trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

web: re-organise frontend and cleanup common code (#3572)

Browse source 
* fix repo in api client

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web: re-organise files to match their interface

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* core: include version in script tags

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* cleanup maybe broken

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* revert rename

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web: get rid of Client.ts

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* move more to common

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* more moving

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* format

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* unfuck files that vscode fucked, thanks

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* move more

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* finish moving (maybe)

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* ok more moving

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* fix more stuff that vs code destroyed

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* get rid "web" prefix for virtual package

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* fix locales

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* use custom base element

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* fix css file

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* don't run autoDetectLanguage when importing locale

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* fix circular dependencies

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web: fix build

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens L 2022-09-15 00:05:21 +02:00 committed by GitHub
parent 369440652c
commit 4a91a7d2e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
291 changed files with 2062 additions and 1921 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/web-api-publish.yml vendored
View file

@ -10,7 +10,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v3.4.1 - uses: actions/setup-node@v3.4.1
with: with:
node-version: '16' node-version: '16'

4
Makefile
View file

@ -90,7 +90,9 @@ gen-client-ts:
-i /local/schema.yml \ -i /local/schema.yml \
-g typescript-fetch \ -g typescript-fetch \
-o /local/gen-ts-api \ -o /local/gen-ts-api \
--additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=@goauthentik/api,npmVersion=${NPM_VERSION} --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=@goauthentik/api,npmVersion=${NPM_VERSION} \
--git-repo-id authentik \
--git-user-id goauthentik
mkdir -p web/node_modules/@goauthentik/api mkdir -p web/node_modules/@goauthentik/api
\cp -fv scripts/web_api_readme.md gen-ts-api/README.md \cp -fv scripts/web_api_readme.md gen-ts-api/README.md
cd gen-ts-api && npm i cd gen-ts-api && npm i

2
authentik/core/templates/if/admin.html
View file

@ -4,7 +4,7 @@
{% load i18n %} {% load i18n %}
{% block head %} {% block head %}
<script src="{% static 'dist/admin/AdminInterface.js' %}" type="module"></script> <script src="{% static 'dist/admin/AdminInterface.js' %}?version={{ version }}" type="module"></script>
<meta name="theme-color" content="#18191a" media="(prefers-color-scheme: dark)"> <meta name="theme-color" content="#18191a" media="(prefers-color-scheme: dark)">
<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)"> <meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
<link rel="icon" href="{{ tenant.branding_favicon }}"> <link rel="icon" href="{{ tenant.branding_favicon }}">

2
authentik/core/templates/if/flow.html
View file

@ -23,7 +23,7 @@ window.authentik.flow = {
{% endblock %} {% endblock %}
{% block head %} {% block head %}
<script src="{% static 'dist/flow/FlowInterface.js' %}" type="module"></script> <script src="{% static 'dist/flow/FlowInterface.js' %}?version={{ version }}" type="module"></script>
<style> <style>
:root { :root {
--ak-flow-background: url("{{ flow.background_url }}"); --ak-flow-background: url("{{ flow.background_url }}");

2
authentik/core/templates/if/user.html
View file

@ -4,7 +4,7 @@
{% load i18n %} {% load i18n %}
{% block head %} {% block head %}
<script src="{% static 'dist/user/UserInterface.js' %}" type="module"></script> <script src="{% static 'dist/user/UserInterface.js' %}?version={{ version }}" type="module"></script>
<meta name="theme-color" content="#151515" media="(prefers-color-scheme: light)"> <meta name="theme-color" content="#151515" media="(prefers-color-scheme: light)">
<meta name="theme-color" content="#151515" media="(prefers-color-scheme: dark)"> <meta name="theme-color" content="#151515" media="(prefers-color-scheme: dark)">
<link rel="icon" href="{{ tenant.branding_favicon }}"> <link rel="icon" href="{{ tenant.branding_favicon }}">

2
authentik/tenants/utils.py
View file

@ -6,6 +6,7 @@ from django.db.models import Value as V
from django.http.request import HttpRequest from django.http.request import HttpRequest
from sentry_sdk.hub import Hub from sentry_sdk.hub import Hub
from authentik import get_full_version
from authentik.lib.config import CONFIG from authentik.lib.config import CONFIG
from authentik.tenants.models import Tenant from authentik.tenants.models import Tenant
@ -37,4 +38,5 @@ def context_processor(request: HttpRequest) -> dict[str, Any]:
"tenant": tenant, "tenant": tenant,
"footer_links": CONFIG.y("footer_links"), "footer_links": CONFIG.y("footer_links"),
"sentry_trace": trace, "sentry_trace": trace,
"version": get_full_version(),
} }

12
web/rollup.config.js
View file

@ -32,7 +32,7 @@ export const resources = [
src: "node_modules/@patternfly/patternfly/components/Spinner/spinner.css", src: "node_modules/@patternfly/patternfly/components/Spinner/spinner.css",
dest: "dist/", dest: "dist/",
}, },
{ src: "src/authentik.css", dest: "dist/" }, { src: "src/common/styles/authentik.css", dest: "dist/" },
{ src: "src/custom.css", dest: "dist/" }, { src: "src/custom.css", dest: "dist/" },
{ {
@ -90,14 +90,14 @@ export const defaultOptions = {
watch: { watch: {
clearScreen: false, clearScreen: false,
}, },
preserveEntrySignatures: false, preserveEntrySignatures: "strict",
cache: true, cache: true,
context: "window", context: "window",
}; };
// Polyfills (imported first) // Polyfills (imported first)
export const POLY = { export const POLY = {
input: "./poly.ts", input: "./src/polyfill/poly.ts",
output: [ output: [
{ {
format: "iife", format: "iife",
@ -122,7 +122,7 @@ export default [
POLY, POLY,
// Flow interface // Flow interface
{ {
input: "./src/interfaces/FlowInterface.ts", input: "./src/flow/FlowInterface.ts",
output: [ output: [
{ {
format: "es", format: "es",
@ -135,7 +135,7 @@ export default [
}, },
// Admin interface // Admin interface
{ {
input: "./src/interfaces/AdminInterface.ts", input: "./src/admin/AdminInterface.ts",
output: [ output: [
{ {
format: "es", format: "es",
@ -148,7 +148,7 @@ export default [
}, },
// User interface // User interface
{ {
input: "./src/interfaces/UserInterface.ts", input: "./src/user/UserInterface.ts",
output: [ output: [
{ {
format: "es", format: "es",

37
web/src/interfaces/AdminInterface.ts → web/src/admin/AdminInterface.ts
View file

@ -1,30 +1,31 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { ROUTES } from "@goauthentik/admin/Routes";
import { me } from "@goauthentik/web/api/Users"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { WebsocketClient } from "@goauthentik/web/common/ws";
import { import {
EVENT_API_DRAWER_TOGGLE, EVENT_API_DRAWER_TOGGLE,
EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_NOTIFICATION_DRAWER_TOGGLE,
EVENT_SIDEBAR_TOGGLE, EVENT_SIDEBAR_TOGGLE,
VERSION, VERSION,
} from "@goauthentik/web/constants"; } from "@goauthentik/common/constants";
import "@goauthentik/web/elements/messages/MessageContainer"; import { autoDetectLanguage } from "@goauthentik/common/ui/locale";
import "@goauthentik/web/elements/messages/MessageContainer"; import { me } from "@goauthentik/common/users";
import "@goauthentik/web/elements/notifications/NotificationDrawer"; import { WebsocketClient } from "@goauthentik/common/ws";
import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "@goauthentik/web/elements/router/Route"; import { AKElement } from "@goauthentik/elements/Base";
import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch"; import "@goauthentik/elements/messages/MessageContainer";
import "@goauthentik/web/elements/router/RouterOutlet"; import "@goauthentik/elements/messages/MessageContainer";
import "@goauthentik/web/elements/sidebar/Sidebar"; import "@goauthentik/elements/notifications/NotificationDrawer";
import "@goauthentik/web/elements/sidebar/SidebarItem"; import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "@goauthentik/elements/router/Route";
import "@goauthentik/web/interfaces/locale"; import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
import { ROUTES } from "@goauthentik/web/routesAdmin"; import "@goauthentik/elements/router/RouterOutlet";
import "@goauthentik/elements/sidebar/Sidebar";
import "@goauthentik/elements/sidebar/SidebarItem";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, css, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { until } from "lit/directives/until.js"; import { until } from "lit/directives/until.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css"; import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css";
import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css";
@ -32,8 +33,10 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { AdminApi, Version } from "@goauthentik/api"; import { AdminApi, Version } from "@goauthentik/api";
autoDetectLanguage();
@customElement("ak-interface-admin") @customElement("ak-interface-admin")
export class AdminInterface extends LitElement { export class AdminInterface extends AKElement {
@property({ type: Boolean }) @property({ type: Boolean })
sidebarOpen = true; sidebarOpen = true;

64
web/src/routesAdmin.ts → web/src/admin/Routes.ts
View file

@ -1,5 +1,5 @@
import { ID_REGEX, Route, SLUG_REGEX, UUID_REGEX } from "@goauthentik/web/elements/router/Route"; import "@goauthentik/admin/admin-overview/AdminOverviewPage";
import "@goauthentik/web/pages/admin-overview/AdminOverviewPage"; import { ID_REGEX, Route, SLUG_REGEX, UUID_REGEX } from "@goauthentik/elements/router/Route";
import { html } from "lit"; import { html } from "lit";
@ -13,123 +13,123 @@ export const ROUTES: Route[] = [
return html`<ak-admin-overview></ak-admin-overview>`; return html`<ak-admin-overview></ak-admin-overview>`;
}), }),
new Route(new RegExp("^/administration/dashboard/users$"), async () => { new Route(new RegExp("^/administration/dashboard/users$"), async () => {
await import("@goauthentik/web/pages/admin-overview/DashboardUserPage"); await import("@goauthentik/admin/admin-overview/DashboardUserPage");
return html`<ak-admin-dashboard-users></ak-admin-dashboard-users>`; return html`<ak-admin-dashboard-users></ak-admin-dashboard-users>`;
}), }),
new Route(new RegExp("^/administration/system-tasks$"), async () => { new Route(new RegExp("^/administration/system-tasks$"), async () => {
await import("@goauthentik/web/pages/system-tasks/SystemTaskListPage"); await import("@goauthentik/admin/system-tasks/SystemTaskListPage");
return html`<ak-system-task-list></ak-system-task-list>`; return html`<ak-system-task-list></ak-system-task-list>`;
}), }),
new Route(new RegExp("^/core/providers$"), async () => { new Route(new RegExp("^/core/providers$"), async () => {
await import("@goauthentik/web/pages/providers/ProviderListPage"); await import("@goauthentik/admin/providers/ProviderListPage");
return html`<ak-provider-list></ak-provider-list>`; return html`<ak-provider-list></ak-provider-list>`;
}), }),
new Route(new RegExp(`^/core/providers/(?<id>${ID_REGEX})$`), async (args) => { new Route(new RegExp(`^/core/providers/(?<id>${ID_REGEX})$`), async (args) => {
await import("@goauthentik/web/pages/providers/ProviderViewPage"); await import("@goauthentik/admin/providers/ProviderViewPage");
return html`<ak-provider-view .providerID=${parseInt(args.id, 10)}></ak-provider-view>`; return html`<ak-provider-view .providerID=${parseInt(args.id, 10)}></ak-provider-view>`;
}), }),
new Route(new RegExp("^/core/applications$"), async () => { new Route(new RegExp("^/core/applications$"), async () => {
await import("@goauthentik/web/pages/applications/ApplicationListPage"); await import("@goauthentik/admin/applications/ApplicationListPage");
return html`<ak-application-list></ak-application-list>`; return html`<ak-application-list></ak-application-list>`;
}), }),
new Route(new RegExp(`^/core/applications/(?<slug>${SLUG_REGEX})$`), async (args) => { new Route(new RegExp(`^/core/applications/(?<slug>${SLUG_REGEX})$`), async (args) => {
await import("@goauthentik/web/pages/applications/ApplicationViewPage"); await import("@goauthentik/admin/applications/ApplicationViewPage");
return html`<ak-application-view .applicationSlug=${args.slug}></ak-application-view>`; return html`<ak-application-view .applicationSlug=${args.slug}></ak-application-view>`;
}), }),
new Route(new RegExp("^/core/sources$"), async () => { new Route(new RegExp("^/core/sources$"), async () => {
await import("@goauthentik/web/pages/sources/SourceListPage"); await import("@goauthentik/admin/sources/SourceListPage");
return html`<ak-source-list></ak-source-list>`; return html`<ak-source-list></ak-source-list>`;
}), }),
new Route(new RegExp(`^/core/sources/(?<slug>${SLUG_REGEX})$`), async (args) => { new Route(new RegExp(`^/core/sources/(?<slug>${SLUG_REGEX})$`), async (args) => {
await import("@goauthentik/web/pages/sources/SourceViewPage"); await import("@goauthentik/admin/sources/SourceViewPage");
return html`<ak-source-view .sourceSlug=${args.slug}></ak-source-view>`; return html`<ak-source-view .sourceSlug=${args.slug}></ak-source-view>`;
}), }),
new Route(new RegExp("^/core/property-mappings$"), async () => { new Route(new RegExp("^/core/property-mappings$"), async () => {
await import("@goauthentik/web/pages/property-mappings/PropertyMappingListPage"); await import("@goauthentik/admin/property-mappings/PropertyMappingListPage");
return html`<ak-property-mapping-list></ak-property-mapping-list>`; return html`<ak-property-mapping-list></ak-property-mapping-list>`;
}), }),
new Route(new RegExp("^/core/tokens$"), async () => { new Route(new RegExp("^/core/tokens$"), async () => {
await import("@goauthentik/web/pages/tokens/TokenListPage"); await import("@goauthentik/admin/tokens/TokenListPage");
return html`<ak-token-list></ak-token-list>`; return html`<ak-token-list></ak-token-list>`;
}), }),
new Route(new RegExp("^/core/tenants$"), async () => { new Route(new RegExp("^/core/tenants$"), async () => {
await import("@goauthentik/web/pages/tenants/TenantListPage"); await import("@goauthentik/admin/tenants/TenantListPage");
return html`<ak-tenant-list></ak-tenant-list>`; return html`<ak-tenant-list></ak-tenant-list>`;
}), }),
new Route(new RegExp("^/policy/policies$"), async () => { new Route(new RegExp("^/policy/policies$"), async () => {
await import("@goauthentik/web/pages/policies/PolicyListPage"); await import("@goauthentik/admin/policies/PolicyListPage");
return html`<ak-policy-list></ak-policy-list>`; return html`<ak-policy-list></ak-policy-list>`;
}), }),
new Route(new RegExp("^/policy/reputation$"), async () => { new Route(new RegExp("^/policy/reputation$"), async () => {
await import("@goauthentik/web/pages/policies/reputation/ReputationListPage"); await import("@goauthentik/admin/policies/reputation/ReputationListPage");
return html`<ak-policy-reputation-list></ak-policy-reputation-list>`; return html`<ak-policy-reputation-list></ak-policy-reputation-list>`;
}), }),
new Route(new RegExp("^/identity/groups$"), async () => { new Route(new RegExp("^/identity/groups$"), async () => {
await import("@goauthentik/web/pages/groups/GroupListPage"); await import("@goauthentik/admin/groups/GroupListPage");
return html`<ak-group-list></ak-group-list>`; return html`<ak-group-list></ak-group-list>`;
}), }),
new Route(new RegExp(`^/identity/groups/(?<uuid>${UUID_REGEX})$`), async (args) => { new Route(new RegExp(`^/identity/groups/(?<uuid>${UUID_REGEX})$`), async (args) => {
await import("@goauthentik/web/pages/groups/GroupViewPage"); await import("@goauthentik/admin/groups/GroupViewPage");
return html`<ak-group-view .groupId=${args.uuid}></ak-group-view>`; return html`<ak-group-view .groupId=${args.uuid}></ak-group-view>`;
}), }),
new Route(new RegExp("^/identity/users$"), async () => { new Route(new RegExp("^/identity/users$"), async () => {
await import("@goauthentik/web/pages/users/UserListPage"); await import("@goauthentik/admin/users/UserListPage");
return html`<ak-user-list></ak-user-list>`; return html`<ak-user-list></ak-user-list>`;
}), }),
new Route(new RegExp(`^/identity/users/(?<id>${ID_REGEX})$`), async (args) => { new Route(new RegExp(`^/identity/users/(?<id>${ID_REGEX})$`), async (args) => {
await import("@goauthentik/web/pages/users/UserViewPage"); await import("@goauthentik/admin/users/UserViewPage");
return html`<ak-user-view .userId=${parseInt(args.id, 10)}></ak-user-view>`; return html`<ak-user-view .userId=${parseInt(args.id, 10)}></ak-user-view>`;
}), }),
new Route(new RegExp("^/flow/stages/invitations$"), async () => { new Route(new RegExp("^/flow/stages/invitations$"), async () => {
await import("@goauthentik/web/pages/stages/invitation/InvitationListPage"); await import("@goauthentik/admin/stages/invitation/InvitationListPage");
return html`<ak-stage-invitation-list></ak-stage-invitation-list>`; return html`<ak-stage-invitation-list></ak-stage-invitation-list>`;
}), }),
new Route(new RegExp("^/flow/stages/prompts$"), async () => { new Route(new RegExp("^/flow/stages/prompts$"), async () => {
await import("@goauthentik/web/pages/stages/prompt/PromptListPage"); await import("@goauthentik/admin/stages/prompt/PromptListPage");
return html`<ak-stage-prompt-list></ak-stage-prompt-list>`; return html`<ak-stage-prompt-list></ak-stage-prompt-list>`;
}), }),
new Route(new RegExp("^/flow/stages$"), async () => { new Route(new RegExp("^/flow/stages$"), async () => {
await import("@goauthentik/web/pages/stages/StageListPage"); await import("@goauthentik/admin/stages/StageListPage");
return html`<ak-stage-list></ak-stage-list>`; return html`<ak-stage-list></ak-stage-list>`;
}), }),
new Route(new RegExp("^/flow/flows$"), async () => { new Route(new RegExp("^/flow/flows$"), async () => {
await import("@goauthentik/web/pages/flows/FlowListPage"); await import("@goauthentik/admin/flows/FlowListPage");
return html`<ak-flow-list></ak-flow-list>`; return html`<ak-flow-list></ak-flow-list>`;
}), }),
new Route(new RegExp(`^/flow/flows/(?<slug>${SLUG_REGEX})$`), async (args) => { new Route(new RegExp(`^/flow/flows/(?<slug>${SLUG_REGEX})$`), async (args) => {
await import("@goauthentik/web/pages/flows/FlowViewPage"); await import("@goauthentik/admin/flows/FlowViewPage");
return html`<ak-flow-view .flowSlug=${args.slug}></ak-flow-view>`; return html`<ak-flow-view .flowSlug=${args.slug}></ak-flow-view>`;
}), }),
new Route(new RegExp("^/events/log$"), async () => { new Route(new RegExp("^/events/log$"), async () => {
await import("@goauthentik/web/pages/events/EventListPage"); await import("@goauthentik/admin/events/EventListPage");
return html`<ak-event-list></ak-event-list>`; return html`<ak-event-list></ak-event-list>`;
}), }),
new Route(new RegExp(`^/events/log/(?<id>${UUID_REGEX})$`), async (args) => { new Route(new RegExp(`^/events/log/(?<id>${UUID_REGEX})$`), async (args) => {
await import("@goauthentik/web/pages/events/EventInfoPage"); await import("@goauthentik/admin/events/EventInfoPage");
return html`<ak-event-info-page .eventID=${args.id}></ak-event-info-page>`; return html`<ak-event-info-page .eventID=${args.id}></ak-event-info-page>`;
}), }),
new Route(new RegExp("^/events/transports$"), async () => { new Route(new RegExp("^/events/transports$"), async () => {
await import("@goauthentik/web/pages/events/TransportListPage"); await import("@goauthentik/admin/events/TransportListPage");
return html`<ak-event-transport-list></ak-event-transport-list>`; return html`<ak-event-transport-list></ak-event-transport-list>`;
}), }),
new Route(new RegExp("^/events/rules$"), async () => { new Route(new RegExp("^/events/rules$"), async () => {
await import("@goauthentik/web/pages/events/RuleListPage"); await import("@goauthentik/admin/events/RuleListPage");
return html`<ak-event-rule-list></ak-event-rule-list>`; return html`<ak-event-rule-list></ak-event-rule-list>`;
}), }),
new Route(new RegExp("^/outpost/outposts$"), async () => { new Route(new RegExp("^/outpost/outposts$"), async () => {
await import("@goauthentik/web/pages/outposts/OutpostListPage"); await import("@goauthentik/admin/outposts/OutpostListPage");
return html`<ak-outpost-list></ak-outpost-list>`; return html`<ak-outpost-list></ak-outpost-list>`;
}), }),
new Route(new RegExp("^/outpost/integrations$"), async () => { new Route(new RegExp("^/outpost/integrations$"), async () => {
await import("@goauthentik/web/pages/outposts/ServiceConnectionListPage"); await import("@goauthentik/admin/outposts/ServiceConnectionListPage");
return html`<ak-outpost-service-connection-list></ak-outpost-service-connection-list>`; return html`<ak-outpost-service-connection-list></ak-outpost-service-connection-list>`;
}), }),
new Route(new RegExp("^/crypto/certificates$"), async () => { new Route(new RegExp("^/crypto/certificates$"), async () => {
await import("@goauthentik/web/pages/crypto/CertificateKeyPairListPage"); await import("@goauthentik/admin/crypto/CertificateKeyPairListPage");
return html`<ak-crypto-certificate-list></ak-crypto-certificate-list>`; return html`<ak-crypto-certificate-list></ak-crypto-certificate-list>`;
}), }),
new Route(new RegExp("^/blueprints/instances$"), async () => { new Route(new RegExp("^/blueprints/instances$"), async () => {
await import("@goauthentik/web/pages/blueprints/BlueprintListPage"); await import("@goauthentik/admin/blueprints/BlueprintListPage");
return html`<ak-blueprint-list></ak-blueprint-list>`; return html`<ak-blueprint-list></ak-blueprint-list>`;
}), }),
]; ];

39
web/src/pages/admin-overview/AdminOverviewPage.ts → web/src/admin/admin-overview/AdminOverviewPage.ts
View file

@ -1,34 +1,35 @@
import { me } from "@goauthentik/web/api/Users"; import "@goauthentik/admin/admin-overview/TopApplicationsTable";
import "@goauthentik/web/elements/PageHeader"; import "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
import "@goauthentik/web/elements/cards/AggregatePromiseCard"; import "@goauthentik/admin/admin-overview/cards/SystemStatusCard";
import "@goauthentik/web/elements/charts/AdminLoginsChart"; import "@goauthentik/admin/admin-overview/cards/VersionStatusCard";
import { paramURL } from "@goauthentik/web/elements/router/RouterOutlet"; import "@goauthentik/admin/admin-overview/cards/WorkerStatusCard";
import "@goauthentik/web/pages/admin-overview/TopApplicationsTable"; import "@goauthentik/admin/admin-overview/charts/FlowStatusChart";
import "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard"; import "@goauthentik/admin/admin-overview/charts/GroupCountStatusChart";
import "@goauthentik/web/pages/admin-overview/cards/SystemStatusCard"; import "@goauthentik/admin/admin-overview/charts/LDAPSyncStatusChart";
import "@goauthentik/web/pages/admin-overview/cards/VersionStatusCard"; import "@goauthentik/admin/admin-overview/charts/OutpostStatusChart";
import "@goauthentik/web/pages/admin-overview/cards/WorkerStatusCard"; import "@goauthentik/admin/admin-overview/charts/PolicyStatusChart";
import "@goauthentik/web/pages/admin-overview/charts/FlowStatusChart"; import "@goauthentik/admin/admin-overview/charts/UserCountStatusChart";
import "@goauthentik/web/pages/admin-overview/charts/GroupCountStatusChart"; import { me } from "@goauthentik/common/users";
import "@goauthentik/web/pages/admin-overview/charts/LDAPSyncStatusChart"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/pages/admin-overview/charts/OutpostStatusChart"; import "@goauthentik/elements/PageHeader";
import "@goauthentik/web/pages/admin-overview/charts/PolicyStatusChart"; import "@goauthentik/elements/cards/AggregatePromiseCard";
import "@goauthentik/web/pages/admin-overview/charts/UserCountStatusChart"; import "@goauthentik/elements/charts/AdminLoginsChart";
import { paramURL } from "@goauthentik/elements/router/RouterOutlet";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, css, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement } from "lit/decorators.js"; import { customElement } from "lit/decorators.js";
import { until } from "lit/directives/until.js"; import { until } from "lit/directives/until.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css";
import PFList from "@patternfly/patternfly/components/List/list.css"; import PFList from "@patternfly/patternfly/components/List/list.css";
import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css";
import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css";
@customElement("ak-admin-overview") @customElement("ak-admin-overview")
export class AdminOverviewPage extends LitElement { export class AdminOverviewPage extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [ return [
PFGrid, PFGrid,

13
web/src/pages/admin-overview/DashboardUserPage.ts → web/src/admin/admin-overview/DashboardUserPage.ts
View file

@ -1,13 +1,14 @@
import "@goauthentik/web/elements/PageHeader"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/elements/cards/AggregatePromiseCard"; import "@goauthentik/elements/PageHeader";
import "@goauthentik/web/elements/charts/AdminModelPerDay"; import "@goauthentik/elements/cards/AggregatePromiseCard";
import "@goauthentik/elements/charts/AdminModelPerDay";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, css, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement } from "lit/decorators.js"; import { customElement } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css";
import PFList from "@patternfly/patternfly/components/List/list.css"; import PFList from "@patternfly/patternfly/components/List/list.css";
import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css";
@ -16,7 +17,7 @@ import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css";
import { EventActions } from "@goauthentik/api"; import { EventActions } from "@goauthentik/api";
@customElement("ak-admin-dashboard-users") @customElement("ak-admin-dashboard-users")
export class DashboardUserPage extends LitElement { export class DashboardUserPage extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [ return [
PFGrid, PFGrid,

11
web/src/pages/admin-overview/TopApplicationsTable.ts → web/src/admin/admin-overview/TopApplicationsTable.ts
View file

@ -1,18 +1,19 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/Spinner"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/elements/Spinner";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFTable from "@patternfly/patternfly/components/Table/table.css"; import PFTable from "@patternfly/patternfly/components/Table/table.css";
import { EventTopPerUser, EventsApi } from "@goauthentik/api"; import { EventTopPerUser, EventsApi } from "@goauthentik/api";
@customElement("ak-top-applications-table") @customElement("ak-top-applications-table")
export class TopApplicationsTable extends LitElement { export class TopApplicationsTable extends AKElement {
@property({ attribute: false }) @property({ attribute: false })
topN?: EventTopPerUser[]; topN?: EventTopPerUser[];

6
web/src/pages/admin-overview/cards/AdminStatusCard.ts → web/src/admin/admin-overview/cards/AdminStatusCard.ts
View file

@ -1,6 +1,6 @@
import { EVENT_REFRESH } from "@goauthentik/web/constants"; import { EVENT_REFRESH } from "@goauthentik/common/constants";
import { PFSize } from "@goauthentik/web/elements/Spinner"; import { PFSize } from "@goauthentik/elements/Spinner";
import { AggregateCard } from "@goauthentik/web/elements/cards/AggregateCard"; import { AggregateCard } from "@goauthentik/elements/cards/AggregateCard";
import { TemplateResult, html } from "lit"; import { TemplateResult, html } from "lit";
import { until } from "lit/directives/until.js"; import { until } from "lit/directives/until.js";

4
web/src/pages/admin-overview/cards/SystemStatusCard.ts → web/src/admin/admin-overview/cards/SystemStatusCard.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
import { import {
AdminStatus, AdminStatus,
AdminStatusCard, AdminStatusCard,
} from "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard"; } from "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

4
web/src/pages/admin-overview/cards/VersionStatusCard.ts → web/src/admin/admin-overview/cards/VersionStatusCard.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
import { import {
AdminStatus, AdminStatus,
AdminStatusCard, AdminStatusCard,
} from "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard"; } from "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

4
web/src/pages/admin-overview/cards/WorkerStatusCard.ts → web/src/admin/admin-overview/cards/WorkerStatusCard.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
import { import {
AdminStatus, AdminStatus,
AdminStatusCard, AdminStatusCard,
} from "@goauthentik/web/pages/admin-overview/cards/AdminStatusCard"; } from "@goauthentik/admin/admin-overview/cards/AdminStatusCard";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

6
web/src/pages/admin-overview/charts/FlowStatusChart.ts → web/src/admin/admin-overview/charts/FlowStatusChart.ts
View file

@ -1,6 +1,6 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { AKChart } from "@goauthentik/web/elements/charts/Chart"; import { AKChart } from "@goauthentik/elements/charts/Chart";
import "@goauthentik/web/elements/forms/ConfirmationForm"; import "@goauthentik/elements/forms/ConfirmationForm";
import { ChartData, ChartOptions } from "chart.js"; import { ChartData, ChartOptions } from "chart.js";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

4
web/src/pages/admin-overview/charts/GroupCountStatusChart.ts → web/src/admin/admin-overview/charts/GroupCountStatusChart.ts
View file

@ -1,5 +1,5 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { AKChart } from "@goauthentik/web/elements/charts/Chart"; import { AKChart } from "@goauthentik/elements/charts/Chart";
import { ChartData, ChartOptions } from "chart.js"; import { ChartData, ChartOptions } from "chart.js";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

6
web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts → web/src/admin/admin-overview/charts/LDAPSyncStatusChart.ts
View file

@ -1,6 +1,6 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { AKChart } from "@goauthentik/web/elements/charts/Chart"; import { AKChart } from "@goauthentik/elements/charts/Chart";
import "@goauthentik/web/elements/forms/ConfirmationForm"; import "@goauthentik/elements/forms/ConfirmationForm";
import { ChartData, ChartOptions } from "chart.js"; import { ChartData, ChartOptions } from "chart.js";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

6
web/src/pages/admin-overview/charts/OutpostStatusChart.ts → web/src/admin/admin-overview/charts/OutpostStatusChart.ts
View file

@ -1,6 +1,6 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { AKChart } from "@goauthentik/web/elements/charts/Chart"; import { AKChart } from "@goauthentik/elements/charts/Chart";
import "@goauthentik/web/elements/forms/ConfirmationForm"; import "@goauthentik/elements/forms/ConfirmationForm";
import { ChartData, ChartOptions } from "chart.js"; import { ChartData, ChartOptions } from "chart.js";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

6
web/src/pages/admin-overview/charts/PolicyStatusChart.ts → web/src/admin/admin-overview/charts/PolicyStatusChart.ts
View file

@ -1,6 +1,6 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { AKChart } from "@goauthentik/web/elements/charts/Chart"; import { AKChart } from "@goauthentik/elements/charts/Chart";
import "@goauthentik/web/elements/forms/ConfirmationForm"; import "@goauthentik/elements/forms/ConfirmationForm";
import { ChartData, ChartOptions } from "chart.js"; import { ChartData, ChartOptions } from "chart.js";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

4
web/src/pages/admin-overview/charts/UserCountStatusChart.ts → web/src/admin/admin-overview/charts/UserCountStatusChart.ts
View file

@ -1,5 +1,5 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { AKChart } from "@goauthentik/web/elements/charts/Chart"; import { AKChart } from "@goauthentik/elements/charts/Chart";
import { ChartData, ChartOptions } from "chart.js"; import { ChartData, ChartOptions } from "chart.js";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

10
web/src/pages/applications/ApplicationCheckAccessForm.ts → web/src/admin/applications/ApplicationCheckAccessForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { PFColor } from "@goauthentik/web/elements/Label"; import { PFColor } from "@goauthentik/elements/Label";
import { Form } from "@goauthentik/web/elements/forms/Form"; import { Form } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { UserOption } from "@goauthentik/web/elements/user/utils"; import { UserOption } from "@goauthentik/elements/user/utils";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

16
web/src/pages/applications/ApplicationForm.ts → web/src/admin/applications/ApplicationForm.ts
View file

@ -1,11 +1,11 @@
import { DEFAULT_CONFIG, config } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/providers/ProviderWizard";
import "@goauthentik/web/elements/forms/FormGroup"; import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/providers/ProviderWizard"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { first } from "@goauthentik/web/utils"; import "@goauthentik/elements/forms/ProxyForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

28
web/src/pages/applications/ApplicationListPage.ts → web/src/admin/applications/ApplicationListPage.ts
View file

@ -1,16 +1,16 @@
import "@goauthentik/admin/applications/ApplicationForm";
import "@goauthentik/admin/applications/wizard/ApplicationWizard";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { uiConfig } from "@goauthentik/common/ui/config";
import MDApplication from "@goauthentik/docs/core/applications.md"; import MDApplication from "@goauthentik/docs/core/applications.md";
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/elements/Markdown";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/elements/buttons/SpinnerButton";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/elements/Markdown"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import { getURLParam } from "@goauthentik/elements/router/RouteMatch";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/elements/forms/ModalForm"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { getURLParam } from "@goauthentik/web/elements/router/RouteMatch"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { TableColumn } from "@goauthentik/web/elements/table/Table";
import { TablePage } from "@goauthentik/web/elements/table/TablePage";
import "@goauthentik/web/pages/applications/ApplicationForm";
import "@goauthentik/web/pages/applications/wizard/ApplicationWizard";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -18,7 +18,7 @@ import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css";
@ -44,7 +44,7 @@ export class ApplicationListPage extends TablePage<Application> {
@property() @property()
order = "name"; order = "name";
async apiEndpoint(page: number): Promise<AKResponse<Application>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Application>> {
return new CoreApi(DEFAULT_CONFIG).coreApplicationsList({ return new CoreApi(DEFAULT_CONFIG).coreApplicationsList({
ordering: this.order, ordering: this.order,
page: page, page: page,

27
web/src/pages/applications/ApplicationViewPage.ts → web/src/admin/applications/ApplicationViewPage.ts
View file

@ -1,21 +1,22 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/applications/ApplicationCheckAccessForm";
import "@goauthentik/web/elements/EmptyState"; import "@goauthentik/admin/applications/ApplicationForm";
import "@goauthentik/web/elements/PageHeader"; import "@goauthentik/admin/policies/BoundPoliciesList";
import "@goauthentik/web/elements/Tabs"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/elements/charts/ApplicationAuthorizeChart"; import "@goauthentik/elements/EmptyState";
import "@goauthentik/web/elements/events/ObjectChangelog"; import "@goauthentik/elements/PageHeader";
import "@goauthentik/web/pages/applications/ApplicationCheckAccessForm"; import "@goauthentik/elements/Tabs";
import "@goauthentik/web/pages/applications/ApplicationForm"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/pages/policies/BoundPoliciesList"; import "@goauthentik/elements/charts/ApplicationAuthorizeChart";
import "@goauthentik/elements/events/ObjectChangelog";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property, state } from "lit/decorators.js"; import { customElement, property, state } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css";
@ -28,7 +29,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { Application, CoreApi, OutpostsApi } from "@goauthentik/api"; import { Application, CoreApi, OutpostsApi } from "@goauthentik/api";
@customElement("ak-application-view") @customElement("ak-application-view")
export class ApplicationViewPage extends LitElement { export class ApplicationViewPage extends AKElement {
@property() @property()
set applicationSlug(value: string) { set applicationSlug(value: string) {
new CoreApi(DEFAULT_CONFIG) new CoreApi(DEFAULT_CONFIG)

33
web/src/pages/applications/wizard/ApplicationWizard.ts → web/src/admin/applications/wizard/ApplicationWizard.ts
View file

@ -1,30 +1,31 @@
import "@goauthentik/web/elements/wizard/Wizard"; import "@goauthentik/admin/applications/wizard/InitialApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/InitialApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/TypeApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/TypeApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/ldap/TypeLDAPApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/ldap/TypeLDAPApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/link/TypeLinkApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/link/TypeLinkApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/proxy/TypeProxyApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/proxy/TypeProxyApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/saml/TypeSAMLApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/saml/TypeSAMLApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage"; import "@goauthentik/admin/applications/wizard/saml/TypeSAMLImportApplicationWizardPage";
import "@goauthentik/web/pages/applications/wizard/saml/TypeSAMLImportApplicationWizardPage"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/elements/wizard/Wizard";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { property } from "lit/decorators.js"; import { property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css";
@customElement("ak-application-wizard") @customElement("ak-application-wizard")
export class ApplicationWizard extends LitElement { export class ApplicationWizard extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [PFBase, PFButton, AKGlobal, PFRadio]; return [PFBase, PFButton, AKGlobal, PFRadio];
} }

12
web/src/pages/applications/wizard/InitialApplicationWizardPage.ts → web/src/admin/applications/wizard/InitialApplicationWizardPage.ts
View file

@ -1,9 +1,9 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { KeyUnknown } from "@goauthentik/web/elements/forms/Form"; import { convertToSlug } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/FormGroup"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { convertToSlug } from "@goauthentik/web/utils"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

4
web/src/pages/applications/wizard/TypeApplicationWizardPage.ts → web/src/admin/applications/wizard/TypeApplicationWizardPage.ts
View file

@ -1,11 +1,11 @@
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";

8
web/src/pages/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts → web/src/admin/applications/wizard/ldap/TypeLDAPApplicationWizardPage.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { KeyUnknown } from "@goauthentik/web/elements/forms/Form"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

6
web/src/pages/applications/wizard/link/TypeLinkApplicationWizardPage.ts → web/src/admin/applications/wizard/link/TypeLinkApplicationWizardPage.ts
View file

@ -1,6 +1,6 @@
import { KeyUnknown } from "@goauthentik/web/elements/forms/Form"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

6
web/src/pages/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts → web/src/admin/applications/wizard/oauth/TypeOAuthAPIApplicationWizardPage.ts
View file

@ -1,12 +1,12 @@
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";

6
web/src/pages/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts → web/src/admin/applications/wizard/oauth/TypeOAuthApplicationWizardPage.ts
View file

@ -1,12 +1,12 @@
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";

10
web/src/pages/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts → web/src/admin/applications/wizard/oauth/TypeOAuthCodeApplicationWizardPage.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { KeyUnknown } from "@goauthentik/web/elements/forms/Form"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import "@goauthentik/web/elements/wizard/WizardFormPage"; import "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

4
web/src/pages/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts → web/src/admin/applications/wizard/oauth/TypeOAuthImplicitApplicationWizardPage.ts
View file

@ -1,5 +1,5 @@
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

8
web/src/pages/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts → web/src/admin/applications/wizard/proxy/TypeProxyApplicationWizardPage.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { KeyUnknown } from "@goauthentik/web/elements/forms/Form"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

6
web/src/pages/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts → web/src/admin/applications/wizard/saml/TypeSAMLApplicationWizardPage.ts
View file

@ -1,12 +1,12 @@
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";

8
web/src/pages/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts → web/src/admin/applications/wizard/saml/TypeSAMLConfigApplicationWizardPage.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { KeyUnknown } from "@goauthentik/web/elements/forms/Form"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

8
web/src/pages/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts → web/src/admin/applications/wizard/saml/TypeSAMLImportApplicationWizardPage.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { KeyUnknown } from "@goauthentik/web/elements/forms/Form"; import { KeyUnknown } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { WizardFormPage } from "@goauthentik/web/elements/wizard/WizardFormPage"; import { WizardFormPage } from "@goauthentik/elements/wizard/WizardFormPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

12
web/src/pages/blueprints/BlueprintForm.ts → web/src/admin/blueprints/BlueprintForm.ts
View file

@ -1,9 +1,9 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/FormGroup"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

29
web/src/pages/blueprints/BlueprintListPage.ts → web/src/admin/blueprints/BlueprintListPage.ts
View file

@ -1,15 +1,15 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/blueprints/BlueprintForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { uiConfig } from "@goauthentik/web/common/config"; import { EVENT_REFRESH } from "@goauthentik/common/constants";
import { EVENT_REFRESH } from "@goauthentik/web/constants"; import { uiConfig } from "@goauthentik/common/ui/config";
import { PFColor } from "@goauthentik/web/elements/Label"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/ActionButton";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/forms/ModalForm";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { TableColumn } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/blueprints/BlueprintForm"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -25,13 +25,12 @@ export function BlueprintStatus(blueprint?: BlueprintInstance): string {
return t`Successful`; return t`Successful`;
case BlueprintInstanceStatusEnum.Orphaned: case BlueprintInstanceStatusEnum.Orphaned:
return t`Orphaned`; return t`Orphaned`;
case BlueprintInstanceStatusEnum.Unknown:
return t`Unknown`;
case BlueprintInstanceStatusEnum.Warning: case BlueprintInstanceStatusEnum.Warning:
return t`Warning`; return t`Warning`;
case BlueprintInstanceStatusEnum.Error: case BlueprintInstanceStatusEnum.Error:
return t`Error`; return t`Error`;
} }
return t`Unknown`;
} }
@customElement("ak-blueprint-list") @customElement("ak-blueprint-list")
export class BlueprintListPage extends TablePage<BlueprintInstance> { export class BlueprintListPage extends TablePage<BlueprintInstance> {
@ -53,7 +52,7 @@ export class BlueprintListPage extends TablePage<BlueprintInstance> {
@property() @property()
order = "name"; order = "name";
async apiEndpoint(page: number): Promise<AKResponse<BlueprintInstance>> { async apiEndpoint(page: number): Promise<PaginatedResponse<BlueprintInstance>> {
return new ManagedApi(DEFAULT_CONFIG).managedBlueprintsList({ return new ManagedApi(DEFAULT_CONFIG).managedBlueprintsList({
ordering: this.order, ordering: this.order,
page: page, page: page,

6
web/src/pages/crypto/CertificateGenerateForm.ts → web/src/admin/crypto/CertificateGenerateForm.ts
View file

@ -1,6 +1,6 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { Form } from "@goauthentik/web/elements/forms/Form"; import { Form } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

8
web/src/pages/crypto/CertificateKeyPairForm.ts → web/src/admin/crypto/CertificateKeyPairForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

24
web/src/pages/crypto/CertificateKeyPairListPage.ts → web/src/admin/crypto/CertificateKeyPairListPage.ts
View file

@ -1,14 +1,14 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/crypto/CertificateGenerateForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/crypto/CertificateKeyPairForm";
import { uiConfig } from "@goauthentik/web/common/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { PFColor } from "@goauthentik/web/elements/Label"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/elements/forms/ModalForm";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/crypto/CertificateGenerateForm"; import { TableColumn } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/crypto/CertificateKeyPairForm"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -44,7 +44,7 @@ export class CertificateKeyPairListPage extends TablePage<CertificateKeyPair> {
return super.styles.concat(PFDescriptionList); return super.styles.concat(PFDescriptionList);
} }
async apiEndpoint(page: number): Promise<AKResponse<CertificateKeyPair>> { async apiEndpoint(page: number): Promise<PaginatedResponse<CertificateKeyPair>> {
return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsList({ return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsList({
ordering: this.order, ordering: this.order,
page: page, page: page,

17
web/src/pages/events/EventInfo.ts → web/src/admin/events/EventInfo.ts
View file

@ -1,13 +1,14 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { EventContext, EventModel, EventWithContext } from "@goauthentik/web/api/Events"; import { VERSION } from "@goauthentik/common/constants";
import { VERSION } from "@goauthentik/web/constants"; import { EventContext, EventModel, EventWithContext } from "@goauthentik/common/events";
import "@goauthentik/web/elements/Expand"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/elements/Spinner"; import "@goauthentik/elements/Expand";
import { PFSize } from "@goauthentik/web/elements/Spinner"; import "@goauthentik/elements/Spinner";
import { PFSize } from "@goauthentik/elements/Spinner";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, css, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { until } from "lit/directives/until.js"; import { until } from "lit/directives/until.js";
@ -20,7 +21,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { EventActions, FlowsApi } from "@goauthentik/api"; import { EventActions, FlowsApi } from "@goauthentik/api";
@customElement("ak-event-info") @customElement("ak-event-info")
export class EventInfo extends LitElement { export class EventInfo extends AKElement {
@property({ attribute: false }) @property({ attribute: false })
event!: EventWithContext; event!: EventWithContext;

15
web/src/pages/events/EventInfoPage.ts → web/src/admin/events/EventInfoPage.ts
View file

@ -1,14 +1,15 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/events/EventInfo";
import { EventWithContext } from "@goauthentik/web/api/Events"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/PageHeader"; import { EventWithContext } from "@goauthentik/common/events";
import "@goauthentik/web/pages/events/EventInfo"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/elements/PageHeader";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css";
import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css";
import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css";
@ -17,7 +18,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { EventsApi } from "@goauthentik/api"; import { EventsApi } from "@goauthentik/api";
@customElement("ak-event-info-page") @customElement("ak-event-info-page")
export class EventInfoPage extends LitElement { export class EventInfoPage extends AKElement {
@property() @property()
set eventID(value: string) { set eventID(value: string) {
new EventsApi(DEFAULT_CONFIG) new EventsApi(DEFAULT_CONFIG)

18
web/src/pages/events/EventListPage.ts → web/src/admin/events/EventListPage.ts
View file

@ -1,11 +1,11 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/events/EventInfo";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { ActionToLabel } from "@goauthentik/admin/events/utils";
import { EventWithContext } from "@goauthentik/web/api/Events"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { uiConfig } from "@goauthentik/web/common/config"; import { EventWithContext } from "@goauthentik/common/events";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { uiConfig } from "@goauthentik/common/ui/config";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/events/EventInfo"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { ActionToLabel } from "@goauthentik/web/pages/events/utils"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -34,7 +34,7 @@ export class EventListPage extends TablePage<Event> {
@property() @property()
order = "-created"; order = "-created";
async apiEndpoint(page: number): Promise<AKResponse<Event>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Event>> {
return new EventsApi(DEFAULT_CONFIG).eventsEventsList({ return new EventsApi(DEFAULT_CONFIG).eventsEventsList({
ordering: this.order, ordering: this.order,
page: page, page: page,

6
web/src/pages/events/RuleForm.ts → web/src/admin/events/RuleForm.ts
View file

@ -1,6 +1,6 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

22
web/src/pages/events/RuleListPage.ts → web/src/admin/events/RuleListPage.ts
View file

@ -1,13 +1,13 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/events/RuleForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/policies/BoundPoliciesList";
import { uiConfig } from "@goauthentik/web/common/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/elements/forms/ModalForm";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/events/RuleForm"; import { TableColumn } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/policies/BoundPoliciesList"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -37,7 +37,7 @@ export class RuleListPage extends TablePage<NotificationRule> {
@property() @property()
order = "name"; order = "name";
async apiEndpoint(page: number): Promise<AKResponse<NotificationRule>> { async apiEndpoint(page: number): Promise<PaginatedResponse<NotificationRule>> {
return new EventsApi(DEFAULT_CONFIG).eventsRulesList({ return new EventsApi(DEFAULT_CONFIG).eventsRulesList({
ordering: this.order, ordering: this.order,
page: page, page: page,

8
web/src/pages/events/TransportForm.ts → web/src/admin/events/TransportForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import { first } from "@goauthentik/common/utils";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

22
web/src/pages/events/TransportListPage.ts → web/src/admin/events/TransportListPage.ts
View file

@ -1,13 +1,13 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/events/TransportForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { uiConfig } from "@goauthentik/web/common/config"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/ActionButton";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/forms/ModalForm";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { TableColumn } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/events/TransportForm"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -36,7 +36,7 @@ export class TransportListPage extends TablePage<NotificationTransport> {
@property() @property()
order = "name"; order = "name";
async apiEndpoint(page: number): Promise<AKResponse<NotificationTransport>> { async apiEndpoint(page: number): Promise<PaginatedResponse<NotificationTransport>> {
return new EventsApi(DEFAULT_CONFIG).eventsTransportsList({ return new EventsApi(DEFAULT_CONFIG).eventsTransportsList({
ordering: this.order, ordering: this.order,
page: page, page: page,

0
web/src/pages/events/utils.ts → web/src/admin/events/utils.ts
View file

24
web/src/pages/flows/BoundStagesList.ts → web/src/admin/flows/BoundStagesList.ts
View file

@ -1,14 +1,14 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/flows/StageBindingForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/policies/BoundPoliciesList";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/admin/stages/StageWizard";
import "@goauthentik/web/elements/Tabs"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/Tabs";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import { Table, TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/flows/StageBindingForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/policies/BoundPoliciesList"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/stages/StageWizard"; import { Table, TableColumn } from "@goauthentik/elements/table/Table";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -26,7 +26,7 @@ export class BoundStagesList extends Table<FlowStageBinding> {
@property() @property()
target?: string; target?: string;
async apiEndpoint(page: number): Promise<AKResponse<FlowStageBinding>> { async apiEndpoint(page: number): Promise<PaginatedResponse<FlowStageBinding>> {
return new FlowsApi(DEFAULT_CONFIG).flowsBindingsList({ return new FlowsApi(DEFAULT_CONFIG).flowsBindingsList({
target: this.target || "", target: this.target || "",
ordering: "order", ordering: "order",

11
web/src/pages/flows/FlowDiagram.ts → web/src/admin/flows/FlowDiagram.ts
View file

@ -1,9 +1,10 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { EVENT_REFRESH } from "@goauthentik/web/constants"; import { EVENT_REFRESH } from "@goauthentik/common/constants";
import "@goauthentik/web/elements/EmptyState"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/elements/EmptyState";
import FlowChart from "flowchart.js"; import FlowChart from "flowchart.js";
import { LitElement, TemplateResult, html } from "lit"; import { TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { FlowsApi } from "@goauthentik/api"; import { FlowsApi } from "@goauthentik/api";
@ -14,7 +15,7 @@ export const FILL_DARK_MODE = "#18191a";
export const FILL_LIGHT_MODE = "#f0f0f0"; export const FILL_LIGHT_MODE = "#f0f0f0";
@customElement("ak-flow-diagram") @customElement("ak-flow-diagram")
export class FlowDiagram extends LitElement { export class FlowDiagram extends AKElement {
_flowSlug?: string; _flowSlug?: string;
@property() @property()

12
web/src/pages/flows/FlowForm.ts → web/src/admin/flows/FlowForm.ts
View file

@ -1,9 +1,8 @@
import { DeniedActionEnum } from "@goauthentik/api/dist/models/DeniedActionEnum.js"; import { DesignationToLabel, LayoutToLabel } from "@goauthentik/admin/flows/utils";
import { DEFAULT_CONFIG, config } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG, config } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import { first } from "@goauthentik/common/utils";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { DesignationToLabel, LayoutToLabel } from "@goauthentik/web/pages/flows/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { first } from "@goauthentik/web/utils";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -14,6 +13,7 @@ import { until } from "lit/directives/until.js";
import { import {
CapabilitiesEnum, CapabilitiesEnum,
DeniedActionEnum,
Flow, Flow,
FlowDesignationEnum, FlowDesignationEnum,
FlowsApi, FlowsApi,

8
web/src/pages/flows/FlowImportForm.ts → web/src/admin/flows/FlowImportForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { SentryIgnoredError } from "@goauthentik/web/common/errors"; import { SentryIgnoredError } from "@goauthentik/common/errors";
import { Form } from "@goauthentik/web/elements/forms/Form"; import { Form } from "@goauthentik/elements/forms/Form";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

28
web/src/pages/flows/FlowListPage.ts → web/src/admin/flows/FlowListPage.ts
View file

@ -1,16 +1,16 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/flows/FlowForm";
import { AndNext, DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/flows/FlowImportForm";
import { uiConfig } from "@goauthentik/web/common/config"; import { DesignationToLabel } from "@goauthentik/admin/flows/utils";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/ConfirmationForm"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import { groupBy } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/buttons/SpinnerButton";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/elements/forms/ConfirmationForm";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/pages/flows/FlowForm"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/flows/FlowImportForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import { DesignationToLabel } from "@goauthentik/web/pages/flows/utils"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { groupBy } from "@goauthentik/web/utils"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -39,7 +39,7 @@ export class FlowListPage extends TablePage<Flow> {
@property() @property()
order = "slug"; order = "slug";
async apiEndpoint(page: number): Promise<AKResponse<Flow>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Flow>> {
return new FlowsApi(DEFAULT_CONFIG).flowsInstancesList({ return new FlowsApi(DEFAULT_CONFIG).flowsInstancesList({
ordering: this.order, ordering: this.order,
page: page, page: page,

25
web/src/pages/flows/FlowViewPage.ts → web/src/admin/flows/FlowViewPage.ts
View file

@ -1,19 +1,20 @@
import { AndNext, DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/flows/BoundStagesList";
import "@goauthentik/web/elements/PageHeader"; import "@goauthentik/admin/flows/FlowDiagram";
import "@goauthentik/web/elements/Tabs"; import "@goauthentik/admin/flows/FlowForm";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/admin/policies/BoundPoliciesList";
import "@goauthentik/web/elements/events/ObjectChangelog"; import { AndNext, DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/pages/flows/BoundStagesList"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/pages/flows/FlowDiagram"; import "@goauthentik/elements/PageHeader";
import "@goauthentik/web/pages/flows/FlowForm"; import "@goauthentik/elements/Tabs";
import "@goauthentik/web/pages/policies/BoundPoliciesList"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/elements/events/ObjectChangelog";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, css, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css";
import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css";
@ -25,7 +26,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { Flow, FlowsApi, ResponseError } from "@goauthentik/api"; import { Flow, FlowsApi, ResponseError } from "@goauthentik/api";
@customElement("ak-flow-view") @customElement("ak-flow-view")
export class FlowViewPage extends LitElement { export class FlowViewPage extends AKElement {
@property() @property()
set flowSlug(value: string) { set flowSlug(value: string) {
new FlowsApi(DEFAULT_CONFIG) new FlowsApi(DEFAULT_CONFIG)

8
web/src/pages/flows/StageBindingForm.ts → web/src/admin/flows/StageBindingForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import { first, groupBy } from "@goauthentik/common/utils";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first, groupBy } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

0
web/src/pages/flows/utils.ts → web/src/admin/flows/utils.ts
View file

18
web/src/pages/groups/GroupForm.ts → web/src/admin/groups/GroupForm.ts
View file

@ -1,12 +1,12 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/groups/MemberSelectModal";
import "@goauthentik/web/elements/CodeMirror"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/chips/Chip"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/chips/ChipGroup"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/chips/Chip";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/chips/ChipGroup";
import { UserOption } from "@goauthentik/web/elements/user/utils"; import "@goauthentik/elements/forms/HorizontalFormElement";
import "@goauthentik/web/pages/groups/MemberSelectModal"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { first } from "@goauthentik/web/utils"; import { UserOption } from "@goauthentik/elements/user/utils";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

22
web/src/pages/groups/GroupListPage.ts → web/src/admin/groups/GroupListPage.ts
View file

@ -1,13 +1,13 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/groups/GroupForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { uiConfig } from "@goauthentik/web/common/config"; import { uiConfig } from "@goauthentik/common/ui/config";
import { PFColor } from "@goauthentik/web/elements/Label"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/forms/ModalForm";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { TableColumn } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/groups/GroupForm"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -35,7 +35,7 @@ export class GroupListPage extends TablePage<Group> {
@property() @property()
order = "name"; order = "name";
async apiEndpoint(page: number): Promise<AKResponse<Group>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Group>> {
return new CoreApi(DEFAULT_CONFIG).coreGroupsList({ return new CoreApi(DEFAULT_CONFIG).coreGroupsList({
ordering: this.order, ordering: this.order,
page: page, page: page,

31
web/src/pages/groups/GroupViewPage.ts → web/src/admin/groups/GroupViewPage.ts
View file

@ -1,22 +1,23 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/groups/GroupForm";
import { EVENT_REFRESH } from "@goauthentik/web/constants"; import "@goauthentik/admin/users/RelatedUserList";
import "@goauthentik/web/elements/CodeMirror"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { PFColor } from "@goauthentik/web/elements/Label"; import { EVENT_REFRESH } from "@goauthentik/common/constants";
import "@goauthentik/web/elements/PageHeader"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/elements/Tabs"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/buttons/ActionButton"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/PageHeader";
import "@goauthentik/web/elements/events/ObjectChangelog"; import "@goauthentik/elements/Tabs";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/buttons/ActionButton";
import "@goauthentik/web/pages/groups/GroupForm"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/pages/users/RelatedUserList"; import "@goauthentik/elements/events/ObjectChangelog";
import "@goauthentik/elements/forms/ModalForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css";
import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css";
@ -31,7 +32,7 @@ import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css";
import { CoreApi, Group } from "@goauthentik/api"; import { CoreApi, Group } from "@goauthentik/api";
@customElement("ak-group-view") @customElement("ak-group-view")
export class GroupViewPage extends LitElement { export class GroupViewPage extends AKElement {
@property({ type: String }) @property({ type: String })
set groupId(id: string) { set groupId(id: string) {
new CoreApi(DEFAULT_CONFIG) new CoreApi(DEFAULT_CONFIG)

18
web/src/pages/groups/MemberSelectModal.ts → web/src/admin/groups/MemberSelectModal.ts
View file

@ -1,11 +1,11 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { uiConfig } from "@goauthentik/common/ui/config";
import { uiConfig } from "@goauthentik/web/common/config"; import { first } from "@goauthentik/common/utils";
import { PFColor } from "@goauthentik/web/elements/Label"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/buttons/SpinnerButton";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import { TableModal } from "@goauthentik/web/elements/table/TableModal"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { first } from "@goauthentik/web/utils"; import { TableModal } from "@goauthentik/elements/table/TableModal";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -28,7 +28,7 @@ export class MemberSelectTable extends TableModal<User> {
order = "username"; order = "username";
async apiEndpoint(page: number): Promise<AKResponse<User>> { async apiEndpoint(page: number): Promise<PaginatedResponse<User>> {
return new CoreApi(DEFAULT_CONFIG).coreUsersList({ return new CoreApi(DEFAULT_CONFIG).coreUsersList({
ordering: this.order, ordering: this.order,
page: page, page: page,

20
web/src/pages/groups/RelatedGroupList.ts → web/src/admin/groups/RelatedGroupList.ts
View file

@ -1,12 +1,12 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/groups/GroupForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { uiConfig } from "@goauthentik/web/common/config"; import { uiConfig } from "@goauthentik/common/ui/config";
import { PFColor } from "@goauthentik/web/elements/Label"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/elements/forms/ModalForm";
import { Table, TableColumn } from "@goauthentik/web/elements/table/Table"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/groups/GroupForm"; import { Table, TableColumn } from "@goauthentik/elements/table/Table";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -28,7 +28,7 @@ export class RelatedGroupList extends Table<Group> {
@property({ type: Number }) @property({ type: Number })
targetUser?: number; targetUser?: number;
async apiEndpoint(page: number): Promise<AKResponse<Group>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Group>> {
return new CoreApi(DEFAULT_CONFIG).coreGroupsList({ return new CoreApi(DEFAULT_CONFIG).coreGroupsList({
ordering: this.order, ordering: this.order,
page: page, page: page,

4
web/src/pages/outposts/OutpostDeploymentModal.ts → web/src/admin/outposts/OutpostDeploymentModal.ts
View file

@ -1,5 +1,5 @@
import { ModalButton } from "@goauthentik/web/elements/buttons/ModalButton"; import { ModalButton } from "@goauthentik/elements/buttons/ModalButton";
import "@goauthentik/web/elements/buttons/TokenCopyButton"; import "@goauthentik/elements/buttons/TokenCopyButton";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

8
web/src/pages/outposts/OutpostForm.ts → web/src/admin/outposts/OutpostForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

11
web/src/pages/outposts/OutpostHealth.ts → web/src/admin/outposts/OutpostHealth.ts
View file

@ -1,18 +1,19 @@
import { PFColor } from "@goauthentik/web/elements/Label"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/elements/Spinner"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/elements/Spinner";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, css, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { OutpostHealth } from "@goauthentik/api"; import { OutpostHealth } from "@goauthentik/api";
@customElement("ak-outpost-health") @customElement("ak-outpost-health")
export class OutpostHealthElement extends LitElement { export class OutpostHealthElement extends AKElement {
@property({ attribute: false }) @property({ attribute: false })
outpostHealth?: OutpostHealth; outpostHealth?: OutpostHealth;

15
web/src/pages/outposts/OutpostHealthSimple.ts → web/src/admin/outposts/OutpostHealthSimple.ts
View file

@ -1,20 +1,21 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { EVENT_REFRESH } from "@goauthentik/web/constants"; import { EVENT_REFRESH } from "@goauthentik/common/constants";
import { PFColor } from "@goauthentik/web/elements/Label"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/elements/Spinner"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/elements/Spinner";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { OutpostHealth, OutpostsApi } from "@goauthentik/api"; import { OutpostHealth, OutpostsApi } from "@goauthentik/api";
@customElement("ak-outpost-health-simple") @customElement("ak-outpost-health-simple")
export class OutpostHealthSimpleElement extends LitElement { export class OutpostHealthSimpleElement extends AKElement {
@property() @property()
outpostId?: string; outpostId?: string;

29
web/src/pages/outposts/OutpostListPage.ts → web/src/admin/outposts/OutpostListPage.ts
View file

@ -1,16 +1,17 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/outposts/OutpostDeploymentModal";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/outposts/OutpostDeploymentModal";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/admin/outposts/OutpostForm";
import { PFSize } from "@goauthentik/web/elements/Spinner"; import "@goauthentik/admin/outposts/OutpostHealth";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/admin/outposts/OutpostHealthSimple";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/ModalForm"; import { uiConfig } from "@goauthentik/common/ui/config";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { PFSize } from "@goauthentik/elements/Spinner";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/pages/outposts/OutpostDeploymentModal"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/pages/outposts/OutpostForm"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/outposts/OutpostHealth"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/outposts/OutpostHealthSimple"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -50,7 +51,7 @@ export class OutpostListPage extends TablePage<Outpost> {
searchEnabled(): boolean { searchEnabled(): boolean {
return true; return true;
} }
async apiEndpoint(page: number): Promise<AKResponse<Outpost>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Outpost>> {
return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesList({ return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesList({
ordering: this.order, ordering: this.order,
page: page, page: page,

8
web/src/pages/outposts/ServiceConnectionDockerForm.ts → web/src/admin/outposts/ServiceConnectionDockerForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import { first } from "@goauthentik/common/utils";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

10
web/src/pages/outposts/ServiceConnectionKubernetesForm.ts → web/src/admin/outposts/ServiceConnectionKubernetesForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/CodeMirror";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

30
web/src/pages/outposts/ServiceConnectionListPage.ts → web/src/admin/outposts/ServiceConnectionListPage.ts
View file

@ -1,17 +1,17 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/outposts/OutpostHealth";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/outposts/ServiceConnectionDockerForm";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/admin/outposts/ServiceConnectionKubernetesForm";
import { PFColor } from "@goauthentik/web/elements/Label"; import "@goauthentik/admin/outposts/ServiceConnectionWizard";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/elements/forms/ModalForm"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/elements/buttons/SpinnerButton";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/elements/forms/DeleteBulkForm";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/outposts/OutpostHealth"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/outposts/ServiceConnectionDockerForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/outposts/ServiceConnectionKubernetesForm"; import { TableColumn } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/outposts/ServiceConnectionWizard"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -39,7 +39,7 @@ export class OutpostServiceConnectionListPage extends TablePage<ServiceConnectio
checkbox = true; checkbox = true;
async apiEndpoint(page: number): Promise<AKResponse<ServiceConnection>> { async apiEndpoint(page: number): Promise<PaginatedResponse<ServiceConnection>> {
return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsAllList({ return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsAllList({
ordering: this.order, ordering: this.order,
page: page, page: page,

21
web/src/pages/outposts/ServiceConnectionWizard.ts → web/src/admin/outposts/ServiceConnectionWizard.ts
View file

@ -1,18 +1,19 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/outposts/ServiceConnectionDockerForm";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/admin/outposts/ServiceConnectionKubernetesForm";
import "@goauthentik/web/elements/wizard/FormWizardPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/wizard/Wizard"; import { AKElement } from "@goauthentik/elements/Base";
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/outposts/ServiceConnectionDockerForm"; import "@goauthentik/elements/wizard/FormWizardPage";
import "@goauthentik/web/pages/outposts/ServiceConnectionKubernetesForm"; import "@goauthentik/elements/wizard/Wizard";
import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { property } from "lit/decorators.js"; import { property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@ -58,7 +59,7 @@ export class InitialServiceConnectionWizardPage extends WizardPage {
} }
@customElement("ak-service-connection-wizard") @customElement("ak-service-connection-wizard")
export class ServiceConnectionWizard extends LitElement { export class ServiceConnectionWizard extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [PFBase, PFButton, AKGlobal, PFRadio]; return [PFBase, PFButton, AKGlobal, PFRadio];
} }

30
web/src/pages/policies/BoundPoliciesList.ts → web/src/admin/policies/BoundPoliciesList.ts
View file

@ -1,17 +1,17 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/groups/GroupForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/policies/PolicyBindingForm";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/admin/policies/PolicyWizard";
import { PFColor } from "@goauthentik/web/elements/Label"; import "@goauthentik/admin/users/UserForm";
import { PFSize } from "@goauthentik/web/elements/Spinner"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/Tabs"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/forms/ModalForm"; import { PFSize } from "@goauthentik/elements/Spinner";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/elements/Tabs";
import { Table, TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/pages/groups/GroupForm"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/policies/PolicyBindingForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/policies/PolicyWizard"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/users/UserForm"; import { Table, TableColumn } from "@goauthentik/elements/table/Table";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -31,7 +31,7 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
checkbox = true; checkbox = true;
async apiEndpoint(page: number): Promise<AKResponse<PolicyBinding>> { async apiEndpoint(page: number): Promise<PaginatedResponse<PolicyBinding>> {
return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsList({ return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsList({
target: this.target || "", target: this.target || "",
ordering: "order", ordering: "order",

12
web/src/pages/policies/PolicyBindingForm.ts → web/src/admin/policies/PolicyBindingForm.ts
View file

@ -1,9 +1,9 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/SearchSelect"; import { first, groupBy } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/SearchSelect";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { UserOption } from "@goauthentik/web/elements/user/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { first, groupBy } from "@goauthentik/web/utils"; import { UserOption } from "@goauthentik/elements/user/utils";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

40
web/src/pages/policies/PolicyListPage.ts → web/src/admin/policies/PolicyListPage.ts
View file

@ -1,22 +1,22 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/policies/PolicyTestForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/policies/PolicyWizard";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/admin/policies/dummy/DummyPolicyForm";
import "@goauthentik/web/elements/forms/ConfirmationForm"; import "@goauthentik/admin/policies/event_matcher/EventMatcherPolicyForm";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/admin/policies/expiry/ExpiryPolicyForm";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/admin/policies/expression/ExpressionPolicyForm";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/admin/policies/hibp/HaveIBeenPwnedPolicyForm";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/admin/policies/password/PasswordPolicyForm";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import "@goauthentik/admin/policies/reputation/ReputationPolicyForm";
import "@goauthentik/web/pages/policies/PolicyTestForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/pages/policies/PolicyWizard"; import { uiConfig } from "@goauthentik/common/ui/config";
import "@goauthentik/web/pages/policies/dummy/DummyPolicyForm"; import { groupBy } from "@goauthentik/common/utils";
import "@goauthentik/web/pages/policies/event_matcher/EventMatcherPolicyForm"; import "@goauthentik/elements/forms/ConfirmationForm";
import "@goauthentik/web/pages/policies/expiry/ExpiryPolicyForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/pages/policies/expression/ExpressionPolicyForm"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/policies/hibp/HaveIBeenPwnedPolicyForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/policies/password/PasswordPolicyForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/policies/reputation/ReputationPolicyForm"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { groupBy } from "@goauthentik/web/utils"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -46,7 +46,7 @@ export class PolicyListPage extends TablePage<Policy> {
@property() @property()
order = "name"; order = "name";
async apiEndpoint(page: number): Promise<AKResponse<Policy>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Policy>> {
return new PoliciesApi(DEFAULT_CONFIG).policiesAllList({ return new PoliciesApi(DEFAULT_CONFIG).policiesAllList({
ordering: this.order, ordering: this.order,
page: page, page: page,

14
web/src/pages/policies/PolicyTestForm.ts → web/src/admin/policies/PolicyTestForm.ts
View file

@ -1,10 +1,10 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import { first } from "@goauthentik/common/utils";
import { PFColor } from "@goauthentik/web/elements/Label"; import "@goauthentik/elements/CodeMirror";
import { Form } from "@goauthentik/web/elements/forms/Form"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import { Form } from "@goauthentik/elements/forms/Form";
import { UserOption } from "@goauthentik/web/elements/user/utils"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { UserOption } from "@goauthentik/elements/user/utils";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

31
web/src/pages/policies/PolicyWizard.ts → web/src/admin/policies/PolicyWizard.ts
View file

@ -1,23 +1,24 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/policies/dummy/DummyPolicyForm";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/admin/policies/event_matcher/EventMatcherPolicyForm";
import "@goauthentik/web/elements/wizard/FormWizardPage"; import "@goauthentik/admin/policies/expiry/ExpiryPolicyForm";
import "@goauthentik/web/elements/wizard/Wizard"; import "@goauthentik/admin/policies/expression/ExpressionPolicyForm";
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import "@goauthentik/admin/policies/hibp/HaveIBeenPwnedPolicyForm";
import "@goauthentik/web/pages/policies/dummy/DummyPolicyForm"; import "@goauthentik/admin/policies/password/PasswordPolicyForm";
import "@goauthentik/web/pages/policies/event_matcher/EventMatcherPolicyForm"; import "@goauthentik/admin/policies/reputation/ReputationPolicyForm";
import "@goauthentik/web/pages/policies/expiry/ExpiryPolicyForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/pages/policies/expression/ExpressionPolicyForm"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/pages/policies/hibp/HaveIBeenPwnedPolicyForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/policies/password/PasswordPolicyForm"; import "@goauthentik/elements/wizard/FormWizardPage";
import "@goauthentik/web/pages/policies/reputation/ReputationPolicyForm"; import "@goauthentik/elements/wizard/Wizard";
import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { property } from "lit/decorators.js"; import { property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@ -63,7 +64,7 @@ export class InitialPolicyWizardPage extends WizardPage {
} }
@customElement("ak-policy-wizard") @customElement("ak-policy-wizard")
export class PolicyWizard extends LitElement { export class PolicyWizard extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [PFBase, PFButton, AKGlobal, PFRadio]; return [PFBase, PFButton, AKGlobal, PFRadio];
} }

10
web/src/pages/policies/dummy/DummyPolicyForm.ts → web/src/admin/policies/dummy/DummyPolicyForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/FormGroup"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

10
web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts → web/src/admin/policies/event_matcher/EventMatcherPolicyForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/FormGroup"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

10
web/src/pages/policies/expiry/ExpiryPolicyForm.ts → web/src/admin/policies/expiry/ExpiryPolicyForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/FormGroup"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

12
web/src/pages/policies/expression/ExpressionPolicyForm.ts → web/src/admin/policies/expression/ExpressionPolicyForm.ts
View file

@ -1,9 +1,9 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/FormGroup"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

10
web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts → web/src/admin/policies/hibp/HaveIBeenPwnedPolicyForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/FormGroup"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

10
web/src/pages/policies/password/PasswordPolicyForm.ts → web/src/admin/policies/password/PasswordPolicyForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/FormGroup"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

20
web/src/pages/policies/reputation/ReputationListPage.ts → web/src/admin/policies/reputation/ReputationListPage.ts
View file

@ -1,12 +1,12 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { uiConfig } from "@goauthentik/common/ui/config";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/elements/buttons/ModalButton";
import "@goauthentik/web/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/elements/forms/ModalForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import getUnicodeFlagIcon from "country-flag-icons/unicode"; import getUnicodeFlagIcon from "country-flag-icons/unicode";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -36,7 +36,7 @@ export class ReputationListPage extends TablePage<Reputation> {
checkbox = true; checkbox = true;
async apiEndpoint(page: number): Promise<AKResponse<Reputation>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Reputation>> {
return new PoliciesApi(DEFAULT_CONFIG).policiesReputationScoresList({ return new PoliciesApi(DEFAULT_CONFIG).policiesReputationScoresList({
ordering: this.order, ordering: this.order,
page: page, page: page,

10
web/src/pages/policies/reputation/ReputationPolicyForm.ts → web/src/admin/policies/reputation/ReputationPolicyForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/FormGroup"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

8
web/src/pages/property-mappings/PropertyMappingLDAPForm.ts → web/src/admin/property-mappings/PropertyMappingLDAPForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

34
web/src/pages/property-mappings/PropertyMappingListPage.ts → web/src/admin/property-mappings/PropertyMappingListPage.ts
View file

@ -1,19 +1,19 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/property-mappings/PropertyMappingLDAPForm";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
import "@goauthentik/web/elements/forms/ModalForm"; import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/admin/property-mappings/PropertyMappingWizard";
import { getURLParam, updateURLParams } from "@goauthentik/web/elements/router/RouteMatch"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import { uiConfig } from "@goauthentik/common/ui/config";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import { groupBy } from "@goauthentik/common/utils";
import "@goauthentik/web/pages/property-mappings/PropertyMappingLDAPForm"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/pages/property-mappings/PropertyMappingNotification"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/property-mappings/PropertyMappingSAMLForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/property-mappings/PropertyMappingScopeForm"; import { getURLParam, updateURLParams } from "@goauthentik/elements/router/RouteMatch";
import "@goauthentik/web/pages/property-mappings/PropertyMappingTestForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/property-mappings/PropertyMappingWizard"; import { TableColumn } from "@goauthentik/elements/table/Table";
import { groupBy } from "@goauthentik/web/utils"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -46,7 +46,7 @@ export class PropertyMappingListPage extends TablePage<PropertyMapping> {
@property({ type: Boolean }) @property({ type: Boolean })
hideManaged = getURLParam<boolean>("hideManaged", true); hideManaged = getURLParam<boolean>("hideManaged", true);
async apiEndpoint(page: number): Promise<AKResponse<PropertyMapping>> { async apiEndpoint(page: number): Promise<PaginatedResponse<PropertyMapping>> {
return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllList({ return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllList({
ordering: this.order, ordering: this.order,
page: page, page: page,

8
web/src/pages/property-mappings/PropertyMappingNotification.ts → web/src/admin/property-mappings/PropertyMappingNotification.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

8
web/src/pages/property-mappings/PropertyMappingSAMLForm.ts → web/src/admin/property-mappings/PropertyMappingSAMLForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

8
web/src/pages/property-mappings/PropertyMappingScopeForm.ts → web/src/admin/property-mappings/PropertyMappingScopeForm.ts
View file

@ -1,7 +1,7 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

12
web/src/pages/property-mappings/PropertyMappingTestForm.ts → web/src/admin/property-mappings/PropertyMappingTestForm.ts
View file

@ -1,9 +1,9 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import { first } from "@goauthentik/common/utils";
import { Form } from "@goauthentik/web/elements/forms/Form"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import { Form } from "@goauthentik/elements/forms/Form";
import { UserOption } from "@goauthentik/web/elements/user/utils"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { UserOption } from "@goauthentik/elements/user/utils";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

27
web/src/pages/property-mappings/PropertyMappingWizard.ts → web/src/admin/property-mappings/PropertyMappingWizard.ts
View file

@ -1,21 +1,22 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/property-mappings/PropertyMappingLDAPForm";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
import "@goauthentik/web/elements/wizard/FormWizardPage"; import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
import "@goauthentik/web/elements/wizard/Wizard"; import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
import "@goauthentik/web/pages/property-mappings/PropertyMappingLDAPForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/pages/property-mappings/PropertyMappingNotification"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/pages/property-mappings/PropertyMappingSAMLForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/property-mappings/PropertyMappingScopeForm"; import "@goauthentik/elements/wizard/FormWizardPage";
import "@goauthentik/web/pages/property-mappings/PropertyMappingTestForm"; import "@goauthentik/elements/wizard/Wizard";
import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { property } from "lit/decorators.js"; import { property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFRadio from "@patternfly/patternfly/components/Radio/radio.css"; import PFRadio from "@patternfly/patternfly/components/Radio/radio.css";
@ -61,7 +62,7 @@ export class InitialPropertyMappingWizardPage extends WizardPage {
} }
@customElement("ak-property-mapping-wizard") @customElement("ak-property-mapping-wizard")
export class PropertyMappingWizard extends LitElement { export class PropertyMappingWizard extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [PFBase, PFButton, AKGlobal, PFRadio]; return [PFBase, PFButton, AKGlobal, PFRadio];
} }

30
web/src/pages/providers/ProviderListPage.ts → web/src/admin/providers/ProviderListPage.ts
View file

@ -1,17 +1,17 @@
import { AKResponse } from "@goauthentik/web/api/Client"; import "@goauthentik/admin/providers/ProviderWizard";
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/providers/ldap/LDAPProviderForm";
import { uiConfig } from "@goauthentik/web/common/config"; import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/admin/providers/proxy/ProxyProviderForm";
import "@goauthentik/web/elements/forms/DeleteBulkForm"; import "@goauthentik/admin/providers/saml/SAMLProviderForm";
import "@goauthentik/web/elements/forms/ModalForm"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/ProxyForm"; import { uiConfig } from "@goauthentik/common/ui/config";
import { TableColumn } from "@goauthentik/web/elements/table/Table"; import "@goauthentik/elements/buttons/SpinnerButton";
import { TablePage } from "@goauthentik/web/elements/table/TablePage"; import "@goauthentik/elements/forms/DeleteBulkForm";
import "@goauthentik/web/pages/providers/ProviderWizard"; import "@goauthentik/elements/forms/ModalForm";
import "@goauthentik/web/pages/providers/ldap/LDAPProviderForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/providers/oauth2/OAuth2ProviderForm"; import { PaginatedResponse } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/providers/proxy/ProxyProviderForm"; import { TableColumn } from "@goauthentik/elements/table/Table";
import "@goauthentik/web/pages/providers/saml/SAMLProviderForm"; import { TablePage } from "@goauthentik/elements/table/TablePage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -40,7 +40,7 @@ export class ProviderListPage extends TablePage<Provider> {
@property() @property()
order = "name"; order = "name";
async apiEndpoint(page: number): Promise<AKResponse<Provider>> { async apiEndpoint(page: number): Promise<PaginatedResponse<Provider>> {
return new ProvidersApi(DEFAULT_CONFIG).providersAllList({ return new ProvidersApi(DEFAULT_CONFIG).providersAllList({
ordering: this.order, ordering: this.order,
page: page, page: page,

23
web/src/pages/providers/ProviderViewPage.ts → web/src/admin/providers/ProviderViewPage.ts
View file

@ -1,25 +1,26 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/providers/ldap/LDAPProviderViewPage";
import "@goauthentik/web/elements/EmptyState"; import "@goauthentik/admin/providers/oauth2/OAuth2ProviderViewPage";
import "@goauthentik/web/elements/PageHeader"; import "@goauthentik/admin/providers/proxy/ProxyProviderViewPage";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/admin/providers/saml/SAMLProviderViewPage";
import "@goauthentik/web/pages/providers/ldap/LDAPProviderViewPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/pages/providers/oauth2/OAuth2ProviderViewPage"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/pages/providers/proxy/ProxyProviderViewPage"; import "@goauthentik/elements/EmptyState";
import "@goauthentik/web/pages/providers/saml/SAMLProviderViewPage"; import "@goauthentik/elements/PageHeader";
import "@goauthentik/elements/buttons/SpinnerButton";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css";
import { Provider, ProvidersApi } from "@goauthentik/api"; import { Provider, ProvidersApi } from "@goauthentik/api";
@customElement("ak-provider-view") @customElement("ak-provider-view")
export class ProviderViewPage extends LitElement { export class ProviderViewPage extends AKElement {
@property({ type: Number }) @property({ type: Number })
set providerID(value: number) { set providerID(value: number) {
new ProvidersApi(DEFAULT_CONFIG) new ProvidersApi(DEFAULT_CONFIG)

29
web/src/pages/providers/ProviderWizard.ts → web/src/admin/providers/ProviderWizard.ts
View file

@ -1,22 +1,23 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/providers/ldap/LDAPProviderForm";
import "@goauthentik/web/elements/forms/ProxyForm"; import "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm";
import { paramURL } from "@goauthentik/web/elements/router/RouterOutlet"; import "@goauthentik/admin/providers/proxy/ProxyProviderForm";
import "@goauthentik/web/elements/wizard/FormWizardPage"; import "@goauthentik/admin/providers/saml/SAMLProviderForm";
import "@goauthentik/web/elements/wizard/Wizard"; import "@goauthentik/admin/providers/saml/SAMLProviderImportForm";
import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/pages/providers/ldap/LDAPProviderForm"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/pages/providers/oauth2/OAuth2ProviderForm"; import "@goauthentik/elements/forms/ProxyForm";
import "@goauthentik/web/pages/providers/proxy/ProxyProviderForm"; import { paramURL } from "@goauthentik/elements/router/RouterOutlet";
import "@goauthentik/web/pages/providers/saml/SAMLProviderForm"; import "@goauthentik/elements/wizard/FormWizardPage";
import "@goauthentik/web/pages/providers/saml/SAMLProviderImportForm"; import "@goauthentik/elements/wizard/Wizard";
import { WizardPage } from "@goauthentik/elements/wizard/WizardPage";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { customElement } from "@lit/reactive-element/decorators/custom-element.js"; import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { property } from "lit/decorators.js"; import { property } from "lit/decorators.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css";
import PFHint from "@patternfly/patternfly/components/Hint/hint.css"; import PFHint from "@patternfly/patternfly/components/Hint/hint.css";
@ -77,7 +78,7 @@ export class InitialProviderWizardPage extends WizardPage {
} }
@customElement("ak-provider-wizard") @customElement("ak-provider-wizard")
export class ProviderWizard extends LitElement { export class ProviderWizard extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [PFBase, PFButton, AKGlobal, PFRadio]; return [PFBase, PFButton, AKGlobal, PFRadio];
} }

11
web/src/pages/providers/RelatedApplicationButton.ts → web/src/admin/providers/RelatedApplicationButton.ts
View file

@ -1,10 +1,11 @@
import "@goauthentik/web/elements/Spinner"; import "@goauthentik/admin/applications/ApplicationForm";
import "@goauthentik/web/elements/forms/ModalForm"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/pages/applications/ApplicationForm"; import "@goauthentik/elements/Spinner";
import "@goauthentik/elements/forms/ModalForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
@ -13,7 +14,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { Provider } from "@goauthentik/api"; import { Provider } from "@goauthentik/api";
@customElement("ak-provider-related-application") @customElement("ak-provider-related-application")
export class RelatedApplicationButton extends LitElement { export class RelatedApplicationButton extends AKElement {
static get styles(): CSSResult[] { static get styles(): CSSResult[] {
return [PFBase, PFButton]; return [PFBase, PFButton];
} }

10
web/src/pages/providers/ldap/LDAPProviderForm.ts → web/src/admin/providers/ldap/LDAPProviderForm.ts
View file

@ -1,8 +1,8 @@
import { DEFAULT_CONFIG, tenant } from "@goauthentik/web/api/Config"; import { DEFAULT_CONFIG, tenant } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/forms/FormGroup"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/web/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/FormGroup";
import { ModelForm } from "@goauthentik/web/elements/forms/ModelForm"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { first } from "@goauthentik/web/utils"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";

27
web/src/pages/providers/ldap/LDAPProviderViewPage.ts → web/src/admin/providers/ldap/LDAPProviderViewPage.ts
View file

@ -1,22 +1,23 @@
import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config"; import "@goauthentik/admin/providers/RelatedApplicationButton";
import { me } from "@goauthentik/web/api/Users"; import "@goauthentik/admin/providers/ldap/LDAPProviderForm";
import { EVENT_REFRESH } from "@goauthentik/web/constants"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import "@goauthentik/web/elements/CodeMirror"; import { EVENT_REFRESH } from "@goauthentik/common/constants";
import "@goauthentik/web/elements/Tabs"; import { me } from "@goauthentik/common/users";
import "@goauthentik/web/elements/buttons/ModalButton"; import { AKElement } from "@goauthentik/elements/Base";
import "@goauthentik/web/elements/buttons/SpinnerButton"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/web/elements/events/ObjectChangelog"; import "@goauthentik/elements/Tabs";
import "@goauthentik/web/pages/providers/RelatedApplicationButton"; import "@goauthentik/elements/buttons/ModalButton";
import "@goauthentik/web/pages/providers/ldap/LDAPProviderForm"; import "@goauthentik/elements/buttons/SpinnerButton";
import "@goauthentik/elements/events/ObjectChangelog";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, LitElement, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { until } from "lit-html/directives/until.js"; import { until } from "lit-html/directives/until.js";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import AKGlobal from "@goauthentik/web/authentik.css"; import AKGlobal from "@goauthentik/common/styles/authentik.css";
import PFBanner from "@patternfly/patternfly/components/Banner/banner.css"; import PFBanner from "@patternfly/patternfly/components/Banner/banner.css";
import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css";
import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css";
@ -32,7 +33,7 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
import { LDAPProvider, ProvidersApi } from "@goauthentik/api"; import { LDAPProvider, ProvidersApi } from "@goauthentik/api";
@customElement("ak-provider-ldap-view") @customElement("ak-provider-ldap-view")
export class LDAPProviderViewPage extends LitElement { export class LDAPProviderViewPage extends AKElement {
@property() @property()
set args(value: { [key: string]: number }) { set args(value: { [key: string]: number }) {
this.providerID = value.id; this.providerID = value.id;

Some files were not shown because too many files have changed in this diff Show more