From e06d729fe5ecf4bcb53b42d36a32e122cd93ab7a Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 4 Apr 2021 22:04:46 +0200 Subject: [PATCH] web: SpinnerSize -> PFSize, add size prop for modal button Signed-off-by: Jens Langhammer --- web/src/elements/EmptyState.ts | 4 ++-- web/src/elements/Spinner.ts | 4 ++-- web/src/elements/buttons/ModalButton.ts | 5 +++-- web/src/elements/buttons/SpinnerButton.ts | 4 ++-- web/src/elements/cards/AggregatePromiseCard.ts | 4 ++-- web/src/flows/FlowExecutor.ts | 4 ++-- .../AuthenticatorValidateStageWebAuthn.ts | 4 ++-- .../WebAuthnAuthenticatorRegisterStage.ts | 4 ++-- web/src/flows/stages/captcha/CaptchaStage.ts | 4 ++-- web/src/pages/admin-overview/cards/AdminStatusCard.ts | 4 ++-- web/src/pages/events/EventInfo.ts | 6 +++--- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/web/src/elements/EmptyState.ts b/web/src/elements/EmptyState.ts index 124e64bd6..911befcbb 100644 --- a/web/src/elements/EmptyState.ts +++ b/web/src/elements/EmptyState.ts @@ -4,7 +4,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import AKGlobal from "../authentik.css"; -import { SpinnerSize } from "./Spinner"; +import { PFSize } from "./Spinner"; @customElement("ak-empty-state") export class EmptyState extends LitElement { @@ -30,7 +30,7 @@ export class EmptyState extends LitElement {
${this.loading ? html`
- +
`: html``}

diff --git a/web/src/elements/Spinner.ts b/web/src/elements/Spinner.ts index 84ca4c199..d4888c9bd 100644 --- a/web/src/elements/Spinner.ts +++ b/web/src/elements/Spinner.ts @@ -2,7 +2,7 @@ import { t } from "@lingui/macro"; import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css"; -export enum SpinnerSize { +export enum PFSize { Small = "pf-m-sm", Medium = "pf-m-md", Large = "pf-m-lg", @@ -12,7 +12,7 @@ export enum SpinnerSize { @customElement("ak-spinner") export class Spinner extends LitElement { @property() - size: SpinnerSize = SpinnerSize.Medium; + size: PFSize = PFSize.Medium; static get styles(): CSSResult[] { return [PFSpinner]; diff --git a/web/src/elements/buttons/ModalButton.ts b/web/src/elements/buttons/ModalButton.ts index 507243094..401639bff 100644 --- a/web/src/elements/buttons/ModalButton.ts +++ b/web/src/elements/buttons/ModalButton.ts @@ -12,11 +12,12 @@ import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; import AKGlobal from "../../authentik.css"; +import { PFSize } from "../Spinner"; @customElement("ak-modal-button") export class ModalButton extends LitElement { @property() - href?: string; + size: PFSize = PFSize.Large; @property({type: Boolean}) open = false; @@ -78,7 +79,7 @@ export class ModalButton extends LitElement { return html`
- +
diff --git a/web/src/pages/admin-overview/cards/AdminStatusCard.ts b/web/src/pages/admin-overview/cards/AdminStatusCard.ts index af06f975d..bfca58a5d 100644 --- a/web/src/pages/admin-overview/cards/AdminStatusCard.ts +++ b/web/src/pages/admin-overview/cards/AdminStatusCard.ts @@ -2,7 +2,7 @@ import { html, TemplateResult } from "lit-html"; import { until } from "lit-html/directives/until"; import { EVENT_REFRESH } from "../../../constants"; import { AggregateCard } from "../../../elements/cards/AggregateCard"; -import { SpinnerSize } from "../../../elements/Spinner"; +import { PFSize } from "../../../elements/Spinner"; export interface AdminStatus { icon: string; @@ -38,7 +38,7 @@ export abstract class AdminStatusCard extends AggregateCard {  ${this.renderValue()}

${status.message ? html`

${status.message}

` : html``}`; - }), html``)} + }), html``)}

`; } } diff --git a/web/src/pages/events/EventInfo.ts b/web/src/pages/events/EventInfo.ts index e7490ceab..7203a801b 100644 --- a/web/src/pages/events/EventInfo.ts +++ b/web/src/pages/events/EventInfo.ts @@ -4,7 +4,7 @@ import { until } from "lit-html/directives/until"; import { FlowsApi } from "authentik-api"; import "../../elements/Spinner"; import "../../elements/Expand"; -import { SpinnerSize } from "../../elements/Spinner"; +import { PFSize } from "../../elements/Spinner"; import { EventContext, EventWithContext } from "../../api/Events"; import { DEFAULT_CONFIG } from "../../api/Config"; @@ -91,7 +91,7 @@ export class EventInfo extends LitElement { render(): TemplateResult { if (!this.event) { - return html``; + return html``; } switch (this.event?.action) { case "model_created": @@ -113,7 +113,7 @@ export class EventInfo extends LitElement { flowUuid: this.event.context.flow as string, }).then(resp => { return html`${resp.results[0].name}`; - }), html``)} + }), html``)}