trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web: break circular dependency between AKElement & Interface. 

This commit changes the way the root node of the web application shell is
discovered by child components, such that the base class shared by both
no longer results in a circular dependency between the two models.

I've run this in isolation and have seen no failures of discovery; the identity
token exists as soon as the Interface is constructed and is found by every item
on the page.
This commit is contained in:
Ken Sternberg 2023-10-13 08:22:46 -07:00
parent 9d18bc545f
commit 314d89b1b7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/elements/Base.ts
View File

@ -13,12 +13,10 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { Config, CurrentTenant, UiThemeEnum } from "@goauthentik/api"; import { Config, CurrentTenant, UiThemeEnum } from "@goauthentik/api";
export function rootInterface<T extends Interface>(): T | undefined { type AkInterface = HTMLElement & { getTheme: () => Promise<UiThemeEnum> };
const el = Array.from(document.body.querySelectorAll("*")).filter(
(el) => el instanceof Interface, export const rootInterface = <T extends AkInterface>(): T | undefined =>
); document.body.querySelector('[data-ak-interface-root]') as T ?? undefined
return el[0] as T;
}
export function ensureCSSStyleSheet(css: CSSStyleSheet | CSSResult): CSSStyleSheet { export function ensureCSSStyleSheet(css: CSSStyleSheet | CSSResult): CSSStyleSheet {
if (css instanceof CSSResult) { if (css instanceof CSSResult) {
@ -171,7 +169,7 @@ export class AKElement extends LitElement {
} }
} }
export class Interface extends AKElement { export class Interface extends AKElement implements AkInterface {
@state() @state()
tenant?: CurrentTenant; tenant?: CurrentTenant;
@ -186,6 +184,7 @@ export class Interface extends AKElement {
document.adoptedStyleSheets = [...document.adoptedStyleSheets, ensureCSSStyleSheet(PFBase)]; document.adoptedStyleSheets = [...document.adoptedStyleSheets, ensureCSSStyleSheet(PFBase)];
tenant().then((tenant) => (this.tenant = tenant)); tenant().then((tenant) => (this.tenant = tenant));
config().then((config) => (this.config = config)); config().then((config) => (this.config = config));
this.dataset.akInterfaceRoot = "true";
} }
_activateTheme(root: AdoptedStyleSheetsElement, theme: UiThemeEnum): void { _activateTheme(root: AdoptedStyleSheetsElement, theme: UiThemeEnum): void {