From df1af817a5db05d3bddf11e9364d1d578fbba354 Mon Sep 17 00:00:00 2001 From: ivanThePleasant Date: Tue, 14 Feb 2023 13:40:21 +0200 Subject: [PATCH] Design changes --- .../hooks/useLicenseLimitNotification/index.js | 14 ++++++++------ .../components/AdminSeatInfo/index.js | 7 +++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js index 82b8fa57ca..daa3240d00 100644 --- a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js +++ b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js @@ -26,7 +26,7 @@ const useLicenseLimitNotification = () => { return; } - const { currentUserCount, permittedSeats, licenseLimitStatus, isHostedOnStrapiCloud } = + const { enforcementUserCount, permittedSeats, licenseLimitStatus, isHostedOnStrapiCloud } = license?.data ?? {}; const shouldDisplayNotification = @@ -47,19 +47,21 @@ const useLicenseLimitNotification = () => { type: notificationType, message: formatMessage( { - id: 'notification.ee.warning.seat-limit.message', + id: 'notification.ee.warning.over-.message', defaultMessage: - "Add seats to invite more Users. If you already did it but it's not reflected in Strapi yet, make sure to restart your app.", + "Add seats to {licenseLimitStatus, select, OVER_LIMIT {invite} other {re-enable}} Users. If you already did it but it's not reflected in Strapi yet, make sure to restart your app.", }, { licenseLimitStatus } ), title: formatMessage( { - id: 'notification.ee.warning.seat-limit.title', - defaultMessage: 'Over seat limit ({currentUserCount}/{permittedSeats})', + id: 'notification.ee.warning.at-seat-limit.title', + defaultMessage: + '{licenseLimitStatus, select, OVER_LIMIT {Over} other {At}} seat limit ({enforcementUserCount}/{permittedSeats})', }, { - currentUserCount, + licenseLimitStatus, + enforcementUserCount, permittedSeats, } ), diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js index 671949e481..4bf2ba3bad 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js @@ -40,7 +40,10 @@ const AdminSeatInfo = () => { enforcementUserCount, // eslint-disable-next-line react/no-unstable-nested-components text: (chunks) => ( - + permittedSeats ? 'danger500' : null} + > {chunks} ), @@ -48,7 +51,7 @@ const AdminSeatInfo = () => { )} - {licenseLimitStatus === 'AT_LIMIT' && ( + {licenseLimitStatus === 'OVER_LIMIT' && (