From bb8559ee18fdf3555ac96ab60de7055ebdfd4260 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 13 Jun 2021 19:54:27 +0200 Subject: [PATCH] web: remove base interface Signed-off-by: Jens Langhammer --- authentik/outposts/models.py | 2 +- web/src/interfaces/AdminInterface.ts | 95 +++++++++++++++++++++++++- web/src/interfaces/Interface.ts | 99 ---------------------------- 3 files changed, 93 insertions(+), 103 deletions(-) delete mode 100644 web/src/interfaces/Interface.ts diff --git a/authentik/outposts/models.py b/authentik/outposts/models.py index 0e2d54b12..bd0d4b56e 100644 --- a/authentik/outposts/models.py +++ b/authentik/outposts/models.py @@ -141,7 +141,7 @@ class OutpostServiceConnection(models.Model): @property def component(self) -> str: """Return component used to edit this object""" - raise NotImplementedError + return "" class Meta: diff --git a/web/src/interfaces/AdminInterface.ts b/web/src/interfaces/AdminInterface.ts index 8a25367ae..01cfc233f 100644 --- a/web/src/interfaces/AdminInterface.ts +++ b/web/src/interfaces/AdminInterface.ts @@ -1,14 +1,103 @@ import "../elements/messages/MessageContainer"; -import { customElement, html, TemplateResult } from "lit-element"; +import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; import { me } from "../api/Users"; import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "../elements/router/Route"; -import { Interface } from "./Interface"; import "./locale"; import "../elements/sidebar/SidebarItem"; import { t } from "@lingui/macro"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css"; + +import "../elements/router/RouterOutlet"; +import "../elements/messages/MessageContainer"; +import "../elements/notifications/NotificationDrawer"; +import "../elements/Banner"; +import "../elements/sidebar/Sidebar"; +import { until } from "lit-html/directives/until"; +import { EVENT_NOTIFICATION_TOGGLE, EVENT_SIDEBAR_TOGGLE, VERSION } from "../constants"; +import { AdminApi } from "authentik-api"; +import { DEFAULT_CONFIG } from "../api/Config"; + @customElement("ak-interface-admin") -export class AdminInterface extends Interface { +export class AdminInterface extends LitElement { + + @property({type: Boolean}) + sidebarOpen = true; + + @property({type: Boolean}) + notificationOpen = false; + + static get styles(): CSSResult[] { + return [PFBase, PFPage, PFButton, PFDrawer, css` + .pf-c-page__main, .pf-c-drawer__content, .pf-c-page__drawer { + z-index: auto !important; + } + `]; + } + + constructor() { + super(); + this.sidebarOpen = window.innerWidth >= 1280; + window.addEventListener("resize", () => { + this.sidebarOpen = window.innerWidth >= 1280; + }); + window.addEventListener(EVENT_SIDEBAR_TOGGLE, () => { + this.sidebarOpen = !this.sidebarOpen; + }); + window.addEventListener(EVENT_NOTIFICATION_TOGGLE, () => { + this.notificationOpen = !this.notificationOpen; + }); + } + + render(): TemplateResult { + return html` + ${until(new AdminApi(DEFAULT_CONFIG).adminVersionRetrieve().then(version => { + if (version.versionCurrent !== VERSION) { + return html` + ${t`A newer version of the frontend is available.`} + + `; + } + return html``; + }))} + ${until(me().then((u) => { + if (u.original) { + return html` + ${t`You're currently impersonating ${u.user.username}.`} + + ${t`Stop impersonation`} + + `; + } + return html``; + }))} +
+ + ${this.renderSidebarItems()} + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+
`; + } renderSidebarItems(): TemplateResult { const superUserCondition = () => { diff --git a/web/src/interfaces/Interface.ts b/web/src/interfaces/Interface.ts deleted file mode 100644 index 5f43deff2..000000000 --- a/web/src/interfaces/Interface.ts +++ /dev/null @@ -1,99 +0,0 @@ -import { css, CSSResult, html, LitElement, property, TemplateResult } from "lit-element"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css"; - -import "../elements/router/RouterOutlet"; -import "../elements/messages/MessageContainer"; -import "../elements/notifications/NotificationDrawer"; -import "../elements/Banner"; -import "../elements/sidebar/Sidebar"; -import { until } from "lit-html/directives/until"; -import { me } from "../api/Users"; -import { t } from "@lingui/macro"; -import { EVENT_NOTIFICATION_TOGGLE, EVENT_SIDEBAR_TOGGLE, VERSION } from "../constants"; -import { AdminApi } from "authentik-api"; -import { DEFAULT_CONFIG } from "../api/Config"; - -export abstract class Interface extends LitElement { - @property({type: Boolean}) - sidebarOpen = true; - - @property({type: Boolean}) - notificationOpen = false; - - static get styles(): CSSResult[] { - return [PFBase, PFPage, PFButton, PFDrawer, css` - .pf-c-page__main, .pf-c-drawer__content, .pf-c-page__drawer { - z-index: auto !important; - } - `]; - } - - constructor() { - super(); - this.sidebarOpen = window.innerWidth >= 1280; - window.addEventListener("resize", () => { - this.sidebarOpen = window.innerWidth >= 1280; - }); - window.addEventListener(EVENT_SIDEBAR_TOGGLE, () => { - this.sidebarOpen = !this.sidebarOpen; - }); - window.addEventListener(EVENT_NOTIFICATION_TOGGLE, () => { - this.notificationOpen = !this.notificationOpen; - }); - } - - renderSidebarItems(): TemplateResult { - return html``; - } - - render(): TemplateResult { - return html` - ${until(new AdminApi(DEFAULT_CONFIG).adminVersionRetrieve().then(version => { - if (version.versionCurrent !== VERSION) { - return html` - ${t`A newer version of the frontend is available.`} - - `; - } - return html``; - }))} - ${until(me().then((u) => { - if (u.original) { - return html` - ${t`You're currently impersonating ${u.user.username}.`} - - ${t`Stop impersonation`} - - `; - } - return html``; - }))} -
- - ${this.renderSidebarItems()} - -
-
-
-
-
-
- - -
-
-
- - -
-
-
-
`; - } - -}