From da7635ae5c12d0b4eb51e6c950cc5063f497b8d0 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 21 Sep 2021 11:31:37 +0200 Subject: [PATCH] web: sort imports Signed-off-by: Jens Langhammer --- web/.prettierrc.json | 4 +- web/package-lock.json | 197 ++++++++++++++++++ web/package.json | 1 + web/poly.ts | 8 +- web/rollup.config.js | 12 +- web/src/common/ws.ts | 1 + web/src/elements/CodeMirror.ts | 23 +- web/src/elements/Divider.ts | 5 +- web/src/elements/EmptyState.ts | 10 +- web/src/elements/Expand.ts | 4 +- web/src/elements/Label.ts | 7 +- web/src/elements/LoadingOverlay.ts | 6 +- web/src/elements/PageHeader.ts | 13 +- web/src/elements/Spinner.ts | 4 +- web/src/elements/Tabs.ts | 7 +- web/src/elements/buttons/ActionButton.ts | 5 +- web/src/elements/buttons/Dropdown.ts | 3 +- web/src/elements/buttons/ModalButton.ts | 16 +- web/src/elements/buttons/SpinnerButton.ts | 8 +- web/src/elements/buttons/TokenCopyButton.ts | 4 +- web/src/elements/cards/AggregateCard.ts | 5 +- .../elements/cards/AggregatePromiseCard.ts | 3 +- web/src/elements/charts/AdminLoginsChart.ts | 7 +- .../charts/ApplicationAuthorizeChart.ts | 5 +- web/src/elements/charts/Chart.ts | 10 +- web/src/elements/charts/UserChart.ts | 11 +- web/src/elements/chips/Chip.ts | 4 +- web/src/elements/chips/ChipGroup.ts | 7 +- web/src/elements/events/ObjectChangelog.ts | 18 +- web/src/elements/events/UserEvents.ts | 18 +- web/src/elements/forms/ConfirmationForm.ts | 2 + web/src/elements/forms/DeleteBulkForm.ts | 16 +- web/src/elements/forms/DeleteForm.ts | 12 +- web/src/elements/forms/Form.ts | 22 +- web/src/elements/forms/FormElement.ts | 4 +- web/src/elements/forms/FormGroup.ts | 7 +- .../elements/forms/HorizontalFormElement.ts | 11 +- web/src/elements/forms/ModalForm.ts | 8 +- web/src/elements/forms/ModelForm.ts | 1 + web/src/elements/forms/ProxyForm.ts | 1 + web/src/elements/messages/Message.ts | 4 +- web/src/elements/messages/MessageContainer.ts | 8 +- web/src/elements/messages/Middleware.ts | 4 +- web/src/elements/notifications/APIDrawer.ts | 16 +- .../notifications/NotificationDrawer.ts | 18 +- web/src/elements/oauth/UserCodeList.ts | 10 +- web/src/elements/oauth/UserRefreshList.ts | 11 +- web/src/elements/router/RouteMatch.ts | 1 + web/src/elements/router/Router404.ts | 2 + web/src/elements/router/RouterOutlet.ts | 7 +- web/src/elements/sidebar/Sidebar.ts | 7 +- web/src/elements/sidebar/SidebarBrand.ts | 10 +- web/src/elements/sidebar/SidebarItem.ts | 12 +- web/src/elements/sidebar/SidebarUser.ts | 9 +- web/src/elements/table/Table.ts | 21 +- web/src/elements/table/TableModal.ts | 18 +- web/src/elements/table/TablePage.ts | 8 +- web/src/elements/table/TablePagination.ts | 11 +- web/src/elements/table/TableSearch.ts | 14 +- web/src/elements/user/SessionList.ts | 10 +- web/src/elements/user/UserConsentList.ts | 10 +- web/src/flows/FlowExecutor.ts | 59 +++--- web/src/flows/FormStatic.ts | 4 +- .../flows/access_denied/FlowAccessDenied.ts | 17 +- web/src/flows/sources/plex/PlexLoginInit.ts | 32 +-- .../AuthenticatorDuoStage.ts | 20 +- .../AuthenticatorStaticStage.ts | 20 +- .../AuthenticatorTOTPStage.ts | 26 ++- .../AuthenticatorValidateStage.ts | 20 +- .../AuthenticatorValidateStageCode.ts | 24 ++- .../AuthenticatorValidateStageDuo.ts | 22 +- .../AuthenticatorValidateStageWebAuthn.ts | 27 +-- .../WebAuthnAuthenticatorRegisterStage.ts | 22 +- .../stages/authenticator_webauthn/utils.ts | 5 +- .../stages/autosubmit/AutosubmitStage.ts | 14 +- web/src/flows/stages/base.ts | 3 +- web/src/flows/stages/captcha/CaptchaStage.ts | 24 ++- web/src/flows/stages/consent/ConsentStage.ts | 18 +- web/src/flows/stages/dummy/DummyStage.ts | 14 +- web/src/flows/stages/email/EmailStage.ts | 14 +- .../identification/IdentificationStage.ts | 18 +- .../flows/stages/password/PasswordStage.ts | 22 +- web/src/flows/stages/prompt/PromptStage.ts | 20 +- web/src/interfaces/AdminInterface.ts | 37 ++-- web/src/interfaces/FlowInterface.ts | 2 +- web/src/interfaces/UserInterface.ts | 41 ++-- web/src/interfaces/locale.ts | 4 +- .../pages/admin-overview/AdminOverviewPage.ts | 25 ++- .../admin-overview/TopApplicationsTable.ts | 11 +- .../admin-overview/cards/AdminStatusCard.ts | 3 +- .../admin-overview/cards/BackupStatusCard.ts | 5 +- .../admin-overview/cards/SystemStatusCard.ts | 3 + .../admin-overview/cards/VersionStatusCard.ts | 3 + .../admin-overview/cards/WorkerStatusCard.ts | 3 + .../admin-overview/charts/FlowStatusChart.ts | 16 +- .../charts/GroupCountStatusChart.ts | 8 +- .../charts/LDAPSyncStatusChart.ts | 16 +- .../charts/OutpostStatusChart.ts | 16 +- .../charts/PolicyStatusChart.ts | 16 +- .../charts/UserCountStatusChart.ts | 8 +- .../ApplicationCheckAccessForm.ts | 9 +- web/src/pages/applications/ApplicationForm.ts | 26 ++- .../pages/applications/ApplicationListPage.ts | 19 +- .../pages/applications/ApplicationViewPage.ts | 35 ++-- .../pages/crypto/CertificateGenerateForm.ts | 7 +- .../pages/crypto/CertificateKeyPairForm.ts | 11 +- .../crypto/CertificateKeyPairListPage.ts | 16 +- web/src/pages/events/EventInfo.ts | 18 +- web/src/pages/events/EventInfoPage.ts | 18 +- web/src/pages/events/EventListPage.ts | 3 + web/src/pages/events/RuleForm.ts | 11 +- web/src/pages/events/RuleListPage.ts | 16 +- web/src/pages/events/TransportForm.ts | 15 +- web/src/pages/events/TransportListPage.ts | 16 +- web/src/pages/events/utils.ts | 1 + web/src/pages/flows/BoundStagesList.ts | 24 ++- web/src/pages/flows/FlowDiagram.ts | 7 +- web/src/pages/flows/FlowForm.ts | 13 +- web/src/pages/flows/FlowImportForm.ts | 7 +- web/src/pages/flows/FlowListPage.ts | 16 +- web/src/pages/flows/FlowViewPage.ts | 29 +-- web/src/pages/flows/StageBindingForm.ts | 15 +- web/src/pages/groups/GroupForm.ts | 30 +-- web/src/pages/groups/GroupListPage.ts | 14 +- web/src/pages/groups/MemberSelectModal.ts | 9 +- .../pages/outposts/OutpostDeploymentModal.ts | 9 +- web/src/pages/outposts/OutpostForm.ts | 22 +- web/src/pages/outposts/OutpostHealth.ts | 10 +- web/src/pages/outposts/OutpostHealthSimple.ts | 14 +- web/src/pages/outposts/OutpostListPage.ts | 33 +-- .../outposts/ServiceConnectionDockerForm.ts | 13 +- .../ServiceConnectionKubernetesForm.ts | 22 +- .../outposts/ServiceConnectionListPage.ts | 32 +-- web/src/pages/policies/BoundPoliciesList.ts | 25 +-- web/src/pages/policies/PolicyBindingForm.ts | 18 +- web/src/pages/policies/PolicyListPage.ts | 22 +- web/src/pages/policies/PolicyTestForm.ts | 18 +- .../pages/policies/dummy/DummyPolicyForm.ts | 13 +- .../event_matcher/EventMatcherPolicyForm.ts | 15 +- .../pages/policies/expiry/ExpiryPolicyForm.ts | 13 +- .../expression/ExpressionPolicyForm.ts | 15 +- .../policies/hibp/HaveIBeenPwnedPolicyForm.ts | 13 +- .../policies/password/PasswordPolicyForm.ts | 13 +- .../reputation/IPReputationListPage.ts | 12 +- .../reputation/ReputationPolicyForm.ts | 13 +- .../reputation/UserReputationListPage.ts | 12 +- .../PropertyMappingLDAPForm.ts | 11 +- .../PropertyMappingListPage.ts | 26 +-- .../PropertyMappingNotification.ts | 11 +- .../PropertyMappingSAMLForm.ts | 11 +- .../PropertyMappingScopeForm.ts | 13 +- .../PropertyMappingTestForm.ts | 20 +- web/src/pages/providers/ProviderListPage.ts | 20 +- web/src/pages/providers/ProviderViewPage.ts | 14 +- .../providers/RelatedApplicationButton.ts | 7 +- .../pages/providers/ldap/LDAPProviderForm.ts | 17 +- .../providers/ldap/LDAPProviderViewPage.ts | 35 ++-- .../providers/oauth2/OAuth2ProviderForm.ts | 17 +- .../oauth2/OAuth2ProviderViewPage.ts | 39 ++-- .../providers/proxy/ProxyProviderForm.ts | 26 ++- .../providers/proxy/ProxyProviderViewPage.ts | 25 ++- .../pages/providers/saml/SAMLProviderForm.ts | 17 +- .../providers/saml/SAMLProviderImportForm.ts | 11 +- .../providers/saml/SAMLProviderViewPage.ts | 39 ++-- web/src/pages/sources/SourceViewPage.ts | 12 +- web/src/pages/sources/SourcesListPage.ts | 22 +- web/src/pages/sources/ldap/LDAPSourceForm.ts | 13 +- .../pages/sources/ldap/LDAPSourceViewPage.ts | 32 +-- .../pages/sources/oauth/OAuthSourceForm.ts | 15 +- .../sources/oauth/OAuthSourceViewPage.ts | 28 +-- web/src/pages/sources/plex/PlexSourceForm.ts | 17 +- .../pages/sources/plex/PlexSourceViewPage.ts | 28 +-- web/src/pages/sources/saml/SAMLSourceForm.ts | 15 +- .../pages/sources/saml/SAMLSourceViewPage.ts | 30 +-- web/src/pages/stages/StageListPage.ts | 25 +-- .../AuthenticatorDuoStageForm.ts | 17 +- .../AuthenticatorStaticStageForm.ts | 17 +- .../AuthenticatorTOTPStageForm.ts | 15 +- .../AuthenticatorValidateStageForm.ts | 15 +- .../AuthenticateWebAuthnStageForm.ts | 9 +- .../pages/stages/captcha/CaptchaStageForm.ts | 11 +- .../pages/stages/consent/ConsentStageForm.ts | 11 +- web/src/pages/stages/deny/DenyStageForm.ts | 9 +- web/src/pages/stages/dummy/DummyStageForm.ts | 9 +- web/src/pages/stages/email/EmailStageForm.ts | 15 +- .../identification/IdentificationStageForm.ts | 17 +- .../pages/stages/invitation/InvitationForm.ts | 20 +- .../stages/invitation/InvitationListLink.ts | 10 +- .../stages/invitation/InvitationListPage.ts | 14 +- .../stages/invitation/InvitationStageForm.ts | 13 +- .../stages/password/PasswordStageForm.ts | 17 +- web/src/pages/stages/prompt/PromptForm.ts | 11 +- web/src/pages/stages/prompt/PromptListPage.ts | 14 +- .../pages/stages/prompt/PromptStageForm.ts | 17 +- .../stages/user_delete/UserDeleteStageForm.ts | 9 +- .../stages/user_login/UserLoginStageForm.ts | 11 +- .../stages/user_logout/UserLogoutStageForm.ts | 9 +- .../stages/user_write/UserWriteStageForm.ts | 13 +- .../pages/system-tasks/SystemTaskListPage.ts | 15 +- web/src/pages/tenants/TenantForm.ts | 17 +- web/src/pages/tenants/TenantListPage.ts | 14 +- web/src/pages/tokens/TokenForm.ts | 17 +- web/src/pages/tokens/TokenListPage.ts | 14 +- web/src/pages/users/GroupSelectModal.ts | 9 +- web/src/pages/users/ServiceAccountForm.ts | 15 +- web/src/pages/users/UserActiveForm.ts | 4 +- web/src/pages/users/UserForm.ts | 26 ++- web/src/pages/users/UserListPage.ts | 25 ++- web/src/pages/users/UserResetEmailForm.ts | 9 +- web/src/pages/users/UserViewPage.ts | 40 ++-- web/src/routesAdmin.ts | 6 +- web/src/routesUser.ts | 2 +- web/src/user/LibraryApplication.ts | 12 +- web/src/user/LibraryPage.ts | 21 +- .../user/user-settings/BaseUserSettings.ts | 7 +- web/src/user/user-settings/UserSelfForm.ts | 9 +- .../user/user-settings/UserSettingsPage.ts | 26 +-- .../user-settings/sources/SourceSettings.ts | 9 +- .../sources/SourceSettingsOAuth.ts | 13 +- .../sources/SourceSettingsPlex.ts | 9 +- .../user-settings/stages/StageSettings.ts | 9 +- .../stages/UserSettingsAuthenticatorDuo.ts | 7 +- .../stages/UserSettingsAuthenticatorStatic.ts | 9 +- .../stages/UserSettingsAuthenticatorTOTP.ts | 7 +- .../UserSettingsAuthenticatorWebAuthn.ts | 18 +- .../stages/UserSettingsPassword.ts | 6 +- .../user-settings/tokens/UserTokenForm.ts | 9 +- .../user-settings/tokens/UserTokenList.ts | 19 +- web/src/utils.ts | 2 + 229 files changed, 2112 insertions(+), 1317 deletions(-) diff --git a/web/.prettierrc.json b/web/.prettierrc.json index bdb9c6487..c1093426d 100644 --- a/web/.prettierrc.json +++ b/web/.prettierrc.json @@ -14,5 +14,7 @@ "tabWidth": 4, "trailingComma": "all", "useTabs": false, - "vueIndentScriptAndStyle": false + "vueIndentScriptAndStyle": false, + "importOrder": ["^@lingui/(.*)$", "^lit(.*)$", "\\.css$", "^@goauthentik/api$", "^[./]"], + "importOrderSeparation": true } diff --git a/web/package-lock.json b/web/package-lock.json index 4101dbc3b..eb550d29d 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -28,6 +28,7 @@ "@sentry/browser": "^6.13.1", "@sentry/tracing": "^6.13.1", "@squoosh/cli": "^0.7.2", + "@trivago/prettier-plugin-sort-imports": "^2.0.4", "@types/chart.js": "^2.9.34", "@types/codemirror": "5.60.2", "@types/grecaptcha": "^3.0.3", @@ -2440,6 +2441,101 @@ "node": " ^12.5.0 || ^14.0.0 || ^16.0.0 " } }, + "node_modules/@trivago/prettier-plugin-sort-imports": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-2.0.4.tgz", + "integrity": "sha512-SCVUhQdbjn/Z4AY7b9JO00fZCeXxiVuarVxYP0n6cX2ijiQkE5HmGrOk32n0u385OebzQ9bZcrc51lAGLjXnFQ==", + "dependencies": { + "@babel/core": "7.13.10", + "@babel/generator": "7.13.9", + "@babel/parser": "7.13.10", + "@babel/traverse": "7.13.0", + "@babel/types": "7.13.0", + "@types/lodash": "4.14.168", + "javascript-natural-sort": "0.7.1", + "lodash": "4.17.21" + }, + "peerDependencies": { + "prettier": "2.x" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/core": { + "version": "7.13.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.10.tgz", + "integrity": "sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.9", + "@babel/helper-compilation-targets": "^7.13.10", + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helpers": "^7.13.10", + "@babel/parser": "^7.13.10", + "@babel/template": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "semver": "^6.3.0", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/generator": { + "version": "7.13.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz", + "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==", + "dependencies": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/parser": { + "version": "7.13.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.10.tgz", + "integrity": "sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dependencies": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, "node_modules/@types/chart.js": { "version": "2.9.34", "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.34.tgz", @@ -2536,6 +2632,11 @@ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" }, + "node_modules/@types/lodash": { + "version": "4.14.168", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz", + "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==" + }, "node_modules/@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -5264,6 +5365,11 @@ "node": ">=0.10.0" } }, + "node_modules/javascript-natural-sort": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", + "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=" + }, "node_modules/jest-get-type": { "version": "26.3.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", @@ -10253,6 +10359,87 @@ "web-streams-polyfill": "^3.0.3" } }, + "@trivago/prettier-plugin-sort-imports": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-2.0.4.tgz", + "integrity": "sha512-SCVUhQdbjn/Z4AY7b9JO00fZCeXxiVuarVxYP0n6cX2ijiQkE5HmGrOk32n0u385OebzQ9bZcrc51lAGLjXnFQ==", + "requires": { + "@babel/core": "7.13.10", + "@babel/generator": "7.13.9", + "@babel/parser": "7.13.10", + "@babel/traverse": "7.13.0", + "@babel/types": "7.13.0", + "@types/lodash": "4.14.168", + "javascript-natural-sort": "0.7.1", + "lodash": "4.17.21" + }, + "dependencies": { + "@babel/core": { + "version": "7.13.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.10.tgz", + "integrity": "sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==", + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.9", + "@babel/helper-compilation-targets": "^7.13.10", + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helpers": "^7.13.10", + "@babel/parser": "^7.13.10", + "@babel/template": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "semver": "^6.3.0", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.13.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz", + "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==", + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.13.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.10.tgz", + "integrity": "sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==" + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@types/chart.js": { "version": "2.9.34", "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.34.tgz", @@ -10348,6 +10535,11 @@ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" }, + "@types/lodash": { + "version": "4.14.168", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz", + "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==" + }, "@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -12324,6 +12516,11 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, + "javascript-natural-sort": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", + "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=" + }, "jest-get-type": { "version": "26.3.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", diff --git a/web/package.json b/web/package.json index b443ed9ad..c4716ba7a 100644 --- a/web/package.json +++ b/web/package.json @@ -60,6 +60,7 @@ "@sentry/browser": "^6.13.1", "@sentry/tracing": "^6.13.1", "@squoosh/cli": "^0.7.2", + "@trivago/prettier-plugin-sort-imports": "^2.0.4", "@types/chart.js": "^2.9.34", "@types/codemirror": "5.60.2", "@types/grecaptcha": "^3.0.3", diff --git a/web/poly.ts b/web/poly.ts index 43009f976..d66643fcd 100644 --- a/web/poly.ts +++ b/web/poly.ts @@ -1,5 +1,7 @@ +import "@webcomponents/webcomponentsjs"; +import "construct-style-sheets-polyfill"; + +import "lit/polyfill-support"; + // @ts-ignore window["polymerSkipLoadingFontRoboto"] = true; -import "construct-style-sheets-polyfill"; -import "@webcomponents/webcomponentsjs"; -import "lit/polyfill-support"; diff --git a/web/rollup.config.js b/web/rollup.config.js index f7f5d02e3..7a15f007e 100644 --- a/web/rollup.config.js +++ b/web/rollup.config.js @@ -1,11 +1,11 @@ -import resolve from "rollup-plugin-node-resolve"; -import commonjs from "rollup-plugin-commonjs"; -import { terser } from "rollup-plugin-terser"; -import sourcemaps from "rollup-plugin-sourcemaps"; -import cssimport from "rollup-plugin-cssimport"; -import copy from "rollup-plugin-copy"; import babel from "@rollup/plugin-babel"; import replace from "@rollup/plugin-replace"; +import commonjs from "rollup-plugin-commonjs"; +import copy from "rollup-plugin-copy"; +import cssimport from "rollup-plugin-cssimport"; +import resolve from "rollup-plugin-node-resolve"; +import sourcemaps from "rollup-plugin-sourcemaps"; +import { terser } from "rollup-plugin-terser"; const extensions = [".js", ".jsx", ".ts", ".tsx"]; diff --git a/web/src/common/ws.ts b/web/src/common/ws.ts index 94c7bac58..f7c3ee063 100644 --- a/web/src/common/ws.ts +++ b/web/src/common/ws.ts @@ -1,4 +1,5 @@ import { t } from "@lingui/macro"; + import { EVENT_WS_MESSAGE } from "../constants"; import { MessageLevel } from "../elements/messages/Message"; import { showMessage } from "../elements/messages/MessageContainer"; diff --git a/web/src/elements/CodeMirror.ts b/web/src/elements/CodeMirror.ts index 18d819374..bed336f6d 100644 --- a/web/src/elements/CodeMirror.ts +++ b/web/src/elements/CodeMirror.ts @@ -1,22 +1,23 @@ -import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; -import { customElement, property } from "lit/decorators"; - import CodeMirror from "codemirror"; +import "codemirror/addon/dialog/dialog"; import "codemirror/addon/display/autorefresh"; +import "codemirror/addon/hint/show-hint"; import "codemirror/addon/search/search"; import "codemirror/addon/search/searchcursor"; -import "codemirror/addon/dialog/dialog"; -import "codemirror/addon/hint/show-hint"; -import "codemirror/mode/xml/xml.js"; -import "codemirror/mode/yaml/yaml.js"; import "codemirror/mode/javascript/javascript.js"; import "codemirror/mode/python/python.js"; -import CodeMirrorStyle from "codemirror/lib/codemirror.css"; -import CodeMirrorTheme from "codemirror/theme/monokai.css"; +import "codemirror/mode/xml/xml.js"; +import "codemirror/mode/yaml/yaml.js"; +import YAML from "yaml"; + +import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; + import CodeMirrorDialogStyle from "codemirror/addon/dialog/dialog.css"; import CodeMirrorShowHintStyle from "codemirror/addon/hint/show-hint.css"; -import { ifDefined } from "lit/directives/if-defined"; -import YAML from "yaml"; +import CodeMirrorStyle from "codemirror/lib/codemirror.css"; +import CodeMirrorTheme from "codemirror/theme/monokai.css"; @customElement("ak-codemirror") export class CodeMirrorTextarea extends LitElement { diff --git a/web/src/elements/Divider.ts b/web/src/elements/Divider.ts index f6ee702c9..f673c8db7 100644 --- a/web/src/elements/Divider.ts +++ b/web/src/elements/Divider.ts @@ -1,8 +1,9 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../authentik.css"; import { customElement } from "lit/decorators"; +import AKGlobal from "../authentik.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + @customElement("ak-divider") export class Divider extends LitElement { static get styles(): CSSResult[] { diff --git a/web/src/elements/EmptyState.ts b/web/src/elements/EmptyState.ts index c8239f82a..60038dd2f 100644 --- a/web/src/elements/EmptyState.ts +++ b/web/src/elements/EmptyState.ts @@ -1,9 +1,11 @@ import { CSSResult, html, LitElement, TemplateResult } from "lit"; -import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import AKGlobal from "../authentik.css"; import { customElement, property } from "lit/decorators"; + +import AKGlobal from "../authentik.css"; +import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; +import PFTitle from "@patternfly/patternfly/components/Title/title.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { PFSize } from "./Spinner"; @customElement("ak-empty-state") diff --git a/web/src/elements/Expand.ts b/web/src/elements/Expand.ts index f26412bb2..f5f4c4ae2 100644 --- a/web/src/elements/Expand.ts +++ b/web/src/elements/Expand.ts @@ -1,8 +1,10 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; -import PFExpandableSection from "../../node_modules/@patternfly/patternfly/components/ExpandableSection/expandable-section.css"; import { customElement, property } from "lit/decorators"; +import PFExpandableSection from "../../node_modules/@patternfly/patternfly/components/ExpandableSection/expandable-section.css"; + @customElement("ak-expand") export class Expand extends LitElement { @property({ type: Boolean }) diff --git a/web/src/elements/Label.ts b/web/src/elements/Label.ts index 7adccdddc..d4e24dff7 100644 --- a/web/src/elements/Label.ts +++ b/web/src/elements/Label.ts @@ -1,9 +1,10 @@ import { CSSResult, html, LitElement, TemplateResult } from "lit"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFLabel from "@patternfly/patternfly/components/Label/label.css"; -import AKGlobal from "../authentik.css"; import { customElement, property } from "lit/decorators"; +import AKGlobal from "../authentik.css"; +import PFLabel from "@patternfly/patternfly/components/Label/label.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + export enum PFColor { Green = "pf-m-green", Orange = "pf-m-orange", diff --git a/web/src/elements/LoadingOverlay.ts b/web/src/elements/LoadingOverlay.ts index 1f88d86ab..92b289a03 100644 --- a/web/src/elements/LoadingOverlay.ts +++ b/web/src/elements/LoadingOverlay.ts @@ -1,8 +1,10 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { PFSize } from "./Spinner"; import { customElement, property } from "lit/decorators"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { PFSize } from "./Spinner"; + @customElement("ak-loading-overlay") export class LoadingOverlay extends LitElement { @property({ type: Boolean }) diff --git a/web/src/elements/PageHeader.ts b/web/src/elements/PageHeader.ts index 4017b9160..645fb8e8f 100644 --- a/web/src/elements/PageHeader.ts +++ b/web/src/elements/PageHeader.ts @@ -1,10 +1,15 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; + import AKGlobal from "../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { EventsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG, tenant } from "../api/Config"; import { EVENT_API_DRAWER_TOGGLE, EVENT_NOTIFICATION_DRAWER_TOGGLE, @@ -12,8 +17,6 @@ import { EVENT_SIDEBAR_TOGGLE, TITLE_DEFAULT, } from "../constants"; -import { DEFAULT_CONFIG, tenant } from "../api/Config"; -import { EventsApi } from "@goauthentik/api"; @customElement("ak-page-header") export class PageHeader extends LitElement { diff --git a/web/src/elements/Spinner.ts b/web/src/elements/Spinner.ts index 78a26d850..002362eea 100644 --- a/web/src/elements/Spinner.ts +++ b/web/src/elements/Spinner.ts @@ -1,8 +1,10 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; -import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css"; import { customElement, property } from "lit/decorators"; +import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css"; + export enum PFSize { Small = "pf-m-sm", Medium = "pf-m-md", diff --git a/web/src/elements/Tabs.ts b/web/src/elements/Tabs.ts index bc6fecde7..db402913c 100644 --- a/web/src/elements/Tabs.ts +++ b/web/src/elements/Tabs.ts @@ -1,11 +1,14 @@ +import { t } from "@lingui/macro"; + import { LitElement, html, CSSResult, TemplateResult, css } from "lit"; import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../authentik.css"; import PFTabs from "@patternfly/patternfly/components/Tabs/tabs.css"; import PFGlobal from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../authentik.css"; + import { CURRENT_CLASS, ROUTE_SEPARATOR } from "../constants"; -import { t } from "@lingui/macro"; @customElement("ak-tabs") export class Tabs extends LitElement { diff --git a/web/src/elements/buttons/ActionButton.ts b/web/src/elements/buttons/ActionButton.ts index 0446fccde..1bf36b967 100644 --- a/web/src/elements/buttons/ActionButton.ts +++ b/web/src/elements/buttons/ActionButton.ts @@ -1,7 +1,8 @@ import { customElement, property } from "lit/decorators"; -import { SpinnerButton } from "./SpinnerButton"; -import { showMessage } from "../messages/MessageContainer"; + import { MessageLevel } from "../messages/Message"; +import { showMessage } from "../messages/MessageContainer"; +import { SpinnerButton } from "./SpinnerButton"; @customElement("ak-action-button") export class ActionButton extends SpinnerButton { diff --git a/web/src/elements/buttons/Dropdown.ts b/web/src/elements/buttons/Dropdown.ts index ac9da36f7..2d9047b9a 100644 --- a/web/src/elements/buttons/Dropdown.ts +++ b/web/src/elements/buttons/Dropdown.ts @@ -5,9 +5,10 @@ import { customElement } from "lit/decorators"; export class DropdownButton extends LitElement { constructor() { super(); - const menu = this.querySelector(".pf-c-dropdown__menu"); + const menu = this.querySelector(".pf-c-dropdown__menu"); this.querySelectorAll("button.pf-c-dropdown__toggle").forEach((btn) => { btn.addEventListener("click", () => { + if (!menu) return; menu.hidden = !menu.hidden; }); }); diff --git a/web/src/elements/buttons/ModalButton.ts b/web/src/elements/buttons/ModalButton.ts index 74173bfbf..7b447c35e 100644 --- a/web/src/elements/buttons/ModalButton.ts +++ b/web/src/elements/buttons/ModalButton.ts @@ -1,17 +1,19 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import AKGlobal from "../../authentik.css"; +import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; -import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css"; +import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import AKGlobal from "../../authentik.css"; +import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { PFSize } from "../Spinner"; export const MODAL_BUTTON_STYLES = css` diff --git a/web/src/elements/buttons/SpinnerButton.ts b/web/src/elements/buttons/SpinnerButton.ts index 20a88494e..d76ea5b9d 100644 --- a/web/src/elements/buttons/SpinnerButton.ts +++ b/web/src/elements/buttons/SpinnerButton.ts @@ -1,11 +1,13 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import AKGlobal from "../../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFSpinner from "@patternfly/patternfly/components/Spinner/spinner.css"; -import AKGlobal from "../../authentik.css"; -import { PFSize } from "../Spinner"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { ERROR_CLASS, PROGRESS_CLASS, SUCCESS_CLASS } from "../../constants"; +import { PFSize } from "../Spinner"; @customElement("ak-spinner-button") export class SpinnerButton extends LitElement { diff --git a/web/src/elements/buttons/TokenCopyButton.ts b/web/src/elements/buttons/TokenCopyButton.ts index 9914a1cfc..7ae9417f4 100644 --- a/web/src/elements/buttons/TokenCopyButton.ts +++ b/web/src/elements/buttons/TokenCopyButton.ts @@ -1,7 +1,9 @@ import { customElement, property } from "lit/decorators"; + import { CoreApi } from "@goauthentik/api"; -import { ERROR_CLASS, SECONDARY_CLASS, SUCCESS_CLASS } from "../../constants"; + import { DEFAULT_CONFIG } from "../../api/Config"; +import { ERROR_CLASS, SECONDARY_CLASS, SUCCESS_CLASS } from "../../constants"; import { ActionButton } from "./ActionButton"; @customElement("ak-token-copy-button") diff --git a/web/src/elements/cards/AggregateCard.ts b/web/src/elements/cards/AggregateCard.ts index ebc73b90c..595cb8a7c 100644 --- a/web/src/elements/cards/AggregateCard.ts +++ b/web/src/elements/cards/AggregateCard.ts @@ -1,10 +1,11 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import AKGlobal from "../../authentik.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css"; -import AKGlobal from "../../authentik.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; @customElement("ak-aggregate-card") export class AggregateCard extends LitElement { diff --git a/web/src/elements/cards/AggregatePromiseCard.ts b/web/src/elements/cards/AggregatePromiseCard.ts index 273d1c57b..fd2f85a1e 100644 --- a/web/src/elements/cards/AggregatePromiseCard.ts +++ b/web/src/elements/cards/AggregatePromiseCard.ts @@ -1,9 +1,10 @@ import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { until } from "lit/directives/until"; -import { AggregateCard } from "./AggregateCard"; + import "../Spinner"; import { PFSize } from "../Spinner"; +import { AggregateCard } from "./AggregateCard"; @customElement("ak-aggregate-card-promise") export class AggregatePromiseCard extends AggregateCard { diff --git a/web/src/elements/charts/AdminLoginsChart.ts b/web/src/elements/charts/AdminLoginsChart.ts index 13f6026d1..116c17465 100644 --- a/web/src/elements/charts/AdminLoginsChart.ts +++ b/web/src/elements/charts/AdminLoginsChart.ts @@ -1,8 +1,11 @@ -import { customElement } from "lit/decorators"; import { ChartData } from "chart.js"; + +import { customElement } from "lit/decorators"; + import { AdminApi, LoginMetrics } from "@goauthentik/api"; -import { AKChart } from "./Chart"; + import { DEFAULT_CONFIG } from "../../api/Config"; +import { AKChart } from "./Chart"; @customElement("ak-charts-admin-login") export class AdminLoginsChart extends AKChart { diff --git a/web/src/elements/charts/ApplicationAuthorizeChart.ts b/web/src/elements/charts/ApplicationAuthorizeChart.ts index 7fd966918..fb0c7fcfe 100644 --- a/web/src/elements/charts/ApplicationAuthorizeChart.ts +++ b/web/src/elements/charts/ApplicationAuthorizeChart.ts @@ -1,8 +1,11 @@ +import { ChartData } from "chart.js"; + import { customElement, property } from "lit/decorators"; + import { Coordinate, CoreApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../api/Config"; import { AKChart } from "./Chart"; -import { ChartData } from "chart.js"; @customElement("ak-charts-application-authorize") export class ApplicationAuthorizeChart extends AKChart { diff --git a/web/src/elements/charts/Chart.ts b/web/src/elements/charts/Chart.ts index 13074c7aa..980d673d5 100644 --- a/web/src/elements/charts/Chart.ts +++ b/web/src/elements/charts/Chart.ts @@ -1,13 +1,15 @@ -import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; -import { property } from "lit/decorators"; import { Chart, Plugin, Tick, ChartConfiguration, ChartData, ChartOptions } from "chart.js"; import { Legend, Tooltip } from "chart.js"; import { DoughnutController, LineController, BarController } from "chart.js"; import { ArcElement, BarElement } from "chart.js"; import { TimeScale, LinearScale } from "chart.js"; import "chartjs-adapter-moment"; -import { FONT_COLOUR_DARK_MODE, FONT_COLOUR_LIGHT_MODE } from "../../pages/flows/FlowDiagram"; + +import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; +import { property } from "lit/decorators"; + import { EVENT_REFRESH } from "../../constants"; +import { FONT_COLOUR_DARK_MODE, FONT_COLOUR_LIGHT_MODE } from "../../pages/flows/FlowDiagram"; Chart.register(Legend, Tooltip); Chart.register(LineController, BarController, DoughnutController); @@ -68,7 +70,7 @@ export abstract class AKChart extends LitElement { firstUpdated(): void { this.apiRequest().then((r) => { - const canvas = this.shadowRoot?.querySelector("canvas"); + const canvas = this.shadowRoot?.querySelector("canvas"); if (!canvas) { console.warn("Failed to get canvas element"); return false; diff --git a/web/src/elements/charts/UserChart.ts b/web/src/elements/charts/UserChart.ts index f68b6cd4b..7f12f09ba 100644 --- a/web/src/elements/charts/UserChart.ts +++ b/web/src/elements/charts/UserChart.ts @@ -1,9 +1,12 @@ -import { customElement, property } from "lit/decorators"; -import { CoreApi, UserMetrics } from "@goauthentik/api"; -import { AKChart } from "./Chart"; -import { DEFAULT_CONFIG } from "../../api/Config"; import { ChartData } from "chart.js"; +import { customElement, property } from "lit/decorators"; + +import { CoreApi, UserMetrics } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import { AKChart } from "./Chart"; + @customElement("ak-charts-user") export class UserChart extends AKChart { @property({ type: Number }) diff --git a/web/src/elements/chips/Chip.ts b/web/src/elements/chips/Chip.ts index 4f3d350f9..1a611fd81 100644 --- a/web/src/elements/chips/Chip.ts +++ b/web/src/elements/chips/Chip.ts @@ -1,10 +1,10 @@ import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import AKGlobal from "../../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFChip from "@patternfly/patternfly/components/Chip/chip.css"; -import AKGlobal from "../../authentik.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; @customElement("ak-chip") export class Chip extends LitElement { diff --git a/web/src/elements/chips/ChipGroup.ts b/web/src/elements/chips/ChipGroup.ts index 7ab30c936..089188eab 100644 --- a/web/src/elements/chips/ChipGroup.ts +++ b/web/src/elements/chips/ChipGroup.ts @@ -1,11 +1,12 @@ import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import AKGlobal from "../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFChip from "@patternfly/patternfly/components/Chip/chip.css"; import PFChipGroup from "@patternfly/patternfly/components/ChipGroup/chip-group.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import AKGlobal from "../../authentik.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { Chip } from "./Chip"; @customElement("ak-chip-group") diff --git a/web/src/elements/events/ObjectChangelog.ts b/web/src/elements/events/ObjectChangelog.ts index 8101522d1..0aff068c7 100644 --- a/web/src/elements/events/ObjectChangelog.ts +++ b/web/src/elements/events/ObjectChangelog.ts @@ -1,18 +1,20 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../table/Table"; + import { Event, EventsApi } from "@goauthentik/api"; -import "../Tabs"; -import "../buttons/ModalButton"; -import "../buttons/SpinnerButton"; -import "../buttons/Dropdown"; -import "../../pages/events/EventInfo"; -import { PAGE_SIZE } from "../../constants"; +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { EventWithContext } from "../../api/Events"; +import { PAGE_SIZE } from "../../constants"; +import "../../pages/events/EventInfo"; +import "../Tabs"; +import "../buttons/Dropdown"; +import "../buttons/ModalButton"; +import "../buttons/SpinnerButton"; +import { Table, TableColumn } from "../table/Table"; @customElement("ak-object-changelog") export class ObjectChangelog extends Table { diff --git a/web/src/elements/events/UserEvents.ts b/web/src/elements/events/UserEvents.ts index 6595e2184..d19f658e9 100644 --- a/web/src/elements/events/UserEvents.ts +++ b/web/src/elements/events/UserEvents.ts @@ -1,18 +1,20 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../table/Table"; + import { Event, EventsApi } from "@goauthentik/api"; -import "../Tabs"; -import "../buttons/ModalButton"; -import "../buttons/SpinnerButton"; -import "../buttons/Dropdown"; -import "../../pages/events/EventInfo"; -import { PAGE_SIZE } from "../../constants"; +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { EventWithContext } from "../../api/Events"; +import { PAGE_SIZE } from "../../constants"; +import "../../pages/events/EventInfo"; +import "../Tabs"; +import "../buttons/Dropdown"; +import "../buttons/ModalButton"; +import "../buttons/SpinnerButton"; +import { Table, TableColumn } from "../table/Table"; @customElement("ak-events-user") export class ObjectChangelog extends Table { diff --git a/web/src/elements/forms/ConfirmationForm.ts b/web/src/elements/forms/ConfirmationForm.ts index ece7525e6..ec870a8f5 100644 --- a/web/src/elements/forms/ConfirmationForm.ts +++ b/web/src/elements/forms/ConfirmationForm.ts @@ -1,6 +1,8 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + import { EVENT_REFRESH } from "../../constants"; import { ModalButton } from "../buttons/ModalButton"; import "../buttons/SpinnerButton"; diff --git a/web/src/elements/forms/DeleteBulkForm.ts b/web/src/elements/forms/DeleteBulkForm.ts index 146927204..8ecf1f61e 100644 --- a/web/src/elements/forms/DeleteBulkForm.ts +++ b/web/src/elements/forms/DeleteBulkForm.ts @@ -1,17 +1,21 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; + +import PFList from "@patternfly/patternfly/components/List/list.css"; + +import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { EVENT_REFRESH } from "../../constants"; +import { PFSize } from "../Spinner"; import { ModalButton } from "../buttons/ModalButton"; +import "../buttons/SpinnerButton"; import { MessageLevel } from "../messages/Message"; import { showMessage } from "../messages/MessageContainer"; -import "../buttons/SpinnerButton"; -import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; -import PFList from "@patternfly/patternfly/components/List/list.css"; -import { until } from "lit/directives/until"; import { Table, TableColumn } from "../table/Table"; -import { AKResponse } from "../../api/Client"; -import { PFSize } from "../Spinner"; type BulkDeleteMetadata = { key: string; value: string }[]; diff --git a/web/src/elements/forms/DeleteForm.ts b/web/src/elements/forms/DeleteForm.ts index ecb3ea5ad..cff61079a 100644 --- a/web/src/elements/forms/DeleteForm.ts +++ b/web/src/elements/forms/DeleteForm.ts @@ -1,14 +1,18 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; + +import PFList from "@patternfly/patternfly/components/List/list.css"; + +import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; + import { EVENT_REFRESH } from "../../constants"; import { ModalButton } from "../buttons/ModalButton"; +import "../buttons/SpinnerButton"; import { MessageLevel } from "../messages/Message"; import { showMessage } from "../messages/MessageContainer"; -import "../buttons/SpinnerButton"; -import { UsedBy, UsedByActionEnum } from "@goauthentik/api"; -import PFList from "@patternfly/patternfly/components/List/list.css"; -import { until } from "lit/directives/until"; @customElement("ak-forms-delete") export class DeleteForm extends ModalButton { diff --git a/web/src/elements/forms/Form.ts b/web/src/elements/forms/Form.ts index 4d52ec87b..da3c75133 100644 --- a/web/src/elements/forms/Form.ts +++ b/web/src/elements/forms/Form.ts @@ -1,22 +1,26 @@ -import "@polymer/paper-input/paper-input"; import "@polymer/iron-form/iron-form"; +import { IronFormElement } from "@polymer/iron-form/iron-form"; +import "@polymer/paper-input/paper-input"; import { PaperInputElement } from "@polymer/paper-input/paper-input"; -import { showMessage } from "../../elements/messages/MessageContainer"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; + import AKGlobal from "../../authentik.css"; +import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-group.css"; -import { MessageLevel } from "../messages/Message"; -import { IronFormElement } from "@polymer/iron-form/iron-form"; -import { camelToSnake, convertToSlug } from "../../utils"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { ValidationError } from "@goauthentik/api"; + import { EVENT_REFRESH } from "../../constants"; +import { showMessage } from "../../elements/messages/MessageContainer"; +import { camelToSnake, convertToSlug } from "../../utils"; +import { MessageLevel } from "../messages/Message"; export class APIError extends Error { constructor(public response: ValidationError) { diff --git a/web/src/elements/forms/FormElement.ts b/web/src/elements/forms/FormElement.ts index 99ff428cd..71d0d0011 100644 --- a/web/src/elements/forms/FormElement.ts +++ b/web/src/elements/forms/FormElement.ts @@ -1,8 +1,10 @@ import { LitElement, CSSResult, css } from "lit"; -import { customElement, property } from "lit/decorators"; import { TemplateResult, html } from "lit"; +import { customElement, property } from "lit/decorators"; + import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; + import { ErrorDetail } from "@goauthentik/api"; @customElement("ak-form-element") diff --git a/web/src/elements/forms/FormGroup.ts b/web/src/elements/forms/FormGroup.ts index 87bf214bf..3e8f752d6 100644 --- a/web/src/elements/forms/FormGroup.ts +++ b/web/src/elements/forms/FormGroup.ts @@ -1,10 +1,11 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFForm from "@patternfly/patternfly/components/Form/form.css"; -import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; + import AKGlobal from "../../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFForm from "@patternfly/patternfly/components/Form/form.css"; +import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; @customElement("ak-form-group") export class FormGroup extends LitElement { diff --git a/web/src/elements/forms/HorizontalFormElement.ts b/web/src/elements/forms/HorizontalFormElement.ts index bf0a9330d..527c53d68 100644 --- a/web/src/elements/forms/HorizontalFormElement.ts +++ b/web/src/elements/forms/HorizontalFormElement.ts @@ -1,11 +1,14 @@ +import { t } from "@lingui/macro"; + import { LitElement, CSSResult, css } from "lit"; -import { customElement, property } from "lit/decorators"; import { TemplateResult, html } from "lit"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import { customElement, property } from "lit/decorators"; + +import AKGlobal from "../../authentik.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import AKGlobal from "../../authentik.css"; -import { t } from "@lingui/macro"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { FormGroup } from "./FormGroup"; @customElement("ak-form-element-horizontal") diff --git a/web/src/elements/forms/ModalForm.ts b/web/src/elements/forms/ModalForm.ts index 4a217e465..49b3739a6 100644 --- a/web/src/elements/forms/ModalForm.ts +++ b/web/src/elements/forms/ModalForm.ts @@ -1,11 +1,13 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + import { EVENT_REFRESH } from "../../constants"; -import { ModalButton } from "../buttons/ModalButton"; -import { Form } from "./Form"; -import "../buttons/SpinnerButton"; import "../LoadingOverlay"; +import { ModalButton } from "../buttons/ModalButton"; +import "../buttons/SpinnerButton"; +import { Form } from "./Form"; @customElement("ak-forms-modal") export class ModalForm extends ModalButton { diff --git a/web/src/elements/forms/ModelForm.ts b/web/src/elements/forms/ModelForm.ts index e3f53b109..52cd35808 100644 --- a/web/src/elements/forms/ModelForm.ts +++ b/web/src/elements/forms/ModelForm.ts @@ -1,5 +1,6 @@ import { TemplateResult } from "lit"; import { property } from "lit/decorators"; + import { EVENT_REFRESH } from "../../constants"; import { Form } from "./Form"; diff --git a/web/src/elements/forms/ProxyForm.ts b/web/src/elements/forms/ProxyForm.ts index f57806d66..9a551fa2f 100644 --- a/web/src/elements/forms/ProxyForm.ts +++ b/web/src/elements/forms/ProxyForm.ts @@ -1,5 +1,6 @@ import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + import { Form } from "./Form"; @customElement("ak-proxy-form") diff --git a/web/src/elements/messages/Message.ts b/web/src/elements/messages/Message.ts index c2ceed649..4a844e9a9 100644 --- a/web/src/elements/messages/Message.ts +++ b/web/src/elements/messages/Message.ts @@ -1,10 +1,10 @@ import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css"; import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; export enum MessageLevel { error = "error", diff --git a/web/src/elements/messages/MessageContainer.ts b/web/src/elements/messages/MessageContainer.ts index 0c3307b79..32ed8a706 100644 --- a/web/src/elements/messages/MessageContainer.ts +++ b/web/src/elements/messages/MessageContainer.ts @@ -1,11 +1,13 @@ import { LitElement, html, TemplateResult, CSSResult, css } from "lit"; import { customElement, property } from "lit/decorators"; -import "./Message"; -import { APIMessage } from "./Message"; + import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { EVENT_WS_MESSAGE, WS_MSG_TYPE_MESSAGE } from "../../constants"; + import { WSMessage } from "../../common/ws"; +import { EVENT_WS_MESSAGE, WS_MSG_TYPE_MESSAGE } from "../../constants"; +import "./Message"; +import { APIMessage } from "./Message"; export function showMessage(message: APIMessage): void { const container = document.querySelector("ak-message-container"); diff --git a/web/src/elements/messages/Middleware.ts b/web/src/elements/messages/Middleware.ts index 5a06b3dbd..f51d3580f 100644 --- a/web/src/elements/messages/Middleware.ts +++ b/web/src/elements/messages/Middleware.ts @@ -1,5 +1,7 @@ -import { Middleware, ResponseContext } from "@goauthentik/api"; import { t } from "@lingui/macro"; + +import { Middleware, ResponseContext } from "@goauthentik/api"; + import { MessageLevel } from "./Message"; import { showMessage } from "./MessageContainer"; diff --git a/web/src/elements/notifications/APIDrawer.ts b/web/src/elements/notifications/APIDrawer.ts index e8a4a9571..832204d0a 100644 --- a/web/src/elements/notifications/APIDrawer.ts +++ b/web/src/elements/notifications/APIDrawer.ts @@ -1,13 +1,17 @@ -import { Middleware, ResponseContext } from "@goauthentik/api"; +import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css"; -import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; + +import AKGlobal from "../../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import AKGlobal from "../../authentik.css"; -import { t } from "@lingui/macro"; +import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; +import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { Middleware, ResponseContext } from "@goauthentik/api"; + import { EVENT_API_DRAWER_REFRESH, EVENT_API_DRAWER_TOGGLE } from "../../constants"; export interface RequestInfo { diff --git a/web/src/elements/notifications/NotificationDrawer.ts b/web/src/elements/notifications/NotificationDrawer.ts index 9d4d5113e..04e85bb0d 100644 --- a/web/src/elements/notifications/NotificationDrawer.ts +++ b/web/src/elements/notifications/NotificationDrawer.ts @@ -1,19 +1,23 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + +import AKGlobal from "../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; +import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { EventsApi, Notification } from "@goauthentik/api"; + import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFNotificationDrawer from "@patternfly/patternfly/components/NotificationDrawer/notification-drawer.css"; -import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import AKGlobal from "../../authentik.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; import { EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_REFRESH } from "../../constants"; import { ActionToLabel } from "../../pages/events/utils"; -import { showMessage } from "../messages/MessageContainer"; import { MessageLevel } from "../messages/Message"; +import { showMessage } from "../messages/MessageContainer"; @customElement("ak-notification-drawer") export class NotificationDrawer extends LitElement { diff --git a/web/src/elements/oauth/UserCodeList.ts b/web/src/elements/oauth/UserCodeList.ts index 89a0d7a25..b66de5b85 100644 --- a/web/src/elements/oauth/UserCodeList.ts +++ b/web/src/elements/oauth/UserCodeList.ts @@ -1,13 +1,15 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../table/Table"; -import "../forms/DeleteBulkForm"; -import { PAGE_SIZE } from "../../constants"; import { ExpiringBaseGrantModel, Oauth2Api } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../forms/DeleteBulkForm"; +import { Table, TableColumn } from "../table/Table"; @customElement("ak-user-oauth-code-list") export class UserOAuthCodeList extends Table { diff --git a/web/src/elements/oauth/UserRefreshList.ts b/web/src/elements/oauth/UserRefreshList.ts index 4c435a0fa..8f3f9b17a 100644 --- a/web/src/elements/oauth/UserRefreshList.ts +++ b/web/src/elements/oauth/UserRefreshList.ts @@ -1,14 +1,17 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../table/Table"; + import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css"; -import "../forms/DeleteBulkForm"; -import { PAGE_SIZE } from "../../constants"; import { RefreshTokenModel, Oauth2Api, ExpiringBaseGrantModel } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../forms/DeleteBulkForm"; +import { Table, TableColumn } from "../table/Table"; @customElement("ak-user-oauth-refresh-list") export class UserOAuthRefreshList extends Table { diff --git a/web/src/elements/router/RouteMatch.ts b/web/src/elements/router/RouteMatch.ts index 3113cc581..cda3235ab 100644 --- a/web/src/elements/router/RouteMatch.ts +++ b/web/src/elements/router/RouteMatch.ts @@ -1,4 +1,5 @@ import { TemplateResult } from "lit"; + import { Route } from "./Route"; export class RouteMatch { diff --git a/web/src/elements/router/Router404.ts b/web/src/elements/router/Router404.ts index 8783635f1..558f9e749 100644 --- a/web/src/elements/router/Router404.ts +++ b/web/src/elements/router/Router404.ts @@ -1,6 +1,8 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; diff --git a/web/src/elements/router/RouterOutlet.ts b/web/src/elements/router/RouterOutlet.ts index 2e493c07b..2b9faf1fd 100644 --- a/web/src/elements/router/RouterOutlet.ts +++ b/web/src/elements/router/RouterOutlet.ts @@ -1,11 +1,12 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { Route } from "./Route"; -import { RouteMatch } from "./RouteMatch"; + import AKGlobal from "../../authentik.css"; -import "./Router404"; import { ROUTE_SEPARATOR } from "../../constants"; +import { Route } from "./Route"; +import { RouteMatch } from "./RouteMatch"; +import "./Router404"; // Poliyfill for hashchange.newURL, // https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onhashchange diff --git a/web/src/elements/sidebar/Sidebar.ts b/web/src/elements/sidebar/Sidebar.ts index fefa8cc96..b6bdbbbf7 100644 --- a/web/src/elements/sidebar/Sidebar.ts +++ b/web/src/elements/sidebar/Sidebar.ts @@ -1,9 +1,10 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import AKGlobal from "../../authentik.css"; +import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; import "./SidebarBrand"; import "./SidebarUser"; diff --git a/web/src/elements/sidebar/SidebarBrand.ts b/web/src/elements/sidebar/SidebarBrand.ts index 83933a6a0..6afef8424 100644 --- a/web/src/elements/sidebar/SidebarBrand.ts +++ b/web/src/elements/sidebar/SidebarBrand.ts @@ -1,15 +1,17 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + +import AKGlobal from "../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; import PFGlobal from "@patternfly/patternfly/patternfly-base.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../authentik.css"; -import { configureSentry } from "../../api/Sentry"; import { CurrentTenant } from "@goauthentik/api"; -import { EVENT_SIDEBAR_TOGGLE } from "../../constants"; + import { tenant } from "../../api/Config"; +import { configureSentry } from "../../api/Sentry"; +import { EVENT_SIDEBAR_TOGGLE } from "../../constants"; import { first } from "../../utils"; // If the viewport is wider than MIN_WIDTH, the sidebar diff --git a/web/src/elements/sidebar/SidebarItem.ts b/web/src/elements/sidebar/SidebarItem.ts index 9c1a42a62..63011f66a 100644 --- a/web/src/elements/sidebar/SidebarItem.ts +++ b/web/src/elements/sidebar/SidebarItem.ts @@ -1,11 +1,13 @@ import { css, CSSResult, LitElement } from "lit"; -import { customElement, property } from "lit/decorators"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../authentik.css"; import { TemplateResult, html } from "lit"; +import { customElement, property } from "lit/decorators"; import { until } from "lit/directives/until"; + +import AKGlobal from "../../authentik.css"; +import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { ROUTE_SEPARATOR } from "../../constants"; @customElement("ak-sidebar-item") diff --git a/web/src/elements/sidebar/SidebarUser.ts b/web/src/elements/sidebar/SidebarUser.ts index 40ac50c39..9c6e6fe63 100644 --- a/web/src/elements/sidebar/SidebarUser.ts +++ b/web/src/elements/sidebar/SidebarUser.ts @@ -1,12 +1,13 @@ import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; -import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; -import { me } from "../../api/Users"; +import { ifDefined } from "lit/directives/if-defined"; import { until } from "lit/directives/until"; + +import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; +import PFNav from "@patternfly/patternfly/components/Nav/nav.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import { ifDefined } from "lit/directives/if-defined"; +import { me } from "../../api/Users"; @customElement("ak-sidebar-user") export class SidebarUser extends LitElement { diff --git a/web/src/elements/table/Table.ts b/web/src/elements/table/Table.ts index 595894d58..6ba782130 100644 --- a/web/src/elements/table/Table.ts +++ b/web/src/elements/table/Table.ts @@ -1,24 +1,25 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; +import { ifDefined } from "lit/directives/if-defined"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFTable from "@patternfly/patternfly/components/Table/table.css"; -import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; +import AKGlobal from "../../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css"; import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; import PFPagination from "@patternfly/patternfly/components/Pagination/pagination.css"; -import AKGlobal from "../../authentik.css"; +import PFTable from "@patternfly/patternfly/components/Table/table.css"; +import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css"; +import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import "./TablePagination"; -import "./TableSearch"; +import { AKResponse } from "../../api/Client"; +import { EVENT_REFRESH } from "../../constants"; import "../EmptyState"; import "../chips/Chip"; import "../chips/ChipGroup"; -import { EVENT_REFRESH } from "../../constants"; -import { ifDefined } from "lit/directives/if-defined"; +import "./TablePagination"; +import "./TableSearch"; export class TableColumn { title: string; diff --git a/web/src/elements/table/TableModal.ts b/web/src/elements/table/TableModal.ts index 2c7862207..783651f9b 100644 --- a/web/src/elements/table/TableModal.ts +++ b/web/src/elements/table/TableModal.ts @@ -1,16 +1,18 @@ import { CSSResult, LitElement } from "lit"; -import { property } from "lit/decorators"; import { html, TemplateResult } from "lit"; -import { Table } from "./Table"; -import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css"; -import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; -import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css"; -import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import { property } from "lit/decorators"; + import AKGlobal from "../../authentik.css"; +import PFBackdrop from "@patternfly/patternfly/components/Backdrop/backdrop.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFModalBox from "@patternfly/patternfly/components/ModalBox/modal-box.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBullseye from "@patternfly/patternfly/layouts/Bullseye/bullseye.css"; +import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css"; + import { PFSize } from "../Spinner"; import { MODAL_BUTTON_STYLES } from "../buttons/ModalButton"; +import { Table } from "./Table"; export abstract class TableModal extends Table { @property() diff --git a/web/src/elements/table/TablePage.ts b/web/src/elements/table/TablePage.ts index 203c6cde1..6118f1c9c 100644 --- a/web/src/elements/table/TablePage.ts +++ b/web/src/elements/table/TablePage.ts @@ -1,10 +1,12 @@ import { CSSResult } from "lit"; import { html, TemplateResult } from "lit"; import { ifDefined } from "lit/directives/if-defined"; -import { Table } from "./Table"; -import "../../elements/PageHeader"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; + import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; + +import "../../elements/PageHeader"; +import { Table } from "./Table"; export abstract class TablePage extends Table { abstract pageTitle(): string; diff --git a/web/src/elements/table/TablePagination.ts b/web/src/elements/table/TablePagination.ts index 75ce831f5..2613d90f7 100644 --- a/web/src/elements/table/TablePagination.ts +++ b/web/src/elements/table/TablePagination.ts @@ -1,11 +1,14 @@ +import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKPagination } from "../../api/Client"; -import { t } from "@lingui/macro"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import AKGlobal from "../../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFPagination from "@patternfly/patternfly/components/Pagination/pagination.css"; -import AKGlobal from "../../authentik.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { AKPagination } from "../../api/Client"; @customElement("ak-table-pagination") export class TablePagination extends LitElement { diff --git a/web/src/elements/table/TableSearch.ts b/web/src/elements/table/TableSearch.ts index 94d2ec84a..321cee8ad 100644 --- a/web/src/elements/table/TableSearch.ts +++ b/web/src/elements/table/TableSearch.ts @@ -1,13 +1,15 @@ +import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css"; -import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-group.css"; -import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; + import AKGlobal from "../../authentik.css"; -import { t } from "@lingui/macro"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFInputGroup from "@patternfly/patternfly/components/InputGroup/input-group.css"; +import PFToolbar from "@patternfly/patternfly/components/Toolbar/toolbar.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; @customElement("ak-table-search") export class TableSearch extends LitElement { diff --git a/web/src/elements/user/SessionList.ts b/web/src/elements/user/SessionList.ts index 3c486937e..08999f542 100644 --- a/web/src/elements/user/SessionList.ts +++ b/web/src/elements/user/SessionList.ts @@ -1,13 +1,15 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../table/Table"; -import "../forms/DeleteBulkForm"; -import { PAGE_SIZE } from "../../constants"; import { CoreApi, AuthenticatedSession } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../forms/DeleteBulkForm"; +import { Table, TableColumn } from "../table/Table"; @customElement("ak-user-session-list") export class AuthenticatedSessionList extends Table { diff --git a/web/src/elements/user/UserConsentList.ts b/web/src/elements/user/UserConsentList.ts index 549ccfcd4..feaca37af 100644 --- a/web/src/elements/user/UserConsentList.ts +++ b/web/src/elements/user/UserConsentList.ts @@ -1,13 +1,15 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../table/Table"; -import "../forms/DeleteBulkForm"; -import { PAGE_SIZE } from "../../constants"; import { CoreApi, UserConsent } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../forms/DeleteBulkForm"; +import { Table, TableColumn } from "../table/Table"; @customElement("ak-user-consent-list") export class UserConsentList extends Table { diff --git a/web/src/flows/FlowExecutor.ts b/web/src/flows/FlowExecutor.ts index ca34b862d..01b755c1a 100644 --- a/web/src/flows/FlowExecutor.ts +++ b/web/src/flows/FlowExecutor.ts @@ -1,32 +1,18 @@ import { t } from "@lingui/macro"; + import { LitElement, html, TemplateResult, CSSResult, css } from "lit"; import { customElement, property } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFBackgroundImage from "@patternfly/patternfly/components/BackgroundImage/background-image.css"; -import PFList from "@patternfly/patternfly/components/List/list.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import AKGlobal from "../authentik.css"; - import { unsafeHTML } from "lit/directives/unsafe-html"; -import "../elements/LoadingOverlay"; -import "./access_denied/FlowAccessDenied"; -import "./stages/authenticator_static/AuthenticatorStaticStage"; -import "./stages/authenticator_totp/AuthenticatorTOTPStage"; -import "./stages/authenticator_duo/AuthenticatorDuoStage"; -import "./stages/authenticator_validate/AuthenticatorValidateStage"; -import "./stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage"; -import "./stages/autosubmit/AutosubmitStage"; -import "./stages/captcha/CaptchaStage"; -import "./stages/consent/ConsentStage"; -import "./stages/dummy/DummyStage"; -import "./stages/email/EmailStage"; -import "./stages/identification/IdentificationStage"; -import "./stages/password/PasswordStage"; -import "./stages/prompt/PromptStage"; -import "./sources/plex/PlexLoginInit"; -import { StageHost } from "./stages/base"; +import { until } from "lit/directives/until"; + +import AKGlobal from "../authentik.css"; +import PFBackgroundImage from "@patternfly/patternfly/components/BackgroundImage/background-image.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFList from "@patternfly/patternfly/components/List/list.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import PFTitle from "@patternfly/patternfly/components/Title/title.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { ChallengeChoices, CurrentTenant, @@ -36,13 +22,30 @@ import { RedirectChallenge, ShellChallenge, } from "@goauthentik/api"; + import { DEFAULT_CONFIG, tenant } from "../api/Config"; -import { until } from "lit/directives/until"; -import { TITLE_DEFAULT } from "../constants"; import { configureSentry } from "../api/Sentry"; import { WebsocketClient } from "../common/ws"; -import { first } from "../utils"; +import { TITLE_DEFAULT } from "../constants"; +import "../elements/LoadingOverlay"; import { DefaultTenant } from "../elements/sidebar/SidebarBrand"; +import { first } from "../utils"; +import "./access_denied/FlowAccessDenied"; +import "./sources/plex/PlexLoginInit"; +import "./stages/authenticator_duo/AuthenticatorDuoStage"; +import "./stages/authenticator_static/AuthenticatorStaticStage"; +import "./stages/authenticator_totp/AuthenticatorTOTPStage"; +import "./stages/authenticator_validate/AuthenticatorValidateStage"; +import "./stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage"; +import "./stages/autosubmit/AutosubmitStage"; +import { StageHost } from "./stages/base"; +import "./stages/captcha/CaptchaStage"; +import "./stages/consent/ConsentStage"; +import "./stages/dummy/DummyStage"; +import "./stages/email/EmailStage"; +import "./stages/identification/IdentificationStage"; +import "./stages/password/PasswordStage"; +import "./stages/prompt/PromptStage"; @customElement("ak-flow-executor") export class FlowExecutor extends LitElement implements StageHost { diff --git a/web/src/flows/FormStatic.ts b/web/src/flows/FormStatic.ts index 3b10e15d8..5393d8848 100644 --- a/web/src/flows/FormStatic.ts +++ b/web/src/flows/FormStatic.ts @@ -1,9 +1,11 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; import { ifDefined } from "lit/directives/if-defined"; +import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; + @customElement("ak-form-static") export class FormStatic extends LitElement { @property() diff --git a/web/src/flows/access_denied/FlowAccessDenied.ts b/web/src/flows/access_denied/FlowAccessDenied.ts index 468180a3d..941161010 100644 --- a/web/src/flows/access_denied/FlowAccessDenied.ts +++ b/web/src/flows/access_denied/FlowAccessDenied.ts @@ -1,17 +1,20 @@ -import { AccessDeniedChallenge, FlowChallengeResponseRequest } from "@goauthentik/api"; +import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import { BaseStage } from "../stages/base"; + +import AKGlobal from "../../authentik.css"; +import PFForm from "@patternfly/patternfly/components/Form/form.css"; +import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFList from "@patternfly/patternfly/components/List/list.css"; import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFForm from "@patternfly/patternfly/components/Form/form.css"; -import PFList from "@patternfly/patternfly/components/List/list.css"; -import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import AKGlobal from "../../authentik.css"; -import { t } from "@lingui/macro"; + +import { AccessDeniedChallenge, FlowChallengeResponseRequest } from "@goauthentik/api"; import "../../elements/EmptyState"; +import { BaseStage } from "../stages/base"; @customElement("ak-stage-access-denied") export class FlowAccessDenied extends BaseStage< diff --git a/web/src/flows/sources/plex/PlexLoginInit.ts b/web/src/flows/sources/plex/PlexLoginInit.ts index a18ad3fcb..a6c78f118 100644 --- a/web/src/flows/sources/plex/PlexLoginInit.ts +++ b/web/src/flows/sources/plex/PlexLoginInit.ts @@ -1,24 +1,28 @@ import { t } from "@lingui/macro"; + +import { CSSResult } from "lit"; +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFForm from "@patternfly/patternfly/components/Form/form.css"; +import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import PFTitle from "@patternfly/patternfly/components/Title/title.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { PlexAuthenticationChallenge, PlexAuthenticationChallengeResponseRequest, } from "@goauthentik/api"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; -import PFForm from "@patternfly/patternfly/components/Form/form.css"; -import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { CSSResult } from "lit"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; +import { SourcesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { MessageLevel } from "../../../elements/messages/Message"; +import { showMessage } from "../../../elements/messages/MessageContainer"; import { BaseStage } from "../../stages/base"; import { PlexAPIClient, popupCenterScreen } from "./API"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { SourcesApi } from "@goauthentik/api"; -import { showMessage } from "../../../elements/messages/MessageContainer"; -import { MessageLevel } from "../../../elements/messages/Message"; @customElement("ak-flow-sources-plex") export class PlexLoginInit extends BaseStage< diff --git a/web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts b/web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts index af05fb4e8..c0c25d603 100644 --- a/web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts +++ b/web/src/flows/stages/authenticator_duo/AuthenticatorDuoStage.ts @@ -1,24 +1,28 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; -import "../../FormStatic"; + import { AuthenticatorDuoChallenge, AuthenticatorDuoChallengeResponseRequest, StagesApi, } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import "../../FormStatic"; +import { BaseStage } from "../base"; @customElement("ak-stage-authenticator-duo") export class AuthenticatorDuoStage extends BaseStage< diff --git a/web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts b/web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts index 73f8df752..6432997c9 100644 --- a/web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts +++ b/web/src/flows/stages/authenticator_static/AuthenticatorStaticStage.ts @@ -1,22 +1,26 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; -import "../../FormStatic"; + import { AuthenticatorStaticChallenge, AuthenticatorStaticChallengeResponseRequest, } from "@goauthentik/api"; -import { ifDefined } from "lit/directives/if-defined"; + +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import "../../FormStatic"; +import { BaseStage } from "../base"; export const STATIC_TOKEN_STYLE = css` /* Static OTP Tokens */ diff --git a/web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts b/web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts index 8049a2ef6..d43aaed09 100644 --- a/web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts +++ b/web/src/flows/stages/authenticator_totp/AuthenticatorTOTPStage.ts @@ -1,26 +1,30 @@ +import "webcomponent-qr-code"; + import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import "webcomponent-qr-code"; -import "../../../elements/forms/FormElement"; -import { showMessage } from "../../../elements/messages/MessageContainer"; -import "../../../elements/EmptyState"; -import "../../FormStatic"; -import { MessageLevel } from "../../../elements/messages/Message"; + import { AuthenticatorTOTPChallenge, AuthenticatorTOTPChallengeResponseRequest, } from "@goauthentik/api"; -import { ifDefined } from "lit/directives/if-defined"; + +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import { MessageLevel } from "../../../elements/messages/Message"; +import { showMessage } from "../../../elements/messages/MessageContainer"; +import "../../FormStatic"; +import { BaseStage } from "../base"; @customElement("ak-stage-authenticator-totp") export class AuthenticatorTOTPStage extends BaseStage< diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts index 79addc3f7..892a80ec9 100644 --- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts +++ b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts @@ -1,24 +1,28 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage, StageHost } from "../base"; -import "./AuthenticatorValidateStageWebAuthn"; -import "./AuthenticatorValidateStageCode"; -import "./AuthenticatorValidateStageDuo"; -import { PasswordManagerPrefill } from "../identification/IdentificationStage"; + import { AuthenticatorValidationChallenge, AuthenticatorValidationChallengeResponseRequest, DeviceChallenge, } from "@goauthentik/api"; +import { BaseStage, StageHost } from "../base"; +import { PasswordManagerPrefill } from "../identification/IdentificationStage"; +import "./AuthenticatorValidateStageCode"; +import "./AuthenticatorValidateStageDuo"; +import "./AuthenticatorValidateStageWebAuthn"; + export enum DeviceClasses { STATIC = "static", TOTP = "totp", diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts index 635ed885c..f5dd8732f 100644 --- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts +++ b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts @@ -1,25 +1,29 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import { AuthenticatorValidateStage } from "./AuthenticatorValidateStage"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; -import { PasswordManagerPrefill } from "../identification/IdentificationStage"; -import "../../FormStatic"; + import { AuthenticatorValidationChallenge, AuthenticatorValidationChallengeResponseRequest, DeviceChallenge, } from "@goauthentik/api"; -import { ifDefined } from "lit/directives/if-defined"; + +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import "../../FormStatic"; +import { BaseStage } from "../base"; +import { PasswordManagerPrefill } from "../identification/IdentificationStage"; +import { AuthenticatorValidateStage } from "./AuthenticatorValidateStage"; @customElement("ak-stage-authenticator-validate-code") export class AuthenticatorValidateStageWebCode extends BaseStage< diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts index 5772059ef..420730c63 100644 --- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts +++ b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts @@ -1,24 +1,28 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import { AuthenticatorValidateStage } from "./AuthenticatorValidateStage"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; -import "../../FormStatic"; + import { AuthenticatorValidationChallenge, AuthenticatorValidationChallengeResponseRequest, DeviceChallenge, } from "@goauthentik/api"; -import { ifDefined } from "lit/directives/if-defined"; + +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import "../../FormStatic"; +import { BaseStage } from "../base"; +import { AuthenticatorValidateStage } from "./AuthenticatorValidateStage"; @customElement("ak-stage-authenticator-validate-duo") export class AuthenticatorValidateStageWebDuo extends BaseStage< diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts index 2354068f7..80b3bac37 100644 --- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts +++ b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts @@ -1,13 +1,22 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; + +import { + AuthenticatorValidationChallenge, + AuthenticatorValidationChallengeResponseRequest, + DeviceChallenge, +} from "@goauthentik/api"; + import { PFSize } from "../../../elements/Spinner"; import { transformAssertionForServer, @@ -15,11 +24,6 @@ import { } from "../authenticator_webauthn/utils"; import { BaseStage } from "../base"; import { AuthenticatorValidateStage } from "./AuthenticatorValidateStage"; -import { - AuthenticatorValidationChallenge, - AuthenticatorValidationChallengeResponseRequest, - DeviceChallenge, -} from "@goauthentik/api"; @customElement("ak-stage-authenticator-validate-webauthn") export class AuthenticatorValidateStageWebAuthn extends BaseStage< @@ -45,9 +49,8 @@ export class AuthenticatorValidateStageWebAuthn extends BaseStage< async authenticate(): Promise { // convert certain members of the PublicKeyCredentialRequestOptions into // byte arrays as expected by the spec. - const credentialRequestOptions = ( - this.deviceChallenge?.challenge - ); + const credentialRequestOptions = this.deviceChallenge + ?.challenge as PublicKeyCredentialRequestOptions; const transformedCredentialRequestOptions = transformCredentialRequestOptions(credentialRequestOptions); @@ -68,7 +71,7 @@ export class AuthenticatorValidateStageWebAuthn extends BaseStage< // we now have an authentication assertion! encode the byte arrays contained // in the assertion data as strings for posting to the server const transformedAssertionForServer = transformAssertionForServer( - assertion, + assertion as PublicKeyCredential, ); // post the assertion to the server for verification. diff --git a/web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts b/web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts index 490a07692..b9249a7e9 100644 --- a/web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts +++ b/web/src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts @@ -1,13 +1,21 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; + +import { + AuthenticatorWebAuthnChallenge, + AuthenticatorWebAuthnChallengeResponseRequest, +} from "@goauthentik/api"; + import { PFSize } from "../../../elements/Spinner"; import { BaseStage } from "../base"; import { @@ -15,10 +23,6 @@ import { transformCredentialCreateOptions, transformNewAssertionForServer, } from "./utils"; -import { - AuthenticatorWebAuthnChallenge, - AuthenticatorWebAuthnChallengeResponseRequest, -} from "@goauthentik/api"; export interface WebAuthnAuthenticatorRegisterChallengeResponse { response: Assertion; @@ -52,9 +56,9 @@ export class WebAuthnAuthenticatorRegisterStage extends BaseStage< // request the authenticator(s) to create a new credential keypair. let credential; try { - credential = await navigator.credentials.create({ + credential = (await navigator.credentials.create({ publicKey: publicKeyCredentialCreateOptions, - }); + })) as PublicKeyCredential; if (!credential) { throw new Error("Credential is empty"); } diff --git a/web/src/flows/stages/authenticator_webauthn/utils.ts b/web/src/flows/stages/authenticator_webauthn/utils.ts index 86aa60b4e..bae6640a4 100644 --- a/web/src/flows/stages/authenticator_webauthn/utils.ts +++ b/web/src/flows/stages/authenticator_webauthn/utils.ts @@ -1,4 +1,5 @@ import * as base64js from "base64-js"; + import { hexEncode } from "../../../utils"; export function b64enc(buf: Uint8Array): string { @@ -44,7 +45,7 @@ export interface Assertion { */ export function transformNewAssertionForServer(newAssertion: PublicKeyCredential): Assertion { const attObj = new Uint8Array( - (newAssertion.response).attestationObject, + (newAssertion.response as AuthenticatorAttestationResponse).attestationObject, ); const clientDataJSON = new Uint8Array(newAssertion.response.clientDataJSON); const rawId = new Uint8Array(newAssertion.rawId); @@ -101,7 +102,7 @@ export interface AuthAssertion { * @param {PublicKeyCredential} newAssertion */ export function transformAssertionForServer(newAssertion: PublicKeyCredential): AuthAssertion { - const response = newAssertion.response; + const response = newAssertion.response as AuthenticatorAssertionResponse; const authData = new Uint8Array(response.authenticatorData); const clientDataJSON = new Uint8Array(response.clientDataJSON); const rawId = new Uint8Array(newAssertion.rawId); diff --git a/web/src/flows/stages/autosubmit/AutosubmitStage.ts b/web/src/flows/stages/autosubmit/AutosubmitStage.ts index 718387b85..0bf754c8d 100644 --- a/web/src/flows/stages/autosubmit/AutosubmitStage.ts +++ b/web/src/flows/stages/autosubmit/AutosubmitStage.ts @@ -1,17 +1,21 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import "../../../elements/EmptyState"; + import { AutosubmitChallenge, AutoSubmitChallengeResponseRequest } from "@goauthentik/api"; +import "../../../elements/EmptyState"; +import { BaseStage } from "../base"; + @customElement("ak-stage-autosubmit") export class AutosubmitStage extends BaseStage< AutosubmitChallenge, diff --git a/web/src/flows/stages/base.ts b/web/src/flows/stages/base.ts index cfc6b2f53..83381bb24 100644 --- a/web/src/flows/stages/base.ts +++ b/web/src/flows/stages/base.ts @@ -1,7 +1,8 @@ -import { ErrorDetail } from "@goauthentik/api"; import { html, LitElement, TemplateResult } from "lit"; import { property } from "lit/decorators"; +import { ErrorDetail } from "@goauthentik/api"; + export interface StageHost { challenge?: unknown; submit(payload: unknown): Promise; diff --git a/web/src/flows/stages/captcha/CaptchaStage.ts b/web/src/flows/stages/captcha/CaptchaStage.ts index 5f99b9edd..44d2ee8a5 100644 --- a/web/src/flows/stages/captcha/CaptchaStage.ts +++ b/web/src/flows/stages/captcha/CaptchaStage.ts @@ -1,20 +1,24 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; -import { customElement, property } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { PFSize } from "../../../elements/Spinner"; -import { BaseStage } from "../base"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; -import "../../FormStatic"; + import { CaptchaChallenge, CaptchaChallengeResponseRequest } from "@goauthentik/api"; -import { ifDefined } from "lit/directives/if-defined"; + +import "../../../elements/EmptyState"; +import { PFSize } from "../../../elements/Spinner"; +import "../../../elements/forms/FormElement"; +import "../../FormStatic"; +import { BaseStage } from "../base"; @customElement("ak-stage-captcha") export class CaptchaStage extends BaseStage { diff --git a/web/src/flows/stages/consent/ConsentStage.ts b/web/src/flows/stages/consent/ConsentStage.ts index a5736f0b7..db96e2c53 100644 --- a/web/src/flows/stages/consent/ConsentStage.ts +++ b/web/src/flows/stages/consent/ConsentStage.ts @@ -1,20 +1,24 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; -import PFList from "@patternfly/patternfly/components/List/list.css"; +import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFList from "@patternfly/patternfly/components/List/list.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFSpacing from "@patternfly/patternfly/utilities/Spacing/spacing.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; + +import { ConsentChallenge, ConsentChallengeResponseRequest } from "@goauthentik/api"; + import "../../../elements/EmptyState"; import "../../FormStatic"; -import { ConsentChallenge, ConsentChallengeResponseRequest } from "@goauthentik/api"; -import { ifDefined } from "lit/directives/if-defined"; +import { BaseStage } from "../base"; @customElement("ak-stage-consent") export class ConsentStage extends BaseStage { diff --git a/web/src/flows/stages/dummy/DummyStage.ts b/web/src/flows/stages/dummy/DummyStage.ts index 5fa17f7cc..533b5d442 100644 --- a/web/src/flows/stages/dummy/DummyStage.ts +++ b/web/src/flows/stages/dummy/DummyStage.ts @@ -1,17 +1,21 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; + +import { DummyChallenge, DummyChallengeResponseRequest } from "@goauthentik/api"; + import "../../../elements/EmptyState"; import "../../FormStatic"; -import { DummyChallenge, DummyChallengeResponseRequest } from "@goauthentik/api"; +import { BaseStage } from "../base"; @customElement("ak-stage-dummy") export class DummyStage extends BaseStage { diff --git a/web/src/flows/stages/email/EmailStage.ts b/web/src/flows/stages/email/EmailStage.ts index fea006741..d4bc22029 100644 --- a/web/src/flows/stages/email/EmailStage.ts +++ b/web/src/flows/stages/email/EmailStage.ts @@ -1,17 +1,21 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import "../../../elements/EmptyState"; + import { EmailChallenge, EmailChallengeResponseRequest } from "@goauthentik/api"; +import "../../../elements/EmptyState"; +import { BaseStage } from "../base"; + @customElement("ak-stage-email") export class EmailStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/flows/stages/identification/IdentificationStage.ts b/web/src/flows/stages/identification/IdentificationStage.ts index f2322844d..e9223f8ee 100644 --- a/web/src/flows/stages/identification/IdentificationStage.ts +++ b/web/src/flows/stages/identification/IdentificationStage.ts @@ -1,17 +1,17 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import { BaseStage } from "../base"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; -import AKGlobal from "../../../authentik.css"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; + import { IdentificationChallenge, IdentificationChallengeResponseRequest, @@ -19,6 +19,10 @@ import { UserFieldsEnum, } from "@goauthentik/api"; +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import { BaseStage } from "../base"; + export const PasswordManagerPrefill: { password: string | undefined; totp: string | undefined; diff --git a/web/src/flows/stages/password/PasswordStage.ts b/web/src/flows/stages/password/PasswordStage.ts index c9310aa10..a739ee200 100644 --- a/web/src/flows/stages/password/PasswordStage.ts +++ b/web/src/flows/stages/password/PasswordStage.ts @@ -1,20 +1,24 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; +import { ifDefined } from "lit/directives/if-defined"; + +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; -import { PasswordManagerPrefill } from "../identification/IdentificationStage"; -import "../../FormStatic"; + import { PasswordChallenge, PasswordChallengeResponseRequest } from "@goauthentik/api"; -import { ifDefined } from "lit/directives/if-defined"; + +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import "../../FormStatic"; +import { BaseStage } from "../base"; +import { PasswordManagerPrefill } from "../identification/IdentificationStage"; @customElement("ak-stage-password") export class PasswordStage extends BaseStage { diff --git a/web/src/flows/stages/prompt/PromptStage.ts b/web/src/flows/stages/prompt/PromptStage.ts index 5e7037b7c..e7e50679c 100644 --- a/web/src/flows/stages/prompt/PromptStage.ts +++ b/web/src/flows/stages/prompt/PromptStage.ts @@ -1,21 +1,25 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; import { unsafeHTML } from "lit/directives/unsafe-html"; -import PFLogin from "@patternfly/patternfly/components/Login/login.css"; + +import AKGlobal from "../../../authentik.css"; +import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFLogin from "@patternfly/patternfly/components/Login/login.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFAlert from "@patternfly/patternfly/components/Alert/alert.css"; -import AKGlobal from "../../../authentik.css"; -import { BaseStage } from "../base"; -import "../../../elements/forms/FormElement"; -import "../../../elements/EmptyState"; -import "../../../elements/Divider"; + import { PromptChallenge, PromptChallengeResponseRequest, StagePrompt } from "@goauthentik/api"; +import "../../../elements/Divider"; +import "../../../elements/EmptyState"; +import "../../../elements/forms/FormElement"; +import { BaseStage } from "../base"; + @customElement("ak-stage-prompt") export class PromptStage extends BaseStage { static get styles(): CSSResult[] { diff --git a/web/src/interfaces/AdminInterface.ts b/web/src/interfaces/AdminInterface.ts index c7aaf574a..cc439026e 100644 --- a/web/src/interfaces/AdminInterface.ts +++ b/web/src/interfaces/AdminInterface.ts @@ -1,32 +1,35 @@ -import "../elements/messages/MessageContainer"; +import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { me } from "../api/Users"; -import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "../elements/router/Route"; -import "./locale"; -import "../elements/sidebar/SidebarItem"; -import { t } from "@lingui/macro"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import { until } from "lit/directives/until"; + +import AKGlobal from "../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css"; -import AKGlobal from "../authentik.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import "../elements/router/RouterOutlet"; -import "../elements/messages/MessageContainer"; -import "../elements/notifications/NotificationDrawer"; -import "../elements/sidebar/Sidebar"; -import { until } from "lit/directives/until"; +import { AdminApi, Version } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../api/Config"; +import { me } from "../api/Users"; +import { WebsocketClient } from "../common/ws"; import { EVENT_API_DRAWER_TOGGLE, EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_SIDEBAR_TOGGLE, VERSION, } from "../constants"; -import { AdminApi, Version } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../api/Config"; -import { WebsocketClient } from "../common/ws"; +import "../elements/messages/MessageContainer"; +import "../elements/messages/MessageContainer"; +import "../elements/notifications/NotificationDrawer"; +import { ID_REGEX, SLUG_REGEX, UUID_REGEX } from "../elements/router/Route"; +import "../elements/router/RouterOutlet"; +import "../elements/sidebar/Sidebar"; +import "../elements/sidebar/SidebarItem"; import { ROUTES } from "../routesAdmin"; +import "./locale"; @customElement("ak-interface-admin") export class AdminInterface extends LitElement { diff --git a/web/src/interfaces/FlowInterface.ts b/web/src/interfaces/FlowInterface.ts index e6c5b10c6..a32fe968a 100644 --- a/web/src/interfaces/FlowInterface.ts +++ b/web/src/interfaces/FlowInterface.ts @@ -1,3 +1,3 @@ -import "./locale"; import "../elements/messages/MessageContainer"; import "../flows/FlowExecutor"; +import "./locale"; diff --git a/web/src/interfaces/UserInterface.ts b/web/src/interfaces/UserInterface.ts index b64b019aa..207beb9d7 100644 --- a/web/src/interfaces/UserInterface.ts +++ b/web/src/interfaces/UserInterface.ts @@ -1,37 +1,40 @@ -import "../elements/messages/MessageContainer"; +import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { me } from "../api/Users"; -import "./locale"; -import "../elements/sidebar/SidebarItem"; -import { t } from "@lingui/macro"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import { until } from "lit/directives/until"; + +import AKGlobal from "../authentik.css"; +import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; import PFBrand from "@patternfly/patternfly/components/Brand/brand.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFDrawer from "@patternfly/patternfly/components/Drawer/drawer.css"; -import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; import PFNotificationBadge from "@patternfly/patternfly/components/NotificationBadge/notification-badge.css"; -import AKGlobal from "../authentik.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import "../elements/router/RouterOutlet"; -import "../elements/messages/MessageContainer"; -import "../elements/notifications/NotificationDrawer"; -import "../elements/sidebar/Sidebar"; +import { CurrentTenant, EventsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG, tenant } from "../api/Config"; +import { me } from "../api/Users"; +import { WebsocketClient } from "../common/ws"; import { EVENT_API_DRAWER_TOGGLE, EVENT_NOTIFICATION_DRAWER_TOGGLE, EVENT_REFRESH, } from "../constants"; -import { CurrentTenant, EventsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG, tenant } from "../api/Config"; -import { WebsocketClient } from "../common/ws"; -import { ROUTES } from "../routesUser"; -import { first } from "../utils"; +import "../elements/messages/MessageContainer"; +import "../elements/messages/MessageContainer"; +import "../elements/notifications/NotificationDrawer"; +import "../elements/router/RouterOutlet"; +import "../elements/sidebar/Sidebar"; import { DefaultTenant } from "../elements/sidebar/SidebarBrand"; -import { until } from "lit/directives/until"; +import "../elements/sidebar/SidebarItem"; +import { ROUTES } from "../routesUser"; import { uiConfig } from "../user/config"; +import { first } from "../utils"; +import "./locale"; @customElement("ak-interface-user") export class UserInterface extends LitElement { diff --git a/web/src/interfaces/locale.ts b/web/src/interfaces/locale.ts index a545ae580..cfb1ab476 100644 --- a/web/src/interfaces/locale.ts +++ b/web/src/interfaces/locale.ts @@ -1,5 +1,7 @@ -import { i18n } from "@lingui/core"; import { en } from "make-plural/plurals"; + +import { i18n } from "@lingui/core"; + import { messages as localeEN } from "../locales/en"; import { messages as localeDEBUG } from "../locales/pseudo-LOCALE"; diff --git a/web/src/pages/admin-overview/AdminOverviewPage.ts b/web/src/pages/admin-overview/AdminOverviewPage.ts index c2e925f5c..bae96e324 100644 --- a/web/src/pages/admin-overview/AdminOverviewPage.ts +++ b/web/src/pages/admin-overview/AdminOverviewPage.ts @@ -1,29 +1,28 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import "../../elements/charts/AdminLoginsChart"; -import "../../elements/cards/AggregatePromiseCard"; -import "./TopApplicationsTable"; +import AKGlobal from "../../authentik.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; +import "../../elements/PageHeader"; +import "../../elements/cards/AggregatePromiseCard"; +import "../../elements/charts/AdminLoginsChart"; +import "./TopApplicationsTable"; import "./cards/AdminStatusCard"; import "./cards/BackupStatusCard"; +import "./cards/SystemStatusCard"; import "./cards/VersionStatusCard"; import "./cards/WorkerStatusCard"; -import "./cards/SystemStatusCard"; - import "./charts/FlowStatusChart"; +import "./charts/GroupCountStatusChart"; import "./charts/LDAPSyncStatusChart"; import "./charts/OutpostStatusChart"; -import "./charts/UserCountStatusChart"; -import "./charts/GroupCountStatusChart"; import "./charts/PolicyStatusChart"; - -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; -import AKGlobal from "../../authentik.css"; -import "../../elements/PageHeader"; +import "./charts/UserCountStatusChart"; @customElement("ak-admin-overview") export class AdminOverviewPage extends LitElement { diff --git a/web/src/pages/admin-overview/TopApplicationsTable.ts b/web/src/pages/admin-overview/TopApplicationsTable.ts index 4f9c628cb..998d95cf0 100644 --- a/web/src/pages/admin-overview/TopApplicationsTable.ts +++ b/web/src/pages/admin-overview/TopApplicationsTable.ts @@ -1,12 +1,15 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { EventsApi, EventTopPerUser } from "@goauthentik/api"; -import PFTable from "@patternfly/patternfly/components/Table/table.css"; -import AKGlobal from "../../authentik.css"; -import "../../elements/Spinner"; +import AKGlobal from "../../authentik.css"; +import PFTable from "@patternfly/patternfly/components/Table/table.css"; + +import { EventsApi, EventTopPerUser } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/Spinner"; @customElement("ak-top-applications-table") export class TopApplicationsTable extends LitElement { diff --git a/web/src/pages/admin-overview/cards/AdminStatusCard.ts b/web/src/pages/admin-overview/cards/AdminStatusCard.ts index 049473987..03511d92e 100644 --- a/web/src/pages/admin-overview/cards/AdminStatusCard.ts +++ b/web/src/pages/admin-overview/cards/AdminStatusCard.ts @@ -1,8 +1,9 @@ import { html, TemplateResult } from "lit"; import { until } from "lit/directives/until"; + import { EVENT_REFRESH } from "../../../constants"; -import { AggregateCard } from "../../../elements/cards/AggregateCard"; import { PFSize } from "../../../elements/Spinner"; +import { AggregateCard } from "../../../elements/cards/AggregateCard"; export interface AdminStatus { icon: string; diff --git a/web/src/pages/admin-overview/cards/BackupStatusCard.ts b/web/src/pages/admin-overview/cards/BackupStatusCard.ts index 4d78b4baf..f3117c446 100644 --- a/web/src/pages/admin-overview/cards/BackupStatusCard.ts +++ b/web/src/pages/admin-overview/cards/BackupStatusCard.ts @@ -1,10 +1,13 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import { AdminStatus, AdminStatusCard } from "./AdminStatusCard"; + import { AdminApi, StatusEnum, CapabilitiesEnum } from "@goauthentik/api"; + import { config, DEFAULT_CONFIG } from "../../../api/Config"; import { convertToTitle } from "../../../utils"; +import { AdminStatus, AdminStatusCard } from "./AdminStatusCard"; @customElement("ak-admin-status-card-backup") export class BackupStatusCard extends AdminStatusCard { diff --git a/web/src/pages/admin-overview/cards/SystemStatusCard.ts b/web/src/pages/admin-overview/cards/SystemStatusCard.ts index 564f3e5fb..0228addd4 100644 --- a/web/src/pages/admin-overview/cards/SystemStatusCard.ts +++ b/web/src/pages/admin-overview/cards/SystemStatusCard.ts @@ -1,7 +1,10 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; + import { AdminApi, System } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatusCard, AdminStatus } from "./AdminStatusCard"; diff --git a/web/src/pages/admin-overview/cards/VersionStatusCard.ts b/web/src/pages/admin-overview/cards/VersionStatusCard.ts index debb79344..20007c0d9 100644 --- a/web/src/pages/admin-overview/cards/VersionStatusCard.ts +++ b/web/src/pages/admin-overview/cards/VersionStatusCard.ts @@ -1,7 +1,10 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; + import { AdminApi, Version } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatusCard, AdminStatus } from "./AdminStatusCard"; diff --git a/web/src/pages/admin-overview/cards/WorkerStatusCard.ts b/web/src/pages/admin-overview/cards/WorkerStatusCard.ts index f8daaeb23..5749c0be5 100644 --- a/web/src/pages/admin-overview/cards/WorkerStatusCard.ts +++ b/web/src/pages/admin-overview/cards/WorkerStatusCard.ts @@ -1,7 +1,10 @@ import { t } from "@lingui/macro"; + import { html } from "lit"; import { customElement } from "lit/decorators"; + import { AdminApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { AdminStatus, AdminStatusCard } from "./AdminStatusCard"; diff --git a/web/src/pages/admin-overview/charts/FlowStatusChart.ts b/web/src/pages/admin-overview/charts/FlowStatusChart.ts index 4df2d7501..f7f9e8d1f 100644 --- a/web/src/pages/admin-overview/charts/FlowStatusChart.ts +++ b/web/src/pages/admin-overview/charts/FlowStatusChart.ts @@ -1,11 +1,15 @@ -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { FlowsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import "../../../elements/forms/ConfirmationForm"; -import { AKChart } from "../../../elements/charts/Chart"; import { ChartData, ChartOptions } from "chart.js"; +import { t } from "@lingui/macro"; + +import { customElement } from "lit/decorators"; + +import { FlowsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { AKChart } from "../../../elements/charts/Chart"; +import "../../../elements/forms/ConfirmationForm"; + interface FlowMetrics { count: number; cached: number; diff --git a/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts b/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts index 24ed01a25..40ddc6953 100644 --- a/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts +++ b/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts @@ -1,9 +1,13 @@ +import { ChartOptions, ChartData } from "chart.js"; + +import { t } from "@lingui/macro"; + import { customElement } from "lit/decorators"; + import { CoreApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { AKChart } from "../../../elements/charts/Chart"; -import { t } from "@lingui/macro"; -import { ChartOptions, ChartData } from "chart.js"; interface GroupMetrics { count: number; diff --git a/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts b/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts index f65aedb47..01b2082ba 100644 --- a/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts +++ b/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts @@ -1,11 +1,15 @@ -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { SourcesApi, StatusEnum } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import "../../../elements/forms/ConfirmationForm"; -import { AKChart } from "../../../elements/charts/Chart"; import { ChartOptions, ChartData } from "chart.js"; +import { t } from "@lingui/macro"; + +import { customElement } from "lit/decorators"; + +import { SourcesApi, StatusEnum } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { AKChart } from "../../../elements/charts/Chart"; +import "../../../elements/forms/ConfirmationForm"; + interface LDAPSyncStats { healthy: number; failed: number; diff --git a/web/src/pages/admin-overview/charts/OutpostStatusChart.ts b/web/src/pages/admin-overview/charts/OutpostStatusChart.ts index 1b7b8ce68..c64b3e46e 100644 --- a/web/src/pages/admin-overview/charts/OutpostStatusChart.ts +++ b/web/src/pages/admin-overview/charts/OutpostStatusChart.ts @@ -1,11 +1,15 @@ -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { OutpostsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import "../../../elements/forms/ConfirmationForm"; -import { AKChart } from "../../../elements/charts/Chart"; import { ChartOptions, ChartData } from "chart.js"; +import { t } from "@lingui/macro"; + +import { customElement } from "lit/decorators"; + +import { OutpostsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { AKChart } from "../../../elements/charts/Chart"; +import "../../../elements/forms/ConfirmationForm"; + interface OutpostStats { healthy: number; outdated: number; diff --git a/web/src/pages/admin-overview/charts/PolicyStatusChart.ts b/web/src/pages/admin-overview/charts/PolicyStatusChart.ts index 474b10aad..8cc8b3ca4 100644 --- a/web/src/pages/admin-overview/charts/PolicyStatusChart.ts +++ b/web/src/pages/admin-overview/charts/PolicyStatusChart.ts @@ -1,11 +1,15 @@ -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { PoliciesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import "../../../elements/forms/ConfirmationForm"; -import { AKChart } from "../../../elements/charts/Chart"; import { ChartData, ChartOptions } from "chart.js"; +import { t } from "@lingui/macro"; + +import { customElement } from "lit/decorators"; + +import { PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { AKChart } from "../../../elements/charts/Chart"; +import "../../../elements/forms/ConfirmationForm"; + interface PolicyMetrics { count: number; cached: number; diff --git a/web/src/pages/admin-overview/charts/UserCountStatusChart.ts b/web/src/pages/admin-overview/charts/UserCountStatusChart.ts index 147d1565c..7c9c61e14 100644 --- a/web/src/pages/admin-overview/charts/UserCountStatusChart.ts +++ b/web/src/pages/admin-overview/charts/UserCountStatusChart.ts @@ -1,9 +1,13 @@ +import { ChartOptions, ChartData } from "chart.js"; + +import { t } from "@lingui/macro"; + import { customElement } from "lit/decorators"; + import { CoreApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { AKChart } from "../../../elements/charts/Chart"; -import { t } from "@lingui/macro"; -import { ChartOptions, ChartData } from "chart.js"; interface UserMetrics { count: number; diff --git a/web/src/pages/applications/ApplicationCheckAccessForm.ts b/web/src/pages/applications/ApplicationCheckAccessForm.ts index e0a0219bb..f3d17a5f6 100644 --- a/web/src/pages/applications/ApplicationCheckAccessForm.ts +++ b/web/src/pages/applications/ApplicationCheckAccessForm.ts @@ -1,10 +1,13 @@ -import { Application, CoreApi, PolicyTestResult } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; + import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; + +import { Application, CoreApi, PolicyTestResult } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../api/Config"; import { Form } from "../../elements/forms/Form"; -import { until } from "lit/directives/until"; import "../../elements/forms/HorizontalFormElement"; @customElement("ak-application-check-access-form") diff --git a/web/src/pages/applications/ApplicationForm.ts b/web/src/pages/applications/ApplicationForm.ts index 85ff4faf8..58500b60c 100644 --- a/web/src/pages/applications/ApplicationForm.ts +++ b/web/src/pages/applications/ApplicationForm.ts @@ -1,3 +1,13 @@ +import { t } from "@lingui/macro"; + +import { CSSResult } from "lit"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; + import { CoreApi, Application, @@ -6,21 +16,15 @@ import { PolicyEngineMode, CapabilitiesEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { CSSResult } from "lit"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { config, DEFAULT_CONFIG } from "../../api/Config"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/buttons/Dropdown"; import "../../elements/Spinner"; -import "../../elements/forms/ProxyForm"; -import "../../elements/forms/ModalForm"; -import "../../elements/forms/HorizontalFormElement"; +import "../../elements/buttons/Dropdown"; import "../../elements/forms/FormGroup"; -import PFDropdown from "@patternfly/patternfly/components/Dropdown/dropdown.css"; +import "../../elements/forms/HorizontalFormElement"; +import "../../elements/forms/ModalForm"; import { ModelForm } from "../../elements/forms/ModelForm"; +import "../../elements/forms/ProxyForm"; import { first } from "../../utils"; @customElement("ak-application-form") diff --git a/web/src/pages/applications/ApplicationListPage.ts b/web/src/pages/applications/ApplicationListPage.ts index 0b15e3c98..078512301 100644 --- a/web/src/pages/applications/ApplicationListPage.ts +++ b/web/src/pages/applications/ApplicationListPage.ts @@ -1,17 +1,20 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; -import "../../elements/forms/ModalForm"; -import "../../elements/forms/DeleteBulkForm"; -import "../../elements/buttons/SpinnerButton"; -import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; +import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; + import { Application, CoreApi } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/DeleteBulkForm"; +import "../../elements/forms/ModalForm"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; import "./ApplicationForm"; @customElement("ak-application-list") diff --git a/web/src/pages/applications/ApplicationViewPage.ts b/web/src/pages/applications/ApplicationViewPage.ts index 131f01a60..8bdb0f7c1 100644 --- a/web/src/pages/applications/ApplicationViewPage.ts +++ b/web/src/pages/applications/ApplicationViewPage.ts @@ -1,27 +1,30 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/Tabs"; -import "../../elements/charts/ApplicationAuthorizeChart"; -import "../../elements/buttons/SpinnerButton"; +import AKGlobal from "../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { Application, CoreApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/EmptyState"; +import "../../elements/PageHeader"; +import "../../elements/Tabs"; +import "../../elements/buttons/SpinnerButton"; +import "../../elements/charts/ApplicationAuthorizeChart"; import "../../elements/events/ObjectChangelog"; import "../policies/BoundPoliciesList"; -import "./ApplicationForm"; import "./ApplicationCheckAccessForm"; -import "../../elements/PageHeader"; -import { Application, CoreApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import AKGlobal from "../../authentik.css"; -import { ifDefined } from "lit/directives/if-defined"; +import "./ApplicationForm"; @customElement("ak-application-view") export class ApplicationViewPage extends LitElement { diff --git a/web/src/pages/crypto/CertificateGenerateForm.ts b/web/src/pages/crypto/CertificateGenerateForm.ts index ebd9a0d35..948f74cff 100644 --- a/web/src/pages/crypto/CertificateGenerateForm.ts +++ b/web/src/pages/crypto/CertificateGenerateForm.ts @@ -1,7 +1,10 @@ -import { CertificateGenerationRequest, CertificateKeyPair, CryptoApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; + +import { CertificateGenerationRequest, CertificateKeyPair, CryptoApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../api/Config"; import { Form } from "../../elements/forms/Form"; import "../../elements/forms/HorizontalFormElement"; diff --git a/web/src/pages/crypto/CertificateKeyPairForm.ts b/web/src/pages/crypto/CertificateKeyPairForm.ts index 6a8d268fe..f67e0ef4a 100644 --- a/web/src/pages/crypto/CertificateKeyPairForm.ts +++ b/web/src/pages/crypto/CertificateKeyPairForm.ts @@ -1,11 +1,14 @@ -import { CertificateKeyPair, CertificateKeyPairRequest, CryptoApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; + +import { CertificateKeyPair, CertificateKeyPairRequest, CryptoApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-crypto-certificate-form") diff --git a/web/src/pages/crypto/CertificateKeyPairListPage.ts b/web/src/pages/crypto/CertificateKeyPairListPage.ts index 6ed34ac09..e915294fe 100644 --- a/web/src/pages/crypto/CertificateKeyPairListPage.ts +++ b/web/src/pages/crypto/CertificateKeyPairListPage.ts @@ -1,20 +1,22 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; + import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import { CryptoApi, CertificateKeyPair } from "@goauthentik/api"; -import "../../elements/forms/ModalForm"; +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; -import "./CertificateKeyPairForm"; -import "./CertificateGenerateForm"; +import "../../elements/forms/ModalForm"; import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { TablePage } from "../../elements/table/TablePage"; +import "./CertificateGenerateForm"; +import "./CertificateKeyPairForm"; @customElement("ak-crypto-certificate-list") export class CertificateKeyPairListPage extends TablePage { diff --git a/web/src/pages/events/EventInfo.ts b/web/src/pages/events/EventInfo.ts index b324442d6..ef51f8aab 100644 --- a/web/src/pages/events/EventInfo.ts +++ b/web/src/pages/events/EventInfo.ts @@ -1,19 +1,23 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { until } from "lit/directives/until"; -import { EventActions, FlowsApi } from "@goauthentik/api"; -import "../../elements/Spinner"; -import "../../elements/Expand"; -import { PFSize } from "../../elements/Spinner"; -import { EventContext, EventModel, EventWithContext } from "../../api/Events"; -import { DEFAULT_CONFIG } from "../../api/Config"; + import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFList from "@patternfly/patternfly/components/List/list.css"; import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFList from "@patternfly/patternfly/components/List/list.css"; + +import { EventActions, FlowsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import { EventContext, EventModel, EventWithContext } from "../../api/Events"; import { VERSION } from "../../constants"; +import "../../elements/Expand"; +import "../../elements/Spinner"; +import { PFSize } from "../../elements/Spinner"; @customElement("ak-event-info") export class EventInfo extends LitElement { diff --git a/web/src/pages/events/EventInfoPage.ts b/web/src/pages/events/EventInfoPage.ts index 525a50a5d..7a7899048 100644 --- a/web/src/pages/events/EventInfoPage.ts +++ b/web/src/pages/events/EventInfoPage.ts @@ -1,16 +1,20 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { EventsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { EventWithContext } from "../../api/Events"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; + +import AKGlobal from "../../authentik.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import AKGlobal from "../../authentik.css"; -import "./EventInfo"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { EventsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import { EventWithContext } from "../../api/Events"; import "../../elements/PageHeader"; +import "./EventInfo"; @customElement("ak-event-info-page") export class EventInfoPage extends LitElement { diff --git a/web/src/pages/events/EventListPage.ts b/web/src/pages/events/EventListPage.ts index e3d9d62df..9d3b33dda 100644 --- a/web/src/pages/events/EventListPage.ts +++ b/web/src/pages/events/EventListPage.ts @@ -1,7 +1,10 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + import { Event, EventsApi } from "@goauthentik/api"; + import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { EventWithContext } from "../../api/Events"; diff --git a/web/src/pages/events/RuleForm.ts b/web/src/pages/events/RuleForm.ts index 2772219c2..be1441aa1 100644 --- a/web/src/pages/events/RuleForm.ts +++ b/web/src/pages/events/RuleForm.ts @@ -1,11 +1,14 @@ -import { CoreApi, EventsApi, NotificationRule, SeverityEnum } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; import { until } from "lit/directives/until"; + +import { CoreApi, EventsApi, NotificationRule, SeverityEnum } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-event-rule-form") diff --git a/web/src/pages/events/RuleListPage.ts b/web/src/pages/events/RuleListPage.ts index b1bd8194b..f6b1cf085 100644 --- a/web/src/pages/events/RuleListPage.ts +++ b/web/src/pages/events/RuleListPage.ts @@ -1,17 +1,19 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; -import "../policies/BoundPoliciesList"; +import { EventsApi, NotificationRule } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; -import { EventsApi, NotificationRule } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import "../../elements/forms/DeleteBulkForm"; +import { TablePage } from "../../elements/table/TablePage"; +import "../policies/BoundPoliciesList"; import "./RuleForm"; @customElement("ak-event-rule-list") diff --git a/web/src/pages/events/TransportForm.ts b/web/src/pages/events/TransportForm.ts index c9acdc820..de238c1e3 100644 --- a/web/src/pages/events/TransportForm.ts +++ b/web/src/pages/events/TransportForm.ts @@ -1,18 +1,21 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { EventsApi, NotificationTransport, NotificationTransportModeEnum, PropertymappingsApi, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; import "../../elements/forms/HorizontalFormElement"; -import { first } from "../../utils"; import { ModelForm } from "../../elements/forms/ModelForm"; -import { until } from "lit/directives/until"; +import { first } from "../../utils"; @customElement("ak-event-transport-form") export class TransportForm extends ModelForm { diff --git a/web/src/pages/events/TransportListPage.ts b/web/src/pages/events/TransportListPage.ts index 00f3c1da6..ecfc186eb 100644 --- a/web/src/pages/events/TransportListPage.ts +++ b/web/src/pages/events/TransportListPage.ts @@ -1,17 +1,19 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; -import "../../elements/buttons/ActionButton"; -import "../../elements/forms/ModalForm"; -import "../../elements/buttons/SpinnerButton"; -import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; import { EventsApi, NotificationTransport } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/ActionButton"; +import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; +import "../../elements/forms/ModalForm"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; import "./TransportForm"; @customElement("ak-event-transport-list") diff --git a/web/src/pages/events/utils.ts b/web/src/pages/events/utils.ts index 2b18915e9..d1bfe75b8 100644 --- a/web/src/pages/events/utils.ts +++ b/web/src/pages/events/utils.ts @@ -1,4 +1,5 @@ import { t } from "@lingui/macro"; + import { EventActions } from "@goauthentik/api"; export function ActionToLabel(action?: EventActions): string { diff --git a/web/src/pages/flows/BoundStagesList.ts b/web/src/pages/flows/BoundStagesList.ts index 343d79263..e95ec03d1 100644 --- a/web/src/pages/flows/BoundStagesList.ts +++ b/web/src/pages/flows/BoundStagesList.ts @@ -1,22 +1,24 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../../elements/table/Table"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; +import { FlowsApi, FlowStageBinding, StagesApi } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../../elements/Tabs"; +import "../../elements/buttons/Dropdown"; +import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; import "../../elements/forms/ProxyForm"; -import "./StageBindingForm"; -import "../../elements/Tabs"; -import "../../elements/buttons/SpinnerButton"; -import "../../elements/buttons/Dropdown"; +import { Table, TableColumn } from "../../elements/table/Table"; import "../policies/BoundPoliciesList"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; -import { FlowsApi, FlowStageBinding, StagesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; +import "./StageBindingForm"; @customElement("ak-bound-stages-list") export class BoundStagesList extends Table { diff --git a/web/src/pages/flows/FlowDiagram.ts b/web/src/pages/flows/FlowDiagram.ts index 6c29ddb8e..4318a88b5 100644 --- a/web/src/pages/flows/FlowDiagram.ts +++ b/web/src/pages/flows/FlowDiagram.ts @@ -1,10 +1,13 @@ +import FlowChart from "flowchart.js"; + import { html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import FlowChart from "flowchart.js"; -import { loading } from "../../utils"; + import { FlowsApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../api/Config"; import { EVENT_REFRESH } from "../../constants"; +import { loading } from "../../utils"; export const FONT_COLOUR_DARK_MODE = "#fafafa"; export const FONT_COLOUR_LIGHT_MODE = "#151515"; diff --git a/web/src/pages/flows/FlowForm.ts b/web/src/pages/flows/FlowForm.ts index b2e163a7f..748f2b76b 100644 --- a/web/src/pages/flows/FlowForm.ts +++ b/web/src/pages/flows/FlowForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { Flow, FlowDesignationEnum, @@ -5,14 +12,10 @@ import { FlowsApi, CapabilitiesEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { config, DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; -import { until } from "lit/directives/until"; import { first } from "../../utils"; @customElement("ak-flow-form") diff --git a/web/src/pages/flows/FlowImportForm.ts b/web/src/pages/flows/FlowImportForm.ts index ae61f61a9..b52c6b268 100644 --- a/web/src/pages/flows/FlowImportForm.ts +++ b/web/src/pages/flows/FlowImportForm.ts @@ -1,7 +1,10 @@ -import { Flow, FlowsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; + +import { Flow, FlowsApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../api/Config"; import { Form } from "../../elements/forms/Form"; import "../../elements/forms/HorizontalFormElement"; diff --git a/web/src/pages/flows/FlowListPage.ts b/web/src/pages/flows/FlowListPage.ts index a8e76a90a..4217ef373 100644 --- a/web/src/pages/flows/FlowListPage.ts +++ b/web/src/pages/flows/FlowListPage.ts @@ -1,19 +1,21 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; +import { Flow, FlowsApi } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/ConfirmationForm"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; -import "../../elements/forms/ConfirmationForm"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; import "./FlowForm"; import "./FlowImportForm"; -import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; -import { Flow, FlowsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; @customElement("ak-flow-list") export class FlowListPage extends TablePage { diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts index 7245b3cf5..bac0131cd 100644 --- a/web/src/pages/flows/FlowViewPage.ts +++ b/web/src/pages/flows/FlowViewPage.ts @@ -1,24 +1,27 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import "../../elements/Tabs"; + +import AKGlobal from "../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { Flow, FlowsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/PageHeader"; -import "../../elements/events/ObjectChangelog"; +import "../../elements/Tabs"; import "../../elements/buttons/SpinnerButton"; +import "../../elements/events/ObjectChangelog"; import "../policies/BoundPoliciesList"; import "./BoundStagesList"; import "./FlowDiagram"; -import { Flow, FlowsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; - -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import AKGlobal from "../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; @customElement("ak-flow-view") export class FlowViewPage extends LitElement { diff --git a/web/src/pages/flows/StageBindingForm.ts b/web/src/pages/flows/StageBindingForm.ts index 342c3f9d6..7d196d6c4 100644 --- a/web/src/pages/flows/StageBindingForm.ts +++ b/web/src/pages/flows/StageBindingForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { FlowsApi, FlowStageBinding, @@ -6,15 +13,11 @@ import { Stage, StagesApi, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../api/Config"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; import "../../elements/forms/HorizontalFormElement"; -import { first, groupBy } from "../../utils"; import { ModelForm } from "../../elements/forms/ModelForm"; +import { first, groupBy } from "../../utils"; @customElement("ak-stage-binding-form") export class StageBindingForm extends ModelForm { diff --git a/web/src/pages/groups/GroupForm.ts b/web/src/pages/groups/GroupForm.ts index 12cc67c60..becd1ff39 100644 --- a/web/src/pages/groups/GroupForm.ts +++ b/web/src/pages/groups/GroupForm.ts @@ -1,18 +1,22 @@ -import { CoreApi, Group, User } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; -import "../../elements/CodeMirror"; -import "../../elements/chips/ChipGroup"; -import "../../elements/chips/Chip"; -import "./MemberSelectModal"; import YAML from "yaml"; -import { first } from "../../utils"; + +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { CoreApi, Group, User } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/CodeMirror"; +import "../../elements/chips/Chip"; +import "../../elements/chips/ChipGroup"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; +import { first } from "../../utils"; +import "./MemberSelectModal"; @customElement("ak-group-form") export class GroupForm extends ModelForm { diff --git a/web/src/pages/groups/GroupListPage.ts b/web/src/pages/groups/GroupListPage.ts index 1211c2517..013ee07cb 100644 --- a/web/src/pages/groups/GroupListPage.ts +++ b/web/src/pages/groups/GroupListPage.ts @@ -1,16 +1,18 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; -import "../../elements/forms/DeleteBulkForm"; -import "../../elements/buttons/SpinnerButton"; -import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; import { CoreApi, Group } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; import "./GroupForm"; @customElement("ak-group-list") diff --git a/web/src/pages/groups/MemberSelectModal.ts b/web/src/pages/groups/MemberSelectModal.ts index a4f0efec8..49554fda8 100644 --- a/web/src/pages/groups/MemberSelectModal.ts +++ b/web/src/pages/groups/MemberSelectModal.ts @@ -1,13 +1,16 @@ import { t } from "@lingui/macro"; -import { CoreApi, User } from "@goauthentik/api"; -import { customElement, property } from "lit/decorators"; + import { TemplateResult, html } from "lit"; +import { customElement, property } from "lit/decorators"; + +import { CoreApi, User } from "@goauthentik/api"; + import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { TableModal } from "../../elements/table/TableModal"; -import "../../elements/buttons/SpinnerButton"; import { first } from "../../utils"; @customElement("ak-group-member-select-table") diff --git a/web/src/pages/outposts/OutpostDeploymentModal.ts b/web/src/pages/outposts/OutpostDeploymentModal.ts index 820afa693..4ce14c846 100644 --- a/web/src/pages/outposts/OutpostDeploymentModal.ts +++ b/web/src/pages/outposts/OutpostDeploymentModal.ts @@ -1,10 +1,13 @@ -import { Outpost, OutpostTypeEnum } from "@goauthentik/api"; +import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { t } from "@lingui/macro"; import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/buttons/TokenCopyButton"; + +import { Outpost, OutpostTypeEnum } from "@goauthentik/api"; + import { ModalButton } from "../../elements/buttons/ModalButton"; +import "../../elements/buttons/TokenCopyButton"; @customElement("ak-outpost-deployment-modal") export class OutpostDeploymentModal extends ModalButton { diff --git a/web/src/pages/outposts/OutpostForm.ts b/web/src/pages/outposts/OutpostForm.ts index a5f5d753b..12c15b7ed 100644 --- a/web/src/pages/outposts/OutpostForm.ts +++ b/web/src/pages/outposts/OutpostForm.ts @@ -1,13 +1,17 @@ -import { Outpost, OutpostsApi, OutpostTypeEnum, ProvidersApi } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; -import "../../elements/CodeMirror"; import YAML from "yaml"; + +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { Outpost, OutpostsApi, OutpostTypeEnum, ProvidersApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-outpost-form") diff --git a/web/src/pages/outposts/OutpostHealth.ts b/web/src/pages/outposts/OutpostHealth.ts index d8c0a965f..1d779515c 100644 --- a/web/src/pages/outposts/OutpostHealth.ts +++ b/web/src/pages/outposts/OutpostHealth.ts @@ -1,11 +1,15 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { OutpostHealth } from "@goauthentik/api"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import "../../elements/Spinner"; + import AKGlobal from "../../authentik.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { OutpostHealth } from "@goauthentik/api"; + import { PFColor } from "../../elements/Label"; +import "../../elements/Spinner"; @customElement("ak-outpost-health") export class OutpostHealthElement extends LitElement { diff --git a/web/src/pages/outposts/OutpostHealthSimple.ts b/web/src/pages/outposts/OutpostHealthSimple.ts index c7a168ff9..edef5d11f 100644 --- a/web/src/pages/outposts/OutpostHealthSimple.ts +++ b/web/src/pages/outposts/OutpostHealthSimple.ts @@ -1,13 +1,17 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { OutpostHealth, OutpostsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import "../../elements/Spinner"; + import AKGlobal from "../../authentik.css"; -import { PFColor } from "../../elements/Label"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { OutpostHealth, OutpostsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import { EVENT_REFRESH } from "../../constants"; +import { PFColor } from "../../elements/Label"; +import "../../elements/Spinner"; @customElement("ak-outpost-health-simple") export class OutpostHealthSimpleElement extends LitElement { diff --git a/web/src/pages/outposts/OutpostListPage.ts b/web/src/pages/outposts/OutpostListPage.ts index b43a67d22..6914b3617 100644 --- a/web/src/pages/outposts/OutpostListPage.ts +++ b/web/src/pages/outposts/OutpostListPage.ts @@ -1,25 +1,28 @@ import { t } from "@lingui/macro"; + import { CSSResult } from "lit"; -import { customElement, property } from "lit/decorators"; import { html, TemplateResult } from "lit"; -import { AKResponse } from "../../api/Client"; -import { TableColumn } from "../../elements/table/Table"; -import { TablePage } from "../../elements/table/TablePage"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { Outpost, OutpostsApi } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import { PFSize } from "../../elements/Spinner"; +import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/DeleteBulkForm"; +import "../../elements/forms/ModalForm"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; +import "./OutpostDeploymentModal"; +import "./OutpostForm"; import "./OutpostHealth"; import "./OutpostHealthSimple"; -import "./OutpostForm"; -import "./OutpostDeploymentModal"; -import "../../elements/buttons/SpinnerButton"; -import "../../elements/forms/ModalForm"; -import "../../elements/forms/DeleteBulkForm"; -import { PAGE_SIZE } from "../../constants"; -import { Outpost, OutpostsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import { PFSize } from "../../elements/Spinner"; -import { until } from "lit/directives/until"; @customElement("ak-outpost-list") export class OutpostListPage extends TablePage { diff --git a/web/src/pages/outposts/ServiceConnectionDockerForm.ts b/web/src/pages/outposts/ServiceConnectionDockerForm.ts index 0b5d42014..563776a44 100644 --- a/web/src/pages/outposts/ServiceConnectionDockerForm.ts +++ b/web/src/pages/outposts/ServiceConnectionDockerForm.ts @@ -1,13 +1,16 @@ -import { CryptoApi, DockerServiceConnection, OutpostsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { until } from "lit/directives/until"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { CryptoApi, DockerServiceConnection, OutpostsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/forms/HorizontalFormElement"; -import { first } from "../../utils"; import { ModelForm } from "../../elements/forms/ModelForm"; +import { first } from "../../utils"; @customElement("ak-service-connection-docker-form") export class ServiceConnectionDockerForm extends ModelForm { diff --git a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts index 541b4831e..e12b50d1c 100644 --- a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts +++ b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts @@ -1,14 +1,18 @@ -import { KubernetesServiceConnection, OutpostsApi } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; -import "../../elements/CodeMirror"; import YAML from "yaml"; -import { first } from "../../utils"; + +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; + +import { KubernetesServiceConnection, OutpostsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; +import { first } from "../../utils"; @customElement("ak-service-connection-kubernetes-form") export class ServiceConnectionKubernetesForm extends ModelForm< diff --git a/web/src/pages/outposts/ServiceConnectionListPage.ts b/web/src/pages/outposts/ServiceConnectionListPage.ts index 0cedfbecf..fb5d3c828 100644 --- a/web/src/pages/outposts/ServiceConnectionListPage.ts +++ b/web/src/pages/outposts/ServiceConnectionListPage.ts @@ -1,24 +1,26 @@ import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; -import { AKResponse } from "../../api/Client"; -import { TableColumn } from "../../elements/table/Table"; -import { TablePage } from "../../elements/table/TablePage"; -import "./OutpostHealth"; -import "../../elements/buttons/SpinnerButton"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { OutpostsApi, ServiceConnection } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import { PFColor } from "../../elements/Label"; import "../../elements/buttons/Dropdown"; +import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; -import "./ServiceConnectionKubernetesForm"; -import "./ServiceConnectionDockerForm"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; -import { OutpostsApi, ServiceConnection } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/forms/ProxyForm"; -import { ifDefined } from "lit/directives/if-defined"; -import { PFColor } from "../../elements/Label"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; +import "./OutpostHealth"; +import "./ServiceConnectionDockerForm"; +import "./ServiceConnectionKubernetesForm"; @customElement("ak-outpost-service-connection-list") export class OutpostServiceConnectionListPage extends TablePage { diff --git a/web/src/pages/policies/BoundPoliciesList.ts b/web/src/pages/policies/BoundPoliciesList.ts index 8b4863d1f..7860e3e71 100644 --- a/web/src/pages/policies/BoundPoliciesList.ts +++ b/web/src/pages/policies/BoundPoliciesList.ts @@ -1,25 +1,26 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { Table, TableColumn } from "../../elements/table/Table"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { PoliciesApi, PolicyBinding } from "@goauthentik/api"; -import "../../elements/forms/DeleteBulkForm"; -import "../../elements/Tabs"; -import "../../elements/forms/ProxyForm"; -import "../../elements/buttons/SpinnerButton"; -import "../../elements/buttons/Dropdown"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; - +import { PAGE_SIZE } from "../../constants"; +import { PFSize } from "../../elements/Spinner"; +import "../../elements/Tabs"; +import "../../elements/buttons/Dropdown"; +import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; +import "../../elements/forms/ProxyForm"; +import { Table, TableColumn } from "../../elements/table/Table"; import "../groups/GroupForm"; import "../users/UserForm"; import "./PolicyBindingForm"; -import { ifDefined } from "lit/directives/if-defined"; -import { PFSize } from "../../elements/Spinner"; @customElement("ak-bound-policies-list") export class BoundPoliciesList extends Table { diff --git a/web/src/pages/policies/PolicyBindingForm.ts b/web/src/pages/policies/PolicyBindingForm.ts index e9730566e..31483d1c8 100644 --- a/web/src/pages/policies/PolicyBindingForm.ts +++ b/web/src/pages/policies/PolicyBindingForm.ts @@ -1,16 +1,20 @@ -import { CoreApi, PoliciesApi, Policy, PolicyBinding } from "@goauthentik/api"; import { t } from "@lingui/macro"; + import { css, CSSResult } from "lit"; -import { customElement, property } from "lit/decorators"; import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { until } from "lit/directives/until"; +import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import { first, groupBy } from "../../utils"; -import "../../elements/forms/HorizontalFormElement"; -import PFToggleGroup from "@patternfly/patternfly/components/ToggleGroup/toggle-group.css"; +import { until } from "lit/directives/until"; + import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFToggleGroup from "@patternfly/patternfly/components/ToggleGroup/toggle-group.css"; + +import { CoreApi, PoliciesApi, Policy, PolicyBinding } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; +import { first, groupBy } from "../../utils"; enum target { policy, diff --git a/web/src/pages/policies/PolicyListPage.ts b/web/src/pages/policies/PolicyListPage.ts index 582518aae..4c5284738 100644 --- a/web/src/pages/policies/PolicyListPage.ts +++ b/web/src/pages/policies/PolicyListPage.ts @@ -1,26 +1,28 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; +import { PoliciesApi, Policy } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/Dropdown"; import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/ConfirmationForm"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; import "../../elements/forms/ProxyForm"; -import "../../elements/forms/ConfirmationForm"; -import "./PolicyTestForm"; import { TableColumn } from "../../elements/table/Table"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; -import { PoliciesApi, Policy } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; +import { TablePage } from "../../elements/table/TablePage"; +import "./PolicyTestForm"; import "./dummy/DummyPolicyForm"; import "./event_matcher/EventMatcherPolicyForm"; -import "./expression/ExpressionPolicyForm"; import "./expiry/ExpiryPolicyForm"; +import "./expression/ExpressionPolicyForm"; import "./hibp/HaveIBeenPwnedPolicyForm"; import "./password/PasswordPolicyForm"; import "./reputation/ReputationPolicyForm"; diff --git a/web/src/pages/policies/PolicyTestForm.ts b/web/src/pages/policies/PolicyTestForm.ts index 3d85f1bf1..05c285ab1 100644 --- a/web/src/pages/policies/PolicyTestForm.ts +++ b/web/src/pages/policies/PolicyTestForm.ts @@ -1,3 +1,11 @@ +import YAML from "yaml"; + +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; + import { CoreApi, PoliciesApi, @@ -5,15 +13,11 @@ import { PolicyTestRequest, PolicyTestResult, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../api/Config"; -import { Form } from "../../elements/forms/Form"; -import { until } from "lit/directives/until"; -import "../../elements/forms/HorizontalFormElement"; import "../../elements/CodeMirror"; -import YAML from "yaml"; +import { Form } from "../../elements/forms/Form"; +import "../../elements/forms/HorizontalFormElement"; import { first } from "../../utils"; @customElement("ak-policy-test-form") diff --git a/web/src/pages/policies/dummy/DummyPolicyForm.ts b/web/src/pages/policies/dummy/DummyPolicyForm.ts index cc9e64033..23a60262f 100644 --- a/web/src/pages/policies/dummy/DummyPolicyForm.ts +++ b/web/src/pages/policies/dummy/DummyPolicyForm.ts @@ -1,13 +1,16 @@ -import { DummyPolicy, PoliciesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { DummyPolicy, PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-policy-dummy-form") export class DummyPolicyForm extends ModelForm { diff --git a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts index 142fe1296..7d8ad7a65 100644 --- a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts +++ b/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts @@ -1,14 +1,17 @@ -import { AdminApi, EventMatcherPolicy, EventsApi, PoliciesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; -import "../../../elements/forms/FormGroup"; import { until } from "lit/directives/until"; -import { first } from "../../../utils"; + +import { AdminApi, EventMatcherPolicy, EventsApi, PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-policy-event-matcher-form") export class EventMatcherPolicyForm extends ModelForm { diff --git a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts b/web/src/pages/policies/expiry/ExpiryPolicyForm.ts index c7375330d..5e4028e77 100644 --- a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts +++ b/web/src/pages/policies/expiry/ExpiryPolicyForm.ts @@ -1,13 +1,16 @@ -import { PasswordExpiryPolicy, PoliciesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { PasswordExpiryPolicy, PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-policy-password-expiry-form") export class PasswordExpiryPolicyForm extends ModelForm { diff --git a/web/src/pages/policies/expression/ExpressionPolicyForm.ts b/web/src/pages/policies/expression/ExpressionPolicyForm.ts index bdb34fae2..0c7feb226 100644 --- a/web/src/pages/policies/expression/ExpressionPolicyForm.ts +++ b/web/src/pages/policies/expression/ExpressionPolicyForm.ts @@ -1,14 +1,17 @@ -import { ExpressionPolicy, PoliciesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; -import "../../../elements/forms/FormGroup"; + +import { ExpressionPolicy, PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/CodeMirror"; -import { first } from "../../../utils"; +import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-policy-expression-form") export class ExpressionPolicyForm extends ModelForm { diff --git a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts b/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts index 1221e27c9..ce4281551 100644 --- a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts +++ b/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts @@ -1,13 +1,16 @@ -import { HaveIBeenPwendPolicy, PoliciesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { HaveIBeenPwendPolicy, PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-policy-hibp-form") export class HaveIBeenPwnedPolicyForm extends ModelForm { diff --git a/web/src/pages/policies/password/PasswordPolicyForm.ts b/web/src/pages/policies/password/PasswordPolicyForm.ts index 8b4cc9007..399acbd33 100644 --- a/web/src/pages/policies/password/PasswordPolicyForm.ts +++ b/web/src/pages/policies/password/PasswordPolicyForm.ts @@ -1,13 +1,16 @@ -import { PasswordPolicy, PoliciesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { PasswordPolicy, PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-policy-password-form") export class PasswordPolicyForm extends ModelForm { diff --git a/web/src/pages/policies/reputation/IPReputationListPage.ts b/web/src/pages/policies/reputation/IPReputationListPage.ts index 32402a941..f0e19b3fe 100644 --- a/web/src/pages/policies/reputation/IPReputationListPage.ts +++ b/web/src/pages/policies/reputation/IPReputationListPage.ts @@ -1,17 +1,19 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../../api/Client"; -import { TablePage } from "../../../elements/table/TablePage"; +import { IPReputation, PoliciesApi } from "@goauthentik/api"; + +import { AKResponse } from "../../../api/Client"; +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { PAGE_SIZE } from "../../../constants"; import "../../../elements/buttons/ModalButton"; import "../../../elements/buttons/SpinnerButton"; import "../../../elements/forms/DeleteBulkForm"; import "../../../elements/forms/ModalForm"; import { TableColumn } from "../../../elements/table/Table"; -import { PAGE_SIZE } from "../../../constants"; -import { IPReputation, PoliciesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { TablePage } from "../../../elements/table/TablePage"; @customElement("ak-policy-reputation-ip-list") export class IPReputationListPage extends TablePage { diff --git a/web/src/pages/policies/reputation/ReputationPolicyForm.ts b/web/src/pages/policies/reputation/ReputationPolicyForm.ts index 94c504fb6..28d3d9564 100644 --- a/web/src/pages/policies/reputation/ReputationPolicyForm.ts +++ b/web/src/pages/policies/reputation/ReputationPolicyForm.ts @@ -1,13 +1,16 @@ -import { ReputationPolicy, PoliciesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { ReputationPolicy, PoliciesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-policy-reputation-form") export class ReputationPolicyForm extends ModelForm { diff --git a/web/src/pages/policies/reputation/UserReputationListPage.ts b/web/src/pages/policies/reputation/UserReputationListPage.ts index 4401f417b..5dd56b80b 100644 --- a/web/src/pages/policies/reputation/UserReputationListPage.ts +++ b/web/src/pages/policies/reputation/UserReputationListPage.ts @@ -1,17 +1,19 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../../api/Client"; -import { TablePage } from "../../../elements/table/TablePage"; +import { UserReputation, PoliciesApi } from "@goauthentik/api"; + +import { AKResponse } from "../../../api/Client"; +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { PAGE_SIZE } from "../../../constants"; import "../../../elements/buttons/ModalButton"; import "../../../elements/buttons/SpinnerButton"; import "../../../elements/forms/DeleteBulkForm"; import "../../../elements/forms/ModalForm"; import { TableColumn } from "../../../elements/table/Table"; -import { PAGE_SIZE } from "../../../constants"; -import { UserReputation, PoliciesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { TablePage } from "../../../elements/table/TablePage"; @customElement("ak-policy-reputation-user-list") export class UserReputationListPage extends TablePage { diff --git a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts b/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts index 63a9e6ffb..14c1a6a95 100644 --- a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts +++ b/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts @@ -1,11 +1,14 @@ -import { LDAPPropertyMapping, PropertymappingsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; + +import { LDAPPropertyMapping, PropertymappingsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-property-mapping-ldap-form") diff --git a/web/src/pages/property-mappings/PropertyMappingListPage.ts b/web/src/pages/property-mappings/PropertyMappingListPage.ts index dc38aab38..dc6e3f15c 100644 --- a/web/src/pages/property-mappings/PropertyMappingListPage.ts +++ b/web/src/pages/property-mappings/PropertyMappingListPage.ts @@ -1,25 +1,27 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; +import { PropertyMapping, PropertymappingsApi } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/Dropdown"; import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; import "../../elements/forms/ProxyForm"; -import "./PropertyMappingTestForm"; -import "./PropertyMappingScopeForm"; -import "./PropertyMappingLDAPForm"; -import "./PropertyMappingSAMLForm"; -import "./PropertyMappingNotification"; import { TableColumn } from "../../elements/table/Table"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; -import { PropertyMapping, PropertymappingsApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; +import { TablePage } from "../../elements/table/TablePage"; +import "./PropertyMappingLDAPForm"; +import "./PropertyMappingNotification"; +import "./PropertyMappingSAMLForm"; +import "./PropertyMappingScopeForm"; +import "./PropertyMappingTestForm"; @customElement("ak-property-mapping-list") export class PropertyMappingListPage extends TablePage { diff --git a/web/src/pages/property-mappings/PropertyMappingNotification.ts b/web/src/pages/property-mappings/PropertyMappingNotification.ts index bce843c71..c5059f4d8 100644 --- a/web/src/pages/property-mappings/PropertyMappingNotification.ts +++ b/web/src/pages/property-mappings/PropertyMappingNotification.ts @@ -1,11 +1,14 @@ -import { NotificationWebhookMapping, PropertymappingsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; + +import { NotificationWebhookMapping, PropertymappingsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-property-mapping-notification-form") diff --git a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts b/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts index d14247cac..1015bd5b1 100644 --- a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts +++ b/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts @@ -1,11 +1,14 @@ -import { SAMLPropertyMapping, PropertymappingsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; + +import { SAMLPropertyMapping, PropertymappingsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-property-mapping-saml-form") diff --git a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts index aca4a8f77..62099b9f0 100644 --- a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts +++ b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts @@ -1,12 +1,15 @@ -import { ScopeMapping, PropertymappingsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ModelForm } from "../../elements/forms/ModelForm"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; + +import { ScopeMapping, PropertymappingsApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-property-mapping-scope-form") export class PropertyMappingScopeForm extends ModelForm { diff --git a/web/src/pages/property-mappings/PropertyMappingTestForm.ts b/web/src/pages/property-mappings/PropertyMappingTestForm.ts index fb4217ee8..d13e2f05a 100644 --- a/web/src/pages/property-mappings/PropertyMappingTestForm.ts +++ b/web/src/pages/property-mappings/PropertyMappingTestForm.ts @@ -1,3 +1,12 @@ +import YAML from "yaml"; + +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { CoreApi, PolicyTestRequest, @@ -5,16 +14,11 @@ import { PropertymappingsApi, PropertyMappingTestResult, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../api/Config"; -import { Form } from "../../elements/forms/Form"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; import "../../elements/CodeMirror"; -import YAML from "yaml"; +import { Form } from "../../elements/forms/Form"; +import "../../elements/forms/HorizontalFormElement"; import { first } from "../../utils"; @customElement("ak-property-mapping-test-form") diff --git a/web/src/pages/providers/ProviderListPage.ts b/web/src/pages/providers/ProviderListPage.ts index e2a3173d1..8900e4784 100644 --- a/web/src/pages/providers/ProviderListPage.ts +++ b/web/src/pages/providers/ProviderListPage.ts @@ -1,25 +1,27 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; -import "../../elements/buttons/SpinnerButton"; +import { Provider, ProvidersApi } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/Dropdown"; +import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; import "../../elements/forms/ProxyForm"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; import "./ldap/LDAPProviderForm"; import "./oauth2/OAuth2ProviderForm"; import "./proxy/ProxyProviderForm"; import "./saml/SAMLProviderForm"; import "./saml/SAMLProviderImportForm"; -import { TableColumn } from "../../elements/table/Table"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; -import { Provider, ProvidersApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; @customElement("ak-provider-list") export class ProviderListPage extends TablePage { diff --git a/web/src/pages/providers/ProviderViewPage.ts b/web/src/pages/providers/ProviderViewPage.ts index 2457ff16f..bcf2aac8a 100644 --- a/web/src/pages/providers/ProviderViewPage.ts +++ b/web/src/pages/providers/ProviderViewPage.ts @@ -1,17 +1,17 @@ import { html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/buttons/SpinnerButton"; +import { Provider, ProvidersApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/EmptyState"; import "../../elements/PageHeader"; - -import "./saml/SAMLProviderViewPage"; +import "../../elements/buttons/SpinnerButton"; +import "./ldap/LDAPProviderViewPage"; import "./oauth2/OAuth2ProviderViewPage"; import "./proxy/ProxyProviderViewPage"; -import "./ldap/LDAPProviderViewPage"; -import { Provider, ProvidersApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; +import "./saml/SAMLProviderViewPage"; @customElement("ak-provider-view") export class ProviderViewPage extends LitElement { diff --git a/web/src/pages/providers/RelatedApplicationButton.ts b/web/src/pages/providers/RelatedApplicationButton.ts index 084a7a7f4..a2ced0831 100644 --- a/web/src/pages/providers/RelatedApplicationButton.ts +++ b/web/src/pages/providers/RelatedApplicationButton.ts @@ -1,9 +1,12 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { Provider } from "@goauthentik/api"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { Provider } from "@goauthentik/api"; import "../../elements/Spinner"; import "../../elements/forms/ModalForm"; diff --git a/web/src/pages/providers/ldap/LDAPProviderForm.ts b/web/src/pages/providers/ldap/LDAPProviderForm.ts index 09e09bff6..1196b305f 100644 --- a/web/src/pages/providers/ldap/LDAPProviderForm.ts +++ b/web/src/pages/providers/ldap/LDAPProviderForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { FlowsApi, ProvidersApi, @@ -6,15 +13,11 @@ import { FlowsInstancesListDesignationEnum, CryptoApi, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG, tenant } from "../../../api/Config"; -import { ModelForm } from "../../../elements/forms/ModelForm"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../../elements/forms/ModelForm"; import { first } from "../../../utils"; @customElement("ak-provider-ldap-form") diff --git a/web/src/pages/providers/ldap/LDAPProviderViewPage.ts b/web/src/pages/providers/ldap/LDAPProviderViewPage.ts index eb434a2c8..d1bb661d6 100644 --- a/web/src/pages/providers/ldap/LDAPProviderViewPage.ts +++ b/web/src/pages/providers/ldap/LDAPProviderViewPage.ts @@ -1,28 +1,31 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import "../../../elements/buttons/ModalButton"; -import "../../../elements/buttons/SpinnerButton"; +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; + +import { ProvidersApi, LDAPProvider } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/CodeMirror"; import "../../../elements/Tabs"; +import "../../../elements/buttons/ModalButton"; +import "../../../elements/buttons/SpinnerButton"; import "../../../elements/events/ObjectChangelog"; import "../RelatedApplicationButton"; import "./LDAPProviderForm"; -import { ProvidersApi, LDAPProvider } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; @customElement("ak-provider-ldap-view") export class LDAPProviderViewPage extends LitElement { diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts index 1926a3742..1045e180b 100644 --- a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts +++ b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { CryptoApi, FlowsApi, @@ -10,15 +17,11 @@ import { ProvidersApi, FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ModelForm } from "../../../elements/forms/ModelForm"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../../elements/forms/ModelForm"; import { first, randomString } from "../../../utils"; @customElement("ak-provider-oauth2-form") diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts b/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts index d952564ca..b23c78672 100644 --- a/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts +++ b/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts @@ -1,31 +1,34 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; + import AKGlobal from "../../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import "../../../elements/buttons/ModalButton"; -import "../../../elements/buttons/SpinnerButton"; -import "../../../elements/CodeMirror"; -import "../../../elements/Tabs"; -import "../../../elements/events/ObjectChangelog"; -import "../RelatedApplicationButton"; -import "./OAuth2ProviderForm"; -import { convertToTitle } from "../../../utils"; import { OAuth2Provider, OAuth2ProviderSetupURLs, ProvidersApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { EVENT_REFRESH } from "../../../constants"; +import "../../../elements/CodeMirror"; +import "../../../elements/Tabs"; +import "../../../elements/buttons/ModalButton"; +import "../../../elements/buttons/SpinnerButton"; +import "../../../elements/events/ObjectChangelog"; +import { convertToTitle } from "../../../utils"; +import "../RelatedApplicationButton"; +import "./OAuth2ProviderForm"; @customElement("ak-provider-oauth2-view") export class OAuth2ProviderViewPage extends LitElement { diff --git a/web/src/pages/providers/proxy/ProxyProviderForm.ts b/web/src/pages/providers/proxy/ProxyProviderForm.ts index 0a0736987..a559eed6c 100644 --- a/web/src/pages/providers/proxy/ProxyProviderForm.ts +++ b/web/src/pages/providers/proxy/ProxyProviderForm.ts @@ -1,3 +1,15 @@ +import { t } from "@lingui/macro"; + +import { css, CSSResult } from "lit"; +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFToggleGroup from "@patternfly/patternfly/components/ToggleGroup/toggle-group.css"; +import PFSpacing from "@patternfly/patternfly/utilities/Spacing/spacing.css"; + import { CryptoApi, FlowsApi, @@ -6,19 +18,11 @@ import { ProxyMode, ProxyProvider, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { css, CSSResult } from "lit"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ModelForm } from "../../../elements/forms/ModelForm"; -import PFToggleGroup from "@patternfly/patternfly/components/ToggleGroup/toggle-group.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFSpacing from "@patternfly/patternfly/utilities/Spacing/spacing.css"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../../elements/forms/ModelForm"; import { first } from "../../../utils"; @customElement("ak-provider-proxy-form") diff --git a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts b/web/src/pages/providers/proxy/ProxyProviderViewPage.ts index 83a512454..669fbfcc6 100644 --- a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts +++ b/web/src/pages/providers/proxy/ProxyProviderViewPage.ts @@ -1,27 +1,30 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; + +import AKGlobal from "../../../authentik.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import AKGlobal from "../../../authentik.css"; -import "../../../elements/buttons/ModalButton"; -import "../../../elements/buttons/SpinnerButton"; -import "../../../elements/CodeMirror"; -import "../../../elements/Tabs"; -import "../../../elements/events/ObjectChangelog"; -import "../RelatedApplicationButton"; -import "./ProxyProviderForm"; import { ProvidersApi, ProxyProvider } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { EVENT_REFRESH } from "../../../constants"; +import "../../../elements/CodeMirror"; +import "../../../elements/Tabs"; +import "../../../elements/buttons/ModalButton"; +import "../../../elements/buttons/SpinnerButton"; +import "../../../elements/events/ObjectChangelog"; import { convertToTitle } from "../../../utils"; +import "../RelatedApplicationButton"; +import "./ProxyProviderForm"; @customElement("ak-provider-proxy-view") export class ProxyProviderViewPage extends LitElement { diff --git a/web/src/pages/providers/saml/SAMLProviderForm.ts b/web/src/pages/providers/saml/SAMLProviderForm.ts index f0bdb98e5..e39791f46 100644 --- a/web/src/pages/providers/saml/SAMLProviderForm.ts +++ b/web/src/pages/providers/saml/SAMLProviderForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { CryptoApi, FlowsApi, @@ -9,15 +16,11 @@ import { SignatureAlgorithmEnum, FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ModelForm } from "../../../elements/forms/ModelForm"; -import { until } from "lit/directives/until"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../../elements/forms/ModelForm"; @customElement("ak-provider-saml-form") export class SAMLProviderFormPage extends ModelForm { diff --git a/web/src/pages/providers/saml/SAMLProviderImportForm.ts b/web/src/pages/providers/saml/SAMLProviderImportForm.ts index de6c53763..19a3cc74b 100644 --- a/web/src/pages/providers/saml/SAMLProviderImportForm.ts +++ b/web/src/pages/providers/saml/SAMLProviderImportForm.ts @@ -1,13 +1,16 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { until } from "lit/directives/until"; + import { FlowsApi, FlowsInstancesListDesignationEnum, ProvidersApi, SAMLProvider, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; -import { until } from "lit/directives/until"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import { Form } from "../../../elements/forms/Form"; import "../../../elements/forms/HorizontalFormElement"; diff --git a/web/src/pages/providers/saml/SAMLProviderViewPage.ts b/web/src/pages/providers/saml/SAMLProviderViewPage.ts index 3826c947d..1680970e3 100644 --- a/web/src/pages/providers/saml/SAMLProviderViewPage.ts +++ b/web/src/pages/providers/saml/SAMLProviderViewPage.ts @@ -1,31 +1,34 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; import { until } from "lit/directives/until"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; -import AKGlobal from "../../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; -import "../../../elements/buttons/ModalButton"; -import "../../../elements/buttons/ActionButton"; -import "../../../elements/buttons/SpinnerButton"; +import AKGlobal from "../../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; + +import { ProvidersApi, SAMLProvider } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/CodeMirror"; import "../../../elements/Tabs"; +import "../../../elements/buttons/ActionButton"; +import "../../../elements/buttons/ModalButton"; +import "../../../elements/buttons/SpinnerButton"; import "../../../elements/events/ObjectChangelog"; import "../RelatedApplicationButton"; import "./SAMLProviderForm"; -import { ProvidersApi, SAMLProvider } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; -import { ifDefined } from "lit/directives/if-defined"; @customElement("ak-provider-saml-view") export class SAMLProviderViewPage extends LitElement { diff --git a/web/src/pages/sources/SourceViewPage.ts b/web/src/pages/sources/SourceViewPage.ts index 9ff0c120c..68ff2881f 100644 --- a/web/src/pages/sources/SourceViewPage.ts +++ b/web/src/pages/sources/SourceViewPage.ts @@ -1,17 +1,17 @@ import { html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { Source, SourcesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/buttons/SpinnerButton"; +import { Source, SourcesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/EmptyState"; import "../../elements/PageHeader"; - +import "../../elements/buttons/SpinnerButton"; import "./ldap/LDAPSourceViewPage"; import "./oauth/OAuthSourceViewPage"; -import "./saml/SAMLSourceViewPage"; import "./plex/PlexSourceViewPage"; -import { ifDefined } from "lit/directives/if-defined"; +import "./saml/SAMLSourceViewPage"; @customElement("ak-source-view") export class SourceViewPage extends LitElement { diff --git a/web/src/pages/sources/SourcesListPage.ts b/web/src/pages/sources/SourcesListPage.ts index b694e4d6c..a11bb2aa5 100644 --- a/web/src/pages/sources/SourcesListPage.ts +++ b/web/src/pages/sources/SourcesListPage.ts @@ -1,24 +1,26 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TableColumn } from "../../elements/table/Table"; -import { TablePage } from "../../elements/table/TablePage"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; -import "../../elements/buttons/SpinnerButton"; +import { Source, SourcesApi } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/Dropdown"; +import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; import "../../elements/forms/ProxyForm"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; -import { Source, SourcesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; import "./ldap/LDAPSourceForm"; -import "./saml/SAMLSourceForm"; import "./oauth/OAuthSourceForm"; import "./plex/PlexSourceForm"; +import "./saml/SAMLSourceForm"; @customElement("ak-source-list") export class SourceListPage extends TablePage { diff --git a/web/src/pages/sources/ldap/LDAPSourceForm.ts b/web/src/pages/sources/ldap/LDAPSourceForm.ts index 0fdffbda4..5d204d234 100644 --- a/web/src/pages/sources/ldap/LDAPSourceForm.ts +++ b/web/src/pages/sources/ldap/LDAPSourceForm.ts @@ -1,14 +1,17 @@ -import { LDAPSource, SourcesApi, PropertymappingsApi, LDAPSourceRequest } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { LDAPSource, SourcesApi, PropertymappingsApi, LDAPSourceRequest } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; import "../../../elements/forms/HorizontalFormElement"; -import { ifDefined } from "lit/directives/if-defined"; -import { until } from "lit/directives/until"; -import { first } from "../../../utils"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-source-ldap-form") export class LDAPSourceForm extends ModelForm { diff --git a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts index ff823d3a6..ea9a15f95 100644 --- a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts +++ b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts @@ -1,31 +1,33 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import AKGlobal from "../../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import PFList from "@patternfly/patternfly/components/List/list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import "../../../elements/buttons/SpinnerButton"; -import "../../../elements/buttons/ActionButton"; +import { LDAPSource, SourcesApi, StatusEnum } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/CodeMirror"; import "../../../elements/Tabs"; +import "../../../elements/buttons/ActionButton"; +import "../../../elements/buttons/SpinnerButton"; import "../../../elements/events/ObjectChangelog"; import "../../../elements/forms/ModalForm"; import "./LDAPSourceForm"; -import { until } from "lit/directives/until"; -import { LDAPSource, SourcesApi, StatusEnum } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; @customElement("ak-source-ldap-view") export class LDAPSourceViewPage extends LitElement { diff --git a/web/src/pages/sources/oauth/OAuthSourceForm.ts b/web/src/pages/sources/oauth/OAuthSourceForm.ts index 591c872b5..b7bf6369f 100644 --- a/web/src/pages/sources/oauth/OAuthSourceForm.ts +++ b/web/src/pages/sources/oauth/OAuthSourceForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { OAuthSource, SourcesApi, @@ -7,16 +14,12 @@ import { FlowsInstancesListDesignationEnum, SourceType, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; import "../../../elements/forms/HorizontalFormElement"; -import { ifDefined } from "lit/directives/if-defined"; -import { until } from "lit/directives/until"; -import { first } from "../../../utils"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-source-oauth-form") export class OAuthSourceForm extends ModelForm { diff --git a/web/src/pages/sources/oauth/OAuthSourceViewPage.ts b/web/src/pages/sources/oauth/OAuthSourceViewPage.ts index 1421011c1..a7afa23c2 100644 --- a/web/src/pages/sources/oauth/OAuthSourceViewPage.ts +++ b/web/src/pages/sources/oauth/OAuthSourceViewPage.ts @@ -1,29 +1,31 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import AKGlobal from "../../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import "../../../elements/buttons/SpinnerButton"; +import { OAuthSource, SourcesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/CodeMirror"; import "../../../elements/Tabs"; +import "../../../elements/buttons/SpinnerButton"; import "../../../elements/events/ObjectChangelog"; import "../../../elements/forms/ModalForm"; import "../../policies/BoundPoliciesList"; import "./OAuthSourceForm"; -import { OAuthSource, SourcesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; @customElement("ak-source-oauth-view") export class OAuthSourceViewPage extends LitElement { diff --git a/web/src/pages/sources/plex/PlexSourceForm.ts b/web/src/pages/sources/plex/PlexSourceForm.ts index 9fdf817de..aba0529e8 100644 --- a/web/src/pages/sources/plex/PlexSourceForm.ts +++ b/web/src/pages/sources/plex/PlexSourceForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { PlexSource, SourcesApi, @@ -5,17 +12,13 @@ import { UserMatchingModeEnum, FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; import "../../../elements/forms/HorizontalFormElement"; -import { ifDefined } from "lit/directives/if-defined"; -import { until } from "lit/directives/until"; -import { first, randomString } from "../../../utils"; -import { PlexAPIClient, PlexResource, popupCenterScreen } from "../../../flows/sources/plex/API"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { PlexAPIClient, PlexResource, popupCenterScreen } from "../../../flows/sources/plex/API"; +import { first, randomString } from "../../../utils"; @customElement("ak-source-plex-form") export class PlexSourceForm extends ModelForm { diff --git a/web/src/pages/sources/plex/PlexSourceViewPage.ts b/web/src/pages/sources/plex/PlexSourceViewPage.ts index b8b204cfa..b7ce2dfac 100644 --- a/web/src/pages/sources/plex/PlexSourceViewPage.ts +++ b/web/src/pages/sources/plex/PlexSourceViewPage.ts @@ -1,29 +1,31 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import AKGlobal from "../../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import "../../../elements/buttons/SpinnerButton"; +import { PlexSource, SourcesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/CodeMirror"; import "../../../elements/Tabs"; +import "../../../elements/buttons/SpinnerButton"; import "../../../elements/events/ObjectChangelog"; import "../../../elements/forms/ModalForm"; import "../../policies/BoundPoliciesList"; import "./PlexSourceForm"; -import { PlexSource, SourcesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; @customElement("ak-source-plex-view") export class PlexSourceViewPage extends LitElement { diff --git a/web/src/pages/sources/saml/SAMLSourceForm.ts b/web/src/pages/sources/saml/SAMLSourceForm.ts index 38bb03177..32e98af9d 100644 --- a/web/src/pages/sources/saml/SAMLSourceForm.ts +++ b/web/src/pages/sources/saml/SAMLSourceForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { SAMLSource, SourcesApi, @@ -9,16 +16,12 @@ import { FlowsApi, FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; import "../../../elements/forms/HorizontalFormElement"; -import { ifDefined } from "lit/directives/if-defined"; -import { until } from "lit/directives/until"; -import { first } from "../../../utils"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-source-saml-form") export class SAMLSourceForm extends ModelForm { diff --git a/web/src/pages/sources/saml/SAMLSourceViewPage.ts b/web/src/pages/sources/saml/SAMLSourceViewPage.ts index 320fc2701..718ca72ac 100644 --- a/web/src/pages/sources/saml/SAMLSourceViewPage.ts +++ b/web/src/pages/sources/saml/SAMLSourceViewPage.ts @@ -1,31 +1,33 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; import { until } from "lit/directives/until"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import AKGlobal from "../../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import "../../../elements/buttons/SpinnerButton"; +import { SAMLSource, SourcesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/CodeMirror"; import "../../../elements/Tabs"; +import "../../../elements/buttons/SpinnerButton"; import "../../../elements/events/ObjectChangelog"; import "../../../elements/forms/ModalForm"; import "../../policies/BoundPoliciesList"; import "./SAMLSourceForm"; -import { SAMLSource, SourcesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; -import { ifDefined } from "lit/directives/if-defined"; @customElement("ak-source-saml-view") export class SAMLSourceViewPage extends LitElement { diff --git a/web/src/pages/stages/StageListPage.ts b/web/src/pages/stages/StageListPage.ts index 7a48d51a2..a25486134 100644 --- a/web/src/pages/stages/StageListPage.ts +++ b/web/src/pages/stages/StageListPage.ts @@ -1,21 +1,22 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { Stage, StagesApi } from "@goauthentik/api"; + import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/Dropdown"; +import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/DeleteBulkForm"; +import "../../elements/forms/ModalForm"; +import "../../elements/forms/ProxyForm"; import { TableColumn } from "../../elements/table/Table"; import { TablePage } from "../../elements/table/TablePage"; - -import "../../elements/buttons/SpinnerButton"; -import "../../elements/buttons/Dropdown"; -import "../../elements/forms/DeleteBulkForm"; -import "../../elements/forms/ProxyForm"; -import "../../elements/forms/ModalForm"; -import { until } from "lit/directives/until"; -import { PAGE_SIZE } from "../../constants"; -import { Stage, StagesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; - import "./authenticator_duo/AuthenticatorDuoStageForm.ts"; import "./authenticator_static/AuthenticatorStaticStageForm.ts"; import "./authenticator_totp/AuthenticatorTOTPStageForm.ts"; diff --git a/web/src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts b/web/src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts index c5b6659a3..4491dbc50 100644 --- a/web/src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts +++ b/web/src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { FlowsApi, AuthenticatorDuoStage, @@ -5,16 +12,12 @@ import { FlowsInstancesListDesignationEnum, AuthenticatorDuoStageRequest, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; -import { until } from "lit/directives/until"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-stage-authenticator-duo-form") export class AuthenticatorDuoStageForm extends ModelForm { diff --git a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts index 9487fada2..afc3e6f79 100644 --- a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts +++ b/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts @@ -1,19 +1,22 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { FlowsApi, AuthenticatorStaticStage, StagesApi, FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; -import { until } from "lit/directives/until"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-stage-authenticator-static-form") export class AuthenticatorStaticStageForm extends ModelForm { diff --git a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts index 51e0c6d8d..3315587d1 100644 --- a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts +++ b/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts @@ -1,17 +1,20 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { FlowsApi, AuthenticatorTOTPStage, StagesApi, FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; -import { until } from "lit/directives/until"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; @customElement("ak-stage-authenticator-totp-form") diff --git a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts index f23549629..64967b514 100644 --- a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts +++ b/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts @@ -1,17 +1,20 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { AuthenticatorValidateStage, NotConfiguredActionEnum, DeviceClassesEnum, StagesApi, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; -import { until } from "lit/directives/until"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; @customElement("ak-stage-authenticator-validate-form") diff --git a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts b/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts index 521037fa7..11c2bcc8a 100644 --- a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts +++ b/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts @@ -1,9 +1,12 @@ -import { AuthenticateWebAuthnStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import { AuthenticateWebAuthnStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; diff --git a/web/src/pages/stages/captcha/CaptchaStageForm.ts b/web/src/pages/stages/captcha/CaptchaStageForm.ts index 62b65850a..c1d32a121 100644 --- a/web/src/pages/stages/captcha/CaptchaStageForm.ts +++ b/web/src/pages/stages/captcha/CaptchaStageForm.ts @@ -1,11 +1,14 @@ -import { CaptchaStage, CaptchaStageRequest, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { CaptchaStage, CaptchaStageRequest, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; @customElement("ak-stage-captcha-form") diff --git a/web/src/pages/stages/consent/ConsentStageForm.ts b/web/src/pages/stages/consent/ConsentStageForm.ts index 8661295fb..3da2cde6a 100644 --- a/web/src/pages/stages/consent/ConsentStageForm.ts +++ b/web/src/pages/stages/consent/ConsentStageForm.ts @@ -1,11 +1,14 @@ -import { ConsentStage, ConsentStageModeEnum, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { ConsentStage, ConsentStageModeEnum, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; @customElement("ak-stage-consent-form") diff --git a/web/src/pages/stages/deny/DenyStageForm.ts b/web/src/pages/stages/deny/DenyStageForm.ts index d2a42df31..cea20f0d5 100644 --- a/web/src/pages/stages/deny/DenyStageForm.ts +++ b/web/src/pages/stages/deny/DenyStageForm.ts @@ -1,9 +1,12 @@ -import { DenyStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import { DenyStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; diff --git a/web/src/pages/stages/dummy/DummyStageForm.ts b/web/src/pages/stages/dummy/DummyStageForm.ts index f861585f7..91886b3f1 100644 --- a/web/src/pages/stages/dummy/DummyStageForm.ts +++ b/web/src/pages/stages/dummy/DummyStageForm.ts @@ -1,9 +1,12 @@ -import { DummyStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import { DummyStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; diff --git a/web/src/pages/stages/email/EmailStageForm.ts b/web/src/pages/stages/email/EmailStageForm.ts index bbfbb80c8..740d03937 100644 --- a/web/src/pages/stages/email/EmailStageForm.ts +++ b/web/src/pages/stages/email/EmailStageForm.ts @@ -1,14 +1,17 @@ -import { EmailStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; -import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; import { until } from "lit/directives/until"; + +import { EmailStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-stage-email-form") export class EmailStageForm extends ModelForm { diff --git a/web/src/pages/stages/identification/IdentificationStageForm.ts b/web/src/pages/stages/identification/IdentificationStageForm.ts index 196952400..2b3afa598 100644 --- a/web/src/pages/stages/identification/IdentificationStageForm.ts +++ b/web/src/pages/stages/identification/IdentificationStageForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { FlowsApi, IdentificationStage, @@ -6,16 +13,12 @@ import { FlowsInstancesListDesignationEnum, SourcesApi, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; -import { until } from "lit/directives/until"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-stage-identification-form") export class IdentificationStageForm extends ModelForm { diff --git a/web/src/pages/stages/invitation/InvitationForm.ts b/web/src/pages/stages/invitation/InvitationForm.ts index a292990b5..582791d27 100644 --- a/web/src/pages/stages/invitation/InvitationForm.ts +++ b/web/src/pages/stages/invitation/InvitationForm.ts @@ -1,13 +1,17 @@ -import { Invitation, StagesApi } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import "../../../elements/forms/HorizontalFormElement"; -import "../../../elements/CodeMirror"; import YAML from "yaml"; -import { dateTimeLocal, first } from "../../../utils"; + +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; + +import { Invitation, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import "../../../elements/CodeMirror"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { dateTimeLocal, first } from "../../../utils"; @customElement("ak-invitation-form") export class InvitationForm extends ModelForm { diff --git a/web/src/pages/stages/invitation/InvitationListLink.ts b/web/src/pages/stages/invitation/InvitationListLink.ts index d8031554e..6b13728a3 100644 --- a/web/src/pages/stages/invitation/InvitationListLink.ts +++ b/web/src/pages/stages/invitation/InvitationListLink.ts @@ -1,15 +1,19 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { until } from "lit/directives/until"; + +import AKGlobal from "../../../authentik.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; -import AKGlobal from "../../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFFlex from "@patternfly/patternfly/layouts/Flex/flex.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { FlowsApi, FlowsInstancesListDesignationEnum } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; @customElement("ak-stage-invitation-list-link") export class InvitationListLink extends LitElement { diff --git a/web/src/pages/stages/invitation/InvitationListPage.ts b/web/src/pages/stages/invitation/InvitationListPage.ts index f2560bc10..a3b2654d5 100644 --- a/web/src/pages/stages/invitation/InvitationListPage.ts +++ b/web/src/pages/stages/invitation/InvitationListPage.ts @@ -1,19 +1,21 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../../api/Client"; -import { TablePage } from "../../../elements/table/TablePage"; +import { Invitation, StagesApi } from "@goauthentik/api"; + +import { AKResponse } from "../../../api/Client"; +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { PAGE_SIZE } from "../../../constants"; import "../../../elements/buttons/ModalButton"; import "../../../elements/buttons/SpinnerButton"; import "../../../elements/forms/DeleteBulkForm"; import "../../../elements/forms/ModalForm"; +import { TableColumn } from "../../../elements/table/Table"; +import { TablePage } from "../../../elements/table/TablePage"; import "./InvitationForm"; import "./InvitationListLink"; -import { TableColumn } from "../../../elements/table/Table"; -import { PAGE_SIZE } from "../../../constants"; -import { Invitation, StagesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; @customElement("ak-stage-invitation-list") export class InvitationListPage extends TablePage { diff --git a/web/src/pages/stages/invitation/InvitationStageForm.ts b/web/src/pages/stages/invitation/InvitationStageForm.ts index 107d12cbb..eb9e30c40 100644 --- a/web/src/pages/stages/invitation/InvitationStageForm.ts +++ b/web/src/pages/stages/invitation/InvitationStageForm.ts @@ -1,13 +1,16 @@ -import { InvitationStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; + +import { InvitationStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-stage-invitation-form") export class InvitationStageForm extends ModelForm { diff --git a/web/src/pages/stages/password/PasswordStageForm.ts b/web/src/pages/stages/password/PasswordStageForm.ts index 226dc0296..5b008bce3 100644 --- a/web/src/pages/stages/password/PasswordStageForm.ts +++ b/web/src/pages/stages/password/PasswordStageForm.ts @@ -1,3 +1,10 @@ +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + import { FlowsApi, PasswordStage, @@ -5,16 +12,12 @@ import { StagesApi, FlowsInstancesListDesignationEnum, } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; -import { until } from "lit/directives/until"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-stage-password-form") export class PasswordStageForm extends ModelForm { diff --git a/web/src/pages/stages/prompt/PromptForm.ts b/web/src/pages/stages/prompt/PromptForm.ts index 007782e0f..bb41cda63 100644 --- a/web/src/pages/stages/prompt/PromptForm.ts +++ b/web/src/pages/stages/prompt/PromptForm.ts @@ -1,12 +1,15 @@ -import { Prompt, PromptTypeEnum, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import { Prompt, PromptTypeEnum, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/HorizontalFormElement"; -import { first } from "../../../utils"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-prompt-form") export class PromptForm extends ModelForm { diff --git a/web/src/pages/stages/prompt/PromptListPage.ts b/web/src/pages/stages/prompt/PromptListPage.ts index cdf166899..4783da44e 100644 --- a/web/src/pages/stages/prompt/PromptListPage.ts +++ b/web/src/pages/stages/prompt/PromptListPage.ts @@ -1,18 +1,20 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../../api/Client"; -import { TablePage } from "../../../elements/table/TablePage"; +import { Prompt, StagesApi } from "@goauthentik/api"; + +import { AKResponse } from "../../../api/Client"; +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { PAGE_SIZE } from "../../../constants"; import "../../../elements/buttons/ModalButton"; import "../../../elements/buttons/SpinnerButton"; import "../../../elements/forms/DeleteBulkForm"; import "../../../elements/forms/ModalForm"; -import "./PromptForm"; import { TableColumn } from "../../../elements/table/Table"; -import { PAGE_SIZE } from "../../../constants"; -import { Prompt, StagesApi } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { TablePage } from "../../../elements/table/TablePage"; +import "./PromptForm"; @customElement("ak-stage-prompt-list") export class PromptListPage extends TablePage { diff --git a/web/src/pages/stages/prompt/PromptStageForm.ts b/web/src/pages/stages/prompt/PromptStageForm.ts index 0262e62d8..8def9c18c 100644 --- a/web/src/pages/stages/prompt/PromptStageForm.ts +++ b/web/src/pages/stages/prompt/PromptStageForm.ts @@ -1,15 +1,18 @@ -import { PoliciesApi, PromptStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; -import "../../../elements/forms/FormGroup"; -import "../../../elements/forms/ModalForm"; -import "./PromptForm"; import { until } from "lit/directives/until"; + +import { PoliciesApi, PromptStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; +import "../../../elements/forms/ModalForm"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import "./PromptForm"; @customElement("ak-stage-prompt-form") export class PromptStageForm extends ModelForm { diff --git a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts b/web/src/pages/stages/user_delete/UserDeleteStageForm.ts index 26324a2ba..9efed8f28 100644 --- a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts +++ b/web/src/pages/stages/user_delete/UserDeleteStageForm.ts @@ -1,9 +1,12 @@ -import { UserDeleteStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import { UserDeleteStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; diff --git a/web/src/pages/stages/user_login/UserLoginStageForm.ts b/web/src/pages/stages/user_login/UserLoginStageForm.ts index 370f51867..9570b83cc 100644 --- a/web/src/pages/stages/user_login/UserLoginStageForm.ts +++ b/web/src/pages/stages/user_login/UserLoginStageForm.ts @@ -1,12 +1,15 @@ -import { UserLoginStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; + +import { UserLoginStage, StagesApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import "../../../elements/forms/HorizontalFormElement"; import "../../../elements/forms/FormGroup"; -import { first } from "../../../utils"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; +import { first } from "../../../utils"; @customElement("ak-stage-user-login-form") export class UserLoginStageForm extends ModelForm { diff --git a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts b/web/src/pages/stages/user_logout/UserLogoutStageForm.ts index 202955757..4c1bb9dc9 100644 --- a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts +++ b/web/src/pages/stages/user_logout/UserLogoutStageForm.ts @@ -1,9 +1,12 @@ -import { UserLogoutStage, StagesApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import { UserLogoutStage, StagesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; diff --git a/web/src/pages/stages/user_write/UserWriteStageForm.ts b/web/src/pages/stages/user_write/UserWriteStageForm.ts index 1e48bcb34..d53db94c6 100644 --- a/web/src/pages/stages/user_write/UserWriteStageForm.ts +++ b/web/src/pages/stages/user_write/UserWriteStageForm.ts @@ -1,14 +1,17 @@ -import { UserWriteStage, StagesApi, CoreApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; -import "../../../elements/forms/HorizontalFormElement"; +import { until } from "lit/directives/until"; + +import { UserWriteStage, StagesApi, CoreApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/FormGroup"; +import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; import { first } from "../../../utils"; -import { until } from "lit/directives/until"; @customElement("ak-stage-user-write-form") export class UserWriteStageForm extends ModelForm { diff --git a/web/src/pages/system-tasks/SystemTaskListPage.ts b/web/src/pages/system-tasks/SystemTaskListPage.ts index 92f9f8e73..2998fc330 100644 --- a/web/src/pages/system-tasks/SystemTaskListPage.ts +++ b/web/src/pages/system-tasks/SystemTaskListPage.ts @@ -1,17 +1,20 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; + import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import "../../elements/buttons/SpinnerButton"; -import "../../elements/buttons/ActionButton"; -import { TableColumn } from "../../elements/table/Table"; import { AdminApi, Task, StatusEnum } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; -import { PFColor } from "../../elements/Label"; import { EVENT_REFRESH } from "../../constants"; +import { PFColor } from "../../elements/Label"; +import "../../elements/buttons/ActionButton"; +import "../../elements/buttons/SpinnerButton"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; @customElement("ak-system-task-list") export class SystemTaskListPage extends TablePage { diff --git a/web/src/pages/tenants/TenantForm.ts b/web/src/pages/tenants/TenantForm.ts index 6d677b130..f7c9e21a9 100644 --- a/web/src/pages/tenants/TenantForm.ts +++ b/web/src/pages/tenants/TenantForm.ts @@ -1,14 +1,17 @@ -import { CoreApi, FlowsApi, FlowsInstancesListDesignationEnum, Tenant } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import "../../elements/forms/HorizontalFormElement"; -import "../../elements/forms/FormGroup"; -import { first } from "../../utils"; -import { ModelForm } from "../../elements/forms/ModelForm"; +import { customElement } from "lit/decorators"; import { until } from "lit/directives/until"; + +import { CoreApi, FlowsApi, FlowsInstancesListDesignationEnum, Tenant } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/forms/FormGroup"; +import "../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../elements/forms/ModelForm"; import { DefaultTenant } from "../../elements/sidebar/SidebarBrand"; +import { first } from "../../utils"; @customElement("ak-tenant-form") export class TenantForm extends ModelForm { diff --git a/web/src/pages/tenants/TenantListPage.ts b/web/src/pages/tenants/TenantListPage.ts index 74801fb78..a7b612772 100644 --- a/web/src/pages/tenants/TenantListPage.ts +++ b/web/src/pages/tenants/TenantListPage.ts @@ -1,16 +1,18 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; -import "../../elements/forms/DeleteBulkForm"; -import "../../elements/buttons/SpinnerButton"; -import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; import { CoreApi, Tenant } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/SpinnerButton"; +import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; import "./TenantForm"; @customElement("ak-tenant-list") diff --git a/web/src/pages/tokens/TokenForm.ts b/web/src/pages/tokens/TokenForm.ts index 87fd4ccc9..38f2bf350 100644 --- a/web/src/pages/tokens/TokenForm.ts +++ b/web/src/pages/tokens/TokenForm.ts @@ -1,14 +1,17 @@ -import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import "../../elements/forms/HorizontalFormElement"; -import "../../elements/forms/FormGroup"; -import { dateTimeLocal, first } from "../../utils"; -import { ModelForm } from "../../elements/forms/ModelForm"; +import { customElement } from "lit/decorators"; import { until } from "lit/directives/until"; +import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/forms/FormGroup"; +import "../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../elements/forms/ModelForm"; +import { dateTimeLocal, first } from "../../utils"; + @customElement("ak-token-form") export class TokenForm extends ModelForm { loadInstance(pk: string): Promise { diff --git a/web/src/pages/tokens/TokenListPage.ts b/web/src/pages/tokens/TokenListPage.ts index ca6dc547e..c585b27a7 100644 --- a/web/src/pages/tokens/TokenListPage.ts +++ b/web/src/pages/tokens/TokenListPage.ts @@ -1,18 +1,20 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; +import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; +import { DEFAULT_CONFIG } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; import "../../elements/buttons/Dropdown"; import "../../elements/buttons/TokenCopyButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; -import "./TokenForm"; import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; -import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; +import { TablePage } from "../../elements/table/TablePage"; +import "./TokenForm"; export function IntentToLabel(intent: IntentEnum): string { switch (intent) { diff --git a/web/src/pages/users/GroupSelectModal.ts b/web/src/pages/users/GroupSelectModal.ts index 62000e37d..da6b552f7 100644 --- a/web/src/pages/users/GroupSelectModal.ts +++ b/web/src/pages/users/GroupSelectModal.ts @@ -1,13 +1,16 @@ import { t } from "@lingui/macro"; -import { CoreApi, Group } from "@goauthentik/api"; -import { customElement, property } from "lit/decorators"; + import { TemplateResult, html } from "lit"; +import { customElement, property } from "lit/decorators"; + +import { CoreApi, Group } from "@goauthentik/api"; + import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { TableModal } from "../../elements/table/TableModal"; -import "../../elements/buttons/SpinnerButton"; @customElement("ak-user-group-select-table") export class GroupSelectModal extends TableModal { diff --git a/web/src/pages/users/ServiceAccountForm.ts b/web/src/pages/users/ServiceAccountForm.ts index d2a082a8e..e3e6e47ce 100644 --- a/web/src/pages/users/ServiceAccountForm.ts +++ b/web/src/pages/users/ServiceAccountForm.ts @@ -1,13 +1,16 @@ -import { CoreApi, UserServiceAccountRequest, UserServiceAccountResponse } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import "../../elements/forms/HorizontalFormElement"; -import { Form } from "../../elements/forms/Form"; -import { ModalForm } from "../../elements/forms/ModalForm"; +import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; +import { CoreApi, UserServiceAccountRequest, UserServiceAccountResponse } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import { Form } from "../../elements/forms/Form"; +import "../../elements/forms/HorizontalFormElement"; +import { ModalForm } from "../../elements/forms/ModalForm"; + @customElement("ak-user-service-account") export class ServiceAccountForm extends Form { @property({ attribute: false }) diff --git a/web/src/pages/users/UserActiveForm.ts b/web/src/pages/users/UserActiveForm.ts index 38cfadbcd..abd209bd2 100644 --- a/web/src/pages/users/UserActiveForm.ts +++ b/web/src/pages/users/UserActiveForm.ts @@ -1,10 +1,12 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; + +import "../../elements/buttons/SpinnerButton"; import { DeleteForm } from "../../elements/forms/DeleteForm"; import { MessageLevel } from "../../elements/messages/Message"; import { showMessage } from "../../elements/messages/MessageContainer"; -import "../../elements/buttons/SpinnerButton"; @customElement("ak-user-active-form") export class UserActiveForm extends DeleteForm { diff --git a/web/src/pages/users/UserForm.ts b/web/src/pages/users/UserForm.ts index 47d61933b..5e2f98688 100644 --- a/web/src/pages/users/UserForm.ts +++ b/web/src/pages/users/UserForm.ts @@ -1,17 +1,21 @@ -import { CoreApi, Group, User } from "@goauthentik/api"; -import { t } from "@lingui/macro"; -import { customElement } from "lit/decorators"; -import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { ifDefined } from "lit/directives/if-defined"; -import "../../elements/forms/HorizontalFormElement"; -import "../../elements/CodeMirror"; -import "./GroupSelectModal"; import YAML from "yaml"; -import { first } from "../../utils"; -import { ModelForm } from "../../elements/forms/ModelForm"; + +import { t } from "@lingui/macro"; + +import { html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; +import { ifDefined } from "lit/directives/if-defined"; import { until } from "lit/directives/until"; +import { CoreApi, Group, User } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import "../../elements/CodeMirror"; +import "../../elements/forms/HorizontalFormElement"; +import { ModelForm } from "../../elements/forms/ModelForm"; +import { first } from "../../utils"; +import "./GroupSelectModal"; + @customElement("ak-user-form") export class UserForm extends ModelForm { loadInstance(pk: number): Promise { diff --git a/web/src/pages/users/UserListPage.ts b/web/src/pages/users/UserListPage.ts index 2a324442a..6b5ec0bd1 100644 --- a/web/src/pages/users/UserListPage.ts +++ b/web/src/pages/users/UserListPage.ts @@ -1,25 +1,28 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../api/Client"; -import { TablePage } from "../../elements/table/TablePage"; +import { until } from "lit/directives/until"; + import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import "../../elements/forms/ModalForm"; -import "../../elements/buttons/ActionButton"; -import { TableColumn } from "../../elements/table/Table"; -import { PAGE_SIZE } from "../../constants"; import { CoreApi, User } from "@goauthentik/api"; + +import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG, tenant } from "../../api/Config"; +import { PAGE_SIZE } from "../../constants"; +import "../../elements/buttons/ActionButton"; import "../../elements/forms/DeleteBulkForm"; +import "../../elements/forms/ModalForm"; +import { MessageLevel } from "../../elements/messages/Message"; +import { showMessage } from "../../elements/messages/MessageContainer"; +import { TableColumn } from "../../elements/table/Table"; +import { TablePage } from "../../elements/table/TablePage"; +import { first } from "../../utils"; +import "./ServiceAccountForm"; import "./UserActiveForm"; import "./UserForm"; import "./UserResetEmailForm"; -import "./ServiceAccountForm"; -import { showMessage } from "../../elements/messages/MessageContainer"; -import { MessageLevel } from "../../elements/messages/Message"; -import { first } from "../../utils"; -import { until } from "lit/directives/until"; @customElement("ak-user-list") export class UserListPage extends TablePage { diff --git a/web/src/pages/users/UserResetEmailForm.ts b/web/src/pages/users/UserResetEmailForm.ts index e9f335b73..6dc9c9813 100644 --- a/web/src/pages/users/UserResetEmailForm.ts +++ b/web/src/pages/users/UserResetEmailForm.ts @@ -1,10 +1,13 @@ -import { CoreApi, CoreUsersRecoveryEmailRetrieveRequest, StagesApi, User } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; + import { html, TemplateResult } from "lit"; +import { customElement, property } from "lit/decorators"; +import { until } from "lit/directives/until"; + +import { CoreApi, CoreUsersRecoveryEmailRetrieveRequest, StagesApi, User } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../api/Config"; import { Form } from "../../elements/forms/Form"; -import { until } from "lit/directives/until"; import "../../elements/forms/HorizontalFormElement"; @customElement("ak-user-reset-email-form") diff --git a/web/src/pages/users/UserViewPage.ts b/web/src/pages/users/UserViewPage.ts index 15c47de6a..76548415c 100644 --- a/web/src/pages/users/UserViewPage.ts +++ b/web/src/pages/users/UserViewPage.ts @@ -1,39 +1,41 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; import AKGlobal from "../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; +import { CoreApi, User } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../api/Config"; +import { EVENT_REFRESH } from "../../constants"; +import "../../elements/CodeMirror"; +import { PFColor } from "../../elements/Label"; +import "../../elements/PageHeader"; +import "../../elements/Tabs"; import "../../elements/buttons/ActionButton"; import "../../elements/buttons/SpinnerButton"; import "../../elements/charts/UserChart"; -import "../../elements/CodeMirror"; import "../../elements/events/ObjectChangelog"; import "../../elements/events/UserEvents"; import "../../elements/forms/ModalForm"; +import { MessageLevel } from "../../elements/messages/Message"; +import { showMessage } from "../../elements/messages/MessageContainer"; import "../../elements/oauth/UserCodeList"; import "../../elements/oauth/UserRefreshList"; -import "../../elements/PageHeader"; -import "../../elements/Tabs"; import "../../elements/user/SessionList"; import "../../elements/user/UserConsentList"; import "./UserForm"; -import { CoreApi, User } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../api/Config"; -import { EVENT_REFRESH } from "../../constants"; -import { showMessage } from "../../elements/messages/MessageContainer"; -import { MessageLevel } from "../../elements/messages/Message"; -import { PFColor } from "../../elements/Label"; @customElement("ak-user-view") export class UserViewPage extends LitElement { diff --git a/web/src/routesAdmin.ts b/web/src/routesAdmin.ts index e198a8b27..fd77eeeac 100644 --- a/web/src/routesAdmin.ts +++ b/web/src/routesAdmin.ts @@ -1,6 +1,6 @@ import { html } from "lit"; -import { Route, SLUG_REGEX, ID_REGEX, UUID_REGEX } from "./elements/router/Route"; +import { Route, SLUG_REGEX, ID_REGEX, UUID_REGEX } from "./elements/router/Route"; import "./pages/admin-overview/AdminOverviewPage"; import "./pages/applications/ApplicationListPage"; import "./pages/applications/ApplicationViewPage"; @@ -20,11 +20,11 @@ import "./pages/policies/reputation/UserReputationListPage"; import "./pages/property-mappings/PropertyMappingListPage"; import "./pages/providers/ProviderListPage"; import "./pages/providers/ProviderViewPage"; -import "./pages/sources/SourcesListPage"; import "./pages/sources/SourceViewPage"; +import "./pages/sources/SourcesListPage"; +import "./pages/stages/StageListPage"; import "./pages/stages/invitation/InvitationListPage"; import "./pages/stages/prompt/PromptListPage"; -import "./pages/stages/StageListPage"; import "./pages/system-tasks/SystemTaskListPage"; import "./pages/tenants/TenantListPage"; import "./pages/tokens/TokenListPage"; diff --git a/web/src/routesUser.ts b/web/src/routesUser.ts index 6b2e74760..273588861 100644 --- a/web/src/routesUser.ts +++ b/web/src/routesUser.ts @@ -1,6 +1,6 @@ import { html } from "lit"; -import { Route } from "./elements/router/Route"; +import { Route } from "./elements/router/Route"; import "./user/LibraryPage"; import "./user/user-settings/UserSettingsPage"; diff --git a/web/src/user/LibraryApplication.ts b/web/src/user/LibraryApplication.ts index 87d213b83..8376e8615 100644 --- a/web/src/user/LibraryApplication.ts +++ b/web/src/user/LibraryApplication.ts @@ -1,16 +1,20 @@ import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import { until } from "lit/directives/until"; -import { Application } from "@goauthentik/api"; -import { me } from "../api/Users"; -import { truncate } from "../utils"; + import AKGlobal from "../authentik.css"; import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFButton from "@patternfly/patternfly/components/Button/button.css"; import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + +import { Application } from "@goauthentik/api"; + +import { me } from "../api/Users"; +import { truncate } from "../utils"; import { uiConfig } from "./config"; @customElement("ak-library-app") diff --git a/web/src/user/LibraryPage.ts b/web/src/user/LibraryPage.ts index 45ac13565..c3e826249 100644 --- a/web/src/user/LibraryPage.ts +++ b/web/src/user/LibraryPage.ts @@ -1,19 +1,24 @@ +import Fuse from "fuse.js"; + import { t } from "@lingui/macro"; + import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import Fuse from "fuse.js"; +import { until } from "lit/directives/until"; + +import AKGlobal from "../authentik.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; + import { Application, CoreApi } from "@goauthentik/api"; + import { AKResponse } from "../api/Client"; import { DEFAULT_CONFIG } from "../api/Config"; import { loading } from "../utils"; -import AKGlobal from "../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; import "./LibraryApplication"; -import { until } from "lit/directives/until"; import { UIConfig, uiConfig } from "./config"; @customElement("ak-library") diff --git a/web/src/user/user-settings/BaseUserSettings.ts b/web/src/user/user-settings/BaseUserSettings.ts index a86d287c8..c63e8e106 100644 --- a/web/src/user/user-settings/BaseUserSettings.ts +++ b/web/src/user/user-settings/BaseUserSettings.ts @@ -1,11 +1,12 @@ import { CSSResult, LitElement } from "lit"; import { property } from "lit/decorators"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFButton from "@patternfly/patternfly/components/Button/button.css"; + import AKGlobal from "../../authentik.css"; +import PFButton from "@patternfly/patternfly/components/Button/button.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; export abstract class BaseUserSettings extends LitElement { @property() diff --git a/web/src/user/user-settings/UserSelfForm.ts b/web/src/user/user-settings/UserSelfForm.ts index a22d4b248..7660b4ecf 100644 --- a/web/src/user/user-settings/UserSelfForm.ts +++ b/web/src/user/user-settings/UserSelfForm.ts @@ -1,14 +1,17 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import { CoreApi, UserSelf } from "@goauthentik/api"; import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { CoreApi, UserSelf } from "@goauthentik/api"; + import { DEFAULT_CONFIG, tenant } from "../../api/Config"; -import "../../elements/forms/FormElement"; import "../../elements/EmptyState"; import "../../elements/forms/Form"; +import "../../elements/forms/FormElement"; import "../../elements/forms/HorizontalFormElement"; -import { until } from "lit/directives/until"; import { ModelForm } from "../../elements/forms/ModelForm"; @customElement("ak-user-self-form") diff --git a/web/src/user/user-settings/UserSettingsPage.ts b/web/src/user/user-settings/UserSettingsPage.ts index 9ad439c76..30b94b5cc 100644 --- a/web/src/user/user-settings/UserSettingsPage.ts +++ b/web/src/user/user-settings/UserSettingsPage.ts @@ -1,28 +1,30 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; +import { until } from "lit/directives/until"; -import PFPage from "@patternfly/patternfly/components/Page/page.css"; -import PFContent from "@patternfly/patternfly/components/Content/content.css"; -import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; -import PFCard from "@patternfly/patternfly/components/Card/card.css"; -import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; -import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; -import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; -import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; import AKGlobal from "../../authentik.css"; -import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; +import PFContent from "@patternfly/patternfly/components/Content/content.css"; +import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import PFForm from "@patternfly/patternfly/components/Form/form.css"; import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css"; +import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css"; +import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; + +import { me } from "../../api/Users"; import "../../elements/Tabs"; import "../../elements/user/SessionList"; import "../../elements/user/UserConsentList"; -import "./tokens/UserTokenList"; import "./UserSelfForm"; import "./sources/SourceSettings"; import "./stages/StageSettings"; -import { until } from "lit/directives/until"; -import { me } from "../../api/Users"; +import "./tokens/UserTokenList"; @customElement("ak-user-settings") export class UserSettingsPage extends LitElement { diff --git a/web/src/user/user-settings/sources/SourceSettings.ts b/web/src/user/user-settings/sources/SourceSettings.ts index e95457e13..7d7313dc1 100644 --- a/web/src/user/user-settings/sources/SourceSettings.ts +++ b/web/src/user/user-settings/sources/SourceSettings.ts @@ -1,12 +1,15 @@ -import { SourcesApi, UserSetting } from "@goauthentik/api"; import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { until } from "lit/directives/until"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; + import PFGrid from "@patternfly/patternfly/layouts/Grid/grid.css"; +import { SourcesApi, UserSetting } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/EmptyState"; import "./SourceSettingsOAuth"; import "./SourceSettingsPlex"; diff --git a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts index 6f4adf71c..6550165db 100644 --- a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts +++ b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts @@ -1,11 +1,14 @@ +import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { BaseUserSettings } from "../BaseUserSettings"; -import { SourcesApi } from "@goauthentik/api"; -import { until } from "lit/directives/until"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { t } from "@lingui/macro"; import { ifDefined } from "lit/directives/if-defined"; +import { until } from "lit/directives/until"; + +import { SourcesApi } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { BaseUserSettings } from "../BaseUserSettings"; @customElement("ak-user-settings-source-oauth") export class SourceSettingsOAuth extends BaseUserSettings { diff --git a/web/src/user/user-settings/sources/SourceSettingsPlex.ts b/web/src/user/user-settings/sources/SourceSettingsPlex.ts index 32005058b..6d862a305 100644 --- a/web/src/user/user-settings/sources/SourceSettingsPlex.ts +++ b/web/src/user/user-settings/sources/SourceSettingsPlex.ts @@ -1,10 +1,13 @@ +import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { BaseUserSettings } from "../BaseUserSettings"; -import { SourcesApi } from "@goauthentik/api"; import { until } from "lit/directives/until"; + +import { SourcesApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { t } from "@lingui/macro"; +import { BaseUserSettings } from "../BaseUserSettings"; @customElement("ak-user-settings-source-plex") export class SourceSettingsPlex extends BaseUserSettings { diff --git a/web/src/user/user-settings/stages/StageSettings.ts b/web/src/user/user-settings/stages/StageSettings.ts index 75c64af9b..b906f1139 100644 --- a/web/src/user/user-settings/stages/StageSettings.ts +++ b/web/src/user/user-settings/stages/StageSettings.ts @@ -1,12 +1,15 @@ -import { StagesApi, UserSetting } from "@goauthentik/api"; import { t } from "@lingui/macro"; + import { CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { until } from "lit/directives/until"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { EVENT_REFRESH } from "../../../constants"; + import PFStack from "@patternfly/patternfly/layouts/Stack/stack.css"; +import { StagesApi, UserSetting } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/EmptyState"; import "./UserSettingsAuthenticatorDuo"; import "./UserSettingsAuthenticatorStatic"; diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts index 71ef7951e..ea0743e4f 100644 --- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts +++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts @@ -1,11 +1,14 @@ -import { AuthenticatorsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; import { until } from "lit/directives/until"; + +import { AuthenticatorsApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { BaseUserSettings } from "../BaseUserSettings"; import { EVENT_REFRESH } from "../../../constants"; +import { BaseUserSettings } from "../BaseUserSettings"; @customElement("ak-user-settings-authenticator-duo") export class UserSettingsAuthenticatorDuo extends BaseUserSettings { diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts index 303e923da..559c5a0b5 100644 --- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts +++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts @@ -1,12 +1,15 @@ -import { AuthenticatorsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; +import { customElement } from "lit/decorators"; import { until } from "lit/directives/until"; + +import { AuthenticatorsApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import { STATIC_TOKEN_STYLE } from "../../../flows/stages/authenticator_static/AuthenticatorStaticStage"; import { BaseUserSettings } from "../BaseUserSettings"; -import { EVENT_REFRESH } from "../../../constants"; -import { customElement } from "lit/decorators"; @customElement("ak-user-settings-authenticator-static") export class UserSettingsAuthenticatorStatic extends BaseUserSettings { diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts index 87bdafb97..b0c8e30c5 100644 --- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts +++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts @@ -1,11 +1,14 @@ -import { AuthenticatorsApi } from "@goauthentik/api"; import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; import { until } from "lit/directives/until"; + +import { AuthenticatorsApi } from "@goauthentik/api"; + import { DEFAULT_CONFIG } from "../../../api/Config"; -import { BaseUserSettings } from "../BaseUserSettings"; import { EVENT_REFRESH } from "../../../constants"; +import { BaseUserSettings } from "../BaseUserSettings"; @customElement("ak-user-settings-authenticator-totp") export class UserSettingsAuthenticatorTOTP extends BaseUserSettings { diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts index 9d6baead4..75243db42 100644 --- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts +++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts @@ -1,19 +1,23 @@ +import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import { t } from "@lingui/macro"; -import { AuthenticatorsApi, WebAuthnDevice } from "@goauthentik/api"; +import { ifDefined } from "lit/directives/if-defined"; import { until } from "lit/directives/until"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import { BaseUserSettings } from "../BaseUserSettings"; + import PFDataList from "@patternfly/patternfly/components/DataList/data-list.css"; + +import { AuthenticatorsApi, WebAuthnDevice } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/buttons/ModalButton"; import "../../../elements/buttons/SpinnerButton"; import "../../../elements/forms/DeleteForm"; import "../../../elements/forms/Form"; -import "../../../elements/forms/ModalForm"; import "../../../elements/forms/HorizontalFormElement"; -import { ifDefined } from "lit/directives/if-defined"; -import { EVENT_REFRESH } from "../../../constants"; +import "../../../elements/forms/ModalForm"; +import { BaseUserSettings } from "../BaseUserSettings"; @customElement("ak-user-settings-authenticator-webauthn") export class UserSettingsAuthenticatorWebAuthn extends BaseUserSettings { diff --git a/web/src/user/user-settings/stages/UserSettingsPassword.ts b/web/src/user/user-settings/stages/UserSettingsPassword.ts index c5235d53a..cdc88012f 100644 --- a/web/src/user/user-settings/stages/UserSettingsPassword.ts +++ b/web/src/user/user-settings/stages/UserSettingsPassword.ts @@ -1,9 +1,11 @@ +import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; import { customElement } from "lit/decorators"; -import { t } from "@lingui/macro"; -import { BaseUserSettings } from "../BaseUserSettings"; import { ifDefined } from "lit/directives/if-defined"; +import { BaseUserSettings } from "../BaseUserSettings"; + @customElement("ak-user-settings-password") export class UserSettingsPassword extends BaseUserSettings { render(): TemplateResult { diff --git a/web/src/user/user-settings/tokens/UserTokenForm.ts b/web/src/user/user-settings/tokens/UserTokenForm.ts index 80b4b09b7..92f64ab39 100644 --- a/web/src/user/user-settings/tokens/UserTokenForm.ts +++ b/web/src/user/user-settings/tokens/UserTokenForm.ts @@ -1,9 +1,12 @@ -import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; import { t } from "@lingui/macro"; -import { customElement, property } from "lit/decorators"; + import { html, TemplateResult } from "lit"; -import { DEFAULT_CONFIG } from "../../../api/Config"; +import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; + +import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; + +import { DEFAULT_CONFIG } from "../../../api/Config"; import "../../../elements/forms/HorizontalFormElement"; import { ModelForm } from "../../../elements/forms/ModelForm"; diff --git a/web/src/user/user-settings/tokens/UserTokenList.ts b/web/src/user/user-settings/tokens/UserTokenList.ts index 5193bca1b..6571ed7ed 100644 --- a/web/src/user/user-settings/tokens/UserTokenList.ts +++ b/web/src/user/user-settings/tokens/UserTokenList.ts @@ -1,20 +1,23 @@ import { t } from "@lingui/macro"; + import { CSSResult, html, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; -import { AKResponse } from "../../../api/Client"; + import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; +import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; + +import { AKResponse } from "../../../api/Client"; +import { DEFAULT_CONFIG } from "../../../api/Config"; +import { PAGE_SIZE } from "../../../constants"; +import "../../../elements/buttons/Dropdown"; +import "../../../elements/buttons/ModalButton"; +import "../../../elements/buttons/TokenCopyButton"; import "../../../elements/forms/DeleteBulkForm"; import "../../../elements/forms/ModalForm"; -import "../../../elements/buttons/ModalButton"; -import "../../../elements/buttons/Dropdown"; -import "../../../elements/buttons/TokenCopyButton"; import { Table, TableColumn } from "../../../elements/table/Table"; -import { PAGE_SIZE } from "../../../constants"; -import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; -import { DEFAULT_CONFIG } from "../../../api/Config"; -import "./UserTokenForm"; import { IntentToLabel } from "../../../pages/tokens/TokenListPage"; +import "./UserTokenForm"; @customElement("ak-user-token-list") export class UserTokenList extends Table { diff --git a/web/src/utils.ts b/web/src/utils.ts index e41af1a83..313007866 100644 --- a/web/src/utils.ts +++ b/web/src/utils.ts @@ -1,5 +1,7 @@ import { t } from "@lingui/macro"; + import { html, TemplateResult } from "lit"; + import "./elements/EmptyState"; export function getCookie(name: string): string {