diff --git a/web/src/admin/applications/ApplicationListPage.ts b/web/src/admin/applications/ApplicationListPage.ts index c378a2e68..c06236750 100644 --- a/web/src/admin/applications/ApplicationListPage.ts +++ b/web/src/admin/applications/ApplicationListPage.ts @@ -1,15 +1,14 @@ import "@goauthentik/admin/applications/ApplicationForm"; -import "./ApplicationWizardHint"; import { PFSize } from "@goauthentik/app/elements/Spinner"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; -import { getURLParam } from "@goauthentik/elements/router/RouteMatch"; import "@goauthentik/components/ak-app-icon"; import MDApplication from "@goauthentik/docs/core/applications.md"; import "@goauthentik/elements/Markdown"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/ModalForm"; +import { getURLParam } from "@goauthentik/elements/router/RouteMatch"; // import { getURLParam } from "@goauthentik/elements/router/RouteMatch"; import { PaginatedResponse } from "@goauthentik/elements/table/Table"; import { TableColumn } from "@goauthentik/elements/table/Table"; @@ -24,6 +23,8 @@ import PFCard from "@patternfly/patternfly/components/Card/card.css"; import { Application, CoreApi } from "@goauthentik/api"; +import "./ApplicationWizardHint"; + @customElement("ak-application-list") export class ApplicationListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/applications/ApplicationWizardHint.ts b/web/src/admin/applications/ApplicationWizardHint.ts index 118454abb..288e18dbd 100644 --- a/web/src/admin/applications/ApplicationWizardHint.ts +++ b/web/src/admin/applications/ApplicationWizardHint.ts @@ -1,5 +1,8 @@ import "@goauthentik/admin/applications/wizard/ak-application-wizard"; -import { ShowHintController, ShowHintControllerHost } from "@goauthentik/components/ak-hint/ShowHintController"; +import { + ShowHintController, + ShowHintControllerHost, +} from "@goauthentik/components/ak-hint/ShowHintController"; import "@goauthentik/components/ak-hint/ak-hint"; import "@goauthentik/components/ak-hint/ak-hint-body"; import { AKElement } from "@goauthentik/elements/Base"; @@ -16,7 +19,15 @@ import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFLabel from "@patternfly/patternfly/components/Label/label.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; -const closeButtonIcon = html` - ${msg("One hint, 'New Application Wizard', is currently hidden")} - + + ${msg("One hint, 'New Application Wizard', is currently hidden")} + + `; @@ -60,11 +92,15 @@ export class AkApplicationWizardHint extends AKElement implements ShowHintContro

- You can now configure both an application and its authentication provider at the same time with our new Application Wizard. + You can now configure both an application and its authentication provider at + the same time with our new Application Wizard.

- +
${this.showHintController.render()}
diff --git a/web/src/admin/providers/ProviderListPage.ts b/web/src/admin/providers/ProviderListPage.ts index 51769a8cc..7dbab4f16 100644 --- a/web/src/admin/providers/ProviderListPage.ts +++ b/web/src/admin/providers/ProviderListPage.ts @@ -1,3 +1,4 @@ +import "@goauthentik/admin/applications/ApplicationWizardHint"; import "@goauthentik/admin/providers/ProviderWizard"; import "@goauthentik/admin/providers/ldap/LDAPProviderForm"; import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm"; @@ -5,7 +6,6 @@ import "@goauthentik/admin/providers/proxy/ProxyProviderForm"; import "@goauthentik/admin/providers/radius/RadiusProviderForm"; import "@goauthentik/admin/providers/saml/SAMLProviderForm"; import "@goauthentik/admin/providers/scim/SCIMProviderForm"; -import "@goauthentik/admin/applications/ApplicationWizardHint"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; import "@goauthentik/elements/buttons/SpinnerButton"; diff --git a/web/src/components/ak-wizard-main/stories/ak-demo-wizard.ts b/web/src/components/ak-wizard-main/stories/ak-demo-wizard.ts index eaf8de53e..30322d666 100644 --- a/web/src/components/ak-wizard-main/stories/ak-demo-wizard.ts +++ b/web/src/components/ak-wizard-main/stories/ak-demo-wizard.ts @@ -1,14 +1,15 @@ +import type { WizardStep } from "@goauthentik/components/ak-wizard-main/types"; + +import { msg } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { html } from "lit"; -import { BackStep, CancelWizard, CloseWizard, NextStep } from "../commonWizardButtons"; -import { msg } from "@lit/localize"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import type { WizardStep } from "@goauthentik/components/ak-wizard-main/types"; import { AkWizard } from "../AkWizard"; +import { BackStep, CancelWizard, CloseWizard, NextStep } from "../commonWizardButtons"; type WizardStateUpdate = { message: string; @@ -43,5 +44,4 @@ export class ApplicationWizard extends AkWizard { close() { this.frame.value!.open = false; } - } diff --git a/web/src/components/ak-wizard-main/stories/ak-wizard-main.stories.ts b/web/src/components/ak-wizard-main/stories/ak-wizard-main.stories.ts index f841f47bf..0de141dc2 100644 --- a/web/src/components/ak-wizard-main/stories/ak-wizard-main.stories.ts +++ b/web/src/components/ak-wizard-main/stories/ak-wizard-main.stories.ts @@ -1,10 +1,13 @@ +import type { WizardStep } from "@goauthentik/components/ak-wizard-main/types"; import "@goauthentik/elements/messages/MessageContainer"; import { Meta } from "@storybook/web-components"; import { TemplateResult, html } from "lit"; + +import { AkWizard } from "../AkWizard"; import "./ak-demo-wizard"; -const metadata: Meta = { +const metadata: Meta> = { title: "Components / Wizard / Basic", component: "ak-wizard-main", parameters: { @@ -32,9 +35,6 @@ const container = (testItem: TemplateResult) => ${testItem} `; - export const OnePageWizard = () => { - return container( - html` ` - ); + return container(html` `); };