diff --git a/crates/defguard_core/src/enterprise/handlers/mod.rs b/crates/defguard_core/src/enterprise/handlers/mod.rs index 5686717e6a..8083e77787 100644 --- a/crates/defguard_core/src/enterprise/handlers/mod.rs +++ b/crates/defguard_core/src/enterprise/handlers/mod.rs @@ -57,7 +57,8 @@ pub async fn check_enterprise_info(_admin: AdminRole, _session: SessionInfo) -> "valid_until": license.valid_until, "subscription": license.subscription, "expired": license.is_max_overdue(), - "limits_exceeded": counts.is_over_license_limits(license) + "limits_exceeded": counts.is_over_license_limits(license), + "tier": license.tier } ) }); diff --git a/web/src/i18n/en/index.ts b/web/src/i18n/en/index.ts index 9431378732..19f4cf9a2a 100644 --- a/web/src/i18n/en/index.ts +++ b/web/src/i18n/en/index.ts @@ -1575,6 +1575,9 @@ Licensing information: [https://docs.defguard.net/enterprise/license](https://do validUntil: { label: 'Valid until', }, + licenseTier: { + label: 'License tier', + }, }, }, }, diff --git a/web/src/i18n/i18n-types.ts b/web/src/i18n/i18n-types.ts index c4fd696949..813e6609f6 100644 --- a/web/src/i18n/i18n-types.ts +++ b/web/src/i18n/i18n-types.ts @@ -3813,6 +3813,12 @@ type RootTranslation = { */ label: string } + licenseTier: { + /** + * License tier + */ + label: string + } } } } @@ -10575,6 +10581,12 @@ export type TranslationFunctions = { */ label: () => LocalizedString } + licenseTier: { + /** + * License tier + */ + label: () => LocalizedString + } } } } diff --git a/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/LicenseSettings.tsx b/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/LicenseSettings.tsx index 3fa9acfab7..c1076a30f5 100644 --- a/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/LicenseSettings.tsx +++ b/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/LicenseSettings.tsx @@ -109,6 +109,12 @@ export const LicenseSettings = ({ : '-'}
+{enterpriseInfo.tier || '-'}
+diff --git a/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/styles.scss b/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/styles.scss index 3d1ca3037c..4f8ba8e014 100644 --- a/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/styles.scss +++ b/web/src/pages/settings/components/GlobalSettings/components/LicenseSettings/styles.scss @@ -25,7 +25,7 @@ #license-info { display: grid; - grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 16px; & > div { diff --git a/web/src/shared/types.ts b/web/src/shared/types.ts index b438891d7f..b841582003 100644 --- a/web/src/shared/types.ts +++ b/web/src/shared/types.ts @@ -1148,6 +1148,7 @@ export type EnterpriseInfo = { subscription: boolean; // iso utc date valid_until: string; + tier: string; }; export interface Webhook {