habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web/admin: fix error in admin interface due to un-hydrated context (#9336)

Browse Source 
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens L
2024-04-18 16:49:17 +02:00
committed by GitHub
parent 9f5d7089c3
commit 2e9df96a62
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/admin/AdminInterface/AdminSidebar.ts
View File

@ -166,7 +166,7 @@ export class AkAdminSidebar extends WithCapabilitiesConfig(AKElement) {
${this.renderNewVersionMessage()} ${this.renderNewVersionMessage()}
${this.renderImpersonationMessage()} ${this.renderImpersonationMessage()}
${map(sidebarContent, renderOneSidebarItem)} ${map(sidebarContent, renderOneSidebarItem)}
${this.renderEnterpriseMessage()} ${this.renderEnterpriseMenu()}
`; `;
} }
@ -199,7 +199,7 @@ export class AkAdminSidebar extends WithCapabilitiesConfig(AKElement) {
: nothing; : nothing;
} }
renderEnterpriseMessage() { renderEnterpriseMenu() {
return this.can(CapabilitiesEnum.IsEnterprise) return this.can(CapabilitiesEnum.IsEnterprise)
? html` ? html`
<ak-sidebar-item> <ak-sidebar-item>

4
web/src/elements/Interface/ConfigContextController.ts
View File

@ -1,5 +1,6 @@
import { EVENT_REFRESH } from "@goauthentik/authentik/common/constants"; import { EVENT_REFRESH } from "@goauthentik/authentik/common/constants";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { globalAK } from "@goauthentik/common/global";
import { authentikConfigContext } from "@goauthentik/elements/AuthentikContexts"; import { authentikConfigContext } from "@goauthentik/elements/AuthentikContexts";
import { ContextProvider } from "@lit/context"; import { ContextProvider } from "@lit/context";
@ -23,6 +24,9 @@ export class ConfigContextController implements ReactiveController {
context: authentikConfigContext, context: authentikConfigContext,
initialValue: undefined, initialValue: undefined,
}); });
// Pre-hydrate from template-embedded config
this.context.setValue(globalAK().config);
this.host.config = globalAK().config;
this.fetch = this.fetch.bind(this); this.fetch = this.fetch.bind(this);
this.fetch(); this.fetch();
} }