diff --git a/web/.storybook/manager.js b/web/.storybook/manager.js index 89ba5a192f..f11eaed6d4 100644 --- a/web/.storybook/manager.js +++ b/web/.storybook/manager.js @@ -4,6 +4,7 @@ * @import { ThemeVarsPartial } from "storybook/internal/theming"; */ import { createUIThemeEffect, resolveUITheme } from "@goauthentik/web/common/theme.ts"; + import { addons } from "@storybook/manager-api"; import { create } from "@storybook/theming/create"; diff --git a/web/bundler/mdx-plugin/node.js b/web/bundler/mdx-plugin/node.js index d5ef33bec4..940d521da3 100644 --- a/web/bundler/mdx-plugin/node.js +++ b/web/bundler/mdx-plugin/node.js @@ -1,3 +1,6 @@ +import * as fs from "node:fs/promises"; +import * as path from "node:path"; + /** * @file MDX plugin for ESBuild. * @@ -11,8 +14,6 @@ * } from "esbuild" */ import { MonoRepoRoot } from "@goauthentik/core/paths/node"; -import * as fs from "node:fs/promises"; -import * as path from "node:path"; /** * @typedef {Omit & LoadDataFields} LoadData Data passed to `onload`. diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs index 525073c443..6ce206dbbe 100644 --- a/web/eslint.config.mjs +++ b/web/eslint.config.mjs @@ -1,4 +1,5 @@ import { createESLintPackageConfig } from "@goauthentik/eslint-config"; + import tseslint from "typescript-eslint"; // @ts-check diff --git a/web/packages/sfe/rollup.config.mjs b/web/packages/sfe/rollup.config.mjs index ccdc6a9bad..d26d206ccb 100644 --- a/web/packages/sfe/rollup.config.mjs +++ b/web/packages/sfe/rollup.config.mjs @@ -1,10 +1,11 @@ +import { resolve as resolvePath } from "node:path"; + /** * @file Rollup configuration for the SFE package. */ import commonjs from "@rollup/plugin-commonjs"; import resolve from "@rollup/plugin-node-resolve"; import swc from "@rollup/plugin-swc"; -import { resolve as resolvePath } from "node:path"; import copy from "rollup-plugin-copy"; export async function createConfig() { diff --git a/web/packages/sfe/src/index.ts b/web/packages/sfe/src/index.ts index 0da39dd481..81978c2639 100644 --- a/web/packages/sfe/src/index.ts +++ b/web/packages/sfe/src/index.ts @@ -1,6 +1,4 @@ -import { fromByteArray } from "base64-js"; import "formdata-polyfill"; -import $ from "jquery"; import "weakmap-polyfill"; import { @@ -16,6 +14,9 @@ import { type RedirectChallenge, } from "@goauthentik/api"; +import { fromByteArray } from "base64-js"; +import $ from "jquery"; + interface GlobalAuthentik { brand: { branding_logo: string; diff --git a/web/paths/node.js b/web/paths/node.js index 85f3d1718c..1cc8b66b18 100644 --- a/web/paths/node.js +++ b/web/paths/node.js @@ -1,11 +1,12 @@ +import { dirname, resolve } from "node:path"; +import { fileURLToPath } from "node:url"; + /** * @file Paths used by the web package. * * @runtime node */ import { DistDirectoryName } from "#paths"; -import { dirname, resolve } from "node:path"; -import { fileURLToPath } from "node:url"; const relativeDirname = dirname(fileURLToPath(import.meta.url)); diff --git a/web/scripts/build-locales.mjs b/web/scripts/build-locales.mjs index 94038cfff5..0fcb9dd0e6 100644 --- a/web/scripts/build-locales.mjs +++ b/web/scripts/build-locales.mjs @@ -1,3 +1,7 @@ +import { spawnSync } from "node:child_process"; +import { readFileSync, statSync } from "node:fs"; +import path from "node:path"; + /** * @file Lit Localize build script. * @@ -13,9 +17,6 @@ * @import { Stats } from "fs"; */ import { PackageRoot } from "#paths/node"; -import { spawnSync } from "node:child_process"; -import { readFileSync, statSync } from "node:fs"; -import path from "node:path"; /** * @type {ConfigFile} diff --git a/web/scripts/build-web.mjs b/web/scripts/build-web.mjs index 1f658bd6bd..a21f5f1e03 100644 --- a/web/scripts/build-web.mjs +++ b/web/scripts/build-web.mjs @@ -1,4 +1,7 @@ /// +import * as fs from "node:fs/promises"; +import * as path from "node:path"; + /** * @file ESBuild script for building the authentik web UI. * @@ -7,15 +10,15 @@ import { mdxPlugin } from "#bundler/mdx-plugin/node"; import { createBundleDefinitions } from "#bundler/utils/node"; import { DistDirectory, EntryPoint, PackageRoot } from "#paths/node"; + import { NodeEnvironment } from "@goauthentik/core/environment/node"; import { MonoRepoRoot, resolvePackage } from "@goauthentik/core/paths/node"; import { readBuildIdentifier } from "@goauthentik/core/version/node"; + import { deepmerge } from "deepmerge-ts"; import esbuild from "esbuild"; import copy from "esbuild-plugin-copy"; import { polyfillNode } from "esbuild-plugin-polyfill-node"; -import * as fs from "node:fs/promises"; -import * as path from "node:path"; const logPrefix = "[Build]"; diff --git a/web/scripts/pseudolocalize.mjs b/web/scripts/pseudolocalize.mjs index 416fa9630f..abd82152d9 100644 --- a/web/scripts/pseudolocalize.mjs +++ b/web/scripts/pseudolocalize.mjs @@ -1,3 +1,6 @@ +import { readFileSync } from "node:fs"; +import path from "node:path"; + /** * @file Pseudo-localization script. * @@ -7,8 +10,7 @@ * @import { Locale } from "@lit/localize-tools/src/types/locale.js" */ import { PackageRoot } from "#paths/node"; -import { readFileSync } from "node:fs"; -import path from "node:path"; + import pseudolocale from "pseudolocale"; import { makeFormatter } from "@lit/localize-tools/lib/formatters/index.js"; diff --git a/web/src/admin/AdminInterface/AboutModal.ts b/web/src/admin/AdminInterface/AboutModal.ts index d9b783cf5e..a9623d2371 100644 --- a/web/src/admin/AdminInterface/AboutModal.ts +++ b/web/src/admin/AdminInterface/AboutModal.ts @@ -1,19 +1,21 @@ +import "#elements/EmptyState"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { globalAK } from "#common/global"; + +import { ModalButton } from "#elements/buttons/ModalButton"; import { WithBrandConfig } from "#elements/mixins/branding"; import { WithLicenseSummary } from "#elements/mixins/license"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { globalAK } from "@goauthentik/common/global"; -import "@goauthentik/elements/EmptyState"; -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; + +import { AdminApi, CapabilitiesEnum, LicenseSummaryStatusEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { TemplateResult, css, html } from "lit"; +import { css, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { until } from "lit/directives/until.js"; import PFAbout from "@patternfly/patternfly/components/AboutModalBox/about-modal-box.css"; -import { AdminApi, CapabilitiesEnum, LicenseSummaryStatusEnum } from "@goauthentik/api"; - @customElement("ak-about-modal") export class AboutModal extends WithLicenseSummary(WithBrandConfig(ModalButton)) { static get styles() { diff --git a/web/src/admin/AdminInterface/AdminSidebar.ts b/web/src/admin/AdminInterface/AdminSidebar.ts index 3bb0449454..cdc301905d 100644 --- a/web/src/admin/AdminInterface/AdminSidebar.ts +++ b/web/src/admin/AdminInterface/AdminSidebar.ts @@ -1,8 +1,9 @@ -import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "@goauthentik/elements/router/Route"; +import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "#elements/router/Route"; + import { spread } from "@open-wc/lit-helpers"; import { msg } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; +import { html, nothing, TemplateResult } from "lit"; import { repeat } from "lit/directives/repeat.js"; // The second attribute type is of string[] to help with the 'activeWhen' control, which was diff --git a/web/src/admin/AdminInterface/index.entrypoint.ts b/web/src/admin/AdminInterface/index.entrypoint.ts index 663364ce7c..280ffef9f2 100644 --- a/web/src/admin/AdminInterface/index.entrypoint.ts +++ b/web/src/admin/AdminInterface/index.entrypoint.ts @@ -1,28 +1,31 @@ import "#admin/AdminInterface/AboutModal"; -import type { AboutModal } from "#admin/AdminInterface/AboutModal"; -import { ROUTES } from "#admin/Routes"; -import { EVENT_API_DRAWER_TOGGLE, EVENT_NOTIFICATION_DRAWER_TOGGLE } from "#common/constants"; -import { configureSentry } from "#common/sentry/index"; -import { me } from "#common/users"; -import { WebsocketClient } from "#common/ws"; -import { SidebarToggleEventDetail } from "#components/ak-page-header"; -import { AuthenticatedInterface } from "#elements/AuthenticatedInterface"; import "#elements/ak-locale-context/ak-locale-context"; import "#elements/banner/EnterpriseStatusBanner"; -import "#elements/banner/EnterpriseStatusBanner"; -import "#elements/banner/VersionBanner"; import "#elements/banner/VersionBanner"; import "#elements/messages/MessageContainer"; -import "#elements/messages/MessageContainer"; -import { WithCapabilitiesConfig } from "#elements/mixins/capabilities"; import "#elements/notifications/APIDrawer"; import "#elements/notifications/NotificationDrawer"; -import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; import "#elements/router/RouterOutlet"; import "#elements/sidebar/Sidebar"; import "#elements/sidebar/SidebarItem"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { EVENT_API_DRAWER_TOGGLE, EVENT_NOTIFICATION_DRAWER_TOGGLE } from "#common/constants"; +import { configureSentry } from "#common/sentry/index"; +import { me } from "#common/users"; +import { WebsocketClient } from "#common/ws"; + +import { AuthenticatedInterface } from "#elements/AuthenticatedInterface"; +import { WithCapabilitiesConfig } from "#elements/mixins/capabilities"; +import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; + +import { SidebarToggleEventDetail } from "#components/ak-page-header"; + +import type { AboutModal } from "#admin/AdminInterface/AboutModal"; +import { ROUTES } from "#admin/Routes"; + +import { CapabilitiesEnum, SessionUser, UiThemeEnum } from "@goauthentik/api"; + +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, eventOptions, property, query } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; @@ -32,8 +35,6 @@ import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { CapabilitiesEnum, SessionUser, UiThemeEnum } from "@goauthentik/api"; - import { AdminSidebarEnterpriseEntries, AdminSidebarEntries, diff --git a/web/src/admin/DebugPage.ts b/web/src/admin/DebugPage.ts index d5c9d9e1d2..105bfa68e0 100644 --- a/web/src/admin/DebugPage.ts +++ b/web/src/admin/DebugPage.ts @@ -1,12 +1,17 @@ +import "#components/ak-page-header"; + import { DEFAULT_CONFIG } from "#common/api/config"; import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; import { MessageLevel } from "#common/messages"; -import "#components/ak-page-header"; + import { AKElement } from "#elements/Base"; import { showMessage } from "#elements/messages/MessageContainer"; + +import { AdminApi } from "@goauthentik/api"; + import * as Sentry from "@sentry/browser"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -15,8 +20,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { AdminApi } from "@goauthentik/api"; - @customElement("ak-admin-debug-page") export class DebugPage extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/Routes.ts b/web/src/admin/Routes.ts index 88fb143ca3..76c251d5c6 100644 --- a/web/src/admin/Routes.ts +++ b/web/src/admin/Routes.ts @@ -1,5 +1,6 @@ -import "@goauthentik/admin/admin-overview/AdminOverviewPage"; -import { ID_REGEX, Route, SLUG_REGEX, UUID_REGEX } from "@goauthentik/elements/router/Route"; +import "#admin/admin-overview/AdminOverviewPage"; + +import { ID_REGEX, Route, SLUG_REGEX, UUID_REGEX } from "#elements/router/Route"; import { html } from "lit"; @@ -13,147 +14,147 @@ export const ROUTES: Route[] = [ return html``; }), new Route(new RegExp("^/administration/dashboard/users$"), async () => { - await import("@goauthentik/admin/admin-overview/DashboardUserPage"); + await import("#admin/admin-overview/DashboardUserPage"); return html``; }), new Route(new RegExp("^/administration/system-tasks$"), async () => { - await import("@goauthentik/admin/system-tasks/SystemTaskListPage"); + await import("#admin/system-tasks/SystemTaskListPage"); return html``; }), new Route(new RegExp("^/core/providers$"), async () => { - await import("@goauthentik/admin/providers/ProviderListPage"); + await import("#admin/providers/ProviderListPage"); return html``; }), new Route(new RegExp(`^/core/providers/(?${ID_REGEX})$`), async (args) => { - await import("@goauthentik/admin/providers/ProviderViewPage"); + await import("#admin/providers/ProviderViewPage"); return html``; }), new Route(new RegExp("^/core/applications$"), async () => { - await import("@goauthentik/admin/applications/ApplicationListPage"); + await import("#admin/applications/ApplicationListPage"); return html``; }), new Route(new RegExp(`^/core/applications/(?${SLUG_REGEX})$`), async (args) => { - await import("@goauthentik/admin/applications/ApplicationViewPage"); + await import("#admin/applications/ApplicationViewPage"); return html``; }), new Route(new RegExp("^/core/sources$"), async () => { - await import("@goauthentik/admin/sources/SourceListPage"); + await import("#admin/sources/SourceListPage"); return html``; }), new Route(new RegExp(`^/core/sources/(?${SLUG_REGEX})$`), async (args) => { - await import("@goauthentik/admin/sources/SourceViewPage"); + await import("#admin/sources/SourceViewPage"); return html``; }), new Route(new RegExp("^/core/property-mappings$"), async () => { - await import("@goauthentik/admin/property-mappings/PropertyMappingListPage"); + await import("#admin/property-mappings/PropertyMappingListPage"); return html``; }), new Route(new RegExp("^/core/tokens$"), async () => { - await import("@goauthentik/admin/tokens/TokenListPage"); + await import("#admin/tokens/TokenListPage"); return html``; }), new Route(new RegExp("^/core/brands"), async () => { - await import("@goauthentik/admin/brands/BrandListPage"); + await import("#admin/brands/BrandListPage"); return html``; }), new Route(new RegExp("^/policy/policies$"), async () => { - await import("@goauthentik/admin/policies/PolicyListPage"); + await import("#admin/policies/PolicyListPage"); return html``; }), new Route(new RegExp("^/policy/reputation$"), async () => { - await import("@goauthentik/admin/policies/reputation/ReputationListPage"); + await import("#admin/policies/reputation/ReputationListPage"); return html``; }), new Route(new RegExp("^/identity/groups$"), async () => { - await import("@goauthentik/admin/groups/GroupListPage"); + await import("#admin/groups/GroupListPage"); return html``; }), new Route(new RegExp(`^/identity/groups/(?${UUID_REGEX})$`), async (args) => { - await import("@goauthentik/admin/groups/GroupViewPage"); + await import("#admin/groups/GroupViewPage"); return html``; }), new Route(new RegExp("^/identity/users$"), async () => { - await import("@goauthentik/admin/users/UserListPage"); + await import("#admin/users/UserListPage"); return html``; }), new Route(new RegExp(`^/identity/users/(?${ID_REGEX})$`), async (args) => { - await import("@goauthentik/admin/users/UserViewPage"); + await import("#admin/users/UserViewPage"); return html``; }), new Route(new RegExp("^/identity/roles$"), async () => { - await import("@goauthentik/admin/roles/RoleListPage"); + await import("#admin/roles/RoleListPage"); return html``; }), new Route(new RegExp("^/identity/initial-permissions$"), async () => { - await import("@goauthentik/admin/rbac/InitialPermissionsListPage"); + await import("#admin/rbac/InitialPermissionsListPage"); return html``; }), new Route(new RegExp(`^/identity/roles/(?${UUID_REGEX})$`), async (args) => { - await import("@goauthentik/admin/roles/RoleViewPage"); + await import("#admin/roles/RoleViewPage"); return html``; }), new Route(new RegExp("^/flow/stages/invitations$"), async () => { - await import("@goauthentik/admin/stages/invitation/InvitationListPage"); + await import("#admin/stages/invitation/InvitationListPage"); return html``; }), new Route(new RegExp("^/flow/stages/prompts$"), async () => { - await import("@goauthentik/admin/stages/prompt/PromptListPage"); + await import("#admin/stages/prompt/PromptListPage"); return html``; }), new Route(new RegExp("^/flow/stages$"), async () => { - await import("@goauthentik/admin/stages/StageListPage"); + await import("#admin/stages/StageListPage"); return html``; }), new Route(new RegExp("^/flow/flows$"), async () => { - await import("@goauthentik/admin/flows/FlowListPage"); + await import("#admin/flows/FlowListPage"); return html``; }), new Route(new RegExp(`^/flow/flows/(?${SLUG_REGEX})$`), async (args) => { - await import("@goauthentik/admin/flows/FlowViewPage"); + await import("#admin/flows/FlowViewPage"); return html``; }), new Route(new RegExp("^/events/log$"), async () => { - await import("@goauthentik/admin/events/EventListPage"); + await import("#admin/events/EventListPage"); return html``; }), new Route(new RegExp(`^/events/log/(?${UUID_REGEX})$`), async (args) => { - await import("@goauthentik/admin/events/EventViewPage"); + await import("#admin/events/EventViewPage"); return html``; }), new Route(new RegExp("^/events/transports$"), async () => { - await import("@goauthentik/admin/events/TransportListPage"); + await import("#admin/events/TransportListPage"); return html``; }), new Route(new RegExp("^/events/rules$"), async () => { - await import("@goauthentik/admin/events/RuleListPage"); + await import("#admin/events/RuleListPage"); return html``; }), new Route(new RegExp("^/outpost/outposts$"), async () => { - await import("@goauthentik/admin/outposts/OutpostListPage"); + await import("#admin/outposts/OutpostListPage"); return html``; }), new Route(new RegExp("^/outpost/integrations$"), async () => { - await import("@goauthentik/admin/outposts/ServiceConnectionListPage"); + await import("#admin/outposts/ServiceConnectionListPage"); return html``; }), new Route(new RegExp("^/crypto/certificates$"), async () => { - await import("@goauthentik/admin/crypto/CertificateKeyPairListPage"); + await import("#admin/crypto/CertificateKeyPairListPage"); return html``; }), new Route(new RegExp("^/admin/settings$"), async () => { - await import("@goauthentik/admin/admin-settings/AdminSettingsPage"); + await import("#admin/admin-settings/AdminSettingsPage"); return html``; }), new Route(new RegExp("^/blueprints/instances$"), async () => { - await import("@goauthentik/admin/blueprints/BlueprintListPage"); + await import("#admin/blueprints/BlueprintListPage"); return html``; }), new Route(new RegExp("^/debug$"), async () => { - await import("@goauthentik/admin/DebugPage"); + await import("#admin/DebugPage"); return html``; }), new Route(new RegExp("^/enterprise/licenses$"), async () => { - await import("@goauthentik/admin/enterprise/EnterpriseLicenseListPage"); + await import("#admin/enterprise/EnterpriseLicenseListPage"); return html``; }), ]; diff --git a/web/src/admin/admin-overview/AdminOverviewPage.ts b/web/src/admin/admin-overview/AdminOverviewPage.ts index 005bc34f94..7a6068d51c 100644 --- a/web/src/admin/admin-overview/AdminOverviewPage.ts +++ b/web/src/admin/admin-overview/AdminOverviewPage.ts @@ -8,18 +8,22 @@ import "#admin/admin-overview/cards/WorkerStatusCard"; import "#admin/admin-overview/charts/AdminLoginAuthorizeChart"; import "#admin/admin-overview/charts/OutpostStatusChart"; import "#admin/admin-overview/charts/SyncStatusChart"; -import { me } from "#common/users"; import "#components/ak-page-header"; -import { AKElement } from "#elements/Base"; import "#elements/cards/AggregatePromiseCard"; -import type { QuickAction } from "#elements/cards/QuickActionsCard"; import "#elements/cards/QuickActionsCard"; + +import { me } from "#common/users"; + +import { AKElement } from "#elements/Base"; +import type { QuickAction } from "#elements/cards/QuickActionsCard"; import { WithLicenseSummary } from "#elements/mixins/license"; import { paramURL } from "#elements/router/RouterOutlet"; + +import { SessionUser } from "@goauthentik/api"; import { createReleaseNotesURL } from "@goauthentik/core/version"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; @@ -29,8 +33,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { SessionUser } from "@goauthentik/api"; - const AdminOverviewBase = WithLicenseSummary(AKElement); @customElement("ak-admin-overview") diff --git a/web/src/admin/admin-overview/DashboardUserPage.ts b/web/src/admin/admin-overview/DashboardUserPage.ts index 0d8a765628..0ffa3c8ae5 100644 --- a/web/src/admin/admin-overview/DashboardUserPage.ts +++ b/web/src/admin/admin-overview/DashboardUserPage.ts @@ -1,10 +1,13 @@ import "#admin/admin-overview/charts/AdminModelPerDay"; import "#components/ak-page-header"; -import { AKElement } from "#elements/Base"; import "#elements/cards/AggregatePromiseCard"; +import { AKElement } from "#elements/Base"; + +import { EventActions, EventsEventsVolumeListRequest } from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; @@ -13,8 +16,6 @@ import PFList from "@patternfly/patternfly/components/List/list.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; -import { EventActions, EventsEventsVolumeListRequest } from "@goauthentik/api"; - @customElement("ak-admin-dashboard-users") export class DashboardUserPage extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/admin-overview/TopApplicationsTable.ts b/web/src/admin/admin-overview/TopApplicationsTable.ts index 8937a3e04b..c947cf1a7a 100644 --- a/web/src/admin/admin-overview/TopApplicationsTable.ts +++ b/web/src/admin/admin-overview/TopApplicationsTable.ts @@ -1,15 +1,17 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Spinner"; +import "#elements/Spinner"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; + +import { EventsApi, EventTopPerUser } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFTable from "@patternfly/patternfly/components/Table/table.css"; -import { EventTopPerUser, EventsApi } from "@goauthentik/api"; - @customElement("ak-top-applications-table") export class TopApplicationsTable extends AKElement { @property({ attribute: false }) diff --git a/web/src/admin/admin-overview/cards/AdminStatusCard.ts b/web/src/admin/admin-overview/cards/AdminStatusCard.ts index 266c2ec73a..9f83d52849 100644 --- a/web/src/admin/admin-overview/cards/AdminStatusCard.ts +++ b/web/src/admin/admin-overview/cards/AdminStatusCard.ts @@ -1,14 +1,11 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { - APIError, - parseAPIResponseError, - pluckErrorDetail, -} from "@goauthentik/common/errors/network"; -import { AggregateCard } from "@goauthentik/elements/cards/AggregateCard"; +import { EVENT_REFRESH } from "#common/constants"; +import { PFSize } from "#common/enums"; +import { APIError, parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; + +import { AggregateCard } from "#elements/cards/AggregateCard"; import { msg } from "@lit/localize"; -import { PropertyValues, TemplateResult, html, nothing } from "lit"; +import { html, nothing, PropertyValues, TemplateResult } from "lit"; import { state } from "lit/decorators.js"; export interface AdminStatus { diff --git a/web/src/admin/admin-overview/cards/FipsStatusCard.ts b/web/src/admin/admin-overview/cards/FipsStatusCard.ts index 47f05e1a67..386ccb1e19 100644 --- a/web/src/admin/admin-overview/cards/FipsStatusCard.ts +++ b/web/src/admin/admin-overview/cards/FipsStatusCard.ts @@ -1,15 +1,13 @@ -import { - AdminStatus, - AdminStatusCard, -} from "@goauthentik/admin/admin-overview/cards/AdminStatusCard"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, state } from "lit/decorators.js"; +import { AdminStatus, AdminStatusCard } from "#admin/admin-overview/cards/AdminStatusCard"; import { AdminApi, SystemInfo } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; + type StatusContent = { icon: string; message: TemplateResult }; @customElement("ak-admin-fips-status-system") diff --git a/web/src/admin/admin-overview/cards/RecentEventsCard.ts b/web/src/admin/admin-overview/cards/RecentEventsCard.ts index bd2abbea45..13c2ab1b58 100644 --- a/web/src/admin/admin-overview/cards/RecentEventsCard.ts +++ b/web/src/admin/admin-overview/cards/RecentEventsCard.ts @@ -1,25 +1,27 @@ -import { EventGeo, renderEventUser } from "@goauthentik/admin/events/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EventWithContext } from "@goauthentik/common/events"; -import { actionToLabel } from "@goauthentik/common/labels"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-event-info"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/Dropdown"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; -import { SlottedTemplateResult } from "@goauthentik/elements/types"; +import "#components/ak-event-info"; +import "#elements/Tabs"; +import "#elements/buttons/Dropdown"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EventWithContext } from "#common/events"; +import { actionToLabel } from "#common/labels"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; +import { SlottedTemplateResult } from "#elements/types"; + +import { EventGeo, renderEventUser } from "#admin/events/utils"; + +import { Event, EventsApi } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import { Event, EventsApi } from "@goauthentik/api"; - @customElement("ak-recent-events") export class RecentEventsCard extends Table { @property() diff --git a/web/src/admin/admin-overview/cards/SystemStatusCard.ts b/web/src/admin/admin-overview/cards/SystemStatusCard.ts index 7b31c6168d..61a8951fd7 100644 --- a/web/src/admin/admin-overview/cards/SystemStatusCard.ts +++ b/web/src/admin/admin-overview/cards/SystemStatusCard.ts @@ -1,15 +1,13 @@ -import { - AdminStatus, - AdminStatusCard, -} from "@goauthentik/admin/admin-overview/cards/AdminStatusCard"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, state } from "lit/decorators.js"; +import { AdminStatus, AdminStatusCard } from "#admin/admin-overview/cards/AdminStatusCard"; import { AdminApi, OutpostsApi, SystemInfo } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; + @customElement("ak-admin-status-system") export class SystemStatusCard extends AdminStatusCard { now?: Date; diff --git a/web/src/admin/admin-overview/cards/VersionStatusCard.ts b/web/src/admin/admin-overview/cards/VersionStatusCard.ts index 804efd6cd6..b7f86fb4f5 100644 --- a/web/src/admin/admin-overview/cards/VersionStatusCard.ts +++ b/web/src/admin/admin-overview/cards/VersionStatusCard.ts @@ -1,15 +1,13 @@ -import { - AdminStatus, - AdminStatusCard, -} from "@goauthentik/admin/admin-overview/cards/AdminStatusCard"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { AdminStatus, AdminStatusCard } from "#admin/admin-overview/cards/AdminStatusCard"; import { AdminApi, Version } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-admin-status-version") export class VersionStatusCard extends AdminStatusCard { icon = "pf-icon pf-icon-bundle"; diff --git a/web/src/admin/admin-overview/cards/WorkerStatusCard.ts b/web/src/admin/admin-overview/cards/WorkerStatusCard.ts index ad158bc07e..6bcbdb9b25 100644 --- a/web/src/admin/admin-overview/cards/WorkerStatusCard.ts +++ b/web/src/admin/admin-overview/cards/WorkerStatusCard.ts @@ -1,15 +1,13 @@ -import { - AdminStatus, - AdminStatusCard, -} from "@goauthentik/admin/admin-overview/cards/AdminStatusCard"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { AdminStatus, AdminStatusCard } from "#admin/admin-overview/cards/AdminStatusCard"; import { AdminApi, Worker } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-admin-status-card-workers") export class WorkersStatusCard extends AdminStatusCard { icon = "pf-icon pf-icon-server"; diff --git a/web/src/admin/admin-overview/charts/AdminLoginAuthorizeChart.ts b/web/src/admin/admin-overview/charts/AdminLoginAuthorizeChart.ts index fdca98eb63..23cba7d5e5 100644 --- a/web/src/admin/admin-overview/charts/AdminLoginAuthorizeChart.ts +++ b/web/src/admin/admin-overview/charts/AdminLoginAuthorizeChart.ts @@ -1,12 +1,14 @@ +import { DEFAULT_CONFIG } from "#common/api/config"; + import { EventChart } from "#elements/charts/EventChart"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; + +import { EventActions, EventsApi, EventVolume } from "@goauthentik/api"; + import { ChartData, ChartDataset } from "chart.js"; import { msg } from "@lit/localize"; import { customElement } from "lit/decorators.js"; -import { EventActions, EventVolume, EventsApi } from "@goauthentik/api"; - @customElement("ak-charts-admin-login-authorization") export class AdminLoginAuthorizeChart extends EventChart { async apiRequest(): Promise { diff --git a/web/src/admin/admin-overview/charts/AdminModelPerDay.ts b/web/src/admin/admin-overview/charts/AdminModelPerDay.ts index f728a415f2..310a1149e3 100644 --- a/web/src/admin/admin-overview/charts/AdminModelPerDay.ts +++ b/web/src/admin/admin-overview/charts/AdminModelPerDay.ts @@ -1,17 +1,19 @@ +import { DEFAULT_CONFIG } from "#common/api/config"; + import { EventChart } from "#elements/charts/EventChart"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; + +import { + EventActions, + EventsApi, + EventsEventsVolumeListRequest, + EventVolume, +} from "@goauthentik/api"; + import { ChartData } from "chart.js"; import { msg } from "@lit/localize"; import { customElement, property } from "lit/decorators.js"; -import { - EventActions, - EventVolume, - EventsApi, - EventsEventsVolumeListRequest, -} from "@goauthentik/api"; - @customElement("ak-charts-admin-model-per-day") export class AdminModelPerDay extends EventChart { @property() diff --git a/web/src/admin/admin-overview/charts/OutpostStatusChart.ts b/web/src/admin/admin-overview/charts/OutpostStatusChart.ts index 1bee838288..a168e4adf6 100644 --- a/web/src/admin/admin-overview/charts/OutpostStatusChart.ts +++ b/web/src/admin/admin-overview/charts/OutpostStatusChart.ts @@ -1,15 +1,19 @@ +import "#elements/forms/ConfirmationForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKChart } from "#elements/charts/Chart"; import { actionToColor } from "#elements/charts/EventChart"; -import { SummarizedSyncStatus } from "@goauthentik/admin/admin-overview/charts/SyncStatusChart"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKChart } from "@goauthentik/elements/charts/Chart"; -import "@goauthentik/elements/forms/ConfirmationForm"; + +import { SummarizedSyncStatus } from "#admin/admin-overview/charts/SyncStatusChart"; + +import { EventActions, OutpostsApi } from "@goauthentik/api"; + import { ChartData, ChartOptions } from "chart.js"; import { msg } from "@lit/localize"; import { customElement } from "lit/decorators.js"; -import { EventActions, OutpostsApi } from "@goauthentik/api"; - @customElement("ak-admin-status-chart-outpost") export class OutpostStatusChart extends AKChart { getChartType(): string { diff --git a/web/src/admin/admin-overview/charts/SyncStatusChart.ts b/web/src/admin/admin-overview/charts/SyncStatusChart.ts index e864546fd1..19887358d0 100644 --- a/web/src/admin/admin-overview/charts/SyncStatusChart.ts +++ b/web/src/admin/admin-overview/charts/SyncStatusChart.ts @@ -1,12 +1,10 @@ -import { actionToColor } from "#elements/charts/EventChart"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKChart } from "@goauthentik/elements/charts/Chart"; -import "@goauthentik/elements/forms/ConfirmationForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { ChartData, ChartOptions } from "chart.js"; +import "#elements/forms/ConfirmationForm"; -import { msg } from "@lit/localize"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKChart } from "#elements/charts/Chart"; +import { actionToColor } from "#elements/charts/EventChart"; +import { PaginatedResponse } from "#elements/table/Table"; import { EventActions, @@ -16,6 +14,11 @@ import { SystemTaskStatusEnum, } from "@goauthentik/api"; +import { ChartData, ChartOptions } from "chart.js"; + +import { msg } from "@lit/localize"; +import { customElement } from "lit/decorators.js"; + export interface SummarizedSyncStatus { healthy: number; failed: number; diff --git a/web/src/admin/admin-settings/AdminSettingsFooterLinks.ts b/web/src/admin/admin-settings/AdminSettingsFooterLinks.ts index 5fd8e03d72..54324cee5c 100644 --- a/web/src/admin/admin-settings/AdminSettingsFooterLinks.ts +++ b/web/src/admin/admin-settings/AdminSettingsFooterLinks.ts @@ -1,5 +1,8 @@ -import { AkControlElement } from "@goauthentik/elements/AkControlElement.js"; -import { type Spread } from "@goauthentik/elements/types"; +import { AkControlElement } from "#elements/AkControlElement"; +import { type Spread } from "#elements/types"; + +import { FooterLink } from "@goauthentik/api"; + import { spread } from "@open-wc/lit-helpers"; import { msg } from "@lit/localize"; @@ -11,8 +14,6 @@ import PFFormControl from "@patternfly/patternfly/components/FormControl/form-co import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-group.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { FooterLink } from "@goauthentik/api"; - export interface IFooterLinkInput { footerLink: FooterLink; } diff --git a/web/src/admin/admin-settings/AdminSettingsForm.ts b/web/src/admin/admin-settings/AdminSettingsForm.ts index 3aeaae4114..8eeefadbc4 100644 --- a/web/src/admin/admin-settings/AdminSettingsForm.ts +++ b/web/src/admin/admin-settings/AdminSettingsForm.ts @@ -1,26 +1,28 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-number-input"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/elements/ak-array-input.js"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#components/ak-number-input"; +import "#components/ak-switch-input"; +import "#components/ak-text-input"; +import "#elements/ak-array-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; +import "./AdminSettingsFooterLinks.js"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { Form } from "#elements/forms/Form"; + +import { AdminApi, FooterLink, Settings, SettingsRequest } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import PFList from "@patternfly/patternfly/components/List/list.css"; -import { AdminApi, FooterLink, Settings, SettingsRequest } from "@goauthentik/api"; - -import "./AdminSettingsFooterLinks.js"; -import { IFooterLinkInput, akFooterLinkInput } from "./AdminSettingsFooterLinks.js"; +import { akFooterLinkInput, IFooterLinkInput } from "./AdminSettingsFooterLinks.js"; const DEFAULT_REPUTATION_LOWER_LIMIT = -5; const DEFAULT_REPUTATION_UPPER_LIMIT = 5; diff --git a/web/src/admin/admin-settings/AdminSettingsPage.ts b/web/src/admin/admin-settings/AdminSettingsPage.ts index 9693750a0c..3ea41d1e1e 100644 --- a/web/src/admin/admin-settings/AdminSettingsPage.ts +++ b/web/src/admin/admin-settings/AdminSettingsPage.ts @@ -1,9 +1,6 @@ import "#admin/admin-settings/AdminSettingsForm"; -import { AdminSettingsForm } from "#admin/admin-settings/AdminSettingsForm"; -import { DEFAULT_CONFIG } from "#common/api/config"; import "#components/ak-page-header"; import "#components/events/ObjectChangelog"; -import { AKElement } from "#elements/Base"; import "#elements/CodeMirror"; import "#elements/EmptyState"; import "#elements/Tabs"; @@ -11,6 +8,14 @@ import "#elements/buttons/ModalButton"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; import "#elements/forms/ModalForm"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; + +import { AdminSettingsForm } from "#admin/admin-settings/AdminSettingsForm"; + +import { AdminApi, Settings } from "@goauthentik/api"; + import { msg } from "@lit/localize"; import { html, nothing } from "lit"; import { customElement, query, state } from "lit/decorators.js"; @@ -26,8 +31,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { AdminApi, Settings } from "@goauthentik/api"; - @customElement("ak-admin-settings") export class AdminSettingsPage extends AKElement { static get styles() { diff --git a/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.stories.ts b/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.stories.ts index df78850c9a..54501be2ae 100644 --- a/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.stories.ts +++ b/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.stories.ts @@ -1,11 +1,12 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../AdminSettingsFooterLinks.js"; + import { Meta, StoryObj, WebComponentsRenderer } from "@storybook/web-components"; import { DecoratorFunction } from "storybook/internal/types"; import { html } from "lit"; import { FooterLinkInput } from "../AdminSettingsFooterLinks.js"; -import "../AdminSettingsFooterLinks.js"; // eslint-disable-next-line @typescript-eslint/no-explicit-any type Decorator = DecoratorFunction; diff --git a/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.test.ts b/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.test.ts index 59d97543a6..9b29d0b68d 100644 --- a/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.test.ts +++ b/web/src/admin/admin-settings/stories/AdminSettingsFooterLinks.test.ts @@ -1,10 +1,11 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../AdminSettingsFooterLinks.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../AdminSettingsFooterLinks.js"; - describe("ak-admin-settings-footer-link", () => { afterEach(async () => { await browser.execute(async () => { diff --git a/web/src/admin/applications/ApplicationAuthorizeChart.ts b/web/src/admin/applications/ApplicationAuthorizeChart.ts index 37de1b0e3f..04b12ffa11 100644 --- a/web/src/admin/applications/ApplicationAuthorizeChart.ts +++ b/web/src/admin/applications/ApplicationAuthorizeChart.ts @@ -1,12 +1,14 @@ +import { DEFAULT_CONFIG } from "#common/api/config"; + import { EventChart } from "#elements/charts/EventChart"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; + +import { EventActions, EventsApi, EventVolume } from "@goauthentik/api"; + import { ChartData } from "chart.js"; import { msg } from "@lit/localize"; import { customElement, property } from "lit/decorators.js"; -import { EventActions, EventVolume, EventsApi } from "@goauthentik/api"; - @customElement("ak-charts-application-authorize") export class ApplicationAuthorizeChart extends EventChart { @property({ attribute: "application-id" }) diff --git a/web/src/admin/applications/ApplicationCheckAccessForm.ts b/web/src/admin/applications/ApplicationCheckAccessForm.ts index a2799548d2..8e0c5ff227 100644 --- a/web/src/admin/applications/ApplicationCheckAccessForm.ts +++ b/web/src/admin/applications/ApplicationCheckAccessForm.ts @@ -1,15 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/events/LogViewer"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-status-label"; +import "#elements/events/LogViewer"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { Form } from "#elements/forms/Form"; import { Application, @@ -19,6 +15,12 @@ import { User, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; + @customElement("ak-application-check-access-form") export class ApplicationCheckAccessForm extends Form<{ forUser: number }> { @property({ attribute: false }) diff --git a/web/src/admin/applications/ApplicationForm.ts b/web/src/admin/applications/ApplicationForm.ts index 90d758de4f..85dba806bc 100644 --- a/web/src/admin/applications/ApplicationForm.ts +++ b/web/src/admin/applications/ApplicationForm.ts @@ -1,33 +1,35 @@ -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/admin/applications/ProviderSelectModal"; -import { iconHelperText } from "@goauthentik/admin/helperText"; -import { policyEngineModes } from "@goauthentik/admin/policies/PolicyEngineModes"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-file-input"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-slug-input"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/components/ak-textarea-input"; -import "@goauthentik/elements/Alert"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/ModalForm"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect/ak-search-select"; +import "#admin/applications/ProviderSelectModal"; +import "#components/ak-file-input"; +import "#components/ak-radio-input"; +import "#components/ak-slug-input"; +import "#components/ak-switch-input"; +import "#components/ak-text-input"; +import "#components/ak-textarea-input"; +import "#elements/Alert"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/ak-search-select"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import "./components/ak-backchannel-input.js"; +import "./components/ak-provider-search-input.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; + +import { iconHelperText } from "#admin/helperText"; +import { policyEngineModes } from "#admin/policies/PolicyEngineModes"; import { Application, CoreApi, Provider } from "@goauthentik/api"; -import "./components/ak-backchannel-input"; -import "./components/ak-provider-search-input"; +import { msg } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; @customElement("ak-application-form") export class ApplicationForm extends WithCapabilitiesConfig(ModelForm) { diff --git a/web/src/admin/applications/ApplicationListPage.ts b/web/src/admin/applications/ApplicationListPage.ts index 5e5a70c2c0..3de09ec272 100644 --- a/web/src/admin/applications/ApplicationListPage.ts +++ b/web/src/admin/applications/ApplicationListPage.ts @@ -1,29 +1,30 @@ import "#admin/applications/ApplicationForm"; -import { DEFAULT_CONFIG } from "#common/api/config"; import "#elements/AppIcon"; import "#elements/ak-mdx/ak-mdx"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; import "#elements/forms/DeleteBulkForm"; import "#elements/forms/ModalForm"; +import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import "./ApplicationWizardHint.js"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + import { WithBrandConfig } from "#elements/mixins/branding"; import { getURLParam } from "#elements/router/RouteMatch"; -import { PaginatedResponse } from "#elements/table/Table"; -import { TableColumn } from "#elements/table/Table"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; import { TablePage } from "#elements/table/TablePage"; -import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; + +import { Application, CoreApi, PoliciesApi } from "@goauthentik/api"; + import MDApplication from "~docs/add-secure-apps/applications/index.md"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import { Application, CoreApi, PoliciesApi } from "@goauthentik/api"; - -import "./ApplicationWizardHint.js"; - export const applicationListStyle = css` /* Fix alignment issues with images in tables */ .pf-c-table tbody > tr > * { diff --git a/web/src/admin/applications/ApplicationViewPage.ts b/web/src/admin/applications/ApplicationViewPage.ts index 5f810200cc..fd99a576e2 100644 --- a/web/src/admin/applications/ApplicationViewPage.ts +++ b/web/src/admin/applications/ApplicationViewPage.ts @@ -4,18 +4,27 @@ import "#admin/applications/ApplicationForm"; import "#admin/applications/entitlements/ApplicationEntitlementPage"; import "#admin/policies/BoundPoliciesList"; import "#admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "#common/api/config"; -import { PFSize } from "#common/enums"; import "#components/ak-page-header"; import "#components/events/ObjectChangelog"; import "#elements/AppIcon"; -import { AKElement } from "#elements/Base"; import "#elements/EmptyState"; import "#elements/Tabs"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; + +import { AKElement } from "#elements/Base"; + +import { + Application, + CoreApi, + OutpostsApi, + RbacPermissionsAssignedByUsersListModelEnum, +} from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -29,13 +38,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - Application, - CoreApi, - OutpostsApi, - RbacPermissionsAssignedByUsersListModelEnum, -} from "@goauthentik/api"; - @customElement("ak-application-view") export class ApplicationViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/applications/ApplicationWizardHint.ts b/web/src/admin/applications/ApplicationWizardHint.ts index 54b88279dc..3798af3b3f 100644 --- a/web/src/admin/applications/ApplicationWizardHint.ts +++ b/web/src/admin/applications/ApplicationWizardHint.ts @@ -1,14 +1,13 @@ -import "@goauthentik/admin/applications/wizard/ak-application-wizard"; -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"; -import "@goauthentik/elements/Label"; -import "@goauthentik/elements/buttons/ActionButton/ak-action-button"; -import { getURLParam } from "@goauthentik/elements/router/RouteMatch"; +import "#admin/applications/wizard/ak-application-wizard"; +import "#components/ak-hint/ak-hint"; +import "#components/ak-hint/ak-hint-body"; +import "#elements/Label"; +import "#elements/buttons/ActionButton/ak-action-button"; + +import { AKElement } from "#elements/Base"; +import { getURLParam } from "#elements/router/RouteMatch"; + +import { ShowHintController, ShowHintControllerHost } from "#components/ak-hint/ShowHintController"; import { msg } from "@lit/localize"; import { css, html } from "lit"; diff --git a/web/src/admin/applications/ProviderSelectModal.ts b/web/src/admin/applications/ProviderSelectModal.ts index b587fdd774..4e3ece3237 100644 --- a/web/src/admin/applications/ProviderSelectModal.ts +++ b/web/src/admin/applications/ProviderSelectModal.ts @@ -1,15 +1,16 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TableModal } from "@goauthentik/elements/table/TableModal"; +import "#elements/buttons/SpinnerButton/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TableModal } from "#elements/table/TableModal"; import { Provider, ProvidersApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-select-table") export class ProviderSelectModal extends TableModal { checkbox = true; diff --git a/web/src/admin/applications/components/ak-backchannel-input.ts b/web/src/admin/applications/components/ak-backchannel-input.ts index 48e1ed94fd..628ac053c2 100644 --- a/web/src/admin/applications/components/ak-backchannel-input.ts +++ b/web/src/admin/applications/components/ak-backchannel-input.ts @@ -1,15 +1,16 @@ -import "@goauthentik/admin/applications/ProviderSelectModal"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; +import "#admin/applications/ProviderSelectModal"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; -import { TemplateResult, html, nothing } from "lit"; +import { AKElement } from "#elements/Base"; + +import { Provider } from "@goauthentik/api"; + +import { html, nothing, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import { map } from "lit/directives/map.js"; -import { Provider } from "@goauthentik/api"; - @customElement("ak-backchannel-providers-input") export class AkBackchannelProvidersInput extends AKElement { // Render into the lightDOM. This effectively erases the shadowDOM nature of this component, but diff --git a/web/src/admin/applications/components/ak-provider-search-input.ts b/web/src/admin/applications/components/ak-provider-search-input.ts index 0b095bc002..35b66ea898 100644 --- a/web/src/admin/applications/components/ak-provider-search-input.ts +++ b/web/src/admin/applications/components/ak-provider-search-input.ts @@ -1,13 +1,15 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { AKElement } from "#elements/Base"; + +import { Provider, ProvidersAllListRequest, ProvidersApi } from "@goauthentik/api"; import { html, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { Provider, ProvidersAllListRequest, ProvidersApi } from "@goauthentik/api"; - const renderElement = (item: Provider) => item.name; const renderValue = (item: Provider | undefined) => item?.pk; const doGroupBy = (items: Provider[]) => groupBy(items, (item) => item.verboseName); diff --git a/web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts b/web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts index 3c105e9d9f..4c981a2240 100644 --- a/web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts +++ b/web/src/admin/applications/entitlements/ApplicationEntitlementForm.ts @@ -1,21 +1,23 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { ApplicationEntitlement, CoreApi } from "@goauthentik/api"; + import YAML from "yaml"; import { msg } from "@lit/localize"; -import { CSSResult } from "lit"; -import { TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import { ApplicationEntitlement, CoreApi } from "@goauthentik/api"; - @customElement("ak-application-entitlement-form") export class ApplicationEntitlementForm extends ModelForm { async loadInstance(pk: string): Promise { diff --git a/web/src/admin/applications/entitlements/ApplicationEntitlementPage.ts b/web/src/admin/applications/entitlements/ApplicationEntitlementPage.ts index 816b5306a6..7fbf585873 100644 --- a/web/src/admin/applications/entitlements/ApplicationEntitlementPage.ts +++ b/web/src/admin/applications/entitlements/ApplicationEntitlementPage.ts @@ -1,21 +1,18 @@ -import "@goauthentik/admin/applications/entitlements/ApplicationEntitlementForm"; -import "@goauthentik/admin/policies/BoundPoliciesList"; -import { PolicyBindingCheckTarget } from "@goauthentik/admin/policies/utils"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/applications/entitlements/ApplicationEntitlementForm"; +import "#admin/policies/BoundPoliciesList"; +import "#admin/rbac/ObjectPermissionModal"; +import "#components/ak-status-label"; +import "#elements/Tabs"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { PolicyBindingCheckTarget } from "#admin/policies/utils"; import { ApplicationEntitlement, @@ -23,6 +20,11 @@ import { RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-application-entitlements-list") export class ApplicationEntitlementsPage extends Table { @property() diff --git a/web/src/admin/applications/wizard/ApplicationWizardStep.ts b/web/src/admin/applications/wizard/ApplicationWizardStep.ts index 9f9e2b61ca..2d9c14ffc1 100644 --- a/web/src/admin/applications/wizard/ApplicationWizardStep.ts +++ b/web/src/admin/applications/wizard/ApplicationWizardStep.ts @@ -1,23 +1,25 @@ -import { styles } from "#admin/applications/wizard/ApplicationWizardFormStepStyles.styles"; -import { WizardStep } from "@goauthentik/components/ak-wizard/WizardStep.js"; +import { KeyUnknown, serializeForm } from "#elements/forms/Form"; +import { HorizontalFormElement } from "#elements/forms/HorizontalFormElement"; + import { NavigationEventInit, WizardNavigationEvent, WizardUpdateEvent, -} from "@goauthentik/components/ak-wizard/events"; -import { KeyUnknown, serializeForm } from "@goauthentik/elements/forms/Form"; -import { HorizontalFormElement } from "@goauthentik/elements/forms/HorizontalFormElement"; +} from "#components/ak-wizard/events"; +import { WizardStep } from "#components/ak-wizard/WizardStep"; + +import { styles } from "#admin/applications/wizard/ApplicationWizardFormStepStyles.styles"; + +import { ValidationError } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { property, query } from "lit/decorators.js"; -import { ValidationError } from "@goauthentik/api"; - import { ApplicationTransactionValidationError, type ApplicationWizardState, type ApplicationWizardStateUpdate, -} from "./types"; +} from "./types.js"; export class ApplicationWizardStep extends WizardStep { static get styles() { diff --git a/web/src/admin/applications/wizard/ak-application-wizard-main.ts b/web/src/admin/applications/wizard/ak-application-wizard-main.ts index 2a0c817379..6018002342 100644 --- a/web/src/admin/applications/wizard/ak-application-wizard-main.ts +++ b/web/src/admin/applications/wizard/ak-application-wizard-main.ts @@ -1,23 +1,26 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-wizard/ak-wizard-steps.js"; -import { WizardUpdateEvent } from "@goauthentik/components/ak-wizard/events"; -import { AKElement } from "@goauthentik/elements/Base.js"; - -import { ContextProvider } from "@lit/context"; -import { html } from "lit"; -import { customElement, state } from "lit/decorators.js"; - -import { ProvidersApi, ProxyMode } from "@goauthentik/api"; - -import { applicationWizardProvidersContext } from "./ContextIdentity"; -import { providerTypeRenderers } from "./steps/ProviderChoices.js"; +import "#components/ak-wizard/ak-wizard-steps"; import "./steps/ak-application-wizard-application-step.js"; import "./steps/ak-application-wizard-bindings-step.js"; import "./steps/ak-application-wizard-edit-binding-step.js"; import "./steps/ak-application-wizard-provider-choice-step.js"; import "./steps/ak-application-wizard-provider-step.js"; import "./steps/ak-application-wizard-submit-step.js"; -import { type ApplicationWizardState, type ApplicationWizardStateUpdate } from "./types"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; + +import { WizardUpdateEvent } from "#components/ak-wizard/events"; + +import { ProvidersApi, ProxyMode } from "@goauthentik/api"; + +import { ContextProvider } from "@lit/context"; +import { html } from "lit"; +import { customElement, state } from "lit/decorators.js"; + +import { applicationWizardProvidersContext } from "./ContextIdentity.js"; +import { providerTypeRenderers } from "./steps/ProviderChoices.js"; +import { type ApplicationWizardState, type ApplicationWizardStateUpdate } from "./types.js"; const freshWizardState = (): ApplicationWizardState => ({ providerModel: "", diff --git a/web/src/admin/applications/wizard/ak-application-wizard.ts b/web/src/admin/applications/wizard/ak-application-wizard.ts index 6302d63934..7bf4e90523 100644 --- a/web/src/admin/applications/wizard/ak-application-wizard.ts +++ b/web/src/admin/applications/wizard/ak-application-wizard.ts @@ -1,12 +1,13 @@ -import { WizardCloseEvent } from "@goauthentik/components/ak-wizard/events.js"; -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; -import { bound } from "@goauthentik/elements/decorators/bound.js"; +import "./ak-application-wizard-main.js"; + +import { ModalButton } from "#elements/buttons/ModalButton"; +import { bound } from "#elements/decorators/bound"; + +import { WizardCloseEvent } from "#components/ak-wizard/events"; import { html } from "lit"; import { customElement } from "lit/decorators.js"; -import "./ak-application-wizard-main.js"; - @customElement("ak-application-wizard") export class AkApplicationWizard extends ModalButton { constructor() { diff --git a/web/src/admin/applications/wizard/ak-wizard-title.ts b/web/src/admin/applications/wizard/ak-wizard-title.ts index 6b2c2dc661..02fda4fec9 100644 --- a/web/src/admin/applications/wizard/ak-wizard-title.ts +++ b/web/src/admin/applications/wizard/ak-wizard-title.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { css, html } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/admin/applications/wizard/steps/ProviderChoices.ts b/web/src/admin/applications/wizard/steps/ProviderChoices.ts index 86a563765a..e11a0a3f11 100644 --- a/web/src/admin/applications/wizard/steps/ProviderChoices.ts +++ b/web/src/admin/applications/wizard/steps/ProviderChoices.ts @@ -1,9 +1,9 @@ -import "@goauthentik/admin/common/ak-license-notice"; - -import { TemplateResult, html } from "lit"; +import "#admin/common/ak-license-notice"; import type { TypeCreate } from "@goauthentik/api"; +import { html, TemplateResult } from "lit"; + type ProviderRenderer = () => TemplateResult; export type LocalTypeCreate = TypeCreate & { diff --git a/web/src/admin/applications/wizard/steps/SubmitStepOverviewRenderers.ts b/web/src/admin/applications/wizard/steps/SubmitStepOverviewRenderers.ts index f519034b7a..48ec22cfa2 100644 --- a/web/src/admin/applications/wizard/steps/SubmitStepOverviewRenderers.ts +++ b/web/src/admin/applications/wizard/steps/SubmitStepOverviewRenderers.ts @@ -1,11 +1,4 @@ -import { - type DescriptionPair, - renderDescriptionList, -} from "@goauthentik/components/DescriptionList.js"; -import { match } from "ts-pattern"; - -import { msg } from "@lit/localize"; -import { html } from "lit"; +import { type DescriptionPair, renderDescriptionList } from "#components/DescriptionList"; import { ClientTypeEnum, @@ -22,6 +15,11 @@ import { SCIMProvider, } from "@goauthentik/api"; +import { match } from "ts-pattern"; + +import { msg } from "@lit/localize"; +import { html } from "lit"; + import { OneOfProvider } from "../types.js"; const renderSummary = (type: string, name: string, fields: DescriptionPair[]) => diff --git a/web/src/admin/applications/wizard/steps/ak-application-wizard-application-step.ts b/web/src/admin/applications/wizard/steps/ak-application-wizard-application-step.ts index 39633637ea..bfdfcf5b36 100644 --- a/web/src/admin/applications/wizard/steps/ak-application-wizard-application-step.ts +++ b/web/src/admin/applications/wizard/steps/ak-application-wizard-application-step.ts @@ -1,25 +1,29 @@ -import { ApplicationWizardStep } from "@goauthentik/admin/applications/wizard/ApplicationWizardStep.js"; -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { policyEngineModes } from "@goauthentik/admin/policies/PolicyEngineModes"; -import { camelToSnake } from "@goauthentik/common/utils.js"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-slug-input"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/components/ak-text-input"; -import { type NavigableButton, type WizardButton } from "@goauthentik/components/ak-wizard/types"; -import { type KeyUnknown } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { isSlug } from "@goauthentik/elements/router/utils.js"; +import "#admin/applications/wizard/ak-wizard-title"; +import "#components/ak-radio-input"; +import "#components/ak-slug-input"; +import "#components/ak-switch-input"; +import "#components/ak-text-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; + +import { camelToSnake } from "#common/utils"; + +import { type KeyUnknown } from "#elements/forms/Form"; +import { isSlug } from "#elements/router/utils"; + +import { type NavigableButton, type WizardButton } from "#components/ak-wizard/types"; + +import { ApplicationWizardStep } from "#admin/applications/wizard/ApplicationWizardStep"; +import { policyEngineModes } from "#admin/policies/PolicyEngineModes"; + +import { type ApplicationRequest } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html } from "lit"; import { customElement, query, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { type ApplicationRequest } from "@goauthentik/api"; - -import { ApplicationWizardStateUpdate, ValidationRecord } from "../types"; +import { ApplicationWizardStateUpdate, ValidationRecord } from "../types.js"; const autoTrim = (v: unknown) => (typeof v === "string" ? v.trim() : v); diff --git a/web/src/admin/applications/wizard/steps/ak-application-wizard-bindings-step.ts b/web/src/admin/applications/wizard/steps/ak-application-wizard-bindings-step.ts index 877f0d2ff3..dd15d2d616 100644 --- a/web/src/admin/applications/wizard/steps/ak-application-wizard-bindings-step.ts +++ b/web/src/admin/applications/wizard/steps/ak-application-wizard-bindings-step.ts @@ -1,16 +1,21 @@ -import { ApplicationWizardStep } from "@goauthentik/admin/applications/wizard/ApplicationWizardStep.js"; -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-slug-input"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/components/ak-text-input"; -import { type WizardButton } from "@goauthentik/components/ak-wizard/types"; -import "@goauthentik/elements/ak-table/ak-select-table.js"; -import { SelectTable } from "@goauthentik/elements/ak-table/ak-select-table.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { P, match } from "ts-pattern"; +import "#admin/applications/wizard/ak-wizard-title"; +import "#components/ak-radio-input"; +import "#components/ak-slug-input"; +import "#components/ak-status-label"; +import "#components/ak-switch-input"; +import "#components/ak-text-input"; +import "#elements/ak-table/ak-select-table"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "./bindings/ak-application-wizard-bindings-toolbar.js"; + +import { SelectTable } from "#elements/ak-table/ak-select-table"; + +import { type WizardButton } from "#components/ak-wizard/types"; + +import { ApplicationWizardStep } from "#admin/applications/wizard/ApplicationWizardStep"; + +import { match, P } from "ts-pattern"; import { msg, str } from "@lit/localize"; import { css, html } from "lit"; @@ -19,7 +24,6 @@ import { customElement, query } from "lit/decorators.js"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import { makeEditButton } from "./bindings/ak-application-wizard-bindings-edit-button.js"; -import "./bindings/ak-application-wizard-bindings-toolbar.js"; const COLUMNS = [ [msg("Order"), "order"], diff --git a/web/src/admin/applications/wizard/steps/ak-application-wizard-edit-binding-step.ts b/web/src/admin/applications/wizard/steps/ak-application-wizard-edit-binding-step.ts index 70e761354f..3ef7afcee0 100644 --- a/web/src/admin/applications/wizard/steps/ak-application-wizard-edit-binding-step.ts +++ b/web/src/admin/applications/wizard/steps/ak-application-wizard-edit-binding-step.ts @@ -1,24 +1,28 @@ -import { ApplicationWizardStep } from "@goauthentik/admin/applications/wizard/ApplicationWizardStep.js"; -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/components/ak-toggle-group"; -import { type NavigableButton, type WizardButton } from "@goauthentik/components/ak-wizard/types"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; -import { type SearchSelectBase } from "@goauthentik/elements/forms/SearchSelect/SearchSelect.js"; -import "@goauthentik/elements/forms/SearchSelect/ak-search-select-ez.js"; +import "#admin/applications/wizard/ak-wizard-title"; +import "#components/ak-radio-input"; +import "#components/ak-switch-input"; +import "#components/ak-text-input"; +import "#components/ak-toggle-group"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; +import "#elements/forms/SearchSelect/ak-search-select-ez"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { type SearchSelectBase } from "#elements/forms/SearchSelect/SearchSelect"; + +import { type NavigableButton, type WizardButton } from "#components/ak-wizard/types"; + +import { ApplicationWizardStep } from "#admin/applications/wizard/ApplicationWizardStep"; + +import { CoreApi, Group, PoliciesApi, Policy, PolicyBinding, User } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; import { customElement, query, state } from "lit/decorators.js"; -import { CoreApi, Group, PoliciesApi, Policy, PolicyBinding, User } from "@goauthentik/api"; - const withQuery = (search: string | undefined, args: T) => (search ? { ...args, search } : args); enum target { diff --git a/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-choice-step.ts b/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-choice-step.ts index 5ee492ad63..d4e85959f4 100644 --- a/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-choice-step.ts +++ b/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-choice-step.ts @@ -1,22 +1,25 @@ +import "#admin/applications/wizard/ak-wizard-title"; +import "#elements/EmptyState"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/wizard/TypeCreateWizardPage"; + +import { bound } from "#elements/decorators/bound"; import { WithLicenseSummary } from "#elements/mixins/license"; -import { ApplicationWizardStep } from "@goauthentik/admin/applications/wizard/ApplicationWizardStep.js"; -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import type { NavigableButton, WizardButton } from "@goauthentik/components/ak-wizard/types"; -import "@goauthentik/elements/EmptyState.js"; -import { bound } from "@goauthentik/elements/decorators/bound.js"; -import "@goauthentik/elements/forms/FormGroup.js"; -import "@goauthentik/elements/forms/HorizontalFormElement.js"; -import { TypeCreateWizardPageLayouts } from "@goauthentik/elements/wizard/TypeCreateWizardPage.js"; -import "@goauthentik/elements/wizard/TypeCreateWizardPage.js"; +import { TypeCreateWizardPageLayouts } from "#elements/wizard/TypeCreateWizardPage"; + +import type { NavigableButton, WizardButton } from "#components/ak-wizard/types"; + +import { ApplicationWizardStep } from "#admin/applications/wizard/ApplicationWizardStep"; + +import { TypeCreate } from "@goauthentik/api"; import { consume } from "@lit/context"; import { msg } from "@lit/localize"; import { html } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { TypeCreate } from "@goauthentik/api"; - -import { applicationWizardProvidersContext } from "../ContextIdentity"; +import { applicationWizardProvidersContext } from "../ContextIdentity.js"; import { type LocalTypeCreate } from "./ProviderChoices.js"; @customElement("ak-application-wizard-provider-choice-step") diff --git a/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-step.ts b/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-step.ts index d7cab22b5a..014c88dbcb 100644 --- a/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-step.ts +++ b/web/src/admin/applications/wizard/steps/ak-application-wizard-provider-step.ts @@ -1,13 +1,3 @@ -import { type NavigableButton, type WizardButton } from "@goauthentik/components/ak-wizard/types"; - -import { msg } from "@lit/localize"; -import { PropertyValues, nothing } from "lit"; -import { customElement, query, state } from "lit/decorators.js"; -import { html, unsafeStatic } from "lit/static-html.js"; - -import { ApplicationWizardStep } from "../ApplicationWizardStep.js"; -import { OneOfProvider } from "../types.js"; -import { ApplicationWizardProviderForm } from "./providers/ApplicationWizardProviderForm.js"; import "./providers/ak-application-wizard-provider-for-ldap.js"; import "./providers/ak-application-wizard-provider-for-oauth.js"; import "./providers/ak-application-wizard-provider-for-proxy.js"; @@ -16,6 +6,17 @@ import "./providers/ak-application-wizard-provider-for-radius.js"; import "./providers/ak-application-wizard-provider-for-saml.js"; import "./providers/ak-application-wizard-provider-for-scim.js"; +import { type NavigableButton, type WizardButton } from "#components/ak-wizard/types"; + +import { msg } from "@lit/localize"; +import { nothing, PropertyValues } from "lit"; +import { customElement, query, state } from "lit/decorators.js"; +import { html, unsafeStatic } from "lit/static-html.js"; + +import { ApplicationWizardStep } from "../ApplicationWizardStep.js"; +import { OneOfProvider } from "../types.js"; +import { ApplicationWizardProviderForm } from "./providers/ApplicationWizardProviderForm.js"; + const providerToTag = new Map([ ["ldapprovider", "ak-application-wizard-provider-for-ldap"], ["oauth2provider", "ak-application-wizard-provider-for-oauth"], diff --git a/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts b/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts index 2ca5e6b5d3..84a748d58a 100644 --- a/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts +++ b/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts @@ -1,15 +1,33 @@ -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { parseAPIResponseError } from "@goauthentik/common/errors/network"; -import { WizardNavigationEvent } from "@goauthentik/components/ak-wizard/events.js"; -import { type WizardButton } from "@goauthentik/components/ak-wizard/types"; -import { showAPIErrorMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; -import { P, match } from "ts-pattern"; +import "#admin/applications/wizard/ak-wizard-title"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { parseAPIResponseError } from "#common/errors/network"; + +import { showAPIErrorMessage } from "#elements/messages/MessageContainer"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; + +import { WizardNavigationEvent } from "#components/ak-wizard/events"; +import { type WizardButton } from "#components/ak-wizard/types"; + +import { + type ApplicationRequest, + CoreApi, + instanceOfValidationError, + type ModelRequest, + type PolicyBinding, + ProviderModelEnum, + ProxyMode, + type ProxyProviderRequest, + type TransactionApplicationRequest, + type TransactionApplicationResponse, + type TransactionPolicyBindingRequest, +} from "@goauthentik/api"; + +import { match, P } from "ts-pattern"; import { msg } from "@lit/localize"; -import { TemplateResult, css, html, nothing } from "lit"; +import { css, html, nothing, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; @@ -20,22 +38,8 @@ import PFProgressStepper from "@patternfly/patternfly/components/ProgressStepper import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; -import { - type ApplicationRequest, - CoreApi, - type ModelRequest, - type PolicyBinding, - ProviderModelEnum, - ProxyMode, - type ProxyProviderRequest, - type TransactionApplicationRequest, - type TransactionApplicationResponse, - type TransactionPolicyBindingRequest, - instanceOfValidationError, -} from "@goauthentik/api"; - import { ApplicationWizardStep } from "../ApplicationWizardStep.js"; -import { OneOfProvider, isApplicationTransactionValidationError } from "../types.js"; +import { isApplicationTransactionValidationError, OneOfProvider } from "../types.js"; import { providerRenderers } from "./SubmitStepOverviewRenderers.js"; const _submitStates = ["reviewing", "running", "submitted"] as const; diff --git a/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-edit-button.ts b/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-edit-button.ts index cf4ddfd0ab..00bb35e7a5 100644 --- a/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-edit-button.ts +++ b/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-edit-button.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/elements/Base.js"; -import { bound } from "@goauthentik/elements/decorators/bound.js"; +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; import { msg } from "@lit/localize"; import { html } from "lit"; diff --git a/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-toolbar.ts b/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-toolbar.ts index 6cfbbbb789..74dcbf2991 100644 --- a/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-toolbar.ts +++ b/web/src/admin/applications/wizard/steps/bindings/ak-application-wizard-bindings-toolbar.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; import { html } from "lit"; diff --git a/web/src/admin/applications/wizard/steps/providers/ApplicationWizardProviderForm.ts b/web/src/admin/applications/wizard/steps/providers/ApplicationWizardProviderForm.ts index 535c2162ab..c704db0293 100644 --- a/web/src/admin/applications/wizard/steps/providers/ApplicationWizardProviderForm.ts +++ b/web/src/admin/applications/wizard/steps/providers/ApplicationWizardProviderForm.ts @@ -1,13 +1,15 @@ -import { camelToSnake } from "@goauthentik/common/utils.js"; -import "@goauthentik/components/ak-number-input"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/components/ak-text-input"; -import { AKElement } from "@goauthentik/elements/Base.js"; -import { KeyUnknown, serializeForm } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { HorizontalFormElement } from "@goauthentik/elements/forms/HorizontalFormElement"; +import "#components/ak-number-input"; +import "#components/ak-radio-input"; +import "#components/ak-switch-input"; +import "#components/ak-text-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; + +import { camelToSnake } from "#common/utils"; + +import { AKElement } from "#elements/Base"; +import { KeyUnknown, serializeForm } from "#elements/forms/Form"; +import { HorizontalFormElement } from "#elements/forms/HorizontalFormElement"; import { property, query } from "lit/decorators.js"; diff --git a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-ldap.ts b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-ldap.ts index fbde2a86cb..ae63625977 100644 --- a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-ldap.ts +++ b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-ldap.ts @@ -1,14 +1,16 @@ +import "#admin/applications/wizard/ak-wizard-title"; + import { WithBrandConfig } from "#elements/mixins/branding"; -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { ValidationRecord } from "@goauthentik/admin/applications/wizard/types"; -import { renderForm } from "@goauthentik/admin/providers/ldap/LDAPProviderFormForm.js"; + +import { ValidationRecord } from "#admin/applications/wizard/types"; +import { renderForm } from "#admin/providers/ldap/LDAPProviderFormForm"; + +import type { LDAPProvider } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html } from "lit"; import { customElement } from "lit/decorators.js"; -import type { LDAPProvider } from "@goauthentik/api"; - import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm.js"; @customElement("ak-application-wizard-provider-for-ldap") diff --git a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-oauth.ts b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-oauth.ts index 4b23e93950..19f298e649 100644 --- a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-oauth.ts +++ b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-oauth.ts @@ -1,14 +1,20 @@ -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { renderForm } from "@goauthentik/admin/providers/oauth2/OAuth2ProviderFormForm.js"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import "#admin/applications/wizard/ak-wizard-title"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { renderForm } from "#admin/providers/oauth2/OAuth2ProviderFormForm"; + +import { + type OAuth2Provider, + OAuth2ProviderRequest, + type PaginatedOAuthSourceList, + SourcesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { OAuth2ProviderRequest, SourcesApi } from "@goauthentik/api"; -import { type OAuth2Provider, type PaginatedOAuthSourceList } from "@goauthentik/api"; - import { ApplicationTransactionValidationError } from "../../types.js"; import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm.js"; diff --git a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-proxy.ts b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-proxy.ts index cb4374f388..3980067db5 100644 --- a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-proxy.ts +++ b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-proxy.ts @@ -1,20 +1,22 @@ -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { ValidationRecord } from "@goauthentik/admin/applications/wizard/types"; +import "#admin/applications/wizard/ak-wizard-title"; + +import { WizardUpdateEvent } from "#components/ak-wizard/events"; + +import { ValidationRecord } from "#admin/applications/wizard/types"; import { ProxyModeValue, + renderForm, type SetMode, type SetShowHttpBasic, - renderForm, -} from "@goauthentik/admin/providers/proxy/ProxyProviderFormForm.js"; -import { WizardUpdateEvent } from "@goauthentik/components/ak-wizard/events.js"; +} from "#admin/providers/proxy/ProxyProviderFormForm"; + +import { ProxyMode, ProxyProvider } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { ProxyMode, ProxyProvider } from "@goauthentik/api"; - -import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm"; +import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm.js"; @customElement("ak-application-wizard-provider-for-proxy") export class ApplicationWizardProxyProviderForm extends ApplicationWizardProviderForm { diff --git a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-rac.ts b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-rac.ts index 60ec8a6065..c66253e24b 100644 --- a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-rac.ts +++ b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-rac.ts @@ -1,21 +1,22 @@ -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import "@goauthentik/admin/common/ak-crypto-certificate-search.js"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; +import "#admin/applications/wizard/ak-wizard-title"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#components/ak-text-input"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; + import { propertyMappingsProvider, propertyMappingsSelector, -} from "@goauthentik/admin/providers/rac/RACProviderFormHelpers.js"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; +} from "#admin/providers/rac/RACProviderFormHelpers"; + +import { FlowsInstancesListDesignationEnum, type RACProvider } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { FlowsInstancesListDesignationEnum, type RACProvider } from "@goauthentik/api"; - import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm.js"; @customElement("ak-application-wizard-provider-for-rac") diff --git a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-radius.ts b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-radius.ts index 5c045a2132..de71220c4e 100644 --- a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-radius.ts +++ b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-radius.ts @@ -1,14 +1,16 @@ +import "#admin/applications/wizard/ak-wizard-title"; + import { WithBrandConfig } from "#elements/mixins/branding"; -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { ValidationRecord } from "@goauthentik/admin/applications/wizard/types"; -import { renderForm } from "@goauthentik/admin/providers/radius/RadiusProviderFormForm.js"; + +import { ValidationRecord } from "#admin/applications/wizard/types"; +import { renderForm } from "#admin/providers/radius/RadiusProviderFormForm"; + +import { RadiusProvider } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators.js"; import { html } from "lit"; -import { RadiusProvider } from "@goauthentik/api"; - import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm.js"; @customElement("ak-application-wizard-provider-for-radius") diff --git a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-saml.ts b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-saml.ts index 0e2a3845c8..2c738c4ba5 100644 --- a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-saml.ts +++ b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-saml.ts @@ -1,15 +1,16 @@ -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { type AkCryptoCertificateSearch } from "@goauthentik/admin/common/ak-crypto-certificate-search"; -import { renderForm } from "@goauthentik/admin/providers/saml/SAMLProviderFormForm.js"; -import "@goauthentik/elements/forms/FormGroup"; +import "#admin/applications/wizard/ak-wizard-title"; +import "#elements/forms/FormGroup"; + +import { type AkCryptoCertificateSearch } from "#admin/common/ak-crypto-certificate-search"; +import { renderForm } from "#admin/providers/saml/SAMLProviderFormForm"; + +import { SAMLProvider } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { customElement, state } from "@lit/reactive-element/decorators.js"; import { html } from "lit"; -import { SAMLProvider } from "@goauthentik/api"; - -import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm"; +import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm.js"; @customElement("ak-application-wizard-provider-for-saml") export class ApplicationWizardProviderSamlForm extends ApplicationWizardProviderForm { diff --git a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-scim.ts b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-scim.ts index ab70045cc9..405777c46c 100644 --- a/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-scim.ts +++ b/web/src/admin/applications/wizard/steps/providers/ak-application-wizard-provider-for-scim.ts @@ -1,14 +1,15 @@ -import "@goauthentik/admin/applications/wizard/ak-wizard-title.js"; -import { renderForm } from "@goauthentik/admin/providers/scim/SCIMProviderFormForm.js"; -import "@goauthentik/elements/forms/FormGroup"; +import "#admin/applications/wizard/ak-wizard-title"; +import "#elements/forms/FormGroup"; + +import { renderForm } from "#admin/providers/scim/SCIMProviderFormForm"; + +import { PaginatedSCIMMappingList, type SCIMProvider } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { customElement, state } from "@lit/reactive-element/decorators.js"; import { html } from "lit"; -import { PaginatedSCIMMappingList, type SCIMProvider } from "@goauthentik/api"; - -import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm"; +import { ApplicationWizardProviderForm } from "./ApplicationWizardProviderForm.js"; @customElement("ak-application-wizard-provider-for-scim") export class ApplicationWizardSCIMProvider extends ApplicationWizardProviderForm { diff --git a/web/src/admin/blueprints/BlueprintForm.ts b/web/src/admin/blueprints/BlueprintForm.ts index 559e30161a..f53960bd5b 100644 --- a/web/src/admin/blueprints/BlueprintForm.ts +++ b/web/src/admin/blueprints/BlueprintForm.ts @@ -1,23 +1,26 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { docLink } from "@goauthentik/common/global"; -import "@goauthentik/components/ak-toggle-group"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-toggle-group"; +import "#elements/CodeMirror"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { docLink } from "#common/global"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { BlueprintFile, BlueprintInstance, ManagedApi } from "@goauthentik/api"; + import YAML from "yaml"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import { BlueprintFile, BlueprintInstance, ManagedApi } from "@goauthentik/api"; - enum blueprintSource { file = "file", oci = "oci", diff --git a/web/src/admin/blueprints/BlueprintListPage.ts b/web/src/admin/blueprints/BlueprintListPage.ts index ff8d1f9b94..00dcaae660 100644 --- a/web/src/admin/blueprints/BlueprintListPage.ts +++ b/web/src/admin/blueprints/BlueprintListPage.ts @@ -1,23 +1,18 @@ -import "@goauthentik/admin/blueprints/BlueprintForm"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/blueprints/BlueprintForm"; +import "#admin/rbac/ObjectPermissionModal"; +import "#components/ak-status-label"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { formatElapsedTime } from "#common/temporal"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { BlueprintInstance, @@ -26,6 +21,12 @@ import { RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; + export function BlueprintStatus(blueprint?: BlueprintInstance): string { if (!blueprint) return ""; switch (blueprint.status) { diff --git a/web/src/admin/brands/BrandForm.ts b/web/src/admin/brands/BrandForm.ts index 26f07e15e5..a7c1a06980 100644 --- a/web/src/admin/brands/BrandForm.ts +++ b/web/src/admin/brands/BrandForm.ts @@ -1,21 +1,19 @@ -import { certificateProvider, certificateSelector } from "@goauthentik/admin/brands/Certificates"; -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DefaultBrand } from "@goauthentik/common/ui/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; -import YAML from "yaml"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { DefaultBrand } from "#common/ui/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { certificateProvider, certificateSelector } from "#admin/brands/Certificates"; import { Application, @@ -25,6 +23,12 @@ import { FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; +import YAML from "yaml"; + +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-brand-form") export class BrandForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/brands/BrandListPage.ts b/web/src/admin/brands/BrandListPage.ts index f7d1a7d8b2..04f84af5ce 100644 --- a/web/src/admin/brands/BrandListPage.ts +++ b/web/src/admin/brands/BrandListPage.ts @@ -1,22 +1,22 @@ -import "@goauthentik/admin/brands/BrandForm"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/brands/BrandForm"; +import "#admin/rbac/ObjectPermissionModal"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { Brand, CoreApi, RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-brand-list") export class BrandListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/brands/Certificates.ts b/web/src/admin/brands/Certificates.ts index 496d37463d..4a79a1a68d 100644 --- a/web/src/admin/brands/Certificates.ts +++ b/web/src/admin/brands/Certificates.ts @@ -1,4 +1,5 @@ import { DEFAULT_CONFIG } from "#common/api/config"; + import { DataProvision, DualSelectPair, diff --git a/web/src/admin/common/ak-core-group-search.ts b/web/src/admin/common/ak-core-group-search.ts index 64be9bfa2a..62a5040687 100644 --- a/web/src/admin/common/ak-core-group-search.ts +++ b/web/src/admin/common/ak-core-group-search.ts @@ -1,14 +1,14 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import { SearchSelect } from "@goauthentik/elements/forms/SearchSelect"; -import { CustomListenerElement } from "@goauthentik/elements/utils/eventEmitter"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { property, query } from "lit/decorators.js"; +import { AKElement } from "#elements/Base"; +import { SearchSelect } from "#elements/forms/SearchSelect/index"; +import { CustomListenerElement } from "#elements/utils/eventEmitter"; import { CoreApi, CoreGroupsListRequest, Group } from "@goauthentik/api"; +import { html } from "lit"; +import { customElement, property, query } from "lit/decorators.js"; + async function fetchObjects(query?: string): Promise { const args: CoreGroupsListRequest = { ordering: "name", diff --git a/web/src/admin/common/ak-crypto-certificate-search.ts b/web/src/admin/common/ak-crypto-certificate-search.ts index c50afcdfe2..c0f582496f 100644 --- a/web/src/admin/common/ak-crypto-certificate-search.ts +++ b/web/src/admin/common/ak-crypto-certificate-search.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import { SearchSelect } from "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/forms/SearchSelect"; -import { CustomListenerElement } from "@goauthentik/elements/utils/eventEmitter"; +import "#elements/forms/SearchSelect/index"; -import { html } from "lit"; -import { customElement, property, query } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import { SearchSelect } from "#elements/forms/SearchSelect/index"; +import { CustomListenerElement } from "#elements/utils/eventEmitter"; import { CertificateKeyPair, @@ -14,6 +12,10 @@ import { CryptoCertificatekeypairsListRequest, } from "@goauthentik/api"; +import { html } from "lit"; +import { customElement, property, query } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + const renderElement = (item: CertificateKeyPair): string => item.name; const renderValue = (item: CertificateKeyPair | undefined): string | undefined => item?.pk; diff --git a/web/src/admin/common/ak-flow-search/FlowSearch.ts b/web/src/admin/common/ak-flow-search/FlowSearch.ts index 1c95bc3268..e055511497 100644 --- a/web/src/admin/common/ak-flow-search/FlowSearch.ts +++ b/web/src/admin/common/ak-flow-search/FlowSearch.ts @@ -1,17 +1,20 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import { SearchSelect } from "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/forms/SearchSelect"; -import { CustomListenerElement } from "@goauthentik/elements/utils/eventEmitter"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import { SearchSelect } from "#elements/forms/SearchSelect/index"; +import { CustomListenerElement } from "#elements/utils/eventEmitter"; + +import { RenderFlowOption } from "#admin/flows/utils"; + +import type { Flow, FlowsInstancesListRequest } from "@goauthentik/api"; +import { FlowsApi, FlowsInstancesListDesignationEnum } from "@goauthentik/api"; import { html } from "lit"; import { property, query } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { FlowsApi, FlowsInstancesListDesignationEnum } from "@goauthentik/api"; -import type { Flow, FlowsInstancesListRequest } from "@goauthentik/api"; - export function renderElement(flow: Flow) { return RenderFlowOption(flow); } diff --git a/web/src/admin/common/ak-flow-search/ak-branded-flow-search.ts b/web/src/admin/common/ak-flow-search/ak-branded-flow-search.ts index a1bbb7f428..3ff867c5fb 100644 --- a/web/src/admin/common/ak-flow-search/ak-branded-flow-search.ts +++ b/web/src/admin/common/ak-flow-search/ak-branded-flow-search.ts @@ -1,8 +1,8 @@ -import { customElement, property } from "lit/decorators.js"; - import type { Flow } from "@goauthentik/api"; -import FlowSearch from "./FlowSearch"; +import { customElement, property } from "lit/decorators.js"; + +import FlowSearch from "./FlowSearch.js"; /** * Search for flows that may have a fallback specified by the brand settings diff --git a/web/src/admin/common/ak-flow-search/ak-flow-search-no-default.ts b/web/src/admin/common/ak-flow-search/ak-flow-search-no-default.ts index 1fc3ffe725..a45d45b303 100644 --- a/web/src/admin/common/ak-flow-search/ak-flow-search-no-default.ts +++ b/web/src/admin/common/ak-flow-search/ak-flow-search-no-default.ts @@ -1,11 +1,11 @@ -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/SearchSelect/index"; + +import type { Flow } from "@goauthentik/api"; import { html } from "lit"; import { customElement } from "lit/decorators.js"; -import type { Flow } from "@goauthentik/api"; - -import { FlowSearch, getFlowValue, renderDescription, renderElement } from "./FlowSearch"; +import { FlowSearch, getFlowValue, renderDescription, renderElement } from "./FlowSearch.js"; /** * @element ak-flow-search-no-default diff --git a/web/src/admin/common/ak-flow-search/ak-flow-search.stories.ts b/web/src/admin/common/ak-flow-search/ak-flow-search.stories.ts index 653fef6e15..225266651f 100644 --- a/web/src/admin/common/ak-flow-search/ak-flow-search.stories.ts +++ b/web/src/admin/common/ak-flow-search/ak-flow-search.stories.ts @@ -1,12 +1,14 @@ -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { AkFlowSearch } from "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#elements/forms/HorizontalFormElement"; + +import { AkFlowSearch } from "#admin/common/ak-flow-search/ak-flow-search"; + +import { Flow, FlowsInstancesListDesignationEnum } from "@goauthentik/api"; + import { Meta } from "@storybook/web-components"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; - -import { Flow, FlowsInstancesListDesignationEnum } from "@goauthentik/api"; +import { html, TemplateResult } from "lit"; const mockData = { pagination: { diff --git a/web/src/admin/common/ak-flow-search/ak-flow-search.ts b/web/src/admin/common/ak-flow-search/ak-flow-search.ts index f0d6cbcc1e..2f8b264e84 100644 --- a/web/src/admin/common/ak-flow-search/ak-flow-search.ts +++ b/web/src/admin/common/ak-flow-search/ak-flow-search.ts @@ -1,8 +1,8 @@ -import { customElement } from "lit/decorators.js"; - import type { Flow } from "@goauthentik/api"; -import FlowSearch from "./FlowSearch"; +import { customElement } from "lit/decorators.js"; + +import FlowSearch from "./FlowSearch.js"; /** * @element ak-flow-search diff --git a/web/src/admin/common/ak-flow-search/ak-source-flow-search.ts b/web/src/admin/common/ak-flow-search/ak-source-flow-search.ts index 4baf035606..1d076a6284 100644 --- a/web/src/admin/common/ak-flow-search/ak-source-flow-search.ts +++ b/web/src/admin/common/ak-flow-search/ak-source-flow-search.ts @@ -1,9 +1,8 @@ -import { customElement } from "lit/decorators.js"; -import { property } from "lit/decorators.js"; - import type { Flow } from "@goauthentik/api"; -import FlowSearch from "./FlowSearch"; +import { customElement, property } from "lit/decorators.js"; + +import FlowSearch from "./FlowSearch.js"; /** * Search for flows that connect to user sources diff --git a/web/src/admin/common/ak-license-notice.ts b/web/src/admin/common/ak-license-notice.ts index 81829be442..8542e03768 100644 --- a/web/src/admin/common/ak-license-notice.ts +++ b/web/src/admin/common/ak-license-notice.ts @@ -1,7 +1,9 @@ +import "#elements/Alert"; + import { $PFBase } from "#common/theme"; + +import { AKElement } from "#elements/Base"; import { WithLicenseSummary } from "#elements/mixins/license"; -import "@goauthentik/elements/Alert"; -import { AKElement } from "@goauthentik/elements/Base"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; diff --git a/web/src/admin/common/stories/ak-crypto-certificate-search.stories.ts b/web/src/admin/common/stories/ak-crypto-certificate-search.stories.ts index 9138268079..7c002e958b 100644 --- a/web/src/admin/common/stories/ak-crypto-certificate-search.stories.ts +++ b/web/src/admin/common/stories/ak-crypto-certificate-search.stories.ts @@ -1,12 +1,13 @@ -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/messages/MessageContainer"; +import "../ak-crypto-certificate-search.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-crypto-certificate-search"; -import AkCryptoCertificateSearch from "../ak-crypto-certificate-search"; -import { dummyCryptoCertsSearch } from "./samples"; +import AkCryptoCertificateSearch from "../ak-crypto-certificate-search.js"; +import { dummyCryptoCertsSearch } from "./samples.js"; const metadata: Meta = { title: "Components / Searches / CryptoCertificateKeyPair", diff --git a/web/src/admin/crypto/CertificateGenerateForm.ts b/web/src/admin/crypto/CertificateGenerateForm.ts index 85187a626a..4388fe9b8f 100644 --- a/web/src/admin/crypto/CertificateGenerateForm.ts +++ b/web/src/admin/crypto/CertificateGenerateForm.ts @@ -1,10 +1,8 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { Form } from "#elements/forms/Form"; import { AlgEnum, @@ -13,6 +11,10 @@ import { CryptoApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-crypto-certificate-generate-form") export class CertificateKeyPairForm extends Form { getSuccessMessage(): string { diff --git a/web/src/admin/crypto/CertificateKeyPairForm.ts b/web/src/admin/crypto/CertificateKeyPairForm.ts index 88b69ff333..096179da50 100644 --- a/web/src/admin/crypto/CertificateKeyPairForm.ts +++ b/web/src/admin/crypto/CertificateKeyPairForm.ts @@ -1,16 +1,18 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-secret-textarea-input.js"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import "#components/ak-secret-textarea-input"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { CertificateKeyPair, CertificateKeyPairRequest, CryptoApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-crypto-certificate-form") export class CertificateKeyPairForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/crypto/CertificateKeyPairListPage.ts b/web/src/admin/crypto/CertificateKeyPairListPage.ts index 940bd0374a..a7aa6441f6 100644 --- a/web/src/admin/crypto/CertificateKeyPairListPage.ts +++ b/web/src/admin/crypto/CertificateKeyPairListPage.ts @@ -1,22 +1,17 @@ -import "@goauthentik/admin/crypto/CertificateGenerateForm"; -import "@goauthentik/admin/crypto/CertificateKeyPairForm"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/crypto/CertificateGenerateForm"; +import "#admin/crypto/CertificateKeyPairForm"; +import "#admin/rbac/ObjectPermissionModal"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { CertificateKeyPair, @@ -24,6 +19,12 @@ import { RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; + @customElement("ak-crypto-certificate-list") export class CertificateKeyPairListPage extends TablePage { expandable = true; diff --git a/web/src/admin/enterprise/EnterpriseLicenseForm.ts b/web/src/admin/enterprise/EnterpriseLicenseForm.ts index 94caa9d158..27bedc16db 100644 --- a/web/src/admin/enterprise/EnterpriseLicenseForm.ts +++ b/web/src/admin/enterprise/EnterpriseLicenseForm.ts @@ -1,17 +1,19 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH_ENTERPRISE } from "@goauthentik/common/constants"; -import "@goauthentik/components/ak-secret-textarea-input.js"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import "#components/ak-secret-textarea-input"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH_ENTERPRISE } from "#common/constants"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { EnterpriseApi, License } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-enterprise-license-form") export class EnterpriseLicenseForm extends ModelForm { @state() diff --git a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts index 050030db51..edc5287957 100644 --- a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts +++ b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts @@ -1,28 +1,19 @@ -import "@goauthentik/admin/enterprise/EnterpriseLicenseForm"; -import "@goauthentik/admin/enterprise/EnterpriseStatusCard"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/Spinner"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/cards/AggregateCard"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/enterprise/EnterpriseLicenseForm"; +import "#admin/enterprise/EnterpriseStatusCard"; +import "#admin/rbac/ObjectPermissionModal"; +import "#elements/Spinner"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/cards/AggregateCard"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; -import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { EnterpriseApi, @@ -33,6 +24,16 @@ import { RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { css, CSSResult, html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + +import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; + @customElement("ak-enterprise-license-list") export class EnterpriseLicenseListPage extends TablePage { checkbox = true; diff --git a/web/src/admin/enterprise/EnterpriseStatusCard.test.ts b/web/src/admin/enterprise/EnterpriseStatusCard.test.ts index 64ce92d3e4..fbd7bc9e6c 100644 --- a/web/src/admin/enterprise/EnterpriseStatusCard.test.ts +++ b/web/src/admin/enterprise/EnterpriseStatusCard.test.ts @@ -1,13 +1,14 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "./EnterpriseStatusCard.js"; + +import { render } from "#elements/tests/utils"; + +import { LicenseForecast, LicenseSummary, LicenseSummaryStatusEnum } from "@goauthentik/api"; + import { $, expect } from "@wdio/globals"; import { msg } from "@lit/localize"; import { html } from "lit"; -import { LicenseForecast, LicenseSummary, LicenseSummaryStatusEnum } from "@goauthentik/api"; - -import "./EnterpriseStatusCard.js"; - describe("ak-enterprise-status-card", () => { it("should not error when no data is loaded", async () => { render(html``); diff --git a/web/src/admin/enterprise/EnterpriseStatusCard.ts b/web/src/admin/enterprise/EnterpriseStatusCard.ts index 14086b884a..801106a66b 100644 --- a/web/src/admin/enterprise/EnterpriseStatusCard.ts +++ b/web/src/admin/enterprise/EnterpriseStatusCard.ts @@ -1,5 +1,7 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { PFColor } from "@goauthentik/elements/Label"; +import { AKElement } from "#elements/Base"; +import { PFColor } from "#elements/Label"; + +import { LicenseForecast, LicenseSummary, LicenseSummaryStatusEnum } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { CSSResult, html, nothing } from "lit"; @@ -11,8 +13,6 @@ import PFProgress from "@patternfly/patternfly/components/Progress/progress.css" import PFSplit from "@patternfly/patternfly/layouts/Split/split.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { LicenseForecast, LicenseSummary, LicenseSummaryStatusEnum } from "@goauthentik/api"; - @customElement("ak-enterprise-status-card") export class EnterpriseStatusCard extends AKElement { @state() diff --git a/web/src/admin/events/EventListPage.ts b/web/src/admin/events/EventListPage.ts index 6ddd598aa7..e8e94f0bcd 100644 --- a/web/src/admin/events/EventListPage.ts +++ b/web/src/admin/events/EventListPage.ts @@ -1,28 +1,30 @@ import "#elements/Tabs"; -import { WithLicenseSummary } from "#elements/mixins/license"; -import { updateURLParams } from "#elements/router/RouteMatch"; -import "@goauthentik/admin/events/EventMap"; -import "@goauthentik/admin/events/EventVolumeChart"; -import { EventGeo, renderEventUser } from "@goauthentik/admin/events/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EventWithContext } from "@goauthentik/common/events"; -import { actionToLabel } from "@goauthentik/common/labels"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-event-info"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; -import { SlottedTemplateResult } from "@goauthentik/elements/types"; +import "#admin/events/EventMap"; +import "#admin/events/EventVolumeChart"; +import "#components/ak-event-info"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EventWithContext } from "#common/events"; +import { actionToLabel } from "#common/labels"; +import { formatElapsedTime } from "#common/temporal"; + +import { WithLicenseSummary } from "#elements/mixins/license"; +import { updateURLParams } from "#elements/router/RouteMatch"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; +import { SlottedTemplateResult } from "#elements/types"; + +import { EventGeo, renderEventUser } from "#admin/events/utils"; + +import { Event, EventsApi, LicenseSummaryStatusEnum } from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; -import { Event, EventsApi, LicenseSummaryStatusEnum } from "@goauthentik/api"; - @customElement("ak-event-list") export class EventListPage extends WithLicenseSummary(TablePage) { expandable = true; diff --git a/web/src/admin/events/EventMap.ts b/web/src/admin/events/EventMap.ts index e173bc2604..8cc5466806 100644 --- a/web/src/admin/events/EventMap.ts +++ b/web/src/admin/events/EventMap.ts @@ -1,28 +1,31 @@ -import { EventWithContext } from "#common/events"; -import { globalAK } from "#common/global"; -import { PaginatedResponse } from "#elements/table/Table"; -import { AKElement } from "@goauthentik/elements/Base"; import "@openlayers-elements/core/ol-layer-vector"; -import type OlLayerVector from "@openlayers-elements/core/ol-layer-vector"; -import OlMap from "@openlayers-elements/core/ol-map"; import "@openlayers-elements/maps/ol-layer-openstreetmap"; import "@openlayers-elements/maps/ol-select"; -import Feature from "ol/Feature"; + +import { EventWithContext } from "#common/events"; +import { globalAK } from "#common/global"; + +import { AKElement } from "#elements/Base"; +import { PaginatedResponse } from "#elements/table/Table"; + +import { Event } from "@goauthentik/api"; + +import type OlLayerVector from "@openlayers-elements/core/ol-layer-vector"; +import OlMap from "@openlayers-elements/core/ol-map"; import { isEmpty } from "ol/extent"; +import Feature from "ol/Feature"; import { Point } from "ol/geom"; import { fromLonLat } from "ol/proj"; import Icon from "ol/style/Icon"; import Style from "ol/style/Style"; -import { CSSResult, PropertyValues, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, query } from "lit/decorators.js"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import OL from "ol/ol.css"; -import { Event } from "@goauthentik/api"; - @customElement("ak-map") export class Map extends OlMap { public render() { diff --git a/web/src/admin/events/EventViewPage.ts b/web/src/admin/events/EventViewPage.ts index 3484e6111b..a4031b36c1 100644 --- a/web/src/admin/events/EventViewPage.ts +++ b/web/src/admin/events/EventViewPage.ts @@ -1,14 +1,19 @@ -import { EventGeo, renderEventUser } from "#admin/events/utils"; +import "#components/ak-event-info"; +import "#components/ak-page-header"; + import { DEFAULT_CONFIG } from "#common/api/config"; import { EventWithContext } from "#common/events"; import { actionToLabel } from "#common/labels"; import { formatElapsedTime } from "#common/temporal"; -import "#components/ak-event-info"; -import "#components/ak-page-header"; + import { AKElement } from "#elements/Base"; +import { EventGeo, renderEventUser } from "#admin/events/utils"; + +import { EventsApi, EventToJSON } from "@goauthentik/api"; + import { msg, str } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; @@ -18,8 +23,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { EventToJSON, EventsApi } from "@goauthentik/api"; - @customElement("ak-event-view") export class EventViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/events/EventVolumeChart.ts b/web/src/admin/events/EventVolumeChart.ts index 07f36f0761..b0dfac542f 100644 --- a/web/src/admin/events/EventVolumeChart.ts +++ b/web/src/admin/events/EventVolumeChart.ts @@ -1,14 +1,16 @@ +import { DEFAULT_CONFIG } from "#common/api/config"; + import { EventChart } from "#elements/charts/EventChart"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; + +import { EventsApi, EventsEventsListRequest, EventVolume } from "@goauthentik/api"; + import { ChartData } from "chart.js"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import { EventVolume, EventsApi, EventsEventsListRequest } from "@goauthentik/api"; - @customElement("ak-events-volume-chart") export class EventVolumeChart extends EventChart { @property({ attribute: "with-map", type: Boolean }) diff --git a/web/src/admin/events/RuleForm.ts b/web/src/admin/events/RuleForm.ts index cffe76d280..b416c48f4c 100644 --- a/web/src/admin/events/RuleForm.ts +++ b/web/src/admin/events/RuleForm.ts @@ -1,15 +1,12 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { severityToLabel } from "@goauthentik/common/labels"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { severityToLabel } from "#common/labels"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { CoreApi, @@ -21,6 +18,11 @@ import { SeverityEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { eventTransportsProvider, eventTransportsSelector } from "./RuleFormHelpers.js"; @customElement("ak-event-rule-form") diff --git a/web/src/admin/events/RuleFormHelpers.ts b/web/src/admin/events/RuleFormHelpers.ts index f941dc0182..deeb361ed9 100644 --- a/web/src/admin/events/RuleFormHelpers.ts +++ b/web/src/admin/events/RuleFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { EventsApi, NotificationTransport } from "@goauthentik/api"; diff --git a/web/src/admin/events/RuleListPage.ts b/web/src/admin/events/RuleListPage.ts index 8c9a9f3fdd..14616d138a 100644 --- a/web/src/admin/events/RuleListPage.ts +++ b/web/src/admin/events/RuleListPage.ts @@ -1,20 +1,17 @@ -import "@goauthentik/admin/events/RuleForm"; -import "@goauthentik/admin/policies/BoundPoliciesList"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { severityToLabel } from "@goauthentik/common/labels"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/events/RuleForm"; +import "#admin/policies/BoundPoliciesList"; +import "#admin/rbac/ObjectPermissionModal"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { severityToLabel } from "#common/labels"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { EventsApi, @@ -22,6 +19,10 @@ import { RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-event-rule-list") export class RuleListPage extends TablePage { expandable = true; diff --git a/web/src/admin/events/TransportForm.ts b/web/src/admin/events/TransportForm.ts index be2eac76e7..79f3347a93 100644 --- a/web/src/admin/events/TransportForm.ts +++ b/web/src/admin/events/TransportForm.ts @@ -1,14 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-hidden-text-input"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-hidden-text-input"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { EventsApi, @@ -19,6 +16,11 @@ import { PropertymappingsNotificationListRequest, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-event-transport-form") export class TransportForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/events/TransportListPage.ts b/web/src/admin/events/TransportListPage.ts index 36b607512c..4cb0b5b40a 100644 --- a/web/src/admin/events/TransportListPage.ts +++ b/web/src/admin/events/TransportListPage.ts @@ -1,18 +1,15 @@ -import "@goauthentik/admin/events/TransportForm"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/events/TransportForm"; +import "#admin/rbac/ObjectPermissionModal"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { EventsApi, @@ -20,6 +17,10 @@ import { RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-event-transport-list") export class TransportListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/events/utils.ts b/web/src/admin/events/utils.ts index 26026180e6..d510d38211 100644 --- a/web/src/admin/events/utils.ts +++ b/web/src/admin/events/utils.ts @@ -1,9 +1,10 @@ -import { EventUser, EventWithContext } from "@goauthentik/common/events"; -import { truncate } from "@goauthentik/common/utils"; -import { SlottedTemplateResult } from "@goauthentik/elements/types"; +import { EventUser, EventWithContext } from "#common/events"; +import { truncate } from "#common/utils"; + +import { SlottedTemplateResult } from "#elements/types"; import { msg, str } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; +import { html, nothing, TemplateResult } from "lit"; /** * Given event with a geographical context, format it into a string for display. diff --git a/web/src/admin/flows/BoundStagesList.ts b/web/src/admin/flows/BoundStagesList.ts index 126e7a22e3..ab6e341867 100644 --- a/web/src/admin/flows/BoundStagesList.ts +++ b/web/src/admin/flows/BoundStagesList.ts @@ -1,26 +1,27 @@ -import "@goauthentik/admin/flows/StageBindingForm"; -import "@goauthentik/admin/policies/BoundPoliciesList"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import "@goauthentik/admin/stages/StageWizard"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/flows/StageBindingForm"; +import "#admin/policies/BoundPoliciesList"; +import "#admin/rbac/ObjectPermissionModal"; +import "#admin/stages/StageWizard"; +import "#elements/Tabs"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { - FlowStageBinding, FlowsApi, + FlowStageBinding, RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-bound-stages-list") export class BoundStagesList extends Table { expandable = true; diff --git a/web/src/admin/flows/FlowDiagram.ts b/web/src/admin/flows/FlowDiagram.ts index 1b581ef977..93be6b50ca 100644 --- a/web/src/admin/flows/FlowDiagram.ts +++ b/web/src/admin/flows/FlowDiagram.ts @@ -1,11 +1,13 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { Diagram } from "@goauthentik/elements/Diagram"; -import "@goauthentik/elements/EmptyState"; +import "#elements/EmptyState"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { Diagram } from "#elements/Diagram"; import { FlowsApi } from "@goauthentik/api"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-flow-diagram") export class FlowDiagram extends Diagram { @property() diff --git a/web/src/admin/flows/FlowForm.ts b/web/src/admin/flows/FlowForm.ts index 523677d425..1d4fd4f363 100644 --- a/web/src/admin/flows/FlowForm.ts +++ b/web/src/admin/flows/FlowForm.ts @@ -1,18 +1,15 @@ -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import { DesignationToLabel, LayoutToLabel } from "@goauthentik/admin/flows/utils"; -import { policyEngineModes } from "@goauthentik/admin/policies/PolicyEngineModes"; -import { AuthenticationEnum } from "@goauthentik/api/dist/models/AuthenticationEnum"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-slug-input.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; +import "#components/ak-slug-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; + +import { DesignationToLabel, LayoutToLabel } from "#admin/flows/utils"; +import { policyEngineModes } from "#admin/policies/PolicyEngineModes"; import { DeniedActionEnum, @@ -21,6 +18,12 @@ import { FlowLayoutEnum, FlowsApi, } from "@goauthentik/api"; +import { AuthenticationEnum } from "@goauthentik/api/dist/models/AuthenticationEnum"; + +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; @customElement("ak-flow-form") export class FlowForm extends WithCapabilitiesConfig(ModelForm) { diff --git a/web/src/admin/flows/FlowImportForm.ts b/web/src/admin/flows/FlowImportForm.ts index c035f3c163..2751c9452f 100644 --- a/web/src/admin/flows/FlowImportForm.ts +++ b/web/src/admin/flows/FlowImportForm.ts @@ -1,18 +1,20 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { SentryIgnoredError } from "@goauthentik/common/sentry"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/events/LogViewer"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#components/ak-status-label"; +import "#elements/events/LogViewer"; +import "#elements/forms/HorizontalFormElement"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { SentryIgnoredError } from "#common/sentry/index"; + +import { Form } from "#elements/forms/Form"; + +import { Flow, FlowImportResult, FlowsApi } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { Flow, FlowImportResult, FlowsApi } from "@goauthentik/api"; - @customElement("ak-flow-import-form") export class FlowImportForm extends Form { @state() diff --git a/web/src/admin/flows/FlowListPage.ts b/web/src/admin/flows/FlowListPage.ts index 8a1505153e..aaa94c6696 100644 --- a/web/src/admin/flows/FlowListPage.ts +++ b/web/src/admin/flows/FlowListPage.ts @@ -1,23 +1,25 @@ -import "@goauthentik/admin/flows/FlowForm"; -import "@goauthentik/admin/flows/FlowImportForm"; -import { DesignationToLabel } from "@goauthentik/admin/flows/utils"; -import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/ConfirmationForm"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/flows/FlowForm"; +import "#admin/flows/FlowImportForm"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/ConfirmationForm"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { AndNext, DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; + +import { DesignationToLabel } from "#admin/flows/utils"; import { Flow, FlowsApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-flow-list") export class FlowListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/flows/FlowViewPage.ts b/web/src/admin/flows/FlowViewPage.ts index 8e578baca1..23c1873d87 100644 --- a/web/src/admin/flows/FlowViewPage.ts +++ b/web/src/admin/flows/FlowViewPage.ts @@ -1,19 +1,24 @@ import "#admin/flows/BoundStagesList"; import "#admin/flows/FlowDiagram"; import "#admin/flows/FlowForm"; -import { DesignationToLabel } from "#admin/flows/utils"; import "#admin/policies/BoundPoliciesList"; import "#admin/rbac/ObjectPermissionsPage"; -import { AndNext, DEFAULT_CONFIG } from "#common/api/config"; -import { isResponseErrorLike } from "#common/errors/network"; import "#components/ak-page-header"; import "#components/events/ObjectChangelog"; -import { AKElement } from "#elements/Base"; import "#elements/Tabs"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; +import { AndNext, DEFAULT_CONFIG } from "#common/api/config"; +import { isResponseErrorLike } from "#common/errors/network"; + +import { AKElement } from "#elements/Base"; + +import { DesignationToLabel } from "#admin/flows/utils"; + +import { Flow, FlowsApi, RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -24,8 +29,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { Flow, FlowsApi, RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; - @customElement("ak-flow-view") export class FlowViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/flows/StageBindingForm.ts b/web/src/admin/flows/StageBindingForm.ts index 8e1d3fbbc1..d8ddfe9805 100644 --- a/web/src/admin/flows/StageBindingForm.ts +++ b/web/src/admin/flows/StageBindingForm.ts @@ -1,18 +1,16 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { - FlowStageBinding, FlowsApi, FlowsInstancesListDesignationEnum, + FlowStageBinding, InvalidResponseActionEnum, PolicyEngineMode, Stage, @@ -20,6 +18,10 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + @customElement("ak-stage-binding-form") export class StageBindingForm extends ModelForm { async loadInstance(pk: string): Promise { diff --git a/web/src/admin/flows/utils.ts b/web/src/admin/flows/utils.ts index 90c123c9ad..8916bde04d 100644 --- a/web/src/admin/flows/utils.ts +++ b/web/src/admin/flows/utils.ts @@ -1,7 +1,7 @@ -import { msg } from "@lit/localize"; - import { Flow, FlowDesignationEnum, FlowLayoutEnum } from "@goauthentik/api"; +import { msg } from "@lit/localize"; + export function RenderFlowOption(flow: Flow): string { return `${flow.slug} (${flow.name})`; } diff --git a/web/src/admin/groups/GroupForm.ts b/web/src/admin/groups/GroupForm.ts index 892972edbe..84c1fc2187 100644 --- a/web/src/admin/groups/GroupForm.ts +++ b/web/src/admin/groups/GroupForm.ts @@ -1,23 +1,26 @@ -import "@goauthentik/admin/groups/MemberSelectModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider"; -import { DataProvision, DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/groups/MemberSelectModal"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DataProvision, DualSelectPair } from "#elements/ak-dual-select/types"; +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { CoreApi, CoreGroupsListRequest, Group, RbacApi, Role } from "@goauthentik/api"; + import YAML from "yaml"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { CoreApi, CoreGroupsListRequest, Group, RbacApi, Role } from "@goauthentik/api"; - export function rbacRolePair(item: Role): DualSelectPair { return [item.pk, html`
${item.name}
`, item.name]; } diff --git a/web/src/admin/groups/GroupListPage.ts b/web/src/admin/groups/GroupListPage.ts index bbd49deb2e..414679faca 100644 --- a/web/src/admin/groups/GroupListPage.ts +++ b/web/src/admin/groups/GroupListPage.ts @@ -1,20 +1,21 @@ -import "@goauthentik/admin/groups/GroupForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/groups/GroupForm"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { CoreApi, Group } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-group-list") export class GroupListPage extends TablePage { checkbox = true; diff --git a/web/src/admin/groups/GroupViewPage.ts b/web/src/admin/groups/GroupViewPage.ts index 7441c40740..7a6a6dd2b2 100644 --- a/web/src/admin/groups/GroupViewPage.ts +++ b/web/src/admin/groups/GroupViewPage.ts @@ -1,20 +1,24 @@ -import "@goauthentik/admin/groups/GroupForm"; -import "@goauthentik/admin/groups/RelatedUserList"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/ak-page-header"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/ModalForm"; +import "#admin/groups/GroupForm"; +import "#admin/groups/RelatedUserList"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/ak-page-header"; +import "#components/ak-status-label"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/ModalForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { CoreApi, Group, RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -28,8 +32,6 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import { CoreApi, Group, RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; - @customElement("ak-group-view") export class GroupViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/groups/MemberSelectModal.ts b/web/src/admin/groups/MemberSelectModal.ts index cf925b74e9..1ad69de24a 100644 --- a/web/src/admin/groups/MemberSelectModal.ts +++ b/web/src/admin/groups/MemberSelectModal.ts @@ -1,18 +1,20 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TableModal } from "@goauthentik/elements/table/TableModal"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TableModal } from "#elements/table/TableModal"; + +import { CoreApi, CoreUsersListRequest, User } from "@goauthentik/api"; + import { match } from "ts-pattern"; import { msg } from "@lit/localize"; -import { TemplateResult, css, html } from "lit"; +import { css, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { CoreApi, CoreUsersListRequest, User } from "@goauthentik/api"; - // Leaving room in the future for a multi-state control if someone somehow needs to filter inactive // users as well. type UserListFilter = "active" | "all"; diff --git a/web/src/admin/groups/RelatedGroupList.ts b/web/src/admin/groups/RelatedGroupList.ts index e0f588fb5b..df584d7002 100644 --- a/web/src/admin/groups/RelatedGroupList.ts +++ b/web/src/admin/groups/RelatedGroupList.ts @@ -1,24 +1,24 @@ -import "@goauthentik/admin/groups/GroupForm"; -import "@goauthentik/admin/groups/GroupForm"; -import "@goauthentik/admin/users/GroupSelectModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/groups/GroupForm"; +import "#admin/users/GroupSelectModal"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { Form } from "#elements/forms/Form"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { CoreApi, Group, User } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-group-related-add") export class RelatedGroupAdd extends Form<{ groups: string[] }> { @property({ attribute: false }) diff --git a/web/src/admin/groups/RelatedUserList.ts b/web/src/admin/groups/RelatedUserList.ts index 138fd5b626..3c32f72816 100644 --- a/web/src/admin/groups/RelatedUserList.ts +++ b/web/src/admin/groups/RelatedUserList.ts @@ -1,33 +1,36 @@ -import { WithBrandConfig } from "#elements/mixins/branding"; -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/admin/users/ServiceAccountForm"; -import "@goauthentik/admin/users/UserActiveForm"; -import "@goauthentik/admin/users/UserForm"; -import "@goauthentik/admin/users/UserImpersonateForm"; -import "@goauthentik/admin/users/UserPasswordForm"; -import "@goauthentik/admin/users/UserResetEmailForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { me } from "@goauthentik/common/users"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/Dropdown"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/ModalForm"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; -import { UserOption } from "@goauthentik/elements/user/utils"; +import "#admin/users/ServiceAccountForm"; +import "#admin/users/UserActiveForm"; +import "#admin/users/UserForm"; +import "#admin/users/UserImpersonateForm"; +import "#admin/users/UserPasswordForm"; +import "#admin/users/UserResetEmailForm"; +import "#components/ak-status-label"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/Dropdown"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; +import { formatElapsedTime } from "#common/temporal"; +import { me } from "#common/users"; + +import { Form } from "#elements/forms/Form"; +import { showMessage } from "#elements/messages/MessageContainer"; +import { WithBrandConfig } from "#elements/mixins/branding"; +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; +import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; +import { UserOption } from "#elements/user/utils"; + +import { CoreApi, CoreUsersListTypeEnum, Group, SessionUser, User } from "@goauthentik/api"; + import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html, nothing } from "lit"; +import { CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -35,8 +38,6 @@ import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { CoreApi, CoreUsersListTypeEnum, Group, SessionUser, User } from "@goauthentik/api"; - @customElement("ak-user-related-add") export class RelatedUserAdd extends Form<{ users: number[] }> { @property({ attribute: false }) diff --git a/web/src/admin/outposts/OutpostDeploymentModal.ts b/web/src/admin/outposts/OutpostDeploymentModal.ts index 0990588f96..88f3eb0985 100644 --- a/web/src/admin/outposts/OutpostDeploymentModal.ts +++ b/web/src/admin/outposts/OutpostDeploymentModal.ts @@ -1,14 +1,16 @@ -import { docLink } from "@goauthentik/common/global"; -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/TokenCopyButton"; +import "#elements/buttons/TokenCopyButton/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { docLink } from "#common/global"; + +import { ModalButton } from "#elements/buttons/ModalButton"; import { Outpost, OutpostTypeEnum } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-outpost-deployment-modal") export class OutpostDeploymentModal extends ModalButton { @property({ attribute: false }) diff --git a/web/src/admin/outposts/OutpostForm.ts b/web/src/admin/outposts/OutpostForm.ts index fe9334e825..e6fcefec6f 100644 --- a/web/src/admin/outposts/OutpostForm.ts +++ b/web/src/admin/outposts/OutpostForm.ts @@ -1,33 +1,36 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { docLink } from "@goauthentik/common/global"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider"; -import { DataProvider, DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import YAML from "yaml"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; -import { map } from "lit/directives/map.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { docLink } from "#common/global"; +import { groupBy } from "#common/utils"; + +import { DataProvider, DualSelectPair } from "#elements/ak-dual-select/types"; +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; +import { PaginatedResponse } from "#elements/table/Table"; import { Outpost, OutpostDefaultConfig, - OutpostTypeEnum, OutpostsApi, OutpostsServiceConnectionsAllListRequest, + OutpostTypeEnum, ProvidersApi, ServiceConnection, } from "@goauthentik/api"; +import YAML from "yaml"; + +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; +import { map } from "lit/directives/map.js"; + interface ProviderBase { pk: number; name: string; diff --git a/web/src/admin/outposts/OutpostHealth.ts b/web/src/admin/outposts/OutpostHealth.ts index 0f5ddf9b7c..6bb0ce1eb7 100644 --- a/web/src/admin/outposts/OutpostHealth.ts +++ b/web/src/admin/outposts/OutpostHealth.ts @@ -1,17 +1,19 @@ -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { AKElement } from "@goauthentik/elements/Base"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/Spinner"; +import "#elements/Spinner"; + +import { formatElapsedTime } from "#common/temporal"; + +import { AKElement } from "#elements/Base"; +import { PFColor } from "#elements/Label"; + +import { OutpostHealth } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { OutpostHealth } from "@goauthentik/api"; - @customElement("ak-outpost-health") export class OutpostHealthElement extends AKElement { @property({ attribute: false }) diff --git a/web/src/admin/outposts/OutpostHealthSimple.ts b/web/src/admin/outposts/OutpostHealthSimple.ts index ed5ae5548a..74e80aeec7 100644 --- a/web/src/admin/outposts/OutpostHealthSimple.ts +++ b/web/src/admin/outposts/OutpostHealthSimple.ts @@ -1,18 +1,20 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { AKElement } from "@goauthentik/elements/Base"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/Spinner"; +import "#elements/Spinner"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { formatElapsedTime } from "#common/temporal"; + +import { AKElement } from "#elements/Base"; +import { PFColor } from "#elements/Label"; + +import { OutpostHealth, OutpostsApi } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { OutpostHealth, OutpostsApi } from "@goauthentik/api"; - @customElement("ak-outpost-health-simple") export class OutpostHealthSimpleElement extends AKElement { @property() diff --git a/web/src/admin/outposts/OutpostListPage.ts b/web/src/admin/outposts/OutpostListPage.ts index 7b1a6466fb..2eff74a445 100644 --- a/web/src/admin/outposts/OutpostListPage.ts +++ b/web/src/admin/outposts/OutpostListPage.ts @@ -1,36 +1,35 @@ -import "@goauthentik/admin/outposts/OutpostDeploymentModal"; -import "@goauthentik/admin/outposts/OutpostDeploymentModal"; -import "@goauthentik/admin/outposts/OutpostForm"; -import "@goauthentik/admin/outposts/OutpostHealth"; -import "@goauthentik/admin/outposts/OutpostHealthSimple"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/outposts/OutpostDeploymentModal"; +import "#admin/outposts/OutpostForm"; +import "#admin/outposts/OutpostHealth"; +import "#admin/outposts/OutpostHealthSimple"; +import "#admin/rbac/ObjectPermissionModal"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { CSSResult } from "lit"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { Outpost, OutpostHealth, - OutpostTypeEnum, OutpostsApi, + OutpostTypeEnum, RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; + export function TypeToLabel(type?: OutpostTypeEnum): string { if (!type) return ""; switch (type) { diff --git a/web/src/admin/outposts/ServiceConnectionDockerForm.ts b/web/src/admin/outposts/ServiceConnectionDockerForm.ts index 81b3b0c633..90d6b289f0 100644 --- a/web/src/admin/outposts/ServiceConnectionDockerForm.ts +++ b/web/src/admin/outposts/ServiceConnectionDockerForm.ts @@ -1,16 +1,18 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-crypto-certificate-search"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { DockerServiceConnection, OutpostsApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-service-connection-docker-form") export class ServiceConnectionDockerForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts index 382da70a3f..02c34290d7 100644 --- a/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts +++ b/web/src/admin/outposts/ServiceConnectionKubernetesForm.ts @@ -1,17 +1,20 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { KubernetesServiceConnection, OutpostsApi } from "@goauthentik/api"; + import YAML from "yaml"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { KubernetesServiceConnection, OutpostsApi } from "@goauthentik/api"; - @customElement("ak-service-connection-kubernetes-form") export class ServiceConnectionKubernetesForm extends ModelForm< KubernetesServiceConnection, diff --git a/web/src/admin/outposts/ServiceConnectionListPage.ts b/web/src/admin/outposts/ServiceConnectionListPage.ts index d922fa22f3..41bbb9096b 100644 --- a/web/src/admin/outposts/ServiceConnectionListPage.ts +++ b/web/src/admin/outposts/ServiceConnectionListPage.ts @@ -1,27 +1,28 @@ -import "@goauthentik/admin/outposts/OutpostHealth"; -import "@goauthentik/admin/outposts/ServiceConnectionDockerForm"; -import "@goauthentik/admin/outposts/ServiceConnectionKubernetesForm"; -import "@goauthentik/admin/outposts/ServiceConnectionWizard"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/outposts/OutpostHealth"; +import "#admin/outposts/ServiceConnectionDockerForm"; +import "#admin/outposts/ServiceConnectionKubernetesForm"; +import "#admin/outposts/ServiceConnectionWizard"; +import "#admin/rbac/ObjectPermissionModal"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { OutpostsApi, ServiceConnection, ServiceConnectionState } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-outpost-service-connection-list") export class OutpostServiceConnectionListPage extends TablePage { pageTitle(): string { diff --git a/web/src/admin/outposts/ServiceConnectionWizard.ts b/web/src/admin/outposts/ServiceConnectionWizard.ts index ebc4439e28..2a68b948bd 100644 --- a/web/src/admin/outposts/ServiceConnectionWizard.ts +++ b/web/src/admin/outposts/ServiceConnectionWizard.ts @@ -1,23 +1,25 @@ -import "@goauthentik/admin/outposts/ServiceConnectionDockerForm"; -import "@goauthentik/admin/outposts/ServiceConnectionKubernetesForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/ProxyForm"; -import "@goauthentik/elements/wizard/FormWizardPage"; -import "@goauthentik/elements/wizard/TypeCreateWizardPage"; -import "@goauthentik/elements/wizard/Wizard"; -import type { Wizard } from "@goauthentik/elements/wizard/Wizard"; +import "#admin/outposts/ServiceConnectionDockerForm"; +import "#admin/outposts/ServiceConnectionKubernetesForm"; +import "#elements/forms/ProxyForm"; +import "#elements/wizard/FormWizardPage"; +import "#elements/wizard/TypeCreateWizardPage"; +import "#elements/wizard/Wizard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import type { Wizard } from "#elements/wizard/Wizard"; + +import { OutpostsApi, TypeCreate } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { property, query } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { OutpostsApi, TypeCreate } from "@goauthentik/api"; - @customElement("ak-service-connection-wizard") export class ServiceConnectionWizard extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/policies/BasePolicyForm.ts b/web/src/admin/policies/BasePolicyForm.ts index 450a653a61..8cfe1de4a6 100644 --- a/web/src/admin/policies/BasePolicyForm.ts +++ b/web/src/admin/policies/BasePolicyForm.ts @@ -1,4 +1,4 @@ -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import { ModelForm } from "#elements/forms/ModelForm"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/policies/BoundPoliciesList.ts b/web/src/admin/policies/BoundPoliciesList.ts index d7caefb70a..2bbceadcfe 100644 --- a/web/src/admin/policies/BoundPoliciesList.ts +++ b/web/src/admin/policies/BoundPoliciesList.ts @@ -1,28 +1,22 @@ -import "@goauthentik/admin/groups/GroupForm"; -import "@goauthentik/admin/policies/PolicyBindingForm"; -import { PolicyBindingNotice } from "@goauthentik/admin/policies/PolicyBindingForm"; -import { policyEngineModes } from "@goauthentik/admin/policies/PolicyEngineModes"; -import "@goauthentik/admin/policies/PolicyWizard"; -import { - PolicyBindingCheckTarget, - PolicyBindingCheckTargetToLabel, -} from "@goauthentik/admin/policies/utils"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import "@goauthentik/admin/users/UserForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums.js"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/groups/GroupForm"; +import "#admin/policies/PolicyBindingForm"; +import "#admin/policies/PolicyWizard"; +import "#admin/rbac/ObjectPermissionModal"; +import "#admin/users/UserForm"; +import "#components/ak-status-label"; +import "#elements/Tabs"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { PolicyBindingNotice } from "#admin/policies/PolicyBindingForm"; +import { policyEngineModes } from "#admin/policies/PolicyEngineModes"; +import { PolicyBindingCheckTarget, PolicyBindingCheckTargetToLabel } from "#admin/policies/utils"; import { PoliciesApi, @@ -30,6 +24,11 @@ import { RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-bound-policies-list") export class BoundPoliciesList extends Table { @property() diff --git a/web/src/admin/policies/PolicyBindingForm.ts b/web/src/admin/policies/PolicyBindingForm.ts index eed915d082..c7e2bbbab1 100644 --- a/web/src/admin/policies/PolicyBindingForm.ts +++ b/web/src/admin/policies/PolicyBindingForm.ts @@ -1,21 +1,14 @@ -import { - PolicyBindingCheckTarget, - PolicyBindingCheckTargetToLabel, -} from "@goauthentik/admin/policies/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/components/ak-toggle-group"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-toggle-group"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { CSSResult, nothing } from "lit"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { PolicyBindingCheckTarget, PolicyBindingCheckTargetToLabel } from "#admin/policies/utils"; import { CoreApi, @@ -29,6 +22,12 @@ import { User, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { CSSResult, html, nothing, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + +import PFContent from "@patternfly/patternfly/components/Content/content.css"; + export type PolicyBindingNotice = { type: PolicyBindingCheckTarget; notice: string }; @customElement("ak-policy-binding-form") diff --git a/web/src/admin/policies/PolicyEngineModes.ts b/web/src/admin/policies/PolicyEngineModes.ts index d5237b13ed..fad66d4430 100644 --- a/web/src/admin/policies/PolicyEngineModes.ts +++ b/web/src/admin/policies/PolicyEngineModes.ts @@ -1,8 +1,8 @@ +import { PolicyEngineMode } from "@goauthentik/api"; + import { msg } from "@lit/localize"; import { html } from "lit"; -import { PolicyEngineMode } from "@goauthentik/api"; - export const policyEngineModes = [ { label: "any", diff --git a/web/src/admin/policies/PolicyListPage.ts b/web/src/admin/policies/PolicyListPage.ts index c16ecf5310..7ec9a0b9a7 100644 --- a/web/src/admin/policies/PolicyListPage.ts +++ b/web/src/admin/policies/PolicyListPage.ts @@ -1,31 +1,32 @@ -import "@goauthentik/admin/policies/PolicyTestForm"; -import "@goauthentik/admin/policies/PolicyWizard"; -import "@goauthentik/admin/policies/dummy/DummyPolicyForm"; -import "@goauthentik/admin/policies/event_matcher/EventMatcherPolicyForm"; -import "@goauthentik/admin/policies/expiry/ExpiryPolicyForm"; -import "@goauthentik/admin/policies/expression/ExpressionPolicyForm"; -import "@goauthentik/admin/policies/password/PasswordPolicyForm"; -import "@goauthentik/admin/policies/reputation/ReputationPolicyForm"; -import "@goauthentik/admin/policies/unique_password/UniquePasswordPolicyForm"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/forms/ConfirmationForm"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/policies/PolicyTestForm"; +import "#admin/policies/PolicyWizard"; +import "#admin/policies/dummy/DummyPolicyForm"; +import "#admin/policies/event_matcher/EventMatcherPolicyForm"; +import "#admin/policies/expiry/ExpiryPolicyForm"; +import "#admin/policies/expression/ExpressionPolicyForm"; +import "#admin/policies/password/PasswordPolicyForm"; +import "#admin/policies/reputation/ReputationPolicyForm"; +import "#admin/policies/unique_password/UniquePasswordPolicyForm"; +import "#admin/rbac/ObjectPermissionModal"; +import "#elements/forms/ConfirmationForm"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { PoliciesApi, Policy } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-list") export class PolicyListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/policies/PolicyTestForm.ts b/web/src/admin/policies/PolicyTestForm.ts index 5c8bb59493..182363968b 100644 --- a/web/src/admin/policies/PolicyTestForm.ts +++ b/web/src/admin/policies/PolicyTestForm.ts @@ -1,18 +1,13 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/events/LogViewer"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; -import YAML from "yaml"; +import "#components/ak-status-label"; +import "#elements/CodeMirror"; +import "#elements/events/LogViewer"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { Form } from "#elements/forms/Form"; import { CoreApi, @@ -24,6 +19,14 @@ import { User, } from "@goauthentik/api"; +import YAML from "yaml"; + +import { msg } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; + @customElement("ak-policy-test-form") export class PolicyTestForm extends Form { @property({ attribute: false }) diff --git a/web/src/admin/policies/PolicyWizard.ts b/web/src/admin/policies/PolicyWizard.ts index e1ec40b394..b074bd8820 100644 --- a/web/src/admin/policies/PolicyWizard.ts +++ b/web/src/admin/policies/PolicyWizard.ts @@ -1,31 +1,34 @@ -import { PolicyBindingForm } from "@goauthentik/admin/policies/PolicyBindingForm"; -import "@goauthentik/admin/policies/dummy/DummyPolicyForm"; -import "@goauthentik/admin/policies/event_matcher/EventMatcherPolicyForm"; -import "@goauthentik/admin/policies/expiry/ExpiryPolicyForm"; -import "@goauthentik/admin/policies/expression/ExpressionPolicyForm"; -import "@goauthentik/admin/policies/geoip/GeoIPPolicyForm"; -import "@goauthentik/admin/policies/password/PasswordPolicyForm"; -import "@goauthentik/admin/policies/reputation/ReputationPolicyForm"; -import "@goauthentik/admin/policies/unique_password/UniquePasswordPolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/ProxyForm"; -import "@goauthentik/elements/wizard/FormWizardPage"; -import { FormWizardPage } from "@goauthentik/elements/wizard/FormWizardPage"; -import "@goauthentik/elements/wizard/TypeCreateWizardPage"; -import "@goauthentik/elements/wizard/Wizard"; -import type { Wizard } from "@goauthentik/elements/wizard/Wizard"; +import "#admin/policies/dummy/DummyPolicyForm"; +import "#admin/policies/event_matcher/EventMatcherPolicyForm"; +import "#admin/policies/expiry/ExpiryPolicyForm"; +import "#admin/policies/expression/ExpressionPolicyForm"; +import "#admin/policies/geoip/GeoIPPolicyForm"; +import "#admin/policies/password/PasswordPolicyForm"; +import "#admin/policies/reputation/ReputationPolicyForm"; +import "#admin/policies/unique_password/UniquePasswordPolicyForm"; +import "#elements/forms/ProxyForm"; +import "#elements/wizard/FormWizardPage"; +import "#elements/wizard/TypeCreateWizardPage"; +import "#elements/wizard/Wizard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import { FormWizardPage } from "#elements/wizard/FormWizardPage"; +import type { Wizard } from "#elements/wizard/Wizard"; + +import { PolicyBindingForm } from "#admin/policies/PolicyBindingForm"; + +import { PoliciesApi, Policy, PolicyBinding, TypeCreate } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { property, query } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { PoliciesApi, Policy, PolicyBinding, TypeCreate } from "@goauthentik/api"; - @customElement("ak-policy-wizard") export class PolicyWizard extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/policies/dummy/DummyPolicyForm.ts b/web/src/admin/policies/dummy/DummyPolicyForm.ts index 7c973fb581..4c2517713a 100644 --- a/web/src/admin/policies/dummy/DummyPolicyForm.ts +++ b/web/src/admin/policies/dummy/DummyPolicyForm.ts @@ -1,15 +1,17 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { DummyPolicy, PoliciesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-dummy-form") export class DummyPolicyForm extends BasePolicyForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts index d456eb96b9..ff5e52f98c 100644 --- a/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts +++ b/web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts @@ -1,13 +1,10 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { AdminApi, @@ -18,6 +15,11 @@ import { TypeCreate, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-event-matcher-form") export class EventMatcherPolicyForm extends BasePolicyForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts index 6f24bfff4c..67c04de9a8 100644 --- a/web/src/admin/policies/expiry/ExpiryPolicyForm.ts +++ b/web/src/admin/policies/expiry/ExpiryPolicyForm.ts @@ -1,15 +1,17 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { PasswordExpiryPolicy, PoliciesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-password-expiry-form") export class PasswordExpiryPolicyForm extends BasePolicyForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/policies/expression/ExpressionPolicyForm.ts b/web/src/admin/policies/expression/ExpressionPolicyForm.ts index 36ee965794..63279af864 100644 --- a/web/src/admin/policies/expression/ExpressionPolicyForm.ts +++ b/web/src/admin/policies/expression/ExpressionPolicyForm.ts @@ -1,18 +1,21 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { docLink } from "@goauthentik/common/global"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { docLink } from "#common/global"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { ExpressionPolicy, PoliciesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-expression-form") export class ExpressionPolicyForm extends BasePolicyForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/policies/geoip/CountryCache.ts b/web/src/admin/policies/geoip/CountryCache.ts index 076d314d86..0a132f4014 100644 --- a/web/src/admin/policies/geoip/CountryCache.ts +++ b/web/src/admin/policies/geoip/CountryCache.ts @@ -1,4 +1,4 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; import { DetailedCountry, PoliciesApi } from "@goauthentik/api"; diff --git a/web/src/admin/policies/geoip/GeoIPPolicyForm.ts b/web/src/admin/policies/geoip/GeoIPPolicyForm.ts index d11f374d8f..d6cb578275 100644 --- a/web/src/admin/policies/geoip/GeoIPPolicyForm.ts +++ b/web/src/admin/policies/geoip/GeoIPPolicyForm.ts @@ -1,18 +1,21 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/ak-dual-select"; -import { DataProvision, DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/ak-dual-select/index"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DataProvision, DualSelectPair } from "#elements/ak-dual-select/types"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { DetailedCountry, GeoIPPolicy, PoliciesApi } from "@goauthentik/api"; -import { countryCache } from "./CountryCache"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + +import { countryCache } from "./CountryCache.js"; function countryToPair(country: DetailedCountry): DualSelectPair { return [country.code, country.name, country.name]; diff --git a/web/src/admin/policies/password/PasswordPolicyForm.ts b/web/src/admin/policies/password/PasswordPolicyForm.ts index 5f1b8798f2..eecf43eca7 100644 --- a/web/src/admin/policies/password/PasswordPolicyForm.ts +++ b/web/src/admin/policies/password/PasswordPolicyForm.ts @@ -1,15 +1,17 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { PasswordPolicy, PoliciesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-password-form") export class PasswordPolicyForm extends BasePolicyForm { @state() diff --git a/web/src/admin/policies/reputation/ReputationListPage.ts b/web/src/admin/policies/reputation/ReputationListPage.ts index 62028cb4b8..a8466cfbea 100644 --- a/web/src/admin/policies/reputation/ReputationListPage.ts +++ b/web/src/admin/policies/reputation/ReputationListPage.ts @@ -1,18 +1,14 @@ -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; -import getUnicodeFlagIcon from "country-flag-icons/unicode"; +import "#admin/rbac/ObjectPermissionModal"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { PoliciesApi, @@ -20,6 +16,12 @@ import { Reputation, } from "@goauthentik/api"; +import getUnicodeFlagIcon from "country-flag-icons/unicode"; + +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-policy-reputation-list") export class ReputationListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/policies/reputation/ReputationPolicyForm.ts b/web/src/admin/policies/reputation/ReputationPolicyForm.ts index ac7e7645a4..5089da7d2e 100644 --- a/web/src/admin/policies/reputation/ReputationPolicyForm.ts +++ b/web/src/admin/policies/reputation/ReputationPolicyForm.ts @@ -1,15 +1,17 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { PoliciesApi, ReputationPolicy } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-reputation-form") export class ReputationPolicyForm extends BasePolicyForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts b/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts index aeb0f0af60..64326df97f 100644 --- a/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts +++ b/web/src/admin/policies/unique_password/UniquePasswordPolicyForm.ts @@ -1,15 +1,17 @@ -import { BasePolicyForm } from "@goauthentik/admin/policies/BasePolicyForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePolicyForm } from "#admin/policies/BasePolicyForm"; import { PoliciesApi, UniquePasswordPolicy } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-policy-password-uniqueness-form") export class UniquePasswordPolicyForm extends BasePolicyForm { async loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/BasePropertyMappingForm.ts b/web/src/admin/property-mappings/BasePropertyMappingForm.ts index 899f116cc7..372a6274ae 100644 --- a/web/src/admin/property-mappings/BasePropertyMappingForm.ts +++ b/web/src/admin/property-mappings/BasePropertyMappingForm.ts @@ -1,9 +1,10 @@ -import { docLink } from "@goauthentik/common/global"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import { docLink } from "#common/global"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; interface PropertyMapping { diff --git a/web/src/admin/property-mappings/PropertyMappingListPage.ts b/web/src/admin/property-mappings/PropertyMappingListPage.ts index 76d25ec000..a8ad8f9f2c 100644 --- a/web/src/admin/property-mappings/PropertyMappingListPage.ts +++ b/web/src/admin/property-mappings/PropertyMappingListPage.ts @@ -1,37 +1,38 @@ -import "@goauthentik/admin/property-mappings/PropertyMappingNotification"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderRACForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderRadiusForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderSAMLForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderSCIMForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderScopeForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceKerberosForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceLDAPForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceOAuthForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourcePlexForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceSAMLForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceSCIMForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingTestForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingWizard"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/property-mappings/PropertyMappingNotification"; +import "#admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm"; +import "#admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm"; +import "#admin/property-mappings/PropertyMappingProviderRACForm"; +import "#admin/property-mappings/PropertyMappingProviderRadiusForm"; +import "#admin/property-mappings/PropertyMappingProviderSAMLForm"; +import "#admin/property-mappings/PropertyMappingProviderSCIMForm"; +import "#admin/property-mappings/PropertyMappingProviderScopeForm"; +import "#admin/property-mappings/PropertyMappingSourceKerberosForm"; +import "#admin/property-mappings/PropertyMappingSourceLDAPForm"; +import "#admin/property-mappings/PropertyMappingSourceOAuthForm"; +import "#admin/property-mappings/PropertyMappingSourcePlexForm"; +import "#admin/property-mappings/PropertyMappingSourceSAMLForm"; +import "#admin/property-mappings/PropertyMappingSourceSCIMForm"; +import "#admin/property-mappings/PropertyMappingTestForm"; +import "#admin/property-mappings/PropertyMappingWizard"; +import "#admin/rbac/ObjectPermissionModal"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { PropertyMapping, PropertymappingsApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-property-mapping-list") export class PropertyMappingListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/property-mappings/PropertyMappingNotification.ts b/web/src/admin/property-mappings/PropertyMappingNotification.ts index dff00b822d..8c4af6cd72 100644 --- a/web/src/admin/property-mappings/PropertyMappingNotification.ts +++ b/web/src/admin/property-mappings/PropertyMappingNotification.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { NotificationWebhookMapping, PropertymappingsApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-notification-form") export class PropertyMappingNotification extends BasePropertyMappingForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts index 9e47b9d640..68045b47c0 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { GoogleWorkspaceProviderMapping, PropertymappingsApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-provider-google-workspace-form") export class PropertyMappingProviderGoogleWorkspaceForm extends BasePropertyMappingForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts index 4d56faeef9..f61b84830a 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { MicrosoftEntraProviderMapping, PropertymappingsApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-provider-microsoft-entra-form") export class PropertyMappingProviderMicrosoftEntraForm extends BasePropertyMappingForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts index 04e424eee1..5ada0f1126 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts @@ -1,20 +1,23 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { docLink } from "@goauthentik/common/global"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import type { RadioOption } from "@goauthentik/elements/forms/Radio"; +import "#elements/CodeMirror"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { docLink } from "#common/global"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import type { RadioOption } from "#elements/forms/Radio"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PropertymappingsApi, RACPropertyMapping } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + export const staticSettingOptions: RadioOption[] = [ { label: msg("Unconfigured"), diff --git a/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts index 2a3cc57bff..b0e156d8de 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PropertymappingsApi, RadiusProviderPropertyMapping } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-provider-radius-form") export class PropertyMappingProviderRadiusForm extends BasePropertyMappingForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts index 323a339faf..9149ee6f95 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts @@ -1,15 +1,17 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PropertymappingsApi, SAMLPropertyMapping } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-property-mapping-provider-saml-form") export class PropertyMappingProviderSAMLForm extends BasePropertyMappingForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts index 6969d548ca..542606910c 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PropertymappingsApi, SCIMMapping } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-provider-scim-form") export class PropertyMappingProviderSCIMForm extends BasePropertyMappingForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts b/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts index 26635c05b4..4c432471d2 100644 --- a/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts @@ -1,15 +1,17 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-property-mapping-provider-scope-form") export class PropertyMappingProviderScopeForm extends BasePropertyMappingForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts index ed07e67e7a..754e187bbb 100644 --- a/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSourceKerberosForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { KerberosSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-source-kerberos-form") export class PropertyMappingSourceKerberosForm extends BasePropertyMappingForm { docLink(): string { diff --git a/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts index 722dbbd12d..abf07bdf37 100644 --- a/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { LDAPSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-source-ldap-form") export class PropertyMappingSourceLDAPForm extends BasePropertyMappingForm { docLink(): string { diff --git a/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts index 17936b650b..46ec046311 100644 --- a/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { OAuthSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-source-oauth-form") export class PropertyMappingSourceOAuthForm extends BasePropertyMappingForm { docLink(): string { diff --git a/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts b/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts index abd295a33b..a8e17398dc 100644 --- a/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PlexSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-source-plex-form") export class PropertyMappingSourcePlexForm extends BasePropertyMappingForm { docLink(): string { diff --git a/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts index c045f34ba8..57b40011ce 100644 --- a/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PropertymappingsApi, SAMLSourcePropertyMapping } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-source-saml-form") export class PropertyMappingSourceSAMLForm extends BasePropertyMappingForm { docLink(): string { diff --git a/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts b/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts index cbb5e93ff6..1fe42e769e 100644 --- a/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts @@ -1,12 +1,14 @@ -import { BasePropertyMappingForm } from "@goauthentik/admin/property-mappings/BasePropertyMappingForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BasePropertyMappingForm } from "#admin/property-mappings/BasePropertyMappingForm"; import { PropertymappingsApi, SCIMSourcePropertyMapping } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-property-mapping-source-scim-form") export class PropertyMappingSourceSCIMForm extends BasePropertyMappingForm { docLink(): string { diff --git a/web/src/admin/property-mappings/PropertyMappingTestForm.ts b/web/src/admin/property-mappings/PropertyMappingTestForm.ts index ec21340978..9111fe07ab 100644 --- a/web/src/admin/property-mappings/PropertyMappingTestForm.ts +++ b/web/src/admin/property-mappings/PropertyMappingTestForm.ts @@ -1,15 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; -import YAML from "yaml"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { Form } from "#elements/forms/Form"; import { CoreApi, @@ -17,13 +13,20 @@ import { CoreUsersListRequest, Group, PropertyMapping, + PropertymappingsApi, PropertyMappingTestRequest, PropertyMappingTestResult, - PropertymappingsApi, RbacPermissionsAssignedByUsersListModelEnum, User, } from "@goauthentik/api"; +import YAML from "yaml"; + +import { msg } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-property-mapping-test-form") export class PolicyTestForm extends Form { @property({ attribute: false }) diff --git a/web/src/admin/property-mappings/PropertyMappingWizard.ts b/web/src/admin/property-mappings/PropertyMappingWizard.ts index 3ffe1fd78d..359a364144 100644 --- a/web/src/admin/property-mappings/PropertyMappingWizard.ts +++ b/web/src/admin/property-mappings/PropertyMappingWizard.ts @@ -1,36 +1,38 @@ -import "@goauthentik/admin/property-mappings/PropertyMappingNotification"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderRACForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderRadiusForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderSAMLForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderSCIMForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingProviderScopeForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceKerberosForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceLDAPForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceOAuthForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourcePlexForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceSAMLForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingSourceSCIMForm"; -import "@goauthentik/admin/property-mappings/PropertyMappingTestForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/ProxyForm"; -import "@goauthentik/elements/wizard/FormWizardPage"; -import "@goauthentik/elements/wizard/TypeCreateWizardPage"; -import "@goauthentik/elements/wizard/Wizard"; -import type { Wizard } from "@goauthentik/elements/wizard/Wizard"; +import "#admin/property-mappings/PropertyMappingNotification"; +import "#admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm"; +import "#admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm"; +import "#admin/property-mappings/PropertyMappingProviderRACForm"; +import "#admin/property-mappings/PropertyMappingProviderRadiusForm"; +import "#admin/property-mappings/PropertyMappingProviderSAMLForm"; +import "#admin/property-mappings/PropertyMappingProviderSCIMForm"; +import "#admin/property-mappings/PropertyMappingProviderScopeForm"; +import "#admin/property-mappings/PropertyMappingSourceKerberosForm"; +import "#admin/property-mappings/PropertyMappingSourceLDAPForm"; +import "#admin/property-mappings/PropertyMappingSourceOAuthForm"; +import "#admin/property-mappings/PropertyMappingSourcePlexForm"; +import "#admin/property-mappings/PropertyMappingSourceSAMLForm"; +import "#admin/property-mappings/PropertyMappingSourceSCIMForm"; +import "#admin/property-mappings/PropertyMappingTestForm"; +import "#elements/forms/ProxyForm"; +import "#elements/wizard/FormWizardPage"; +import "#elements/wizard/TypeCreateWizardPage"; +import "#elements/wizard/Wizard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import type { Wizard } from "#elements/wizard/Wizard"; + +import { PropertymappingsApi, TypeCreate } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { property, query } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { PropertymappingsApi, TypeCreate } from "@goauthentik/api"; - @customElement("ak-property-mapping-wizard") export class PropertyMappingWizard extends AKElement { static get styles() { diff --git a/web/src/admin/providers/BaseProviderForm.ts b/web/src/admin/providers/BaseProviderForm.ts index 3f6134046b..061ed5b84d 100644 --- a/web/src/admin/providers/BaseProviderForm.ts +++ b/web/src/admin/providers/BaseProviderForm.ts @@ -1,4 +1,4 @@ -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import { ModelForm } from "#elements/forms/ModelForm"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/providers/ProviderListPage.ts b/web/src/admin/providers/ProviderListPage.ts index 8e778b6b65..43d2a7f4ab 100644 --- a/web/src/admin/providers/ProviderListPage.ts +++ b/web/src/admin/providers/ProviderListPage.ts @@ -1,31 +1,32 @@ -import "@goauthentik/admin/applications/ApplicationWizardHint"; -import "@goauthentik/admin/providers/ProviderWizard"; -import "@goauthentik/admin/providers/google_workspace/GoogleWorkspaceProviderForm"; -import "@goauthentik/admin/providers/ldap/LDAPProviderForm"; -import "@goauthentik/admin/providers/microsoft_entra/MicrosoftEntraProviderForm"; -import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm"; -import "@goauthentik/admin/providers/proxy/ProxyProviderForm"; -import "@goauthentik/admin/providers/rac/RACProviderForm"; -import "@goauthentik/admin/providers/radius/RadiusProviderForm"; -import "@goauthentik/admin/providers/saml/SAMLProviderForm"; -import "@goauthentik/admin/providers/scim/SCIMProviderForm"; -import "@goauthentik/admin/providers/ssf/SSFProviderFormPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/applications/ApplicationWizardHint"; +import "#admin/providers/ProviderWizard"; +import "#admin/providers/google_workspace/GoogleWorkspaceProviderForm"; +import "#admin/providers/ldap/LDAPProviderForm"; +import "#admin/providers/microsoft_entra/MicrosoftEntraProviderForm"; +import "#admin/providers/oauth2/OAuth2ProviderForm"; +import "#admin/providers/proxy/ProxyProviderForm"; +import "#admin/providers/rac/RACProviderForm"; +import "#admin/providers/radius/RadiusProviderForm"; +import "#admin/providers/saml/SAMLProviderForm"; +import "#admin/providers/scim/SCIMProviderForm"; +import "#admin/providers/ssf/SSFProviderFormPage"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { Provider, ProvidersApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-list") export class ProviderListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/providers/ProviderViewPage.ts b/web/src/admin/providers/ProviderViewPage.ts index f9963f9502..c25b813ac3 100644 --- a/web/src/admin/providers/ProviderViewPage.ts +++ b/web/src/admin/providers/ProviderViewPage.ts @@ -8,20 +8,22 @@ import "#admin/providers/radius/RadiusProviderViewPage"; import "#admin/providers/saml/SAMLProviderViewPage"; import "#admin/providers/scim/SCIMProviderViewPage"; import "#admin/providers/ssf/SSFProviderViewPage"; -import { DEFAULT_CONFIG } from "#common/api/config"; import "#components/ak-page-header"; -import { AKElement } from "#elements/Base"; import "#elements/EmptyState"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; -import { CSSResult, TemplateResult, html } from "lit"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; + +import { Provider, ProvidersApi } from "@goauthentik/api"; + +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import { Provider, ProvidersApi } from "@goauthentik/api"; - @customElement("ak-provider-view") export class ProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/ProviderWizard.ts b/web/src/admin/providers/ProviderWizard.ts index 738cdccc42..4fb10af059 100644 --- a/web/src/admin/providers/ProviderWizard.ts +++ b/web/src/admin/providers/ProviderWizard.ts @@ -1,28 +1,30 @@ -import "@goauthentik/admin/common/ak-license-notice"; -import "@goauthentik/admin/providers/ldap/LDAPProviderForm"; -import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm"; -import "@goauthentik/admin/providers/proxy/ProxyProviderForm"; -import "@goauthentik/admin/providers/saml/SAMLProviderForm"; -import "@goauthentik/admin/providers/saml/SAMLProviderImportForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/ProxyForm"; -import "@goauthentik/elements/wizard/FormWizardPage"; -import "@goauthentik/elements/wizard/TypeCreateWizardPage"; -import { TypeCreateWizardPageLayouts } from "@goauthentik/elements/wizard/TypeCreateWizardPage"; -import "@goauthentik/elements/wizard/Wizard"; -import type { Wizard } from "@goauthentik/elements/wizard/Wizard"; +import "#admin/common/ak-license-notice"; +import "#admin/providers/ldap/LDAPProviderForm"; +import "#admin/providers/oauth2/OAuth2ProviderForm"; +import "#admin/providers/proxy/ProxyProviderForm"; +import "#admin/providers/saml/SAMLProviderForm"; +import "#admin/providers/saml/SAMLProviderImportForm"; +import "#elements/forms/ProxyForm"; +import "#elements/wizard/FormWizardPage"; +import "#elements/wizard/TypeCreateWizardPage"; +import "#elements/wizard/Wizard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import { TypeCreateWizardPageLayouts } from "#elements/wizard/TypeCreateWizardPage"; +import type { Wizard } from "#elements/wizard/Wizard"; + +import { ProvidersApi, TypeCreate } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { property, query } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { ProvidersApi, TypeCreate } from "@goauthentik/api"; - @customElement("ak-provider-wizard") export class ProviderWizard extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/providers/RelatedApplicationButton.ts b/web/src/admin/providers/RelatedApplicationButton.ts index c8ae28b5b8..61f7ab9d78 100644 --- a/web/src/admin/providers/RelatedApplicationButton.ts +++ b/web/src/admin/providers/RelatedApplicationButton.ts @@ -1,17 +1,18 @@ -import "@goauthentik/admin/applications/ApplicationForm"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Spinner"; -import "@goauthentik/elements/forms/ModalForm"; +import "#admin/applications/ApplicationForm"; +import "#elements/Spinner"; +import "#elements/forms/ModalForm"; + +import { AKElement } from "#elements/Base"; + +import { Provider } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { Provider } from "@goauthentik/api"; - @customElement("ak-provider-related-application") export class RelatedApplicationButton extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts index 9d282ae27c..540e54713f 100644 --- a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts +++ b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts @@ -1,22 +1,20 @@ -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; + +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; import { propertyMappingsProvider, propertyMappingsSelector, -} from "@goauthentik/admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers.js"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; - -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +} from "#admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers"; import { CoreApi, @@ -27,6 +25,11 @@ import { ProvidersApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-provider-google-workspace-form") export class GoogleWorkspaceProviderFormPage extends BaseProviderForm { loadInstance(pk: number): Promise { diff --git a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers.ts b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers.ts index e297727e95..ddee113dee 100644 --- a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers.ts +++ b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { GoogleWorkspaceProviderMapping, PropertymappingsApi } from "@goauthentik/api"; diff --git a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderGroupList.ts b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderGroupList.ts index fe8b547e56..4f989090fe 100644 --- a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderGroupList.ts +++ b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderGroupList.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncObjectForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncObjectForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { GoogleWorkspaceProviderGroup, @@ -15,6 +13,10 @@ import { SyncObjectModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-google-workspace-groups-list") export class GoogleWorkspaceProviderGroupList extends Table { @property({ type: Number }) diff --git a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderUserList.ts b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderUserList.ts index df06814633..868f361652 100644 --- a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderUserList.ts +++ b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderUserList.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncObjectForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncObjectForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { GoogleWorkspaceProviderUser, @@ -15,6 +13,10 @@ import { SyncObjectModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-google-workspace-users-list") export class GoogleWorkspaceProviderUserList extends Table { @property({ type: Number }) diff --git a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderViewPage.ts b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderViewPage.ts index 7d6fc3eaac..54831c4d02 100644 --- a/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderViewPage.ts +++ b/web/src/admin/providers/google_workspace/GoogleWorkspaceProviderViewPage.ts @@ -1,19 +1,28 @@ -import "@goauthentik/admin/providers/google_workspace/GoogleWorkspaceProviderForm"; -import "@goauthentik/admin/providers/google_workspace/GoogleWorkspaceProviderGroupList"; -import "@goauthentik/admin/providers/google_workspace/GoogleWorkspaceProviderUserList"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/sync/SyncStatusCard"; +import "#admin/providers/google_workspace/GoogleWorkspaceProviderForm"; +import "#admin/providers/google_workspace/GoogleWorkspaceProviderGroupList"; +import "#admin/providers/google_workspace/GoogleWorkspaceProviderUserList"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/ak-status-label"; +import "#components/events/ObjectChangelog"; +import "#elements/Tabs"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/ModalButton"; +import "#elements/sync/SyncStatusCard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + GoogleWorkspaceProvider, + ProvidersApi, + RbacPermissionsAssignedByUsersListModelEnum, + SyncStatus, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -28,13 +37,6 @@ import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - GoogleWorkspaceProvider, - ProvidersApi, - RbacPermissionsAssignedByUsersListModelEnum, - SyncStatus, -} from "@goauthentik/api"; - @customElement("ak-provider-google-workspace-view") export class GoogleWorkspaceProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/ldap/LDAPOptionsAndHelp.ts b/web/src/admin/providers/ldap/LDAPOptionsAndHelp.ts index da967a9a50..dee2aa3f1d 100644 --- a/web/src/admin/providers/ldap/LDAPOptionsAndHelp.ts +++ b/web/src/admin/providers/ldap/LDAPOptionsAndHelp.ts @@ -1,8 +1,8 @@ +import { LDAPAPIAccessMode } from "@goauthentik/api"; + import { msg } from "@lit/localize"; import { html } from "lit"; -import { LDAPAPIAccessMode } from "@goauthentik/api"; - export const bindModeOptions = [ { label: msg("Cached binding"), diff --git a/web/src/admin/providers/ldap/LDAPProviderForm.ts b/web/src/admin/providers/ldap/LDAPProviderForm.ts index 08bca515cc..07c7aa89b0 100644 --- a/web/src/admin/providers/ldap/LDAPProviderForm.ts +++ b/web/src/admin/providers/ldap/LDAPProviderForm.ts @@ -1,13 +1,16 @@ -import { WithBrandConfig } from "#elements/mixins/branding"; -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-branded-flow-search"; -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-branded-flow-search"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { WithBrandConfig } from "#elements/mixins/branding"; + +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; import { LDAPProvider, ProvidersApi } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + import { renderForm } from "./LDAPProviderFormForm.js"; @customElement("ak-provider-ldap-form") diff --git a/web/src/admin/providers/ldap/LDAPProviderFormForm.ts b/web/src/admin/providers/ldap/LDAPProviderFormForm.ts index dd1956accf..d427ea9a14 100644 --- a/web/src/admin/providers/ldap/LDAPProviderFormForm.ts +++ b/web/src/admin/providers/ldap/LDAPProviderFormForm.ts @@ -1,21 +1,17 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-branded-flow-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import "@goauthentik/components/ak-number-input"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/components/ak-textarea-input"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; - -import { msg } from "@lit/localize"; -import { html, nothing } from "lit"; -import { ifDefined } from "lit/directives/if-defined.js"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-branded-flow-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#components/ak-number-input"; +import "#components/ak-radio-input"; +import "#components/ak-text-input"; +import "#components/ak-textarea-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; import { CurrentBrand, @@ -24,6 +20,10 @@ import { ValidationError, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, nothing } from "lit"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { bindModeOptions, cryptoCertificateHelp, diff --git a/web/src/admin/providers/ldap/LDAPProviderFormHelpers.ts b/web/src/admin/providers/ldap/LDAPProviderFormHelpers.ts index 08c66e423d..e90255e91f 100644 --- a/web/src/admin/providers/ldap/LDAPProviderFormHelpers.ts +++ b/web/src/admin/providers/ldap/LDAPProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { LDAPSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; diff --git a/web/src/admin/providers/ldap/LDAPProviderViewPage.ts b/web/src/admin/providers/ldap/LDAPProviderViewPage.ts index 91e163dfdb..2f139f734a 100644 --- a/web/src/admin/providers/ldap/LDAPProviderViewPage.ts +++ b/web/src/admin/providers/ldap/LDAPProviderViewPage.ts @@ -1,18 +1,27 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/ldap/LDAPProviderForm"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { me } from "@goauthentik/common/users"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/ldap/LDAPProviderForm"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { me } from "#common/users"; + +import { AKElement } from "#elements/Base"; + +import { + LDAPProvider, + ProvidersApi, + RbacPermissionsAssignedByUsersListModelEnum, + SessionUser, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -28,13 +37,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - LDAPProvider, - ProvidersApi, - RbacPermissionsAssignedByUsersListModelEnum, - SessionUser, -} from "@goauthentik/api"; - @customElement("ak-provider-ldap-view") export class LDAPProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts index d2382c760c..a1b82c153a 100644 --- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts +++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderForm.ts @@ -1,21 +1,18 @@ -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; +import "#components/ak-hidden-text-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; import { propertyMappingsProvider, propertyMappingsSelector, -} from "@goauthentik/admin/providers/microsoft_entra/MicrosoftEntraProviderFormHelpers.js"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-hidden-text-input"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; - -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +} from "#admin/providers/microsoft_entra/MicrosoftEntraProviderFormHelpers"; import { CoreApi, @@ -26,6 +23,11 @@ import { ProvidersApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-provider-microsoft-entra-form") export class MicrosoftEntraProviderFormPage extends BaseProviderForm { loadInstance(pk: number): Promise { diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderFormHelpers.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderFormHelpers.ts index 168bd349a8..893c2f8bfb 100644 --- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderFormHelpers.ts +++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { MicrosoftEntraProviderMapping, PropertymappingsApi } from "@goauthentik/api"; diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderGroupList.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderGroupList.ts index 396f4fd460..c37dd80726 100644 --- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderGroupList.ts +++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderGroupList.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncObjectForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncObjectForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { MicrosoftEntraProviderGroup, @@ -15,6 +13,10 @@ import { SyncObjectModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-microsoft-entra-groups-list") export class MicrosoftEntraProviderGroupList extends Table { @property({ type: Number }) diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderPropertyMappings.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderPropertyMappings.ts index 6a9fa34dd5..716e5ff137 100644 --- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderPropertyMappings.ts +++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderPropertyMappings.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api"; diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderUserList.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderUserList.ts index a1ec577266..4eb418743a 100644 --- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderUserList.ts +++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderUserList.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncObjectForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncObjectForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { MicrosoftEntraProviderUser, @@ -15,6 +13,10 @@ import { SyncObjectModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-microsoft-entra-users-list") export class MicrosoftEntraProviderUserList extends Table { @property({ type: Number }) diff --git a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderViewPage.ts b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderViewPage.ts index 82ff332593..b87cc29cea 100644 --- a/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderViewPage.ts +++ b/web/src/admin/providers/microsoft_entra/MicrosoftEntraProviderViewPage.ts @@ -1,18 +1,27 @@ -import "@goauthentik/admin/providers/microsoft_entra/MicrosoftEntraProviderForm"; -import "@goauthentik/admin/providers/microsoft_entra/MicrosoftEntraProviderGroupList"; -import "@goauthentik/admin/providers/microsoft_entra/MicrosoftEntraProviderUserList"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/events/LogViewer"; +import "#admin/providers/microsoft_entra/MicrosoftEntraProviderForm"; +import "#admin/providers/microsoft_entra/MicrosoftEntraProviderGroupList"; +import "#admin/providers/microsoft_entra/MicrosoftEntraProviderUserList"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/events/ObjectChangelog"; +import "#elements/Tabs"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/ModalButton"; +import "#elements/events/LogViewer"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + MicrosoftEntraProvider, + ProvidersApi, + RbacPermissionsAssignedByUsersListModelEnum, + SyncStatus, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -27,13 +36,6 @@ import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - MicrosoftEntraProvider, - ProvidersApi, - RbacPermissionsAssignedByUsersListModelEnum, - SyncStatus, -} from "@goauthentik/api"; - @customElement("ak-provider-microsoft-entra-view") export class MicrosoftEntraProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts index 7481d669ab..591fac4432 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderForm.ts @@ -1,12 +1,14 @@ -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; + +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; + +import { ClientTypeEnum, OAuth2Provider, ProvidersApi } from "@goauthentik/api"; import { css } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { ClientTypeEnum, OAuth2Provider, ProvidersApi } from "@goauthentik/api"; - import { renderForm } from "./OAuth2ProviderFormForm.js"; const providerToSelect = (provider: OAuth2Provider) => [provider.pk, provider.name]; diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderFormForm.ts b/web/src/admin/providers/oauth2/OAuth2ProviderFormForm.ts index 7853e202d4..4e9ac7c8c6 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderFormForm.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderFormForm.ts @@ -1,26 +1,24 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { - IRedirectURIInput, - akOAuthRedirectURIInput, -} from "@goauthentik/admin/providers/oauth2/OAuth2ProviderRedirectURI"; -import { ascii_letters, digits, randomString } from "@goauthentik/common/utils"; -import "@goauthentik/components/ak-hidden-text-input"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/components/ak-textarea-input"; -import "@goauthentik/elements/ak-array-input.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#components/ak-hidden-text-input"; +import "#components/ak-radio-input"; +import "#components/ak-text-input"; +import "#components/ak-textarea-input"; +import "#elements/ak-array-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { html } from "lit"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { ascii_letters, digits, randomString } from "#common/utils"; + +import { + akOAuthRedirectURIInput, + IRedirectURIInput, +} from "#admin/providers/oauth2/OAuth2ProviderRedirectURI"; import { ClientTypeEnum, @@ -33,6 +31,10 @@ import { ValidationError, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html } from "lit"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./OAuth2ProviderFormHelpers.js"; import { oauth2ProvidersProvider, oauth2ProvidersSelector } from "./OAuth2ProvidersProvider.js"; import { oauth2SourcesProvider, oauth2SourcesSelector } from "./OAuth2Sources.js"; diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderFormHelpers.ts b/web/src/admin/providers/oauth2/OAuth2ProviderFormHelpers.ts index 676f42091b..9124fd1c22 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderFormHelpers.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api"; diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderRedirectURI.ts b/web/src/admin/providers/oauth2/OAuth2ProviderRedirectURI.ts index 1c6159cd10..73e6a8ee53 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderRedirectURI.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderRedirectURI.ts @@ -1,6 +1,10 @@ -import "@goauthentik/admin/providers/oauth2/OAuth2ProviderRedirectURI"; -import { AkControlElement } from "@goauthentik/elements/AkControlElement.js"; -import { type Spread } from "@goauthentik/elements/types"; +import "#admin/providers/oauth2/OAuth2ProviderRedirectURI"; + +import { AkControlElement } from "#elements/AkControlElement"; +import { type Spread } from "#elements/types"; + +import { MatchingModeEnum, RedirectURI } from "@goauthentik/api"; + import { spread } from "@open-wc/lit-helpers"; import { msg } from "@lit/localize"; @@ -12,8 +16,6 @@ import PFFormControl from "@patternfly/patternfly/components/FormControl/form-co import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-group.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { MatchingModeEnum, RedirectURI } from "@goauthentik/api"; - export interface IRedirectURIInput { redirectURI: RedirectURI; } diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts b/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts index fdf85dbf5c..ab0b6e96bf 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts @@ -1,20 +1,36 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import renderDescriptionList from "@goauthentik/components/DescriptionList"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/ak-mdx"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/oauth2/OAuth2ProviderForm"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/EmptyState"; +import "#elements/Tabs"; +import "#elements/ak-mdx/index"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import renderDescriptionList from "#components/DescriptionList"; + +import { + ClientTypeEnum, + CoreApi, + CoreUsersListRequest, + OAuth2Provider, + OAuth2ProviderSetupURLs, + PropertyMappingPreview, + ProvidersApi, + RbacPermissionsAssignedByUsersListModelEnum, + User, +} from "@goauthentik/api"; + import MDProviderOAuth2 from "~docs/add-secure-apps/providers/oauth2/index.mdx"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; @@ -29,18 +45,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - ClientTypeEnum, - CoreApi, - CoreUsersListRequest, - OAuth2Provider, - OAuth2ProviderSetupURLs, - PropertyMappingPreview, - ProvidersApi, - RbacPermissionsAssignedByUsersListModelEnum, - User, -} from "@goauthentik/api"; - export function TypeToLabel(type?: ClientTypeEnum): string { if (!type) return ""; switch (type) { diff --git a/web/src/admin/providers/oauth2/OAuth2ProvidersProvider.ts b/web/src/admin/providers/oauth2/OAuth2ProvidersProvider.ts index c7f4024e9a..86bfffac76 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProvidersProvider.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProvidersProvider.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { OAuth2Provider, ProvidersApi } from "@goauthentik/api"; diff --git a/web/src/admin/providers/oauth2/OAuth2Sources.ts b/web/src/admin/providers/oauth2/OAuth2Sources.ts index 73e571839f..2f77dc4ccb 100644 --- a/web/src/admin/providers/oauth2/OAuth2Sources.ts +++ b/web/src/admin/providers/oauth2/OAuth2Sources.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { OAuthSource, SourcesApi } from "@goauthentik/api"; diff --git a/web/src/admin/providers/proxy/ProxyProviderForm.ts b/web/src/admin/providers/proxy/ProxyProviderForm.ts index 8e3c527719..6723759b6f 100644 --- a/web/src/admin/providers/proxy/ProxyProviderForm.ts +++ b/web/src/admin/providers/proxy/ProxyProviderForm.ts @@ -1,7 +1,11 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; + +import { ProvidersApi, ProxyMode, ProxyProvider } from "@goauthentik/api"; import { CSSResult } from "lit"; import { customElement, state } from "lit/decorators.js"; @@ -10,9 +14,7 @@ import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFList from "@patternfly/patternfly/components/List/list.css"; import PFSpacing from "@patternfly/patternfly/utilities/Spacing/spacing.css"; -import { ProvidersApi, ProxyMode, ProxyProvider } from "@goauthentik/api"; - -import { SetMode, SetShowHttpBasic, renderForm } from "./ProxyProviderFormForm.js"; +import { renderForm, SetMode, SetShowHttpBasic } from "./ProxyProviderFormForm.js"; @customElement("ak-provider-proxy-form") export class ProxyProviderFormPage extends BaseProviderForm { diff --git a/web/src/admin/providers/proxy/ProxyProviderFormForm.ts b/web/src/admin/providers/proxy/ProxyProviderFormForm.ts index df31de7509..2523893e79 100644 --- a/web/src/admin/providers/proxy/ProxyProviderFormForm.ts +++ b/web/src/admin/providers/proxy/ProxyProviderFormForm.ts @@ -1,24 +1,20 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#components/ak-toggle-group"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; + import { oauth2ProviderSelector, oauth2ProvidersProvider, -} from "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm"; +} from "#admin/providers/oauth2/OAuth2ProviderForm"; import { oauth2SourcesProvider, oauth2SourcesSelector, -} from "@goauthentik/admin/providers/oauth2/OAuth2Sources.js"; -import "@goauthentik/components/ak-toggle-group"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; -import { match } from "ts-pattern"; - -import { msg } from "@lit/localize"; -import { html, nothing } from "lit"; -import { ifDefined } from "lit/directives/if-defined.js"; +} from "#admin/providers/oauth2/OAuth2Sources"; import { FlowsInstancesListDesignationEnum, @@ -27,6 +23,12 @@ import { ValidationError, } from "@goauthentik/api"; +import { match } from "ts-pattern"; + +import { msg } from "@lit/localize"; +import { html, nothing } from "lit"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./ProxyProviderFormHelpers.js"; export type ProxyModeValue = { value: ProxyMode }; diff --git a/web/src/admin/providers/proxy/ProxyProviderFormHelpers.ts b/web/src/admin/providers/proxy/ProxyProviderFormHelpers.ts index 5cd9807193..a22ba4ccfa 100644 --- a/web/src/admin/providers/proxy/ProxyProviderFormHelpers.ts +++ b/web/src/admin/providers/proxy/ProxyProviderFormHelpers.ts @@ -1,4 +1,4 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api"; diff --git a/web/src/admin/providers/proxy/ProxyProviderViewPage.ts b/web/src/admin/providers/proxy/ProxyProviderViewPage.ts index be26428c83..1f01fa6ccc 100644 --- a/web/src/admin/providers/proxy/ProxyProviderViewPage.ts +++ b/web/src/admin/providers/proxy/ProxyProviderViewPage.ts @@ -1,19 +1,29 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/proxy/ProxyProviderForm"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/ak-mdx"; -import type { Replacer } from "@goauthentik/elements/ak-mdx"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { getURLParam } from "@goauthentik/elements/router/RouteMatch"; -import { formatSlug } from "@goauthentik/elements/router/utils.js"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/proxy/ProxyProviderForm"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/ak-status-label"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/ak-mdx/index"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import type { Replacer } from "#elements/ak-mdx/index"; +import { AKElement } from "#elements/Base"; +import { getURLParam } from "#elements/router/RouteMatch"; +import { formatSlug } from "#elements/router/utils"; + +import { + ProvidersApi, + ProxyMode, + ProxyProvider, + RbacPermissionsAssignedByUsersListModelEnum, +} from "@goauthentik/api"; + import MDCaddyStandalone from "~docs/add-secure-apps/providers/proxy/_caddy_standalone.md"; import MDNginxIngress from "~docs/add-secure-apps/providers/proxy/_nginx_ingress.md"; import MDNginxPM from "~docs/add-secure-apps/providers/proxy/_nginx_proxy_manager.md"; @@ -24,7 +34,7 @@ import MDTraefikStandalone from "~docs/add-secure-apps/providers/proxy/_traefik_ import MDHeaderAuthentication from "~docs/add-secure-apps/providers/proxy/header_authentication.mdx"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; @@ -39,13 +49,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - ProvidersApi, - ProxyMode, - ProxyProvider, - RbacPermissionsAssignedByUsersListModelEnum, -} from "@goauthentik/api"; - export function ModeToLabel(action?: ProxyMode): string { if (!action) return ""; switch (action) { diff --git a/web/src/admin/providers/rac/ConnectionTokenList.ts b/web/src/admin/providers/rac/ConnectionTokenList.ts index 42a36ba1fa..71dac0e7c8 100644 --- a/web/src/admin/providers/rac/ConnectionTokenList.ts +++ b/web/src/admin/providers/rac/ConnectionTokenList.ts @@ -1,19 +1,20 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse, Table } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { ConnectionToken, RacApi, RACProvider } from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { ConnectionToken, RACProvider, RacApi } from "@goauthentik/api"; - @customElement("ak-rac-connection-token-list") export class ConnectionTokenListPage extends Table { checkbox = true; diff --git a/web/src/admin/providers/rac/EndpointForm.ts b/web/src/admin/providers/rac/EndpointForm.ts index 216ba562e3..355ac24470 100644 --- a/web/src/admin/providers/rac/EndpointForm.ts +++ b/web/src/admin/providers/rac/EndpointForm.ts @@ -1,19 +1,22 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import "#components/ak-radio-input"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; + +import { AuthModeEnum, Endpoint, ProtocolEnum, RacApi } from "@goauthentik/api"; + import YAML from "yaml"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { AuthModeEnum, Endpoint, ProtocolEnum, RacApi } from "@goauthentik/api"; - import { propertyMappingsProvider, propertyMappingsSelector } from "./RACProviderFormHelpers.js"; @customElement("ak-rac-endpoint-form") diff --git a/web/src/admin/providers/rac/EndpointList.ts b/web/src/admin/providers/rac/EndpointList.ts index 56c8aa1037..2f04744fa1 100644 --- a/web/src/admin/providers/rac/EndpointList.ts +++ b/web/src/admin/providers/rac/EndpointList.ts @@ -1,27 +1,28 @@ -import "@goauthentik/admin/policies/BoundPoliciesList"; -import "@goauthentik/admin/providers/rac/EndpointForm"; -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse, Table } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/policies/BoundPoliciesList"; +import "#admin/providers/rac/EndpointForm"; +import "#admin/rbac/ObjectPermissionModal"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { Endpoint, - RACProvider, RacApi, + RACProvider, RbacPermissionsAssignedByUsersListModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; + @customElement("ak-rac-endpoint-list") export class EndpointListPage extends Table { expandable = true; diff --git a/web/src/admin/providers/rac/RACProviderForm.ts b/web/src/admin/providers/rac/RACProviderForm.ts index e4b5c05c51..b29832e3f5 100644 --- a/web/src/admin/providers/rac/RACProviderForm.ts +++ b/web/src/admin/providers/rac/RACProviderForm.ts @@ -1,23 +1,26 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-branded-flow-search"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-branded-flow-search"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; + +import { FlowsInstancesListDesignationEnum, ProvidersApi, RACProvider } from "@goauthentik/api"; + import YAML from "yaml"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { FlowsInstancesListDesignationEnum, ProvidersApi, RACProvider } from "@goauthentik/api"; - import { propertyMappingsProvider, propertyMappingsSelector } from "./RACProviderFormHelpers.js"; @customElement("ak-provider-rac-form") diff --git a/web/src/admin/providers/rac/RACProviderFormHelpers.ts b/web/src/admin/providers/rac/RACProviderFormHelpers.ts index 3da5619cd1..3d9bb02a49 100644 --- a/web/src/admin/providers/rac/RACProviderFormHelpers.ts +++ b/web/src/admin/providers/rac/RACProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, RACPropertyMapping } from "@goauthentik/api"; diff --git a/web/src/admin/providers/rac/RACProviderViewPage.ts b/web/src/admin/providers/rac/RACProviderViewPage.ts index ae21bd62fa..6bbce165ba 100644 --- a/web/src/admin/providers/rac/RACProviderViewPage.ts +++ b/web/src/admin/providers/rac/RACProviderViewPage.ts @@ -1,21 +1,29 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/rac/ConnectionTokenList"; -import "@goauthentik/admin/providers/rac/EndpointForm"; -import "@goauthentik/admin/providers/rac/EndpointList"; -import "@goauthentik/admin/providers/rac/RACProviderForm"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/rac/ConnectionTokenList"; +import "#admin/providers/rac/EndpointForm"; +import "#admin/providers/rac/EndpointList"; +import "#admin/providers/rac/RACProviderForm"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/ak-status-label"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + ProvidersApi, + RACProvider, + RbacPermissionsAssignedByUsersListModelEnum, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; @@ -30,12 +38,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - ProvidersApi, - RACProvider, - RbacPermissionsAssignedByUsersListModelEnum, -} from "@goauthentik/api"; - @customElement("ak-provider-rac-view") export class RACProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/radius/RadiusProviderForm.ts b/web/src/admin/providers/radius/RadiusProviderForm.ts index ea810602fe..7f51293638 100644 --- a/web/src/admin/providers/radius/RadiusProviderForm.ts +++ b/web/src/admin/providers/radius/RadiusProviderForm.ts @@ -1,11 +1,13 @@ -import { WithBrandConfig } from "#elements/mixins/branding"; -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { customElement } from "lit/decorators.js"; +import { WithBrandConfig } from "#elements/mixins/branding"; + +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; import { ProvidersApi, RadiusProvider } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + import { renderForm } from "./RadiusProviderFormForm.js"; @customElement("ak-provider-radius-form") diff --git a/web/src/admin/providers/radius/RadiusProviderFormForm.ts b/web/src/admin/providers/radius/RadiusProviderFormForm.ts index a99ae46b96..6fecf3d3f2 100644 --- a/web/src/admin/providers/radius/RadiusProviderFormForm.ts +++ b/web/src/admin/providers/radius/RadiusProviderFormForm.ts @@ -1,15 +1,12 @@ -import "@goauthentik/admin/common/ak-flow-search/ak-branded-flow-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { ascii_letters, digits, randomString } from "@goauthentik/common/utils"; -import "@goauthentik/components/ak-hidden-text-input"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-branded-flow-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#components/ak-hidden-text-input"; +import "#components/ak-text-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { html } from "lit"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { ascii_letters, digits, randomString } from "#common/utils"; import { CurrentBrand, @@ -18,6 +15,10 @@ import { ValidationError, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html } from "lit"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./RadiusProviderFormHelpers.js"; const mfaSupportHelp = msg( diff --git a/web/src/admin/providers/radius/RadiusProviderFormHelpers.ts b/web/src/admin/providers/radius/RadiusProviderFormHelpers.ts index 33843d2201..45ee93b776 100644 --- a/web/src/admin/providers/radius/RadiusProviderFormHelpers.ts +++ b/web/src/admin/providers/radius/RadiusProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, RadiusProviderPropertyMapping } from "@goauthentik/api"; diff --git a/web/src/admin/providers/radius/RadiusProviderViewPage.ts b/web/src/admin/providers/radius/RadiusProviderViewPage.ts index 913f3faa98..bf4ac71d8f 100644 --- a/web/src/admin/providers/radius/RadiusProviderViewPage.ts +++ b/web/src/admin/providers/radius/RadiusProviderViewPage.ts @@ -1,17 +1,25 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/radius/RadiusProviderForm"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/radius/RadiusProviderForm"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + ProvidersApi, + RadiusProvider, + RbacPermissionsAssignedByUsersListModelEnum, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -24,12 +32,6 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import { - ProvidersApi, - RadiusProvider, - RbacPermissionsAssignedByUsersListModelEnum, -} from "@goauthentik/api"; - @customElement("ak-provider-radius-view") export class RadiusProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/saml/SAMLProviderForm.ts b/web/src/admin/providers/saml/SAMLProviderForm.ts index a55a3f3b06..f537b890ce 100644 --- a/web/src/admin/providers/saml/SAMLProviderForm.ts +++ b/web/src/admin/providers/saml/SAMLProviderForm.ts @@ -1,11 +1,12 @@ -import { type AkCryptoCertificateSearch } from "@goauthentik/admin/common/ak-crypto-certificate-search"; -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { customElement, state } from "lit/decorators.js"; +import { type AkCryptoCertificateSearch } from "#admin/common/ak-crypto-certificate-search"; +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; import { ProvidersApi, SAMLProvider } from "@goauthentik/api"; +import { customElement, state } from "lit/decorators.js"; + import { renderForm } from "./SAMLProviderFormForm.js"; @customElement("ak-provider-saml-form") diff --git a/web/src/admin/providers/saml/SAMLProviderFormForm.ts b/web/src/admin/providers/saml/SAMLProviderFormForm.ts index 1ac1372f11..edf08180a8 100644 --- a/web/src/admin/providers/saml/SAMLProviderFormForm.ts +++ b/web/src/admin/providers/saml/SAMLProviderFormForm.ts @@ -1,16 +1,13 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { html, nothing } from "lit"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; import { FlowsInstancesListDesignationEnum, @@ -22,8 +19,12 @@ import { ValidationError, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, nothing } from "lit"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./SAMLProviderFormHelpers.js"; -import { digestAlgorithmOptions, signatureAlgorithmOptions } from "./SAMLProviderOptions"; +import { digestAlgorithmOptions, signatureAlgorithmOptions } from "./SAMLProviderOptions.js"; const serviceProviderBindingOptions = [ { diff --git a/web/src/admin/providers/saml/SAMLProviderFormHelpers.ts b/web/src/admin/providers/saml/SAMLProviderFormHelpers.ts index 54e8c789e2..f61c4ed605 100644 --- a/web/src/admin/providers/saml/SAMLProviderFormHelpers.ts +++ b/web/src/admin/providers/saml/SAMLProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, SAMLPropertyMapping } from "@goauthentik/api"; diff --git a/web/src/admin/providers/saml/SAMLProviderImportForm.ts b/web/src/admin/providers/saml/SAMLProviderImportForm.ts index 46c5866f15..3c150d2d40 100644 --- a/web/src/admin/providers/saml/SAMLProviderImportForm.ts +++ b/web/src/admin/providers/saml/SAMLProviderImportForm.ts @@ -1,16 +1,18 @@ -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search-no-default"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { SentryIgnoredError } from "@goauthentik/common/sentry"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-flow-search-no-default"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { SentryIgnoredError } from "#common/sentry/index"; + +import { Form } from "#elements/forms/Form"; import { FlowsInstancesListDesignationEnum, ProvidersApi, SAMLProvider } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-provider-saml-import-form") export class SAMLProviderImportForm extends Form { getSuccessMessage(): string { diff --git a/web/src/admin/providers/saml/SAMLProviderOptions.ts b/web/src/admin/providers/saml/SAMLProviderOptions.ts index 3ab0e4dd59..3a0375d61f 100644 --- a/web/src/admin/providers/saml/SAMLProviderOptions.ts +++ b/web/src/admin/providers/saml/SAMLProviderOptions.ts @@ -1,7 +1,7 @@ -import { msg } from "@lit/localize"; - import { DigestAlgorithmEnum, SignatureAlgorithmEnum, SpBindingEnum } from "@goauthentik/api"; +import { msg } from "@lit/localize"; + type Option = [string, T, boolean?]; function toOptions(options: Option[]) { diff --git a/web/src/admin/providers/saml/SAMLProviderViewPage.ts b/web/src/admin/providers/saml/SAMLProviderViewPage.ts index 9ca3a5bcc1..ebccd8ab9c 100644 --- a/web/src/admin/providers/saml/SAMLProviderViewPage.ts +++ b/web/src/admin/providers/saml/SAMLProviderViewPage.ts @@ -1,23 +1,38 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/saml/SAMLProviderForm"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { MessageLevel } from "@goauthentik/common/messages"; -import renderDescriptionList from "@goauthentik/components/DescriptionList"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/saml/SAMLProviderForm"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/EmptyState"; +import "#elements/Tabs"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { MessageLevel } from "#common/messages"; + +import { AKElement } from "#elements/Base"; +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { showMessage } from "#elements/messages/MessageContainer"; + +import renderDescriptionList from "#components/DescriptionList"; + +import { + CertificateKeyPair, + CoreApi, + CoreUsersListRequest, + CryptoApi, + ProvidersApi, + RbacPermissionsAssignedByUsersListModelEnum, + SAMLMetadata, + SAMLProvider, + User, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -33,18 +48,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - CertificateKeyPair, - CoreApi, - CoreUsersListRequest, - CryptoApi, - ProvidersApi, - RbacPermissionsAssignedByUsersListModelEnum, - SAMLMetadata, - SAMLProvider, - User, -} from "@goauthentik/api"; - interface SAMLPreviewAttribute { attributes: { Name: string; diff --git a/web/src/admin/providers/scim/SCIMProviderForm.ts b/web/src/admin/providers/scim/SCIMProviderForm.ts index 4f88bee8d5..556d02c8a7 100644 --- a/web/src/admin/providers/scim/SCIMProviderForm.ts +++ b/web/src/admin/providers/scim/SCIMProviderForm.ts @@ -1,10 +1,11 @@ -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { customElement } from "lit/decorators.js"; +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; import { ProvidersApi, SCIMProvider } from "@goauthentik/api"; +import { customElement } from "lit/decorators.js"; + import { renderForm } from "./SCIMProviderFormForm.js"; @customElement("ak-provider-scim-form") diff --git a/web/src/admin/providers/scim/SCIMProviderFormForm.ts b/web/src/admin/providers/scim/SCIMProviderFormForm.ts index a3345d1077..04f53a3835 100644 --- a/web/src/admin/providers/scim/SCIMProviderFormForm.ts +++ b/web/src/admin/providers/scim/SCIMProviderFormForm.ts @@ -1,14 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-hidden-text-input"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-hidden-text-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { html } from "lit"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; import { CompatibilityModeEnum, @@ -19,6 +16,10 @@ import { ValidationError, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html } from "lit"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./SCIMProviderFormHelpers.js"; export function renderForm(provider?: Partial, errors: ValidationError = {}) { diff --git a/web/src/admin/providers/scim/SCIMProviderFormHelpers.ts b/web/src/admin/providers/scim/SCIMProviderFormHelpers.ts index 9efd2c3eca..0306a5adae 100644 --- a/web/src/admin/providers/scim/SCIMProviderFormHelpers.ts +++ b/web/src/admin/providers/scim/SCIMProviderFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, SCIMMapping } from "@goauthentik/api"; diff --git a/web/src/admin/providers/scim/SCIMProviderGroupList.ts b/web/src/admin/providers/scim/SCIMProviderGroupList.ts index cd0c1ca552..2eeadf9527 100644 --- a/web/src/admin/providers/scim/SCIMProviderGroupList.ts +++ b/web/src/admin/providers/scim/SCIMProviderGroupList.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncObjectForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncObjectForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { ProvidersApi, @@ -15,6 +13,10 @@ import { SyncObjectModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-scim-groups-list") export class SCIMProviderGroupList extends Table { @property({ type: Number }) diff --git a/web/src/admin/providers/scim/SCIMProviderUserList.ts b/web/src/admin/providers/scim/SCIMProviderUserList.ts index 1e28d1eecd..85fc5b260b 100644 --- a/web/src/admin/providers/scim/SCIMProviderUserList.ts +++ b/web/src/admin/providers/scim/SCIMProviderUserList.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncObjectForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncObjectForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { ProvidersApi, @@ -15,6 +13,10 @@ import { SyncObjectModelEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-provider-scim-users-list") export class SCIMProviderUserList extends Table { @property({ type: Number }) diff --git a/web/src/admin/providers/scim/SCIMProviderViewPage.ts b/web/src/admin/providers/scim/SCIMProviderViewPage.ts index 550335bc2d..8166d4e4f3 100644 --- a/web/src/admin/providers/scim/SCIMProviderViewPage.ts +++ b/web/src/admin/providers/scim/SCIMProviderViewPage.ts @@ -1,22 +1,31 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/scim/SCIMProviderForm"; -import "@goauthentik/admin/providers/scim/SCIMProviderGroupList"; -import "@goauthentik/admin/providers/scim/SCIMProviderUserList"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/ak-mdx"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/sync/SyncStatusCard"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/scim/SCIMProviderForm"; +import "#admin/providers/scim/SCIMProviderGroupList"; +import "#admin/providers/scim/SCIMProviderUserList"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#components/ak-status-label"; +import "#components/events/ObjectChangelog"; +import "#elements/Tabs"; +import "#elements/ak-mdx/index"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/ModalButton"; +import "#elements/sync/SyncStatusCard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + ProvidersApi, + RbacPermissionsAssignedByUsersListModelEnum, + SCIMProvider, +} from "@goauthentik/api"; + import MDSCIMProvider from "~docs/add-secure-apps/providers/scim/index.md"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; @@ -32,12 +41,6 @@ import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - ProvidersApi, - RbacPermissionsAssignedByUsersListModelEnum, - SCIMProvider, -} from "@goauthentik/api"; - @customElement("ak-provider-scim-view") export class SCIMProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/ssf/SSFProviderFormPage.ts b/web/src/admin/providers/ssf/SSFProviderFormPage.ts index b5fc6c0e07..cb0e70acea 100644 --- a/web/src/admin/providers/ssf/SSFProviderFormPage.ts +++ b/web/src/admin/providers/ssf/SSFProviderFormPage.ts @@ -1,25 +1,27 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm"; +import "#admin/common/ak-crypto-certificate-search"; +import "#components/ak-text-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseProviderForm } from "#admin/providers/BaseProviderForm"; import { oauth2ProvidersProvider, oauth2ProvidersSelector, -} from "@goauthentik/admin/providers/oauth2/OAuth2ProvidersProvider"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; - -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +} from "#admin/providers/oauth2/OAuth2ProvidersProvider"; import { ProvidersApi, SSFProvider } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + /** * Form page for SSF Authentication Method * diff --git a/web/src/admin/providers/ssf/SSFProviderViewPage.ts b/web/src/admin/providers/ssf/SSFProviderViewPage.ts index bd0615a8ff..6650e0613d 100644 --- a/web/src/admin/providers/ssf/SSFProviderViewPage.ts +++ b/web/src/admin/providers/ssf/SSFProviderViewPage.ts @@ -1,18 +1,26 @@ -import "@goauthentik/admin/providers/RelatedApplicationButton"; -import "@goauthentik/admin/providers/ssf/SSFProviderFormPage"; -import "@goauthentik/admin/providers/ssf/StreamTable"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; +import "#admin/providers/RelatedApplicationButton"; +import "#admin/providers/ssf/SSFProviderFormPage"; +import "#admin/providers/ssf/StreamTable"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/EmptyState"; +import "#elements/Tabs"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + ProvidersApi, + RbacPermissionsAssignedByUsersListModelEnum, + SSFProvider, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; @@ -27,12 +35,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - ProvidersApi, - RbacPermissionsAssignedByUsersListModelEnum, - SSFProvider, -} from "@goauthentik/api"; - @customElement("ak-provider-ssf-view") export class SSFProviderViewPage extends AKElement { @property({ type: Number }) diff --git a/web/src/admin/providers/ssf/StreamTable.ts b/web/src/admin/providers/ssf/StreamTable.ts index 989a2cd95a..0e13559fca 100644 --- a/web/src/admin/providers/ssf/StreamTable.ts +++ b/web/src/admin/providers/ssf/StreamTable.ts @@ -1,17 +1,18 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { SSFStream, SsfApi } from "@goauthentik/api"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { SsfApi, SSFStream } from "@goauthentik/api"; + +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; @customElement("ak-provider-ssf-stream-list") export class SSFProviderStreamList extends Table { diff --git a/web/src/admin/rbac/InitialPermissionsForm.ts b/web/src/admin/rbac/InitialPermissionsForm.ts index 6f8bdd096f..e70d05dca6 100644 --- a/web/src/admin/rbac/InitialPermissionsForm.ts +++ b/web/src/admin/rbac/InitialPermissionsForm.ts @@ -1,17 +1,15 @@ -import { InitialPermissionsModeToLabel } from "@goauthentik/admin/rbac/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider"; -import { DataProvision, DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DataProvision, DualSelectPair } from "#elements/ak-dual-select/types"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { InitialPermissionsModeToLabel } from "#admin/rbac/utils"; import { InitialPermissions, @@ -22,6 +20,11 @@ import { Role, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + export function rbacPermissionPair(item: Permission): DualSelectPair { return [item.id.toString(), html`
${item.name}
`, item.name]; } diff --git a/web/src/admin/rbac/InitialPermissionsListPage.ts b/web/src/admin/rbac/InitialPermissionsListPage.ts index fb1808ed08..de034077b6 100644 --- a/web/src/admin/rbac/InitialPermissionsListPage.ts +++ b/web/src/admin/rbac/InitialPermissionsListPage.ts @@ -1,20 +1,21 @@ import "#admin/rbac/InitialPermissionsForm"; -import { DEFAULT_CONFIG } from "#common/api/config"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; import "#elements/forms/DeleteBulkForm"; import "#elements/forms/ModalForm"; -import { PaginatedResponse } from "#elements/table/Table"; -import { TableColumn } from "#elements/table/Table"; -import { TablePage } from "#elements/table/TablePage"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { InitialPermissions, RbacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-initial-permissions-list") export class InitialPermissionsListPage extends TablePage { checkbox = true; diff --git a/web/src/admin/rbac/ObjectPermissionModal.ts b/web/src/admin/rbac/ObjectPermissionModal.ts index 1ddb7f5de9..c99ccdff9e 100644 --- a/web/src/admin/rbac/ObjectPermissionModal.ts +++ b/web/src/admin/rbac/ObjectPermissionModal.ts @@ -1,17 +1,18 @@ -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/ModalForm"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#elements/forms/ModalForm"; + +import { AKElement } from "#elements/Base"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; - /** * This is a bit of a hack to get the viewport checking from ModelForm, * even though we actually don't need a form here. diff --git a/web/src/admin/rbac/ObjectPermissionsPage.ts b/web/src/admin/rbac/ObjectPermissionsPage.ts index 6f3d612ccc..3dfb6420bb 100644 --- a/web/src/admin/rbac/ObjectPermissionsPage.ts +++ b/web/src/admin/rbac/ObjectPermissionsPage.ts @@ -1,11 +1,14 @@ -import "@goauthentik/admin/rbac/RoleObjectPermissionTable"; -import "@goauthentik/admin/rbac/UserObjectPermissionTable"; -import "@goauthentik/admin/roles/RoleAssignedGlobalPermissionsTable"; -import "@goauthentik/admin/roles/RoleAssignedObjectPermissionTable"; -import "@goauthentik/admin/users/UserAssignedGlobalPermissionsTable"; -import "@goauthentik/admin/users/UserAssignedObjectPermissionsTable"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Tabs"; +import "#admin/rbac/RoleObjectPermissionTable"; +import "#admin/rbac/UserObjectPermissionTable"; +import "#admin/roles/RoleAssignedGlobalPermissionsTable"; +import "#admin/roles/RoleAssignedObjectPermissionTable"; +import "#admin/users/UserAssignedGlobalPermissionsTable"; +import "#admin/users/UserAssignedObjectPermissionsTable"; +import "#elements/Tabs"; + +import { AKElement } from "#elements/Base"; + +import { RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; @@ -16,8 +19,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { RbacPermissionsAssignedByUsersListModelEnum } from "@goauthentik/api"; - @customElement("ak-rbac-object-permission-page") export class ObjectPermissionPage extends AKElement { @property() diff --git a/web/src/admin/rbac/PermissionSelectModal.ts b/web/src/admin/rbac/PermissionSelectModal.ts index b934e627bc..4c2b27aff9 100644 --- a/web/src/admin/rbac/PermissionSelectModal.ts +++ b/web/src/admin/rbac/PermissionSelectModal.ts @@ -1,18 +1,19 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TableModal } from "@goauthentik/elements/table/TableModal"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TableModal } from "#elements/table/TableModal"; + +import { Permission, RbacApi } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; -import { Permission, RbacApi } from "@goauthentik/api"; - @customElement("ak-rbac-permission-select-table") export class PermissionSelectModal extends TableModal { checkbox = true; diff --git a/web/src/admin/rbac/RoleObjectPermissionForm.ts b/web/src/admin/rbac/RoleObjectPermissionForm.ts index 41be918f26..9d09614056 100644 --- a/web/src/admin/rbac/RoleObjectPermissionForm.ts +++ b/web/src/admin/rbac/RoleObjectPermissionForm.ts @@ -1,13 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-toggle-group"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-toggle-group"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { ModelEnum, @@ -17,6 +15,10 @@ import { Role, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + interface RoleAssignData { role: string; permissions: { diff --git a/web/src/admin/rbac/RoleObjectPermissionTable.ts b/web/src/admin/rbac/RoleObjectPermissionTable.ts index f6b1a79fc5..9b8957a310 100644 --- a/web/src/admin/rbac/RoleObjectPermissionTable.ts +++ b/web/src/admin/rbac/RoleObjectPermissionTable.ts @@ -1,14 +1,11 @@ -import "@goauthentik/admin/rbac/RoleObjectPermissionForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/rbac/RoleObjectPermissionForm"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { PaginatedPermissionList, @@ -17,6 +14,11 @@ import { RoleAssignedObjectPermission, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-rbac-role-object-permission-table") export class RoleAssignedObjectPermissionTable extends Table { @property() diff --git a/web/src/admin/rbac/UserObjectPermissionForm.ts b/web/src/admin/rbac/UserObjectPermissionForm.ts index 335bd01103..acd28e2eda 100644 --- a/web/src/admin/rbac/UserObjectPermissionForm.ts +++ b/web/src/admin/rbac/UserObjectPermissionForm.ts @@ -1,13 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-toggle-group"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-toggle-group"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { CoreApi, @@ -18,6 +16,10 @@ import { User, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + interface UserAssignData { user: number; permissions: { diff --git a/web/src/admin/rbac/UserObjectPermissionTable.ts b/web/src/admin/rbac/UserObjectPermissionTable.ts index f487372954..f8cf34a5e4 100644 --- a/web/src/admin/rbac/UserObjectPermissionTable.ts +++ b/web/src/admin/rbac/UserObjectPermissionTable.ts @@ -1,14 +1,11 @@ -import "@goauthentik/admin/rbac/UserObjectPermissionForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/rbac/UserObjectPermissionForm"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { PaginatedPermissionList, @@ -17,6 +14,11 @@ import { UserAssignedObjectPermission, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-rbac-user-object-permission-table") export class UserAssignedObjectPermissionTable extends Table { @property() diff --git a/web/src/admin/rbac/utils.ts b/web/src/admin/rbac/utils.ts index 7ad08b2dbf..66f069a332 100644 --- a/web/src/admin/rbac/utils.ts +++ b/web/src/admin/rbac/utils.ts @@ -1,7 +1,7 @@ -import { msg } from "@lit/localize"; - import { InitialPermissionsModeEnum } from "@goauthentik/api"; +import { msg } from "@lit/localize"; + export function InitialPermissionsModeToLabel(mode: InitialPermissionsModeEnum): string { switch (mode) { case InitialPermissionsModeEnum.User: diff --git a/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts b/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts index 7c5ee10d6c..1ad045bf3d 100644 --- a/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts +++ b/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts @@ -1,16 +1,18 @@ -import "@goauthentik/admin/roles/RolePermissionForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/roles/RolePermissionForm"; +import "#elements/forms/ModalForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { Permission, RbacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-role-assigned-global-permissions-table") export class RoleAssignedGlobalPermissionsTable extends Table { @property() diff --git a/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts b/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts index 0af99bebc6..a98cb67f12 100644 --- a/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts +++ b/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts @@ -1,15 +1,17 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { ExtraRoleObjectPermission, ModelEnum, RbacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-role-assigned-object-permissions-table") export class RoleAssignedObjectPermissionTable extends Table { @property() diff --git a/web/src/admin/roles/RoleForm.ts b/web/src/admin/roles/RoleForm.ts index 99899af47b..582322ccb5 100644 --- a/web/src/admin/roles/RoleForm.ts +++ b/web/src/admin/roles/RoleForm.ts @@ -1,17 +1,19 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { RbacApi, Role } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-role-form") export class RoleForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/roles/RoleListPage.ts b/web/src/admin/roles/RoleListPage.ts index 4d086528fe..81d85f02a2 100644 --- a/web/src/admin/roles/RoleListPage.ts +++ b/web/src/admin/roles/RoleListPage.ts @@ -1,20 +1,21 @@ import "#admin/roles/RoleForm"; -import { DEFAULT_CONFIG } from "#common/api/config"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; import "#elements/forms/DeleteBulkForm"; import "#elements/forms/ModalForm"; -import { PaginatedResponse } from "#elements/table/Table"; -import { TableColumn } from "#elements/table/Table"; -import { TablePage } from "#elements/table/TablePage"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { RbacApi, Role } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-role-list") export class RoleListPage extends TablePage { checkbox = true; diff --git a/web/src/admin/roles/RolePermissionForm.ts b/web/src/admin/roles/RolePermissionForm.ts index 2dd4842e55..e6dc000e79 100644 --- a/web/src/admin/roles/RolePermissionForm.ts +++ b/web/src/admin/roles/RolePermissionForm.ts @@ -1,19 +1,21 @@ -import "@goauthentik/admin/rbac/PermissionSelectModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-toggle-group"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/rbac/PermissionSelectModal"; +import "#components/ak-toggle-group"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { Permission, RbacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + interface RolePermissionAssign { permissions: string[]; } diff --git a/web/src/admin/roles/RoleViewPage.ts b/web/src/admin/roles/RoleViewPage.ts index 50c26d28f3..28a7af9318 100644 --- a/web/src/admin/roles/RoleViewPage.ts +++ b/web/src/admin/roles/RoleViewPage.ts @@ -1,16 +1,21 @@ import "#admin/groups/RelatedGroupList"; import "#admin/rbac/ObjectPermissionsPage"; import "#admin/roles/RoleForm"; -import { DEFAULT_CONFIG } from "#common/api/config"; -import { EVENT_REFRESH } from "#common/constants"; -import { renderDescriptionList } from "#components/DescriptionList"; import "#components/ak-page-header"; import "#components/events/ObjectChangelog"; import "#components/events/UserEvents"; -import { AKElement } from "#elements/Base"; import "#elements/Tabs"; import "#elements/forms/ModalForm"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { renderDescriptionList } from "#components/DescriptionList"; + +import { RbacApi, RbacPermissionsAssignedByUsersListModelEnum, Role } from "@goauthentik/api"; + import { msg, str } from "@lit/localize"; import { css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators.js"; @@ -24,8 +29,6 @@ import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; -import { RbacApi, RbacPermissionsAssignedByUsersListModelEnum, Role } from "@goauthentik/api"; - @customElement("ak-role-view") export class RoleViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/sources/BaseSourceForm.ts b/web/src/admin/sources/BaseSourceForm.ts index f8c68c4bd1..5fa6b1e8ca 100644 --- a/web/src/admin/sources/BaseSourceForm.ts +++ b/web/src/admin/sources/BaseSourceForm.ts @@ -1,4 +1,4 @@ -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import { ModelForm } from "#elements/forms/ModelForm"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/sources/SourceListPage.ts b/web/src/admin/sources/SourceListPage.ts index 5a7663fa22..dda4ee93b1 100644 --- a/web/src/admin/sources/SourceListPage.ts +++ b/web/src/admin/sources/SourceListPage.ts @@ -1,26 +1,27 @@ -import "@goauthentik/admin/sources/SourceWizard"; -import "@goauthentik/admin/sources/kerberos/KerberosSourceForm"; -import "@goauthentik/admin/sources/ldap/LDAPSourceForm"; -import "@goauthentik/admin/sources/oauth/OAuthSourceForm"; -import "@goauthentik/admin/sources/plex/PlexSourceForm"; -import "@goauthentik/admin/sources/saml/SAMLSourceForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/sources/SourceWizard"; +import "#admin/sources/kerberos/KerberosSourceForm"; +import "#admin/sources/ldap/LDAPSourceForm"; +import "#admin/sources/oauth/OAuthSourceForm"; +import "#admin/sources/plex/PlexSourceForm"; +import "#admin/sources/saml/SAMLSourceForm"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { Source, SourcesApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-source-list") export class SourceListPage extends TablePage { pageTitle(): string { diff --git a/web/src/admin/sources/SourceViewPage.ts b/web/src/admin/sources/SourceViewPage.ts index 342aad0e8c..4b0a247931 100644 --- a/web/src/admin/sources/SourceViewPage.ts +++ b/web/src/admin/sources/SourceViewPage.ts @@ -4,18 +4,20 @@ import "#admin/sources/oauth/OAuthSourceViewPage"; import "#admin/sources/plex/PlexSourceViewPage"; import "#admin/sources/saml/SAMLSourceViewPage"; import "#admin/sources/scim/SCIMSourceViewPage"; -import { DEFAULT_CONFIG } from "#common/api/config"; import "#components/ak-page-header"; -import { AKElement } from "#elements/Base"; import "#elements/EmptyState"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; import { Source, SourcesApi } from "@goauthentik/api"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-source-view") export class SourceViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/sources/SourceWizard.ts b/web/src/admin/sources/SourceWizard.ts index b7758755d5..9a86e6c0c0 100644 --- a/web/src/admin/sources/SourceWizard.ts +++ b/web/src/admin/sources/SourceWizard.ts @@ -1,27 +1,29 @@ -import "@goauthentik/admin/sources/kerberos/KerberosSourceForm"; -import "@goauthentik/admin/sources/ldap/LDAPSourceForm"; -import "@goauthentik/admin/sources/oauth/OAuthSourceForm"; -import "@goauthentik/admin/sources/plex/PlexSourceForm"; -import "@goauthentik/admin/sources/saml/SAMLSourceForm"; -import "@goauthentik/admin/sources/scim/SCIMSourceForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/ProxyForm"; -import "@goauthentik/elements/wizard/FormWizardPage"; -import { TypeCreateWizardPageLayouts } from "@goauthentik/elements/wizard/TypeCreateWizardPage"; -import "@goauthentik/elements/wizard/Wizard"; -import type { Wizard } from "@goauthentik/elements/wizard/Wizard"; +import "#admin/sources/kerberos/KerberosSourceForm"; +import "#admin/sources/ldap/LDAPSourceForm"; +import "#admin/sources/oauth/OAuthSourceForm"; +import "#admin/sources/plex/PlexSourceForm"; +import "#admin/sources/saml/SAMLSourceForm"; +import "#admin/sources/scim/SCIMSourceForm"; +import "#elements/forms/ProxyForm"; +import "#elements/wizard/FormWizardPage"; +import "#elements/wizard/Wizard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import { TypeCreateWizardPageLayouts } from "#elements/wizard/TypeCreateWizardPage"; +import type { Wizard } from "#elements/wizard/Wizard"; + +import { SourcesApi, TypeCreate } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { property, query } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { SourcesApi, TypeCreate } from "@goauthentik/api"; - @customElement("ak-source-wizard") export class SourceWizard extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/sources/kerberos/KerberosSourceConnectivity.ts b/web/src/admin/sources/kerberos/KerberosSourceConnectivity.ts index f23c2b20c1..da5a68fabd 100644 --- a/web/src/admin/sources/kerberos/KerberosSourceConnectivity.ts +++ b/web/src/admin/sources/kerberos/KerberosSourceConnectivity.ts @@ -1,7 +1,8 @@ -import { AKElement } from "@goauthentik/elements/Base"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { CSSResult, TemplateResult, html } from "lit"; +import { AKElement } from "#elements/Base"; + +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFList from "@patternfly/patternfly/components/List/list.css"; diff --git a/web/src/admin/sources/kerberos/KerberosSourceForm.ts b/web/src/admin/sources/kerberos/KerberosSourceForm.ts index 6fc9e05163..636094de15 100644 --- a/web/src/admin/sources/kerberos/KerberosSourceForm.ts +++ b/web/src/admin/sources/kerberos/KerberosSourceForm.ts @@ -1,27 +1,22 @@ -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/admin/common/ak-flow-search/ak-source-flow-search"; -import { iconHelperText, placeholderHelperText } from "@goauthentik/admin/helperText"; -import { BaseSourceForm } from "@goauthentik/admin/sources/BaseSourceForm"; -import { - GroupMatchingModeToLabel, - UserMatchingModeToLabel, -} from "@goauthentik/admin/sources/oauth/utils"; -import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-secret-text-input.js"; -import "@goauthentik/components/ak-secret-textarea-input.js"; -import "@goauthentik/components/ak-slug-input.js"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/components/ak-text-input"; -import "@goauthentik/components/ak-textarea-input"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-source-flow-search"; +import "#components/ak-secret-text-input"; +import "#components/ak-secret-textarea-input"; +import "#components/ak-slug-input"; +import "#components/ak-switch-input"; +import "#components/ak-text-input"; +import "#components/ak-textarea-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { config, DEFAULT_CONFIG } from "#common/api/config"; + +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; + +import { iconHelperText, placeholderHelperText } from "#admin/helperText"; +import { BaseSourceForm } from "#admin/sources/BaseSourceForm"; +import { GroupMatchingModeToLabel, UserMatchingModeToLabel } from "#admin/sources/oauth/utils"; import { FlowsInstancesListDesignationEnum, @@ -33,6 +28,11 @@ import { UserMatchingModeEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./KerberosSourceFormHelpers.js"; @customElement("ak-source-kerberos-form") diff --git a/web/src/admin/sources/kerberos/KerberosSourceFormHelpers.ts b/web/src/admin/sources/kerberos/KerberosSourceFormHelpers.ts index 25c814bfa5..ee08f23111 100644 --- a/web/src/admin/sources/kerberos/KerberosSourceFormHelpers.ts +++ b/web/src/admin/sources/kerberos/KerberosSourceFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { KerberosSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; diff --git a/web/src/admin/sources/kerberos/KerberosSourceViewPage.ts b/web/src/admin/sources/kerberos/KerberosSourceViewPage.ts index 8c0550c1c7..a4489daf00 100644 --- a/web/src/admin/sources/kerberos/KerberosSourceViewPage.ts +++ b/web/src/admin/sources/kerberos/KerberosSourceViewPage.ts @@ -1,21 +1,31 @@ -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import "@goauthentik/admin/sources/kerberos/KerberosSourceConnectivity"; -import "@goauthentik/admin/sources/kerberos/KerberosSourceForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/ak-mdx"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncStatusCard"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#admin/sources/kerberos/KerberosSourceConnectivity"; +import "#admin/sources/kerberos/KerberosSourceForm"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/ak-mdx/index"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncStatusCard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + KerberosSource, + RbacPermissionsAssignedByUsersListModelEnum, + SourcesApi, + SyncStatus, +} from "@goauthentik/api"; + import MDSourceKerberosBrowser from "~docs/users-sources/sources/protocols/kerberos/browser.md"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; @@ -28,13 +38,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - KerberosSource, - RbacPermissionsAssignedByUsersListModelEnum, - SourcesApi, - SyncStatus, -} from "@goauthentik/api"; - @customElement("ak-source-kerberos-view") export class KerberosSourceViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts b/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts index 87a4b3bbed..7d6a7e87e2 100644 --- a/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts +++ b/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts @@ -1,8 +1,9 @@ -import { AKElement } from "@goauthentik/elements/Base"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { AKElement } from "#elements/Base"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFList from "@patternfly/patternfly/components/List/list.css"; diff --git a/web/src/admin/sources/ldap/LDAPSourceForm.ts b/web/src/admin/sources/ldap/LDAPSourceForm.ts index 2d9204ca5c..7171b1730b 100644 --- a/web/src/admin/sources/ldap/LDAPSourceForm.ts +++ b/web/src/admin/sources/ldap/LDAPSourceForm.ts @@ -1,18 +1,15 @@ -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import { placeholderHelperText } from "@goauthentik/admin/helperText"; -import { BaseSourceForm } from "@goauthentik/admin/sources/BaseSourceForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-secret-text-input.js"; -import "@goauthentik/components/ak-slug-input.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-crypto-certificate-search"; +import "#components/ak-secret-text-input"; +import "#components/ak-slug-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { placeholderHelperText } from "#admin/helperText"; +import { BaseSourceForm } from "#admin/sources/BaseSourceForm"; import { CoreApi, @@ -23,6 +20,11 @@ import { SourcesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./LDAPSourceFormHelpers.js"; @customElement("ak-source-ldap-form") diff --git a/web/src/admin/sources/ldap/LDAPSourceFormHelpers.ts b/web/src/admin/sources/ldap/LDAPSourceFormHelpers.ts index 08c66e423d..e90255e91f 100644 --- a/web/src/admin/sources/ldap/LDAPSourceFormHelpers.ts +++ b/web/src/admin/sources/ldap/LDAPSourceFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { LDAPSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; diff --git a/web/src/admin/sources/ldap/LDAPSourceViewPage.ts b/web/src/admin/sources/ldap/LDAPSourceViewPage.ts index 184f4ca821..613e4e0c0e 100644 --- a/web/src/admin/sources/ldap/LDAPSourceViewPage.ts +++ b/web/src/admin/sources/ldap/LDAPSourceViewPage.ts @@ -1,19 +1,28 @@ -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import "@goauthentik/admin/sources/ldap/LDAPSourceConnectivity"; -import "@goauthentik/admin/sources/ldap/LDAPSourceForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/sync/SyncStatusCard"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#admin/sources/ldap/LDAPSourceConnectivity"; +import "#admin/sources/ldap/LDAPSourceForm"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/ModalForm"; +import "#elements/sync/SyncStatusCard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + LDAPSource, + RbacPermissionsAssignedByUsersListModelEnum, + SourcesApi, + SyncStatus, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -25,13 +34,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - LDAPSource, - RbacPermissionsAssignedByUsersListModelEnum, - SourcesApi, - SyncStatus, -} from "@goauthentik/api"; - @customElement("ak-source-ldap-view") export class LDAPSourceViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/sources/oauth/OAuthSourceDiagram.ts b/web/src/admin/sources/oauth/OAuthSourceDiagram.ts index 4f7c22f851..a312f091f7 100644 --- a/web/src/admin/sources/oauth/OAuthSourceDiagram.ts +++ b/web/src/admin/sources/oauth/OAuthSourceDiagram.ts @@ -1,11 +1,12 @@ -import { UserMatchingModeToLabel } from "@goauthentik/admin/sources/oauth/utils"; -import { Diagram } from "@goauthentik/elements/Diagram"; +import { Diagram } from "#elements/Diagram"; + +import { UserMatchingModeToLabel } from "#admin/sources/oauth/utils"; + +import { OAuthSource, UserMatchingModeEnum } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { customElement, property } from "lit/decorators.js"; -import { OAuthSource, UserMatchingModeEnum } from "@goauthentik/api"; - @customElement("ak-source-oauth-diagram") export class OAuthSourceDiagram extends Diagram { @property({ attribute: false }) diff --git a/web/src/admin/sources/oauth/OAuthSourceForm.ts b/web/src/admin/sources/oauth/OAuthSourceForm.ts index 789dae2605..ca54b6c1b5 100644 --- a/web/src/admin/sources/oauth/OAuthSourceForm.ts +++ b/web/src/admin/sources/oauth/OAuthSourceForm.ts @@ -1,28 +1,23 @@ -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/admin/common/ak-flow-search/ak-source-flow-search"; -import { iconHelperText, placeholderHelperText } from "@goauthentik/admin/helperText"; -import { policyEngineModes } from "@goauthentik/admin/policies/PolicyEngineModes"; -import { BaseSourceForm } from "@goauthentik/admin/sources/BaseSourceForm"; -import { - GroupMatchingModeToLabel, - UserMatchingModeToLabel, -} from "@goauthentik/admin/sources/oauth/utils"; -import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-radio-input"; -import "@goauthentik/components/ak-secret-textarea-input.js"; -import "@goauthentik/components/ak-slug-input.js"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-source-flow-search"; +import "#components/ak-radio-input"; +import "#components/ak-secret-textarea-input"; +import "#components/ak-slug-input"; +import "#elements/CodeMirror"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { PropertyValues, TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { config, DEFAULT_CONFIG } from "#common/api/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; + +import { iconHelperText, placeholderHelperText } from "#admin/helperText"; +import { policyEngineModes } from "#admin/policies/PolicyEngineModes"; +import { BaseSourceForm } from "#admin/sources/BaseSourceForm"; +import { GroupMatchingModeToLabel, UserMatchingModeToLabel } from "#admin/sources/oauth/utils"; import { AuthorizationCodeAuthMethodEnum, @@ -31,11 +26,16 @@ import { OAuthSource, OAuthSourceRequest, ProviderTypeEnum, - SourceType, SourcesApi, + SourceType, UserMatchingModeEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, PropertyValues, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./OAuthSourceFormHelpers.js"; const authorizationCodeAuthMethodOptions = [ diff --git a/web/src/admin/sources/oauth/OAuthSourceFormHelpers.ts b/web/src/admin/sources/oauth/OAuthSourceFormHelpers.ts index 7abc36fdf1..41ac2e24ef 100644 --- a/web/src/admin/sources/oauth/OAuthSourceFormHelpers.ts +++ b/web/src/admin/sources/oauth/OAuthSourceFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { OAuthSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; diff --git a/web/src/admin/sources/oauth/OAuthSourceViewPage.ts b/web/src/admin/sources/oauth/OAuthSourceViewPage.ts index c5bf15f4bd..1ac0d10354 100644 --- a/web/src/admin/sources/oauth/OAuthSourceViewPage.ts +++ b/web/src/admin/sources/oauth/OAuthSourceViewPage.ts @@ -1,19 +1,29 @@ -import "@goauthentik/admin/policies/BoundPoliciesList"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import "@goauthentik/admin/sources/oauth/OAuthSourceDiagram"; -import "@goauthentik/admin/sources/oauth/OAuthSourceForm"; -import { sourceBindingTypeNotices } from "@goauthentik/admin/sources/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/ModalForm"; +import "#admin/policies/BoundPoliciesList"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#admin/sources/oauth/OAuthSourceDiagram"; +import "#admin/sources/oauth/OAuthSourceForm"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/ModalForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { sourceBindingTypeNotices } from "#admin/sources/utils"; + +import { + OAuthSource, + ProviderTypeEnum, + RbacPermissionsAssignedByUsersListModelEnum, + SourcesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -24,13 +34,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - OAuthSource, - ProviderTypeEnum, - RbacPermissionsAssignedByUsersListModelEnum, - SourcesApi, -} from "@goauthentik/api"; - export function ProviderToLabel(provider?: ProviderTypeEnum): string { switch (provider) { case undefined: diff --git a/web/src/admin/sources/oauth/utils.ts b/web/src/admin/sources/oauth/utils.ts index c6825455ed..0bd7c2e3ac 100644 --- a/web/src/admin/sources/oauth/utils.ts +++ b/web/src/admin/sources/oauth/utils.ts @@ -1,7 +1,7 @@ -import { msg } from "@lit/localize"; - import { GroupMatchingModeEnum, UserMatchingModeEnum } from "@goauthentik/api"; +import { msg } from "@lit/localize"; + export function UserMatchingModeToLabel(mode?: UserMatchingModeEnum): string { if (!mode) return ""; switch (mode) { diff --git a/web/src/admin/sources/plex/PlexSourceForm.ts b/web/src/admin/sources/plex/PlexSourceForm.ts index 1538102e23..51c5a13303 100644 --- a/web/src/admin/sources/plex/PlexSourceForm.ts +++ b/web/src/admin/sources/plex/PlexSourceForm.ts @@ -1,27 +1,21 @@ -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/admin/common/ak-flow-search/ak-source-flow-search"; -import { iconHelperText, placeholderHelperText } from "@goauthentik/admin/helperText"; -import { policyEngineModes } from "@goauthentik/admin/policies/PolicyEngineModes"; -import { BaseSourceForm } from "@goauthentik/admin/sources/BaseSourceForm"; -import { - GroupMatchingModeToLabel, - UserMatchingModeToLabel, -} from "@goauthentik/admin/sources/oauth/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PlexAPIClient, PlexResource, popupCenterScreen } from "@goauthentik/common/helpers/plex"; -import { ascii_letters, digits, randomString } from "@goauthentik/common/utils"; -import "@goauthentik/components/ak-slug-input.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-source-flow-search"; +import "#components/ak-slug-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PlexAPIClient, PlexResource, popupCenterScreen } from "#common/helpers/plex"; +import { ascii_letters, digits, randomString } from "#common/utils"; + +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; + +import { iconHelperText, placeholderHelperText } from "#admin/helperText"; +import { policyEngineModes } from "#admin/policies/PolicyEngineModes"; +import { BaseSourceForm } from "#admin/sources/BaseSourceForm"; +import { GroupMatchingModeToLabel, UserMatchingModeToLabel } from "#admin/sources/oauth/utils"; import { FlowsInstancesListDesignationEnum, @@ -31,6 +25,11 @@ import { UserMatchingModeEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./PlexSourceFormHelpers.js"; @customElement("ak-source-plex-form") diff --git a/web/src/admin/sources/plex/PlexSourceFormHelpers.ts b/web/src/admin/sources/plex/PlexSourceFormHelpers.ts index adb1ae53e4..454e2d1b92 100644 --- a/web/src/admin/sources/plex/PlexSourceFormHelpers.ts +++ b/web/src/admin/sources/plex/PlexSourceFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PlexSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api"; diff --git a/web/src/admin/sources/plex/PlexSourceViewPage.ts b/web/src/admin/sources/plex/PlexSourceViewPage.ts index 7c466d789d..dc6490d2ba 100644 --- a/web/src/admin/sources/plex/PlexSourceViewPage.ts +++ b/web/src/admin/sources/plex/PlexSourceViewPage.ts @@ -1,18 +1,27 @@ -import "@goauthentik/admin/policies/BoundPoliciesList"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import "@goauthentik/admin/sources/plex/PlexSourceForm"; -import { sourceBindingTypeNotices } from "@goauthentik/admin/sources/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/ModalForm"; +import "#admin/policies/BoundPoliciesList"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#admin/sources/plex/PlexSourceForm"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/ModalForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { sourceBindingTypeNotices } from "#admin/sources/utils"; + +import { + PlexSource, + RbacPermissionsAssignedByUsersListModelEnum, + SourcesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -23,12 +32,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - PlexSource, - RbacPermissionsAssignedByUsersListModelEnum, - SourcesApi, -} from "@goauthentik/api"; - @customElement("ak-source-plex-view") export class PlexSourceViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/sources/saml/SAMLSourceForm.ts b/web/src/admin/sources/saml/SAMLSourceForm.ts index b095da7001..7f01b460b7 100644 --- a/web/src/admin/sources/saml/SAMLSourceForm.ts +++ b/web/src/admin/sources/saml/SAMLSourceForm.ts @@ -1,25 +1,20 @@ -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import "@goauthentik/admin/common/ak-flow-search/ak-source-flow-search"; -import { iconHelperText, placeholderHelperText } from "@goauthentik/admin/helperText"; -import { policyEngineModes } from "@goauthentik/admin/policies/PolicyEngineModes"; -import { BaseSourceForm } from "@goauthentik/admin/sources/BaseSourceForm"; -import { - GroupMatchingModeToLabel, - UserMatchingModeToLabel, -} from "@goauthentik/admin/sources/oauth/utils"; -import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-slug-input.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#admin/common/ak-crypto-certificate-search"; +import "#admin/common/ak-flow-search/ak-source-flow-search"; +import "#components/ak-slug-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { config, DEFAULT_CONFIG } from "#common/api/config"; + +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; + +import { iconHelperText, placeholderHelperText } from "#admin/helperText"; +import { policyEngineModes } from "#admin/policies/PolicyEngineModes"; +import { BaseSourceForm } from "#admin/sources/BaseSourceForm"; +import { GroupMatchingModeToLabel, UserMatchingModeToLabel } from "#admin/sources/oauth/utils"; import { BindingTypeEnum, @@ -33,6 +28,11 @@ import { UserMatchingModeEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./SAMLSourceFormHelpers.js"; @customElement("ak-source-saml-form") diff --git a/web/src/admin/sources/saml/SAMLSourceFormHelpers.ts b/web/src/admin/sources/saml/SAMLSourceFormHelpers.ts index 764015632e..bf3e3977b6 100644 --- a/web/src/admin/sources/saml/SAMLSourceFormHelpers.ts +++ b/web/src/admin/sources/saml/SAMLSourceFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, SAMLSourcePropertyMapping } from "@goauthentik/api"; diff --git a/web/src/admin/sources/saml/SAMLSourceViewPage.ts b/web/src/admin/sources/saml/SAMLSourceViewPage.ts index bebd4624e6..976ea156f0 100644 --- a/web/src/admin/sources/saml/SAMLSourceViewPage.ts +++ b/web/src/admin/sources/saml/SAMLSourceViewPage.ts @@ -1,19 +1,29 @@ -import "@goauthentik/admin/policies/BoundPoliciesList"; -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import "@goauthentik/admin/sources/saml/SAMLSourceForm"; -import { sourceBindingTypeNotices } from "@goauthentik/admin/sources/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/ModalForm"; +import "#admin/policies/BoundPoliciesList"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#admin/sources/saml/SAMLSourceForm"; +import "#components/events/ObjectChangelog"; +import "#elements/CodeMirror"; +import "#elements/Tabs"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/ModalForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; +import { CodeMirrorMode } from "#elements/CodeMirror"; + +import { sourceBindingTypeNotices } from "#admin/sources/utils"; + +import { + RbacPermissionsAssignedByUsersListModelEnum, + SAMLMetadata, + SAMLSource, + SourcesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -25,13 +35,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - RbacPermissionsAssignedByUsersListModelEnum, - SAMLMetadata, - SAMLSource, - SourcesApi, -} from "@goauthentik/api"; - @customElement("ak-source-saml-view") export class SAMLSourceViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/sources/scim/SCIMSourceForm.ts b/web/src/admin/sources/scim/SCIMSourceForm.ts index 7bb59eb86e..3d328a9350 100644 --- a/web/src/admin/sources/scim/SCIMSourceForm.ts +++ b/web/src/admin/sources/scim/SCIMSourceForm.ts @@ -1,18 +1,20 @@ -import { placeholderHelperText } from "@goauthentik/admin/helperText"; -import { BaseSourceForm } from "@goauthentik/admin/sources/BaseSourceForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-slug-input.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#components/ak-slug-input"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { placeholderHelperText } from "#admin/helperText"; +import { BaseSourceForm } from "#admin/sources/BaseSourceForm"; import { SCIMSource, SCIMSourceRequest, SourcesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { propertyMappingsProvider, propertyMappingsSelector } from "./SCIMSourceFormHelpers.js"; @customElement("ak-source-scim-form") diff --git a/web/src/admin/sources/scim/SCIMSourceFormHelpers.ts b/web/src/admin/sources/scim/SCIMSourceFormHelpers.ts index 89c90b02b9..ec89e45d46 100644 --- a/web/src/admin/sources/scim/SCIMSourceFormHelpers.ts +++ b/web/src/admin/sources/scim/SCIMSourceFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PropertymappingsApi, SCIMSourcePropertyMapping } from "@goauthentik/api"; diff --git a/web/src/admin/sources/scim/SCIMSourceGroups.ts b/web/src/admin/sources/scim/SCIMSourceGroups.ts index d1f5659692..ac01837fd8 100644 --- a/web/src/admin/sources/scim/SCIMSourceGroups.ts +++ b/web/src/admin/sources/scim/SCIMSourceGroups.ts @@ -1,12 +1,13 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { SCIMSourceGroup, SourcesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-source-scim-groups-list") export class SCIMSourceGroupList extends Table { @property() diff --git a/web/src/admin/sources/scim/SCIMSourceUsers.ts b/web/src/admin/sources/scim/SCIMSourceUsers.ts index 726edd423b..65109560d7 100644 --- a/web/src/admin/sources/scim/SCIMSourceUsers.ts +++ b/web/src/admin/sources/scim/SCIMSourceUsers.ts @@ -1,12 +1,13 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { SCIMSourceUser, SourcesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-source-scim-users-list") export class SCIMSourceUserList extends Table { @property() diff --git a/web/src/admin/sources/scim/SCIMSourceViewPage.ts b/web/src/admin/sources/scim/SCIMSourceViewPage.ts index db74ca2124..439fd7ec78 100644 --- a/web/src/admin/sources/scim/SCIMSourceViewPage.ts +++ b/web/src/admin/sources/scim/SCIMSourceViewPage.ts @@ -1,19 +1,27 @@ -import "@goauthentik/admin/rbac/ObjectPermissionsPage"; -import "@goauthentik/admin/sources/scim/SCIMSourceForm"; -import "@goauthentik/admin/sources/scim/SCIMSourceGroups"; -import "@goauthentik/admin/sources/scim/SCIMSourceUsers"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/components/events/ObjectChangelog"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/buttons/TokenCopyButton"; -import "@goauthentik/elements/forms/ModalForm"; +import "#admin/rbac/ObjectPermissionsPage"; +import "#admin/sources/scim/SCIMSourceForm"; +import "#admin/sources/scim/SCIMSourceGroups"; +import "#admin/sources/scim/SCIMSourceUsers"; +import "#components/events/ObjectChangelog"; +import "#elements/Tabs"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/buttons/TokenCopyButton/index"; +import "#elements/forms/ModalForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { + RbacPermissionsAssignedByUsersListModelEnum, + SCIMSource, + SourcesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -26,12 +34,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - RbacPermissionsAssignedByUsersListModelEnum, - SCIMSource, - SourcesApi, -} from "@goauthentik/api"; - @customElement("ak-source-scim-view") export class SCIMSourceViewPage extends AKElement { @property({ type: String }) diff --git a/web/src/admin/sources/utils.ts b/web/src/admin/sources/utils.ts index 1ec5ec57e5..6f0e94f78d 100644 --- a/web/src/admin/sources/utils.ts +++ b/web/src/admin/sources/utils.ts @@ -1,7 +1,7 @@ -import { PolicyBindingCheckTarget } from "@goauthentik/admin/policies/utils"; +import { PolicyBindingCheckTarget } from "#admin/policies/utils"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; export function renderSourceIcon(name: string, iconUrl: string | undefined | null): TemplateResult { const icon = html``; diff --git a/web/src/admin/stages/BaseStageForm.ts b/web/src/admin/stages/BaseStageForm.ts index 67c5ffc357..1c11692e6d 100644 --- a/web/src/admin/stages/BaseStageForm.ts +++ b/web/src/admin/stages/BaseStageForm.ts @@ -1,4 +1,4 @@ -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import { ModelForm } from "#elements/forms/ModelForm"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/stages/StageListPage.ts b/web/src/admin/stages/StageListPage.ts index 0b0cfabbaa..73ada2eb3c 100644 --- a/web/src/admin/stages/StageListPage.ts +++ b/web/src/admin/stages/StageListPage.ts @@ -1,45 +1,47 @@ -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import "@goauthentik/admin/stages/StageWizard"; -import "@goauthentik/admin/stages/authenticator_duo/AuthenticatorDuoStageForm"; -import "@goauthentik/admin/stages/authenticator_duo/DuoDeviceImportForm"; -import "@goauthentik/admin/stages/authenticator_email/AuthenticatorEmailStageForm"; -import "@goauthentik/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm"; -import "@goauthentik/admin/stages/authenticator_sms/AuthenticatorSMSStageForm"; -import "@goauthentik/admin/stages/authenticator_static/AuthenticatorStaticStageForm"; -import "@goauthentik/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm"; -import "@goauthentik/admin/stages/authenticator_validate/AuthenticatorValidateStageForm"; -import "@goauthentik/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm"; -import "@goauthentik/admin/stages/captcha/CaptchaStageForm"; -import "@goauthentik/admin/stages/consent/ConsentStageForm"; -import "@goauthentik/admin/stages/deny/DenyStageForm"; -import "@goauthentik/admin/stages/dummy/DummyStageForm"; -import "@goauthentik/admin/stages/email/EmailStageForm"; -import "@goauthentik/admin/stages/identification/IdentificationStageForm"; -import "@goauthentik/admin/stages/invitation/InvitationStageForm"; -import "@goauthentik/admin/stages/mtls/MTLSStageForm"; -import "@goauthentik/admin/stages/password/PasswordStageForm"; -import "@goauthentik/admin/stages/prompt/PromptStageForm"; -import "@goauthentik/admin/stages/redirect/RedirectStageForm"; -import "@goauthentik/admin/stages/source/SourceStageForm"; -import "@goauthentik/admin/stages/user_delete/UserDeleteStageForm"; -import "@goauthentik/admin/stages/user_login/UserLoginStageForm"; -import "@goauthentik/admin/stages/user_logout/UserLogoutStageForm"; -import "@goauthentik/admin/stages/user_write/UserWriteStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import "@goauthentik/elements/forms/ProxyForm"; -import { PaginatedResponse, TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/rbac/ObjectPermissionModal"; +import "#admin/stages/StageWizard"; +import "#admin/stages/authenticator_duo/AuthenticatorDuoStageForm"; +import "#admin/stages/authenticator_duo/DuoDeviceImportForm"; +import "#admin/stages/authenticator_email/AuthenticatorEmailStageForm"; +import "#admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm"; +import "#admin/stages/authenticator_sms/AuthenticatorSMSStageForm"; +import "#admin/stages/authenticator_static/AuthenticatorStaticStageForm"; +import "#admin/stages/authenticator_totp/AuthenticatorTOTPStageForm"; +import "#admin/stages/authenticator_validate/AuthenticatorValidateStageForm"; +import "#admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm"; +import "#admin/stages/captcha/CaptchaStageForm"; +import "#admin/stages/consent/ConsentStageForm"; +import "#admin/stages/deny/DenyStageForm"; +import "#admin/stages/dummy/DummyStageForm"; +import "#admin/stages/email/EmailStageForm"; +import "#admin/stages/identification/IdentificationStageForm"; +import "#admin/stages/invitation/InvitationStageForm"; +import "#admin/stages/mtls/MTLSStageForm"; +import "#admin/stages/password/PasswordStageForm"; +import "#admin/stages/prompt/PromptStageForm"; +import "#admin/stages/redirect/RedirectStageForm"; +import "#admin/stages/source/SourceStageForm"; +import "#admin/stages/user_delete/UserDeleteStageForm"; +import "#admin/stages/user_login/UserLoginStageForm"; +import "#admin/stages/user_logout/UserLogoutStageForm"; +import "#admin/stages/user_write/UserWriteStageForm"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#elements/forms/ProxyForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { Stage, StagesApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-list") export class StageListPage extends TablePage { pageTitle(): string { diff --git a/web/src/admin/stages/StageWizard.ts b/web/src/admin/stages/StageWizard.ts index 7244fada79..f4ab2f2818 100644 --- a/web/src/admin/stages/StageWizard.ts +++ b/web/src/admin/stages/StageWizard.ts @@ -1,47 +1,50 @@ -import "@goauthentik/admin/common/ak-license-notice"; -import { StageBindingForm } from "@goauthentik/admin/flows/StageBindingForm"; -import "@goauthentik/admin/stages/authenticator_duo/AuthenticatorDuoStageForm"; -import "@goauthentik/admin/stages/authenticator_email/AuthenticatorEmailStageForm"; -import "@goauthentik/admin/stages/authenticator_sms/AuthenticatorSMSStageForm"; -import "@goauthentik/admin/stages/authenticator_static/AuthenticatorStaticStageForm"; -import "@goauthentik/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm"; -import "@goauthentik/admin/stages/authenticator_validate/AuthenticatorValidateStageForm"; -import "@goauthentik/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm"; -import "@goauthentik/admin/stages/captcha/CaptchaStageForm"; -import "@goauthentik/admin/stages/consent/ConsentStageForm"; -import "@goauthentik/admin/stages/deny/DenyStageForm"; -import "@goauthentik/admin/stages/dummy/DummyStageForm"; -import "@goauthentik/admin/stages/email/EmailStageForm"; -import "@goauthentik/admin/stages/identification/IdentificationStageForm"; -import "@goauthentik/admin/stages/invitation/InvitationStageForm"; -import "@goauthentik/admin/stages/mtls/MTLSStageForm"; -import "@goauthentik/admin/stages/password/PasswordStageForm"; -import "@goauthentik/admin/stages/prompt/PromptStageForm"; -import "@goauthentik/admin/stages/redirect/RedirectStageForm"; -import "@goauthentik/admin/stages/source/SourceStageForm"; -import "@goauthentik/admin/stages/user_delete/UserDeleteStageForm"; -import "@goauthentik/admin/stages/user_login/UserLoginStageForm"; -import "@goauthentik/admin/stages/user_logout/UserLogoutStageForm"; -import "@goauthentik/admin/stages/user_write/UserWriteStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/ProxyForm"; -import "@goauthentik/elements/wizard/FormWizardPage"; -import { FormWizardPage } from "@goauthentik/elements/wizard/FormWizardPage"; -import "@goauthentik/elements/wizard/TypeCreateWizardPage"; -import "@goauthentik/elements/wizard/Wizard"; -import { Wizard } from "@goauthentik/elements/wizard/Wizard"; +import "#admin/common/ak-license-notice"; +import "#admin/stages/authenticator_duo/AuthenticatorDuoStageForm"; +import "#admin/stages/authenticator_email/AuthenticatorEmailStageForm"; +import "#admin/stages/authenticator_sms/AuthenticatorSMSStageForm"; +import "#admin/stages/authenticator_static/AuthenticatorStaticStageForm"; +import "#admin/stages/authenticator_totp/AuthenticatorTOTPStageForm"; +import "#admin/stages/authenticator_validate/AuthenticatorValidateStageForm"; +import "#admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm"; +import "#admin/stages/captcha/CaptchaStageForm"; +import "#admin/stages/consent/ConsentStageForm"; +import "#admin/stages/deny/DenyStageForm"; +import "#admin/stages/dummy/DummyStageForm"; +import "#admin/stages/email/EmailStageForm"; +import "#admin/stages/identification/IdentificationStageForm"; +import "#admin/stages/invitation/InvitationStageForm"; +import "#admin/stages/mtls/MTLSStageForm"; +import "#admin/stages/password/PasswordStageForm"; +import "#admin/stages/prompt/PromptStageForm"; +import "#admin/stages/redirect/RedirectStageForm"; +import "#admin/stages/source/SourceStageForm"; +import "#admin/stages/user_delete/UserDeleteStageForm"; +import "#admin/stages/user_login/UserLoginStageForm"; +import "#admin/stages/user_logout/UserLogoutStageForm"; +import "#admin/stages/user_write/UserWriteStageForm"; +import "#elements/forms/ProxyForm"; +import "#elements/wizard/FormWizardPage"; +import "#elements/wizard/TypeCreateWizardPage"; +import "#elements/wizard/Wizard"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; +import { FormWizardPage } from "#elements/wizard/FormWizardPage"; +import { Wizard } from "#elements/wizard/Wizard"; + +import { StageBindingForm } from "#admin/flows/StageBindingForm"; + +import { FlowStageBinding, Stage, StagesApi, TypeCreate } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { property, query } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { FlowStageBinding, Stage, StagesApi, TypeCreate } from "@goauthentik/api"; - @customElement("ak-stage-wizard") export class StageWizard extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts index 7545647220..7c1863c4e0 100644 --- a/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts +++ b/web/src/admin/stages/authenticator_duo/AuthenticatorDuoStageForm.ts @@ -1,14 +1,12 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-secret-text-input.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-secret-text-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { AuthenticatorDuoStage, @@ -20,6 +18,10 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-duo-form") export class AuthenticatorDuoStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts index ad9409f94c..695e58b497 100644 --- a/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts +++ b/web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts @@ -1,16 +1,14 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { MessageLevel } from "@goauthentik/common/messages"; -import "@goauthentik/elements/Divider"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModalForm } from "@goauthentik/elements/forms/ModalForm"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import "#elements/Divider"; +import "#elements/buttons/ActionButton/index"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { MessageLevel } from "#common/messages"; + +import { ModalForm } from "#elements/forms/ModalForm"; +import { ModelForm } from "#elements/forms/ModelForm"; +import { showMessage } from "#elements/messages/MessageContainer"; import { AuthenticatorDuoStage, @@ -21,6 +19,10 @@ import { User, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-duo-device-import-form") export class DuoDeviceImportForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts b/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts index dc6194b06c..d7b85b697f 100644 --- a/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts +++ b/web/src/admin/stages/authenticator_email/AuthenticatorEmailStageForm.ts @@ -1,16 +1,13 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-secret-text-input.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-secret-text-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { AuthenticatorEmailStage, @@ -21,6 +18,11 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-authenticator-email-form") export class AuthenticatorEmailStageForm extends BaseStageForm { async loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts b/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts index 4704d4570d..3ee9fcd9ce 100644 --- a/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts +++ b/web/src/admin/stages/authenticator_endpoint_gdtc/AuthenticatorEndpointGDTCStageForm.ts @@ -1,18 +1,21 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/CodeMirror"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; + +import { AuthenticatorEndpointGDTCStage, StagesApi } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; -import { AuthenticatorEndpointGDTCStage, StagesApi } from "@goauthentik/api"; - @customElement("ak-stage-authenticator-endpoint-gdtc-form") export class AuthenticatorEndpointGDTCStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts index f6b7a8c90a..b2e112bfef 100644 --- a/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts +++ b/web/src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts @@ -1,18 +1,16 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { - AuthTypeEnum, AuthenticatorSMSStage, + AuthTypeEnum, Flow, FlowsApi, FlowsInstancesListDesignationEnum, @@ -24,6 +22,10 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-sms-form") export class AuthenticatorSMSStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts index 02c6c0844f..b57a9777f8 100644 --- a/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts +++ b/web/src/admin/stages/authenticator_static/AuthenticatorStaticStageForm.ts @@ -1,12 +1,10 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { AuthenticatorStaticStage, @@ -17,6 +15,10 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-static-form") export class AuthenticatorStaticStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts index 2bcc515112..0555521f2c 100644 --- a/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts +++ b/web/src/admin/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts @@ -1,13 +1,11 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { AuthenticatorTOTPStage, @@ -19,6 +17,10 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-totp-form") export class AuthenticatorTOTPStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts index dba133d6df..24bee68ffa 100644 --- a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts +++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageForm.ts @@ -1,18 +1,15 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { deviceTypeRestrictionPair } from "@goauthentik/admin/stages/authenticator_webauthn/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/Alert"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#elements/Alert"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { deviceTypeRestrictionPair } from "#admin/stages/authenticator_webauthn/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { AuthenticatorValidateStage, @@ -23,6 +20,11 @@ import { UserVerificationEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { authenticatorWebauthnDeviceTypesListProvider, stagesProvider, diff --git a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageFormHelpers.ts b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageFormHelpers.ts index 205e9fd0b6..9da4d19225 100644 --- a/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageFormHelpers.ts +++ b/web/src/admin/stages/authenticator_validate/AuthenticatorValidateStageFormHelpers.ts @@ -1,6 +1,8 @@ -import { deviceTypeRestrictionPair } from "@goauthentik/admin/stages/authenticator_webauthn/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; + +import { deviceTypeRestrictionPair } from "#admin/stages/authenticator_webauthn/utils"; import { Stage, StagesApi } from "@goauthentik/api"; diff --git a/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts b/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts index 78cdbd7aac..3dfff08e6c 100644 --- a/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts +++ b/web/src/admin/stages/authenticator_webauthn/AuthenticatorWebAuthnStageForm.ts @@ -1,17 +1,16 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { deviceTypeRestrictionPair } from "@goauthentik/admin/stages/authenticator_webauthn/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-number-input"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider"; -import { DataProvision } from "@goauthentik/elements/ak-dual-select/types"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-number-input"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DataProvision } from "#elements/ak-dual-select/types"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { deviceTypeRestrictionPair } from "#admin/stages/authenticator_webauthn/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { AuthenticatorAttachmentEnum, @@ -25,6 +24,10 @@ import { UserVerificationEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-webauthn-form") export class AuthenticatorWebAuthnStageForm extends BaseStageForm { async loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/authenticator_webauthn/utils.ts b/web/src/admin/stages/authenticator_webauthn/utils.ts index 9743d48aa9..4d76d87c0c 100644 --- a/web/src/admin/stages/authenticator_webauthn/utils.ts +++ b/web/src/admin/stages/authenticator_webauthn/utils.ts @@ -1,9 +1,9 @@ -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types"; - -import { html } from "lit"; +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { WebAuthnDeviceType } from "@goauthentik/api"; +import { html } from "lit"; + export function deviceTypeRestrictionPair(item: WebAuthnDeviceType): DualSelectPair { const label = item.description ? item.description : item.aaguid; return [ diff --git a/web/src/admin/stages/captcha/CaptchaStageForm.ts b/web/src/admin/stages/captcha/CaptchaStageForm.ts index fadb8deaa8..d411f6487e 100644 --- a/web/src/admin/stages/captcha/CaptchaStageForm.ts +++ b/web/src/admin/stages/captcha/CaptchaStageForm.ts @@ -1,18 +1,20 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-number-input"; -import "@goauthentik/components/ak-secret-text-input.js"; -import "@goauthentik/components/ak-switch-input"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#components/ak-number-input"; +import "#components/ak-secret-text-input"; +import "#components/ak-switch-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { CaptchaStage, CaptchaStageRequest, StagesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-captcha-form") export class CaptchaStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/consent/ConsentStageForm.ts b/web/src/admin/stages/consent/ConsentStageForm.ts index f2bccee242..0151bfa9ec 100644 --- a/web/src/admin/stages/consent/ConsentStageForm.ts +++ b/web/src/admin/stages/consent/ConsentStageForm.ts @@ -1,16 +1,18 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { ConsentStage, ConsentStageModeEnum, StagesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-consent-form") export class ConsentStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/deny/DenyStageForm.ts b/web/src/admin/stages/deny/DenyStageForm.ts index b1f227f9b4..33357fc172 100644 --- a/web/src/admin/stages/deny/DenyStageForm.ts +++ b/web/src/admin/stages/deny/DenyStageForm.ts @@ -1,14 +1,16 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { DenyStage, StagesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-deny-form") export class DenyStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/dummy/DummyStageForm.ts b/web/src/admin/stages/dummy/DummyStageForm.ts index 640451496a..265938a899 100644 --- a/web/src/admin/stages/dummy/DummyStageForm.ts +++ b/web/src/admin/stages/dummy/DummyStageForm.ts @@ -1,14 +1,16 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { DummyStage, StagesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-dummy-form") export class DummyStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/email/EmailStageForm.ts b/web/src/admin/stages/email/EmailStageForm.ts index cc04767d56..2192e3433f 100644 --- a/web/src/admin/stages/email/EmailStageForm.ts +++ b/web/src/admin/stages/email/EmailStageForm.ts @@ -1,17 +1,19 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-secret-text-input.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#components/ak-secret-text-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { EmailStage, StagesApi, TypeCreate } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-email-form") export class EmailStageForm extends BaseStageForm { async loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/identification/IdentificationStageForm.ts b/web/src/admin/stages/identification/IdentificationStageForm.ts index f4f74fff3a..2a270d9959 100644 --- a/web/src/admin/stages/identification/IdentificationStageForm.ts +++ b/web/src/admin/stages/identification/IdentificationStageForm.ts @@ -1,18 +1,15 @@ -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/components/ak-switch-input.js"; -import "@goauthentik/elements/ak-checkbox-group/ak-checkbox-group.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#components/ak-switch-input"; +import "#elements/ak-checkbox-group/ak-checkbox-group"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, css, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { FlowsInstancesListDesignationEnum, @@ -24,6 +21,11 @@ import { UserFieldsEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { css, html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { sourcesProvider, sourcesSelector } from "./IdentificationStageFormHelpers.js"; @customElement("ak-stage-identification-form") diff --git a/web/src/admin/stages/identification/IdentificationStageFormHelpers.ts b/web/src/admin/stages/identification/IdentificationStageFormHelpers.ts index e9846e60b3..1bf8b49e3c 100644 --- a/web/src/admin/stages/identification/IdentificationStageFormHelpers.ts +++ b/web/src/admin/stages/identification/IdentificationStageFormHelpers.ts @@ -1,5 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { Source, SourcesApi } from "@goauthentik/api"; diff --git a/web/src/admin/stages/invitation/InvitationForm.ts b/web/src/admin/stages/invitation/InvitationForm.ts index a302699e2e..5c503368ef 100644 --- a/web/src/admin/stages/invitation/InvitationForm.ts +++ b/web/src/admin/stages/invitation/InvitationForm.ts @@ -1,19 +1,22 @@ -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { dateTimeLocal } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-flow-search"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { dateTimeLocal } from "#common/temporal"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { FlowsInstancesListDesignationEnum, Invitation, StagesApi } from "@goauthentik/api"; + import YAML from "yaml"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; -import { FlowsInstancesListDesignationEnum, Invitation, StagesApi } from "@goauthentik/api"; - @customElement("ak-invitation-form") export class InvitationForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/invitation/InvitationListLink.ts b/web/src/admin/stages/invitation/InvitationListLink.ts index f42cf350bd..0464680bbd 100644 --- a/web/src/admin/stages/invitation/InvitationListLink.ts +++ b/web/src/admin/stages/invitation/InvitationListLink.ts @@ -1,8 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { AKElement } from "@goauthentik/elements/Base"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { AKElement } from "#elements/Base"; + +import { Invitation, StagesApi } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { until } from "lit/directives/until.js"; @@ -11,8 +14,6 @@ import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { Invitation, StagesApi } from "@goauthentik/api"; - @customElement("ak-stage-invitation-list-link") export class InvitationListLink extends AKElement { @property({ attribute: false }) diff --git a/web/src/admin/stages/invitation/InvitationListPage.ts b/web/src/admin/stages/invitation/InvitationListPage.ts index eeb8dc72b4..efdde2a4fa 100644 --- a/web/src/admin/stages/invitation/InvitationListPage.ts +++ b/web/src/admin/stages/invitation/InvitationListPage.ts @@ -1,23 +1,17 @@ import "#admin/rbac/ObjectPermissionModal"; import "#admin/stages/invitation/InvitationForm"; import "#admin/stages/invitation/InvitationListLink"; -import { DEFAULT_CONFIG } from "#common/api/config"; -import { PFColor } from "#elements/Label"; import "#elements/buttons/ModalButton"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; import "#elements/forms/DeleteBulkForm"; import "#elements/forms/ModalForm"; -import { PaginatedResponse } from "#elements/table/Table"; -import { TableColumn } from "#elements/table/Table"; -import { TablePage } from "#elements/table/TablePage"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { FlowDesignationEnum, @@ -26,6 +20,13 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + +import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; + @customElement("ak-stage-invitation-list") export class InvitationListPage extends TablePage { expandable = true; diff --git a/web/src/admin/stages/invitation/InvitationStageForm.ts b/web/src/admin/stages/invitation/InvitationStageForm.ts index 1b36bcdf5e..c66c487190 100644 --- a/web/src/admin/stages/invitation/InvitationStageForm.ts +++ b/web/src/admin/stages/invitation/InvitationStageForm.ts @@ -1,14 +1,16 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { InvitationStage, StagesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-invitation-form") export class InvitationStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/mtls/MTLSStageForm.ts b/web/src/admin/stages/mtls/MTLSStageForm.ts index 9869dce464..12e705c101 100644 --- a/web/src/admin/stages/mtls/MTLSStageForm.ts +++ b/web/src/admin/stages/mtls/MTLSStageForm.ts @@ -1,17 +1,14 @@ -import { certificateProvider, certificateSelector } from "@goauthentik/admin/brands/Certificates"; -import "@goauthentik/admin/common/ak-crypto-certificate-search"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; +import "#admin/common/ak-crypto-certificate-search"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/ak-dual-select/ak-dual-select-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { certificateProvider, certificateSelector } from "#admin/brands/Certificates"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { CertAttributeEnum, @@ -21,6 +18,11 @@ import { UserAttributeEnum, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-mtls-form") export class MTLSStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/password/PasswordStageForm.ts b/web/src/admin/stages/password/PasswordStageForm.ts index b77e355a6a..63d5ac81ab 100644 --- a/web/src/admin/stages/password/PasswordStageForm.ts +++ b/web/src/admin/stages/password/PasswordStageForm.ts @@ -1,14 +1,12 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-switch-input.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#components/ak-switch-input"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { BackendsEnum, @@ -20,6 +18,10 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-password-form") export class PasswordStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/prompt/PromptForm.ts b/web/src/admin/stages/prompt/PromptForm.ts index 16faa40460..9d2f5fd847 100644 --- a/web/src/admin/stages/prompt/PromptForm.ts +++ b/web/src/admin/stages/prompt/PromptForm.ts @@ -1,14 +1,25 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import { StageHost } from "@goauthentik/flow/stages/base"; -import "@goauthentik/flow/stages/prompt/PromptStage"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; +import "#flow/stages/prompt/PromptStage"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { StageHost } from "#flow/stages/base"; + +import { + instanceOfValidationError, + Prompt, + PromptChallenge, + PromptTypeEnum, + StagesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import { map } from "lit/directives/map.js"; @@ -16,14 +27,6 @@ import { map } from "lit/directives/map.js"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; -import { - Prompt, - PromptChallenge, - PromptTypeEnum, - StagesApi, - instanceOfValidationError, -} from "@goauthentik/api"; - class PreviewStageHost implements StageHost { challenge = undefined; flowSlug = undefined; diff --git a/web/src/admin/stages/prompt/PromptListPage.ts b/web/src/admin/stages/prompt/PromptListPage.ts index 4e023ec4dc..a075dfd341 100644 --- a/web/src/admin/stages/prompt/PromptListPage.ts +++ b/web/src/admin/stages/prompt/PromptListPage.ts @@ -1,22 +1,23 @@ -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import "@goauthentik/admin/stages/prompt/PromptForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/rbac/ObjectPermissionModal"; +import "#admin/stages/prompt/PromptForm"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { Prompt, RbacPermissionsAssignedByUsersListModelEnum, StagesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-stage-prompt-list") export class PromptListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/stages/prompt/PromptStageForm.ts b/web/src/admin/stages/prompt/PromptStageForm.ts index 6685db73ab..a71a40aa0b 100644 --- a/web/src/admin/stages/prompt/PromptStageForm.ts +++ b/web/src/admin/stages/prompt/PromptStageForm.ts @@ -1,19 +1,21 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import "@goauthentik/admin/stages/prompt/PromptForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums"; -import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/ModalForm"; +import "#admin/stages/prompt/PromptForm"; +import "#elements/ak-dual-select/ak-dual-select-dynamic-selected-provider"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/ModalForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { PromptStage, StagesApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + import { policiesProvider, policiesSelector, diff --git a/web/src/admin/stages/prompt/PromptStageFormHelpers.ts b/web/src/admin/stages/prompt/PromptStageFormHelpers.ts index 379649864a..fa28bc2da8 100644 --- a/web/src/admin/stages/prompt/PromptStageFormHelpers.ts +++ b/web/src/admin/stages/prompt/PromptStageFormHelpers.ts @@ -1,10 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg, str } from "@lit/localize"; +import { DualSelectPair } from "#elements/ak-dual-select/types"; import { PoliciesApi, Policy, Prompt, StagesApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; + const promptToSelect = (p: Prompt) => [ p.pk, msg(str`${p.name} ("${p.fieldKey}", of type ${p.type})`), diff --git a/web/src/admin/stages/redirect/RedirectStageForm.ts b/web/src/admin/stages/redirect/RedirectStageForm.ts index e485585177..35b7abc7ce 100644 --- a/web/src/admin/stages/redirect/RedirectStageForm.ts +++ b/web/src/admin/stages/redirect/RedirectStageForm.ts @@ -1,11 +1,9 @@ -import { RenderFlowOption } from "@goauthentik/admin/flows/utils"; -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { RenderFlowOption } from "#admin/flows/utils"; +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { Flow, @@ -16,6 +14,10 @@ import { StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-stage-redirect-form") export class RedirectStageForm extends BaseStageForm { @property({ type: String }) diff --git a/web/src/admin/stages/source/SourceStageForm.ts b/web/src/admin/stages/source/SourceStageForm.ts index d923d88edd..9d1217f82d 100644 --- a/web/src/admin/stages/source/SourceStageForm.ts +++ b/web/src/admin/stages/source/SourceStageForm.ts @@ -1,22 +1,24 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect/index"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { Source, - SourceStage, SourcesAllListRequest, SourcesApi, + SourceStage, StagesApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-source-form") export class SourceStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts index 4099087b61..f718599daf 100644 --- a/web/src/admin/stages/user_delete/UserDeleteStageForm.ts +++ b/web/src/admin/stages/user_delete/UserDeleteStageForm.ts @@ -1,14 +1,16 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { StagesApi, UserDeleteStage } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-user-delete-form") export class UserDeleteStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/user_login/UserLoginStageForm.ts b/web/src/admin/stages/user_login/UserLoginStageForm.ts index 2bafb464da..cb8f50f549 100644 --- a/web/src/admin/stages/user_login/UserLoginStageForm.ts +++ b/web/src/admin/stages/user_login/UserLoginStageForm.ts @@ -1,16 +1,18 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/Alert"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/utils/TimeDeltaHelp"; +import "#elements/Alert"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/utils/TimeDeltaHelp"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { GeoipBindingEnum, NetworkBindingEnum, StagesApi, UserLoginStage } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-user-login-form") export class UserLoginStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts index 4a80eb7a95..ede6f40fa5 100644 --- a/web/src/admin/stages/user_logout/UserLogoutStageForm.ts +++ b/web/src/admin/stages/user_logout/UserLogoutStageForm.ts @@ -1,14 +1,16 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { StagesApi, UserLogoutStage } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-stage-user-logout-form") export class UserLogoutStageForm extends BaseStageForm { loadInstance(pk: string): Promise { diff --git a/web/src/admin/stages/user_write/UserWriteStageForm.ts b/web/src/admin/stages/user_write/UserWriteStageForm.ts index 2af623991c..457e5f088a 100644 --- a/web/src/admin/stages/user_write/UserWriteStageForm.ts +++ b/web/src/admin/stages/user_write/UserWriteStageForm.ts @@ -1,15 +1,11 @@ -import { BaseStageForm } from "@goauthentik/admin/stages/BaseStageForm"; -import { UserCreationModeEnum } from "@goauthentik/api/dist/models/UserCreationModeEnum"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStageForm } from "#admin/stages/BaseStageForm"; import { CoreApi, @@ -19,6 +15,12 @@ import { UserTypeEnum, UserWriteStage, } from "@goauthentik/api"; +import { UserCreationModeEnum } from "@goauthentik/api/dist/models/UserCreationModeEnum"; + +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; @customElement("ak-stage-user-write-form") export class UserWriteStageForm extends BaseStageForm { diff --git a/web/src/admin/system-tasks/SystemTaskListPage.ts b/web/src/admin/system-tasks/SystemTaskListPage.ts index de587a2410..987793f182 100644 --- a/web/src/admin/system-tasks/SystemTaskListPage.ts +++ b/web/src/admin/system-tasks/SystemTaskListPage.ts @@ -1,23 +1,24 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { PFColor } from "@goauthentik/elements/Label"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/events/LogViewer"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#elements/buttons/ActionButton/index"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/events/LogViewer"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { formatElapsedTime } from "#common/temporal"; + +import { PFColor } from "#elements/Label"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; + +import { EventsApi, SystemTask, SystemTaskStatusEnum } from "@goauthentik/api"; + import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { EventsApi, SystemTask, SystemTaskStatusEnum } from "@goauthentik/api"; - @customElement("ak-system-task-list") export class SystemTaskListPage extends TablePage { pageTitle(): string { diff --git a/web/src/admin/tokens/TokenForm.ts b/web/src/admin/tokens/TokenForm.ts index dc5bb10e14..2771c04b1f 100644 --- a/web/src/admin/tokens/TokenForm.ts +++ b/web/src/admin/tokens/TokenForm.ts @@ -1,17 +1,19 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { dateTimeLocal } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/forms/FormGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/FormGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { dateTimeLocal } from "#common/temporal"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { CoreApi, CoreUsersListRequest, IntentEnum, Token, User } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; + @customElement("ak-token-form") export class TokenForm extends ModelForm { @state() diff --git a/web/src/admin/tokens/TokenListPage.ts b/web/src/admin/tokens/TokenListPage.ts index 8cf9a09bc3..63eabfa3d4 100644 --- a/web/src/admin/tokens/TokenListPage.ts +++ b/web/src/admin/tokens/TokenListPage.ts @@ -1,21 +1,18 @@ -import "@goauthentik/admin/rbac/ObjectPermissionModal"; -import "@goauthentik/admin/tokens/TokenForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { intentToLabel } from "@goauthentik/common/labels"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/Dropdown"; -import "@goauthentik/elements/buttons/TokenCopyButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; +import "#admin/rbac/ObjectPermissionModal"; +import "#admin/tokens/TokenForm"; +import "#components/ak-status-label"; +import "#elements/buttons/Dropdown"; +import "#elements/buttons/TokenCopyButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { intentToLabel } from "#common/labels"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; import { CoreApi, @@ -24,6 +21,10 @@ import { Token, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-token-list") export class TokenListPage extends TablePage { searchEnabled(): boolean { diff --git a/web/src/admin/users/GroupSelectModal.ts b/web/src/admin/users/GroupSelectModal.ts index e5151c0afd..a7bbc85c61 100644 --- a/web/src/admin/users/GroupSelectModal.ts +++ b/web/src/admin/users/GroupSelectModal.ts @@ -1,18 +1,19 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TableModal } from "@goauthentik/elements/table/TableModal"; +import "#components/ak-status-label"; +import "#elements/buttons/SpinnerButton/index"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TableModal } from "#elements/table/TableModal"; + +import { CoreApi, Group } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; -import { CoreApi, Group } from "@goauthentik/api"; - @customElement("ak-user-group-select-table") export class GroupSelectModal extends TableModal { checkbox = true; diff --git a/web/src/admin/users/ServiceAccountForm.ts b/web/src/admin/users/ServiceAccountForm.ts index a4d3cf9268..aae93427f0 100644 --- a/web/src/admin/users/ServiceAccountForm.ts +++ b/web/src/admin/users/ServiceAccountForm.ts @@ -1,14 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { dateTimeLocal } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-hidden-text-input"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModalForm } from "@goauthentik/elements/forms/ModalForm"; +import "#components/ak-hidden-text-input"; +import "#elements/forms/HorizontalFormElement"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { dateTimeLocal } from "#common/temporal"; + +import { Form } from "#elements/forms/Form"; +import { ModalForm } from "#elements/forms/ModalForm"; import { CoreApi, @@ -17,6 +14,11 @@ import { UserServiceAccountResponse, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-user-service-account-form") export class ServiceAccountForm extends Form { @property({ attribute: false }) diff --git a/web/src/admin/users/UserActiveForm.ts b/web/src/admin/users/UserActiveForm.ts index ed1499a9aa..d8525215b1 100644 --- a/web/src/admin/users/UserActiveForm.ts +++ b/web/src/admin/users/UserActiveForm.ts @@ -1,11 +1,13 @@ -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { DeleteForm } from "@goauthentik/elements/forms/DeleteForm"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import "#elements/buttons/SpinnerButton/index"; + +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; + +import { DeleteForm } from "#elements/forms/DeleteForm"; +import { showMessage } from "#elements/messages/MessageContainer"; import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; @customElement("ak-user-active-form") diff --git a/web/src/admin/users/UserApplicationTable.ts b/web/src/admin/users/UserApplicationTable.ts index 3da37eb0cc..427b9695ad 100644 --- a/web/src/admin/users/UserApplicationTable.ts +++ b/web/src/admin/users/UserApplicationTable.ts @@ -1,16 +1,19 @@ -import { applicationListStyle } from "@goauthentik/admin/applications/ApplicationListPage"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/AppIcon"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/AppIcon"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { applicationListStyle } from "#admin/applications/ApplicationListPage"; import { Application, CoreApi, User } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-user-application-table") export class UserApplicationTable extends Table { @property({ attribute: false }) diff --git a/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts b/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts index cc9addbc3d..1c3a7e319d 100644 --- a/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts +++ b/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts @@ -1,18 +1,20 @@ -import "@goauthentik/admin/users/UserPermissionForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#admin/users/UserPermissionForm"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { Permission, RbacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-user-assigned-global-permissions-table") export class UserAssignedGlobalPermissionsTable extends Table { @property({ type: Number }) diff --git a/web/src/admin/users/UserAssignedObjectPermissionsTable.ts b/web/src/admin/users/UserAssignedObjectPermissionsTable.ts index a64e537aed..ee883bb23d 100644 --- a/web/src/admin/users/UserAssignedObjectPermissionsTable.ts +++ b/web/src/admin/users/UserAssignedObjectPermissionsTable.ts @@ -1,15 +1,17 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { ExtraUserObjectPermission, ModelEnum, RbacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-assigned-object-permissions-table") export class UserAssignedObjectPermissionsTable extends Table { @property({ type: Number }) diff --git a/web/src/admin/users/UserChart.ts b/web/src/admin/users/UserChart.ts index a5b8144486..695bbb178a 100644 --- a/web/src/admin/users/UserChart.ts +++ b/web/src/admin/users/UserChart.ts @@ -1,12 +1,14 @@ +import { DEFAULT_CONFIG } from "#common/api/config"; + import { EventChart } from "#elements/charts/EventChart"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; + +import { EventActions, EventsApi, EventVolume } from "@goauthentik/api"; + import { ChartData } from "chart.js"; import { msg } from "@lit/localize"; import { customElement, property } from "lit/decorators.js"; -import { EventActions, EventVolume, EventsApi } from "@goauthentik/api"; - @customElement("ak-charts-user") export class UserChart extends EventChart { @property() diff --git a/web/src/admin/users/UserDevicesTable.ts b/web/src/admin/users/UserDevicesTable.ts index ebede0c508..32c77b0fa8 100644 --- a/web/src/admin/users/UserDevicesTable.ts +++ b/web/src/admin/users/UserDevicesTable.ts @@ -1,17 +1,18 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { deviceTypeName } from "@goauthentik/common/labels"; -import { SentryIgnoredError } from "@goauthentik/common/sentry"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { deviceTypeName } from "#common/labels"; +import { SentryIgnoredError } from "#common/sentry/index"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { AuthenticatorsApi, Device } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-device-table") export class UserDeviceTable extends Table { @property({ type: Number }) diff --git a/web/src/admin/users/UserForm.ts b/web/src/admin/users/UserForm.ts index a5c4ccd46f..bb758ee9aa 100644 --- a/web/src/admin/users/UserForm.ts +++ b/web/src/admin/users/UserForm.ts @@ -1,19 +1,22 @@ -import "@goauthentik/admin/users/GroupSelectModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/CodeMirror"; -import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; +import "#admin/users/GroupSelectModal"; +import "#elements/CodeMirror"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { CodeMirrorMode } from "#elements/CodeMirror"; +import { ModelForm } from "#elements/forms/ModelForm"; + +import { CoreApi, Group, User, UserTypeEnum } from "@goauthentik/api"; + import YAML from "yaml"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { CoreApi, Group, User, UserTypeEnum } from "@goauthentik/api"; - @customElement("ak-user-form") export class UserForm extends ModelForm { @property({ attribute: false }) diff --git a/web/src/admin/users/UserImpersonateForm.ts b/web/src/admin/users/UserImpersonateForm.ts index 153a47a039..c81bd5b633 100644 --- a/web/src/admin/users/UserImpersonateForm.ts +++ b/web/src/admin/users/UserImpersonateForm.ts @@ -1,14 +1,16 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { globalAK } from "@goauthentik/common/global"; -import "@goauthentik/components/ak-text-input"; -import { Form } from "@goauthentik/elements/forms/Form"; +import "#components/ak-text-input"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { globalAK } from "#common/global"; + +import { Form } from "#elements/forms/Form"; import { CoreApi, ImpersonationRequest } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-impersonate-form") export class UserImpersonateForm extends Form { @property({ type: Number }) diff --git a/web/src/admin/users/UserListPage.ts b/web/src/admin/users/UserListPage.ts index e4598709b5..36860d8b3b 100644 --- a/web/src/admin/users/UserListPage.ts +++ b/web/src/admin/users/UserListPage.ts @@ -1,44 +1,46 @@ -import type { AdminInterface } from "#admin/AdminInterface/index.entrypoint"; -import { WithBrandConfig } from "#elements/mixins/branding"; -import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/admin/users/ServiceAccountForm"; -import "@goauthentik/admin/users/UserActiveForm"; -import "@goauthentik/admin/users/UserForm"; -import "@goauthentik/admin/users/UserImpersonateForm"; -import "@goauthentik/admin/users/UserPasswordForm"; -import "@goauthentik/admin/users/UserResetEmailForm"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { parseAPIResponseError } from "@goauthentik/common/errors/network"; -import { userTypeToLabel } from "@goauthentik/common/labels"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { rootInterface } from "@goauthentik/common/theme"; -import { DefaultUIConfig, uiConfig } from "@goauthentik/common/ui/config"; -import { me } from "@goauthentik/common/users"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/TreeView"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { showAPIErrorMessage, showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { TableColumn } from "@goauthentik/elements/table/Table"; -import { TablePage } from "@goauthentik/elements/table/TablePage"; -import { writeToClipboard } from "@goauthentik/elements/utils/writeToClipboard"; +import "#admin/users/ServiceAccountForm"; +import "#admin/users/UserActiveForm"; +import "#admin/users/UserForm"; +import "#admin/users/UserImpersonateForm"; +import "#admin/users/UserPasswordForm"; +import "#admin/users/UserResetEmailForm"; +import "#components/ak-status-label"; +import "#elements/TreeView"; +import "#elements/buttons/ActionButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; +import { parseAPIResponseError } from "#common/errors/network"; +import { userTypeToLabel } from "#common/labels"; +import { MessageLevel } from "#common/messages"; +import { formatElapsedTime } from "#common/temporal"; +import { rootInterface } from "#common/theme"; +import { DefaultUIConfig, uiConfig } from "#common/ui/config"; +import { me } from "#common/users"; + +import { showAPIErrorMessage, showMessage } from "#elements/messages/MessageContainer"; +import { WithBrandConfig } from "#elements/mixins/branding"; +import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; +import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TablePage } from "#elements/table/TablePage"; +import { writeToClipboard } from "#elements/utils/writeToClipboard"; + +import type { AdminInterface } from "#admin/AdminInterface/index.entrypoint"; + +import { CoreApi, SessionUser, User, UserPath } from "@goauthentik/api"; + import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { CoreApi, SessionUser, User, UserPath } from "@goauthentik/api"; - export const requestRecoveryLink = (user: User) => new CoreApi(DEFAULT_CONFIG) .coreUsersRecoveryCreate({ diff --git a/web/src/admin/users/UserPasswordForm.ts b/web/src/admin/users/UserPasswordForm.ts index 9bfc7226a8..c2a3792e6d 100644 --- a/web/src/admin/users/UserPasswordForm.ts +++ b/web/src/admin/users/UserPasswordForm.ts @@ -1,14 +1,16 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { Form } from "#elements/forms/Form"; import { CoreApi, UserPasswordSetRequest } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-password-form") export class UserPasswordForm extends Form { @property({ type: Number }) diff --git a/web/src/admin/users/UserPermissionForm.ts b/web/src/admin/users/UserPermissionForm.ts index 07379059e9..1e6d119390 100644 --- a/web/src/admin/users/UserPermissionForm.ts +++ b/web/src/admin/users/UserPermissionForm.ts @@ -1,19 +1,21 @@ -import "@goauthentik/admin/rbac/PermissionSelectModal"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/components/ak-toggle-group"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; -import "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/rbac/PermissionSelectModal"; +import "#components/ak-toggle-group"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/Radio"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { Permission, RbacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + interface UserPermissionAssign { permissions: string[]; } diff --git a/web/src/admin/users/UserResetEmailForm.ts b/web/src/admin/users/UserResetEmailForm.ts index 715b4c657f..4bc559e357 100644 --- a/web/src/admin/users/UserResetEmailForm.ts +++ b/web/src/admin/users/UserResetEmailForm.ts @@ -1,12 +1,10 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { groupBy } from "@goauthentik/common/utils"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { groupBy } from "#common/utils"; + +import { Form } from "#elements/forms/Form"; import { CoreApi, @@ -17,6 +15,10 @@ import { User, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-reset-email-form") export class UserResetEmailForm extends Form { @property({ attribute: false }) diff --git a/web/src/admin/users/UserViewPage.ts b/web/src/admin/users/UserViewPage.ts index 85c7391273..9b4b60e313 100644 --- a/web/src/admin/users/UserViewPage.ts +++ b/web/src/admin/users/UserViewPage.ts @@ -6,36 +6,49 @@ import "#admin/users/UserApplicationTable"; import "#admin/users/UserChart"; import "#admin/users/UserForm"; import "#admin/users/UserImpersonateForm"; -import { renderRecoveryEmailRequest, requestRecoveryLink } from "#admin/users/UserListPage"; import "#admin/users/UserPasswordForm"; -import { DEFAULT_CONFIG } from "#common/api/config"; -import { EVENT_REFRESH } from "#common/constants"; -import { PFSize } from "#common/enums"; -import { userTypeToLabel } from "#common/labels"; -import { formatElapsedTime } from "#common/temporal"; -import { me } from "#common/users"; import "#components/DescriptionList"; -import { type DescriptionPair, renderDescriptionList } from "#components/DescriptionList"; import "#components/ak-page-header"; import "#components/ak-status-label"; import "#components/events/ObjectChangelog"; import "#components/events/UserEvents"; -import { AKElement } from "#elements/Base"; import "#elements/CodeMirror"; import "#elements/Tabs"; import "#elements/buttons/ActionButton/ak-action-button"; import "#elements/buttons/SpinnerButton/ak-spinner-button"; import "#elements/forms/ModalForm"; -import { WithCapabilitiesConfig } from "#elements/mixins/capabilities"; import "#elements/oauth/UserAccessTokenList"; import "#elements/oauth/UserRefreshTokenList"; import "#elements/user/SessionList"; import "#elements/user/UserConsentList"; import "#elements/user/UserReputationList"; import "#elements/user/sources/SourceSettings"; +import "./UserDevicesTable.js"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { PFSize } from "#common/enums"; +import { userTypeToLabel } from "#common/labels"; +import { formatElapsedTime } from "#common/temporal"; +import { me } from "#common/users"; + +import { AKElement } from "#elements/Base"; +import { WithCapabilitiesConfig } from "#elements/mixins/capabilities"; + +import { type DescriptionPair, renderDescriptionList } from "#components/DescriptionList"; + +import { renderRecoveryEmailRequest, requestRecoveryLink } from "#admin/users/UserListPage"; + +import { + CapabilitiesEnum, + CoreApi, + RbacPermissionsAssignedByUsersListModelEnum, + SessionUser, + User, +} from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { TemplateResult, css, html, nothing } from "lit"; +import { css, html, nothing, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -50,16 +63,6 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import { - CapabilitiesEnum, - CoreApi, - RbacPermissionsAssignedByUsersListModelEnum, - SessionUser, - User, -} from "@goauthentik/api"; - -import "./UserDevicesTable"; - @customElement("ak-user-view") export class UserViewPage extends WithCapabilitiesConfig(AKElement) { @property({ type: Number }) diff --git a/web/src/common/api/config.ts b/web/src/common/api/config.ts index a22a214aac..840161c434 100644 --- a/web/src/common/api/config.ts +++ b/web/src/common/api/config.ts @@ -1,11 +1,7 @@ -import { - CSRFMiddleware, - EventMiddleware, - LoggingMiddleware, -} from "@goauthentik/common/api/middleware.js"; -import { EVENT_LOCALE_REQUEST } from "@goauthentik/common/constants.js"; -import { globalAK } from "@goauthentik/common/global.js"; -import { SentryMiddleware } from "@goauthentik/common/sentry/middleware"; +import { CSRFMiddleware, EventMiddleware, LoggingMiddleware } from "#common/api/middleware"; +import { EVENT_LOCALE_REQUEST } from "#common/constants"; +import { globalAK } from "#common/global"; +import { SentryMiddleware } from "#common/sentry/middleware"; import { Config, Configuration, CoreApi, CurrentBrand, RootApi } from "@goauthentik/api"; diff --git a/web/src/common/api/middleware.ts b/web/src/common/api/middleware.ts index 3be20e9365..19a4492cf7 100644 --- a/web/src/common/api/middleware.ts +++ b/web/src/common/api/middleware.ts @@ -1,5 +1,5 @@ -import { EVENT_REQUEST_POST } from "@goauthentik/common/constants.js"; -import { getCookie } from "@goauthentik/common/utils.js"; +import { EVENT_REQUEST_POST } from "#common/constants"; +import { getCookie } from "#common/utils"; import { CurrentBrand, diff --git a/web/src/common/helpers/plex.ts b/web/src/common/helpers/plex.ts index 4172d6672e..dcfa4b8bc9 100644 --- a/web/src/common/helpers/plex.ts +++ b/web/src/common/helpers/plex.ts @@ -1,4 +1,4 @@ -import { SentryIgnoredError } from "@goauthentik/common/sentry"; +import { SentryIgnoredError } from "#common/sentry/index"; export interface PlexPinResponse { // Only has the fields we care about diff --git a/web/src/common/labels.ts b/web/src/common/labels.ts index d63c4a38a3..691f5f247e 100644 --- a/web/src/common/labels.ts +++ b/web/src/common/labels.ts @@ -1,7 +1,7 @@ -import { msg } from "@lit/localize"; - import { Device, EventActions, IntentEnum, SeverityEnum, UserTypeEnum } from "@goauthentik/api"; +import { msg } from "@lit/localize"; + /* Various tables in the API for which we need to supply labels */ export const intentEnumToLabel = new Map([ diff --git a/web/src/common/sentry/index.ts b/web/src/common/sentry/index.ts index 37150e5f24..3b7b551c61 100644 --- a/web/src/common/sentry/index.ts +++ b/web/src/common/sentry/index.ts @@ -1,18 +1,20 @@ -import { globalAK } from "@goauthentik/common/global"; -import { me } from "@goauthentik/common/users"; -import { readInterfaceRouteParam } from "@goauthentik/elements/router/utils"; +import { globalAK } from "#common/global"; +import { me } from "#common/users"; + +import { readInterfaceRouteParam } from "#elements/router/utils"; + +import { CapabilitiesEnum, ResponseError } from "@goauthentik/api"; + import { + browserTracingIntegration, ErrorEvent, EventHint, - browserTracingIntegration, init, setTag, setUser, } from "@sentry/browser"; import * as Spotlight from "@spotlightjs/spotlight"; -import { CapabilitiesEnum, ResponseError } from "@goauthentik/api"; - /** * A generic error that can be thrown without triggering Sentry's reporting. */ diff --git a/web/src/common/sentry/middleware.ts b/web/src/common/sentry/middleware.ts index 333e132dfa..a0d9fadfd0 100644 --- a/web/src/common/sentry/middleware.ts +++ b/web/src/common/sentry/middleware.ts @@ -1,7 +1,7 @@ -import { getCurrentScope, getTraceData } from "@sentry/core"; - import { FetchParams, Middleware, RequestContext } from "@goauthentik/api"; +import { getCurrentScope, getTraceData } from "@sentry/core"; + export class SentryMiddleware implements Middleware { pre?(context: RequestContext): Promise { if (!getCurrentScope().getClient) { diff --git a/web/src/common/stylesheets.ts b/web/src/common/stylesheets.ts index 84a2459a56..7221884d07 100644 --- a/web/src/common/stylesheets.ts +++ b/web/src/common/stylesheets.ts @@ -1,7 +1,7 @@ /** * @file Stylesheet utilities. */ -import { CSSResultOrNative, ReactiveElement, adoptStyles as adoptStyleSheetsShim, css } from "lit"; +import { adoptStyles as adoptStyleSheetsShim, css, CSSResultOrNative, ReactiveElement } from "lit"; /** * Element-like objects containing adoptable stylesheets. diff --git a/web/src/common/theme.ts b/web/src/common/theme.ts index 1d9b66599a..8288fbea81 100644 --- a/web/src/common/theme.ts +++ b/web/src/common/theme.ts @@ -1,14 +1,14 @@ +import AKBase from "#common/styles/authentik.css"; +import AKBaseDark from "#common/styles/theme-dark.css"; /** * @file Theme utilities. */ -import { type StyleRoot, createStyleSheetUnsafe, setAdoptedStyleSheets } from "#common/stylesheets"; - -import AKBase from "#common/styles/authentik.css"; -import AKBaseDark from "#common/styles/theme-dark.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import { createStyleSheetUnsafe, setAdoptedStyleSheets, type StyleRoot } from "#common/stylesheets"; import { UiThemeEnum } from "@goauthentik/api"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + //#region Stylesheet Exports /** diff --git a/web/src/common/ui/config.ts b/web/src/common/ui/config.ts index ce5970399c..765248cc76 100644 --- a/web/src/common/ui/config.ts +++ b/web/src/common/ui/config.ts @@ -1,9 +1,10 @@ -import { me } from "@goauthentik/common/users.js"; -import { isUserRoute } from "@goauthentik/elements/router/utils.js"; -import { deepmerge, deepmergeInto } from "deepmerge-ts"; +import { me } from "#common/users"; -import { UiThemeEnum, UserSelf } from "@goauthentik/api"; -import { CurrentBrand } from "@goauthentik/api"; +import { isUserRoute } from "#elements/router/utils"; + +import { CurrentBrand, UiThemeEnum, UserSelf } from "@goauthentik/api"; + +import { deepmerge } from "deepmerge-ts"; export const DefaultBrand = { brandingLogo: "/static/dist/assets/icons/icon_left_brand.svg", diff --git a/web/src/common/users.ts b/web/src/common/users.ts index 83f4b3a7c0..133251df87 100644 --- a/web/src/common/users.ts +++ b/web/src/common/users.ts @@ -1,6 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config.js"; -import { EVENT_LOCALE_REQUEST } from "@goauthentik/common/constants.js"; -import { isResponseErrorLike } from "@goauthentik/common/errors/network.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_LOCALE_REQUEST } from "#common/constants"; +import { isResponseErrorLike } from "#common/errors/network"; import { CoreApi, SessionUser } from "@goauthentik/api"; diff --git a/web/src/common/utils.ts b/web/src/common/utils.ts index 6d45f5142b..0f65d895d3 100644 --- a/web/src/common/utils.ts +++ b/web/src/common/utils.ts @@ -1,4 +1,4 @@ -import { CSSResult, css } from "lit"; +import { css, CSSResult } from "lit"; export function getCookie(name: string): string { let cookieValue = ""; diff --git a/web/src/common/ws.ts b/web/src/common/ws.ts index 8c6c9b26eb..6a8f209502 100644 --- a/web/src/common/ws.ts +++ b/web/src/common/ws.ts @@ -1,6 +1,6 @@ -import { EVENT_MESSAGE, EVENT_WS_MESSAGE } from "@goauthentik/common/constants"; -import { globalAK } from "@goauthentik/common/global"; -import { MessageLevel } from "@goauthentik/common/messages"; +import { EVENT_MESSAGE, EVENT_WS_MESSAGE } from "#common/constants"; +import { globalAK } from "#common/global"; +import { MessageLevel } from "#common/messages"; import { msg } from "@lit/localize"; diff --git a/web/src/components/DescriptionList.ts b/web/src/components/DescriptionList.ts index c82e28a52a..c3063fd123 100644 --- a/web/src/components/DescriptionList.ts +++ b/web/src/components/DescriptionList.ts @@ -1,4 +1,4 @@ -import { TemplateResult, html, nothing } from "lit"; +import { html, nothing, TemplateResult } from "lit"; import { classMap } from "lit/directives/class-map.js"; import { map } from "lit/directives/map.js"; diff --git a/web/src/components/HorizontalLightComponent.ts b/web/src/components/HorizontalLightComponent.ts index d4c3c10ff8..2269d2080e 100644 --- a/web/src/components/HorizontalLightComponent.ts +++ b/web/src/components/HorizontalLightComponent.ts @@ -1,7 +1,8 @@ -import { AKElement, type AKElementProps } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/forms/HorizontalFormElement.js"; +import "#elements/forms/HorizontalFormElement"; -import { TemplateResult, html, nothing } from "lit"; +import { AKElement, type AKElementProps } from "#elements/Base"; + +import { html, nothing, TemplateResult } from "lit"; import { property } from "lit/decorators.js"; type HelpType = TemplateResult | typeof nothing; diff --git a/web/src/components/ak-event-info.ts b/web/src/components/ak-event-info.ts index 3a6346e2a2..1ea853f589 100644 --- a/web/src/components/ak-event-info.ts +++ b/web/src/components/ak-event-info.ts @@ -1,18 +1,17 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { - EventContext, - EventContextProperty, - EventModel, - EventWithContext, -} from "@goauthentik/common/events"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Expand"; -import "@goauthentik/elements/Spinner"; -import { SlottedTemplateResult } from "@goauthentik/elements/types"; +import "#elements/Expand"; +import "#elements/Spinner"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { PFSize } from "#common/enums"; +import { EventContext, EventContextProperty, EventModel, EventWithContext } from "#common/events"; + +import { AKElement } from "#elements/Base"; +import { SlottedTemplateResult } from "#elements/types"; + +import { EventActions, FlowsApi } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { map } from "lit/directives/map.js"; import { until } from "lit/directives/until.js"; @@ -26,8 +25,6 @@ import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css"; import PFSplit from "@patternfly/patternfly/layouts/Split/split.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { EventActions, FlowsApi } from "@goauthentik/api"; - // TODO: Settle these types. It's too hard to make sense of what we're expecting here. type EventSlotValueType = | number diff --git a/web/src/components/ak-file-input.ts b/web/src/components/ak-file-input.ts index 2a79f03f74..eb6b6da1fc 100644 --- a/web/src/components/ak-file-input.ts +++ b/web/src/components/ak-file-input.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; diff --git a/web/src/components/ak-hidden-text-input.ts b/web/src/components/ak-hidden-text-input.ts index e035a7c1ef..3525276e74 100644 --- a/web/src/components/ak-hidden-text-input.ts +++ b/web/src/components/ak-hidden-text-input.ts @@ -1,3 +1,5 @@ +import "./ak-visibility-toggle.js"; + import { bound } from "#elements/decorators/bound"; import { msg } from "@lit/localize"; @@ -6,12 +8,11 @@ import { customElement, property, query } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { ifDefined } from "lit/directives/if-defined.js"; +import type { VisibilityToggleProps } from "./ak-visibility-toggle.js"; import { HorizontalLightComponent, HorizontalLightComponentProps, -} from "./HorizontalLightComponent"; -import "./ak-visibility-toggle.js"; -import type { VisibilityToggleProps } from "./ak-visibility-toggle.js"; +} from "./HorizontalLightComponent.js"; type BaseProps = HorizontalLightComponentProps & Pick; diff --git a/web/src/components/ak-hidden-textarea-input.ts b/web/src/components/ak-hidden-textarea-input.ts index 6edd5e94e8..a18424faad 100644 --- a/web/src/components/ak-hidden-textarea-input.ts +++ b/web/src/components/ak-hidden-textarea-input.ts @@ -1,4 +1,4 @@ -import { css, html } from "lit"; +import { html } from "lit"; import { customElement, property, query } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { ifDefined } from "lit/directives/if-defined.js"; diff --git a/web/src/components/ak-hint/ShowHintController.ts b/web/src/components/ak-hint/ShowHintController.ts index 1752ba4dae..24a1abfcf5 100644 --- a/web/src/components/ak-hint/ShowHintController.ts +++ b/web/src/components/ak-hint/ShowHintController.ts @@ -1,7 +1,7 @@ -import { LOCALSTORAGE_AUTHENTIK_KEY } from "@goauthentik/common/constants"; +import { LOCALSTORAGE_AUTHENTIK_KEY } from "#common/constants"; import { msg } from "@lit/localize"; -import { LitElement, ReactiveController, ReactiveControllerHost, html } from "lit"; +import { html, LitElement, ReactiveController, ReactiveControllerHost } from "lit"; type ReactiveLitElement = LitElement & ReactiveControllerHost; diff --git a/web/src/components/ak-hint/ak-hint-actions.ts b/web/src/components/ak-hint/ak-hint-actions.ts index 80ce8c9c0a..c81c8fb42d 100644 --- a/web/src/components/ak-hint/ak-hint-actions.ts +++ b/web/src/components/ak-hint/ak-hint-actions.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { css, html } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/components/ak-hint/ak-hint-body.ts b/web/src/components/ak-hint/ak-hint-body.ts index fec0775c50..7cb80d7983 100644 --- a/web/src/components/ak-hint/ak-hint-body.ts +++ b/web/src/components/ak-hint/ak-hint-body.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { css, html } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/components/ak-hint/ak-hint-footer.ts b/web/src/components/ak-hint/ak-hint-footer.ts index d2c2278eb2..4fd7289a7c 100644 --- a/web/src/components/ak-hint/ak-hint-footer.ts +++ b/web/src/components/ak-hint/ak-hint-footer.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { css, html } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/components/ak-hint/ak-hint-title.ts b/web/src/components/ak-hint/ak-hint-title.ts index dc2556621f..5bbe855409 100644 --- a/web/src/components/ak-hint/ak-hint-title.ts +++ b/web/src/components/ak-hint/ak-hint-title.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { css, html } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/components/ak-hint/ak-hint.stories.ts b/web/src/components/ak-hint/ak-hint.stories.ts index fb912ea5e7..304f741e9a 100644 --- a/web/src/components/ak-hint/ak-hint.stories.ts +++ b/web/src/components/ak-hint/ak-hint.stories.ts @@ -1,15 +1,18 @@ -import { MessageLevel } from "@goauthentik/common/messages"; -import "@goauthentik/elements/buttons/ActionButton/ak-action-button"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import "#elements/buttons/ActionButton/ak-action-button"; +import "../ak-radio-input.js"; +import "./ak-hint.js"; +import "./ak-hint-body.js"; +import "./ak-hint-title.js"; + +import { MessageLevel } from "#common/messages"; + +import { showMessage } from "#elements/messages/MessageContainer"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-radio-input"; -import "./ak-hint"; -import AkHint from "./ak-hint"; -import "./ak-hint-body"; -import "./ak-hint-title"; +import AkHint from "./ak-hint.js"; const metadata: Meta = { title: "Components / Patternfly Hint", diff --git a/web/src/components/ak-hint/ak-hint.ts b/web/src/components/ak-hint/ak-hint.ts index 0ada7f94a9..65c2065677 100644 --- a/web/src/components/ak-hint/ak-hint.ts +++ b/web/src/components/ak-hint/ak-hint.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { css, html } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/components/ak-multi-select.ts b/web/src/components/ak-multi-select.ts index ceb3cba118..8e2d5b69f5 100644 --- a/web/src/components/ak-multi-select.ts +++ b/web/src/components/ak-multi-select.ts @@ -1,11 +1,12 @@ -import { AkControlElement } from "@goauthentik/elements/AkControlElement.js"; -import "@goauthentik/elements/forms/HorizontalFormElement"; +import "#elements/forms/HorizontalFormElement"; -import { TemplateResult, css, html, nothing } from "lit"; +import { AkControlElement } from "#elements/AkControlElement"; + +import { css, html, nothing, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import { map } from "lit/directives/map.js"; -import { Ref, createRef, ref } from "lit/directives/ref.js"; +import { createRef, ref, Ref } from "lit/directives/ref.js"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; diff --git a/web/src/components/ak-nav-buttons.ts b/web/src/components/ak-nav-buttons.ts index db728794da..506e8f9f00 100644 --- a/web/src/components/ak-nav-buttons.ts +++ b/web/src/components/ak-nav-buttons.ts @@ -1,13 +1,15 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { - EVENT_API_DRAWER_TOGGLE, - EVENT_NOTIFICATION_DRAWER_TOGGLE, -} from "@goauthentik/common/constants"; -import { globalAK } from "@goauthentik/common/global"; -import { UIConfig, UserDisplay, uiConfig } from "@goauthentik/common/ui/config"; -import { me } from "@goauthentik/common/users"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/buttons/ActionButton/ak-action-button"; +import "#elements/buttons/ActionButton/ak-action-button"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_API_DRAWER_TOGGLE, EVENT_NOTIFICATION_DRAWER_TOGGLE } from "#common/constants"; +import { globalAK } from "#common/global"; +import { uiConfig, UIConfig, UserDisplay } from "#common/ui/config"; +import { me } from "#common/users"; + +import { AKElement } from "#elements/Base"; + +import { CoreApi, EventsApi, SessionUser } from "@goauthentik/api"; + import { match } from "ts-pattern"; import { msg } from "@lit/localize"; @@ -25,8 +27,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; -import { CoreApi, EventsApi, SessionUser } from "@goauthentik/api"; - @customElement("ak-nav-buttons") export class NavigationButtons extends AKElement { @property({ type: Object }) diff --git a/web/src/components/ak-number-input.ts b/web/src/components/ak-number-input.ts index eaa2071cb9..f5d6466c65 100644 --- a/web/src/components/ak-number-input.ts +++ b/web/src/components/ak-number-input.ts @@ -2,7 +2,7 @@ import { html } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { HorizontalLightComponent } from "./HorizontalLightComponent"; +import { HorizontalLightComponent } from "./HorizontalLightComponent.js"; @customElement("ak-number-input") export class AkNumberInput extends HorizontalLightComponent { diff --git a/web/src/components/ak-page-header.ts b/web/src/components/ak-page-header.ts index be178b15b8..8aa83bd3ed 100644 --- a/web/src/components/ak-page-header.ts +++ b/web/src/components/ak-page-header.ts @@ -1,8 +1,9 @@ import "#components/ak-nav-buttons"; -import { AKPageNavbar } from "#components/ak-page-navbar"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { CSSResult, LitElement, css } from "lit"; +import { AKPageNavbar } from "#components/ak-page-navbar"; + +import { css, CSSResult, LitElement } from "lit"; import { customElement, property } from "lit/decorators.js"; export interface PageHeaderInit { diff --git a/web/src/components/ak-page-navbar.ts b/web/src/components/ak-page-navbar.ts index a03be00db3..a70840f57a 100644 --- a/web/src/components/ak-page-navbar.ts +++ b/web/src/components/ak-page-navbar.ts @@ -1,17 +1,22 @@ +import "#components/ak-nav-buttons"; +import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; + import { EVENT_WS_MESSAGE } from "#common/constants"; import { globalAK } from "#common/global"; -import { UIConfig, UserDisplay, getConfigForUser } from "#common/ui/config"; +import { getConfigForUser, UIConfig, UserDisplay } from "#common/ui/config"; import { me } from "#common/users"; -import "#components/ak-nav-buttons"; -import type { PageHeaderInit, SidebarToggleEventDetail } from "#components/ak-page-header"; + import { AKElement } from "#elements/Base"; import { WithBrandConfig } from "#elements/mixins/branding"; import { isAdminRoute } from "#elements/router/utils"; import { themeImage } from "#elements/utils/images"; -import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; + +import type { PageHeaderInit, SidebarToggleEventDetail } from "#components/ak-page-header"; + +import { SessionUser } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; @@ -23,8 +28,6 @@ import PFNotificationBadge from "@patternfly/patternfly/components/NotificationB import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { SessionUser } from "@goauthentik/api"; - /** * A global navbar component at the top of the page. * diff --git a/web/src/components/ak-radio-input.ts b/web/src/components/ak-radio-input.ts index 27dd706d33..872174d5e8 100644 --- a/web/src/components/ak-radio-input.ts +++ b/web/src/components/ak-radio-input.ts @@ -1,10 +1,11 @@ -import { RadioOption } from "@goauthentik/elements/forms/Radio"; -import "@goauthentik/elements/forms/Radio"; +import "#elements/forms/Radio"; + +import { RadioOption } from "#elements/forms/Radio"; import { html, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { HorizontalLightComponent } from "./HorizontalLightComponent"; +import { HorizontalLightComponent } from "./HorizontalLightComponent.js"; @customElement("ak-radio-input") export class AkRadioInput extends HorizontalLightComponent { diff --git a/web/src/components/ak-search-ql/index.ts b/web/src/components/ak-search-ql/index.ts index 4575b8fb20..974591c5fa 100644 --- a/web/src/components/ak-search-ql/index.ts +++ b/web/src/components/ak-search-ql/index.ts @@ -1,10 +1,12 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/buttons/Dropdown"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; +import "#elements/buttons/Dropdown"; + +import { AKElement } from "#elements/Base"; +import { PaginatedResponse } from "#elements/table/Table"; + import DjangoQL, { Introspections } from "@mrmarble/djangoql-completion"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property, query, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; diff --git a/web/src/components/ak-secret-text-input.ts b/web/src/components/ak-secret-text-input.ts index 66dd63346d..8176f0e08d 100644 --- a/web/src/components/ak-secret-text-input.ts +++ b/web/src/components/ak-secret-text-input.ts @@ -1,4 +1,4 @@ -import { ifNotEmpty } from "@goauthentik/elements/utils/ifNotEmpty.js"; +import { ifNotEmpty } from "#elements/utils/ifNotEmpty"; import { msg } from "@lit/localize"; import { html } from "lit"; @@ -6,7 +6,7 @@ import { customElement, property } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { HorizontalLightComponent } from "./HorizontalLightComponent"; +import { HorizontalLightComponent } from "./HorizontalLightComponent.js"; @customElement("ak-secret-text-input") export class AkSecretTextInput extends HorizontalLightComponent { diff --git a/web/src/components/ak-secret-textarea-input.ts b/web/src/components/ak-secret-textarea-input.ts index 2420ee85ed..943a8f0cf4 100644 --- a/web/src/components/ak-secret-textarea-input.ts +++ b/web/src/components/ak-secret-textarea-input.ts @@ -1,7 +1,7 @@ -import { ifNotEmpty } from "@goauthentik/elements/utils/ifNotEmpty.js"; +import { ifNotEmpty } from "#elements/utils/ifNotEmpty"; import { html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { customElement } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { ifDefined } from "lit/directives/if-defined.js"; diff --git a/web/src/components/ak-slug-input.ts b/web/src/components/ak-slug-input.ts index b3cc598193..80e17f7298 100644 --- a/web/src/components/ak-slug-input.ts +++ b/web/src/components/ak-slug-input.ts @@ -1,11 +1,12 @@ -import { bound } from "@goauthentik/elements/decorators/bound.js"; +import { bound } from "#elements/decorators/bound"; + import { kebabCase } from "change-case"; import { html } from "lit"; import { customElement, property, query } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { HorizontalLightComponent } from "./HorizontalLightComponent"; +import { HorizontalLightComponent } from "./HorizontalLightComponent.js"; const slugify = (s: string) => kebabCase(s, { suffixCharacters: "-" }); diff --git a/web/src/components/ak-status-label.ts b/web/src/components/ak-status-label.ts index b1e9dcd1e0..2a717e8c9c 100644 --- a/web/src/components/ak-status-label.ts +++ b/web/src/components/ak-status-label.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; import { css, html } from "lit"; diff --git a/web/src/components/ak-switch-input.ts b/web/src/components/ak-switch-input.ts index 229a41996a..257cf1ba96 100644 --- a/web/src/components/ak-switch-input.ts +++ b/web/src/components/ak-switch-input.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { html, nothing } from "lit"; import { customElement, property, query } from "lit/decorators.js"; diff --git a/web/src/components/ak-text-input.ts b/web/src/components/ak-text-input.ts index ff35543475..0aa7fb2c4f 100644 --- a/web/src/components/ak-text-input.ts +++ b/web/src/components/ak-text-input.ts @@ -3,7 +3,7 @@ import { customElement, property } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { HorizontalLightComponent } from "./HorizontalLightComponent"; +import { HorizontalLightComponent } from "./HorizontalLightComponent.js"; @customElement("ak-text-input") export class AkTextInput extends HorizontalLightComponent { diff --git a/web/src/components/ak-textarea-input.ts b/web/src/components/ak-textarea-input.ts index 3988772505..179317fbfe 100644 --- a/web/src/components/ak-textarea-input.ts +++ b/web/src/components/ak-textarea-input.ts @@ -2,7 +2,7 @@ import { html } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { HorizontalLightComponent } from "./HorizontalLightComponent"; +import { HorizontalLightComponent } from "./HorizontalLightComponent.js"; @customElement("ak-textarea-input") export class AkTextareaInput extends HorizontalLightComponent { diff --git a/web/src/components/ak-toggle-group.ts b/web/src/components/ak-toggle-group.ts index de13e2a5d6..350c4ac735 100644 --- a/web/src/components/ak-toggle-group.ts +++ b/web/src/components/ak-toggle-group.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; import { css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/components/ak-visibility-toggle.ts b/web/src/components/ak-visibility-toggle.ts index 3750e06417..3f55507b4d 100644 --- a/web/src/components/ak-visibility-toggle.ts +++ b/web/src/components/ak-visibility-toggle.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base.js"; +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; import { html } from "lit"; diff --git a/web/src/components/ak-wizard/WizardContexts.ts b/web/src/components/ak-wizard/WizardContexts.ts index db48d42e95..31dcec033e 100644 --- a/web/src/components/ak-wizard/WizardContexts.ts +++ b/web/src/components/ak-wizard/WizardContexts.ts @@ -1,6 +1,6 @@ import { createContext } from "@lit/context"; -import type { WizardStepState } from "./types"; +import type { WizardStepState } from "./types.js"; export const wizardStepContext = createContext( Symbol.for("authentik-wizard-step-labels"), diff --git a/web/src/components/ak-wizard/WizardStep.ts b/web/src/components/ak-wizard/WizardStep.ts index ad99134a82..94516bd561 100644 --- a/web/src/components/ak-wizard/WizardStep.ts +++ b/web/src/components/ak-wizard/WizardStep.ts @@ -1,6 +1,7 @@ -import { AKElement } from "@goauthentik/elements/Base.js"; -import { bound } from "@goauthentik/elements/decorators/bound"; -import { P, match } from "ts-pattern"; +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; + +import { match, P } from "ts-pattern"; import { consume } from "@lit/context"; import { msg } from "@lit/localize"; @@ -13,10 +14,15 @@ import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFWizard from "@patternfly/patternfly/components/Wizard/wizard.css"; -import { wizardStepContext } from "./WizardContexts.js"; import { NavigationEventInit, WizardCloseEvent, WizardNavigationEvent } from "./events.js"; -import { WizardStepLabel, WizardStepState } from "./types"; -import { type ButtonKind, type NavigableButton, type WizardButton } from "./types"; +import { + type ButtonKind, + type NavigableButton, + type WizardButton, + WizardStepLabel, + WizardStepState, +} from "./types.js"; +import { wizardStepContext } from "./WizardContexts.js"; const isNavigable = (b: WizardButton): b is NavigableButton => "destination" in b && typeof b.destination === "string" && b.destination.length > 0; diff --git a/web/src/components/ak-wizard/ak-wizard-steps.ts b/web/src/components/ak-wizard/ak-wizard-steps.ts index 4bdd3efe40..60a53d5f9f 100644 --- a/web/src/components/ak-wizard/ak-wizard-steps.ts +++ b/web/src/components/ak-wizard/ak-wizard-steps.ts @@ -1,14 +1,14 @@ -import { AKElement } from "@goauthentik/elements/Base.js"; -import { bound } from "@goauthentik/elements/decorators/bound"; +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; import { ContextProvider } from "@lit/context"; import { html, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { wizardStepContext } from "./WizardContexts"; -import { type WizardStep } from "./WizardStep"; -import { NavigationEventInit, WizardNavigationEvent } from "./events"; -import { WizardStepState } from "./types"; +import { NavigationEventInit, WizardNavigationEvent } from "./events.js"; +import { WizardStepState } from "./types.js"; +import { wizardStepContext } from "./WizardContexts.js"; +import { type WizardStep } from "./WizardStep.js"; /** * @class WizardStepsManager diff --git a/web/src/components/events/ObjectChangelog.ts b/web/src/components/events/ObjectChangelog.ts index fef7f7d792..4e88d48e7b 100644 --- a/web/src/components/events/ObjectChangelog.ts +++ b/web/src/components/events/ObjectChangelog.ts @@ -1,23 +1,25 @@ -import { EventGeo, renderEventUser } from "@goauthentik/admin/events/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EventWithContext } from "@goauthentik/common/events"; -import { actionToLabel } from "@goauthentik/common/labels"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-event-info"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/Dropdown"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; -import { SlottedTemplateResult } from "@goauthentik/elements/types"; +import "#components/ak-event-info"; +import "#elements/Tabs"; +import "#elements/buttons/Dropdown"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; -import { msg } from "@lit/localize"; -import { PropertyValues, TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EventWithContext } from "#common/events"; +import { actionToLabel } from "#common/labels"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; +import { SlottedTemplateResult } from "#elements/types"; + +import { EventGeo, renderEventUser } from "#admin/events/utils"; import { Event, EventsApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, PropertyValues, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-object-changelog") export class ObjectChangelog extends Table { expandable = true; diff --git a/web/src/components/events/UserEvents.ts b/web/src/components/events/UserEvents.ts index e627166ec5..64e1deacb1 100644 --- a/web/src/components/events/UserEvents.ts +++ b/web/src/components/events/UserEvents.ts @@ -1,22 +1,25 @@ -import { renderEventUser } from "@goauthentik/admin/events/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EventWithContext } from "@goauthentik/common/events"; -import { actionToLabel } from "@goauthentik/common/labels"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-event-info"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/buttons/Dropdown"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; -import { SlottedTemplateResult } from "@goauthentik/elements/types"; +import "#components/ak-event-info"; +import "#elements/Tabs"; +import "#elements/buttons/Dropdown"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/SpinnerButton/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EventWithContext } from "#common/events"; +import { actionToLabel } from "#common/labels"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; +import { SlottedTemplateResult } from "#elements/types"; + +import { renderEventUser } from "#admin/events/utils"; import { Event, EventsApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-events-user") export class UserEvents extends Table { expandable = true; diff --git a/web/src/components/stories/ak-hidden-text-input.stories.ts b/web/src/components/stories/ak-hidden-text-input.stories.ts index 36a721ff2f..8aba984e73 100644 --- a/web/src/components/stories/ak-hidden-text-input.stories.ts +++ b/web/src/components/stories/ak-hidden-text-input.stories.ts @@ -1,9 +1,10 @@ +import "../ak-hidden-text-input.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; -import { html, nothing } from "lit"; +import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; -import "../ak-hidden-text-input"; import { type AkHiddenTextInput, type AkHiddenTextInputProps } from "../ak-hidden-text-input.js"; const metadata: Meta = { diff --git a/web/src/components/stories/ak-hidden-textarea-input.stories.ts b/web/src/components/stories/ak-hidden-textarea-input.stories.ts index 212b38a418..d5a5e1c12a 100644 --- a/web/src/components/stories/ak-hidden-textarea-input.stories.ts +++ b/web/src/components/stories/ak-hidden-textarea-input.stories.ts @@ -1,9 +1,10 @@ +import "../ak-hidden-textarea-input.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; -import { html, nothing } from "lit"; +import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; -import "../ak-hidden-textarea-input"; import { type AkHiddenTextAreaInput, type AkHiddenTextAreaInputProps, diff --git a/web/src/components/stories/ak-multi-select.stories.ts b/web/src/components/stories/ak-multi-select.stories.ts index a3115c560e..311f7b0673 100644 --- a/web/src/components/stories/ak-multi-select.stories.ts +++ b/web/src/components/stories/ak-multi-select.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-multi-select.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html, render } from "lit"; +import { html, render, TemplateResult } from "lit"; -import "../ak-multi-select"; -import AkMultiSelect from "../ak-multi-select"; +import AkMultiSelect from "../ak-multi-select.js"; const metadata: Meta = { title: "Components / MultiSelect", diff --git a/web/src/components/stories/ak-number-input.stories.ts b/web/src/components/stories/ak-number-input.stories.ts index e1c991fa7b..8a598298b0 100644 --- a/web/src/components/stories/ak-number-input.stories.ts +++ b/web/src/components/stories/ak-number-input.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-number-input.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-number-input"; -import AkNumberInput from "../ak-number-input"; +import AkNumberInput from "../ak-number-input.js"; const metadata: Meta = { title: "Components / Number Input", diff --git a/web/src/components/stories/ak-page-navbar.stories.ts b/web/src/components/stories/ak-page-navbar.stories.ts index 4a1c8aba24..24544fb599 100644 --- a/web/src/components/stories/ak-page-navbar.stories.ts +++ b/web/src/components/stories/ak-page-navbar.stories.ts @@ -1,13 +1,16 @@ -import { DefaultBrand } from "#common/ui/config"; import "#components/ak-page-header"; + +import { DefaultBrand } from "#common/ui/config"; + import { AKPageNavbar } from "#components/ak-page-navbar"; + +import { CurrentBrand } from "@goauthentik/api"; + import { Meta } from "@storybook/web-components"; import { html } from "lit"; import { customElement } from "lit/decorators.js"; -import { CurrentBrand } from "@goauthentik/api"; - const metadata: Meta = { title: "Components / Page Navbar", component: "ak-page-navbar", diff --git a/web/src/components/stories/ak-radio-input.stories.ts b/web/src/components/stories/ak-radio-input.stories.ts index 68be02ecdb..d96d21176a 100644 --- a/web/src/components/stories/ak-radio-input.stories.ts +++ b/web/src/components/stories/ak-radio-input.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-radio-input.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-radio-input"; -import AkRadioInput from "../ak-radio-input"; +import AkRadioInput from "../ak-radio-input.js"; const metadata: Meta>> = { title: "Components / Radio Input", diff --git a/web/src/components/stories/ak-slug-input.stories.ts b/web/src/components/stories/ak-slug-input.stories.ts index 57a51fc5e7..4c386646ce 100644 --- a/web/src/components/stories/ak-slug-input.stories.ts +++ b/web/src/components/stories/ak-slug-input.stories.ts @@ -1,11 +1,12 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-slug-input.js"; +import "../ak-text-input.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-slug-input"; -import AkSlugInput from "../ak-slug-input"; -import "../ak-text-input"; +import AkSlugInput from "../ak-slug-input.js"; const metadata: Meta = { title: "Components / Slug Input", diff --git a/web/src/components/stories/ak-status-label.stories.ts b/web/src/components/stories/ak-status-label.stories.ts index 67c99ec283..47ce882d8e 100644 --- a/web/src/components/stories/ak-status-label.stories.ts +++ b/web/src/components/stories/ak-status-label.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-status-label.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-status-label"; -import AkStatusLabel from "../ak-status-label"; +import AkStatusLabel from "../ak-status-label.js"; const metadata: Meta = { title: "Components / App Status Label", diff --git a/web/src/components/stories/ak-switch-input.stories.ts b/web/src/components/stories/ak-switch-input.stories.ts index 4985d78911..798ead484b 100644 --- a/web/src/components/stories/ak-switch-input.stories.ts +++ b/web/src/components/stories/ak-switch-input.stories.ts @@ -1,14 +1,15 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-switch-input.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; // Necessary because we're NOT supplying the CSS for the interiors // in our "light" dom. import PFSwitch from "@patternfly/patternfly/components/Switch/switch.css"; -import "../ak-switch-input"; -import AkSwitchInput from "../ak-switch-input"; +import AkSwitchInput from "../ak-switch-input.js"; const metadata: Meta = { title: "Components / Switch Input", diff --git a/web/src/components/stories/ak-text-input.stories.ts b/web/src/components/stories/ak-text-input.stories.ts index 0359f2fabf..bd2bc84960 100644 --- a/web/src/components/stories/ak-text-input.stories.ts +++ b/web/src/components/stories/ak-text-input.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-text-input.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-text-input"; -import AkTextInput from "../ak-text-input"; +import AkTextInput from "../ak-text-input.js"; const metadata: Meta = { title: "Components / Text Input", diff --git a/web/src/components/stories/ak-textarea-input.stories.ts b/web/src/components/stories/ak-textarea-input.stories.ts index 9afb1dd9e8..209d25586d 100644 --- a/web/src/components/stories/ak-textarea-input.stories.ts +++ b/web/src/components/stories/ak-textarea-input.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-textarea-input.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-textarea-input"; -import AkTextareaInput from "../ak-textarea-input"; +import AkTextareaInput from "../ak-textarea-input.js"; const metadata: Meta = { title: "Components / Textarea Input", diff --git a/web/src/components/stories/ak-toggle-group.stories.ts b/web/src/components/stories/ak-toggle-group.stories.ts index ed35571f65..13fa5d6e62 100644 --- a/web/src/components/stories/ak-toggle-group.stories.ts +++ b/web/src/components/stories/ak-toggle-group.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-toggle-group.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-toggle-group"; -import AkToggleGroup from "../ak-toggle-group"; +import AkToggleGroup from "../ak-toggle-group.js"; const metadata: Meta = { title: "Components / Toggle Group", diff --git a/web/src/components/stories/ak-visibility-toggle.stories.ts b/web/src/components/stories/ak-visibility-toggle.stories.ts index af1a7a4797..077bf7d6d2 100644 --- a/web/src/components/stories/ak-visibility-toggle.stories.ts +++ b/web/src/components/stories/ak-visibility-toggle.stories.ts @@ -1,9 +1,10 @@ +import "../ak-visibility-toggle.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; -import { html, nothing } from "lit"; +import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; -import "../ak-visibility-toggle"; import { type VisibilityToggle, type VisibilityToggleProps } from "../ak-visibility-toggle.js"; const metadata: Meta = { diff --git a/web/src/elements/AkControlElement.ts b/web/src/elements/AkControlElement.ts index 984d5504e8..520c477673 100644 --- a/web/src/elements/AkControlElement.ts +++ b/web/src/elements/AkControlElement.ts @@ -1,4 +1,4 @@ -import { AKElement } from "./Base"; +import { AKElement } from "./Base.js"; /** * @class - prototype for all of our hand-made input elements diff --git a/web/src/elements/Alert.ts b/web/src/elements/Alert.ts index 076ba35953..202ec20abf 100644 --- a/web/src/elements/Alert.ts +++ b/web/src/elements/Alert.ts @@ -1,5 +1,6 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { type SlottedTemplateResult, type Spread } from "@goauthentik/elements/types"; +import { AKElement } from "#elements/Base"; +import { type SlottedTemplateResult, type Spread } from "#elements/types"; + import { spread } from "@open-wc/lit-helpers"; import { css, html, nothing } from "lit"; diff --git a/web/src/elements/AppIcon.ts b/web/src/elements/AppIcon.ts index e9cfbb36ee..80aa2e4efe 100644 --- a/web/src/elements/AppIcon.ts +++ b/web/src/elements/AppIcon.ts @@ -1,9 +1,11 @@ -import { PFSize } from "@goauthentik/common/enums.js"; -import { AKElement } from "@goauthentik/elements/Base"; -import { P, match } from "ts-pattern"; +import { PFSize } from "#common/enums"; + +import { AKElement } from "#elements/Base"; + +import { match, P } from "ts-pattern"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFFAIcons from "@patternfly/patternfly/base/patternfly-fa-icons.css"; diff --git a/web/src/elements/AuthenticatedInterface.ts b/web/src/elements/AuthenticatedInterface.ts index 2a38fde5e3..7e2af9e80e 100644 --- a/web/src/elements/AuthenticatedInterface.ts +++ b/web/src/elements/AuthenticatedInterface.ts @@ -1,6 +1,6 @@ -import { Interface } from "#elements/Interface"; import { LicenseContextController } from "#elements/controllers/LicenseContextController"; import { VersionContextController } from "#elements/controllers/VersionContextController"; +import { Interface } from "#elements/Interface"; export class AuthenticatedInterface extends Interface { constructor() { diff --git a/web/src/elements/Base.ts b/web/src/elements/Base.ts index 0f21074c91..d79757d200 100644 --- a/web/src/elements/Base.ts +++ b/web/src/elements/Base.ts @@ -1,21 +1,21 @@ import { globalAK } from "#common/global"; -import { StyleRoot, createCSSResult, createStyleSheetUnsafe } from "#common/stylesheets"; +import { createCSSResult, createStyleSheetUnsafe, StyleRoot } from "#common/stylesheets"; import { $AKBase, - CSSColorSchemeValue, - ResolvedUITheme, applyUITheme, createUIThemeEffect, + CSSColorSchemeValue, formatColorScheme, + ResolvedUITheme, resolveUITheme, } from "#common/theme"; +import { UiThemeEnum } from "@goauthentik/api"; + import { localized } from "@lit/localize"; import { CSSResult, CSSResultGroup, CSSResultOrNative, LitElement } from "lit"; import { property } from "lit/decorators.js"; -import { UiThemeEnum } from "@goauthentik/api"; - export interface AKElementProps { activeTheme: ResolvedUITheme; } diff --git a/web/src/elements/CodeMirror.ts b/web/src/elements/CodeMirror.ts index 3ff48ffece..0f6b154e0c 100644 --- a/web/src/elements/CodeMirror.ts +++ b/web/src/elements/CodeMirror.ts @@ -1,3 +1,9 @@ +import { EVENT_THEME_CHANGE } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { UiThemeEnum } from "@goauthentik/api"; + import { defaultKeymap, history, historyKeymap } from "@codemirror/commands"; import { css as cssLang } from "@codemirror/lang-css"; import { html as htmlLang } from "@codemirror/lang-html"; @@ -5,25 +11,20 @@ import { javascript } from "@codemirror/lang-javascript"; import { python } from "@codemirror/lang-python"; import { xml } from "@codemirror/lang-xml"; import { + defaultHighlightStyle, LanguageSupport, StreamLanguage, - defaultHighlightStyle, syntaxHighlighting, } from "@codemirror/language"; import * as yamlMode from "@codemirror/legacy-modes/mode/yaml"; import { Compartment, EditorState, Extension } from "@codemirror/state"; import { oneDark, oneDarkHighlightStyle } from "@codemirror/theme-one-dark"; -import { ViewUpdate } from "@codemirror/view"; -import { EditorView, drawSelection, keymap, lineNumbers } from "@codemirror/view"; -import { EVENT_THEME_CHANGE } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; +import { drawSelection, EditorView, keymap, lineNumbers, ViewUpdate } from "@codemirror/view"; import YAML from "yaml"; -import { CSSResult, css } from "lit"; +import { css, CSSResult } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { UiThemeEnum } from "@goauthentik/api"; - export enum CodeMirrorMode { XML = "xml", JavaScript = "javascript", diff --git a/web/src/elements/Diagram.ts b/web/src/elements/Diagram.ts index 4ff6e5a062..9016372b25 100644 --- a/web/src/elements/Diagram.ts +++ b/web/src/elements/Diagram.ts @@ -1,16 +1,19 @@ -import { EVENT_REFRESH, EVENT_THEME_CHANGE } from "@goauthentik/common/constants"; -import { DOM_PURIFY_STRICT } from "@goauthentik/common/purify"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; +import "#elements/EmptyState"; + +import { EVENT_REFRESH, EVENT_THEME_CHANGE } from "#common/constants"; +import { DOM_PURIFY_STRICT } from "#common/purify"; + +import { AKElement } from "#elements/Base"; + +import { UiThemeEnum } from "@goauthentik/api"; + import mermaid, { MermaidConfig } from "mermaid"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { unsafeHTML } from "lit/directives/unsafe-html.js"; import { until } from "lit/directives/until.js"; -import { UiThemeEnum } from "@goauthentik/api"; - @customElement("ak-diagram") export class Diagram extends AKElement { @property({ attribute: false }) diff --git a/web/src/elements/Divider.ts b/web/src/elements/Divider.ts index ed847bedaa..1d12e0c20d 100644 --- a/web/src/elements/Divider.ts +++ b/web/src/elements/Divider.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { type SlottedTemplateResult } from "@goauthentik/elements/types"; +import { AKElement } from "#elements/Base"; +import { type SlottedTemplateResult } from "#elements/types"; import { css, html, nothing } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/elements/EmptyState.ts b/web/src/elements/EmptyState.ts index b182d3aed4..e6c8b7ac6b 100644 --- a/web/src/elements/EmptyState.ts +++ b/web/src/elements/EmptyState.ts @@ -1,7 +1,10 @@ -import { PFSize } from "@goauthentik/common/enums.js"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Spinner"; -import { type SlottedTemplateResult, type Spread } from "@goauthentik/elements/types"; +import "#elements/Spinner"; + +import { PFSize } from "#common/enums"; + +import { AKElement } from "#elements/Base"; +import { type SlottedTemplateResult, type Spread } from "#elements/types"; + import { spread } from "@open-wc/lit-helpers"; import { msg } from "@lit/localize"; diff --git a/web/src/elements/Expand.ts b/web/src/elements/Expand.ts index 6d5538bdc9..f181c06cec 100644 --- a/web/src/elements/Expand.ts +++ b/web/src/elements/Expand.ts @@ -1,5 +1,6 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { type SlottedTemplateResult, type Spread } from "@goauthentik/elements/types"; +import { AKElement } from "#elements/Base"; +import { type SlottedTemplateResult, type Spread } from "#elements/types"; + import { spread } from "@open-wc/lit-helpers"; import { msg } from "@lit/localize"; diff --git a/web/src/elements/Interface.ts b/web/src/elements/Interface.ts index eb9ed49a72..6c66387cd5 100644 --- a/web/src/elements/Interface.ts +++ b/web/src/elements/Interface.ts @@ -1,5 +1,6 @@ import { globalAK } from "#common/global"; import { applyDocumentTheme } from "#common/theme"; + import { AKElement } from "#elements/Base"; import { BrandingContextController } from "#elements/controllers/BrandContextController"; import { ConfigContextController } from "#elements/controllers/ConfigContextController"; diff --git a/web/src/elements/Label.ts b/web/src/elements/Label.ts index 520664456c..02972ab98f 100644 --- a/web/src/elements/Label.ts +++ b/web/src/elements/Label.ts @@ -1,5 +1,6 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import type { SlottedTemplateResult, Spread } from "@goauthentik/elements/types"; +import { AKElement } from "#elements/Base"; +import type { SlottedTemplateResult, Spread } from "#elements/types"; + import { spread } from "@open-wc/lit-helpers"; import { css, html, nothing } from "lit"; diff --git a/web/src/elements/LoadingOverlay.ts b/web/src/elements/LoadingOverlay.ts index 1360d3b501..e7ec1986ae 100644 --- a/web/src/elements/LoadingOverlay.ts +++ b/web/src/elements/LoadingOverlay.ts @@ -1,6 +1,8 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; -import { type SlottedTemplateResult, type Spread } from "@goauthentik/elements/types"; +import "#elements/EmptyState"; + +import { AKElement } from "#elements/Base"; +import { type SlottedTemplateResult, type Spread } from "#elements/types"; + import { spread } from "@open-wc/lit-helpers"; import { css, html, nothing } from "lit"; diff --git a/web/src/elements/Spinner.ts b/web/src/elements/Spinner.ts index 2e49fa7914..ed746cbfde 100644 --- a/web/src/elements/Spinner.ts +++ b/web/src/elements/Spinner.ts @@ -1,8 +1,9 @@ -import { PFSize } from "@goauthentik/common/enums.js"; -import { AKElement } from "@goauthentik/elements/Base"; +import { PFSize } from "#common/enums"; + +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css"; diff --git a/web/src/elements/Tabs.ts b/web/src/elements/Tabs.ts index 55455bd423..15c497e2d1 100644 --- a/web/src/elements/Tabs.ts +++ b/web/src/elements/Tabs.ts @@ -1,9 +1,10 @@ -import { CURRENT_CLASS, EVENT_REFRESH, ROUTE_SEPARATOR } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; -import { getURLParams, updateURLParams } from "@goauthentik/elements/router/RouteMatch"; +import { CURRENT_CLASS, EVENT_REFRESH, ROUTE_SEPARATOR } from "#common/constants"; + +import { AKElement } from "#elements/Base"; +import { getURLParams, updateURLParams } from "#elements/router/RouteMatch"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; diff --git a/web/src/elements/TreeView.ts b/web/src/elements/TreeView.ts index a7053d1068..ef903d1b60 100644 --- a/web/src/elements/TreeView.ts +++ b/web/src/elements/TreeView.ts @@ -1,9 +1,10 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; -import { setURLParams } from "@goauthentik/elements/router/RouteMatch"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; +import { setURLParams } from "#elements/router/RouteMatch"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFTreeView from "@patternfly/patternfly/components/TreeView/tree-view.css"; diff --git a/web/src/elements/ak-array-input.ts b/web/src/elements/ak-array-input.ts index 86addde310..9e3e832406 100644 --- a/web/src/elements/ak-array-input.ts +++ b/web/src/elements/ak-array-input.ts @@ -1,11 +1,12 @@ -import { AkControlElement } from "@goauthentik/elements/AkControlElement"; -import { bound } from "@goauthentik/elements/decorators/bound"; -import { type Spread } from "@goauthentik/elements/types"; -import { randomId } from "@goauthentik/elements/utils/randomId.js"; +import { AkControlElement } from "#elements/AkControlElement"; +import { bound } from "#elements/decorators/bound"; +import { type Spread } from "#elements/types"; +import { randomId } from "#elements/utils/randomId"; + import { spread } from "@open-wc/lit-helpers"; import { msg } from "@lit/localize"; -import { TemplateResult, css, html, nothing } from "lit"; +import { css, html, nothing, TemplateResult } from "lit"; import { customElement, property, queryAll } from "lit/decorators.js"; import { repeat } from "lit/directives/repeat.js"; diff --git a/web/src/elements/ak-checkbox-group/ak-checkbox-group.stories.ts b/web/src/elements/ak-checkbox-group/ak-checkbox-group.stories.ts index 11ec69e094..d0b5ece8b7 100644 --- a/web/src/elements/ak-checkbox-group/ak-checkbox-group.stories.ts +++ b/web/src/elements/ak-checkbox-group/ak-checkbox-group.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "./ak-checkbox-group.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "./ak-checkbox-group"; -import { CheckboxGroup as AkCheckboxGroup } from "./ak-checkbox-group"; +import { CheckboxGroup as AkCheckboxGroup } from "./ak-checkbox-group.js"; const metadata: Meta = { title: "Elements / Checkbox Group", diff --git a/web/src/elements/ak-checkbox-group/ak-checkbox-group.ts b/web/src/elements/ak-checkbox-group/ak-checkbox-group.ts index ca8712fc73..3f9334c4da 100644 --- a/web/src/elements/ak-checkbox-group/ak-checkbox-group.ts +++ b/web/src/elements/ak-checkbox-group/ak-checkbox-group.ts @@ -1,9 +1,9 @@ -import { AkControlElement } from "@goauthentik/elements/AkControlElement"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AkControlElement } from "#elements/AkControlElement"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; import { msg } from "@lit/localize"; import { PropertyValues } from "@lit/reactive-element"; -import { TemplateResult, css, html } from "lit"; +import { css, html, TemplateResult } from "lit"; import { customElement, property, queryAll, state } from "lit/decorators.js"; import { map } from "lit/directives/map.js"; diff --git a/web/src/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.ts b/web/src/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.ts index 6b764afd54..53774ced6a 100644 --- a/web/src/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.ts +++ b/web/src/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.ts @@ -1,10 +1,11 @@ -import { PropertyValues, html } from "lit"; +import "./ak-dual-select.js"; + +import { html, PropertyValues } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ref } from "lit/directives/ref.js"; import { AkDualSelectProvider } from "./ak-dual-select-provider.js"; -import "./ak-dual-select.js"; -import type { DualSelectPair, DualSelectPairSource } from "./types.js"; +import type { DualSelectPairSource } from "./types.js"; /** * @element ak-dual-select-dynamic-provider diff --git a/web/src/elements/ak-dual-select/ak-dual-select-provider.ts b/web/src/elements/ak-dual-select/ak-dual-select-provider.ts index d69661a3df..3eaf32732e 100644 --- a/web/src/elements/ak-dual-select/ak-dual-select-provider.ts +++ b/web/src/elements/ak-dual-select/ak-dual-select-provider.ts @@ -1,14 +1,15 @@ -import { AkControlElement } from "@goauthentik/elements/AkControlElement.js"; -import { CustomListenerElement } from "@goauthentik/elements/utils/eventEmitter.js"; +import "./ak-dual-select.js"; -import { msg } from "@lit/localize"; -import { PropertyValues, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { createRef, ref } from "lit/directives/ref.js"; +import { AkControlElement } from "#elements/AkControlElement"; +import { CustomListenerElement } from "#elements/utils/eventEmitter"; import type { Pagination } from "@goauthentik/api"; -import "./ak-dual-select.js"; +import { msg } from "@lit/localize"; +import { html, PropertyValues } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { createRef, ref } from "lit/directives/ref.js"; + import { AkDualSelect } from "./ak-dual-select.js"; import { type DataProvider, DualSelectEventType, type DualSelectPair } from "./types.js"; diff --git a/web/src/elements/ak-dual-select/ak-dual-select.ts b/web/src/elements/ak-dual-select/ak-dual-select.ts index 7d022cd706..1ca2e26eca 100644 --- a/web/src/elements/ak-dual-select/ak-dual-select.ts +++ b/web/src/elements/ak-dual-select/ak-dual-select.ts @@ -1,28 +1,27 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { - CustomEmitterElement, - CustomListenerElement, -} from "@goauthentik/elements/utils/eventEmitter"; +import "./components/ak-dual-select-available-pane.js"; +import "./components/ak-dual-select-controls.js"; +import "./components/ak-dual-select-selected-pane.js"; +import "./components/ak-pagination.js"; +import "./components/ak-search-bar.js"; + +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement, CustomListenerElement } from "#elements/utils/eventEmitter"; + import { match } from "ts-pattern"; import { msg, str } from "@lit/localize"; -import { PropertyValues, html, nothing } from "lit"; +import { html, nothing, PropertyValues } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import { createRef, ref } from "lit/directives/ref.js"; import type { Ref } from "lit/directives/ref.js"; +import { createRef, ref } from "lit/directives/ref.js"; import { unsafeHTML } from "lit/directives/unsafe-html.js"; -import { globalVariables, mainStyles } from "./components/styles.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import "./components/ak-dual-select-available-pane.js"; import { AkDualSelectAvailablePane } from "./components/ak-dual-select-available-pane.js"; -import "./components/ak-dual-select-controls.js"; -import "./components/ak-dual-select-selected-pane.js"; import { AkDualSelectSelectedPane } from "./components/ak-dual-select-selected-pane.js"; -import "./components/ak-pagination.js"; -import "./components/ak-search-bar.js"; +import { globalVariables, mainStyles } from "./components/styles.js"; import { BasePagination, DualSelectEventType, diff --git a/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts b/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts index d516c5fef1..f9bb69b2cb 100644 --- a/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts +++ b/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts @@ -1,18 +1,18 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; -import { PropertyValues, html, nothing } from "lit"; +import { html, nothing, PropertyValues } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { map } from "lit/directives/map.js"; import { createRef, ref } from "lit/directives/ref.js"; -import { availablePaneStyles, listStyles } from "./styles.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFDualListSelector from "@patternfly/patternfly/components/DualListSelector/dual-list-selector.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import { DualSelectEventType, DualSelectPair } from "../types.js"; +import { availablePaneStyles, listStyles } from "./styles.js"; const hostAttributes = [ ["aria-labelledby", "dual-list-selector-available-pane-status"], diff --git a/web/src/elements/ak-dual-select/components/ak-dual-select-controls.ts b/web/src/elements/ak-dual-select/components/ak-dual-select-controls.ts index 66eab4f2a8..2a07a218b6 100644 --- a/web/src/elements/ak-dual-select/components/ak-dual-select-controls.ts +++ b/web/src/elements/ak-dual-select/components/ak-dual-select-controls.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; import { msg } from "@lit/localize"; import { css, html, nothing } from "lit"; diff --git a/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts b/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts index 7e2c670848..5912a1de44 100644 --- a/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts +++ b/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts @@ -1,17 +1,17 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; import { html } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { map } from "lit/directives/map.js"; -import { listStyles, selectedPaneStyles } from "./styles.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFDualListSelector from "@patternfly/patternfly/components/DualListSelector/dual-list-selector.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { DualSelectEventType, DualSelectPair } from "../types"; +import { DualSelectEventType, DualSelectPair } from "../types.js"; +import { listStyles, selectedPaneStyles } from "./styles.js"; const hostAttributes = [ ["aria-labelledby", "dual-list-selector-selected-pane-status"], diff --git a/web/src/elements/ak-dual-select/components/ak-pagination.ts b/web/src/elements/ak-dual-select/components/ak-pagination.ts index 713982ef21..a5c539e992 100644 --- a/web/src/elements/ak-dual-select/components/ak-pagination.ts +++ b/web/src/elements/ak-dual-select/components/ak-pagination.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; import { msg, str } from "@lit/localize"; import { css, html, nothing } from "lit"; diff --git a/web/src/elements/ak-dual-select/components/ak-search-bar.ts b/web/src/elements/ak-dual-select/components/ak-search-bar.ts index 426e64b8cc..cb7dabd161 100644 --- a/web/src/elements/ak-dual-select/components/ak-search-bar.ts +++ b/web/src/elements/ak-dual-select/components/ak-search-bar.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; import { html } from "lit"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/elements/ak-dual-select/index.ts b/web/src/elements/ak-dual-select/index.ts index 3ed6f37f37..51834c9fc3 100644 --- a/web/src/elements/ak-dual-select/index.ts +++ b/web/src/elements/ak-dual-select/index.ts @@ -1,6 +1,7 @@ -import "./ak-dual-select-provider"; -import { AkDualSelectProvider } from "./ak-dual-select-provider.js"; +import "./ak-dual-select-provider.js"; import "./ak-dual-select.js"; + +import { AkDualSelectProvider } from "./ak-dual-select-provider.js"; import { AkDualSelect } from "./ak-dual-select.js"; export { AkDualSelect, AkDualSelectProvider }; diff --git a/web/src/elements/ak-dual-select/stories/ak-dual-select-available-pane.stories.ts b/web/src/elements/ak-dual-select/stories/ak-dual-select-available-pane.stories.ts index e0f9a0b0e0..3f82887f02 100644 --- a/web/src/elements/ak-dual-select/stories/ak-dual-select-available-pane.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-dual-select-available-pane.stories.ts @@ -1,12 +1,13 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../components/ak-dual-select-available-pane.js"; +import "./sb-host-provider.js"; + import { Meta, StoryObj } from "@storybook/web-components"; import { slug } from "github-slugger"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../components/ak-dual-select-available-pane"; -import { AkDualSelectAvailablePane } from "../components/ak-dual-select-available-pane"; -import "./sb-host-provider"; +import { AkDualSelectAvailablePane } from "../components/ak-dual-select-available-pane.js"; const metadata: Meta = { title: "Elements / Dual Select / Available Items Pane", diff --git a/web/src/elements/ak-dual-select/stories/ak-dual-select-controls.stories.ts b/web/src/elements/ak-dual-select/stories/ak-dual-select-controls.stories.ts index 329bcd45b1..3ab8c92205 100644 --- a/web/src/elements/ak-dual-select/stories/ak-dual-select-controls.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-dual-select-controls.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../components/ak-dual-select-controls.js"; + import { Meta, StoryObj } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../components/ak-dual-select-controls"; -import { AkDualSelectControls } from "../components/ak-dual-select-controls"; +import { AkDualSelectControls } from "../components/ak-dual-select-controls.js"; const metadata: Meta = { title: "Elements / Dual Select / Control Panel", diff --git a/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts b/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts index c2ea031e6e..9942dd950b 100644 --- a/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts @@ -1,15 +1,16 @@ -import "@goauthentik/elements/messages/MessageContainer"; -import { Meta, StoryObj } from "@storybook/web-components"; -import { slug } from "github-slugger"; - -import { LitElement, TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import "#elements/messages/MessageContainer"; +import "../ak-dual-select.js"; import { Pagination } from "@goauthentik/api"; -import "../ak-dual-select"; -import { AkDualSelect } from "../ak-dual-select"; -import { DualSelectEventType, type DualSelectPair } from "../types"; +import { Meta, StoryObj } from "@storybook/web-components"; +import { slug } from "github-slugger"; + +import { html, LitElement, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + +import { AkDualSelect } from "../ak-dual-select.js"; +import { DualSelectEventType, type DualSelectPair } from "../types.js"; const goodForYouRaw = ` Apple, Arrowroot, Artichoke, Arugula, Asparagus, Avocado, Bamboo, Banana, Basil, Beet Root, diff --git a/web/src/elements/ak-dual-select/stories/ak-dual-select-search.stories.ts b/web/src/elements/ak-dual-select/stories/ak-dual-select-search.stories.ts index 967450c70c..8f8bb79a4e 100644 --- a/web/src/elements/ak-dual-select/stories/ak-dual-select-search.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-dual-select-search.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../components/ak-search-bar.js"; + import { Meta, StoryObj } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../components/ak-search-bar"; -import { AkSearchbar } from "../components/ak-search-bar"; +import { AkSearchbar } from "../components/ak-search-bar.js"; const metadata: Meta = { title: "Elements / Dual Select / Search Bar", diff --git a/web/src/elements/ak-dual-select/stories/ak-dual-select-selected-pane.stories.ts b/web/src/elements/ak-dual-select/stories/ak-dual-select-selected-pane.stories.ts index 4dc6ef9c3b..8e98081540 100644 --- a/web/src/elements/ak-dual-select/stories/ak-dual-select-selected-pane.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-dual-select-selected-pane.stories.ts @@ -1,12 +1,13 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../components/ak-dual-select-selected-pane.js"; +import "./sb-host-provider.js"; + import { Meta, StoryObj } from "@storybook/web-components"; import { slug } from "github-slugger"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../components/ak-dual-select-selected-pane"; -import { AkDualSelectSelectedPane } from "../components/ak-dual-select-selected-pane"; -import "./sb-host-provider"; +import { AkDualSelectSelectedPane } from "../components/ak-dual-select-selected-pane.js"; const metadata: Meta = { title: "Elements / Dual Select / Selected Items Pane", diff --git a/web/src/elements/ak-dual-select/stories/ak-dual-select.stories.ts b/web/src/elements/ak-dual-select/stories/ak-dual-select.stories.ts index 67c0cb3d03..6a790df8d5 100644 --- a/web/src/elements/ak-dual-select/stories/ak-dual-select.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-dual-select.stories.ts @@ -1,11 +1,12 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-dual-select.js"; + import { Meta, StoryObj } from "@storybook/web-components"; import { slug } from "github-slugger"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-dual-select"; -import { AkDualSelect } from "../ak-dual-select"; +import { AkDualSelect } from "../ak-dual-select.js"; const metadata: Meta = { title: "Elements / Dual Select / Dual Select", diff --git a/web/src/elements/ak-dual-select/stories/ak-pagination.stories.ts b/web/src/elements/ak-dual-select/stories/ak-pagination.stories.ts index 9c81b1327a..7f1b8a3fb3 100644 --- a/web/src/elements/ak-dual-select/stories/ak-pagination.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-pagination.stories.ts @@ -1,11 +1,12 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../components/ak-pagination.js"; + import { Meta, StoryObj } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../components/ak-pagination"; -import { AkPagination } from "../components/ak-pagination"; -import { DualSelectEventType } from "../types"; +import { AkPagination } from "../components/ak-pagination.js"; +import { DualSelectEventType } from "../types.js"; const metadata: Meta = { title: "Elements / Dual Select / Pagination Control", diff --git a/web/src/elements/ak-dual-select/stories/sb-host-provider.ts b/web/src/elements/ak-dual-select/stories/sb-host-provider.ts index 02ec2d67e8..b897f8eb4c 100644 --- a/web/src/elements/ak-dual-select/stories/sb-host-provider.ts +++ b/web/src/elements/ak-dual-select/stories/sb-host-provider.ts @@ -1,4 +1,4 @@ -import { LitElement, html } from "lit"; +import { html, LitElement } from "lit"; import { customElement } from "lit/decorators.js"; import { globalVariables } from "../components/styles.js"; diff --git a/web/src/elements/ak-dual-select/types.ts b/web/src/elements/ak-dual-select/types.ts index 4ccd374464..18471554e6 100644 --- a/web/src/elements/ak-dual-select/types.ts +++ b/web/src/elements/ak-dual-select/types.ts @@ -1,7 +1,7 @@ -import { TemplateResult } from "lit"; - import { Pagination } from "@goauthentik/api"; +import { TemplateResult } from "lit"; + export const DualSelectEventType = { AddSelected: "ak-dual-select-add", RemoveSelected: "ak-dual-select-remove", diff --git a/web/src/elements/ak-list-select/ak-list-select.ts b/web/src/elements/ak-list-select/ak-list-select.ts index ac8381ad35..3ac4c4c2a8 100644 --- a/web/src/elements/ak-list-select/ak-list-select.ts +++ b/web/src/elements/ak-list-select/ak-list-select.ts @@ -1,15 +1,11 @@ -import { AKElement } from "@goauthentik/elements/Base.js"; -import { bound } from "@goauthentik/elements/decorators/bound.js"; -import type { - GroupedOptions, - SelectGroup, - SelectOption, - SelectOptions, -} from "@goauthentik/elements/types.js"; -import { randomId } from "@goauthentik/elements/utils/randomId.js"; +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; +import type { GroupedOptions, SelectGroup, SelectOption, SelectOptions } from "#elements/types"; +import { randomId } from "#elements/utils/randomId"; + import { match } from "ts-pattern"; -import { PropertyValueMap, css, html, nothing } from "lit"; +import { css, html, nothing, PropertyValueMap } from "lit"; import { customElement, property, query, state } from "lit/decorators.js"; import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; diff --git a/web/src/elements/ak-list-select/stories/ak-list-select.stories.ts b/web/src/elements/ak-list-select/stories/ak-list-select.stories.ts index b41852a3e7..5e1a86501b 100644 --- a/web/src/elements/ak-list-select/stories/ak-list-select.stories.ts +++ b/web/src/elements/ak-list-select/stories/ak-list-select.stories.ts @@ -1,11 +1,13 @@ -import { EVENT_MESSAGE } from "@goauthentik/common/constants"; -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../ak-list-select.js"; + +import { EVENT_MESSAGE } from "#common/constants"; + import { Meta, StoryObj } from "@storybook/web-components"; import { slug } from "github-slugger"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../ak-list-select.js"; import { ListSelect } from "../ak-list-select.js"; import { groupedSampleData, sampleData } from "./sampleData.js"; diff --git a/web/src/elements/ak-list-select/utils.ts b/web/src/elements/ak-list-select/utils.ts index b182c514c5..3516e09701 100644 --- a/web/src/elements/ak-list-select/utils.ts +++ b/web/src/elements/ak-list-select/utils.ts @@ -1,4 +1,4 @@ -import type { GroupedOptions, SelectOptions } from "@goauthentik/elements/types"; +import type { GroupedOptions, SelectOptions } from "#elements/types"; export function isVisibleInScrollRegion(el: HTMLElement, container: HTMLElement) { const elTop = el.offsetTop; diff --git a/web/src/elements/ak-locale-context/ak-locale-context.stories.ts b/web/src/elements/ak-locale-context/ak-locale-context.stories.ts index 2d144f1496..1e5b4b4480 100644 --- a/web/src/elements/ak-locale-context/ak-locale-context.stories.ts +++ b/web/src/elements/ak-locale-context/ak-locale-context.stories.ts @@ -1,12 +1,13 @@ -import { EVENT_LOCALE_REQUEST } from "@goauthentik/common/constants"; -import { customEvent } from "@goauthentik/elements/utils/customEvents"; +import "./ak-locale-context.js"; + +import { EVENT_LOCALE_REQUEST } from "#common/constants"; + +import { customEvent } from "#elements/utils/customEvents"; import { localized, msg } from "@lit/localize"; -import { LitElement, html } from "lit"; +import { html, LitElement } from "lit"; import { customElement } from "lit/decorators.js"; -import "./ak-locale-context"; - export default { title: "Elements / Shell / Locale Context", }; diff --git a/web/src/elements/ak-locale-context/ak-locale-context.ts b/web/src/elements/ak-locale-context/ak-locale-context.ts index 900ccd3841..e025aa9491 100644 --- a/web/src/elements/ak-locale-context/ak-locale-context.ts +++ b/web/src/elements/ak-locale-context/ak-locale-context.ts @@ -1,14 +1,15 @@ -import { EVENT_LOCALE_CHANGE, EVENT_LOCALE_REQUEST } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; -import { customEvent } from "@goauthentik/elements/utils/customEvents"; +import { EVENT_LOCALE_CHANGE, EVENT_LOCALE_REQUEST } from "#common/constants"; + +import { AKElement } from "#elements/Base"; +import { customEvent } from "#elements/utils/customEvents"; import { html } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { WithBrandConfig } from "../mixins/branding"; -import { initializeLocalization } from "./configureLocale"; -import type { LocaleGetter, LocaleSetter } from "./configureLocale"; -import { DEFAULT_LOCALE, autoDetectLanguage, getBestMatchLocale } from "./helpers"; +import { WithBrandConfig } from "../mixins/branding.js"; +import type { LocaleGetter, LocaleSetter } from "./configureLocale.js"; +import { initializeLocalization } from "./configureLocale.js"; +import { autoDetectLanguage, DEFAULT_LOCALE, getBestMatchLocale } from "./helpers.js"; /** * A component to manage your locale settings. diff --git a/web/src/elements/ak-locale-context/configureLocale.ts b/web/src/elements/ak-locale-context/configureLocale.ts index ddf47c85b1..fde2682861 100644 --- a/web/src/elements/ak-locale-context/configureLocale.ts +++ b/web/src/elements/ak-locale-context/configureLocale.ts @@ -1,7 +1,7 @@ import { configureLocalization } from "@lit/localize"; import { sourceLocale, targetLocales } from "../../locale-codes"; -import { getBestMatchLocale } from "./helpers"; +import { getBestMatchLocale } from "./helpers.js"; type LocaleGetter = ReturnType["getLocale"]; type LocaleSetter = ReturnType["setLocale"]; diff --git a/web/src/elements/ak-locale-context/definitions.ts b/web/src/elements/ak-locale-context/definitions.ts index ef21a93ebc..47c41b2395 100644 --- a/web/src/elements/ak-locale-context/definitions.ts +++ b/web/src/elements/ak-locale-context/definitions.ts @@ -3,7 +3,7 @@ import * as _enLocale from "#locales/en"; import type { LocaleModule } from "@lit/localize"; import { msg } from "@lit/localize"; -import { AkLocale, LocaleRow } from "./types"; +import { AkLocale, LocaleRow } from "./types.js"; export const DEFAULT_FALLBACK = "en"; diff --git a/web/src/elements/ak-locale-context/helpers.ts b/web/src/elements/ak-locale-context/helpers.ts index 751371485a..4d70af6aba 100644 --- a/web/src/elements/ak-locale-context/helpers.ts +++ b/web/src/elements/ak-locale-context/helpers.ts @@ -1,7 +1,7 @@ -import { globalAK } from "@goauthentik/common/global"; +import { globalAK } from "#common/global"; -import { LOCALES as RAW_LOCALES, enLocale } from "./definitions"; -import { AkLocale } from "./types"; +import { enLocale, LOCALES as RAW_LOCALES } from "./definitions.js"; +import { AkLocale } from "./types.js"; export const DEFAULT_LOCALE = "en"; diff --git a/web/src/elements/ak-locale-context/index.ts b/web/src/elements/ak-locale-context/index.ts index 1a264c6b3a..9209efd0f5 100644 --- a/web/src/elements/ak-locale-context/index.ts +++ b/web/src/elements/ak-locale-context/index.ts @@ -1,4 +1,4 @@ -import LocaleContext from "./ak-locale-context"; +import LocaleContext from "./ak-locale-context.js"; export { LocaleContext }; export default LocaleContext; diff --git a/web/src/elements/ak-mdx/ak-mdx.tsx b/web/src/elements/ak-mdx/ak-mdx.tsx index 0d7ea57bac..98f179ebd9 100644 --- a/web/src/elements/ak-mdx/ak-mdx.tsx +++ b/web/src/elements/ak-mdx/ak-mdx.tsx @@ -1,24 +1,29 @@ -import { globalAK } from "#common/global"; import "#elements/Alert"; -import { AKElement } from "#elements/Base"; -import { MDXModuleContext, fetchMDXModule } from "#elements/ak-mdx/MDXModuleContext"; + +import { globalAK } from "#common/global"; +import OneDark from "#common/styles/one-dark.css"; + import { MDXAnchor } from "#elements/ak-mdx/components/MDXAnchor"; import { MDXWrapper } from "#elements/ak-mdx/components/MDXWrapper"; +import { fetchMDXModule, MDXModuleContext } from "#elements/ak-mdx/MDXModuleContext"; import { remarkAdmonition } from "#elements/ak-mdx/remark/remark-admonition"; import { remarkHeadings } from "#elements/ak-mdx/remark/remark-headings"; import { remarkLists } from "#elements/ak-mdx/remark/remark-lists"; -import { WithAuthentikConfig } from "#elements/mixins/config"; +import { AKElement } from "#elements/Base"; + import { DistDirectoryName, StaticDirectoryName } from "#paths"; + +import { UiThemeEnum } from "@goauthentik/api"; + import { compile as compileMDX, run as runMDX } from "@mdx-js/mdx"; import apacheGrammar from "highlight.js/lib/languages/apache"; import diffGrammar from "highlight.js/lib/languages/diff"; import confGrammar from "highlight.js/lib/languages/ini"; import nginxGrammar from "highlight.js/lib/languages/nginx"; import { common } from "lowlight"; -import { Root, createRoot } from "react-dom/client"; +import { createRoot, Root } from "react-dom/client"; import * as runtime from "react/jsx-runtime"; -import rehypeHighlight from "rehype-highlight"; -import { Options as HighlightOptions } from "rehype-highlight"; +import rehypeHighlight, { Options as HighlightOptions } from "rehype-highlight"; import rehypeMermaid, { RehypeMermaidOptions } from "rehype-mermaid"; import remarkDirective from "remark-directive"; import remarkFrontmatter from "remark-frontmatter"; @@ -30,14 +35,11 @@ import type { MDXModule } from "~docs/types"; import { css } from "lit"; import { customElement, property } from "lit/decorators.js"; -import OneDark from "#common/styles/one-dark.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFList from "@patternfly/patternfly/components/List/list.css"; import PFTable from "@patternfly/patternfly/components/Table/table.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { UiThemeEnum } from "@goauthentik/api"; - const highlightThemeOptions: HighlightOptions = { languages: { ...common, diff --git a/web/src/elements/ak-mdx/components/MDXAnchor.tsx b/web/src/elements/ak-mdx/components/MDXAnchor.tsx index 75244ce16b..ac86d37ef8 100644 --- a/web/src/elements/ak-mdx/components/MDXAnchor.tsx +++ b/web/src/elements/ak-mdx/components/MDXAnchor.tsx @@ -1,6 +1,8 @@ -import { useMDXModule } from "@goauthentik/elements/ak-mdx/MDXModuleContext"; import { resolve } from "node:path"; -import React, { memo } from "react"; + +import { useMDXModule } from "#elements/ak-mdx/MDXModuleContext"; + +import React from "react"; const DOCS_DOMAIN = "https://goauthentik.io"; diff --git a/web/src/elements/ak-mdx/index.ts b/web/src/elements/ak-mdx/index.ts index 4a80c2c1de..fa94cc1ce3 100644 --- a/web/src/elements/ak-mdx/index.ts +++ b/web/src/elements/ak-mdx/index.ts @@ -1,2 +1,2 @@ -export * from "./ak-mdx"; -export { AKMDX as default } from "./ak-mdx"; +export * from "./ak-mdx.js"; +export { AKMDX as default } from "./ak-mdx.js"; diff --git a/web/src/elements/ak-table/TableColumn.ts b/web/src/elements/ak-table/TableColumn.ts index 038c3f6630..3d8b468bca 100644 --- a/web/src/elements/ak-table/TableColumn.ts +++ b/web/src/elements/ak-table/TableColumn.ts @@ -1,4 +1,4 @@ -import { bound } from "@goauthentik/elements/decorators/bound"; +import { bound } from "#elements/decorators/bound"; import { html } from "lit"; import { classMap } from "lit/directives/class-map.js"; diff --git a/web/src/elements/ak-table/ak-select-table.ts b/web/src/elements/ak-table/ak-select-table.ts index 2d86da904f..07f9547a2c 100644 --- a/web/src/elements/ak-table/ak-select-table.ts +++ b/web/src/elements/ak-table/ak-select-table.ts @@ -1,12 +1,12 @@ -import { bound } from "@goauthentik/elements/decorators/bound"; +import { bound } from "#elements/decorators/bound"; import { msg } from "@lit/localize"; -import { PropertyValues, TemplateResult, html } from "lit"; +import { html, PropertyValues, TemplateResult } from "lit"; import { customElement, property, queryAll } from "lit/decorators.js"; import { map } from "lit/directives/map.js"; -import { type ISimpleTable, SimpleTable } from "./ak-simple-table"; -import type { TableRow } from "./types"; +import { type ISimpleTable, SimpleTable } from "./ak-simple-table.js"; +import type { TableRow } from "./types.js"; export interface ISelectTable extends ISimpleTable { value: string; diff --git a/web/src/elements/ak-table/ak-simple-table.ts b/web/src/elements/ak-table/ak-simple-table.ts index 5980878d49..ef2246ed5b 100644 --- a/web/src/elements/ak-table/ak-simple-table.ts +++ b/web/src/elements/ak-table/ak-simple-table.ts @@ -1,8 +1,8 @@ -import { AKElement } from "@goauthentik/elements/Base.js"; -import { bound } from "@goauthentik/elements/decorators/bound"; -import { randomId } from "@goauthentik/elements/utils/randomId.js"; +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; +import { randomId } from "#elements/utils/randomId"; -import { TemplateResult, css, html } from "lit"; +import { css, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { map } from "lit/directives/map.js"; import { repeat } from "lit/directives/repeat.js"; @@ -11,8 +11,8 @@ import PFTable from "@patternfly/patternfly/components/Table/table.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import { TableColumn } from "./TableColumn.js"; -import type { Column, TableFlat, TableGroup, TableGrouped, TableRow } from "./types"; -import { convertContent } from "./utils"; +import type { Column, TableFlat, TableGroup, TableGrouped, TableRow } from "./types.js"; +import { convertContent } from "./utils.js"; export type RawContent = string | number | TemplateResult; export type ContentType = RawContent[][] | TableRow[] | TableGrouped; diff --git a/web/src/elements/ak-table/stories/ak-select-table.stories.ts b/web/src/elements/ak-table/stories/ak-select-table.stories.ts index e14a9843cb..8449a75bc4 100644 --- a/web/src/elements/ak-table/stories/ak-select-table.stories.ts +++ b/web/src/elements/ak-table/stories/ak-select-table.stories.ts @@ -1,12 +1,13 @@ +import "../ak-select-table.js"; + import { Meta, StoryObj } from "@storybook/web-components"; import { slug } from "github-slugger"; -import { LitElement, TemplateResult, html } from "lit"; +import { html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import { TableSortEvent } from "../TableColumn.js"; -import "../ak-select-table.js"; import { SelectTable } from "../ak-select-table.js"; +import { TableSortEvent } from "../TableColumn.js"; import { nutritionDbUSDA } from "./sample_nutrition_db.js"; const metadata: Meta = { diff --git a/web/src/elements/ak-table/stories/ak-simple-table.stories.ts b/web/src/elements/ak-table/stories/ak-simple-table.stories.ts index 99a202f8d4..0d40a650b7 100644 --- a/web/src/elements/ak-table/stories/ak-simple-table.stories.ts +++ b/web/src/elements/ak-table/stories/ak-simple-table.stories.ts @@ -1,14 +1,15 @@ +import "../ak-simple-table.js"; + import { Meta, StoryObj } from "@storybook/web-components"; import { slug } from "github-slugger"; -import { LitElement, TemplateResult, html } from "lit"; +import { html, LitElement, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { TableSortEvent } from "../TableColumn.js"; -import "../ak-simple-table.js"; import { SimpleTable } from "../ak-simple-table.js"; -import { KeyBy } from "../types"; -import type { TableRow } from "../types"; +import { TableSortEvent } from "../TableColumn.js"; +import type { TableRow } from "../types.js"; +import { KeyBy } from "../types.js"; import { convertContent } from "../utils.js"; import { nutritionDbUSDA } from "./sample_nutrition_db.js"; diff --git a/web/src/elements/ak-table/tests/ak-select-table.test.ts b/web/src/elements/ak-table/tests/ak-select-table.test.ts index 5cab2f1d8f..b5e1842fad 100644 --- a/web/src/elements/ak-table/tests/ak-select-table.test.ts +++ b/web/src/elements/ak-table/tests/ak-select-table.test.ts @@ -1,11 +1,13 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../ak-select-table.js"; + +import { render } from "#elements/tests/utils"; + import { $, browser } from "@wdio/globals"; import { expect } from "expect-webdriverio"; import { slug } from "github-slugger"; import { html } from "lit"; -import "../ak-select-table.js"; import { nutritionDbUSDA as unsortedNutritionDbUSDA } from "../stories/sample_nutrition_db.js"; type SortableRecord = Record; diff --git a/web/src/elements/ak-table/tests/ak-simple-table.test.ts b/web/src/elements/ak-table/tests/ak-simple-table.test.ts index 80e4158f7d..b290c32f0b 100644 --- a/web/src/elements/ak-table/tests/ak-simple-table.test.ts +++ b/web/src/elements/ak-table/tests/ak-simple-table.test.ts @@ -1,11 +1,13 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../ak-simple-table.js"; + +import { render } from "#elements/tests/utils"; + import { $, browser } from "@wdio/globals"; import { expect } from "expect-webdriverio"; import { slug } from "github-slugger"; import { html } from "lit"; -import "../ak-simple-table.js"; import { nutritionDbUSDA } from "../stories/sample_nutrition_db.js"; const columns = ["Name", "Calories", "Protein", "Fiber", "Sugar"]; diff --git a/web/src/elements/ak-table/types.ts b/web/src/elements/ak-table/types.ts index de59ce838d..40e57ba068 100644 --- a/web/src/elements/ak-table/types.ts +++ b/web/src/elements/ak-table/types.ts @@ -1,6 +1,6 @@ import { TemplateResult } from "lit"; -import { TableColumn } from "./TableColumn"; +import { TableColumn } from "./TableColumn.js"; // authentik's standard tables (ak-simple-table, ak-select-table) all take a variety of types, the // simplest of which is just an array of tuples, one for each column, along with an tuple for diff --git a/web/src/elements/ak-table/utils.ts b/web/src/elements/ak-table/utils.ts index 9611f84417..4880903f5a 100644 --- a/web/src/elements/ak-table/utils.ts +++ b/web/src/elements/ak-table/utils.ts @@ -1,4 +1,4 @@ -import { groupBy as groupByProcessor } from "@goauthentik/common/utils.js"; +import { groupBy as groupByProcessor } from "#common/utils"; import { html } from "lit"; @@ -10,7 +10,7 @@ import { TableInputType, TableRow, TableType, -} from "./types"; +} from "./types.js"; // TypeScript was extremely specific about due diligence here. export const isTableRows = (v: unknown): v is TableRow[] => diff --git a/web/src/elements/banner/EnterpriseStatusBanner.ts b/web/src/elements/banner/EnterpriseStatusBanner.ts index a8e037e5a1..106674d157 100644 --- a/web/src/elements/banner/EnterpriseStatusBanner.ts +++ b/web/src/elements/banner/EnterpriseStatusBanner.ts @@ -1,6 +1,9 @@ +import { globalAK } from "#common/global"; + +import { AKElement } from "#elements/Base"; import { WithLicenseSummary } from "#elements/mixins/license"; -import { globalAK } from "@goauthentik/common/global"; -import { AKElement } from "@goauthentik/elements/Base"; + +import { LicenseFlagsEnum, LicenseSummaryStatusEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; @@ -8,8 +11,6 @@ import { customElement, property } from "lit/decorators.js"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; -import { LicenseFlagsEnum, LicenseSummaryStatusEnum } from "@goauthentik/api"; - @customElement("ak-enterprise-status") export class EnterpriseStatusBanner extends WithLicenseSummary(AKElement) { @property() diff --git a/web/src/elements/banner/VersionBanner.ts b/web/src/elements/banner/VersionBanner.ts index 9dc79f43f4..6b55314742 100644 --- a/web/src/elements/banner/VersionBanner.ts +++ b/web/src/elements/banner/VersionBanner.ts @@ -1,5 +1,5 @@ +import { AKElement } from "#elements/Base"; import { WithVersion } from "#elements/mixins/version"; -import { AKElement } from "@goauthentik/elements/Base"; import { msg, str } from "@lit/localize"; import { html, nothing } from "lit"; diff --git a/web/src/elements/buttons/ActionButton/ak-action-button.stories.ts b/web/src/elements/buttons/ActionButton/ak-action-button.stories.ts index 8a9b9a3bf6..2578ecc37c 100644 --- a/web/src/elements/buttons/ActionButton/ak-action-button.stories.ts +++ b/web/src/elements/buttons/ActionButton/ak-action-button.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "./ak-action-button.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "./ak-action-button"; -import AKActionButton from "./ak-action-button"; +import AKActionButton from "./ak-action-button.js"; const metadata: Meta = { title: "Elements / ", diff --git a/web/src/elements/buttons/ActionButton/ak-action-button.ts b/web/src/elements/buttons/ActionButton/ak-action-button.ts index 0a1e3a1b03..5680d28c16 100644 --- a/web/src/elements/buttons/ActionButton/ak-action-button.ts +++ b/web/src/elements/buttons/ActionButton/ak-action-button.ts @@ -1,6 +1,7 @@ -import { MessageLevel } from "@goauthentik/common/messages"; -import { BaseTaskButton } from "@goauthentik/elements/buttons/SpinnerButton/BaseTaskButton"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import { MessageLevel } from "#common/messages"; + +import { BaseTaskButton } from "#elements/buttons/SpinnerButton/BaseTaskButton"; +import { showMessage } from "#elements/messages/MessageContainer"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/elements/buttons/ActionButton/index.ts b/web/src/elements/buttons/ActionButton/index.ts index 9ecccae8d4..15db1d3040 100644 --- a/web/src/elements/buttons/ActionButton/index.ts +++ b/web/src/elements/buttons/ActionButton/index.ts @@ -1,4 +1,4 @@ -import { ActionButton } from "./ak-action-button"; +import { ActionButton } from "./ak-action-button.js"; export { ActionButton }; export default ActionButton; diff --git a/web/src/elements/buttons/Dropdown.ts b/web/src/elements/buttons/Dropdown.ts index fb4eefc6e8..5a4edeb737 100644 --- a/web/src/elements/buttons/Dropdown.ts +++ b/web/src/elements/buttons/Dropdown.ts @@ -1,7 +1,8 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; +import { EVENT_REFRESH } from "#common/constants"; -import { TemplateResult, html } from "lit"; +import { AKElement } from "#elements/Base"; + +import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; @customElement("ak-dropdown") diff --git a/web/src/elements/buttons/ModalButton.ts b/web/src/elements/buttons/ModalButton.ts index 0301ee332c..aff2406423 100644 --- a/web/src/elements/buttons/ModalButton.ts +++ b/web/src/elements/buttons/ModalButton.ts @@ -1,12 +1,10 @@ -import { PFSize } from "@goauthentik/common/enums.js"; -import { AKElement } from "@goauthentik/elements/Base"; -import { - ModalHideEvent, - ModalShowEvent, -} from "@goauthentik/elements/controllers/ModalOrchestrationController.js"; +import { PFSize } from "#common/enums"; + +import { AKElement } from "#elements/Base"; +import { ModalHideEvent, ModalShowEvent } from "#elements/controllers/ModalOrchestrationController"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css"; diff --git a/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts b/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts index 591c822f04..52b4edeb62 100644 --- a/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts +++ b/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts @@ -1,7 +1,8 @@ -import { ERROR_CLASS, PROGRESS_CLASS, SUCCESS_CLASS } from "@goauthentik/common/constants"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { ERROR_CLASS, PROGRESS_CLASS, SUCCESS_CLASS } from "#common/constants"; +import { PFSize } from "#common/enums"; + +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; import { Task, TaskStatus } from "@lit/task"; import { css, html } from "lit"; diff --git a/web/src/elements/buttons/SpinnerButton/ak-spinner-button.stories.ts b/web/src/elements/buttons/SpinnerButton/ak-spinner-button.stories.ts index 0d42e3c773..84ae00de05 100644 --- a/web/src/elements/buttons/SpinnerButton/ak-spinner-button.stories.ts +++ b/web/src/elements/buttons/SpinnerButton/ak-spinner-button.stories.ts @@ -1,9 +1,10 @@ +import "./ak-spinner-button.js"; + import { Meta } from "@storybook/web-components"; import { html } from "lit"; -import "./ak-spinner-button"; -import AKSpinnerButton from "./ak-spinner-button"; +import AKSpinnerButton from "./ak-spinner-button.js"; const metadata: Meta = { title: "Elements / Spinner Button", diff --git a/web/src/elements/buttons/SpinnerButton/ak-spinner-button.ts b/web/src/elements/buttons/SpinnerButton/ak-spinner-button.ts index 623198ddd3..19463167b4 100644 --- a/web/src/elements/buttons/SpinnerButton/ak-spinner-button.ts +++ b/web/src/elements/buttons/SpinnerButton/ak-spinner-button.ts @@ -1,7 +1,6 @@ -import { customElement } from "lit/decorators.js"; -import { property } from "lit/decorators.js"; +import { customElement, property } from "lit/decorators.js"; -import { BaseTaskButton } from "./BaseTaskButton"; +import { BaseTaskButton } from "./BaseTaskButton.js"; /** * A button associated with an event handler for loading data. Takes an asynchronous function as its diff --git a/web/src/elements/buttons/SpinnerButton/index.ts b/web/src/elements/buttons/SpinnerButton/index.ts index c14778b539..60ec7049bf 100644 --- a/web/src/elements/buttons/SpinnerButton/index.ts +++ b/web/src/elements/buttons/SpinnerButton/index.ts @@ -1,4 +1,4 @@ -import SpinnerButton from "./ak-spinner-button"; +import SpinnerButton from "./ak-spinner-button.js"; export { SpinnerButton }; export default SpinnerButton; diff --git a/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.stories.ts b/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.stories.ts index b9d2582407..d59fc61998 100644 --- a/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.stories.ts +++ b/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "./ak-token-copy-button.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "./ak-token-copy-button"; -import AKTokenCopyButton from "./ak-token-copy-button"; +import AKTokenCopyButton from "./ak-token-copy-button.js"; // For this test, we want each key to be unique so that the tester can // be assured that the returned result is in fact going into the diff --git a/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.ts b/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.ts index c9954f8b46..5ee6117c1a 100644 --- a/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.ts +++ b/web/src/elements/buttons/TokenCopyButton/ak-token-copy-button.ts @@ -1,15 +1,16 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { writeToClipboard } from "@goauthentik/elements/utils/writeToClipboard"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { MessageLevel } from "#common/messages"; + +import { showMessage } from "#elements/messages/MessageContainer"; +import { writeToClipboard } from "#elements/utils/writeToClipboard"; + +import { CoreApi, ResponseError, TokenView } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { customElement, property } from "lit/decorators.js"; -import { CoreApi, ResponseError, TokenView } from "@goauthentik/api"; - import { APIMessage } from "../../messages/Message"; -import BaseTaskButton from "../SpinnerButton/BaseTaskButton"; +import BaseTaskButton from "../SpinnerButton/BaseTaskButton.js"; /** * A derivative of ak-action-button that is used only to request tokens from the back-end server. diff --git a/web/src/elements/buttons/TokenCopyButton/index.ts b/web/src/elements/buttons/TokenCopyButton/index.ts index e810d58f8d..8c130a15e1 100644 --- a/web/src/elements/buttons/TokenCopyButton/index.ts +++ b/web/src/elements/buttons/TokenCopyButton/index.ts @@ -1,4 +1,4 @@ -import { TokenCopyButton } from "./ak-token-copy-button"; +import { TokenCopyButton } from "./ak-token-copy-button.js"; export { TokenCopyButton }; export default TokenCopyButton; diff --git a/web/src/elements/cards/AggregateCard.ts b/web/src/elements/cards/AggregateCard.ts index 53f366993f..4f803b3117 100644 --- a/web/src/elements/cards/AggregateCard.ts +++ b/web/src/elements/cards/AggregateCard.ts @@ -1,6 +1,6 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; diff --git a/web/src/elements/cards/AggregatePromiseCard.ts b/web/src/elements/cards/AggregatePromiseCard.ts index 39148d3434..c88457b7b4 100644 --- a/web/src/elements/cards/AggregatePromiseCard.ts +++ b/web/src/elements/cards/AggregatePromiseCard.ts @@ -1,9 +1,11 @@ -import { PFSize } from "@goauthentik/common/enums.js"; -import "@goauthentik/elements/Spinner"; -import { AggregateCard, type IAggregateCard } from "@goauthentik/elements/cards/AggregateCard"; +import "#elements/Spinner"; + +import { PFSize } from "#common/enums"; + +import { AggregateCard, type IAggregateCard } from "#elements/cards/AggregateCard"; import { msg } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; +import { html, nothing, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { until } from "lit/directives/until.js"; diff --git a/web/src/elements/cards/QuickActionsCard.ts b/web/src/elements/cards/QuickActionsCard.ts index dc68f4a89f..cb276e88d6 100644 --- a/web/src/elements/cards/QuickActionsCard.ts +++ b/web/src/elements/cards/QuickActionsCard.ts @@ -1,5 +1,6 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/cards/AggregateCard.js"; +import "#elements/cards/AggregateCard"; + +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; import { html } from "lit"; diff --git a/web/src/elements/cards/stories/AggregateCard.stories.ts b/web/src/elements/cards/stories/AggregateCard.stories.ts index b7bf946464..dc0f848b6f 100644 --- a/web/src/elements/cards/stories/AggregateCard.stories.ts +++ b/web/src/elements/cards/stories/AggregateCard.stories.ts @@ -1,10 +1,11 @@ +import "../AggregateCard.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; import { AggregateCard, type IAggregateCard } from "../AggregateCard.js"; -import "../AggregateCard.js"; const metadata: Meta = { title: "Elements/", diff --git a/web/src/elements/cards/stories/AggregatePromiseCard.stories.ts b/web/src/elements/cards/stories/AggregatePromiseCard.stories.ts index 2d98603a56..871b2299ca 100644 --- a/web/src/elements/cards/stories/AggregatePromiseCard.stories.ts +++ b/web/src/elements/cards/stories/AggregatePromiseCard.stories.ts @@ -1,10 +1,11 @@ +import "../AggregatePromiseCard.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; import { AggregatePromiseCard, type IAggregatePromiseCard } from "../AggregatePromiseCard.js"; -import "../AggregatePromiseCard.js"; const metadata: Meta = { title: "Elements/", diff --git a/web/src/elements/cards/stories/QuickActionsCard.stories.ts b/web/src/elements/cards/stories/QuickActionsCard.stories.ts index be99f56ecb..a2e11f88e3 100644 --- a/web/src/elements/cards/stories/QuickActionsCard.stories.ts +++ b/web/src/elements/cards/stories/QuickActionsCard.stories.ts @@ -1,8 +1,9 @@ +import "../QuickActionsCard.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; import { html } from "lit"; -import "../QuickActionsCard.js"; import { QuickAction, QuickActionsCard } from "../QuickActionsCard.js"; const ACTIONS: QuickAction[] = [ diff --git a/web/src/elements/cards/tests/AggregateCard.test.ts b/web/src/elements/cards/tests/AggregateCard.test.ts index b087b2cf87..39b0a6ffda 100644 --- a/web/src/elements/cards/tests/AggregateCard.test.ts +++ b/web/src/elements/cards/tests/AggregateCard.test.ts @@ -1,10 +1,11 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../AggregateCard.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../AggregateCard.js"; - describe("ak-aggregate-card", () => { it("should render the standard card without an icon, link, or subtext", async () => { render( diff --git a/web/src/elements/cards/tests/AggregatePromiseCard.test.ts b/web/src/elements/cards/tests/AggregatePromiseCard.test.ts index d4c2fb45ed..5469024b58 100644 --- a/web/src/elements/cards/tests/AggregatePromiseCard.test.ts +++ b/web/src/elements/cards/tests/AggregatePromiseCard.test.ts @@ -1,10 +1,11 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../AggregatePromiseCard.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../AggregatePromiseCard.js"; - const DELAY = 1000; // milliseconds describe("ak-aggregate-card-promise", () => { diff --git a/web/src/elements/cards/tests/QuickActionCard.test.ts b/web/src/elements/cards/tests/QuickActionCard.test.ts index c8c21374c7..15dfd4a030 100644 --- a/web/src/elements/cards/tests/QuickActionCard.test.ts +++ b/web/src/elements/cards/tests/QuickActionCard.test.ts @@ -1,10 +1,12 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../QuickActionsCard.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; import { QuickAction } from "../QuickActionsCard.js"; -import "../QuickActionsCard.js"; const ACTIONS: QuickAction[] = [ ["Create a new application", "/core/applications"], diff --git a/web/src/elements/charts/Chart.ts b/web/src/elements/charts/Chart.ts index a3ca2df52a..ca9a40a1b4 100644 --- a/web/src/elements/charts/Chart.ts +++ b/web/src/elements/charts/Chart.ts @@ -1,35 +1,40 @@ -import { EVENT_REFRESH, EVENT_THEME_CHANGE } from "@goauthentik/common/constants"; -import { - APIError, - parseAPIResponseError, - pluckErrorDetail, -} from "@goauthentik/common/errors/network"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; +import "#elements/EmptyState"; +import "chartjs-adapter-date-fns"; + +import { EVENT_REFRESH, EVENT_THEME_CHANGE } from "#common/constants"; +import { APIError, parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { formatElapsedTime } from "#common/temporal"; + +import { AKElement } from "#elements/Base"; + +import { UiThemeEnum } from "@goauthentik/api"; + import { + ArcElement, + BarController, + BarElement, Chart, ChartConfiguration, ChartData, ChartOptions, + DoughnutController, Filler, + Legend, + LinearScale, + LineController, LineElement, Plugin, PointElement, Tick, + TimeScale, + TimeSeriesScale, + Tooltip, } from "chart.js"; -import { Legend, Tooltip } from "chart.js"; -import { BarController, DoughnutController, LineController } from "chart.js"; -import { ArcElement, BarElement } from "chart.js"; -import { LinearScale, TimeScale, TimeSeriesScale } from "chart.js"; -import "chartjs-adapter-date-fns"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { property, state } from "lit/decorators.js"; -import { UiThemeEnum } from "@goauthentik/api"; - Chart.register(Legend, Tooltip); Chart.register(LineController, BarController, DoughnutController); Chart.register(ArcElement, BarElement, PointElement, LineElement); diff --git a/web/src/elements/charts/EventChart.ts b/web/src/elements/charts/EventChart.ts index cfc5c43879..a0e65c0ae7 100644 --- a/web/src/elements/charts/EventChart.ts +++ b/web/src/elements/charts/EventChart.ts @@ -1,9 +1,11 @@ import { actionToLabel } from "#common/labels"; + import { AKChart } from "#elements/charts/Chart"; -import { ChartData, ChartDataset } from "chart.js"; import { EventActions, EventVolume } from "@goauthentik/api"; +import { ChartData, ChartDataset } from "chart.js"; + export function actionToColor(action: EventActions): string { switch (action) { case EventActions.AuthorizeApplication: diff --git a/web/src/elements/chips/Chip.ts b/web/src/elements/chips/Chip.ts index 23e5128922..cdcbe2a190 100644 --- a/web/src/elements/chips/Chip.ts +++ b/web/src/elements/chips/Chip.ts @@ -1,8 +1,9 @@ -import { AKElement } from "@goauthentik/elements/Base"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { AKElement } from "#elements/Base"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; diff --git a/web/src/elements/chips/ChipGroup.ts b/web/src/elements/chips/ChipGroup.ts index 232c62a853..7c0a5e11ab 100644 --- a/web/src/elements/chips/ChipGroup.ts +++ b/web/src/elements/chips/ChipGroup.ts @@ -1,7 +1,7 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { Chip } from "@goauthentik/elements/chips/Chip"; +import { AKElement } from "#elements/Base"; +import { Chip } from "#elements/chips/Chip"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; diff --git a/web/src/elements/controllers/BrandContextController.ts b/web/src/elements/controllers/BrandContextController.ts index dd7ebe4036..30101ac0d0 100644 --- a/web/src/elements/controllers/BrandContextController.ts +++ b/web/src/elements/controllers/BrandContextController.ts @@ -1,14 +1,15 @@ import { DEFAULT_CONFIG } from "#common/api/config"; import { EVENT_REFRESH } from "#common/constants"; import { isCausedByAbortError } from "#common/errors/network"; + import { BrandingContext, BrandingMixin } from "#elements/mixins/branding"; import type { ReactiveElementHost } from "#elements/types"; +import { CoreApi, CurrentBrand } from "@goauthentik/api"; + import { ContextProvider } from "@lit/context"; import type { ReactiveController } from "lit"; -import { CoreApi, CurrentBrand } from "@goauthentik/api"; - export class BrandingContextController implements ReactiveController { #log = console.debug.bind(console, `authentik/controller/branding`); #abortController: null | AbortController = null; diff --git a/web/src/elements/controllers/ConfigContextController.ts b/web/src/elements/controllers/ConfigContextController.ts index 11386e509e..bd7bdf4d9a 100644 --- a/web/src/elements/controllers/ConfigContextController.ts +++ b/web/src/elements/controllers/ConfigContextController.ts @@ -1,14 +1,15 @@ import { DEFAULT_CONFIG } from "#common/api/config"; import { EVENT_REFRESH } from "#common/constants"; import { isCausedByAbortError } from "#common/errors/network"; + import { AKConfigMixin, AuthentikConfigContext, kAKConfig } from "#elements/mixins/config"; import type { ReactiveElementHost } from "#elements/types"; +import { Config, RootApi } from "@goauthentik/api"; + import { ContextProvider } from "@lit/context"; import type { ReactiveController } from "lit"; -import { Config, RootApi } from "@goauthentik/api"; - /** * A controller that provides the application configuration to the element. */ diff --git a/web/src/elements/controllers/LicenseContextController.ts b/web/src/elements/controllers/LicenseContextController.ts index 82c634fbaa..9907b8e870 100644 --- a/web/src/elements/controllers/LicenseContextController.ts +++ b/web/src/elements/controllers/LicenseContextController.ts @@ -1,14 +1,15 @@ import { DEFAULT_CONFIG } from "#common/api/config"; import { EVENT_REFRESH_ENTERPRISE } from "#common/constants"; import { isCausedByAbortError } from "#common/errors/network"; + import { LicenseContext, LicenseMixin } from "#elements/mixins/license"; import type { ReactiveElementHost } from "#elements/types"; +import { EnterpriseApi, LicenseSummary } from "@goauthentik/api"; + import { ContextProvider } from "@lit/context"; import type { ReactiveController } from "lit"; -import { EnterpriseApi, LicenseSummary } from "@goauthentik/api"; - export class LicenseContextController implements ReactiveController { #log = console.debug.bind(console, `authentik/controller/license`); #abortController: null | AbortController = null; diff --git a/web/src/elements/controllers/VersionContextController.ts b/web/src/elements/controllers/VersionContextController.ts index 54209a9403..923122a5e1 100644 --- a/web/src/elements/controllers/VersionContextController.ts +++ b/web/src/elements/controllers/VersionContextController.ts @@ -1,14 +1,15 @@ import { DEFAULT_CONFIG } from "#common/api/config"; import { EVENT_REFRESH } from "#common/constants"; import { isCausedByAbortError } from "#common/errors/network"; + import { VersionContext, VersionMixin } from "#elements/mixins/version"; import type { ReactiveElementHost } from "#elements/types"; +import { AdminApi, Version } from "@goauthentik/api"; + import { ContextProvider } from "@lit/context"; import type { ReactiveController } from "lit"; -import { AdminApi, Version } from "@goauthentik/api"; - export class VersionContextController implements ReactiveController { #log = console.debug.bind(console, `authentik/controller/version`); #abortController: null | AbortController = null; diff --git a/web/src/elements/events/LogViewer.ts b/web/src/elements/events/LogViewer.ts index 095177cd58..dd363e819a 100644 --- a/web/src/elements/events/LogViewer.ts +++ b/web/src/elements/events/LogViewer.ts @@ -1,16 +1,18 @@ -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/EmptyState"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#components/ak-status-label"; +import "#elements/EmptyState"; + +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { LogEvent, LogLevelEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { LogEvent, LogLevelEnum } from "@goauthentik/api"; - @customElement("ak-log-viewer") export class LogViewer extends Table { @property({ attribute: false }) diff --git a/web/src/elements/forms/ConfirmationForm.ts b/web/src/elements/forms/ConfirmationForm.ts index 5890f6991f..96aa905641 100644 --- a/web/src/elements/forms/ConfirmationForm.ts +++ b/web/src/elements/forms/ConfirmationForm.ts @@ -1,12 +1,14 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import "#elements/buttons/SpinnerButton/index"; + +import { EVENT_REFRESH } from "#common/constants"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; + +import { ModalButton } from "#elements/buttons/ModalButton"; +import { showMessage } from "#elements/messages/MessageContainer"; import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; @customElement("ak-forms-confirm") diff --git a/web/src/elements/forms/DeleteBulkForm.ts b/web/src/elements/forms/DeleteBulkForm.ts index 013444598f..895ae411c9 100644 --- a/web/src/elements/forms/DeleteBulkForm.ts +++ b/web/src/elements/forms/DeleteBulkForm.ts @@ -1,21 +1,22 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/buttons/SpinnerButton/index"; + +import { EVENT_REFRESH } from "#common/constants"; +import { PFSize } from "#common/enums"; +import { MessageLevel } from "#common/messages"; + +import { ModalButton } from "#elements/buttons/ModalButton"; +import { showMessage } from "#elements/messages/MessageContainer"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { until } from "lit/directives/until.js"; import PFList from "@patternfly/patternfly/components/List/list.css"; -import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; - type BulkDeleteMetadata = { key: string; value: string }[]; @customElement("ak-delete-objects-table") diff --git a/web/src/elements/forms/DeleteForm.ts b/web/src/elements/forms/DeleteForm.ts index 0b6100c1b0..6489200191 100644 --- a/web/src/elements/forms/DeleteForm.ts +++ b/web/src/elements/forms/DeleteForm.ts @@ -1,19 +1,21 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import "#elements/buttons/SpinnerButton/index"; + +import { EVENT_REFRESH } from "#common/constants"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; + +import { ModalButton } from "#elements/buttons/ModalButton"; +import { showMessage } from "#elements/messages/MessageContainer"; + +import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { until } from "lit/directives/until.js"; import PFList from "@patternfly/patternfly/components/List/list.css"; -import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; - @customElement("ak-forms-delete") export class DeleteForm extends ModalButton { static get styles(): CSSResult[] { diff --git a/web/src/elements/forms/Form.ts b/web/src/elements/forms/Form.ts index e49c63ff0f..88e0f97eee 100644 --- a/web/src/elements/forms/Form.ts +++ b/web/src/elements/forms/Form.ts @@ -1,15 +1,18 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { dateToUTC } from "@goauthentik/common/temporal"; -import { camelToSnake } from "@goauthentik/common/utils"; -import { AKElement } from "@goauthentik/elements/Base"; -import { HorizontalFormElement } from "@goauthentik/elements/forms/HorizontalFormElement"; -import { PreventFormSubmit } from "@goauthentik/elements/forms/helpers"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import { EVENT_REFRESH } from "#common/constants"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; +import { dateToUTC } from "#common/temporal"; +import { camelToSnake } from "#common/utils"; + +import { AKElement } from "#elements/Base"; +import { PreventFormSubmit } from "#elements/forms/helpers"; +import { HorizontalFormElement } from "#elements/forms/HorizontalFormElement"; +import { showMessage } from "#elements/messages/MessageContainer"; + +import { instanceOfValidationError } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { property, state } from "lit/decorators.js"; import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; @@ -21,8 +24,6 @@ import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-gro import PFSwitch from "@patternfly/patternfly/components/Switch/switch.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { instanceOfValidationError } from "@goauthentik/api"; - export interface KeyUnknown { [key: string]: unknown; } diff --git a/web/src/elements/forms/FormElement.ts b/web/src/elements/forms/FormElement.ts index 020e573f05..14e39bdc27 100644 --- a/web/src/elements/forms/FormElement.ts +++ b/web/src/elements/forms/FormElement.ts @@ -1,15 +1,14 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; -import { CSSResult } from "lit"; -import { TemplateResult, html } from "lit"; +import { ErrorDetail } from "@goauthentik/api"; + +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { ErrorDetail } from "@goauthentik/api"; - /** * This is used in two places outside of Flow, and in both cases is used primarily to * display content, not take input. It displays the TOTP QR code, and the static diff --git a/web/src/elements/forms/FormGroup.ts b/web/src/elements/forms/FormGroup.ts index 6ff071bcf4..5d66bb481f 100644 --- a/web/src/elements/forms/FormGroup.ts +++ b/web/src/elements/forms/FormGroup.ts @@ -1,7 +1,7 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { createRef, ref } from "lit/directives/ref.js"; diff --git a/web/src/elements/forms/HorizontalFormElement.ts b/web/src/elements/forms/HorizontalFormElement.ts index bf72dcb401..4b275adcbf 100644 --- a/web/src/elements/forms/HorizontalFormElement.ts +++ b/web/src/elements/forms/HorizontalFormElement.ts @@ -1,10 +1,8 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { FormGroup } from "@goauthentik/elements/forms/FormGroup"; -import { formatSlug } from "@goauthentik/elements/router/utils.js"; +import { AKElement } from "#elements/Base"; +import { FormGroup } from "#elements/forms/FormGroup"; import { msg, str } from "@lit/localize"; -import { CSSResult, css } from "lit"; -import { TemplateResult, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; diff --git a/web/src/elements/forms/ModalForm.ts b/web/src/elements/forms/ModalForm.ts index ba0addbc11..28e70e8f14 100644 --- a/web/src/elements/forms/ModalForm.ts +++ b/web/src/elements/forms/ModalForm.ts @@ -1,12 +1,14 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/elements/LoadingOverlay"; -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import { ModalHideEvent } from "@goauthentik/elements/controllers/ModalOrchestrationController.js"; -import { Form } from "@goauthentik/elements/forms/Form"; +import "#elements/LoadingOverlay"; +import "#elements/buttons/SpinnerButton/index"; + +import { EVENT_REFRESH } from "#common/constants"; + +import { ModalButton } from "#elements/buttons/ModalButton"; +import { ModalHideEvent } from "#elements/controllers/ModalOrchestrationController"; +import { Form } from "#elements/forms/Form"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; @customElement("ak-forms-modal") diff --git a/web/src/elements/forms/ModelForm.ts b/web/src/elements/forms/ModelForm.ts index b389dcd2b2..210213e6b1 100644 --- a/web/src/elements/forms/ModelForm.ts +++ b/web/src/elements/forms/ModelForm.ts @@ -1,8 +1,10 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import "@goauthentik/elements/EmptyState"; -import { Form } from "@goauthentik/elements/forms/Form"; +import "#elements/EmptyState"; -import { TemplateResult, html } from "lit"; +import { EVENT_REFRESH } from "#common/constants"; + +import { Form } from "#elements/forms/Form"; + +import { html, TemplateResult } from "lit"; import { property } from "lit/decorators.js"; /** diff --git a/web/src/elements/forms/ProxyForm.ts b/web/src/elements/forms/ProxyForm.ts index c0b33a74cb..7e71767559 100644 --- a/web/src/elements/forms/ProxyForm.ts +++ b/web/src/elements/forms/ProxyForm.ts @@ -1,6 +1,6 @@ -import { Form } from "@goauthentik/elements/forms/Form"; +import { Form } from "#elements/forms/Form"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; @customElement("ak-proxy-form") diff --git a/web/src/elements/forms/Radio.ts b/web/src/elements/forms/Radio.ts index b63c06cb1b..756f00b3fb 100644 --- a/web/src/elements/forms/Radio.ts +++ b/web/src/elements/forms/Radio.ts @@ -1,7 +1,7 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { CustomEmitterElement } from "#elements/utils/eventEmitter"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { map } from "lit/directives/map.js"; @@ -9,7 +9,7 @@ import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { randomId } from "../utils/randomId"; +import { randomId } from "../utils/randomId.js"; export interface RadioOption { label: string; diff --git a/web/src/elements/forms/SearchSelect/SearchSelect.ts b/web/src/elements/forms/SearchSelect/SearchSelect.ts index 29c5d5281e..8d0297c11d 100644 --- a/web/src/elements/forms/SearchSelect/SearchSelect.ts +++ b/web/src/elements/forms/SearchSelect/SearchSelect.ts @@ -1,24 +1,22 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { - APIError, - parseAPIResponseError, - pluckErrorDetail, -} from "@goauthentik/common/errors/network"; -import { groupBy } from "@goauthentik/common/utils"; -import { AkControlElement } from "@goauthentik/elements/AkControlElement.js"; -import { PreventFormSubmit } from "@goauthentik/elements/forms/helpers"; -import type { GroupedOptions, SelectGroup, SelectOption } from "@goauthentik/elements/types.js"; -import { randomId } from "@goauthentik/elements/utils/randomId.js"; +import "./ak-search-select-loading-indicator.js"; +import "./ak-search-select-view.js"; + +import { EVENT_REFRESH } from "#common/constants"; +import { APIError, parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { groupBy } from "#common/utils"; + +import { AkControlElement } from "#elements/AkControlElement"; +import { PreventFormSubmit } from "#elements/forms/helpers"; +import type { GroupedOptions, SelectGroup, SelectOption } from "#elements/types"; +import { randomId } from "#elements/utils/randomId"; import { msg } from "@lit/localize"; -import { PropertyValues, TemplateResult, html } from "lit"; +import { html, PropertyValues, TemplateResult } from "lit"; import { property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import "./ak-search-select-loading-indicator.js"; -import "./ak-search-select-view.js"; import { SearchSelectView } from "./ak-search-select-view.js"; type Group = [string, T[]]; diff --git a/web/src/elements/forms/SearchSelect/ak-portal.ts b/web/src/elements/forms/SearchSelect/ak-portal.ts index 0ffc192462..9cc46ebc2f 100644 --- a/web/src/elements/forms/SearchSelect/ak-portal.ts +++ b/web/src/elements/forms/SearchSelect/ak-portal.ts @@ -1,5 +1,6 @@ +import { randomId } from "#elements/utils/randomId"; + import { autoUpdate, computePosition, flip, hide } from "@floating-ui/dom"; -import { randomId } from "@goauthentik/elements/utils/randomId.js"; import { LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/elements/forms/SearchSelect/ak-search-select-loading-indicator.ts b/web/src/elements/forms/SearchSelect/ak-search-select-loading-indicator.ts index 94b1221262..b9b56b5b8a 100644 --- a/web/src/elements/forms/SearchSelect/ak-search-select-loading-indicator.ts +++ b/web/src/elements/forms/SearchSelect/ak-search-select-loading-indicator.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/elements/Base.js"; -import { randomId } from "@goauthentik/elements/utils/randomId.js"; +import { AKElement } from "#elements/Base"; +import { randomId } from "#elements/utils/randomId"; import { msg } from "@lit/localize"; import { html } from "lit"; diff --git a/web/src/elements/forms/SearchSelect/ak-search-select-view.ts b/web/src/elements/forms/SearchSelect/ak-search-select-view.ts index c2133f6f16..48ca4d3255 100644 --- a/web/src/elements/forms/SearchSelect/ak-search-select-view.ts +++ b/web/src/elements/forms/SearchSelect/ak-search-select-view.ts @@ -1,16 +1,17 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/ak-list-select/ak-list-select.js"; -import { ListSelect } from "@goauthentik/elements/ak-list-select/ak-list-select.js"; -import { bound } from "@goauthentik/elements/decorators/bound.js"; -import "@goauthentik/elements/forms/SearchSelect/ak-portal.js"; -import type { GroupedOptions, SelectOption, SelectOptions } from "@goauthentik/elements/types.js"; -import { randomId } from "@goauthentik/elements/utils/randomId.js"; +import "#elements/ak-list-select/ak-list-select"; +import "#elements/forms/SearchSelect/ak-portal"; + +import { ListSelect } from "#elements/ak-list-select/ak-list-select"; +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; +import type { GroupedOptions, SelectOption, SelectOptions } from "#elements/types"; +import { randomId } from "#elements/utils/randomId"; import { msg } from "@lit/localize"; -import { PropertyValues, html, nothing } from "lit"; +import { html, nothing, PropertyValues } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { Ref, createRef, ref } from "lit/directives/ref.js"; +import { createRef, ref, Ref } from "lit/directives/ref.js"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; diff --git a/web/src/elements/forms/SearchSelect/ak-search-select.ts b/web/src/elements/forms/SearchSelect/ak-search-select.ts index 52af07c266..c4843da732 100644 --- a/web/src/elements/forms/SearchSelect/ak-search-select.ts +++ b/web/src/elements/forms/SearchSelect/ak-search-select.ts @@ -1,4 +1,4 @@ -import { groupBy } from "@goauthentik/common/utils"; +import { groupBy } from "#common/utils"; import { TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/elements/forms/SearchSelect/index.ts b/web/src/elements/forms/SearchSelect/index.ts index f887f8344c..b0abb62c61 100644 --- a/web/src/elements/forms/SearchSelect/index.ts +++ b/web/src/elements/forms/SearchSelect/index.ts @@ -1,4 +1,4 @@ -import { SearchSelect } from "./ak-search-select"; +import { SearchSelect } from "./ak-search-select.js"; export { SearchSelect }; export default SearchSelect; diff --git a/web/src/elements/forms/SearchSelect/stories/ak-search-select-view.stories.ts b/web/src/elements/forms/SearchSelect/stories/ak-search-select-view.stories.ts index caaf8c2120..efd206aec8 100644 --- a/web/src/elements/forms/SearchSelect/stories/ak-search-select-view.stories.ts +++ b/web/src/elements/forms/SearchSelect/stories/ak-search-select-view.stories.ts @@ -1,9 +1,11 @@ -import "@goauthentik/elements/forms/SearchSelect/ak-search-select-view.js"; -import { SearchSelectView } from "@goauthentik/elements/forms/SearchSelect/ak-search-select-view.js"; +import "#elements/forms/SearchSelect/ak-search-select-view"; + +import { SearchSelectView } from "#elements/forms/SearchSelect/ak-search-select-view"; + import { Meta } from "@storybook/web-components"; import { slug } from "github-slugger"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { groupedSampleData, sampleData } from "./sampleData.js"; diff --git a/web/src/elements/forms/SearchSelect/stories/ak-search-select.stories.ts b/web/src/elements/forms/SearchSelect/stories/ak-search-select.stories.ts index 8ff000fb23..a70848aa1c 100644 --- a/web/src/elements/forms/SearchSelect/stories/ak-search-select.stories.ts +++ b/web/src/elements/forms/SearchSelect/stories/ak-search-select.stories.ts @@ -1,11 +1,14 @@ -import { groupBy } from "@goauthentik/common/utils"; -import "@goauthentik/elements/forms/SearchSelect/ak-search-select"; -import { SearchSelect } from "@goauthentik/elements/forms/SearchSelect/ak-search-select"; -import "@goauthentik/elements/forms/SearchSelect/ak-search-select-ez"; -import { type ISearchSelectApi } from "@goauthentik/elements/forms/SearchSelect/ak-search-select-ez"; +import "#elements/forms/SearchSelect/ak-search-select"; +import "#elements/forms/SearchSelect/ak-search-select-ez"; + +import { groupBy } from "#common/utils"; + +import { SearchSelect } from "#elements/forms/SearchSelect/ak-search-select"; +import { type ISearchSelectApi } from "#elements/forms/SearchSelect/ak-search-select-ez"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { sampleData } from "./sampleData.js"; diff --git a/web/src/elements/forms/SearchSelect/tests/ak-search-select-view.test.ts b/web/src/elements/forms/SearchSelect/tests/ak-search-select-view.test.ts index fdbb67ef0b..ac840f4ea7 100644 --- a/web/src/elements/forms/SearchSelect/tests/ak-search-select-view.test.ts +++ b/web/src/elements/forms/SearchSelect/tests/ak-search-select-view.test.ts @@ -1,11 +1,13 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../ak-search-select-view.js"; + +import { render } from "#elements/tests/utils"; + import { $, browser, expect } from "@wdio/globals"; import { slug } from "github-slugger"; import { Key } from "webdriverio"; import { html } from "lit"; -import "../ak-search-select-view.js"; import { sampleData } from "../stories/sampleData.js"; import { AkSearchSelectViewDriver } from "./ak-search-select-view.comp.js"; diff --git a/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts b/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts index 3f4d69270a..0d5cc435a3 100644 --- a/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts +++ b/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts @@ -1,18 +1,19 @@ +import "../ak-search-select.js"; + /* eslint-env jest */ -import { AKElement } from "@goauthentik/elements/Base.js"; -import { bound } from "@goauthentik/elements/decorators/bound.js"; -import { render } from "@goauthentik/elements/tests/utils.js"; -import { CustomListenerElement } from "@goauthentik/elements/utils/eventEmitter"; +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; +import { render } from "#elements/tests/utils"; +import { CustomListenerElement } from "#elements/utils/eventEmitter"; + import { $, browser, expect } from "@wdio/globals"; import { slug } from "github-slugger"; import { html } from "lit"; -import { customElement } from "lit/decorators.js"; -import { property, query } from "lit/decorators.js"; +import { customElement, property, query } from "lit/decorators.js"; -import "../ak-search-select.js"; import { SearchSelect } from "../ak-search-select.js"; -import { type ViewSample, sampleData } from "../stories/sampleData.js"; +import { sampleData, type ViewSample } from "../stories/sampleData.js"; import { AkSearchSelectViewDriver } from "./ak-search-select-view.comp.js"; const renderElement = (fruit: ViewSample) => fruit.produce; diff --git a/web/src/elements/forms/SearchSelect/utils.ts b/web/src/elements/forms/SearchSelect/utils.ts index 6b4c1ab534..0de9888659 100644 --- a/web/src/elements/forms/SearchSelect/utils.ts +++ b/web/src/elements/forms/SearchSelect/utils.ts @@ -1,9 +1,4 @@ -import type { - GroupedOptions, - SelectGrouped, - SelectOption, - SelectOptions, -} from "@goauthentik/elements/types.js"; +import type { GroupedOptions, SelectGrouped, SelectOption, SelectOptions } from "#elements/types"; type Pair = [string, SelectOption]; const mapPair = (option: SelectOption): Pair => [option[0], option]; diff --git a/web/src/elements/forms/helpers.ts b/web/src/elements/forms/helpers.ts index afc0432de4..5e067bd952 100644 --- a/web/src/elements/forms/helpers.ts +++ b/web/src/elements/forms/helpers.ts @@ -1,4 +1,4 @@ -import { HorizontalFormElement } from "@goauthentik/elements/forms/HorizontalFormElement"; +import { HorizontalFormElement } from "#elements/forms/HorizontalFormElement"; export class PreventFormSubmit { // Stub class which can be returned by form elements to prevent the form from submitting diff --git a/web/src/elements/forms/stories/Radio.stories.ts b/web/src/elements/forms/stories/Radio.stories.ts index 20f32f9227..d9540fb7f3 100644 --- a/web/src/elements/forms/stories/Radio.stories.ts +++ b/web/src/elements/forms/stories/Radio.stories.ts @@ -1,10 +1,11 @@ -import "@goauthentik/elements/messages/MessageContainer"; +import "#elements/messages/MessageContainer"; +import "../Radio.js"; + import { Meta } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; -import "../Radio"; -import Radio from "../Radio"; +import Radio from "../Radio.js"; // eslint-disable-next-line @typescript-eslint/no-explicit-any const metadata: Meta> = { diff --git a/web/src/elements/messages/Message.ts b/web/src/elements/messages/Message.ts index 1d3113f6fc..92c1166d89 100644 --- a/web/src/elements/messages/Message.ts +++ b/web/src/elements/messages/Message.ts @@ -1,7 +1,8 @@ -import { MessageLevel } from "@goauthentik/common/messages"; -import { AKElement } from "@goauthentik/elements/Base"; +import { MessageLevel } from "#common/messages"; -import { CSSResult, TemplateResult, html } from "lit"; +import { AKElement } from "#elements/Base"; + +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; diff --git a/web/src/elements/messages/MessageContainer.ts b/web/src/elements/messages/MessageContainer.ts index c28e7ff24c..d2e176094d 100644 --- a/web/src/elements/messages/MessageContainer.ts +++ b/web/src/elements/messages/MessageContainer.ts @@ -1,25 +1,23 @@ -import { - EVENT_MESSAGE, - EVENT_WS_MESSAGE, - WS_MSG_TYPE_MESSAGE, -} from "@goauthentik/common/constants"; -import { APIError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { SentryIgnoredError } from "@goauthentik/common/sentry"; -import { WSMessage } from "@goauthentik/common/ws"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/messages/Message"; -import { APIMessage } from "@goauthentik/elements/messages/Message"; +import "#elements/messages/Message"; + +import { EVENT_MESSAGE, EVENT_WS_MESSAGE, WS_MSG_TYPE_MESSAGE } from "#common/constants"; +import { APIError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; +import { SentryIgnoredError } from "#common/sentry/index"; +import { WSMessage } from "#common/ws"; + +import { AKElement } from "#elements/Base"; +import { APIMessage } from "#elements/messages/Message"; + +import { instanceOfValidationError } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { instanceOfValidationError } from "@goauthentik/api"; - /** * Adds a message to the message container, displaying it to the user. * @param message The message to display. diff --git a/web/src/elements/messages/Middleware.ts b/web/src/elements/messages/Middleware.ts index ba324e0796..2253bd116a 100644 --- a/web/src/elements/messages/Middleware.ts +++ b/web/src/elements/messages/Middleware.ts @@ -1,10 +1,11 @@ -import { MessageLevel } from "@goauthentik/common/messages"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import { MessageLevel } from "#common/messages"; -import { msg } from "@lit/localize"; +import { showMessage } from "#elements/messages/MessageContainer"; import { Middleware, ResponseContext } from "@goauthentik/api"; +import { msg } from "@lit/localize"; + export class MessageMiddleware implements Middleware { post(context: ResponseContext): Promise { if (context.response.status >= 500) { diff --git a/web/src/elements/mixins/branding.ts b/web/src/elements/mixins/branding.ts index 9b61083391..cd3fddeb4d 100644 --- a/web/src/elements/mixins/branding.ts +++ b/web/src/elements/mixins/branding.ts @@ -1,10 +1,11 @@ import { DefaultBrand } from "#common/ui/config"; + import { createMixin } from "#elements/types"; -import { Context, consume, createContext } from "@lit/context"; - import type { CurrentBrand, FooterLink } from "@goauthentik/api"; +import { consume, Context, createContext } from "@lit/context"; + /** * The Lit context for application branding. * diff --git a/web/src/elements/mixins/capabilities.ts b/web/src/elements/mixins/capabilities.ts index 13e6310b5b..767d880686 100644 --- a/web/src/elements/mixins/capabilities.ts +++ b/web/src/elements/mixins/capabilities.ts @@ -1,6 +1,5 @@ -import { WithAuthentikConfig } from "#elements/mixins/config"; -import { kAKConfig } from "#elements/mixins/config"; -import { LitElementConstructor, createMixin } from "#elements/types"; +import { kAKConfig, WithAuthentikConfig } from "#elements/mixins/config"; +import { createMixin } from "#elements/types"; import { CapabilitiesEnum } from "@goauthentik/api"; diff --git a/web/src/elements/mixins/config.ts b/web/src/elements/mixins/config.ts index 775ad09475..550b9945cf 100644 --- a/web/src/elements/mixins/config.ts +++ b/web/src/elements/mixins/config.ts @@ -1,9 +1,9 @@ -import { createMixin } from "@goauthentik/elements/types"; - -import { Context, consume, createContext } from "@lit/context"; +import { createMixin } from "#elements/types"; import type { Config } from "@goauthentik/api"; +import { consume, Context, createContext } from "@lit/context"; + export const kAKConfig = Symbol("kAKConfig"); /** diff --git a/web/src/elements/mixins/license.ts b/web/src/elements/mixins/license.ts index 8577f7fdf4..52333640ad 100644 --- a/web/src/elements/mixins/license.ts +++ b/web/src/elements/mixins/license.ts @@ -1,9 +1,9 @@ import { createMixin } from "#elements/types"; -import { Context, consume, createContext } from "@lit/context"; - import { type LicenseSummary, LicenseSummaryStatusEnum } from "@goauthentik/api"; +import { consume, Context, createContext } from "@lit/context"; + export const LicenseContext = createContext( Symbol.for("authentik-license-context"), ); diff --git a/web/src/elements/mixins/version.ts b/web/src/elements/mixins/version.ts index 446fb1a1c1..39d1c468fa 100644 --- a/web/src/elements/mixins/version.ts +++ b/web/src/elements/mixins/version.ts @@ -1,9 +1,9 @@ import { createMixin } from "#elements/types"; -import { Context, consume, createContext } from "@lit/context"; - import type { Version } from "@goauthentik/api"; +import { consume, Context, createContext } from "@lit/context"; + /** * The Lit context for application branding. * diff --git a/web/src/elements/notifications/APIDrawer.ts b/web/src/elements/notifications/APIDrawer.ts index 8e3c1ce898..66c3fb4ae9 100644 --- a/web/src/elements/notifications/APIDrawer.ts +++ b/web/src/elements/notifications/APIDrawer.ts @@ -1,11 +1,12 @@ -import { RequestInfo } from "@goauthentik/common/api/middleware"; -import { EVENT_API_DRAWER_TOGGLE, EVENT_REQUEST_POST } from "@goauthentik/common/constants"; -import { globalAK } from "@goauthentik/common/global"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { AKElement } from "@goauthentik/elements/Base"; +import { RequestInfo } from "#common/api/middleware"; +import { EVENT_API_DRAWER_TOGGLE, EVENT_REQUEST_POST } from "#common/constants"; +import { globalAK } from "#common/global"; +import { formatElapsedTime } from "#common/temporal"; + +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; diff --git a/web/src/elements/notifications/NotificationDrawer.ts b/web/src/elements/notifications/NotificationDrawer.ts index 45766731ec..a5b9210034 100644 --- a/web/src/elements/notifications/NotificationDrawer.ts +++ b/web/src/elements/notifications/NotificationDrawer.ts @@ -1,18 +1,22 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_REFRESH } from "@goauthentik/common/constants"; -import { globalAK } from "@goauthentik/common/global"; -import { actionToLabel } from "@goauthentik/common/labels"; -import { MessageLevel } from "@goauthentik/common/messages"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { me } from "@goauthentik/common/users"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; +import "#elements/EmptyState"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_REFRESH } from "#common/constants"; +import { globalAK } from "#common/global"; +import { actionToLabel } from "#common/labels"; +import { MessageLevel } from "#common/messages"; +import { formatElapsedTime } from "#common/temporal"; +import { me } from "#common/users"; + +import { AKElement } from "#elements/Base"; +import { showMessage } from "#elements/messages/MessageContainer"; +import { PaginatedResponse } from "#elements/table/Table"; + +import { EventsApi, Notification } from "@goauthentik/api"; + import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -21,8 +25,6 @@ import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css" import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { EventsApi, Notification } from "@goauthentik/api"; - @customElement("ak-notification-drawer") export class NotificationDrawer extends AKElement { @property({ attribute: false }) diff --git a/web/src/elements/oauth/UserAccessTokenList.ts b/web/src/elements/oauth/UserAccessTokenList.ts index ed27facf6d..99c98fa077 100644 --- a/web/src/elements/oauth/UserAccessTokenList.ts +++ b/web/src/elements/oauth/UserAccessTokenList.ts @@ -1,20 +1,21 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#components/ak-status-label"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/DeleteBulkForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { ExpiringBaseGrantModel, Oauth2Api, TokenModel } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css"; -import { ExpiringBaseGrantModel, Oauth2Api, TokenModel } from "@goauthentik/api"; - @customElement("ak-user-oauth-access-token-list") export class UserOAuthAccessTokenList extends Table { expandable = true; diff --git a/web/src/elements/oauth/UserRefreshTokenList.ts b/web/src/elements/oauth/UserRefreshTokenList.ts index b0c46df23a..624f6c31e5 100644 --- a/web/src/elements/oauth/UserRefreshTokenList.ts +++ b/web/src/elements/oauth/UserRefreshTokenList.ts @@ -1,20 +1,21 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#components/ak-status-label"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/DeleteBulkForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { ExpiringBaseGrantModel, Oauth2Api, TokenModel } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css"; -import { ExpiringBaseGrantModel, Oauth2Api, TokenModel } from "@goauthentik/api"; - @customElement("ak-user-oauth-refresh-token-list") export class UserOAuthRefreshTokenList extends Table { expandable = true; diff --git a/web/src/elements/router/Route.ts b/web/src/elements/router/Route.ts index 5beee0a509..57ae9914fd 100644 --- a/web/src/elements/router/Route.ts +++ b/web/src/elements/router/Route.ts @@ -1,6 +1,6 @@ -import "@goauthentik/elements/EmptyState"; +import "#elements/EmptyState"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { until } from "lit/directives/until.js"; export const SLUG_REGEX = "[-a-zA-Z0-9_]+"; diff --git a/web/src/elements/router/RouteMatch.ts b/web/src/elements/router/RouteMatch.ts index e81c911d9a..07c20d4a56 100644 --- a/web/src/elements/router/RouteMatch.ts +++ b/web/src/elements/router/RouteMatch.ts @@ -1,5 +1,6 @@ -import { ROUTE_SEPARATOR } from "@goauthentik/common/constants"; -import { Route } from "@goauthentik/elements/router/Route"; +import { ROUTE_SEPARATOR } from "#common/constants"; + +import { Route } from "#elements/router/Route"; import { TemplateResult } from "lit"; diff --git a/web/src/elements/router/Router404.ts b/web/src/elements/router/Router404.ts index 0e09010196..6d5766bc75 100644 --- a/web/src/elements/router/Router404.ts +++ b/web/src/elements/router/Router404.ts @@ -1,7 +1,7 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; diff --git a/web/src/elements/router/RouterOutlet.ts b/web/src/elements/router/RouterOutlet.ts index d0ea03018f..5097b5e3b6 100644 --- a/web/src/elements/router/RouterOutlet.ts +++ b/web/src/elements/router/RouterOutlet.ts @@ -1,18 +1,21 @@ -import { ROUTE_SEPARATOR } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; -import { Route } from "@goauthentik/elements/router/Route"; -import { RouteMatch } from "@goauthentik/elements/router/RouteMatch"; -import "@goauthentik/elements/router/Router404"; +import "#elements/router/Router404"; + +import { ROUTE_SEPARATOR } from "#common/constants"; + +import { AKElement } from "#elements/Base"; +import { Route } from "#elements/router/Route"; +import { RouteMatch } from "#elements/router/RouteMatch"; + import { BrowserClient, + getClient, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, Span, - getClient, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, } from "@sentry/browser"; -import { CSSResult, PropertyValues, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; // Poliyfill for hashchange.newURL, diff --git a/web/src/elements/sidebar/Sidebar.ts b/web/src/elements/sidebar/Sidebar.ts index 95dfdc2111..a8081761a8 100644 --- a/web/src/elements/sidebar/Sidebar.ts +++ b/web/src/elements/sidebar/Sidebar.ts @@ -1,16 +1,17 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/sidebar/SidebarVersion"; +import "#elements/sidebar/SidebarVersion"; + +import { AKElement } from "#elements/Base"; + +import { UiThemeEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { UiThemeEnum } from "@goauthentik/api"; - @customElement("ak-sidebar") export class Sidebar extends AKElement { static get styles(): CSSResult[] { diff --git a/web/src/elements/sidebar/SidebarItem.ts b/web/src/elements/sidebar/SidebarItem.ts index a6347a329e..0537ec0760 100644 --- a/web/src/elements/sidebar/SidebarItem.ts +++ b/web/src/elements/sidebar/SidebarItem.ts @@ -1,8 +1,8 @@ -import { ROUTE_SEPARATOR } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; +import { ROUTE_SEPARATOR } from "#common/constants"; -import { CSSResult, css } from "lit"; -import { TemplateResult, html } from "lit"; +import { AKElement } from "#elements/Base"; + +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; diff --git a/web/src/elements/sidebar/SidebarVersion.ts b/web/src/elements/sidebar/SidebarVersion.ts index 11fa4d7c40..bc6427305a 100644 --- a/web/src/elements/sidebar/SidebarVersion.ts +++ b/web/src/elements/sidebar/SidebarVersion.ts @@ -1,13 +1,17 @@ -import type { AdminInterface } from "#admin/AdminInterface/index.entrypoint"; +import { globalAK } from "#common/global"; +import { rootInterface } from "#common/theme"; +import { DefaultBrand } from "#common/ui/config"; + +import { AKElement } from "#elements/Base"; import { WithLicenseSummary } from "#elements/mixins/license"; import { WithVersion } from "#elements/mixins/version"; -import { globalAK } from "@goauthentik/common/global"; -import { rootInterface } from "@goauthentik/common/theme"; -import { DefaultBrand } from "@goauthentik/common/ui/config"; -import { AKElement } from "@goauthentik/elements/Base"; + +import type { AdminInterface } from "#admin/AdminInterface/index.entrypoint"; + +import { LicenseSummaryStatusEnum } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing } from "lit"; import { customElement } from "lit/decorators.js"; import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; @@ -15,8 +19,6 @@ import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { LicenseSummaryStatusEnum } from "@goauthentik/api"; - @customElement("ak-sidebar-version") export class SidebarVersion extends WithLicenseSummary(WithVersion(AKElement)) { static get styles(): CSSResult[] { diff --git a/web/src/elements/stories/Alert.stories.ts b/web/src/elements/stories/Alert.stories.ts index 4f5d644b51..7e6f1361f4 100644 --- a/web/src/elements/stories/Alert.stories.ts +++ b/web/src/elements/stories/Alert.stories.ts @@ -1,10 +1,11 @@ +import "../Alert.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; import { Alert, type IAlert } from "../Alert.js"; -import "../Alert.js"; type IAlertForTesting = IAlert & { message: string }; diff --git a/web/src/elements/stories/AppIcon.stories.ts b/web/src/elements/stories/AppIcon.stories.ts index ffd60ba366..c821354668 100644 --- a/web/src/elements/stories/AppIcon.stories.ts +++ b/web/src/elements/stories/AppIcon.stories.ts @@ -1,11 +1,13 @@ -import { PFSize } from "@goauthentik/common/enums.js"; +import "../AppIcon.js"; + +import { PFSize } from "#common/enums"; + import type { Meta, StoryObj } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; -import "../AppIcon"; -import { AppIcon } from "../AppIcon"; +import { AppIcon } from "../AppIcon.js"; const sizeOptions = Array.from(Object.values(PFSize)); diff --git a/web/src/elements/stories/Divider.stories.ts b/web/src/elements/stories/Divider.stories.ts index 1d424294c7..19b1b3b0be 100644 --- a/web/src/elements/stories/Divider.stories.ts +++ b/web/src/elements/stories/Divider.stories.ts @@ -1,9 +1,10 @@ +import "../Divider.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { Divider } from "../Divider.js"; -import "../Divider.js"; const metadata: Meta = { title: "Elements/", diff --git a/web/src/elements/stories/EmptyState.stories.ts b/web/src/elements/stories/EmptyState.stories.ts index cecabcabf1..5e1dff188d 100644 --- a/web/src/elements/stories/EmptyState.stories.ts +++ b/web/src/elements/stories/EmptyState.stories.ts @@ -1,10 +1,11 @@ +import "../EmptyState.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; -import { TemplateResult, html, nothing } from "lit"; +import { html, nothing, TemplateResult } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; -import "../EmptyState.js"; -import { type EmptyState, type IEmptyState, akEmptyState } from "../EmptyState.js"; +import { akEmptyState, type IEmptyState } from "../EmptyState.js"; type StoryArgs = IEmptyState & { headingText?: string | TemplateResult; diff --git a/web/src/elements/stories/Expand.stories.ts b/web/src/elements/stories/Expand.stories.ts index b7baa4eb69..f2370ef62b 100644 --- a/web/src/elements/stories/Expand.stories.ts +++ b/web/src/elements/stories/Expand.stories.ts @@ -1,10 +1,11 @@ +import "../Expand.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; import { Expand, type IExpand } from "../Expand.js"; -import "../Expand.js"; const metadata: Meta = { title: "Elements/", diff --git a/web/src/elements/stories/Label.stories.ts b/web/src/elements/stories/Label.stories.ts index c4c96412f3..10aa57132c 100644 --- a/web/src/elements/stories/Label.stories.ts +++ b/web/src/elements/stories/Label.stories.ts @@ -1,10 +1,11 @@ +import "../Label.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; import { type ILabel, Label, PFColor } from "../Label.js"; -import "../Label.js"; type ILabelForTesting = ILabel & { message: string }; diff --git a/web/src/elements/stories/LoadingOverlay.stories.ts b/web/src/elements/stories/LoadingOverlay.stories.ts index 02d129effc..beb2a3f6cb 100644 --- a/web/src/elements/stories/LoadingOverlay.stories.ts +++ b/web/src/elements/stories/LoadingOverlay.stories.ts @@ -1,10 +1,11 @@ +import "../LoadingOverlay.js"; + import type { Meta, StoryObj } from "@storybook/web-components"; import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; -import "../LoadingOverlay.js"; -import { type ILoadingOverlay, LoadingOverlay, akLoadingOverlay } from "../LoadingOverlay.js"; +import { akLoadingOverlay, type ILoadingOverlay } from "../LoadingOverlay.js"; type StoryArgs = ILoadingOverlay & { headingText?: string; diff --git a/web/src/elements/stories/ak-array-input.stories.ts b/web/src/elements/stories/ak-array-input.stories.ts index c48d802df9..841c286872 100644 --- a/web/src/elements/stories/ak-array-input.stories.ts +++ b/web/src/elements/stories/ak-array-input.stories.ts @@ -1,14 +1,16 @@ -import "@goauthentik/admin/admin-settings/AdminSettingsFooterLinks.js"; -import { FooterLinkInput } from "@goauthentik/admin/admin-settings/AdminSettingsFooterLinks.js"; -import "@goauthentik/elements/messages/MessageContainer"; +import "#admin/admin-settings/AdminSettingsFooterLinks"; +import "#elements/messages/MessageContainer"; +import "../ak-array-input.js"; + +import { FooterLinkInput } from "#admin/admin-settings/AdminSettingsFooterLinks"; + +import { FooterLink } from "@goauthentik/api"; + import { Meta, StoryObj, WebComponentsRenderer } from "@storybook/web-components"; import { DecoratorFunction } from "storybook/internal/types"; import { html } from "lit"; -import { FooterLink } from "@goauthentik/api"; - -import "../ak-array-input.js"; import { IArrayInput } from "../ak-array-input.js"; // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/web/src/elements/sync/SyncObjectForm.ts b/web/src/elements/sync/SyncObjectForm.ts index b380596f07..aa2164a300 100644 --- a/web/src/elements/sync/SyncObjectForm.ts +++ b/web/src/elements/sync/SyncObjectForm.ts @@ -1,12 +1,10 @@ -import "@goauthentik/admin/common/ak-flow-search/ak-flow-search-no-default"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { Form } from "@goauthentik/elements/forms/Form"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import "@goauthentik/elements/forms/SearchSelect"; +import "#admin/common/ak-flow-search/ak-flow-search-no-default"; +import "#elements/forms/HorizontalFormElement"; +import "#elements/forms/SearchSelect/index"; -import { msg } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { Form } from "#elements/forms/Form"; import { CoreApi, @@ -20,6 +18,10 @@ import { User, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-sync-object-form") export class SyncObjectForm extends Form { @property({ type: Number }) diff --git a/web/src/elements/sync/SyncStatusCard.stories.ts b/web/src/elements/sync/SyncStatusCard.stories.ts index acd00c3800..fd74f90203 100644 --- a/web/src/elements/sync/SyncStatusCard.stories.ts +++ b/web/src/elements/sync/SyncStatusCard.stories.ts @@ -1,10 +1,10 @@ -import type { Meta, StoryObj } from "@storybook/web-components"; - -import { html } from "lit"; +import "./SyncStatusCard.js"; import { LogLevelEnum, SyncStatus, SystemTaskStatusEnum } from "@goauthentik/api"; -import "./SyncStatusCard"; +import type { Meta, StoryObj } from "@storybook/web-components"; + +import { html } from "lit"; const metadata: Meta = { title: "Elements/", diff --git a/web/src/elements/sync/SyncStatusCard.ts b/web/src/elements/sync/SyncStatusCard.ts index b538ef68f8..9ee72ce5b0 100644 --- a/web/src/elements/sync/SyncStatusCard.ts +++ b/web/src/elements/sync/SyncStatusCard.ts @@ -1,14 +1,18 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/components/ak-status-label"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/buttons/ActionButton"; -import "@goauthentik/elements/events/LogViewer"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#components/ak-status-label"; +import "#elements/EmptyState"; +import "#elements/buttons/ActionButton/index"; +import "#elements/events/LogViewer"; + +import { EVENT_REFRESH } from "#common/constants"; +import { formatElapsedTime } from "#common/temporal"; + +import { AKElement } from "#elements/Base"; +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { SyncStatus, SystemTask, SystemTaskStatusEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -16,8 +20,6 @@ import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFTable from "@patternfly/patternfly/components/Table/table.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { SyncStatus, SystemTask, SystemTaskStatusEnum } from "@goauthentik/api"; - @customElement("ak-sync-status-table") export class SyncStatusTable extends Table { @property({ attribute: false }) diff --git a/web/src/elements/table/Table.ts b/web/src/elements/table/Table.ts index 1afabd0d5a..f6cdb63036 100644 --- a/web/src/elements/table/Table.ts +++ b/web/src/elements/table/Table.ts @@ -1,24 +1,24 @@ +import "#elements/EmptyState"; +import "#elements/buttons/SpinnerButton/index"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/table/TablePagination"; +import "#elements/table/TableSearch"; + +import { EVENT_REFRESH } from "#common/constants"; +import { APIError, parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { uiConfig } from "#common/ui/config"; +import { groupBy } from "#common/utils"; + +import { AKElement } from "#elements/Base"; import { WithLicenseSummary } from "#elements/mixins/license"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { - APIError, - parseAPIResponseError, - pluckErrorDetail, -} from "@goauthentik/common/errors/network"; -import { uiConfig } from "@goauthentik/common/ui/config"; -import { groupBy } from "@goauthentik/common/utils"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/buttons/SpinnerButton"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch"; -import "@goauthentik/elements/table/TablePagination"; -import "@goauthentik/elements/table/TableSearch"; -import { SlottedTemplateResult } from "@goauthentik/elements/types"; +import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; +import { SlottedTemplateResult } from "#elements/types"; + +import { LicenseSummaryStatusEnum, Pagination } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { property, state } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -32,8 +32,6 @@ import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css"; import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { LicenseSummaryStatusEnum, Pagination } from "@goauthentik/api"; - export interface TableLike { order?: string; fetch: () => void; diff --git a/web/src/elements/table/TableModal.ts b/web/src/elements/table/TableModal.ts index 1e80a26e1b..f0a4a12f14 100644 --- a/web/src/elements/table/TableModal.ts +++ b/web/src/elements/table/TableModal.ts @@ -1,12 +1,12 @@ -import { PFSize } from "@goauthentik/common/enums.js"; -import { AKElement } from "@goauthentik/elements/Base"; -import { MODAL_BUTTON_STYLES } from "@goauthentik/elements/buttons/ModalButton"; -import { ModalShowEvent } from "@goauthentik/elements/controllers/ModalOrchestrationController.js"; -import { Table } from "@goauthentik/elements/table/Table"; +import { PFSize } from "#common/enums"; + +import { AKElement } from "#elements/Base"; +import { MODAL_BUTTON_STYLES } from "#elements/buttons/ModalButton"; +import { ModalShowEvent } from "#elements/controllers/ModalOrchestrationController"; +import { Table } from "#elements/table/Table"; import { msg } from "@lit/localize"; -import { CSSResult } from "lit"; -import { TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { property } from "lit/decorators.js"; import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css"; diff --git a/web/src/elements/table/TablePage.ts b/web/src/elements/table/TablePage.ts index 0f42c65bf3..990f4e9cac 100644 --- a/web/src/elements/table/TablePage.ts +++ b/web/src/elements/table/TablePage.ts @@ -1,10 +1,10 @@ import "#components/ak-page-header"; + import { updateURLParams } from "#elements/router/RouteMatch"; import { Table } from "#elements/table/Table"; import { msg } from "@lit/localize"; -import { CSSResult } from "lit"; -import { TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; diff --git a/web/src/elements/table/TablePagination.ts b/web/src/elements/table/TablePagination.ts index f3b96ce8ed..0c4bd7f7e3 100644 --- a/web/src/elements/table/TablePagination.ts +++ b/web/src/elements/table/TablePagination.ts @@ -1,15 +1,15 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; + +import { Pagination } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFPagination from "@patternfly/patternfly/components/Pagination/pagination.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { Pagination } from "@goauthentik/api"; - @customElement("ak-table-pagination") export class TablePagination extends AKElement { @property({ attribute: false }) diff --git a/web/src/elements/table/TableSearch.ts b/web/src/elements/table/TableSearch.ts index 36d25b40f5..c50a6a0c70 100644 --- a/web/src/elements/table/TableSearch.ts +++ b/web/src/elements/table/TableSearch.ts @@ -1,10 +1,13 @@ +import "#components/ak-search-ql/index"; + +import { AKElement } from "#elements/Base"; import { WithLicenseSummary } from "#elements/mixins/license"; -import "@goauthentik/components/ak-search-ql"; -import { AKElement } from "@goauthentik/elements/Base"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; +import { PaginatedResponse } from "#elements/table/Table"; + +import { LicenseSummaryStatusEnum } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -14,8 +17,6 @@ import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-gro import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { LicenseSummaryStatusEnum } from "@goauthentik/api"; - @customElement("ak-table-search") export class TableSearch extends WithLicenseSummary(AKElement) { @property() diff --git a/web/src/elements/tests/Alert.test.ts b/web/src/elements/tests/Alert.test.ts index db6fba72f9..806ce2196d 100644 --- a/web/src/elements/tests/Alert.test.ts +++ b/web/src/elements/tests/Alert.test.ts @@ -1,10 +1,12 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../Alert.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../Alert.js"; -import { Level, akAlert } from "../Alert.js"; +import { akAlert, Level } from "../Alert.js"; describe("ak-alert", () => { it("should render an alert with the enum", async () => { diff --git a/web/src/elements/tests/Divider.test.ts b/web/src/elements/tests/Divider.test.ts index 30aa6b14b9..37ff6feb10 100644 --- a/web/src/elements/tests/Divider.test.ts +++ b/web/src/elements/tests/Divider.test.ts @@ -1,9 +1,11 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../Divider.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../Divider.js"; import { akDivider } from "../Divider.js"; describe("ak-divider", () => { diff --git a/web/src/elements/tests/EmptyState.test.ts b/web/src/elements/tests/EmptyState.test.ts index 9660d9ab2d..2c7de4fbbe 100644 --- a/web/src/elements/tests/EmptyState.test.ts +++ b/web/src/elements/tests/EmptyState.test.ts @@ -1,10 +1,12 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../EmptyState.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { msg } from "@lit/localize"; import { html } from "lit"; -import "../EmptyState.js"; import { akEmptyState } from "../EmptyState.js"; describe("ak-empty-state", () => { diff --git a/web/src/elements/tests/Expand.test.ts b/web/src/elements/tests/Expand.test.ts index cd7d376884..5557f6a8e5 100644 --- a/web/src/elements/tests/Expand.test.ts +++ b/web/src/elements/tests/Expand.test.ts @@ -1,9 +1,11 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../Expand.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../Expand.js"; import { akExpand } from "../Expand.js"; describe("ak-expand", () => { diff --git a/web/src/elements/tests/Label.test.ts b/web/src/elements/tests/Label.test.ts index 97e3ff4b82..eb70764792 100644 --- a/web/src/elements/tests/Label.test.ts +++ b/web/src/elements/tests/Label.test.ts @@ -1,10 +1,12 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../Label.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../Label.js"; -import { PFColor, akLabel } from "../Label.js"; +import { akLabel, PFColor } from "../Label.js"; describe("ak-label", () => { it("should render a label with the enum", async () => { diff --git a/web/src/elements/tests/LoadingOverlay.test.ts b/web/src/elements/tests/LoadingOverlay.test.ts index 35bbfa878f..bc78c453c2 100644 --- a/web/src/elements/tests/LoadingOverlay.test.ts +++ b/web/src/elements/tests/LoadingOverlay.test.ts @@ -1,9 +1,11 @@ -import { render } from "@goauthentik/elements/tests/utils.js"; +import "../LoadingOverlay.js"; + +import { render } from "#elements/tests/utils"; + import { $, expect } from "@wdio/globals"; import { html } from "lit"; -import "../LoadingOverlay.js"; import { akLoadingOverlay } from "../LoadingOverlay.js"; describe("ak-loading-overlay", () => { diff --git a/web/src/elements/tests/ak-array-input.test.ts b/web/src/elements/tests/ak-array-input.test.ts index 9df1ce2348..325dfc0643 100644 --- a/web/src/elements/tests/ak-array-input.test.ts +++ b/web/src/elements/tests/ak-array-input.test.ts @@ -1,12 +1,13 @@ -import "@goauthentik/admin/admin-settings/AdminSettingsFooterLinks.js"; -import { render } from "@goauthentik/elements/tests/utils.js"; -import { $, expect } from "@wdio/globals"; +import "#admin/admin-settings/AdminSettingsFooterLinks"; +import "../ak-array-input.js"; -import { html } from "lit"; +import { render } from "#elements/tests/utils"; import { FooterLink } from "@goauthentik/api"; -import "../ak-array-input.js"; +import { $, expect } from "@wdio/globals"; + +import { html } from "lit"; const sampleItems: FooterLink[] = [ { name: "authentik", href: "https://goauthentik.io" }, diff --git a/web/src/elements/tests/utils.ts b/web/src/elements/tests/utils.ts index c0accad036..343b408c04 100644 --- a/web/src/elements/tests/utils.ts +++ b/web/src/elements/tests/utils.ts @@ -1,6 +1,6 @@ -import { applyDocumentTheme } from "@goauthentik/common/theme.js"; +import { applyDocumentTheme } from "#common/theme"; -import { TemplateResult, render as litRender } from "lit"; +import { render as litRender, TemplateResult } from "lit"; /** * A special version of render that ensures our stylesheets: diff --git a/web/src/elements/types.ts b/web/src/elements/types.ts index 7374848995..ccb32df404 100644 --- a/web/src/elements/types.ts +++ b/web/src/elements/types.ts @@ -1,6 +1,7 @@ -import { type LitElement, type ReactiveControllerHost, type TemplateResult, nothing } from "lit"; import "lit"; +import { type LitElement, nothing, type ReactiveControllerHost, type TemplateResult } from "lit"; + /** * Type utility to make readonly properties mutable. */ diff --git a/web/src/elements/user/SessionList.ts b/web/src/elements/user/SessionList.ts index 93137c4032..bb9d83626e 100644 --- a/web/src/elements/user/SessionList.ts +++ b/web/src/elements/user/SessionList.ts @@ -1,16 +1,18 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { AuthenticatedSession, CoreApi } from "@goauthentik/api"; + import getUnicodeFlagIcon from "country-flag-icons/unicode"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { AuthenticatedSession, CoreApi } from "@goauthentik/api"; - @customElement("ak-user-session-list") export class AuthenticatedSessionList extends Table { @property() diff --git a/web/src/elements/user/UserConsentList.ts b/web/src/elements/user/UserConsentList.ts index a17fb32fed..f21dfd2cd2 100644 --- a/web/src/elements/user/UserConsentList.ts +++ b/web/src/elements/user/UserConsentList.ts @@ -1,17 +1,18 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/chips/Chip"; -import "@goauthentik/elements/chips/ChipGroup"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/chips/Chip"; +import "#elements/chips/ChipGroup"; +import "#elements/forms/DeleteBulkForm"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { CoreApi, UserConsent } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-consent-list") export class UserConsentList extends Table { @property({ type: Number }) diff --git a/web/src/elements/user/UserReputationList.ts b/web/src/elements/user/UserReputationList.ts index 48d70bcc71..f4825764d8 100644 --- a/web/src/elements/user/UserReputationList.ts +++ b/web/src/elements/user/UserReputationList.ts @@ -1,16 +1,18 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; +import "#elements/forms/DeleteBulkForm"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { PoliciesApi, Reputation } from "@goauthentik/api"; + import getUnicodeFlagIcon from "country-flag-icons/unicode"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; +import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { PoliciesApi, Reputation } from "@goauthentik/api"; - @customElement("ak-user-reputation-list") export class UserReputationList extends Table { @property() diff --git a/web/src/elements/user/sources/BaseUserSettings.ts b/web/src/elements/user/sources/BaseUserSettings.ts index e0e4234f31..e94d191ad6 100644 --- a/web/src/elements/user/sources/BaseUserSettings.ts +++ b/web/src/elements/user/sources/BaseUserSettings.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { CSSResult } from "lit"; import { property } from "lit/decorators.js"; diff --git a/web/src/elements/user/sources/SourceSettings.ts b/web/src/elements/user/sources/SourceSettings.ts index f749fbc487..2ecdef03fc 100644 --- a/web/src/elements/user/sources/SourceSettings.ts +++ b/web/src/elements/user/sources/SourceSettings.ts @@ -1,20 +1,23 @@ -import { renderSourceIcon } from "@goauthentik/admin/sources/utils"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/user/sources/SourceSettingsOAuth"; -import "@goauthentik/elements/user/sources/SourceSettingsPlex"; -import "@goauthentik/elements/user/sources/SourceSettingsSAML"; +import "#elements/EmptyState"; +import "#elements/user/sources/SourceSettingsOAuth"; +import "#elements/user/sources/SourceSettingsPlex"; +import "#elements/user/sources/SourceSettingsSAML"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; + +import { AKElement } from "#elements/Base"; + +import { renderSourceIcon } from "#admin/sources/utils"; + +import { PaginatedUserSourceConnectionList, SourcesApi, UserSetting } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFDataList from "@patternfly/patternfly/components/DataList/data-list.css"; -import { PaginatedUserSourceConnectionList, SourcesApi, UserSetting } from "@goauthentik/api"; - @customElement("ak-user-settings-source") export class UserSourceSettingsPage extends AKElement { @property({ attribute: false }) diff --git a/web/src/elements/user/sources/SourceSettingsOAuth.ts b/web/src/elements/user/sources/SourceSettingsOAuth.ts index fba3c7f246..58fef7cb65 100644 --- a/web/src/elements/user/sources/SourceSettingsOAuth.ts +++ b/web/src/elements/user/sources/SourceSettingsOAuth.ts @@ -1,17 +1,19 @@ -import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import "@goauthentik/elements/Spinner"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { BaseUserSettings } from "@goauthentik/elements/user/sources/BaseUserSettings"; +import "#elements/Spinner"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { AndNext, DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; + +import { showMessage } from "#elements/messages/MessageContainer"; +import { BaseUserSettings } from "#elements/user/sources/BaseUserSettings"; import { SourcesApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-settings-source-oauth") export class SourceSettingsOAuth extends BaseUserSettings { @property() diff --git a/web/src/elements/user/sources/SourceSettingsPlex.ts b/web/src/elements/user/sources/SourceSettingsPlex.ts index af2f852d8b..c1a783beb5 100644 --- a/web/src/elements/user/sources/SourceSettingsPlex.ts +++ b/web/src/elements/user/sources/SourceSettingsPlex.ts @@ -1,18 +1,20 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { PlexAPIClient, popupCenterScreen } from "@goauthentik/common/helpers/plex"; -import { MessageLevel } from "@goauthentik/common/messages"; -import "@goauthentik/elements/Spinner"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { BaseUserSettings } from "@goauthentik/elements/user/sources/BaseUserSettings"; +import "#elements/Spinner"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { PlexAPIClient, popupCenterScreen } from "#common/helpers/plex"; +import { MessageLevel } from "#common/messages"; + +import { showMessage } from "#elements/messages/MessageContainer"; +import { BaseUserSettings } from "#elements/user/sources/BaseUserSettings"; import { SourcesApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-settings-source-plex") export class SourceSettingsPlex extends BaseUserSettings { @property() diff --git a/web/src/elements/user/sources/SourceSettingsSAML.ts b/web/src/elements/user/sources/SourceSettingsSAML.ts index b02b6afc09..0632d3d67e 100644 --- a/web/src/elements/user/sources/SourceSettingsSAML.ts +++ b/web/src/elements/user/sources/SourceSettingsSAML.ts @@ -1,17 +1,19 @@ -import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { parseAPIResponseError, pluckErrorDetail } from "@goauthentik/common/errors/network"; -import { MessageLevel } from "@goauthentik/common/messages"; -import "@goauthentik/elements/Spinner"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { BaseUserSettings } from "@goauthentik/elements/user/sources/BaseUserSettings"; +import "#elements/Spinner"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { AndNext, DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; +import { MessageLevel } from "#common/messages"; + +import { showMessage } from "#elements/messages/MessageContainer"; +import { BaseUserSettings } from "#elements/user/sources/BaseUserSettings"; import { SourcesApi } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-user-settings-source-saml") export class SourceSettingsSAML extends BaseUserSettings { @property() diff --git a/web/src/elements/utils/TimeDeltaHelp.ts b/web/src/elements/utils/TimeDeltaHelp.ts index 47a19a3b31..444b5bc647 100644 --- a/web/src/elements/utils/TimeDeltaHelp.ts +++ b/web/src/elements/utils/TimeDeltaHelp.ts @@ -1,8 +1,9 @@ -import { AKElement } from "@goauthentik/elements/Base"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { AKElement } from "#elements/Base"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; diff --git a/web/src/elements/utils/eventEmitter.ts b/web/src/elements/utils/eventEmitter.ts index b3d5578b82..9a8df6b794 100644 --- a/web/src/elements/utils/eventEmitter.ts +++ b/web/src/elements/utils/eventEmitter.ts @@ -1,9 +1,5 @@ -import { - ConstructorWithMixin, - LitElementConstructor, - createMixin, -} from "@goauthentik/elements/types"; -import { CustomEventDetail, isCustomEvent } from "@goauthentik/elements/utils/customEvents"; +import { ConstructorWithMixin, createMixin, LitElementConstructor } from "#elements/types"; +import { CustomEventDetail, isCustomEvent } from "#elements/utils/customEvents"; export interface CustomEventEmitterMixin { dispatchCustomEvent( diff --git a/web/src/elements/utils/images.ts b/web/src/elements/utils/images.ts index a3de50c165..64dec3874f 100644 --- a/web/src/elements/utils/images.ts +++ b/web/src/elements/utils/images.ts @@ -1,4 +1,5 @@ import { resolveUITheme, rootInterface } from "#common/theme"; + import type { AKElement } from "#elements/Base"; export function themeImage(rawPath: string) { diff --git a/web/src/elements/utils/writeToClipboard.ts b/web/src/elements/utils/writeToClipboard.ts index bd916c3bbe..7638714eb9 100644 --- a/web/src/elements/utils/writeToClipboard.ts +++ b/web/src/elements/utils/writeToClipboard.ts @@ -1,4 +1,4 @@ -import { isSafari } from "./isSafari"; +import { isSafari } from "./isSafari.js"; export async function writeToClipboard(message: string) { if (!navigator.clipboard) { diff --git a/web/src/elements/wizard/ActionWizardPage.ts b/web/src/elements/wizard/ActionWizardPage.ts index a698691ecd..5dea0cebfd 100644 --- a/web/src/elements/wizard/ActionWizardPage.ts +++ b/web/src/elements/wizard/ActionWizardPage.ts @@ -1,9 +1,12 @@ -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { WizardAction } from "@goauthentik/elements/wizard/Wizard"; -import { WizardPage } from "@goauthentik/elements/wizard/WizardPage"; +import { EVENT_REFRESH } from "#common/constants"; + +import { WizardAction } from "#elements/wizard/Wizard"; +import { WizardPage } from "#elements/wizard/WizardPage"; + +import { ResponseError } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; @@ -12,8 +15,6 @@ import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { ResponseError } from "@goauthentik/api"; - export enum ActionState { pending = "pending", running = "running", diff --git a/web/src/elements/wizard/FormWizardPage.ts b/web/src/elements/wizard/FormWizardPage.ts index 61eb496558..d2d2c88f71 100644 --- a/web/src/elements/wizard/FormWizardPage.ts +++ b/web/src/elements/wizard/FormWizardPage.ts @@ -1,5 +1,5 @@ -import { Form } from "@goauthentik/elements/forms/Form"; -import { WizardPage } from "@goauthentik/elements/wizard/WizardPage"; +import { Form } from "#elements/forms/Form"; +import { WizardPage } from "#elements/wizard/WizardPage"; import { msg } from "@lit/localize"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/elements/wizard/TypeCreateWizardPage.ts b/web/src/elements/wizard/TypeCreateWizardPage.ts index d626d88734..2d45509d5c 100644 --- a/web/src/elements/wizard/TypeCreateWizardPage.ts +++ b/web/src/elements/wizard/TypeCreateWizardPage.ts @@ -1,11 +1,14 @@ +import "#admin/common/ak-license-notice"; + import { WithLicenseSummary } from "#elements/mixins/license"; -import "@goauthentik/admin/common/ak-license-notice"; -import { WizardPage } from "@goauthentik/elements/wizard/WizardPage"; +import { WizardPage } from "#elements/wizard/WizardPage"; + +import { TypeCreate } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { Ref, createRef, ref } from "lit/directives/ref.js"; +import { createRef, ref, Ref } from "lit/directives/ref.js"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; @@ -13,8 +16,6 @@ import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { TypeCreate } from "@goauthentik/api"; - export enum TypeCreateWizardPageLayouts { list = "list", grid = "grid", diff --git a/web/src/elements/wizard/Wizard.ts b/web/src/elements/wizard/Wizard.ts index 3e154c2336..0682341904 100644 --- a/web/src/elements/wizard/Wizard.ts +++ b/web/src/elements/wizard/Wizard.ts @@ -1,11 +1,12 @@ -import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/wizard/ActionWizardPage"; -import { WizardPage } from "@goauthentik/elements/wizard/WizardPage"; +import "#elements/wizard/ActionWizardPage"; + +import { ModalButton } from "#elements/buttons/ModalButton"; +import { WizardPage } from "#elements/wizard/WizardPage"; import { msg } from "@lit/localize"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { property } from "@lit/reactive-element/decorators/property.js"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { state } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; diff --git a/web/src/elements/wizard/WizardFormPage.ts b/web/src/elements/wizard/WizardFormPage.ts index 408f652db4..a781a62f5b 100644 --- a/web/src/elements/wizard/WizardFormPage.ts +++ b/web/src/elements/wizard/WizardFormPage.ts @@ -1,7 +1,7 @@ -import { Form, KeyUnknown } from "@goauthentik/elements/forms/Form"; -import { WizardPage } from "@goauthentik/elements/wizard/WizardPage"; +import { Form, KeyUnknown } from "#elements/forms/Form"; +import { WizardPage } from "#elements/wizard/WizardPage"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { property } from "lit/decorators.js"; import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; diff --git a/web/src/elements/wizard/WizardPage.ts b/web/src/elements/wizard/WizardPage.ts index a2b559155a..e7c2413d1c 100644 --- a/web/src/elements/wizard/WizardPage.ts +++ b/web/src/elements/wizard/WizardPage.ts @@ -1,7 +1,7 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { Wizard } from "@goauthentik/elements/wizard/Wizard"; +import { AKElement } from "#elements/Base"; +import { Wizard } from "#elements/wizard/Wizard"; -import { CSSResult, PropertyDeclaration, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyDeclaration, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; diff --git a/web/src/flow/FlowExecutor.ts b/web/src/flow/FlowExecutor.ts index 4254ae49c4..9836ada875 100644 --- a/web/src/flow/FlowExecutor.ts +++ b/web/src/flow/FlowExecutor.ts @@ -1,36 +1,25 @@ -import { DEFAULT_CONFIG } from "#common/api/config"; -import { EVENT_FLOW_ADVANCE, EVENT_FLOW_INSPECTOR_TOGGLE } from "#common/constants"; -import { globalAK } from "#common/global"; -import { configureSentry } from "#common/sentry/index"; -import { WebsocketClient } from "#common/ws"; -import { Interface } from "#elements/Interface"; import "#elements/LoadingOverlay"; import "#elements/ak-locale-context/ak-locale-context"; -import { WithBrandConfig } from "#elements/mixins/branding"; -import { WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import { themeImage } from "#elements/utils/images"; import "#flow/components/ak-brand-footer"; import "#flow/sources/apple/AppleLoginInit"; import "#flow/sources/plex/PlexLoginInit"; import "#flow/stages/FlowErrorStage"; import "#flow/stages/FlowFrameStage"; import "#flow/stages/RedirectStage"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_FLOW_ADVANCE, EVENT_FLOW_INSPECTOR_TOGGLE } from "#common/constants"; +import { globalAK } from "#common/global"; +import { configureSentry } from "#common/sentry/index"; +import { WebsocketClient } from "#common/ws"; + +import { Interface } from "#elements/Interface"; +import { WithBrandConfig } from "#elements/mixins/branding"; +import { WithCapabilitiesConfig } from "#elements/mixins/capabilities"; +import { themeImage } from "#elements/utils/images"; + import { StageHost, SubmitOptions } from "#flow/stages/base"; -import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, css, html, nothing } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; -import { unsafeHTML } from "lit/directives/unsafe-html.js"; -import { until } from "lit/directives/until.js"; - -import PFBackgroundImage from "@patternfly/patternfly/components/BackgroundImage/background-image.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css"; -import PFList from "@patternfly/patternfly/components/List/list.css"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; -import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; - import { CapabilitiesEnum, ChallengeTypes, @@ -44,6 +33,20 @@ import { ShellChallenge, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { css, CSSResult, html, nothing, PropertyValues, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; +import { unsafeHTML } from "lit/directives/unsafe-html.js"; +import { until } from "lit/directives/until.js"; + +import PFBackgroundImage from "@patternfly/patternfly/components/BackgroundImage/background-image.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css"; +import PFList from "@patternfly/patternfly/components/List/list.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import PFTitle from "@patternfly/patternfly/components/Title/title.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + @customElement("ak-flow-executor") export class FlowExecutor extends WithCapabilitiesConfig(WithBrandConfig(Interface)) @@ -308,75 +311,73 @@ export class FlowExecutor } switch (this.challenge?.component) { case "ak-stage-access-denied": - await import("@goauthentik/flow/stages/access_denied/AccessDeniedStage"); + await import("#flow/stages/access_denied/AccessDeniedStage"); return html``; case "ak-stage-identification": - await import("@goauthentik/flow/stages/identification/IdentificationStage"); + await import("#flow/stages/identification/IdentificationStage"); return html``; case "ak-stage-password": - await import("@goauthentik/flow/stages/password/PasswordStage"); + await import("#flow/stages/password/PasswordStage"); return html``; case "ak-stage-captcha": - await import("@goauthentik/flow/stages/captcha/CaptchaStage"); + await import("#flow/stages/captcha/CaptchaStage"); return html``; case "ak-stage-consent": - await import("@goauthentik/flow/stages/consent/ConsentStage"); + await import("#flow/stages/consent/ConsentStage"); return html``; case "ak-stage-dummy": - await import("@goauthentik/flow/stages/dummy/DummyStage"); + await import("#flow/stages/dummy/DummyStage"); return html``; case "ak-stage-email": - await import("@goauthentik/flow/stages/email/EmailStage"); + await import("#flow/stages/email/EmailStage"); return html``; case "ak-stage-autosubmit": - await import("@goauthentik/flow/stages/autosubmit/AutosubmitStage"); + await import("#flow/stages/autosubmit/AutosubmitStage"); return html``; case "ak-stage-prompt": - await import("@goauthentik/flow/stages/prompt/PromptStage"); + await import("#flow/stages/prompt/PromptStage"); return html``; case "ak-stage-authenticator-totp": - await import("@goauthentik/flow/stages/authenticator_totp/AuthenticatorTOTPStage"); + await import("#flow/stages/authenticator_totp/AuthenticatorTOTPStage"); return html``; case "ak-stage-authenticator-duo": - await import("@goauthentik/flow/stages/authenticator_duo/AuthenticatorDuoStage"); + await import("#flow/stages/authenticator_duo/AuthenticatorDuoStage"); return html``; case "ak-stage-authenticator-static": - await import( - "@goauthentik/flow/stages/authenticator_static/AuthenticatorStaticStage" - ); + await import("#flow/stages/authenticator_static/AuthenticatorStaticStage"); return html``; case "ak-stage-authenticator-email": - await import( - "@goauthentik/flow/stages/authenticator_email/AuthenticatorEmailStage" - ); + await import("#flow/stages/authenticator_email/AuthenticatorEmailStage"); return html``; case "ak-stage-authenticator-sms": - await import("@goauthentik/flow/stages/authenticator_sms/AuthenticatorSMSStage"); + await import("#flow/stages/authenticator_sms/AuthenticatorSMSStage"); return html``; case "ak-stage-authenticator-validate": - await import( - "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStage" - ); + await import("#flow/stages/authenticator_validate/AuthenticatorValidateStage"); return html``; case "ak-stage-user-login": - await import("@goauthentik/flow/stages/user_login/UserLoginStage"); + await import("#flow/stages/user_login/UserLoginStage"); return html``; // Providers case "ak-provider-oauth2-device-code": - await import("@goauthentik/flow/providers/oauth2/DeviceCode"); + await import("#flow/providers/oauth2/DeviceCode"); return html``; case "ak-provider-oauth2-device-code-finish": - await import("@goauthentik/flow/providers/oauth2/DeviceCodeFinish"); + await import("#flow/providers/oauth2/DeviceCodeFinish"); return html``; case "ak-stage-session-end": - await import("@goauthentik/flow/providers/SessionEnd"); + await import("#flow/providers/SessionEnd"); return html` { static get styles(): CSSResult[] { diff --git a/web/src/flow/providers/oauth2/DeviceCode.ts b/web/src/flow/providers/oauth2/DeviceCode.ts index b1303c5a80..5c66109701 100644 --- a/web/src/flow/providers/oauth2/DeviceCode.ts +++ b/web/src/flow/providers/oauth2/DeviceCode.ts @@ -1,10 +1,16 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { + OAuthDeviceCodeChallenge, + OAuthDeviceCodeChallengeResponseRequest, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -14,11 +20,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - OAuthDeviceCodeChallenge, - OAuthDeviceCodeChallengeResponseRequest, -} from "@goauthentik/api"; - @customElement("ak-flow-provider-oauth2-code") export class OAuth2DeviceCode extends BaseStage< OAuthDeviceCodeChallenge, diff --git a/web/src/flow/providers/oauth2/DeviceCodeFinish.ts b/web/src/flow/providers/oauth2/DeviceCodeFinish.ts index 95056eabda..a271b7a4c0 100644 --- a/web/src/flow/providers/oauth2/DeviceCodeFinish.ts +++ b/web/src/flow/providers/oauth2/DeviceCodeFinish.ts @@ -1,13 +1,14 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#flow/FormStatic"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { BaseStage } from "#flow/stages/base"; import { OAuthDeviceCodeFinishChallenge } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-flow-provider-oauth2-code-finish") export class DeviceCodeFinish extends BaseStage< OAuthDeviceCodeFinishChallenge, diff --git a/web/src/flow/sources/apple/AppleLoginInit.ts b/web/src/flow/sources/apple/AppleLoginInit.ts index ccc3f58617..cca8e724fc 100644 --- a/web/src/flow/sources/apple/AppleLoginInit.ts +++ b/web/src/flow/sources/apple/AppleLoginInit.ts @@ -1,8 +1,11 @@ -import "@goauthentik/elements/EmptyState"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; + +import { BaseStage } from "#flow/stages/base"; + +import { AppleChallengeResponseRequest, AppleLoginChallenge } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -12,8 +15,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { AppleChallengeResponseRequest, AppleLoginChallenge } from "@goauthentik/api"; - @customElement("ak-flow-source-oauth-apple") export class AppleLoginInit extends BaseStage { @property({ type: Boolean }) diff --git a/web/src/flow/sources/plex/PlexLoginInit.ts b/web/src/flow/sources/plex/PlexLoginInit.ts index f5ef45f721..5154f0a678 100644 --- a/web/src/flow/sources/plex/PlexLoginInit.ts +++ b/web/src/flow/sources/plex/PlexLoginInit.ts @@ -1,12 +1,19 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { parseAPIResponseError } from "@goauthentik/common/errors/network"; -import { PlexAPIClient, popupCenterScreen } from "@goauthentik/common/helpers/plex"; -import { showAPIErrorMessage } from "@goauthentik/elements/messages/MessageContainer"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { parseAPIResponseError } from "#common/errors/network"; +import { PlexAPIClient, popupCenterScreen } from "#common/helpers/plex"; + +import { showAPIErrorMessage } from "#elements/messages/MessageContainer"; + +import { BaseStage } from "#flow/stages/base"; + +import { + PlexAuthenticationChallenge, + PlexAuthenticationChallengeResponseRequest, + SourcesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult } from "lit"; -import { TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -17,12 +24,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - PlexAuthenticationChallenge, - PlexAuthenticationChallengeResponseRequest, -} from "@goauthentik/api"; -import { SourcesApi } from "@goauthentik/api"; - @customElement("ak-flow-source-plex") export class PlexLoginInit extends BaseStage< PlexAuthenticationChallenge, diff --git a/web/src/flow/stages/FlowErrorStage.ts b/web/src/flow/stages/FlowErrorStage.ts index a7bb7de537..35273279a8 100644 --- a/web/src/flow/stages/FlowErrorStage.ts +++ b/web/src/flow/stages/FlowErrorStage.ts @@ -1,9 +1,12 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { FlowChallengeResponseRequest, FlowErrorChallenge } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; @@ -12,8 +15,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { FlowChallengeResponseRequest, FlowErrorChallenge } from "@goauthentik/api"; - @customElement("ak-stage-flow-error") export class FlowErrorStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/flow/stages/FlowFrameStage.ts b/web/src/flow/stages/FlowFrameStage.ts index 4858b3299d..7d5f71aa5b 100644 --- a/web/src/flow/stages/FlowFrameStage.ts +++ b/web/src/flow/stages/FlowFrameStage.ts @@ -1,8 +1,11 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#flow/FormStatic"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { BaseStage } from "#flow/stages/base"; + +import { FrameChallenge, FrameChallengeResponseRequest } from "@goauthentik/api"; + +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; @@ -11,8 +14,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { FrameChallenge, FrameChallengeResponseRequest } from "@goauthentik/api"; - @customElement("xak-flow-frame") export class FlowFrameStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/flow/stages/RedirectStage.ts b/web/src/flow/stages/RedirectStage.ts index a8f1c434a8..9151c7ef63 100644 --- a/web/src/flow/stages/RedirectStage.ts +++ b/web/src/flow/stages/RedirectStage.ts @@ -1,7 +1,9 @@ -import { BaseStage } from "@goauthentik/flow/stages/base"; +import { BaseStage } from "#flow/stages/base"; + +import { FlowChallengeResponseRequest, RedirectChallenge } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -11,8 +13,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { FlowChallengeResponseRequest, RedirectChallenge } from "@goauthentik/api"; - @customElement("ak-stage-redirect") export class RedirectStage extends BaseStage { @property({ type: Boolean }) diff --git a/web/src/flow/stages/access_denied/AccessDeniedStage.stories.ts b/web/src/flow/stages/access_denied/AccessDeniedStage.stories.ts index c1eecb0a38..ffa1b4914f 100644 --- a/web/src/flow/stages/access_denied/AccessDeniedStage.stories.ts +++ b/web/src/flow/stages/access_denied/AccessDeniedStage.stories.ts @@ -1,13 +1,12 @@ -import type { StoryObj } from "@storybook/web-components"; - -import { html } from "lit"; - import "@patternfly/patternfly/components/Login/login.css"; +import "../../../stories/flow-interface"; +import "./AccessDeniedStage.js"; import { AccessDeniedChallenge, UiThemeEnum } from "@goauthentik/api"; -import "../../../stories/flow-interface"; -import "./AccessDeniedStage"; +import type { StoryObj } from "@storybook/web-components"; + +import { html } from "lit"; export default { title: "Flow / Stages / AccessDeniedStage", diff --git a/web/src/flow/stages/access_denied/AccessDeniedStage.ts b/web/src/flow/stages/access_denied/AccessDeniedStage.ts index 3685b6914c..036ee34500 100644 --- a/web/src/flow/stages/access_denied/AccessDeniedStage.ts +++ b/web/src/flow/stages/access_denied/AccessDeniedStage.ts @@ -1,9 +1,12 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { AccessDeniedChallenge, FlowChallengeResponseRequest } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html, nothing } from "lit"; +import { CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -13,8 +16,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { AccessDeniedChallenge, FlowChallengeResponseRequest } from "@goauthentik/api"; - @customElement("ak-stage-access-denied") export class AccessDeniedStage extends BaseStage< AccessDeniedChallenge, diff --git a/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts b/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts index 7876adb904..e2a8c7a305 100644 --- a/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts +++ b/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts @@ -1,11 +1,20 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; + +import { DEFAULT_CONFIG } from "#common/api/config"; + +import { BaseStage } from "#flow/stages/base"; + +import { + AuthenticatorDuoChallenge, + AuthenticatorDuoChallengeResponseRequest, + DuoResponseEnum, + StagesApi, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; +import { CSSResult, html, PropertyValues, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -16,13 +25,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - AuthenticatorDuoChallenge, - AuthenticatorDuoChallengeResponseRequest, - DuoResponseEnum, - StagesApi, -} from "@goauthentik/api"; - @customElement("ak-stage-authenticator-duo") export class AuthenticatorDuoStage extends BaseStage< AuthenticatorDuoChallenge, diff --git a/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts b/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts index 2c92acd111..e29f3d6f09 100644 --- a/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts +++ b/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts @@ -1,10 +1,16 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { + AuthenticatorEmailChallenge, + AuthenticatorEmailChallengeResponseRequest, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -16,11 +22,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - AuthenticatorEmailChallenge, - AuthenticatorEmailChallengeResponseRequest, -} from "@goauthentik/api"; - @customElement("ak-stage-authenticator-email") export class AuthenticatorEmailStage extends BaseStage< AuthenticatorEmailChallenge, diff --git a/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts index 5c6f0c156a..ae5de4dad2 100644 --- a/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts +++ b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts @@ -1,10 +1,16 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { + AuthenticatorSMSChallenge, + AuthenticatorSMSChallengeResponseRequest, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -16,11 +22,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - AuthenticatorSMSChallenge, - AuthenticatorSMSChallengeResponseRequest, -} from "@goauthentik/api"; - @customElement("ak-stage-authenticator-sms") export class AuthenticatorSMSStage extends BaseStage< AuthenticatorSMSChallenge, diff --git a/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts b/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts index 5adc59ad62..c48497e948 100644 --- a/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts +++ b/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts @@ -1,10 +1,16 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { + AuthenticatorStaticChallenge, + AuthenticatorStaticChallengeResponseRequest, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -15,11 +21,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - AuthenticatorStaticChallenge, - AuthenticatorStaticChallengeResponseRequest, -} from "@goauthentik/api"; - @customElement("ak-stage-authenticator-static") export class AuthenticatorStaticStage extends BaseStage< AuthenticatorStaticChallenge, diff --git a/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.stories.ts b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.stories.ts index b687a7fd06..ab9ecbb0ad 100644 --- a/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.stories.ts +++ b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.stories.ts @@ -1,13 +1,12 @@ -import type { StoryObj } from "@storybook/web-components"; - -import { html } from "lit"; - import "@patternfly/patternfly/components/Login/login.css"; +import "../../../stories/flow-interface"; +import "./AuthenticatorTOTPStage.js"; import { AuthenticatorTOTPChallenge, UiThemeEnum } from "@goauthentik/api"; -import "../../../stories/flow-interface"; -import "./AuthenticatorTOTPStage"; +import type { StoryObj } from "@storybook/web-components"; + +import { html } from "lit"; export default { title: "Flow / Stages / AuthenticatorTOTPStage", diff --git a/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts index 5dfcb8bb8d..b3f64e3241 100644 --- a/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts +++ b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts @@ -1,13 +1,21 @@ -import { MessageLevel } from "@goauthentik/common/messages"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; import "webcomponent-qr-code"; +import { MessageLevel } from "#common/messages"; + +import { showMessage } from "#elements/messages/MessageContainer"; + +import { BaseStage } from "#flow/stages/base"; + +import { + AuthenticatorTOTPChallenge, + AuthenticatorTOTPChallengeResponseRequest, +} from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -18,11 +26,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - AuthenticatorTOTPChallenge, - AuthenticatorTOTPChallengeResponseRequest, -} from "@goauthentik/api"; - @customElement("ak-stage-authenticator-totp") export class AuthenticatorTOTPStage extends BaseStage< AuthenticatorTOTPChallenge, diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts index 79eb3febc3..bb57f168ab 100644 --- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts +++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts @@ -1,20 +1,11 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStageCode"; -import "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo"; -import "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn"; -import { BaseStage, StageHost, SubmitOptions } from "@goauthentik/flow/stages/base"; -import { PasswordManagerPrefill } from "@goauthentik/flow/stages/identification/IdentificationStage"; +import "#flow/stages/authenticator_validate/AuthenticatorValidateStageCode"; +import "#flow/stages/authenticator_validate/AuthenticatorValidateStageDuo"; +import "#flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn"; -import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, css, html, nothing } from "lit"; -import { customElement, state } from "lit/decorators.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFForm from "@patternfly/patternfly/components/Form/form.css"; -import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; -import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import { BaseStage, StageHost, SubmitOptions } from "#flow/stages/base"; +import { PasswordManagerPrefill } from "#flow/stages/identification/IdentificationStage"; import { AuthenticatorValidationChallenge, @@ -25,6 +16,17 @@ import { FlowsApi, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { css, CSSResult, html, nothing, PropertyValues, TemplateResult } from "lit"; +import { customElement, state } from "lit/decorators.js"; + +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFForm from "@patternfly/patternfly/components/Form/form.css"; +import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import PFTitle from "@patternfly/patternfly/components/Title/title.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + const customCSS = css` ul { padding-top: 1rem; diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts index 7bd06a2f74..cc91fdb963 100644 --- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts +++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts @@ -1,11 +1,8 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import { BaseDeviceStage } from "@goauthentik/flow/stages/authenticator_validate/base"; -import { PasswordManagerPrefill } from "@goauthentik/flow/stages/identification/IdentificationStage"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; -import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { BaseDeviceStage } from "#flow/stages/authenticator_validate/base"; +import { PasswordManagerPrefill } from "#flow/stages/identification/IdentificationStage"; import { AuthenticatorValidationChallenge, @@ -13,6 +10,10 @@ import { DeviceClassesEnum, } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { css, CSSResult, html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-validate-code") export class AuthenticatorValidateStageWebCode extends BaseDeviceStage< AuthenticatorValidationChallenge, diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts index d67dec34eb..766ad6f657 100644 --- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts +++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts @@ -1,10 +1,7 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import { BaseDeviceStage } from "@goauthentik/flow/stages/authenticator_validate/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; -import { msg } from "@lit/localize"; -import { PropertyValues, TemplateResult, html } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { BaseDeviceStage } from "#flow/stages/authenticator_validate/base"; import { AuthenticatorValidationChallenge, @@ -12,6 +9,10 @@ import { DeviceChallenge, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, PropertyValues, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-validate-duo") export class AuthenticatorValidateStageWebDuo extends BaseDeviceStage< AuthenticatorValidationChallenge, diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts index a2576f7ced..c4f1724f05 100644 --- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts +++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts @@ -1,14 +1,12 @@ +import "#elements/EmptyState"; + import { checkWebAuthnSupport, transformAssertionForServer, transformCredentialRequestOptions, -} from "@goauthentik/common/helpers/webauthn"; -import "@goauthentik/elements/EmptyState"; -import { BaseDeviceStage } from "@goauthentik/flow/stages/authenticator_validate/base"; +} from "#common/helpers/webauthn"; -import { msg } from "@lit/localize"; -import { PropertyValues, TemplateResult, html, nothing } from "lit"; -import { customElement, property, state } from "lit/decorators.js"; +import { BaseDeviceStage } from "#flow/stages/authenticator_validate/base"; import { AuthenticatorValidationChallenge, @@ -16,6 +14,10 @@ import { DeviceChallenge, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, nothing, PropertyValues, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators.js"; + @customElement("ak-stage-authenticator-validate-webauthn") export class AuthenticatorValidateStageWebAuthn extends BaseDeviceStage< AuthenticatorValidationChallenge, diff --git a/web/src/flow/stages/authenticator_validate/base.ts b/web/src/flow/stages/authenticator_validate/base.ts index 4335af54cd..3f22c2b69f 100644 --- a/web/src/flow/stages/authenticator_validate/base.ts +++ b/web/src/flow/stages/authenticator_validate/base.ts @@ -1,8 +1,10 @@ -import { AuthenticatorValidateStage } from "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStage"; -import { BaseStage, FlowInfoChallenge, PendingUserChallenge } from "@goauthentik/flow/stages/base"; +import { AuthenticatorValidateStage } from "#flow/stages/authenticator_validate/AuthenticatorValidateStage"; +import { BaseStage, FlowInfoChallenge, PendingUserChallenge } from "#flow/stages/base"; + +import { DeviceChallenge } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing } from "lit"; import { property } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -12,8 +14,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { DeviceChallenge } from "@goauthentik/api"; - export class BaseDeviceStage< Tin extends FlowInfoChallenge & PendingUserChallenge, Tout, diff --git a/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts b/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts index 7e376317cc..ad6d2209c8 100644 --- a/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts +++ b/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts @@ -1,14 +1,21 @@ +import "#elements/EmptyState"; + import { Assertion, checkWebAuthnSupport, transformCredentialCreateOptions, transformNewAssertionForServer, -} from "@goauthentik/common/helpers/webauthn"; -import "@goauthentik/elements/EmptyState"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +} from "#common/helpers/webauthn"; + +import { BaseStage } from "#flow/stages/base"; + +import { + AuthenticatorWebAuthnChallenge, + AuthenticatorWebAuthnChallengeResponseRequest, +} from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, PropertyValues, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -19,11 +26,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - AuthenticatorWebAuthnChallenge, - AuthenticatorWebAuthnChallengeResponseRequest, -} from "@goauthentik/api"; - export interface WebAuthnAuthenticatorRegisterChallengeResponse { response: Assertion; } diff --git a/web/src/flow/stages/autosubmit/AutosubmitStage.ts b/web/src/flow/stages/autosubmit/AutosubmitStage.ts index 6adc0074b2..437e22095c 100644 --- a/web/src/flow/stages/autosubmit/AutosubmitStage.ts +++ b/web/src/flow/stages/autosubmit/AutosubmitStage.ts @@ -1,8 +1,11 @@ -import "@goauthentik/elements/EmptyState"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; + +import { BaseStage } from "#flow/stages/base"; + +import { AutosubmitChallenge, AutoSubmitChallengeResponseRequest } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, query } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -12,8 +15,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { AutoSubmitChallengeResponseRequest, AutosubmitChallenge } from "@goauthentik/api"; - @customElement("ak-stage-autosubmit") export class AutosubmitStage extends BaseStage< AutosubmitChallenge, diff --git a/web/src/flow/stages/base.ts b/web/src/flow/stages/base.ts index 515feb7079..e0ff4d3eda 100644 --- a/web/src/flow/stages/base.ts +++ b/web/src/flow/stages/base.ts @@ -1,13 +1,13 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { KeyUnknown } from "@goauthentik/elements/forms/Form"; +import { AKElement } from "#elements/Base"; +import { KeyUnknown } from "#elements/forms/Form"; + +import { ContextualFlowInfo, CurrentBrand, ErrorDetail } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; import { property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { ContextualFlowInfo, CurrentBrand, ErrorDetail } from "@goauthentik/api"; - export interface SubmitOptions { invisible: boolean; } diff --git a/web/src/flow/stages/captcha/CaptchaStage.stories.ts b/web/src/flow/stages/captcha/CaptchaStage.stories.ts index bd4eb77916..ac2be5a68e 100644 --- a/web/src/flow/stages/captcha/CaptchaStage.stories.ts +++ b/web/src/flow/stages/captcha/CaptchaStage.stories.ts @@ -1,13 +1,12 @@ -import type { StoryObj } from "@storybook/web-components"; - -import { html } from "lit"; - import "@patternfly/patternfly/components/Login/login.css"; +import "../../../stories/flow-interface"; +import "./CaptchaStage.js"; import { CaptchaChallenge, UiThemeEnum } from "@goauthentik/api"; -import "../../../stories/flow-interface"; -import "./CaptchaStage"; +import type { StoryObj } from "@storybook/web-components"; + +import { html } from "lit"; export default { title: "Flow / Stages / Captcha", diff --git a/web/src/flow/stages/captcha/CaptchaStage.ts b/web/src/flow/stages/captcha/CaptchaStage.ts index 7e4ebddafc..03f6ec27c4 100644 --- a/web/src/flow/stages/captcha/CaptchaStage.ts +++ b/web/src/flow/stages/captcha/CaptchaStage.ts @@ -1,19 +1,25 @@ /// /// -import { renderStaticHTMLUnsafe } from "@goauthentik/common/purify"; -import "@goauthentik/elements/EmptyState"; -import { akEmptyState } from "@goauthentik/elements/EmptyState"; -import { bound } from "@goauthentik/elements/decorators/bound"; -import "@goauthentik/elements/forms/FormElement"; -import { createIFrameHTMLWrapper } from "@goauthentik/elements/utils/iframe"; -import { ListenerController } from "@goauthentik/elements/utils/listenerController.js"; -import { randomId } from "@goauthentik/elements/utils/randomId"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; -import { P, match } from "ts-pattern"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; + +import { renderStaticHTMLUnsafe } from "#common/purify"; + +import { bound } from "#elements/decorators/bound"; +import { akEmptyState } from "#elements/EmptyState"; +import { createIFrameHTMLWrapper } from "#elements/utils/iframe"; +import { ListenerController } from "#elements/utils/listenerController"; +import { randomId } from "#elements/utils/randomId"; + +import { BaseStage } from "#flow/stages/base"; + +import { CaptchaChallenge, CaptchaChallengeResponseRequest } from "@goauthentik/api"; + +import { match, P } from "ts-pattern"; import { msg } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -23,8 +29,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { CaptchaChallenge, CaptchaChallengeResponseRequest } from "@goauthentik/api"; - type TokenHandler = (token: string) => void; type Dims = { height: number }; diff --git a/web/src/flow/stages/consent/ConsentStage.ts b/web/src/flow/stages/consent/ConsentStage.ts index d4ac0998c1..010c8b04f4 100644 --- a/web/src/flow/stages/consent/ConsentStage.ts +++ b/web/src/flow/stages/consent/ConsentStage.ts @@ -1,9 +1,16 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { + ConsentChallenge, + ConsentChallengeResponseRequest, + ConsentPermission, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html, nothing } from "lit"; +import { CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -16,12 +23,6 @@ import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFSpacing from "@patternfly/patternfly/utilities/Spacing/spacing.css"; -import { - ConsentChallenge, - ConsentChallengeResponseRequest, - ConsentPermission, -} from "@goauthentik/api"; - @customElement("ak-stage-consent") export class ConsentStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/flow/stages/dummy/DummyStage.ts b/web/src/flow/stages/dummy/DummyStage.ts index 81c06fd595..b990282a4f 100644 --- a/web/src/flow/stages/dummy/DummyStage.ts +++ b/web/src/flow/stages/dummy/DummyStage.ts @@ -1,9 +1,12 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { DummyChallenge, DummyChallengeResponseRequest } from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -13,8 +16,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { DummyChallenge, DummyChallengeResponseRequest } from "@goauthentik/api"; - @customElement("ak-stage-dummy") export class DummyStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/flow/stages/email/EmailStage.ts b/web/src/flow/stages/email/EmailStage.ts index 8c15ba7d0b..e5c2e0bd83 100644 --- a/web/src/flow/stages/email/EmailStage.ts +++ b/web/src/flow/stages/email/EmailStage.ts @@ -1,8 +1,11 @@ -import "@goauthentik/elements/EmptyState"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; + +import { BaseStage } from "#flow/stages/base"; + +import { EmailChallenge, EmailChallengeResponseRequest } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; @@ -12,8 +15,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { EmailChallenge, EmailChallengeResponseRequest } from "@goauthentik/api"; - @customElement("ak-stage-email") export class EmailStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/flow/stages/identification/IdentificationStage.stories.ts b/web/src/flow/stages/identification/IdentificationStage.stories.ts index af34e5b2ad..6265895f0c 100644 --- a/web/src/flow/stages/identification/IdentificationStage.stories.ts +++ b/web/src/flow/stages/identification/IdentificationStage.stories.ts @@ -1,13 +1,12 @@ -import type { StoryObj } from "@storybook/web-components"; - -import { html } from "lit"; - import "@patternfly/patternfly/components/Login/login.css"; +import "../../../stories/flow-interface"; +import "./IdentificationStage.js"; import { FlowDesignationEnum, IdentificationChallenge, UiThemeEnum } from "@goauthentik/api"; -import "../../../stories/flow-interface"; -import "./IdentificationStage"; +import type { StoryObj } from "@storybook/web-components"; + +import { html } from "lit"; export default { title: "Flow / Stages / Identification", diff --git a/web/src/flow/stages/identification/IdentificationStage.ts b/web/src/flow/stages/identification/IdentificationStage.ts index a2d7d7a1b3..e70301a520 100644 --- a/web/src/flow/stages/identification/IdentificationStage.ts +++ b/web/src/flow/stages/identification/IdentificationStage.ts @@ -1,14 +1,24 @@ -import { renderSourceIcon } from "@goauthentik/admin/sources/utils"; -import "@goauthentik/elements/Divider"; -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/components/ak-flow-password-input.js"; -import { BaseStage } from "@goauthentik/flow/stages/base"; -import "@goauthentik/flow/stages/captcha/CaptchaStage"; -import { AkRememberMeController } from "@goauthentik/flow/stages/identification/RememberMeController.js"; +import "#elements/Divider"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/components/ak-flow-password-input"; +import "#flow/stages/captcha/CaptchaStage"; + +import { renderSourceIcon } from "#admin/sources/utils"; + +import { BaseStage } from "#flow/stages/base"; +import { AkRememberMeController } from "#flow/stages/identification/RememberMeController"; + +import { + FlowDesignationEnum, + IdentificationChallenge, + IdentificationChallengeResponseRequest, + LoginSource, + UserFieldsEnum, +} from "@goauthentik/api"; import { msg, str } from "@lit/localize"; -import { CSSResult, PropertyValues, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, PropertyValues, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; @@ -20,14 +30,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - FlowDesignationEnum, - IdentificationChallenge, - IdentificationChallengeResponseRequest, - LoginSource, - UserFieldsEnum, -} from "@goauthentik/api"; - export const PasswordManagerPrefill: { password: string | undefined; totp: string | undefined; diff --git a/web/src/flow/stages/identification/RememberMeController.ts b/web/src/flow/stages/identification/RememberMeController.ts index b9bf8313ea..7c2fa37403 100644 --- a/web/src/flow/stages/identification/RememberMeController.ts +++ b/web/src/flow/stages/identification/RememberMeController.ts @@ -1,8 +1,7 @@ -import { getCookie } from "@goauthentik/common/utils.js"; +import { getCookie } from "#common/utils"; import { msg } from "@lit/localize"; -import { css, html, nothing } from "lit"; -import { ReactiveController, ReactiveControllerHost } from "lit"; +import { css, html, nothing, ReactiveController, ReactiveControllerHost } from "lit"; import type { IdentificationStage } from "./IdentificationStage.js"; diff --git a/web/src/flow/stages/password/PasswordStage.ts b/web/src/flow/stages/password/PasswordStage.ts index d53cd7ff13..db200d40f2 100644 --- a/web/src/flow/stages/password/PasswordStage.ts +++ b/web/src/flow/stages/password/PasswordStage.ts @@ -1,12 +1,15 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/FormStatic"; -import "@goauthentik/flow/components/ak-flow-password-input.js"; -import { BaseStage } from "@goauthentik/flow/stages/base"; -import { PasswordManagerPrefill } from "@goauthentik/flow/stages/identification/IdentificationStage"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; +import "#flow/components/ak-flow-password-input"; + +import { BaseStage } from "#flow/stages/base"; +import { PasswordManagerPrefill } from "#flow/stages/identification/IdentificationStage"; + +import { PasswordChallenge, PasswordChallengeResponseRequest } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -18,8 +21,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { PasswordChallenge, PasswordChallengeResponseRequest } from "@goauthentik/api"; - @customElement("ak-stage-password") export class PasswordStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/flow/stages/prompt/PromptStage.ts b/web/src/flow/stages/prompt/PromptStage.ts index 629b2c3d8b..5948ad3c74 100644 --- a/web/src/flow/stages/prompt/PromptStage.ts +++ b/web/src/flow/stages/prompt/PromptStage.ts @@ -1,12 +1,21 @@ +import "#elements/Divider"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; + +import { LOCALES } from "#elements/ak-locale-context/definitions"; import { CapabilitiesEnum, WithCapabilitiesConfig } from "#elements/mixins/capabilities"; -import "@goauthentik/elements/Divider"; -import "@goauthentik/elements/EmptyState"; -import { LOCALES } from "@goauthentik/elements/ak-locale-context/definitions"; -import "@goauthentik/elements/forms/FormElement"; -import { BaseStage } from "@goauthentik/flow/stages/base"; + +import { BaseStage } from "#flow/stages/base"; + +import { + PromptChallenge, + PromptChallengeResponseRequest, + PromptTypeEnum, + StagePrompt, +} from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { unsafeHTML } from "lit/directives/unsafe-html.js"; @@ -19,13 +28,6 @@ import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { - PromptChallenge, - PromptChallengeResponseRequest, - PromptTypeEnum, - StagePrompt, -} from "@goauthentik/api"; - @customElement("ak-stage-prompt") export class PromptStage extends WithCapabilitiesConfig( BaseStage, diff --git a/web/src/flow/stages/user_login/UserLoginStage.ts b/web/src/flow/stages/user_login/UserLoginStage.ts index 01483f38e8..27627ce75d 100644 --- a/web/src/flow/stages/user_login/UserLoginStage.ts +++ b/web/src/flow/stages/user_login/UserLoginStage.ts @@ -1,10 +1,13 @@ -import "@goauthentik/elements/EmptyState"; -import "@goauthentik/elements/forms/FormElement"; -import "@goauthentik/flow/FormStatic"; -import { BaseStage } from "@goauthentik/flow/stages/base"; +import "#elements/EmptyState"; +import "#elements/forms/FormElement"; +import "#flow/FormStatic"; + +import { BaseStage } from "#flow/stages/base"; + +import { UserLoginChallenge, UserLoginChallengeResponseRequest } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -16,8 +19,6 @@ import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFSpacing from "@patternfly/patternfly/utilities/Spacing/spacing.css"; -import { UserLoginChallenge, UserLoginChallengeResponseRequest } from "@goauthentik/api"; - @customElement("ak-stage-user-login") export class PasswordStage extends BaseStage< UserLoginChallenge, diff --git a/web/src/polyfill/index.entrypoint.ts b/web/src/polyfill/index.entrypoint.ts index 2703f69c89..c46fec69dc 100644 --- a/web/src/polyfill/index.entrypoint.ts +++ b/web/src/polyfill/index.entrypoint.ts @@ -3,6 +3,5 @@ import "construct-style-sheets-polyfill"; import "@webcomponents/webcomponentsjs"; import "lit/polyfill-support.js"; import "core-js/actual"; - import "@formatjs/intl-listformat/polyfill"; import "@formatjs/intl-listformat/locale-data/en"; diff --git a/web/src/rac/index.entrypoint.ts b/web/src/rac/index.entrypoint.ts index af56360e56..ff3527fcdf 100644 --- a/web/src/rac/index.entrypoint.ts +++ b/web/src/rac/index.entrypoint.ts @@ -1,13 +1,16 @@ -import { Interface } from "#elements/Interface"; import "#elements/LoadingOverlay"; + +import AKGlobal from "#common/styles/authentik.css"; + +import { Interface } from "#elements/Interface"; import { WithBrandConfig } from "#elements/mixins/branding"; + import Guacamole from "guacamole-common-js"; import { msg, str } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import AKGlobal from "#common/styles/authentik.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; diff --git a/web/src/standalone/api-browser/index.entrypoint.ts b/web/src/standalone/api-browser/index.entrypoint.ts index 4d8956a0db..13b404e528 100644 --- a/web/src/standalone/api-browser/index.entrypoint.ts +++ b/web/src/standalone/api-browser/index.entrypoint.ts @@ -5,17 +5,18 @@ import "#elements/ak-locale-context/index"; import { CSRFHeaderName } from "#common/api/middleware"; import { EVENT_THEME_CHANGE } from "#common/constants"; import { getCookie } from "#common/utils"; + import { Interface } from "#elements/Interface"; import { WithBrandConfig } from "#elements/mixins/branding"; import { themeImage } from "#elements/utils/images"; +import { UiThemeEnum } from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import { UiThemeEnum } from "@goauthentik/api"; - @customElement("ak-api-browser") export class APIBrowser extends WithBrandConfig(Interface) { @property() diff --git a/web/src/standalone/loading/index.entrypoint.ts b/web/src/standalone/loading/index.entrypoint.ts index 87b8b3cd94..9946e1bbc3 100644 --- a/web/src/standalone/loading/index.entrypoint.ts +++ b/web/src/standalone/loading/index.entrypoint.ts @@ -1,9 +1,10 @@ import { globalAK } from "#common/global"; import { applyDocumentTheme } from "#common/theme"; + import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; -import { TemplateResult, css, html } from "lit"; +import { css, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators.js"; import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; diff --git a/web/src/stories/flow-interface.ts b/web/src/stories/flow-interface.ts index ac188db06c..38b1e623a1 100644 --- a/web/src/stories/flow-interface.ts +++ b/web/src/stories/flow-interface.ts @@ -1,4 +1,4 @@ -import { FlowExecutor } from "@goauthentik/flow/FlowExecutor"; +import { FlowExecutor } from "#flow/FlowExecutor"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts b/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts index 92d53810d3..8b5ef86187 100644 --- a/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts +++ b/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts @@ -1,13 +1,14 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { PaginatedResponse, TableColumn } from "@goauthentik/elements/table/Table"; -import { TableModal } from "@goauthentik/elements/table/TableModal"; +import { DEFAULT_CONFIG } from "#common/api/config"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; +import { PaginatedResponse, TableColumn } from "#elements/table/Table"; +import { TableModal } from "#elements/table/TableModal"; import { Application, Endpoint, RacApi } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; + @customElement("ak-library-rac-endpoint-launch") export class RACLaunchEndpointModal extends TableModal { clickable = true; diff --git a/web/src/user/LibraryApplication/index.ts b/web/src/user/LibraryApplication/index.ts index 3051d0f1bd..878c7b2cc2 100644 --- a/web/src/user/LibraryApplication/index.ts +++ b/web/src/user/LibraryApplication/index.ts @@ -1,16 +1,21 @@ +import "#elements/AppIcon"; +import "#elements/Expand"; +import "#user/LibraryApplication/RACLaunchEndpointModal"; + +import { PFSize } from "#common/enums"; +import { globalAK } from "#common/global"; +import { rootInterface } from "#common/theme"; +import { truncateWords } from "#common/utils"; + +import { AKElement } from "#elements/Base"; + import type { UserInterface } from "#user/index.entrypoint"; -import { PFSize } from "@goauthentik/common/enums.js"; -import { globalAK } from "@goauthentik/common/global"; -import { rootInterface } from "@goauthentik/common/theme"; -import { truncateWords } from "@goauthentik/common/utils"; -import "@goauthentik/elements/AppIcon"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Expand"; -import "@goauthentik/user/LibraryApplication/RACLaunchEndpointModal"; -import type { RACLaunchEndpointModal } from "@goauthentik/user/LibraryApplication/RACLaunchEndpointModal"; +import type { RACLaunchEndpointModal } from "#user/LibraryApplication/RACLaunchEndpointModal"; + +import { Application } from "@goauthentik/api"; import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html, nothing } from "lit"; +import { css, CSSResult, html, nothing, TemplateResult } from "lit"; import { customElement, property, query } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -20,8 +25,6 @@ import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { Application } from "@goauthentik/api"; - @customElement("ak-library-app") export class LibraryApplication extends AKElement { @property({ attribute: false }) diff --git a/web/src/user/LibraryPage/ak-library-application-empty-list.ts b/web/src/user/LibraryPage/ak-library-application-empty-list.ts index 170eff0a8f..10dd7c7a33 100644 --- a/web/src/user/LibraryPage/ak-library-application-empty-list.ts +++ b/web/src/user/LibraryPage/ak-library-application-empty-list.ts @@ -1,6 +1,7 @@ -import { docLink, globalAK } from "@goauthentik/common/global"; -import { AKElement } from "@goauthentik/elements/Base"; -import { paramURL } from "@goauthentik/elements/router/RouterOutlet"; +import { docLink, globalAK } from "#common/global"; + +import { AKElement } from "#elements/Base"; +import { paramURL } from "#elements/router/RouterOutlet"; import { msg } from "@lit/localize"; import { css, html } from "lit"; diff --git a/web/src/user/LibraryPage/ak-library-application-list.ts b/web/src/user/LibraryPage/ak-library-application-list.ts index 32eb4d498b..5203e73c08 100644 --- a/web/src/user/LibraryPage/ak-library-application-list.ts +++ b/web/src/user/LibraryPage/ak-library-application-list.ts @@ -1,5 +1,8 @@ -import { LayoutType } from "@goauthentik/common/ui/config"; -import { AKElement } from "@goauthentik/elements/Base"; +import { LayoutType } from "#common/ui/config"; + +import { AKElement } from "#elements/Base"; + +import type { Application } from "@goauthentik/api"; import { css, html } from "lit"; import { customElement, property } from "lit/decorators.js"; @@ -10,8 +13,6 @@ import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-sta import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import type { Application } from "@goauthentik/api"; - import type { AppGroupEntry, AppGroupList } from "./types.js"; type Pair = [string, string]; diff --git a/web/src/user/LibraryPage/ak-library-application-search-empty.ts b/web/src/user/LibraryPage/ak-library-application-search-empty.ts index 778af88c5e..ab25f4f71a 100644 --- a/web/src/user/LibraryPage/ak-library-application-search-empty.ts +++ b/web/src/user/LibraryPage/ak-library-application-search-empty.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/elements/Base"; +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; import { html } from "lit"; diff --git a/web/src/user/LibraryPage/ak-library-application-search.ts b/web/src/user/LibraryPage/ak-library-application-search.ts index 0b865fd4d0..6fdfa58cd1 100644 --- a/web/src/user/LibraryPage/ak-library-application-search.ts +++ b/web/src/user/LibraryPage/ak-library-application-search.ts @@ -1,7 +1,9 @@ -import { AKElement } from "@goauthentik/elements/Base"; -import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch"; -import Fuse from "fuse.js"; -import { FuseResult } from "fuse.js"; +import { AKElement } from "#elements/Base"; +import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; + +import type { Application } from "@goauthentik/api"; + +import Fuse, { FuseResult } from "fuse.js"; import { msg } from "@lit/localize"; import { css, html } from "lit"; @@ -11,8 +13,6 @@ import { ifDefined } from "lit/directives/if-defined.js"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; -import type { Application } from "@goauthentik/api"; - import { LibraryPageSearchEmpty, LibraryPageSearchReset, diff --git a/web/src/user/LibraryPage/ak-library-impl.ts b/web/src/user/LibraryPage/ak-library-impl.ts index fc6a228465..6e5aa3a5fe 100644 --- a/web/src/user/LibraryPage/ak-library-impl.ts +++ b/web/src/user/LibraryPage/ak-library-impl.ts @@ -1,29 +1,30 @@ -import { groupBy } from "@goauthentik/common/utils"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; -import { bound } from "@goauthentik/elements/decorators/bound.js"; -import "@goauthentik/user/LibraryApplication"; +import "#elements/EmptyState"; +import "#user/LibraryApplication/index"; +import "./ak-library-application-empty-list.js"; +import "./ak-library-application-list.js"; +import "./ak-library-application-search-empty.js"; +import "./ak-library-application-search.js"; + +import { groupBy } from "#common/utils"; + +import { AKElement } from "#elements/Base"; +import { bound } from "#elements/decorators/bound"; + +import type { Application } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; -import styles from "./LibraryPageImpl.styles.js"; - -import type { Application } from "@goauthentik/api"; - -import { appHasLaunchUrl } from "./LibraryPageImpl.utils.js"; -import "./ak-library-application-empty-list.js"; -import "./ak-library-application-list.js"; -import "./ak-library-application-search-empty.js"; -import "./ak-library-application-search.js"; import { LibraryPageSearchEmpty, LibraryPageSearchReset, LibraryPageSearchSelected, LibraryPageSearchUpdated, } from "./events.js"; +import styles from "./LibraryPageImpl.styles.js"; +import { appHasLaunchUrl } from "./LibraryPageImpl.utils.js"; import type { PageUIConfig } from "./types.js"; /** diff --git a/web/src/user/LibraryPage/ak-library.ts b/web/src/user/LibraryPage/ak-library.ts index 9143ffc3c4..aedbaec716 100644 --- a/web/src/user/LibraryPage/ak-library.ts +++ b/web/src/user/LibraryPage/ak-library.ts @@ -1,17 +1,20 @@ +import "#elements/EmptyState"; +import "./ak-library-impl.js"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { rootInterface } from "#common/theme"; +import { me } from "#common/users"; + +import { AKElement } from "#elements/Base"; + import type { UserInterface } from "#user/index.entrypoint"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { rootInterface } from "@goauthentik/common/theme"; -import { me } from "@goauthentik/common/users"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/EmptyState"; + +import { Application, CoreApi } from "@goauthentik/api"; import { localized, msg } from "@lit/localize"; import { html } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { Application, CoreApi } from "@goauthentik/api"; - -import "./ak-library-impl.js"; import type { PageUIConfig } from "./types.js"; /** diff --git a/web/src/user/LibraryPage/stories/ApplicationEmptyState.stories.ts b/web/src/user/LibraryPage/stories/ApplicationEmptyState.stories.ts index f1f6de0c34..01e1766a07 100644 --- a/web/src/user/LibraryPage/stories/ApplicationEmptyState.stories.ts +++ b/web/src/user/LibraryPage/stories/ApplicationEmptyState.stories.ts @@ -1,6 +1,6 @@ -import { html } from "lit"; +import "../ak-library-application-empty-list.js"; -import "../ak-library-application-empty-list"; +import { html } from "lit"; export default { title: "Users / ", diff --git a/web/src/user/LibraryPage/types.ts b/web/src/user/LibraryPage/types.ts index 1fecd584c4..309e58f28b 100644 --- a/web/src/user/LibraryPage/types.ts +++ b/web/src/user/LibraryPage/types.ts @@ -1,4 +1,4 @@ -import type { LayoutType } from "@goauthentik/common/ui/config"; +import type { LayoutType } from "#common/ui/config"; import type { Application } from "@goauthentik/api"; diff --git a/web/src/user/Routes.ts b/web/src/user/Routes.ts index dd2605c82f..604121a3bb 100644 --- a/web/src/user/Routes.ts +++ b/web/src/user/Routes.ts @@ -1,5 +1,6 @@ -import { Route } from "@goauthentik/elements/router/Route"; -import "@goauthentik/user/LibraryPage/ak-library.js"; +import "#user/LibraryPage/ak-library"; + +import { Route } from "#elements/router/Route"; import { html } from "lit"; @@ -9,7 +10,7 @@ export const ROUTES: Route[] = [ new Route(new RegExp("^#.*")).redirect("/library"), new Route(new RegExp("^/library$"), async () => html``), new Route(new RegExp("^/settings$"), async () => { - await import("@goauthentik/user/user-settings/UserSettingsPage"); + await import("#user/user-settings/UserSettingsPage"); return html``; }), ]; diff --git a/web/src/user/index.entrypoint.ts b/web/src/user/index.entrypoint.ts index 29dd0ea10b..0f32373690 100644 --- a/web/src/user/index.entrypoint.ts +++ b/web/src/user/index.entrypoint.ts @@ -1,3 +1,15 @@ +import "#components/ak-nav-buttons"; +import "#elements/ak-locale-context/ak-locale-context"; +import "#elements/banner/EnterpriseStatusBanner"; +import "#elements/buttons/ActionButton/ak-action-button"; +import "#elements/messages/MessageContainer"; +import "#elements/notifications/APIDrawer"; +import "#elements/notifications/NotificationDrawer"; +import "#elements/router/RouterOutlet"; +import "#elements/sidebar/Sidebar"; +import "#elements/sidebar/SidebarItem"; +import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; + import { DEFAULT_CONFIG } from "#common/api/config"; import { EVENT_API_DRAWER_TOGGLE, @@ -6,27 +18,19 @@ import { } from "#common/constants"; import { globalAK } from "#common/global"; import { configureSentry } from "#common/sentry/index"; -import { UIConfig, getConfigForUser } from "#common/ui/config"; -import { DefaultBrand } from "#common/ui/config"; +import { DefaultBrand, getConfigForUser, UIConfig } from "#common/ui/config"; import { me } from "#common/users"; import { WebsocketClient } from "#common/ws"; -import "#components/ak-nav-buttons"; + import { AuthenticatedInterface } from "#elements/AuthenticatedInterface"; import { AKElement } from "#elements/Base"; -import "#elements/ak-locale-context/ak-locale-context"; -import "#elements/banner/EnterpriseStatusBanner"; -import "#elements/buttons/ActionButton/ak-action-button"; -import "#elements/messages/MessageContainer"; import { WithBrandConfig } from "#elements/mixins/branding"; -import "#elements/notifications/APIDrawer"; -import "#elements/notifications/NotificationDrawer"; import { getURLParam, updateURLParams } from "#elements/router/RouteMatch"; -import "#elements/router/RouterOutlet"; -import "#elements/sidebar/Sidebar"; -import "#elements/sidebar/SidebarItem"; import { themeImage } from "#elements/utils/images"; + import { ROUTES } from "#user/Routes"; -import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; + +import { EventsApi, SessionUser } from "@goauthentik/api"; import { msg } from "@lit/localize"; import { css, html, nothing } from "lit"; @@ -42,8 +46,6 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; -import { EventsApi, SessionUser } from "@goauthentik/api"; - if (process.env.NODE_ENV === "development") { await import("@goauthentik/esbuild-plugin-live-reload/client"); } diff --git a/web/src/user/user-settings/UserSettingsPage.ts b/web/src/user/user-settings/UserSettingsPage.ts index f566d8e1de..e73e27c1e5 100644 --- a/web/src/user/user-settings/UserSettingsPage.ts +++ b/web/src/user/user-settings/UserSettingsPage.ts @@ -1,19 +1,24 @@ +import "#elements/Tabs"; +import "#elements/user/SessionList"; +import "#elements/user/UserConsentList"; +import "#elements/user/sources/SourceSettings"; +import "#user/user-settings/details/UserPassword"; +import "#user/user-settings/details/UserSettingsFlowExecutor"; +import "#user/user-settings/mfa/MFADevicesPage"; +import "#user/user-settings/tokens/UserTokenList"; + +import { DEFAULT_CONFIG } from "#common/api/config"; +import { EVENT_REFRESH } from "#common/constants"; +import { rootInterface } from "#common/theme"; + +import { AKElement } from "#elements/Base"; + import type { UserInterface } from "#user/index.entrypoint"; -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { rootInterface } from "@goauthentik/common/theme"; -import { AKElement } from "@goauthentik/elements/Base"; -import "@goauthentik/elements/Tabs"; -import "@goauthentik/elements/user/SessionList"; -import "@goauthentik/elements/user/UserConsentList"; -import "@goauthentik/elements/user/sources/SourceSettings"; -import "@goauthentik/user/user-settings/details/UserPassword"; -import "@goauthentik/user/user-settings/details/UserSettingsFlowExecutor"; -import "@goauthentik/user/user-settings/mfa/MFADevicesPage"; -import "@goauthentik/user/user-settings/tokens/UserTokenList"; + +import { StagesApi, UserSetting } from "@goauthentik/api"; import { localized, msg } from "@lit/localize"; -import { CSSResult, TemplateResult, css, html } from "lit"; +import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, state } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; @@ -29,8 +34,6 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import { StagesApi, UserSetting } from "@goauthentik/api"; - @localized() @customElement("ak-user-settings") export class UserSettingsPage extends AKElement { diff --git a/web/src/user/user-settings/details/UserPassword.ts b/web/src/user/user-settings/details/UserPassword.ts index 1a971116dc..d728071469 100644 --- a/web/src/user/user-settings/details/UserPassword.ts +++ b/web/src/user/user-settings/details/UserPassword.ts @@ -1,12 +1,11 @@ -import { AndNext } from "@goauthentik/common/api/config"; -import { globalAK } from "@goauthentik/common/global"; -import { AKElement } from "@goauthentik/elements/Base"; +import { AndNext } from "#common/api/config"; +import { globalAK } from "#common/global"; + +import { AKElement } from "#elements/Base"; import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { CSSResult } from "lit"; -import { customElement } from "lit/decorators.js"; -import { property } from "lit/decorators.js"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; import { ifDefined } from "lit/directives/if-defined.js"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; diff --git a/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts b/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts index 29b61eaddb..bbb607dcad 100644 --- a/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts +++ b/web/src/user/user-settings/details/UserSettingsFlowExecutor.ts @@ -1,25 +1,17 @@ +import "#user/user-settings/details/stages/prompt/PromptStage"; + import { DEFAULT_CONFIG } from "#common/api/config"; import { EVENT_REFRESH } from "#common/constants"; import { APIError, parseAPIResponseError, pluckErrorDetail } from "#common/errors/network"; import { globalAK } from "#common/global"; import { MessageLevel } from "#common/messages"; import { refreshMe } from "#common/users"; + import { AKElement } from "#elements/Base"; import { showMessage } from "#elements/messages/MessageContainer"; import { WithBrandConfig } from "#elements/mixins/branding"; + import { StageHost } from "#flow/stages/base"; -import "#user/user-settings/details/stages/prompt/PromptStage"; - -import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { unsafeHTML } from "lit/directives/unsafe-html.js"; - -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import { ChallengeTypes, @@ -30,6 +22,17 @@ import { ShellChallenge, } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { CSSResult, html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { unsafeHTML } from "lit/directives/unsafe-html.js"; + +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + @customElement("ak-user-settings-flow-executor") export class UserSettingsFlowExecutor extends WithBrandConfig(AKElement, true) diff --git a/web/src/user/user-settings/details/stages/prompt/PromptStage.ts b/web/src/user/user-settings/details/stages/prompt/PromptStage.ts index cc8b64e572..83ea0879b5 100644 --- a/web/src/user/user-settings/details/stages/prompt/PromptStage.ts +++ b/web/src/user/user-settings/details/stages/prompt/PromptStage.ts @@ -1,13 +1,15 @@ -import { globalAK } from "@goauthentik/common/global"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { PromptStage } from "@goauthentik/flow/stages/prompt/PromptStage"; +import "#elements/forms/HorizontalFormElement"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement } from "lit/decorators.js"; +import { globalAK } from "#common/global"; + +import { PromptStage } from "#flow/stages/prompt/PromptStage"; import { PromptTypeEnum, StagePrompt } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators.js"; + @customElement("ak-user-stage-prompt") export class UserSettingsPromptStage extends PromptStage { renderPromptInner(prompt: StagePrompt): TemplateResult { diff --git a/web/src/user/user-settings/mfa/MFADeviceForm.ts b/web/src/user/user-settings/mfa/MFADeviceForm.ts index 423526d2f6..c62411559e 100644 --- a/web/src/user/user-settings/mfa/MFADeviceForm.ts +++ b/web/src/user/user-settings/mfa/MFADeviceForm.ts @@ -1,15 +1,17 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { SentryIgnoredError } from "@goauthentik/common/sentry"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import "#elements/forms/HorizontalFormElement"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { SentryIgnoredError } from "#common/sentry/index"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { AuthenticatorsApi, Device } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-user-mfa-form") export class MFADeviceForm extends ModelForm { @property() diff --git a/web/src/user/user-settings/mfa/MFADevicesPage.ts b/web/src/user/user-settings/mfa/MFADevicesPage.ts index ade90d59ed..09d0296abb 100644 --- a/web/src/user/user-settings/mfa/MFADevicesPage.ts +++ b/web/src/user/user-settings/mfa/MFADevicesPage.ts @@ -1,24 +1,26 @@ -import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { globalAK } from "@goauthentik/common/global"; -import { deviceTypeName } from "@goauthentik/common/labels"; -import { SentryIgnoredError } from "@goauthentik/common/sentry"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/buttons/Dropdown"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/TokenCopyButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; -import "@goauthentik/user/user-settings/mfa/MFADeviceForm"; +import "#elements/buttons/Dropdown"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/TokenCopyButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#user/user-settings/mfa/MFADeviceForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; -import { msg, str } from "@lit/localize"; -import { TemplateResult, html, nothing } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { AndNext, DEFAULT_CONFIG } from "#common/api/config"; +import { globalAK } from "#common/global"; +import { deviceTypeName } from "#common/labels"; +import { SentryIgnoredError } from "#common/sentry/index"; +import { formatElapsedTime } from "#common/temporal"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; import { AuthenticatorsApi, Device, UserSetting } from "@goauthentik/api"; +import { msg, str } from "@lit/localize"; +import { html, nothing, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + export const stageToAuthenticatorName = (stage: UserSetting) => stage.title ?? `Invalid stage component ${stage.component}`; diff --git a/web/src/user/user-settings/tokens/UserTokenForm.ts b/web/src/user/user-settings/tokens/UserTokenForm.ts index 76fd28cb2e..05f46721ed 100644 --- a/web/src/user/user-settings/tokens/UserTokenForm.ts +++ b/web/src/user/user-settings/tokens/UserTokenForm.ts @@ -1,15 +1,17 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { dateTimeLocal } from "@goauthentik/common/temporal"; -import "@goauthentik/elements/forms/HorizontalFormElement"; -import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; +import "#elements/forms/HorizontalFormElement"; -import { msg } from "@lit/localize"; -import { TemplateResult, html } from "lit"; -import { customElement, property } from "lit/decorators.js"; -import { ifDefined } from "lit/directives/if-defined.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { dateTimeLocal } from "#common/temporal"; + +import { ModelForm } from "#elements/forms/ModelForm"; import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; +import { msg } from "@lit/localize"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators.js"; +import { ifDefined } from "lit/directives/if-defined.js"; + @customElement("ak-user-token-form") export class UserTokenForm extends ModelForm { @property() diff --git a/web/src/user/user-settings/tokens/UserTokenList.ts b/web/src/user/user-settings/tokens/UserTokenList.ts index 90b2b49941..5dce4b43fa 100644 --- a/web/src/user/user-settings/tokens/UserTokenList.ts +++ b/web/src/user/user-settings/tokens/UserTokenList.ts @@ -1,26 +1,27 @@ -import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; -import { intentToLabel } from "@goauthentik/common/labels"; -import { formatElapsedTime } from "@goauthentik/common/temporal"; -import { me } from "@goauthentik/common/users"; -import "@goauthentik/components/ak-status-label"; -import "@goauthentik/elements/buttons/Dropdown"; -import "@goauthentik/elements/buttons/ModalButton"; -import "@goauthentik/elements/buttons/TokenCopyButton"; -import "@goauthentik/elements/forms/DeleteBulkForm"; -import "@goauthentik/elements/forms/ModalForm"; -import { PaginatedResponse } from "@goauthentik/elements/table/Table"; -import { Table, TableColumn } from "@goauthentik/elements/table/Table"; -import "@goauthentik/user/user-settings/tokens/UserTokenForm"; +import "#components/ak-status-label"; +import "#elements/buttons/Dropdown"; +import "#elements/buttons/ModalButton"; +import "#elements/buttons/TokenCopyButton/index"; +import "#elements/forms/DeleteBulkForm"; +import "#elements/forms/ModalForm"; +import "#user/user-settings/tokens/UserTokenForm"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; +import { DEFAULT_CONFIG } from "#common/api/config"; +import { intentToLabel } from "#common/labels"; +import { formatElapsedTime } from "#common/temporal"; +import { me } from "#common/users"; + +import { PaginatedResponse, Table, TableColumn } from "#elements/table/Table"; + +import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; + import { msg } from "@lit/localize"; -import { CSSResult, TemplateResult, html } from "lit"; +import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; - @customElement("ak-user-token-list") export class UserTokenList extends Table { searchEnabled(): boolean { diff --git a/web/tests/specs/new-application-by-wizard.ts b/web/tests/specs/new-application-by-wizard.ts index 7d00ee7671..233065c13d 100644 --- a/web/tests/specs/new-application-by-wizard.ts +++ b/web/tests/specs/new-application-by-wizard.ts @@ -26,7 +26,7 @@ import { simpleSAMLProviderForm, simpleSCIMProviderForm, } from "./provider-shared-sequences.js"; -import { type TestSequence } from "./shared-sequences"; +import { type TestSequence } from "./shared-sequences.js"; const SUCCESS_MESSAGE = "Your application has been saved"; diff --git a/web/tests/specs/provider-shared-sequences.ts b/web/tests/specs/provider-shared-sequences.ts index d5a8c1de57..8c348622d0 100644 --- a/web/tests/specs/provider-shared-sequences.ts +++ b/web/tests/specs/provider-shared-sequences.ts @@ -1,19 +1,19 @@ import { - type TestProvider, - type TestSequence, checkIsPresent, clickButton, clickToggleGroup, setFormGroup, setRadio, setSearchSelect, - setTextInput, setTextareaInput, + setTextInput, setToggle, setTypeCreate, + type TestProvider, + type TestSequence, } from "pageobjects/controls.js"; -import { ascii_letters, digits, randomString } from "../utils"; +import { ascii_letters, digits, randomString } from "../utils.js"; import { randomId } from "../utils/index.js"; const newObjectName = (prefix: string) => `${prefix} - ${randomId()}`; diff --git a/web/tests/specs/providers.ts b/web/tests/specs/providers.ts index 5d25ed198d..008273bd80 100644 --- a/web/tests/specs/providers.ts +++ b/web/tests/specs/providers.ts @@ -1,6 +1,6 @@ import { expect } from "@wdio/globals"; -import { type TestProvider, type TestSequence } from "../pageobjects/controls"; +import { type TestProvider, type TestSequence } from "../pageobjects/controls.js"; import ProviderWizardView from "../pageobjects/provider-wizard.page.js"; import ProvidersListPage from "../pageobjects/providers-list.page.js"; import { login } from "../utils/login.js"; diff --git a/web/tests/wdio.conf.mjs b/web/tests/wdio.conf.mjs index 8f931ac958..9c774321ce 100644 --- a/web/tests/wdio.conf.mjs +++ b/web/tests/wdio.conf.mjs @@ -3,7 +3,8 @@ * * @see https://webdriver.io/docs/configurationfile.html */ -import { cwd } from "process"; +import { cwd } from "node:process"; + import litCSS from "vite-plugin-lit-css"; import tsconfigPaths from "vite-tsconfig-paths";