Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Change plan name Enterprise to Premium on marketplace #30487

Merged
merged 16 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/odd-hounds-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

chore: Change plan name Enterprise to Premium on marketplace
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const GenericUpsellModal = ({
<Modal.Header>
{icon && <Modal.Icon name={icon} />}
<Modal.HeaderText>
<Modal.Tagline color='font-annotation'>{tagline ?? t('Enterprise_capability')}</Modal.Tagline>
<Modal.Tagline color='font-annotation'>{tagline ?? t('Premium_capability')}</Modal.Tagline>
<Modal.Title>{title}</Modal.Title>
</Modal.HeaderText>
<Modal.Close aria-label={t('Close')} onClick={onClose} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const AppsFilters = ({

const appsSearchPlaceholders: { [key: string]: string } = {
explore: t('Search_Apps'),
enterprise: t('Search_Enterprise_Apps'),
enterprise: t('Search_Premium_Apps'),
installed: t('Search_Installed_Apps'),
requested: t('Search_Requested_Apps'),
private: t('Search_Private_apps'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const AppsPageContent = (): ReactElement => {
{ id: 'all', label: t('All_Prices'), checked: true },
{ id: 'free', label: t('Free_Apps'), checked: false },
{ id: 'paid', label: t('Paid_Apps'), checked: false },
{ id: 'enterprise', label: t('Enterprise'), checked: false },
{ id: 'premium', label: t('Premium'), checked: false },
],
});
const freePaidFilterOnSelected = useRadioToggle(setFreePaidFilterStructure);
Expand Down Expand Up @@ -89,7 +89,7 @@ const AppsPageContent = (): ReactElement => {

const getAppsData = useCallback((): appsDataType => {
switch (context) {
case 'enterprise':
case 'premium':
case 'explore':
case 'requested':
return marketplaceApps;
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/client/views/marketplace/BundleChips.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ const BundleChips = ({ bundledIn }: BundleChipsProps): ReactElement => {

return (
<>
{bundledIn.map((bundle) => (
{bundledIn.map(({ bundleId, bundleName }) => (
<Tag
key={bundle.bundleId}
key={bundleId}
variant='featured'
title={t('this_app_is_included_with_subscription', {
bundleName: bundle.bundleName,
bundleName,
})}
>
{bundle.bundleName}
{bundleName}
</Tag>
))}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const EnabledAppsCount = ({
percentage: number;
limit: number;
enabled: number;
context: 'private' | 'explore' | 'installed' | 'enterprise' | 'requested';
context: 'private' | 'explore' | 'installed' | 'premium' | 'requested';
}): ReactElement | null => {
const t = useTranslation();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import EnabledAppsCount from './EnabledAppsCount';
const MarketplaceHeader = ({ title }: { title: string }): ReactElement | null => {
const t = useTranslation();
const isAdmin = usePermission('manage-apps');
const context = (useRouteParameter('context') || 'explore') as 'private' | 'explore' | 'installed' | 'enterprise' | 'requested';
const context = (useRouteParameter('context') || 'explore') as 'private' | 'explore' | 'installed' | 'premium' | 'requested';
const route = useRoute('marketplace');
const setModal = useSetModal();
const result = useAppsCountQuery(context);
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/marketplace/hooks/useAppInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const useAppInfo = (appId: string, context: string): AppInfo | undefined
}

let appResult: App | undefined;
const marketplaceAppsContexts = ['explore', 'enterprise', 'requested'];
const marketplaceAppsContexts = ['explore', 'premium', 'requested'];

if (marketplaceAppsContexts.includes(context)) appResult = marketplaceApps.value?.apps.find((app) => app.id === appId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ const getProgressBarValues = (numberOfEnabledApps: number, enabledAppsLimit: num
percentage: Math.round((numberOfEnabledApps / enabledAppsLimit) * 100),
});

export type MarketplaceRouteContext = 'private' | 'explore' | 'installed' | 'enterprise' | 'requested';
export type MarketplaceRouteContext = 'private' | 'explore' | 'installed' | 'premium' | 'requested';

export function isMarketplaceRouteContext(context: string): context is MarketplaceRouteContext {
return ['private', 'explore', 'installed', 'enterprise', 'requested'].includes(context);
return ['private', 'explore', 'installed', 'premium', 'requested'].includes(context);
}

export const useAppsCountQuery = (context: MarketplaceRouteContext) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const useFilteredApps = ({
const filterByPurchaseType: Record<string, (apps: App[]) => App[]> = {
all: fallback,
paid: (apps: App[]) => apps.filter(filterAppsByPaid),
enterprise: (apps: App[]) => apps.filter(filterAppsByEnterprise),
premium: (apps: App[]) => apps.filter(filterAppsByEnterprise),
free: (apps: App[]) => apps.filter(filterAppsByFree),
};

Expand All @@ -80,7 +80,7 @@ export const useFilteredApps = ({
explore: fallback,
installed: fallback,
private: fallback,
enterprise: (apps: App[]) => apps.filter(({ categories }) => categories.includes('Enterprise')),
premium: (apps: App[]) => apps.filter(({ categories }) => categories.includes('Enterprise')),
requested: (apps: App[]) => apps.filter(({ appRequestStats, installed }) => Boolean(appRequestStats) && !installed),
};

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/marketplace/sidebarItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export const {
permissionGranted: (): boolean => hasAtLeastOnePermission(['access-marketplace', 'manage-apps']),
},
{
href: '/marketplace/enterprise',
href: '/marketplace/premium',
icon: 'lightning',
i18nLabel: 'Enterprise',
i18nLabel: 'Premium',
permissionGranted: (): boolean => hasAtLeastOnePermission(['access-marketplace', 'manage-apps']),
},
{
Expand Down
16 changes: 10 additions & 6 deletions apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@
"Apps_context_installed": "Installed",
"Apps_context_requested": "Requested",
"Apps_context_private": "Private Apps",
"Apps_context_premium": "Premium",
"Apps_Count_Enabled": "{{count}} app enabled",
"Apps_Count_Enabled_plural": "{{count}} apps enabled",
"Private_Apps_Count_Enabled": "{{count}} private app enabled",
Expand Down Expand Up @@ -4551,6 +4552,7 @@
"Search_Installed_Apps": "Search installed apps",
"Search_Private_apps": "Search private apps",
"Search_Requested_Apps": "Search requested apps",
"Search_Premium_Apps": "Search Premium apps",
"Search_by_file_name": "Search by file name",
"Search_by_username": "Search by username",
"Search_by_category": "Search by category",
Expand Down Expand Up @@ -5946,9 +5948,9 @@
"Theme_light_description": "More accessible for individuals with visual impairments and a good choice for well-lit environments.",
"Theme_dark": "Dark",
"Theme_dark_description": "Reduce eye strain and fatigue in low-light conditions by minimizing the amount of light emitted by the screen.",
"Enable_of_limit_apps_currently_enabled": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** Disable another {{context}} app or upgrade to Enterprise to enable this app.",
"Enable_of_limit_apps_currently_enabled_exceeded": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nCommunity edition app limit has been exceeded. \n \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** You will need to disable at least {{exceed}} other {{context}} apps or upgrade to Enterprise to enable this app.",
"Workspaces_on_Community_edition_install_app": "Workspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. Upgrade to Enterprise to enable unlimited apps.",
"Enable_of_limit_apps_currently_enabled": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** Disable another {{context}} app or upgrade to Premium to enable this app.",
"Enable_of_limit_apps_currently_enabled_exceeded": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nCommunity edition app limit has been exceeded. \n \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** You will need to disable at least {{exceed}} other {{context}} apps or upgrade to Premium to enable this app.",
"Workspaces_on_Community_edition_install_app": "Workspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. Upgrade to Premium to enable unlimited apps.",
"Apps_Currently_Enabled": "{{enabled}} of {{limit}} {{context}} apps currently enabled.",
"Disable_another_app": "Disable another app or upgrade to Enterprise to enable this app.",
"Upload_anyway": "Upload anyway",
Expand All @@ -5971,8 +5973,8 @@
"Create_a_password": "Create a password",
"Create_an_account": "Create an account",
"Get_all_apps": "Get all the apps your team needs",
"Workspaces_on_community_edition_trial_on": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Start a free Enterprise trial to remove these limits today!",
"Workspaces_on_community_edition_trial_off": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Upgrade to Enterprise to remove limits and supercharge your workspace.",
"Workspaces_on_community_edition_trial_on": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Start a free Premium trial to remove these limits today!",
"Workspaces_on_community_edition_trial_off": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Upgrade to Premium to remove limits and supercharge your workspace.",
"No_private_apps_installed": "No private apps installed",
"Private_apps_are_side-loaded": "Private apps are side-loaded and are not available on the Marketplace.",
"Chat_transcript": "Chat transcript",
Expand Down Expand Up @@ -6074,5 +6076,7 @@
"All_visible": "All visible",
"Filter_by_room": "Filter by room type",
"Filter_by_visibility": "Filter by visibility",
"Theme_Appearence": "Theme Appearence"
"Theme_Appearence": "Theme Appearence",
"Premium": "Premium",
"Premium_capability": "Premium capability"
}
Loading