From 772048092b3dd9c4b9a8824d09c93dcec5b1e975 Mon Sep 17 00:00:00 2001 From: Ken Sternberg <133134217+kensternberg-authentik@users.noreply.github.com> Date: Thu, 14 Mar 2024 08:49:28 -0700 Subject: [PATCH 1/2] web/admin: fix markdown table rendering (#8908) * web: fix esbuild issue with style sheets Getting ESBuild, Lit, and Storybook to all agree on how to read and parse stylesheets is a serious pain. This fix better identifies the value types (instances) being passed from various sources in the repo to the three *different* kinds of style processors we're using (the native one, the polyfill one, and whatever the heck Storybook does internally). Falling back to using older CSS instantiating techniques one era at a time seems to do the trick. It's ugly, but in the face of the aggressive styling we use to avoid Flashes of Unstyled Content (FLoUC), it's the logic with which we're left. In standard mode, the following warning appears on the console when running a Flow: ``` Autofocus processing was blocked because a document already has a focused element. ``` In compatibility mode, the following **error** appears on the console when running a Flow: ``` crawler-inject.js:1106 Uncaught TypeError: Failed to execute 'observe' on 'MutationObserver': parameter 1 is not of type 'Node'. at initDomMutationObservers (crawler-inject.js:1106:18) at crawler-inject.js:1114:24 at Array.forEach () at initDomMutationObservers (crawler-inject.js:1114:10) at crawler-inject.js:1549:1 initDomMutationObservers @ crawler-inject.js:1106 (anonymous) @ crawler-inject.js:1114 initDomMutationObservers @ crawler-inject.js:1114 (anonymous) @ crawler-inject.js:1549 ``` Despite this error, nothing seems to be broken and flows work as anticipated. * web: fix markdown table rendering "Render Markdown Tables" is not on by default in `snowdown`; this commit activates it. In a "You touched it, now you have to fix it" moment, Sonar has me fixing a little lint along the way. --- web/src/elements/Markdown.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/elements/Markdown.ts b/web/src/elements/Markdown.ts index e0262008de..8471b951e7 100644 --- a/web/src/elements/Markdown.ts +++ b/web/src/elements/Markdown.ts @@ -53,7 +53,7 @@ export class Markdown extends AKElement { ]; } - converter = new showdown.Converter({ metadata: true }); + converter = new showdown.Converter({ metadata: true, tables: true }); replaceAdmonitions(input: string): string { const admonitionStart = /:::(\w+)/gm; @@ -74,13 +74,12 @@ export class Markdown extends AKElement { replaceRelativeLinks(input: string, md: MarkdownDocument): string { const baseName = md.path.replace(isFile, ""); const baseUrl = docLink(""); - const result = input.replace(isRelativeLink, (match, path) => { + return input.replace(isRelativeLink, (_match, path) => { const pathName = path.replace(".md", ""); const link = `docs/${baseName}${pathName}`; const url = new URL(link, baseUrl).toString(); return `href="${url}" _target="blank"`; }); - return result; } willUpdate(properties: PropertyValues) { From 5805ac83f7c69c94d07e52dc239e61b5e8a7f5cb Mon Sep 17 00:00:00 2001 From: Ken Sternberg <133134217+kensternberg-authentik@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:10:42 -0700 Subject: [PATCH 2/2] web: clean up and remove redundant alias '@goauthentik/app' (#8889) * web: fix esbuild issue with style sheets Getting ESBuild, Lit, and Storybook to all agree on how to read and parse stylesheets is a serious pain. This fix better identifies the value types (instances) being passed from various sources in the repo to the three *different* kinds of style processors we're using (the native one, the polyfill one, and whatever the heck Storybook does internally). Falling back to using older CSS instantiating techniques one era at a time seems to do the trick. It's ugly, but in the face of the aggressive styling we use to avoid Flashes of Unstyled Content (FLoUC), it's the logic with which we're left. In standard mode, the following warning appears on the console when running a Flow: ``` Autofocus processing was blocked because a document already has a focused element. ``` In compatibility mode, the following **error** appears on the console when running a Flow: ``` crawler-inject.js:1106 Uncaught TypeError: Failed to execute 'observe' on 'MutationObserver': parameter 1 is not of type 'Node'. at initDomMutationObservers (crawler-inject.js:1106:18) at crawler-inject.js:1114:24 at Array.forEach () at initDomMutationObservers (crawler-inject.js:1114:10) at crawler-inject.js:1549:1 initDomMutationObservers @ crawler-inject.js:1106 (anonymous) @ crawler-inject.js:1114 initDomMutationObservers @ crawler-inject.js:1114 (anonymous) @ crawler-inject.js:1549 ``` Despite this error, nothing seems to be broken and flows work as anticipated. * web: clean up and remove redundant alias '@goauthentik/app' The path alias `@goauthentik/app` has been a thorn in our side for a long time, as it conflicts with or is redundant with all the *other* aliases in `tsconfig.json`, such as `@goauthentik/elements` and `@goauthentik/locales`. This commit *replaces* `@goauthentik/app` with `@goauthentik/authentik` for a single use case: the locale codes file in the project root. That also helps reserve the subproject name `authentik` in case we ever do go the monorepo root. Other than that, all the rest have been removed with the following mechanical refactor: ``` perl -pi.bak -e 's{\@goauthentik/app/}{\@goauthentik/}' $(rg -l '@goauthentik/app/' ./src/) ``` * web: separate the sizing enum from a specific component implementation (#8890) The PFSizes enum is used by more than just the Spinner, but has been left inside the Spinner for all this time, making refactoring the Spinner for Patternfly 5 a little harder (okay, an annoying amount harder) than it should be. This commit moves this UI-specific, widely-use enum into its own folder in `common`, and refactors everything else to use it. As is often the case, the refactor is mechanical: ``` perl -pi.bak -e 's{import \{ PFSize \} from "\@goauthentik/elements/Spinner";}{import \{ PFSize \} from "\@goauthentik/common/enums.js";}' \\ $(rg -l 'import.*PFSize') ``` **Note:** This commit is dependent upon the ["clean up and remove redundant alias `@goauthentik/app`" PR](https://github.com/goauthentik/authentik/pull/8889) --- .../admin-overview/cards/AdminStatusCard.ts | 2 +- .../admin-overview/cards/RecentEventsCard.ts | 2 +- .../admin/admin-settings/AdminSettingsForm.ts | 2 +- .../admin/applications/ApplicationListPage.ts | 2 +- .../admin/applications/ApplicationViewPage.ts | 4 ++-- ...tion-wizard-authentication-method-choice.ts | 2 +- ...ak-application-wizard-commit-application.ts | 2 +- web/src/admin/blueprints/BlueprintListPage.ts | 2 +- .../admin/enterprise/EnterpriseLicenseForm.ts | 2 +- .../enterprise/EnterpriseLicenseListPage.ts | 2 +- web/src/admin/events/EventListPage.ts | 2 +- web/src/admin/events/EventViewPage.ts | 2 +- web/src/admin/events/EventVolumeChart.ts | 4 ++-- web/src/admin/events/utils.ts | 2 +- web/src/admin/flows/FlowViewPage.ts | 4 ++-- web/src/admin/groups/GroupViewPage.ts | 4 ++-- web/src/admin/groups/RelatedUserList.ts | 2 +- web/src/admin/outposts/OutpostForm.ts | 2 +- web/src/admin/outposts/OutpostListPage.ts | 2 +- web/src/admin/policies/BoundPoliciesList.ts | 2 +- .../policies/reputation/ReputationListPage.ts | 2 +- .../property-mappings/PropertyMappingWizard.ts | 2 +- web/src/admin/providers/ProviderWizard.ts | 2 +- .../providers/ldap/LDAPProviderViewPage.ts | 2 +- .../providers/oauth2/OAuth2ProviderViewPage.ts | 2 +- .../providers/proxy/ProxyProviderViewPage.ts | 2 +- web/src/admin/providers/rac/EndpointForm.ts | 2 +- web/src/admin/providers/rac/EndpointList.ts | 2 +- web/src/admin/providers/rac/RACProviderForm.ts | 2 +- .../admin/providers/rac/RACProviderViewPage.ts | 2 +- .../providers/radius/RadiusProviderViewPage.ts | 2 +- .../providers/saml/SAMLProviderViewPage.ts | 4 ++-- .../providers/scim/SCIMProviderViewPage.ts | 2 +- .../RoleAssignedGlobalPermissionsTable.ts | 6 +++--- .../roles/RoleAssignedObjectPermissionTable.ts | 6 +++--- web/src/admin/roles/RoleViewPage.ts | 2 +- .../sources/ldap/LDAPSourceConnectivity.ts | 2 +- .../admin/sources/ldap/LDAPSourceViewPage.ts | 2 +- .../admin/sources/oauth/OAuthSourceViewPage.ts | 2 +- .../admin/sources/plex/PlexSourceViewPage.ts | 2 +- .../admin/sources/saml/SAMLSourceViewPage.ts | 2 +- .../admin/system-tasks/SystemTaskListPage.ts | 4 ++-- web/src/admin/tokens/TokenListPage.ts | 2 +- web/src/admin/users/UserApplicationTable.ts | 10 +++++----- .../UserAssignedGlobalPermissionsTable.ts | 6 +++--- .../UserAssignedObjectPermissionsTable.ts | 6 +++--- web/src/admin/users/UserListPage.ts | 4 ++-- web/src/admin/users/UserViewPage.ts | 18 +++++++++--------- web/src/common/enums.ts | 6 ++++++ web/src/components/DescriptionList.ts | 2 +- web/src/components/ak-app-icon.ts | 4 ++-- web/src/components/ak-event-info.ts | 2 +- web/src/components/ak-hint/ak-hint-actions.ts | 2 +- web/src/components/ak-hint/ak-hint-body.ts | 2 +- web/src/components/ak-hint/ak-hint-footer.ts | 2 +- web/src/components/ak-hint/ak-hint-title.ts | 2 +- web/src/components/ak-hint/ak-hint.ts | 2 +- web/src/components/ak-multi-select.ts | 2 +- web/src/components/ak-wizard-main/AkWizard.ts | 2 +- web/src/components/events/ObjectChangelog.ts | 6 +++--- web/src/components/events/UserEvents.ts | 4 ++-- .../stories/ak-search-select.stories.ts | 2 +- web/src/elements/EmptyState.ts | 2 +- web/src/elements/Interface/Interface.ts | 2 +- web/src/elements/Spinner.ts | 8 +------- .../ak-locale-context/configureLocale.ts | 2 +- web/src/elements/buttons/ModalButton.ts | 2 +- .../buttons/SpinnerButton/BaseTaskButton.ts | 2 +- web/src/elements/cards/AggregatePromiseCard.ts | 2 +- web/src/elements/charts/Chart.ts | 2 +- web/src/elements/forms/DeleteBulkForm.ts | 2 +- web/src/elements/forms/Form.ts | 2 +- .../forms/SearchSelect/ak-search-select.ts | 4 ++-- web/src/elements/forms/helpers.ts | 2 +- .../notifications/NotificationDrawer.ts | 2 +- web/src/elements/oauth/UserAccessTokenList.ts | 2 +- web/src/elements/oauth/UserRefreshTokenList.ts | 2 +- web/src/elements/rbac/ObjectPermissionModal.ts | 2 +- web/src/elements/rbac/ObjectPermissionsPage.ts | 14 +++++++------- web/src/elements/rbac/PermissionSelectModal.ts | 2 +- .../elements/rbac/RoleObjectPermissionTable.ts | 4 ++-- .../elements/rbac/UserObjectPermissionTable.ts | 4 ++-- web/src/elements/table/Table.ts | 2 +- web/src/elements/table/TableModal.ts | 2 +- web/src/elements/user/SessionList.ts | 2 +- web/src/elements/user/UserConsentList.ts | 2 +- .../elements/user/sources/SourceSettings.ts | 8 ++++---- .../user/sources/SourceSettingsOAuth.ts | 2 +- .../user/sources/SourceSettingsPlex.ts | 2 +- .../user/sources/SourceSettingsSAML.ts | 2 +- web/src/enterprise/rac/index.ts | 2 +- .../AuthenticatorValidateStageCode.ts | 2 +- .../AuthenticatorValidateStageDuo.ts | 2 +- .../AuthenticatorValidateStageWebAuthn.ts | 2 +- .../flow/stages/authenticator_validate/base.ts | 6 +----- web/src/flow/stages/captcha/CaptchaStage.ts | 2 +- .../identification/IdentificationStage.ts | 2 +- web/src/stories/flow-interface.ts | 2 +- web/src/stories/interface.ts | 2 +- .../RACLaunchEndpointModal.ts | 6 +++--- web/src/user/LibraryApplication/index.ts | 2 +- web/src/user/user-settings/UserSettingsPage.ts | 2 +- .../user/user-settings/tokens/UserTokenList.ts | 2 +- web/tsconfig.json | 2 +- 104 files changed, 154 insertions(+), 158 deletions(-) create mode 100644 web/src/common/enums.ts diff --git a/web/src/admin/admin-overview/cards/AdminStatusCard.ts b/web/src/admin/admin-overview/cards/AdminStatusCard.ts index d20f5d570d..ef9f9882d2 100644 --- a/web/src/admin/admin-overview/cards/AdminStatusCard.ts +++ b/web/src/admin/admin-overview/cards/AdminStatusCard.ts @@ -1,5 +1,5 @@ import { EVENT_REFRESH } from "@goauthentik/common/constants"; -import { PFSize } from "@goauthentik/elements/Spinner"; +import { PFSize } from "@goauthentik/common/enums.js"; import { AggregateCard } from "@goauthentik/elements/cards/AggregateCard"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/admin-overview/cards/RecentEventsCard.ts b/web/src/admin/admin-overview/cards/RecentEventsCard.ts index cbbf4382eb..a67910fffe 100644 --- a/web/src/admin/admin-overview/cards/RecentEventsCard.ts +++ b/web/src/admin/admin-overview/cards/RecentEventsCard.ts @@ -1,8 +1,8 @@ import { EventGeo, EventUser } from "@goauthentik/admin/events/utils"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EventWithContext } from "@goauthentik/common/events"; import { actionToLabel } from "@goauthentik/common/labels"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-event-info"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/Dropdown"; diff --git a/web/src/admin/admin-settings/AdminSettingsForm.ts b/web/src/admin/admin-settings/AdminSettingsForm.ts index c1af0fb068..62b9161827 100644 --- a/web/src/admin/admin-settings/AdminSettingsForm.ts +++ b/web/src/admin/admin-settings/AdminSettingsForm.ts @@ -1,5 +1,5 @@ -import { first } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { first } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-switch-input"; import "@goauthentik/components/ak-text-input"; import "@goauthentik/elements/CodeMirror"; diff --git a/web/src/admin/applications/ApplicationListPage.ts b/web/src/admin/applications/ApplicationListPage.ts index 5a50b97d40..84718ef2f0 100644 --- a/web/src/admin/applications/ApplicationListPage.ts +++ b/web/src/admin/applications/ApplicationListPage.ts @@ -1,6 +1,6 @@ import "@goauthentik/admin/applications/ApplicationForm"; -import { PFSize } from "@goauthentik/app/elements/Spinner"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { PFSize } from "@goauthentik/common/enums.js"; import { uiConfig } from "@goauthentik/common/ui/config"; import "@goauthentik/components/ak-app-icon"; import MDApplication from "@goauthentik/docs/applications/index.md"; diff --git a/web/src/admin/applications/ApplicationViewPage.ts b/web/src/admin/applications/ApplicationViewPage.ts index a2626a9f0b..19db71df55 100644 --- a/web/src/admin/applications/ApplicationViewPage.ts +++ b/web/src/admin/applications/ApplicationViewPage.ts @@ -2,9 +2,8 @@ import "@goauthentik/admin/applications/ApplicationAuthorizeChart"; import "@goauthentik/admin/applications/ApplicationCheckAccessForm"; import "@goauthentik/admin/applications/ApplicationForm"; import "@goauthentik/admin/policies/BoundPoliciesList"; -import { PFSize } from "@goauthentik/app/elements/Spinner"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { PFSize } from "@goauthentik/common/enums.js"; import "@goauthentik/components/ak-app-icon"; import "@goauthentik/components/events/ObjectChangelog"; import { AKElement } from "@goauthentik/elements/Base"; @@ -12,6 +11,7 @@ import "@goauthentik/elements/EmptyState"; import "@goauthentik/elements/PageHeader"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/SpinnerButton"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; diff --git a/web/src/admin/applications/wizard/auth-method-choice/ak-application-wizard-authentication-method-choice.ts b/web/src/admin/applications/wizard/auth-method-choice/ak-application-wizard-authentication-method-choice.ts index 0f107d3123..ff8196240b 100644 --- a/web/src/admin/applications/wizard/auth-method-choice/ak-application-wizard-authentication-method-choice.ts +++ b/web/src/admin/applications/wizard/auth-method-choice/ak-application-wizard-authentication-method-choice.ts @@ -1,7 +1,7 @@ -import { WithLicenseSummary } from "@goauthentik/app/elements/Interface/licenseSummaryProvider"; import "@goauthentik/components/ak-radio-input"; import "@goauthentik/components/ak-switch-input"; import "@goauthentik/components/ak-text-input"; +import { WithLicenseSummary } from "@goauthentik/elements/Interface/licenseSummaryProvider"; import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/HorizontalFormElement"; diff --git a/web/src/admin/applications/wizard/commit/ak-application-wizard-commit-application.ts b/web/src/admin/applications/wizard/commit/ak-application-wizard-commit-application.ts index 2258aa7b27..3122830171 100644 --- a/web/src/admin/applications/wizard/commit/ak-application-wizard-commit-application.ts +++ b/web/src/admin/applications/wizard/commit/ak-application-wizard-commit-application.ts @@ -1,5 +1,5 @@ -import { EVENT_REFRESH } from "@goauthentik/app/common/constants"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/ak-radio-input"; import "@goauthentik/components/ak-switch-input"; import "@goauthentik/components/ak-text-input"; diff --git a/web/src/admin/blueprints/BlueprintListPage.ts b/web/src/admin/blueprints/BlueprintListPage.ts index 80b751d8af..6eb24aa2ee 100644 --- a/web/src/admin/blueprints/BlueprintListPage.ts +++ b/web/src/admin/blueprints/BlueprintListPage.ts @@ -1,8 +1,8 @@ import "@goauthentik/admin/blueprints/BlueprintForm"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-status-label"; import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/SpinnerButton"; diff --git a/web/src/admin/enterprise/EnterpriseLicenseForm.ts b/web/src/admin/enterprise/EnterpriseLicenseForm.ts index 466a96aa71..025df416b1 100644 --- a/web/src/admin/enterprise/EnterpriseLicenseForm.ts +++ b/web/src/admin/enterprise/EnterpriseLicenseForm.ts @@ -1,5 +1,5 @@ -import { EVENT_REFRESH_ENTERPRISE } from "@goauthentik/app/common/constants"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { EVENT_REFRESH_ENTERPRISE } from "@goauthentik/common/constants"; import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/HorizontalFormElement"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; diff --git a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts index 4949e193bc..2985e109c6 100644 --- a/web/src/admin/enterprise/EnterpriseLicenseListPage.ts +++ b/web/src/admin/enterprise/EnterpriseLicenseListPage.ts @@ -1,7 +1,7 @@ import "@goauthentik/admin/enterprise/EnterpriseLicenseForm"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import { PFColor } from "@goauthentik/elements/Label"; import "@goauthentik/elements/Spinner"; import "@goauthentik/elements/buttons/SpinnerButton"; diff --git a/web/src/admin/events/EventListPage.ts b/web/src/admin/events/EventListPage.ts index 9e70ac262d..b69adfbfb0 100644 --- a/web/src/admin/events/EventListPage.ts +++ b/web/src/admin/events/EventListPage.ts @@ -1,10 +1,10 @@ import "@goauthentik/admin/events/EventVolumeChart"; import { EventGeo, EventUser } from "@goauthentik/admin/events/utils"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EventWithContext } from "@goauthentik/common/events"; import { actionToLabel } from "@goauthentik/common/labels"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-event-info"; import { PaginatedResponse } from "@goauthentik/elements/table/Table"; import { TableColumn } from "@goauthentik/elements/table/Table"; diff --git a/web/src/admin/events/EventViewPage.ts b/web/src/admin/events/EventViewPage.ts index 616f1a530b..f50eb6012c 100644 --- a/web/src/admin/events/EventViewPage.ts +++ b/web/src/admin/events/EventViewPage.ts @@ -1,8 +1,8 @@ import { EventGeo, EventUser } from "@goauthentik/admin/events/utils"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EventWithContext } from "@goauthentik/common/events"; import { actionToLabel } from "@goauthentik/common/labels"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-event-info"; import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/PageHeader"; diff --git a/web/src/admin/events/EventVolumeChart.ts b/web/src/admin/events/EventVolumeChart.ts index da1710af02..623aa03456 100644 --- a/web/src/admin/events/EventVolumeChart.ts +++ b/web/src/admin/events/EventVolumeChart.ts @@ -1,5 +1,5 @@ -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { AKChart } from "@goauthentik/app/elements/charts/Chart"; +import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { AKChart } from "@goauthentik/elements/charts/Chart"; import { ChartData } from "chart.js"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/events/utils.ts b/web/src/admin/events/utils.ts index ac41a10294..89999d39d6 100644 --- a/web/src/admin/events/utils.ts +++ b/web/src/admin/events/utils.ts @@ -1,5 +1,5 @@ -import { truncate } from "@goauthentik/app/common/utils"; import { EventWithContext } from "@goauthentik/common/events"; +import { truncate } from "@goauthentik/common/utils"; import { KeyUnknown } from "@goauthentik/elements/forms/Form"; import { msg, str } from "@lit/localize"; diff --git a/web/src/admin/flows/FlowViewPage.ts b/web/src/admin/flows/FlowViewPage.ts index 27d3274a4a..e7c42c1d6c 100644 --- a/web/src/admin/flows/FlowViewPage.ts +++ b/web/src/admin/flows/FlowViewPage.ts @@ -1,15 +1,15 @@ import "@goauthentik/admin/flows/BoundStagesList"; import "@goauthentik/admin/flows/FlowDiagram"; import "@goauthentik/admin/flows/FlowForm"; +import { DesignationToLabel } from "@goauthentik/admin/flows/utils"; import "@goauthentik/admin/policies/BoundPoliciesList"; -import { DesignationToLabel } from "@goauthentik/app/admin/flows/utils"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import "@goauthentik/components/events/ObjectChangelog"; import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/PageHeader"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/SpinnerButton"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, PropertyValues, TemplateResult, css, html } from "lit"; diff --git a/web/src/admin/groups/GroupViewPage.ts b/web/src/admin/groups/GroupViewPage.ts index cd95a14e35..f7d5ac3974 100644 --- a/web/src/admin/groups/GroupViewPage.ts +++ b/web/src/admin/groups/GroupViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/groups/GroupForm"; -import "@goauthentik/app/admin/groups/RelatedUserList"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; +import "@goauthentik/admin/groups/RelatedUserList"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/ak-status-label"; @@ -12,6 +11,7 @@ import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/ModalForm"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg, str } from "@lit/localize"; import { CSSResult, TemplateResult, html } from "lit"; diff --git a/web/src/admin/groups/RelatedUserList.ts b/web/src/admin/groups/RelatedUserList.ts index 933e80c595..bbd0cfddc9 100644 --- a/web/src/admin/groups/RelatedUserList.ts +++ b/web/src/admin/groups/RelatedUserList.ts @@ -3,10 +3,10 @@ import "@goauthentik/admin/users/UserActiveForm"; import "@goauthentik/admin/users/UserForm"; import "@goauthentik/admin/users/UserPasswordForm"; import "@goauthentik/admin/users/UserResetEmailForm"; -import { me } from "@goauthentik/app/common/users"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { MessageLevel } from "@goauthentik/common/messages"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { me } from "@goauthentik/common/users"; import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-status-label"; import { WithBrandConfig } from "@goauthentik/elements/Interface/brandProvider"; diff --git a/web/src/admin/outposts/OutpostForm.ts b/web/src/admin/outposts/OutpostForm.ts index eeae589233..d5791caded 100644 --- a/web/src/admin/outposts/OutpostForm.ts +++ b/web/src/admin/outposts/OutpostForm.ts @@ -1,10 +1,10 @@ -import { DataProvider, DualSelectPair } from "@goauthentik/app/elements/ak-dual-select/types"; 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"; diff --git a/web/src/admin/outposts/OutpostListPage.ts b/web/src/admin/outposts/OutpostListPage.ts index f583171a3c..5928e5ebb0 100644 --- a/web/src/admin/outposts/OutpostListPage.ts +++ b/web/src/admin/outposts/OutpostListPage.ts @@ -4,9 +4,9 @@ import "@goauthentik/admin/outposts/OutpostForm"; import "@goauthentik/admin/outposts/OutpostHealth"; import "@goauthentik/admin/outposts/OutpostHealthSimple"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { PFSize } from "@goauthentik/common/enums.js"; import { uiConfig } from "@goauthentik/common/ui/config"; import { PFColor } from "@goauthentik/elements/Label"; -import { PFSize } from "@goauthentik/elements/Spinner"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/ModalForm"; diff --git a/web/src/admin/policies/BoundPoliciesList.ts b/web/src/admin/policies/BoundPoliciesList.ts index 217e088e0d..b245f61d77 100644 --- a/web/src/admin/policies/BoundPoliciesList.ts +++ b/web/src/admin/policies/BoundPoliciesList.ts @@ -3,9 +3,9 @@ import "@goauthentik/admin/policies/PolicyBindingForm"; import "@goauthentik/admin/policies/PolicyWizard"; import "@goauthentik/admin/users/UserForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { PFSize } from "@goauthentik/common/enums.js"; import { uiConfig } from "@goauthentik/common/ui/config"; import "@goauthentik/components/ak-status-label"; -import { PFSize } from "@goauthentik/elements/Spinner"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/ModalForm"; diff --git a/web/src/admin/policies/reputation/ReputationListPage.ts b/web/src/admin/policies/reputation/ReputationListPage.ts index ab7ae28b79..719f7b81e7 100644 --- a/web/src/admin/policies/reputation/ReputationListPage.ts +++ b/web/src/admin/policies/reputation/ReputationListPage.ts @@ -1,6 +1,6 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/DeleteBulkForm"; diff --git a/web/src/admin/property-mappings/PropertyMappingWizard.ts b/web/src/admin/property-mappings/PropertyMappingWizard.ts index d591e56c9b..8a03bab2e4 100644 --- a/web/src/admin/property-mappings/PropertyMappingWizard.ts +++ b/web/src/admin/property-mappings/PropertyMappingWizard.ts @@ -5,10 +5,10 @@ import "@goauthentik/admin/property-mappings/PropertyMappingRACForm"; import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm"; import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm"; import "@goauthentik/admin/property-mappings/PropertyMappingTestForm"; -import { WithLicenseSummary } from "@goauthentik/app/elements/Interface/licenseSummaryProvider"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import "@goauthentik/elements/Alert"; import { AKElement } from "@goauthentik/elements/Base"; +import { WithLicenseSummary } from "@goauthentik/elements/Interface/licenseSummaryProvider"; import "@goauthentik/elements/forms/ProxyForm"; import "@goauthentik/elements/wizard/FormWizardPage"; import "@goauthentik/elements/wizard/Wizard"; diff --git a/web/src/admin/providers/ProviderWizard.ts b/web/src/admin/providers/ProviderWizard.ts index ca80f995ee..98bd95e6eb 100644 --- a/web/src/admin/providers/ProviderWizard.ts +++ b/web/src/admin/providers/ProviderWizard.ts @@ -4,10 +4,10 @@ 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 { WithLicenseSummary } from "@goauthentik/app/elements/Interface/licenseSummaryProvider"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import "@goauthentik/elements/Alert"; import { AKElement } from "@goauthentik/elements/Base"; +import { WithLicenseSummary } from "@goauthentik/elements/Interface/licenseSummaryProvider"; import "@goauthentik/elements/forms/ProxyForm"; import { paramURL } from "@goauthentik/elements/router/RouterOutlet"; import "@goauthentik/elements/wizard/FormWizardPage"; diff --git a/web/src/admin/providers/ldap/LDAPProviderViewPage.ts b/web/src/admin/providers/ldap/LDAPProviderViewPage.ts index 908b3cd12f..39c77166e3 100644 --- a/web/src/admin/providers/ldap/LDAPProviderViewPage.ts +++ b/web/src/admin/providers/ldap/LDAPProviderViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/providers/RelatedApplicationButton"; import "@goauthentik/admin/providers/ldap/LDAPProviderForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import { me } from "@goauthentik/common/users"; @@ -10,6 +9,7 @@ import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; diff --git a/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts b/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts index 5a84ca2eab..337f11be85 100644 --- a/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts +++ b/web/src/admin/providers/oauth2/OAuth2ProviderViewPage.ts @@ -1,8 +1,8 @@ import "@goauthentik/admin/providers/RelatedApplicationButton"; import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm"; -import renderDescriptionList from "@goauthentik/app/components/DescriptionList"; 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 MDProviderOAuth2 from "@goauthentik/docs/providers/oauth2/index.md"; import { AKElement } from "@goauthentik/elements/Base"; diff --git a/web/src/admin/providers/proxy/ProxyProviderViewPage.ts b/web/src/admin/providers/proxy/ProxyProviderViewPage.ts index 9f7419997b..e4488af237 100644 --- a/web/src/admin/providers/proxy/ProxyProviderViewPage.ts +++ b/web/src/admin/providers/proxy/ProxyProviderViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/providers/RelatedApplicationButton"; import "@goauthentik/admin/providers/proxy/ProxyProviderForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import { convertToSlug } from "@goauthentik/common/utils"; @@ -22,6 +21,7 @@ import { Replacer } from "@goauthentik/elements/Markdown"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { getURLParam } from "@goauthentik/elements/router/RouteMatch"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/providers/rac/EndpointForm.ts b/web/src/admin/providers/rac/EndpointForm.ts index 89545465fd..c14feee462 100644 --- a/web/src/admin/providers/rac/EndpointForm.ts +++ b/web/src/admin/providers/rac/EndpointForm.ts @@ -1,5 +1,5 @@ -import { first } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { first } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-radio-input"; import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/FormGroup"; diff --git a/web/src/admin/providers/rac/EndpointList.ts b/web/src/admin/providers/rac/EndpointList.ts index 06a8b542d7..fb17887875 100644 --- a/web/src/admin/providers/rac/EndpointList.ts +++ b/web/src/admin/providers/rac/EndpointList.ts @@ -1,5 +1,5 @@ import "@goauthentik/admin/policies/BoundPoliciesList"; -import "@goauthentik/app/admin/providers/rac/EndpointForm"; +import "@goauthentik/admin/providers/rac/EndpointForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; import "@goauthentik/elements/buttons/SpinnerButton"; diff --git a/web/src/admin/providers/rac/RACProviderForm.ts b/web/src/admin/providers/rac/RACProviderForm.ts index ec9c6477d3..be8de96376 100644 --- a/web/src/admin/providers/rac/RACProviderForm.ts +++ b/web/src/admin/providers/rac/RACProviderForm.ts @@ -1,7 +1,7 @@ import "@goauthentik/admin/common/ak-crypto-certificate-search"; import "@goauthentik/admin/common/ak-flow-search/ak-branded-flow-search"; -import { first } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { first } from "@goauthentik/common/utils"; import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/HorizontalFormElement"; diff --git a/web/src/admin/providers/rac/RACProviderViewPage.ts b/web/src/admin/providers/rac/RACProviderViewPage.ts index c91adf42ce..d7d1e1ba38 100644 --- a/web/src/admin/providers/rac/RACProviderViewPage.ts +++ b/web/src/admin/providers/rac/RACProviderViewPage.ts @@ -3,7 +3,6 @@ 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/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/ak-status-label"; @@ -13,6 +12,7 @@ import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; diff --git a/web/src/admin/providers/radius/RadiusProviderViewPage.ts b/web/src/admin/providers/radius/RadiusProviderViewPage.ts index 5080cd4f9a..c4d90fdf27 100644 --- a/web/src/admin/providers/radius/RadiusProviderViewPage.ts +++ b/web/src/admin/providers/radius/RadiusProviderViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/providers/RelatedApplicationButton"; import "@goauthentik/admin/providers/radius/RadiusProviderForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/events/ObjectChangelog"; @@ -9,6 +8,7 @@ import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; diff --git a/web/src/admin/providers/saml/SAMLProviderViewPage.ts b/web/src/admin/providers/saml/SAMLProviderViewPage.ts index 39e79d3d72..dd00547b12 100644 --- a/web/src/admin/providers/saml/SAMLProviderViewPage.ts +++ b/web/src/admin/providers/saml/SAMLProviderViewPage.ts @@ -1,10 +1,9 @@ import "@goauthentik/admin/providers/RelatedApplicationButton"; import "@goauthentik/admin/providers/saml/SAMLProviderForm"; -import renderDescriptionList from "@goauthentik/app/components/DescriptionList"; -import "@goauthentik/app/elements/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"; @@ -15,6 +14,7 @@ import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton"; import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; diff --git a/web/src/admin/providers/scim/SCIMProviderViewPage.ts b/web/src/admin/providers/scim/SCIMProviderViewPage.ts index 56cc0aecb4..2737172481 100644 --- a/web/src/admin/providers/scim/SCIMProviderViewPage.ts +++ b/web/src/admin/providers/scim/SCIMProviderViewPage.ts @@ -1,5 +1,4 @@ import "@goauthentik/admin/providers/scim/SCIMProviderForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/events/ObjectChangelog"; @@ -9,6 +8,7 @@ import "@goauthentik/elements/Markdown"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/ModalButton"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg, str } from "@lit/localize"; import { CSSResult, PropertyValues, TemplateResult, html } from "lit"; diff --git a/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts b/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts index 6b260e8934..4a37c303b7 100644 --- a/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts +++ b/web/src/admin/roles/RoleAssignedGlobalPermissionsTable.ts @@ -1,8 +1,8 @@ import "@goauthentik/admin/roles/RolePermissionForm"; -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { groupBy } from "@goauthentik/app/common/utils"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/app/elements/table/Table"; +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 { msg } from "@lit/localize"; import { TemplateResult, html } from "lit"; diff --git a/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts b/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts index 68c9fe681e..fc5ec727dc 100644 --- a/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts +++ b/web/src/admin/roles/RoleAssignedObjectPermissionTable.ts @@ -1,7 +1,7 @@ -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { groupBy } from "@goauthentik/app/common/utils"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/app/elements/table/Table"; +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 "@patternfly/elements/pf-tooltip/pf-tooltip.js"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/roles/RoleViewPage.ts b/web/src/admin/roles/RoleViewPage.ts index 9c21742bf3..10622f7294 100644 --- a/web/src/admin/roles/RoleViewPage.ts +++ b/web/src/admin/roles/RoleViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/groups/RelatedGroupList"; import "@goauthentik/admin/roles/RoleForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import { renderDescriptionList } from "@goauthentik/components/DescriptionList"; @@ -10,6 +9,7 @@ import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/PageHeader"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/forms/ModalForm"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg, str } from "@lit/localize"; import { css, html, nothing } from "lit"; diff --git a/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts b/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts index 34cdc2ffe2..2440a68609 100644 --- a/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts +++ b/web/src/admin/sources/ldap/LDAPSourceConnectivity.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/app/elements/Base"; +import { AKElement } from "@goauthentik/elements/Base"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/sources/ldap/LDAPSourceViewPage.ts b/web/src/admin/sources/ldap/LDAPSourceViewPage.ts index f38b3fcb86..cc2bf48b5a 100644 --- a/web/src/admin/sources/ldap/LDAPSourceViewPage.ts +++ b/web/src/admin/sources/ldap/LDAPSourceViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/sources/ldap/LDAPSourceConnectivity"; import "@goauthentik/admin/sources/ldap/LDAPSourceForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/events/ObjectChangelog"; @@ -10,6 +9,7 @@ import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/ModalForm"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg, str } from "@lit/localize"; import { CSSResult, TemplateResult, html } from "lit"; diff --git a/web/src/admin/sources/oauth/OAuthSourceViewPage.ts b/web/src/admin/sources/oauth/OAuthSourceViewPage.ts index df544acb24..0d4d1035d1 100644 --- a/web/src/admin/sources/oauth/OAuthSourceViewPage.ts +++ b/web/src/admin/sources/oauth/OAuthSourceViewPage.ts @@ -1,7 +1,6 @@ import "@goauthentik/admin/policies/BoundPoliciesList"; import "@goauthentik/admin/sources/oauth/OAuthSourceDiagram"; import "@goauthentik/admin/sources/oauth/OAuthSourceForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/events/ObjectChangelog"; @@ -10,6 +9,7 @@ import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/ModalForm"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, TemplateResult, html } from "lit"; diff --git a/web/src/admin/sources/plex/PlexSourceViewPage.ts b/web/src/admin/sources/plex/PlexSourceViewPage.ts index 88287a8b2f..a1bf00c4bb 100644 --- a/web/src/admin/sources/plex/PlexSourceViewPage.ts +++ b/web/src/admin/sources/plex/PlexSourceViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/policies/BoundPoliciesList"; import "@goauthentik/admin/sources/plex/PlexSourceForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/events/ObjectChangelog"; @@ -9,6 +8,7 @@ import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/ModalForm"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, TemplateResult, html } from "lit"; diff --git a/web/src/admin/sources/saml/SAMLSourceViewPage.ts b/web/src/admin/sources/saml/SAMLSourceViewPage.ts index 61abaf5946..4f5d39e104 100644 --- a/web/src/admin/sources/saml/SAMLSourceViewPage.ts +++ b/web/src/admin/sources/saml/SAMLSourceViewPage.ts @@ -1,6 +1,5 @@ import "@goauthentik/admin/policies/BoundPoliciesList"; import "@goauthentik/admin/sources/saml/SAMLSourceForm"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import "@goauthentik/components/events/ObjectChangelog"; @@ -10,6 +9,7 @@ import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/ModalForm"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import { msg } from "@lit/localize"; import { CSSResult, TemplateResult, html } from "lit"; diff --git a/web/src/admin/system-tasks/SystemTaskListPage.ts b/web/src/admin/system-tasks/SystemTaskListPage.ts index 94ab673045..b2c9044b8f 100644 --- a/web/src/admin/system-tasks/SystemTaskListPage.ts +++ b/web/src/admin/system-tasks/SystemTaskListPage.ts @@ -1,7 +1,7 @@ -import { uiConfig } from "@goauthentik/app/common/ui/config"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; +import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import { PFColor } from "@goauthentik/elements/Label"; import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/SpinnerButton"; diff --git a/web/src/admin/tokens/TokenListPage.ts b/web/src/admin/tokens/TokenListPage.ts index 21113e8e30..65a90bcfab 100644 --- a/web/src/admin/tokens/TokenListPage.ts +++ b/web/src/admin/tokens/TokenListPage.ts @@ -1,8 +1,8 @@ import "@goauthentik/admin/tokens/TokenForm"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { intentToLabel } from "@goauthentik/common/labels"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-status-label"; import "@goauthentik/elements/buttons/Dropdown"; import "@goauthentik/elements/buttons/TokenCopyButton"; diff --git a/web/src/admin/users/UserApplicationTable.ts b/web/src/admin/users/UserApplicationTable.ts index c86e53d78b..c5af92624d 100644 --- a/web/src/admin/users/UserApplicationTable.ts +++ b/web/src/admin/users/UserApplicationTable.ts @@ -1,9 +1,9 @@ -import { applicationListStyle } from "@goauthentik/app/admin/applications/ApplicationListPage"; -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { uiConfig } from "@goauthentik/app/common/ui/config"; -import { PFSize } from "@goauthentik/app/elements/Spinner"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/app/elements/table/Table"; +import { applicationListStyle } from "@goauthentik/admin/applications/ApplicationListPage"; +import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { PFSize } from "@goauthentik/common/enums.js"; +import { uiConfig } from "@goauthentik/common/ui/config"; import "@goauthentik/components/ak-app-icon"; +import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts b/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts index 5dfb9abe32..0cc81567ae 100644 --- a/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts +++ b/web/src/admin/users/UserAssignedGlobalPermissionsTable.ts @@ -1,9 +1,9 @@ import "@goauthentik/admin/users/UserPermissionForm"; -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { groupBy } from "@goauthentik/app/common/utils"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/app/elements/table/Table"; +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 "@patternfly/elements/pf-tooltip/pf-tooltip.js"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/users/UserAssignedObjectPermissionsTable.ts b/web/src/admin/users/UserAssignedObjectPermissionsTable.ts index 74cd035f31..4e65a71e4e 100644 --- a/web/src/admin/users/UserAssignedObjectPermissionsTable.ts +++ b/web/src/admin/users/UserAssignedObjectPermissionsTable.ts @@ -1,7 +1,7 @@ -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { groupBy } from "@goauthentik/app/common/utils"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/app/elements/table/Table"; +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 "@patternfly/elements/pf-tooltip/pf-tooltip.js"; import { msg } from "@lit/localize"; diff --git a/web/src/admin/users/UserListPage.ts b/web/src/admin/users/UserListPage.ts index 28d269228e..42951e09de 100644 --- a/web/src/admin/users/UserListPage.ts +++ b/web/src/admin/users/UserListPage.ts @@ -4,11 +4,12 @@ import "@goauthentik/admin/users/UserActiveForm"; import "@goauthentik/admin/users/UserForm"; import "@goauthentik/admin/users/UserPasswordForm"; import "@goauthentik/admin/users/UserResetEmailForm"; -import { me } from "@goauthentik/app/common/users"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { PFSize } from "@goauthentik/common/enums.js"; import { userTypeToLabel } from "@goauthentik/common/labels"; import { MessageLevel } from "@goauthentik/common/messages"; import { DefaultUIConfig, uiConfig } from "@goauthentik/common/ui/config"; +import { me } from "@goauthentik/common/users"; import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-status-label"; import { rootInterface } from "@goauthentik/elements/Base"; @@ -17,7 +18,6 @@ import { CapabilitiesEnum, WithCapabilitiesConfig, } from "@goauthentik/elements/Interface/capabilitiesProvider"; -import { PFSize } from "@goauthentik/elements/Spinner"; import "@goauthentik/elements/TreeView"; import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/forms/DeleteBulkForm"; diff --git a/web/src/admin/users/UserViewPage.ts b/web/src/admin/users/UserViewPage.ts index 7feb88f9cf..f5188d12be 100644 --- a/web/src/admin/users/UserViewPage.ts +++ b/web/src/admin/users/UserViewPage.ts @@ -4,20 +4,17 @@ import "@goauthentik/admin/users/UserActiveForm"; import "@goauthentik/admin/users/UserApplicationTable"; import "@goauthentik/admin/users/UserChart"; import "@goauthentik/admin/users/UserForm"; -import "@goauthentik/admin/users/UserPasswordForm"; import { renderRecoveryEmailRequest, requestRecoveryLink, -} from "@goauthentik/app/admin/users/UserListPage"; -import { me } from "@goauthentik/app/common/users"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; -import "@goauthentik/app/elements/oauth/UserAccessTokenList"; -import "@goauthentik/app/elements/oauth/UserRefreshTokenList"; -import "@goauthentik/app/elements/rbac/ObjectPermissionsPage"; -import "@goauthentik/app/elements/user/sources/SourceSettings"; +} from "@goauthentik/admin/users/UserListPage"; +import "@goauthentik/admin/users/UserPasswordForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; +import { PFSize } from "@goauthentik/common/enums.js"; import { userTypeToLabel } from "@goauthentik/common/labels"; +import { me } from "@goauthentik/common/users"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/DescriptionList"; import { type DescriptionPair, @@ -30,13 +27,16 @@ import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/CodeMirror"; import { WithCapabilitiesConfig } from "@goauthentik/elements/Interface/capabilitiesProvider"; import "@goauthentik/elements/PageHeader"; -import { PFSize } from "@goauthentik/elements/Spinner"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/ModalForm"; +import "@goauthentik/elements/oauth/UserAccessTokenList"; +import "@goauthentik/elements/oauth/UserRefreshTokenList"; +import "@goauthentik/elements/rbac/ObjectPermissionsPage"; import "@goauthentik/elements/user/SessionList"; import "@goauthentik/elements/user/UserConsentList"; +import "@goauthentik/elements/user/sources/SourceSettings"; import { msg, str } from "@lit/localize"; import { TemplateResult, css, html, nothing } from "lit"; diff --git a/web/src/common/enums.ts b/web/src/common/enums.ts new file mode 100644 index 0000000000..5087054228 --- /dev/null +++ b/web/src/common/enums.ts @@ -0,0 +1,6 @@ +export enum PFSize { + Small = "pf-m-sm", + Medium = "pf-m-md", + Large = "pf-m-lg", + XLarge = "pf-m-xl", +} diff --git a/web/src/components/DescriptionList.ts b/web/src/components/DescriptionList.ts index efac7e6e28..31dfc1416d 100644 --- a/web/src/components/DescriptionList.ts +++ b/web/src/components/DescriptionList.ts @@ -1,4 +1,4 @@ -import { first } from "@goauthentik/app/common/utils"; +import { first } from "@goauthentik/common/utils"; import { TemplateResult, html, nothing } from "lit"; import { classMap } from "lit/directives/class-map.js"; diff --git a/web/src/components/ak-app-icon.ts b/web/src/components/ak-app-icon.ts index fcdb9d8930..7237ffc914 100644 --- a/web/src/components/ak-app-icon.ts +++ b/web/src/components/ak-app-icon.ts @@ -1,5 +1,5 @@ -import { AKElement } from "@goauthentik/app/elements/Base"; -import { PFSize } from "@goauthentik/app/elements/Spinner"; +import { PFSize } from "@goauthentik/common/enums.js"; +import { AKElement } from "@goauthentik/elements/Base"; import { msg } from "@lit/localize"; import { CSSResult, TemplateResult, css, html } from "lit"; diff --git a/web/src/components/ak-event-info.ts b/web/src/components/ak-event-info.ts index 7283f1fbbc..1de1b7339c 100644 --- a/web/src/components/ak-event-info.ts +++ b/web/src/components/ak-event-info.ts @@ -1,10 +1,10 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { VERSION } from "@goauthentik/common/constants"; +import { PFSize } from "@goauthentik/common/enums.js"; import { EventContext, EventModel, EventWithContext } from "@goauthentik/common/events"; import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/Expand"; import "@goauthentik/elements/Spinner"; -import { PFSize } from "@goauthentik/elements/Spinner"; import { msg, str } from "@lit/localize"; import { CSSResult, TemplateResult, css, html } from "lit"; diff --git a/web/src/components/ak-hint/ak-hint-actions.ts b/web/src/components/ak-hint/ak-hint-actions.ts index 8af341965b..eaf33b2f8e 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/app/elements/Base"; +import { AKElement } from "@goauthentik/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 f5c122eb50..4261c0a302 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/app/elements/Base"; +import { AKElement } from "@goauthentik/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 a08197d114..14461a814e 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/app/elements/Base"; +import { AKElement } from "@goauthentik/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 accc881d0a..abcb9d596c 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/app/elements/Base"; +import { AKElement } from "@goauthentik/elements/Base"; import { css, html } from "lit"; import { customElement } from "lit/decorators.js"; diff --git a/web/src/components/ak-hint/ak-hint.ts b/web/src/components/ak-hint/ak-hint.ts index 731dbe0ca0..b818fae20d 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/app/elements/Base"; +import { AKElement } from "@goauthentik/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 9efddd079e..c7b9601a33 100644 --- a/web/src/components/ak-multi-select.ts +++ b/web/src/components/ak-multi-select.ts @@ -1,5 +1,5 @@ -import "@goauthentik/app/elements/forms/HorizontalFormElement"; import { AKElement } from "@goauthentik/elements/Base"; +import "@goauthentik/elements/forms/HorizontalFormElement"; import { TemplateResult, css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/components/ak-wizard-main/AkWizard.ts b/web/src/components/ak-wizard-main/AkWizard.ts index 48e827c70b..a393020b17 100644 --- a/web/src/components/ak-wizard-main/AkWizard.ts +++ b/web/src/components/ak-wizard-main/AkWizard.ts @@ -1,4 +1,4 @@ -import "@goauthentik/app/components/ak-wizard-main/ak-wizard-frame"; +import "@goauthentik/components/ak-wizard-main/ak-wizard-frame"; import { AKElement } from "@goauthentik/elements/Base"; import { msg } from "@lit/localize"; diff --git a/web/src/components/events/ObjectChangelog.ts b/web/src/components/events/ObjectChangelog.ts index c98f639896..1e2fb80812 100644 --- a/web/src/components/events/ObjectChangelog.ts +++ b/web/src/components/events/ObjectChangelog.ts @@ -1,9 +1,9 @@ -import { EventGeo, EventUser } from "@goauthentik/app/admin/events/utils"; -import { actionToLabel } from "@goauthentik/app/common/labels"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; +import { EventGeo, EventUser } 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 { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-event-info"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/Dropdown"; diff --git a/web/src/components/events/UserEvents.ts b/web/src/components/events/UserEvents.ts index ebca79eafa..55fdb867d7 100644 --- a/web/src/components/events/UserEvents.ts +++ b/web/src/components/events/UserEvents.ts @@ -1,9 +1,9 @@ -import { EventUser } from "@goauthentik/app/admin/events/utils"; -import { getRelativeTime } from "@goauthentik/app/common/utils"; +import { EventUser } 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 { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-event-info"; import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/buttons/Dropdown"; diff --git a/web/src/components/stories/ak-search-select.stories.ts b/web/src/components/stories/ak-search-select.stories.ts index 0f0e5edc2b..a2bd77f378 100644 --- a/web/src/components/stories/ak-search-select.stories.ts +++ b/web/src/components/stories/ak-search-select.stories.ts @@ -1,4 +1,4 @@ -import { groupBy } from "@goauthentik/app/common/utils"; +import { groupBy } from "@goauthentik/common/utils"; import { convertToSlug as slugify } from "@goauthentik/common/utils.js"; import "@goauthentik/elements/forms/SearchSelect/ak-search-select"; import { SearchSelect } from "@goauthentik/elements/forms/SearchSelect/ak-search-select"; diff --git a/web/src/elements/EmptyState.ts b/web/src/elements/EmptyState.ts index f1b5071691..cf025aef2c 100644 --- a/web/src/elements/EmptyState.ts +++ b/web/src/elements/EmptyState.ts @@ -1,5 +1,5 @@ +import { PFSize } from "@goauthentik/common/enums.js"; import { AKElement } from "@goauthentik/elements/Base"; -import { PFSize } from "@goauthentik/elements/Spinner"; import { CSSResult, TemplateResult, css, html } from "lit"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/elements/Interface/Interface.ts b/web/src/elements/Interface/Interface.ts index a15a6e4979..38099a564f 100644 --- a/web/src/elements/Interface/Interface.ts +++ b/web/src/elements/Interface/Interface.ts @@ -1,6 +1,6 @@ -import { EVENT_REFRESH_ENTERPRISE } from "@goauthentik/app/common/constants"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { brand, config } from "@goauthentik/common/api/config"; +import { EVENT_REFRESH_ENTERPRISE } from "@goauthentik/common/constants"; import { UIConfig, uiConfig } from "@goauthentik/common/ui/config"; import { authentikBrandContext, diff --git a/web/src/elements/Spinner.ts b/web/src/elements/Spinner.ts index 7483aff276..afdbbd527a 100644 --- a/web/src/elements/Spinner.ts +++ b/web/src/elements/Spinner.ts @@ -1,3 +1,4 @@ +import { PFSize } from "@goauthentik/common/enums.js"; import { AKElement } from "@goauthentik/elements/Base"; import { msg } from "@lit/localize"; @@ -6,13 +7,6 @@ import { customElement, property } from "lit/decorators.js"; import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css"; -export enum PFSize { - Small = "pf-m-sm", - Medium = "pf-m-md", - Large = "pf-m-lg", - XLarge = "pf-m-xl", -} - @customElement("ak-spinner") export class Spinner extends AKElement { @property() diff --git a/web/src/elements/ak-locale-context/configureLocale.ts b/web/src/elements/ak-locale-context/configureLocale.ts index 21f244668e..9d007111d3 100644 --- a/web/src/elements/ak-locale-context/configureLocale.ts +++ b/web/src/elements/ak-locale-context/configureLocale.ts @@ -1,4 +1,4 @@ -import { sourceLocale, targetLocales } from "@goauthentik/app/locale-codes"; +import { sourceLocale, targetLocales } from "@goauthentik/authentik/locale-codes"; import { configureLocalization } from "@lit/localize"; diff --git a/web/src/elements/buttons/ModalButton.ts b/web/src/elements/buttons/ModalButton.ts index dfc594e2ce..5e43b5a455 100644 --- a/web/src/elements/buttons/ModalButton.ts +++ b/web/src/elements/buttons/ModalButton.ts @@ -1,5 +1,5 @@ +import { PFSize } from "@goauthentik/common/enums.js"; import { AKElement } from "@goauthentik/elements/Base"; -import { PFSize } from "@goauthentik/elements/Spinner"; import { CSSResult, TemplateResult, css, html, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts b/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts index 1299efacf8..7e07dc3a4b 100644 --- a/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts +++ b/web/src/elements/buttons/SpinnerButton/BaseTaskButton.ts @@ -1,6 +1,6 @@ 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 { PFSize } from "@goauthentik/elements/Spinner"; import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; import { Task, TaskStatus } from "@lit/task"; diff --git a/web/src/elements/cards/AggregatePromiseCard.ts b/web/src/elements/cards/AggregatePromiseCard.ts index 481edb2592..f3ea049210 100644 --- a/web/src/elements/cards/AggregatePromiseCard.ts +++ b/web/src/elements/cards/AggregatePromiseCard.ts @@ -1,4 +1,4 @@ -import { PFSize } from "@goauthentik/elements/Spinner"; +import { PFSize } from "@goauthentik/common/enums.js"; import "@goauthentik/elements/Spinner"; import { AggregateCard } from "@goauthentik/elements/cards/AggregateCard"; diff --git a/web/src/elements/charts/Chart.ts b/web/src/elements/charts/Chart.ts index c5eaa74562..4a12b376c0 100644 --- a/web/src/elements/charts/Chart.ts +++ b/web/src/elements/charts/Chart.ts @@ -1,5 +1,5 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { EVENT_REFRESH, EVENT_THEME_CHANGE } from "@goauthentik/common/constants"; +import { getRelativeTime } from "@goauthentik/common/utils"; import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/EmptyState"; import { diff --git a/web/src/elements/forms/DeleteBulkForm.ts b/web/src/elements/forms/DeleteBulkForm.ts index 278abd0d7d..6ae7fca057 100644 --- a/web/src/elements/forms/DeleteBulkForm.ts +++ b/web/src/elements/forms/DeleteBulkForm.ts @@ -1,6 +1,6 @@ import { EVENT_REFRESH } from "@goauthentik/common/constants"; +import { PFSize } from "@goauthentik/common/enums.js"; import { MessageLevel } from "@goauthentik/common/messages"; -import { PFSize } from "@goauthentik/elements/Spinner"; import { ModalButton } from "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton"; import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; diff --git a/web/src/elements/forms/Form.ts b/web/src/elements/forms/Form.ts index 5d69942025..220df8183f 100644 --- a/web/src/elements/forms/Form.ts +++ b/web/src/elements/forms/Form.ts @@ -1,10 +1,10 @@ -import { PreventFormSubmit } from "@goauthentik/app/elements/forms/helpers"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import { MessageLevel } from "@goauthentik/common/messages"; import { camelToSnake, convertToSlug } from "@goauthentik/common/utils"; import { AKElement } from "@goauthentik/elements/Base"; import { HorizontalFormElement } from "@goauthentik/elements/forms/HorizontalFormElement"; import { SearchSelect } from "@goauthentik/elements/forms/SearchSelect"; +import { PreventFormSubmit } from "@goauthentik/elements/forms/helpers"; import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; import { CSSResult, TemplateResult, css, html } from "lit"; diff --git a/web/src/elements/forms/SearchSelect/ak-search-select.ts b/web/src/elements/forms/SearchSelect/ak-search-select.ts index fb3cf8862d..5077f713c9 100644 --- a/web/src/elements/forms/SearchSelect/ak-search-select.ts +++ b/web/src/elements/forms/SearchSelect/ak-search-select.ts @@ -1,8 +1,8 @@ -import { APIErrorTypes, parseAPIError } from "@goauthentik/app/common/errors"; -import { PreventFormSubmit } from "@goauthentik/app/elements/forms/helpers"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; +import { APIErrorTypes, parseAPIError } from "@goauthentik/common/errors"; import { ascii_letters, digits, groupBy, randomString } from "@goauthentik/common/utils"; import { AKElement } from "@goauthentik/elements/Base"; +import { PreventFormSubmit } from "@goauthentik/elements/forms/helpers"; import { ensureCSSStyleSheet } from "@goauthentik/elements/utils/ensureCSSStyleSheet"; import { CustomEmitterElement } from "@goauthentik/elements/utils/eventEmitter"; diff --git a/web/src/elements/forms/helpers.ts b/web/src/elements/forms/helpers.ts index 50a4c3002b..afc0432de4 100644 --- a/web/src/elements/forms/helpers.ts +++ b/web/src/elements/forms/helpers.ts @@ -1,4 +1,4 @@ -import { HorizontalFormElement } from "@goauthentik/app/elements/forms/HorizontalFormElement"; +import { HorizontalFormElement } from "@goauthentik/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/notifications/NotificationDrawer.ts b/web/src/elements/notifications/NotificationDrawer.ts index 114df30862..77c5b549f2 100644 --- a/web/src/elements/notifications/NotificationDrawer.ts +++ b/web/src/elements/notifications/NotificationDrawer.ts @@ -1,9 +1,9 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_REFRESH } from "@goauthentik/common/constants"; import { actionToLabel } from "@goauthentik/common/labels"; import { MessageLevel } from "@goauthentik/common/messages"; import { me } from "@goauthentik/common/users"; +import { getRelativeTime } from "@goauthentik/common/utils"; import { AKElement } from "@goauthentik/elements/Base"; import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; import { PaginatedResponse } from "@goauthentik/elements/table/Table"; diff --git a/web/src/elements/oauth/UserAccessTokenList.ts b/web/src/elements/oauth/UserAccessTokenList.ts index f6bfb38d4f..95fed88f09 100644 --- a/web/src/elements/oauth/UserAccessTokenList.ts +++ b/web/src/elements/oauth/UserAccessTokenList.ts @@ -1,6 +1,6 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-status-label"; import "@goauthentik/elements/forms/DeleteBulkForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table"; diff --git a/web/src/elements/oauth/UserRefreshTokenList.ts b/web/src/elements/oauth/UserRefreshTokenList.ts index 7ea20f47ac..741a938a76 100644 --- a/web/src/elements/oauth/UserRefreshTokenList.ts +++ b/web/src/elements/oauth/UserRefreshTokenList.ts @@ -1,6 +1,6 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-status-label"; import "@goauthentik/elements/forms/DeleteBulkForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table"; diff --git a/web/src/elements/rbac/ObjectPermissionModal.ts b/web/src/elements/rbac/ObjectPermissionModal.ts index 64bab6097a..72dda84d53 100644 --- a/web/src/elements/rbac/ObjectPermissionModal.ts +++ b/web/src/elements/rbac/ObjectPermissionModal.ts @@ -1,4 +1,4 @@ -import { AKElement } from "@goauthentik/app/elements/Base"; +import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/forms/ModalForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; import "@goauthentik/elements/rbac/ObjectPermissionsPage"; diff --git a/web/src/elements/rbac/ObjectPermissionsPage.ts b/web/src/elements/rbac/ObjectPermissionsPage.ts index a9bfbc14d2..39443e1a20 100644 --- a/web/src/elements/rbac/ObjectPermissionsPage.ts +++ b/web/src/elements/rbac/ObjectPermissionsPage.ts @@ -1,11 +1,11 @@ -import "@goauthentik/app/admin/roles/RoleAssignedGlobalPermissionsTable"; -import "@goauthentik/app/admin/roles/RoleAssignedObjectPermissionTable"; -import "@goauthentik/app/admin/users/UserAssignedGlobalPermissionsTable"; -import "@goauthentik/app/admin/users/UserAssignedObjectPermissionsTable"; -import { AKElement } from "@goauthentik/app/elements/Base"; -import "@goauthentik/app/elements/rbac/RoleObjectPermissionTable"; -import "@goauthentik/app/elements/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 "@goauthentik/elements/rbac/RoleObjectPermissionTable"; +import "@goauthentik/elements/rbac/UserObjectPermissionTable"; import { msg } from "@lit/localize"; import { html, nothing } from "lit"; diff --git a/web/src/elements/rbac/PermissionSelectModal.ts b/web/src/elements/rbac/PermissionSelectModal.ts index 648d88f170..cfd7fe5ced 100644 --- a/web/src/elements/rbac/PermissionSelectModal.ts +++ b/web/src/elements/rbac/PermissionSelectModal.ts @@ -1,6 +1,6 @@ -import { groupBy } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/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"; diff --git a/web/src/elements/rbac/RoleObjectPermissionTable.ts b/web/src/elements/rbac/RoleObjectPermissionTable.ts index 0c0f4bb9e9..7e64edf011 100644 --- a/web/src/elements/rbac/RoleObjectPermissionTable.ts +++ b/web/src/elements/rbac/RoleObjectPermissionTable.ts @@ -1,8 +1,8 @@ -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/app/elements/table/Table"; +import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import "@goauthentik/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/ModalForm"; import "@goauthentik/elements/rbac/RoleObjectPermissionForm"; +import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; import { msg } from "@lit/localize"; diff --git a/web/src/elements/rbac/UserObjectPermissionTable.ts b/web/src/elements/rbac/UserObjectPermissionTable.ts index 4361de4d48..bb1b05d937 100644 --- a/web/src/elements/rbac/UserObjectPermissionTable.ts +++ b/web/src/elements/rbac/UserObjectPermissionTable.ts @@ -1,8 +1,8 @@ -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { PaginatedResponse, Table, TableColumn } from "@goauthentik/app/elements/table/Table"; +import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import "@goauthentik/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/ModalForm"; import "@goauthentik/elements/rbac/UserObjectPermissionForm"; +import { PaginatedResponse, Table, TableColumn } from "@goauthentik/elements/table/Table"; import "@patternfly/elements/pf-tooltip/pf-tooltip.js"; import { msg } from "@lit/localize"; diff --git a/web/src/elements/table/Table.ts b/web/src/elements/table/Table.ts index 16f0b1bd4f..42fe8a0531 100644 --- a/web/src/elements/table/Table.ts +++ b/web/src/elements/table/Table.ts @@ -1,5 +1,5 @@ -import { APIErrorTypes, parseAPIError } from "@goauthentik/app/common/errors"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; +import { APIErrorTypes, parseAPIError } from "@goauthentik/common/errors"; import { groupBy } from "@goauthentik/common/utils"; import { AKElement } from "@goauthentik/elements/Base"; import "@goauthentik/elements/EmptyState"; diff --git a/web/src/elements/table/TableModal.ts b/web/src/elements/table/TableModal.ts index 341951fe6b..98f94a2d2f 100644 --- a/web/src/elements/table/TableModal.ts +++ b/web/src/elements/table/TableModal.ts @@ -1,5 +1,5 @@ +import { PFSize } from "@goauthentik/common/enums.js"; import { AKElement } from "@goauthentik/elements/Base"; -import { PFSize } from "@goauthentik/elements/Spinner"; import { MODAL_BUTTON_STYLES } from "@goauthentik/elements/buttons/ModalButton"; import { Table } from "@goauthentik/elements/table/Table"; diff --git a/web/src/elements/user/SessionList.ts b/web/src/elements/user/SessionList.ts index 24ae886631..01c4d900c0 100644 --- a/web/src/elements/user/SessionList.ts +++ b/web/src/elements/user/SessionList.ts @@ -1,6 +1,6 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/elements/forms/DeleteBulkForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table"; import { Table, TableColumn } from "@goauthentik/elements/table/Table"; diff --git a/web/src/elements/user/UserConsentList.ts b/web/src/elements/user/UserConsentList.ts index 606eb10e8b..638e96521e 100644 --- a/web/src/elements/user/UserConsentList.ts +++ b/web/src/elements/user/UserConsentList.ts @@ -1,6 +1,6 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { uiConfig } from "@goauthentik/common/ui/config"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/elements/forms/DeleteBulkForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table"; import { Table, TableColumn } from "@goauthentik/elements/table/Table"; diff --git a/web/src/elements/user/sources/SourceSettings.ts b/web/src/elements/user/sources/SourceSettings.ts index d276d29e58..e1b26d3247 100644 --- a/web/src/elements/user/sources/SourceSettings.ts +++ b/web/src/elements/user/sources/SourceSettings.ts @@ -1,11 +1,11 @@ -import { renderSourceIcon } from "@goauthentik/app/admin/sources/utils"; -import "@goauthentik/app/elements/user/sources/SourceSettingsOAuth"; -import "@goauthentik/app/elements/user/sources/SourceSettingsPlex"; -import "@goauthentik/app/elements/user/sources/SourceSettingsSAML"; +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 { msg, str } from "@lit/localize"; import { CSSResult, TemplateResult, css, html } from "lit"; diff --git a/web/src/elements/user/sources/SourceSettingsOAuth.ts b/web/src/elements/user/sources/SourceSettingsOAuth.ts index 141cc4cea5..39eda5daca 100644 --- a/web/src/elements/user/sources/SourceSettingsOAuth.ts +++ b/web/src/elements/user/sources/SourceSettingsOAuth.ts @@ -1,9 +1,9 @@ -import { BaseUserSettings } from "@goauthentik/app/elements/user/sources/BaseUserSettings"; import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; 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 { msg, str } from "@lit/localize"; import { TemplateResult, html } from "lit"; diff --git a/web/src/elements/user/sources/SourceSettingsPlex.ts b/web/src/elements/user/sources/SourceSettingsPlex.ts index d9492f0d75..5d3370b70a 100644 --- a/web/src/elements/user/sources/SourceSettingsPlex.ts +++ b/web/src/elements/user/sources/SourceSettingsPlex.ts @@ -1,10 +1,10 @@ -import { BaseUserSettings } from "@goauthentik/app/elements/user/sources/BaseUserSettings"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; 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 { msg, str } from "@lit/localize"; import { TemplateResult, html } from "lit"; diff --git a/web/src/elements/user/sources/SourceSettingsSAML.ts b/web/src/elements/user/sources/SourceSettingsSAML.ts index fe09bb1193..df13a5eaaa 100644 --- a/web/src/elements/user/sources/SourceSettingsSAML.ts +++ b/web/src/elements/user/sources/SourceSettingsSAML.ts @@ -1,9 +1,9 @@ -import { BaseUserSettings } from "@goauthentik/app/elements/user/sources/BaseUserSettings"; import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; 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 { msg, str } from "@lit/localize"; import { TemplateResult, html } from "lit"; diff --git a/web/src/enterprise/rac/index.ts b/web/src/enterprise/rac/index.ts index 87163cc46a..b2900957cc 100644 --- a/web/src/enterprise/rac/index.ts +++ b/web/src/enterprise/rac/index.ts @@ -1,4 +1,4 @@ -import { TITLE_DEFAULT } from "@goauthentik/app/common/constants"; +import { TITLE_DEFAULT } from "@goauthentik/common/constants"; import { Interface } from "@goauthentik/elements/Interface"; import "@goauthentik/elements/LoadingOverlay"; import Guacamole from "guacamole-common-js"; diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts index 1dca962c17..08f8508b1e 100644 --- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts +++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts @@ -1,6 +1,6 @@ -import { BaseDeviceStage } from "@goauthentik/app/flow/stages/authenticator_validate/base"; 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 { msg } from "@lit/localize"; diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts index 09f4da6e45..18edd167af 100644 --- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts +++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts @@ -1,6 +1,6 @@ -import { BaseDeviceStage } from "@goauthentik/app/flow/stages/authenticator_validate/base"; import "@goauthentik/elements/EmptyState"; import "@goauthentik/elements/forms/FormElement"; +import { BaseDeviceStage } from "@goauthentik/flow/stages/authenticator_validate/base"; import { msg } from "@lit/localize"; import { TemplateResult, html } from "lit"; diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts index bda9d5d412..2d57d5ad80 100644 --- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts +++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts @@ -1,10 +1,10 @@ -import { BaseDeviceStage } from "@goauthentik/app/flow/stages/authenticator_validate/base"; import { checkWebAuthnSupport, transformAssertionForServer, transformCredentialRequestOptions, } from "@goauthentik/common/helpers/webauthn"; import "@goauthentik/elements/EmptyState"; +import { BaseDeviceStage } from "@goauthentik/flow/stages/authenticator_validate/base"; import { msg } from "@lit/localize"; import { TemplateResult, html, nothing } from "lit"; diff --git a/web/src/flow/stages/authenticator_validate/base.ts b/web/src/flow/stages/authenticator_validate/base.ts index ac74d66374..821014a931 100644 --- a/web/src/flow/stages/authenticator_validate/base.ts +++ b/web/src/flow/stages/authenticator_validate/base.ts @@ -1,9 +1,5 @@ -import { - BaseStage, - FlowInfoChallenge, - PendingUserChallenge, -} from "@goauthentik/app/flow/stages/base"; import { AuthenticatorValidateStage } from "@goauthentik/flow/stages/authenticator_validate/AuthenticatorValidateStage"; +import { BaseStage, FlowInfoChallenge, PendingUserChallenge } from "@goauthentik/flow/stages/base"; import { msg } from "@lit/localize"; import { CSSResult, TemplateResult, css, html } from "lit"; diff --git a/web/src/flow/stages/captcha/CaptchaStage.ts b/web/src/flow/stages/captcha/CaptchaStage.ts index 753bda99c0..26412c101a 100644 --- a/web/src/flow/stages/captcha/CaptchaStage.ts +++ b/web/src/flow/stages/captcha/CaptchaStage.ts @@ -1,6 +1,6 @@ /// +import { PFSize } from "@goauthentik/common/enums.js"; import "@goauthentik/elements/EmptyState"; -import { PFSize } from "@goauthentik/elements/Spinner"; import "@goauthentik/elements/forms/FormElement"; import "@goauthentik/flow/FormStatic"; import "@goauthentik/flow/stages/access_denied/AccessDeniedStage"; diff --git a/web/src/flow/stages/identification/IdentificationStage.ts b/web/src/flow/stages/identification/IdentificationStage.ts index d5890d014a..cf729a4560 100644 --- a/web/src/flow/stages/identification/IdentificationStage.ts +++ b/web/src/flow/stages/identification/IdentificationStage.ts @@ -1,4 +1,4 @@ -import { renderSourceIcon } from "@goauthentik/app/admin/sources/utils"; +import { renderSourceIcon } from "@goauthentik/admin/sources/utils"; import "@goauthentik/elements/Divider"; import "@goauthentik/elements/EmptyState"; import "@goauthentik/elements/forms/FormElement"; diff --git a/web/src/stories/flow-interface.ts b/web/src/stories/flow-interface.ts index 3975e29f7a..7dbe53ae35 100644 --- a/web/src/stories/flow-interface.ts +++ b/web/src/stories/flow-interface.ts @@ -1,4 +1,4 @@ -import { FlowExecutor } from "@goauthentik/app/flow/FlowExecutor"; +import { FlowExecutor } from "@goauthentik/flow/FlowExecutor"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/stories/interface.ts b/web/src/stories/interface.ts index 1eafc62048..ec15e6ad83 100644 --- a/web/src/stories/interface.ts +++ b/web/src/stories/interface.ts @@ -1,4 +1,4 @@ -import { Interface } from "@goauthentik/app/elements/Interface"; +import { Interface } from "@goauthentik/elements/Interface"; import { customElement, property } from "lit/decorators.js"; diff --git a/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts b/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts index 40f5668f7b..cf643aeaaa 100644 --- a/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts +++ b/web/src/user/LibraryApplication/RACLaunchEndpointModal.ts @@ -1,6 +1,6 @@ -import { DEFAULT_CONFIG } from "@goauthentik/app/common/api/config"; -import { PaginatedResponse, TableColumn } from "@goauthentik/app/elements/table/Table"; -import { TableModal } from "@goauthentik/app/elements/table/TableModal"; +import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; +import { PaginatedResponse, TableColumn } from "@goauthentik/elements/table/Table"; +import { TableModal } from "@goauthentik/elements/table/TableModal"; import { msg } from "@lit/localize"; import { TemplateResult, html } from "lit"; diff --git a/web/src/user/LibraryApplication/index.ts b/web/src/user/LibraryApplication/index.ts index 35f60804fb..30475dd981 100644 --- a/web/src/user/LibraryApplication/index.ts +++ b/web/src/user/LibraryApplication/index.ts @@ -1,4 +1,4 @@ -import { PFSize } from "@goauthentik/app/elements/Spinner"; +import { PFSize } from "@goauthentik/common/enums.js"; import { truncateWords } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-app-icon"; import { AKElement, rootInterface } from "@goauthentik/elements/Base"; diff --git a/web/src/user/user-settings/UserSettingsPage.ts b/web/src/user/user-settings/UserSettingsPage.ts index efa28a5740..8e016da8ee 100644 --- a/web/src/user/user-settings/UserSettingsPage.ts +++ b/web/src/user/user-settings/UserSettingsPage.ts @@ -1,10 +1,10 @@ -import "@goauthentik/app/elements/user/sources/SourceSettings"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants"; import { AKElement, rootInterface } 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 { UserInterface } from "@goauthentik/user/UserInterface"; import "@goauthentik/user/user-settings/details/UserPassword"; import "@goauthentik/user/user-settings/details/UserSettingsFlowExecutor"; diff --git a/web/src/user/user-settings/tokens/UserTokenList.ts b/web/src/user/user-settings/tokens/UserTokenList.ts index 2b5015e15f..e58eee893e 100644 --- a/web/src/user/user-settings/tokens/UserTokenList.ts +++ b/web/src/user/user-settings/tokens/UserTokenList.ts @@ -1,8 +1,8 @@ -import { getRelativeTime } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { intentToLabel } from "@goauthentik/common/labels"; import { uiConfig } from "@goauthentik/common/ui/config"; import { me } from "@goauthentik/common/users"; +import { getRelativeTime } from "@goauthentik/common/utils"; import "@goauthentik/components/ak-status-label"; import "@goauthentik/elements/buttons/Dropdown"; import "@goauthentik/elements/buttons/ModalButton"; diff --git a/web/tsconfig.json b/web/tsconfig.json index 7e9327c551..6c52309f77 100644 --- a/web/tsconfig.json +++ b/web/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "strict": true, "paths": { - "@goauthentik/app/*": ["src/*"], + "@goauthentik/authentik/*": ["src/*"], "@goauthentik/admin/*": ["src/admin/*"], "@goauthentik/common/*": ["src/common/*"], "@goauthentik/components/*": ["src/components/*"],