From 0611eea0e72a6acbdc5dec3945b0fabb8acfcdf2 Mon Sep 17 00:00:00 2001 From: "Jens L." Date: Sat, 10 May 2025 00:54:33 +0200 Subject: [PATCH] web/admin: fix enterprise menu display (#14447) Signed-off-by: Jens Langhammer --- web/src/admin/AdminInterface/index.entrypoint.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/src/admin/AdminInterface/index.entrypoint.ts b/web/src/admin/AdminInterface/index.entrypoint.ts index e0c0583350..b767e06d7c 100644 --- a/web/src/admin/AdminInterface/index.entrypoint.ts +++ b/web/src/admin/AdminInterface/index.entrypoint.ts @@ -10,6 +10,7 @@ import { configureSentry } from "@goauthentik/common/sentry"; import { me } from "@goauthentik/common/users"; import { WebsocketClient } from "@goauthentik/common/ws"; import { AuthenticatedInterface } from "@goauthentik/elements/Interface"; +import { WithCapabilitiesConfig } from "@goauthentik/elements/Interface/capabilitiesProvider"; import { WithLicenseSummary } from "@goauthentik/elements/Interface/licenseSummaryProvider.js"; import "@goauthentik/elements/ak-locale-context"; import "@goauthentik/elements/banner/EnterpriseStatusBanner"; @@ -35,7 +36,7 @@ import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { LicenseSummaryStatusEnum, SessionUser, UiThemeEnum } from "@goauthentik/api"; +import { CapabilitiesEnum, SessionUser, UiThemeEnum } from "@goauthentik/api"; import { AdminSidebarEnterpriseEntries, @@ -48,7 +49,9 @@ if (process.env.NODE_ENV === "development") { } @customElement("ak-interface-admin") -export class AdminInterface extends WithLicenseSummary(AuthenticatedInterface) { +export class AdminInterface extends WithCapabilitiesConfig( + WithLicenseSummary(AuthenticatedInterface), +) { //#region Properties @property({ type: Boolean }) @@ -204,7 +207,7 @@ export class AdminInterface extends WithLicenseSummary(AuthenticatedInterface) { ${renderSidebarItems(AdminSidebarEntries)} - ${this.licenseSummary?.status !== LicenseSummaryStatusEnum.Unlicensed + ${this.can(CapabilitiesEnum.IsEnterprise) ? renderSidebarItems(AdminSidebarEnterpriseEntries) : nothing}