Skip to content

Commit 1cf3c82

Browse files
HichamELBSIcache-your-dreams
authored andcommittedMar 24, 2025
fix: manage seats link for gold license
1 parent ff5b606 commit 1cf3c82

File tree

12 files changed

+43
-28
lines changed

12 files changed

+43
-28
lines changed
 

‎packages/core/admin/admin/src/translations/ar.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,8 @@
618618
"Settings.application.description": "المعلومات العالمية للوحة الإدارة",
619619
"Settings.application.edition-title": "الإصدار الحالي",
620620
"Settings.application.ee-or-ce": "{communityEdition، select، true {Community Edition} أخرى {Enterprise Edition}}",
621-
"Settings.application.ee.admin-seats.add-seats": "Manage seats",
621+
"Settings.application.ee.admin-seats.add-seats": "إدارة المقاعد",
622+
"Settings.application.ee.admin-seats.support": "يرجى الاتصال بفريق الدعم",
622623
"Settings.application.ee.admin-seats.at-limit-tooltip": "عند الحد: أضف مقاعد لدعوة المزيد من المستخدمين",
623624
"Settings.application.ee.admin-seats.count": "<text>{enforcementUserCount}</text>/{permittedSeats}",
624625
"Settings.application.get-help": "احصل على مساعدة",
@@ -809,4 +810,4 @@
809810
"Users.components.List.empty": "لا يوجد مستخدمون ...",
810811
"Users.components.List.empty.withFilters": "لا يوجد مستخدمون لديهم عوامل التصفية المطبقة ...",
811812
"Users.components.List.empty.withSearch": "لا يوجد مستخدمون مطابقون للبحث({search})..."
812-
}
813+
}

‎packages/core/admin/admin/src/translations/ca.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -500,4 +500,4 @@
500500
"request.error.model.unknown": "Aquest model no existeix",
501501
"skipToContent": "Saltar al contingut",
502502
"submit": "Enviar"
503-
}
503+
}

‎packages/core/admin/admin/src/translations/en.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
"Settings.application.edition-title": "current edition",
134134
"Settings.application.ee-or-ce": "{communityEdition, select, true {Community Edition} other {Enterprise Edition}}",
135135
"Settings.application.ee.admin-seats.add-seats": "Manage seats",
136+
"Settings.application.ee.admin-seats.support": "Please contact the support team",
136137
"Settings.application.ee.admin-seats.at-limit-tooltip": "At limit: add seats to invite more users",
137138
"Settings.application.ee.admin-seats.count": "<text>{enforcementUserCount}</text>/{permittedSeats}",
138139
"Settings.application.get-help": "Get help",
@@ -775,4 +776,4 @@
775776
"selectButtonTitle": "Select",
776777
"skipToContent": "Skip to content",
777778
"submit": "Submit"
778-
}
779+
}

‎packages/core/admin/admin/src/translations/fr.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
"Settings.application.ee.admin-seats.count": "<text>{enforcementUserCount}</text>/{permittedSeats}",
134134
"Settings.application.ee.admin-seats.at-limit-tooltip": "Limite atteinte : ajouter des places pour inviter d'autres utilisateurs",
135135
"Settings.application.ee.admin-seats.add-seats": "Gérer les places",
136+
"Settings.application.ee.admin-seats.support": "Veuillez contacter le support",
136137
"Settings.application.customization": "Customisation",
137138
"Settings.application.customization.auth-logo.carousel-hint": "Remplacer le logo dans la page de connexion",
138139
"Settings.application.customization.carousel-hint": "Changer le logo dans l'interface d'administration (dimensions maximales: {dimension}x{dimension}, poids maximal du fichier : {size}KB)",
@@ -557,4 +558,4 @@
557558
"components.Blocks.blocks.image": "Image",
558559
"components.Blocks.blocks.unorderedList": "Liste à puces",
559560
"components.Blocks.blocks.orderedList": "Liste numérotée"
560-
}
561+
}

‎packages/core/admin/admin/src/translations/ru.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
"Settings.application.edition-title": "Текущий план",
133133
"Settings.application.ee-or-ce": "{communityEdition, select, true {Community Edition} other {Enterprise Edition}}",
134134
"Settings.application.ee.admin-seats.add-seats": "Управление места",
135+
"Settings.application.ee.admin-seats.support": "Пожалуйста, свяжитесь с командой поддержки",
135136
"Settings.application.ee.admin-seats.at-limit-tooltip": "При исчерпании лимита: добавьте места, чтобы пригласить больше пользователей",
136137
"Settings.application.ee.admin-seats.count": "<text>{enforcementUserCount}</text>/{permittedSeats}",
137138
"Settings.application.get-help": "Получить помощь",
@@ -722,4 +723,4 @@
722723
"selectButtonTitle": "Выбрать",
723724
"skipToContent": "Перейти к содержимому",
724725
"submit": "Отправить"
725-
}
726+
}

‎packages/core/admin/admin/src/translations/uk.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
"Settings.application.edition-title": "поточний план",
133133
"Settings.application.ee-or-ce": "{communityEdition, select, true {Community Edition} other {Enterprise Edition}}",
134134
"Settings.application.ee.admin-seats.add-seats": "Керування місця",
135+
"Settings.application.ee.admin-seats.support": "Зверніться до служби підтримки",
135136
"Settings.application.ee.admin-seats.at-limit-tooltip": "На вичерпанні ліміту: додайте місця, щоб запросити більше користувачів",
136137
"Settings.application.ee.admin-seats.count": "<text>{enforcementUserCount}</text>/{permittedSeats}",
137138
"Settings.application.get-help": "Отримати допомогу",
@@ -765,4 +766,4 @@
765766
"skipToContent": "Перейти до вмісту",
766767
"submit": "Відправити",
767768
"components.Search.placeholder": "Пошук..."
768-
}
769+
}

‎packages/core/admin/admin/src/translations/zh-Hans.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@
131131
"Settings.application.description": "管理面板的全局信息",
132132
"Settings.application.edition-title": "当前版本",
133133
"Settings.application.ee-or-ce": "{communityEdition, select, true {社区版} other {企业版}}",
134-
"Settings.application.ee.admin-seats.add-seats": "{isHostedOnStrapiCloud, select, true {添加座位} other {管理座位}}",
134+
"Settings.application.ee.admin-seats.add-seats": "管理座位",
135+
"Settings.application.ee.admin-seats.support": "请联系支持团队",
135136
"Settings.application.ee.admin-seats.at-limit-tooltip": "已达上限:添加座位以邀请更多用户",
136137
"Settings.application.ee.admin-seats.count": "<text>{enforcementUserCount}</text>/{permittedSeats}",
137138
"Settings.application.get-help": "获取帮助",
@@ -693,4 +694,4 @@
693694
"selectButtonTitle": "选择",
694695
"skipToContent": "跳至内容",
695696
"submit": "提交"
696-
}
697+
}

‎packages/core/admin/ee/admin/src/hooks/useLicenseLimits.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function useLicenseLimits({ enabled }: UseLicenseLimitsArgs = { enabled: true })
1919
const getFeature = React.useCallback<GetFeatureType>(
2020
(name) => {
2121
const feature = data?.data?.features.find((feature) => feature.name === name);
22-
console.log(data);
2322

2423
if (feature && 'options' in feature) {
2524
return feature.options;
@@ -30,7 +29,7 @@ function useLicenseLimits({ enabled }: UseLicenseLimitsArgs = { enabled: true })
3029
[data]
3130
);
3231

33-
return { license: data?.data, getFeature, isError, isLoading, };
32+
return { license: data?.data, getFeature, isError, isLoading };
3433
}
3534

3635
export { useLicenseLimits };

‎packages/core/admin/ee/admin/src/pages/SettingsPage/pages/ApplicationInfoPage/components/AdminSeatInfo.tsx

+20-14
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { useLicenseLimits } from '../../../../../hooks/useLicenseLimits';
99

1010
const BILLING_SELF_HOSTED_URL = 'https://strapi.io/billing/request-seats';
1111
const MANAGE_SEATS_URL = 'https://strapi.io/billing/manage-seats';
12+
const SUPPORT_URL = 'mailto:support@strapi.io';
1213

1314
export const AdminSeatInfoEE = () => {
1415
const { formatMessage } = useIntl();
@@ -35,13 +36,12 @@ export const AdminSeatInfoEE = () => {
3536
return null;
3637
}
3738

38-
const { licenseLimitStatus, enforcementUserCount, permittedSeats, isHostedOnStrapiCloud } =
39+
const { licenseLimitStatus, enforcementUserCount, permittedSeats, isHostedOnStrapiCloud, type } =
3940
license;
4041

4142
if (!permittedSeats) {
4243
return null;
4344
}
44-
console.log(window.strapi.ee.type);
4545

4646
return (
4747
<Grid.Item col={6} s={12} direction="column" alignItems="stretch">
@@ -86,19 +86,25 @@ export const AdminSeatInfoEE = () => {
8686
</Tooltip>
8787
)}
8888
</Flex>
89-
<Link
90-
href={isHostedOnStrapiCloud ? BILLING_SELF_HOSTED_URL : MANAGE_SEATS_URL}
91-
isExternal
92-
endIcon={<ExternalLink />}
93-
>
94-
{formatMessage(
95-
{
89+
{type === 'gold' ? (
90+
<Link href={SUPPORT_URL} endIcon={<ExternalLink />}>
91+
{formatMessage({
92+
id: 'Settings.application.ee.admin-seats.support',
93+
defaultMessage: 'Please contact the support team',
94+
})}
95+
</Link>
96+
) : (
97+
<Link
98+
href={isHostedOnStrapiCloud ? BILLING_SELF_HOSTED_URL : MANAGE_SEATS_URL}
99+
isExternal
100+
endIcon={<ExternalLink />}
101+
>
102+
{formatMessage({
96103
id: 'Settings.application.ee.admin-seats.add-seats',
97-
defaultMessage:
98-
'Manage seats',
99-
}
100-
)}
101-
</Link>
104+
defaultMessage: 'Manage seats',
105+
})}
106+
</Link>
107+
)}
102108
</Grid.Item>
103109
);
104110
};

‎packages/core/admin/ee/server/src/controllers/admin.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ export default {
77
async getProjectType() {
88
const flags = strapi.config.get('admin.flags', {});
99
try {
10-
return { data: { isEE: strapi.EE, features: strapi.ee.features.list(), flags, type: strapi.ee.type } };
10+
return {
11+
data: { isEE: strapi.EE, features: strapi.ee.features.list(), flags, type: strapi.ee.type },
12+
};
1113
} catch (err) {
1214
return { data: { isEE: false, features: [], flags, type: strapi.ee.type } };
1315
}

‎packages/core/admin/shared/contracts/admin.ts

+1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ export declare namespace GetLicenseLimitInformation {
212212
permittedSeats: number;
213213
shouldNotify: boolean;
214214
shouldStopCreate: boolean;
215+
type: string;
215216
};
216217
error?: errors.ApplicationError;
217218
}

‎packages/core/content-manager/admin/src/translations/zh-Hans.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,12 @@
127127
"Settings.application.customization.modal.upload.from-url": "从URL",
128128
"Settings.application.customization.modal.upload.from-url.input-label": "URL",
129129
"Settings.application.customization.modal.upload.next": "下一步",
130-
"Settings.application.customization.size-details": "最大尺寸:{dimension}×{dimension},最大文件大小:{size}KB",
130+
"Settings.application.customization.size-details": "最大尺寸:{dimension}×{dimension},最大文件大小:{size}KB",
131131
"Settings.application.description": "管理面板的全局信息",
132132
"Settings.application.edition-title": "当前计划",
133133
"Settings.application.ee-or-ce": "{communityEdition, select, true {社区版} other {企业版}}",
134134
"Settings.application.ee.admin-seats.add-seats": "管理座位",
135+
"Settings.application.ee.admin-seats.support": "请联系支持团队",
135136
"Settings.application.ee.admin-seats.at-limit-tooltip": "已达上限:添加座位以邀请更多用户",
136137
"Settings.application.ee.admin-seats.count": "<text>{enforcementUserCount}</text>/{permittedSeats}",
137138
"Settings.application.get-help": "获取帮助",
@@ -911,4 +912,4 @@
911912
"selectButtonTitle": "选择",
912913
"skipToContent": "跳至内容",
913914
"submit": "提交"
914-
}
915+
}

0 commit comments

Comments
 (0)
Please sign in to comment.