Skip to content
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
3 changes: 2 additions & 1 deletion crates/defguard_core/src/enterprise/handlers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
)
});
Expand Down
3 changes: 3 additions & 0 deletions web/src/i18n/en/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1575,6 +1575,9 @@ Licensing information: [https://docs.defguard.net/enterprise/license](https://do
validUntil: {
label: 'Valid until',
},
licenseTier: {
label: 'License tier',
},
},
},
},
Expand Down
12 changes: 12 additions & 0 deletions web/src/i18n/i18n-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3813,6 +3813,12 @@ type RootTranslation = {
*/
label: string
}
licenseTier: {
/**
* L​i​c​e​n​s​e​ ​t​i​e​r
*/
label: string
}
}
}
}
Expand Down Expand Up @@ -10575,6 +10581,12 @@ export type TranslationFunctions = {
*/
label: () => LocalizedString
}
licenseTier: {
/**
* License tier
*/
label: () => LocalizedString
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ export const LicenseSettings = ({
: '-'}
</p>
</div>
<div>
<Label>
{LL.settingsPage.license.licenseInfo.fields.licenseTier.label()}
</Label>
<p>{enterpriseInfo.tier || '-'}</p>
</div>
</div>
) : (
<p id="no-license">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions web/src/shared/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1148,6 +1148,7 @@ export type EnterpriseInfo = {
subscription: boolean;
// iso utc date
valid_until: string;
tier: string;
};

export interface Webhook {
Expand Down