From 24278d0781399201d970ffca69c6e7d625636726 Mon Sep 17 00:00:00 2001 From: Ken Sternberg Date: Mon, 4 Dec 2023 11:01:53 -0800 Subject: [PATCH] web: change "tenant" to "brand" in all context uses, and update SidebarBrand and DefaultBrand to match. --- web/src/admin/tenants/TenantForm.ts | 11 ++++------- web/src/common/api/middleware.ts | 6 +++--- web/src/elements/Base.ts | 4 ++-- web/src/elements/sidebar/SidebarBrand.ts | 6 +++--- web/src/standalone/api-browser/index.ts | 4 ++-- web/src/user/UserInterface.ts | 6 +++--- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/web/src/admin/tenants/TenantForm.ts b/web/src/admin/tenants/TenantForm.ts index 59048d987..a31bc9b89 100644 --- a/web/src/admin/tenants/TenantForm.ts +++ b/web/src/admin/tenants/TenantForm.ts @@ -8,7 +8,7 @@ import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; import "@goauthentik/elements/forms/SearchSelect"; -import { DefaultTenant } from "@goauthentik/elements/sidebar/SidebarBrand"; +import { DefaultBrand } from "@goauthentik/elements/sidebar/SidebarBrand"; import YAML from "yaml"; import { msg } from "@lit/localize"; @@ -95,7 +95,7 @@ export class TenantForm extends ModelForm { type="text" value="${first( this.instance?.brandingTitle, - DefaultTenant.brandingTitle, + DefaultBrand.brandingTitle, )}" class="pf-c-form-control" required @@ -111,10 +111,7 @@ export class TenantForm extends ModelForm { > @@ -131,7 +128,7 @@ export class TenantForm extends ModelForm { type="text" value="${first( this.instance?.brandingFavicon, - DefaultTenant.brandingFavicon, + DefaultBrand.brandingFavicon, )}" class="pf-c-form-control" required diff --git a/web/src/common/api/middleware.ts b/web/src/common/api/middleware.ts index b03fd479a..3977e6116 100644 --- a/web/src/common/api/middleware.ts +++ b/web/src/common/api/middleware.ts @@ -2,7 +2,7 @@ import { EVENT_REQUEST_POST } from "@goauthentik/common/constants"; import { getCookie } from "@goauthentik/common/utils"; import { - CurrentTenant, + CurrentTenant as CurrentBrand, FetchParams, Middleware, RequestContext, @@ -18,8 +18,8 @@ export interface RequestInfo { } export class LoggingMiddleware implements Middleware { - brand: CurrentTenant; - constructor(brand: CurrentTenant) { + brand: CurrentBrand; + constructor(brand: CurrentBrand) { this.brand = brand; } diff --git a/web/src/elements/Base.ts b/web/src/elements/Base.ts index 09a2d2858..6d73e49cc 100644 --- a/web/src/elements/Base.ts +++ b/web/src/elements/Base.ts @@ -9,13 +9,13 @@ import { LitElement } from "lit"; import AKGlobal from "@goauthentik/common/styles/authentik.css"; import ThemeDark from "@goauthentik/common/styles/theme-dark.css"; -import { Config, CurrentTenant, UiThemeEnum } from "@goauthentik/api"; +import { Config, CurrentTenant as CurrentBrand, UiThemeEnum } from "@goauthentik/api"; import { AdoptedStyleSheetsElement } from "./types"; type AkInterface = HTMLElement & { getTheme: () => Promise; - tenant?: CurrentTenant; + brand?: CurrentBrand; uiConfig?: UIConfig; config?: Config; }; diff --git a/web/src/elements/sidebar/SidebarBrand.ts b/web/src/elements/sidebar/SidebarBrand.ts index 459021759..4d5c1fe5e 100644 --- a/web/src/elements/sidebar/SidebarBrand.ts +++ b/web/src/elements/sidebar/SidebarBrand.ts @@ -10,13 +10,13 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGlobal from "@patternfly/patternfly/patternfly-base.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { CurrentTenant, UiThemeEnum } from "@goauthentik/api"; +import { CurrentTenant as CurrentBrand, UiThemeEnum } from "@goauthentik/api"; // If the viewport is wider than MIN_WIDTH, the sidebar // is shown besides the content, and not overlaid. export const MIN_WIDTH = 1200; -export const DefaultTenant: CurrentTenant = { +export const DefaultBrand: CurrentBrand = { brandingLogo: "/static/dist/assets/icons/icon_left_brand.svg", brandingFavicon: "/static/dist/assets/icons/icon.png", brandingTitle: "authentik", @@ -85,7 +85,7 @@ export class SidebarBrand extends WithBrandConfig(AKElement) {
authentik Logo diff --git a/web/src/standalone/api-browser/index.ts b/web/src/standalone/api-browser/index.ts index 38dafdccf..5a12ee74d 100644 --- a/web/src/standalone/api-browser/index.ts +++ b/web/src/standalone/api-browser/index.ts @@ -4,7 +4,7 @@ import { globalAK } from "@goauthentik/common/global"; import { first, getCookie } from "@goauthentik/common/utils"; import { Interface } from "@goauthentik/elements/Interface"; import "@goauthentik/elements/ak-locale-context"; -import { DefaultTenant } from "@goauthentik/elements/sidebar/SidebarBrand"; +import { DefaultBrand } from "@goauthentik/elements/sidebar/SidebarBrand"; import "rapidoc"; import { CSSResult, TemplateResult, css, html } from "lit"; @@ -103,7 +103,7 @@ export class APIBrowser extends Interface {
diff --git a/web/src/user/UserInterface.ts b/web/src/user/UserInterface.ts index f68d92635..1302bf4ea 100644 --- a/web/src/user/UserInterface.ts +++ b/web/src/user/UserInterface.ts @@ -19,7 +19,7 @@ import "@goauthentik/elements/notifications/NotificationDrawer"; import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch"; import "@goauthentik/elements/router/RouterOutlet"; import "@goauthentik/elements/sidebar/Sidebar"; -import { DefaultTenant } from "@goauthentik/elements/sidebar/SidebarBrand"; +import { DefaultBrand } from "@goauthentik/elements/sidebar/SidebarBrand"; import "@goauthentik/elements/sidebar/SidebarItem"; import { ROUTES } from "@goauthentik/user/Routes"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; @@ -192,8 +192,8 @@ export class UserInterface extends Interface { ${(this.brand?.brandingTitle, DefaultTenant.brandingTitle)}