From aaf7981355e55bb1d02bf3fa14f0e904b206d148 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 14:25:35 +0200 Subject: [PATCH 01/32] format --- src/Umbraco.Web.UI.Client/eslint.config.js | 104 ++++++++++----------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/eslint.config.js b/src/Umbraco.Web.UI.Client/eslint.config.js index eaa0ded53d..79e1006836 100644 --- a/src/Umbraco.Web.UI.Client/eslint.config.js +++ b/src/Umbraco.Web.UI.Client/eslint.config.js @@ -1,11 +1,11 @@ -import js from "@eslint/js"; -import globals from "globals"; -import importPlugin from "eslint-plugin-import"; -import localRules from "eslint-plugin-local-rules"; -import wcPlugin from "eslint-plugin-wc"; -import litPlugin from "eslint-plugin-lit"; -import litA11yPlugin from "eslint-plugin-lit-a11y"; -import storybookPlugin from "eslint-plugin-storybook"; +import js from '@eslint/js'; +import globals from 'globals'; +import importPlugin from 'eslint-plugin-import'; +import localRules from 'eslint-plugin-local-rules'; +import wcPlugin from 'eslint-plugin-wc'; +import litPlugin from 'eslint-plugin-lit'; +import litA11yPlugin from 'eslint-plugin-lit-a11y'; +import storybookPlugin from 'eslint-plugin-storybook'; import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'; import tseslint from 'typescript-eslint'; @@ -18,11 +18,11 @@ export default [ // Global ignores { ignores: [ - "**/rollup.config.js", - "**/vite.config.ts", - "src/external", - "src/packages/core/icon-registry/icons", - "src/packages/core/icon-registry/icons.ts" + '**/rollup.config.js', + '**/vite.config.ts', + 'src/external', + 'src/packages/core/icon-registry/icons', + 'src/packages/core/icon-registry/icons.ts', ], }, @@ -35,52 +35,52 @@ export default [ }, globals: { ...globals.browser, - } + }, }, plugins: { import: importPlugin, - "local-rules": localRules, - "wc": wcPlugin, - "lit": litPlugin, - "lit-a11y": litA11yPlugin, - "storybook": storybookPlugin + 'local-rules': localRules, + wc: wcPlugin, + lit: litPlugin, + 'lit-a11y': litA11yPlugin, + storybook: storybookPlugin, }, rules: { - semi: ["warn", "always"], - "no-unused-vars": "warn", - "no-var": "error", - "import/no-unresolved": "off", - "import/order": ["warn", { "groups": ["builtin", "parent", "sibling", "index", "external"] }], - "import/no-self-import": "error", - "import/no-cycle": ["error", { "maxDepth": 6, "allowUnsafeDynamicCyclicDependency": true }], - "local-rules/bad-type-import": "error", - "local-rules/enforce-element-suffix-on-element-class-name": "error", - "local-rules/enforce-umb-prefix-on-element-name": "error", - "local-rules/ensure-relative-import-use-js-extension": "error", - "local-rules/no-direct-api-import": "warn", - "local-rules/prefer-import-aliases": "error", - "local-rules/prefer-static-styles-last": "warn", - "local-rules/umb-class-prefix": "error", - "local-rules/no-relative-import-to-import-map-module": "error", - "local-rules/enforce-umbraco-external-imports": [ - "error", + semi: ['warn', 'always'], + 'no-unused-vars': 'warn', + 'no-var': 'error', + 'import/no-unresolved': 'off', + 'import/order': ['warn', { groups: ['builtin', 'parent', 'sibling', 'index', 'external'] }], + 'import/no-self-import': 'error', + 'import/no-cycle': ['error', { maxDepth: 6, allowUnsafeDynamicCyclicDependency: true }], + 'local-rules/bad-type-import': 'error', + 'local-rules/enforce-element-suffix-on-element-class-name': 'error', + 'local-rules/enforce-umb-prefix-on-element-name': 'error', + 'local-rules/ensure-relative-import-use-js-extension': 'error', + 'local-rules/no-direct-api-import': 'warn', + 'local-rules/prefer-import-aliases': 'error', + 'local-rules/prefer-static-styles-last': 'warn', + 'local-rules/umb-class-prefix': 'error', + 'local-rules/no-relative-import-to-import-map-module': 'error', + 'local-rules/enforce-umbraco-external-imports': [ + 'error', { - "exceptions": ["@umbraco-cms", "@open-wc/testing", "@storybook", "msw", ".", "vite"] - } + exceptions: ['@umbraco-cms', '@open-wc/testing', '@storybook', 'msw', '.', 'vite'], + }, ], - "local-rules/exported-string-constant-naming": [ - "error", + 'local-rules/exported-string-constant-naming': [ + 'error', { - "excludedFileNames": ["umbraco-package", "input-tiny-mce.defaults"] // TODO: what to do about the tiny mce defaults? - } + excludedFileNames: ['umbraco-package', 'input-tiny-mce.defaults'], // TODO: what to do about the tiny mce defaults? + }, ], - "@typescript-eslint/no-non-null-assertion": "off", - "@typescript-eslint/no-explicit-any": "warn", - "@typescript-eslint/no-unused-vars": "warn", - "@typescript-eslint/consistent-type-exports": "error", - "@typescript-eslint/consistent-type-imports": "error", - "@typescript-eslint/no-import-type-side-effects": "warn" - } + '@typescript-eslint/no-non-null-assertion': 'off', + '@typescript-eslint/no-explicit-any': 'warn', + '@typescript-eslint/no-unused-vars': 'warn', + '@typescript-eslint/consistent-type-exports': 'error', + '@typescript-eslint/consistent-type-imports': 'error', + '@typescript-eslint/no-import-type-side-effects': 'warn', + }, }, // Pattern-specific overrides @@ -90,7 +90,7 @@ export default [ languageOptions: { globals: { ...globals.node, - } - } + }, + }, }, ]; From 0de5bf5cf3b29054074083cf1c31de65be3c1e13 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 14:26:56 +0200 Subject: [PATCH 02/32] allow unused params --- src/Umbraco.Web.UI.Client/eslint.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/eslint.config.js b/src/Umbraco.Web.UI.Client/eslint.config.js index 79e1006836..bd97a225f8 100644 --- a/src/Umbraco.Web.UI.Client/eslint.config.js +++ b/src/Umbraco.Web.UI.Client/eslint.config.js @@ -47,7 +47,7 @@ export default [ }, rules: { semi: ['warn', 'always'], - 'no-unused-vars': 'warn', + 'no-unused-vars': 'off', //Let '@typescript-eslint/no-unused-vars' catch the errors to allow unused function parameters (ex: in interfaces) 'no-var': 'error', 'import/no-unresolved': 'off', 'import/order': ['warn', { groups: ['builtin', 'parent', 'sibling', 'index', 'external'] }], From c2507b081b08583e8daed523dfe0869bbca4de11 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:06:52 +0200 Subject: [PATCH 03/32] set unused var to error --- src/Umbraco.Web.UI.Client/eslint.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/eslint.config.js b/src/Umbraco.Web.UI.Client/eslint.config.js index bd97a225f8..3edaa890a5 100644 --- a/src/Umbraco.Web.UI.Client/eslint.config.js +++ b/src/Umbraco.Web.UI.Client/eslint.config.js @@ -76,7 +76,7 @@ export default [ ], '@typescript-eslint/no-non-null-assertion': 'off', '@typescript-eslint/no-explicit-any': 'warn', - '@typescript-eslint/no-unused-vars': 'warn', + '@typescript-eslint/no-unused-vars': 'error', '@typescript-eslint/consistent-type-exports': 'error', '@typescript-eslint/consistent-type-imports': 'error', '@typescript-eslint/no-import-type-side-effects': 'warn', From 2c5d266de2ad0599c42e91f26378575acc676b92 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:07:25 +0200 Subject: [PATCH 04/32] remove unused vars --- .../controller/base-extensions-initializer.controller.ts | 2 -- .../src/mocks/data/document/document-collection.manager.ts | 5 ----- .../packages/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts | 1 - .../user/user-group/entity-bulk-actions/manifests.ts | 1 - .../user-group/workspace/user-group-workspace.context.ts | 2 +- .../user-workspace-assign-access.element.ts | 2 +- .../packages/user/user/workspace/user-workspace.context.ts | 2 +- .../src/packages/user/user/workspace/user-workspace.test.ts | 1 - .../webhook-table-entity-actions-column-layout.element.ts | 2 +- .../src/packages/webhook/menu-item/manifests.ts | 1 - .../webhook/repository/detail/webhook-detail.repository.ts | 1 - 11 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts index c55c77bb36..6b122d0311 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts @@ -1,5 +1,4 @@ import type { SpecificManifestTypeOrManifestBase } from '../types/map.types.js'; -import { map } from '@umbraco-cms/backoffice/external/rxjs'; import type { ManifestBase, UmbBaseExtensionInitializer, @@ -7,7 +6,6 @@ import type { } from '@umbraco-cms/backoffice/extension-api'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { createObservablePart } from '@umbraco-cms/backoffice/observable-api'; export type PermittedControllerType = ControllerType & { manifest: Required>; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-collection.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-collection.manager.ts index 945127fc48..a3979f2ce6 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-collection.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-collection.manager.ts @@ -17,11 +17,6 @@ export class UmbMockDocumentCollectionManager { getCollectionDocumentById({ id, - dataTypeId, - orderBy, - orderCulture, - orderDirection, - filter, skip = 0, take = 100, }: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts index 49051e3419..91b79639a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts @@ -2,7 +2,6 @@ import { getGuid } from '../utils.js'; import { UMB_MEDIA_CAPTION_ALT_TEXT_MODAL } from '../modals/media-caption-alt-text/media-caption-alt-text-modal.token.js'; import { type TinyMcePluginArguments, UmbTinyMcePluginBase } from '../components/input-tiny-mce/tiny-mce-plugin.js'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import type { UMB_CURRENT_USER_CONTEXT, UmbCurrentUserModel } from '@umbraco-cms/backoffice/current-user'; import type { RawEditorOptions } from '@umbraco-cms/backoffice/external/tinymce'; import { UmbTemporaryFileRepository } from '@umbraco-cms/backoffice/temporary-file'; import { UmbId } from '@umbraco-cms/backoffice/id'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts index 78f0e3edfb..87662253e0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts @@ -1,6 +1,5 @@ import { UMB_USER_GROUP_COLLECTION_ALIAS } from '../collection/index.js'; import { UMB_USER_GROUP_ENTITY_TYPE } from '../entity.js'; -import { UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS } from '../repository/index.js'; import { UmbDeleteUserGroupEntityBulkAction } from './delete/delete.action.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; import type { ManifestEntityBulkAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts index 0ad5583347..c360e2057f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts @@ -42,7 +42,7 @@ export class UmbUserGroupWorkspaceContext { path: 'create', component: UmbUserGroupWorkspaceEditorElement, - setup: (component, info) => { + setup: () => { this.create(); new UmbWorkspaceIsNewRedirectController( diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-assign-access/user-workspace-assign-access.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-assign-access/user-workspace-assign-access.element.ts index 8bb3f8d60c..844ea8f228 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-assign-access/user-workspace-assign-access.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-assign-access/user-workspace-assign-access.element.ts @@ -1,6 +1,6 @@ import { UMB_USER_WORKSPACE_CONTEXT } from '../../user-workspace.context-token.js'; import type { UmbUserDetailModel } from '../../../types.js'; -import { html, customElement, state, css, nothing } from '@umbraco-cms/backoffice/external/lit'; +import { html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts index 5529398983..ff9ef93e5a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts @@ -5,7 +5,7 @@ import { UmbUserAvatarRepository } from '../repository/avatar/index.js'; import { UMB_USER_WORKSPACE_ALIAS } from './manifests.js'; import { UmbUserWorkspaceEditorElement } from './user-workspace-editor.element.js'; import type { UmbSubmittableWorkspaceContext } from '@umbraco-cms/backoffice/workspace'; -import { UmbSubmittableWorkspaceContextBase, UmbWorkspaceRouteManager } from '@umbraco-cms/backoffice/workspace'; +import { UmbSubmittableWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.test.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.test.ts index fba5017291..9e8480349a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.test.ts @@ -1,4 +1,3 @@ -import { expect, fixture, html } from '@open-wc/testing'; //TODO: Test has been commented out while we figure out how to setup import maps for the test environment // import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; // import UmbWorkspaceUserElement from './editor-user.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/table/column-layouts/entity-actions/webhook-table-entity-actions-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/table/column-layouts/entity-actions/webhook-table-entity-actions-column-layout.element.ts index 7b02903c0b..16cd56b978 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/table/column-layouts/entity-actions/webhook-table-entity-actions-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/table/column-layouts/entity-actions/webhook-table-entity-actions-column-layout.element.ts @@ -1,5 +1,5 @@ import type { UmbWebhookDetailModel } from '../../../../../types.js'; -import { html, nothing, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; +import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-webhook-table-entity-actions-column-layout') diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/menu-item/manifests.ts index 04c2d9c2ee..5ea8f932bd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/menu-item/manifests.ts @@ -1,4 +1,3 @@ -import { UMB_WEBHOOK_ENTITY_TYPE } from '../entity.js'; import type { ManifestMenuItem, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; const menuItem: ManifestMenuItem = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/detail/webhook-detail.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/detail/webhook-detail.repository.ts index b380e4b5a4..f1495a286b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/detail/webhook-detail.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/detail/webhook-detail.repository.ts @@ -1,7 +1,6 @@ import type { UmbWebhookDetailModel } from '../../types.js'; import { UmbWebhookDetailServerDataSource } from './webhook-detail.server.data-source.js'; import { UMB_WEBHOOK_DETAIL_STORE_CONTEXT } from './webhook-detail.store.js'; -import { WebhookService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbDetailRepositoryBase } from '@umbraco-cms/backoffice/repository'; From 874d194a5aeb57a8398a82d3edf0667033efc59a Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:08:53 +0200 Subject: [PATCH 05/32] remove more unused vars --- .../scripts/tree/folder/script-folder.server.data-source.ts | 2 +- .../media-caption-alt-text-modal.element.ts | 2 +- .../tiny-mce/property-editor-ui-tiny-mce.element.ts | 3 +-- .../components/input-user-group/user-group-input.test.ts | 1 - .../modals/user-group-picker/user-group-picker-modal.test.ts | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts index ff518c6150..e77a405676 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts @@ -109,7 +109,7 @@ export class UmbScriptFolderServerDataSource implements UmbFolderDataSource { ); } - async update(args: UmbUpdateFolderModel): Promise { + async update(): Promise { throw new Error('Updating is not supported'); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/modals/media-caption-alt-text/media-caption-alt-text-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/modals/media-caption-alt-text/media-caption-alt-text-modal.element.ts index 515514c08b..adb87d2e7d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/modals/media-caption-alt-text/media-caption-alt-text-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/modals/media-caption-alt-text/media-caption-alt-text-modal.element.ts @@ -2,7 +2,7 @@ import type { UmbMediaCaptionAltTextModalData, UmbMediaCaptionAltTextModalValue, } from './media-caption-alt-text-modal.token.js'; -import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import '@umbraco-cms/backoffice/block-type'; import { UmbMediaDetailRepository } from '@umbraco-cms/backoffice/media'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts index 5d09e08656..2be77797cf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts @@ -6,7 +6,6 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extensi import '../../components/input-tiny-mce/input-tiny-mce.element.js'; import { - UmbBlockRteEntriesContext, type UmbBlockRteLayoutModel, UmbBlockRteManagerContext, type UmbBlockRteTypeModel, @@ -100,7 +99,7 @@ export class UmbPropertyEditorUITinyMceElement extends UmbLitElement implements this.dispatchEvent(new UmbPropertyValueChangeEvent()); } - #onChange(event: InputEvent & { target: HTMLInputElement }) { + #onChange() { const editor = this.#managerContext.getTinyMceEditor(); if (!editor) return; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.test.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.test.ts index 22dc83a85b..839d38cb36 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.test.ts @@ -1,4 +1,3 @@ -import { expect, fixture, html } from '@open-wc/testing'; //TODO: Test has been commented out while we figure out how to setup import maps for the test environment // import { UmbPickerUserGroupElement } from './picker-user-group.element.js'; // import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.test.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.test.ts index 289c23b982..91ce72f905 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.test.ts @@ -1,4 +1,3 @@ -import { expect, fixture, html } from '@open-wc/testing'; //TODO: Test has been commented out while we figure out how to setup import maps for the test environment // import { UmbPickerLayoutUserGroupElement } from './picker-layout-user-group.element.js'; // import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; From 3e422500dc2d6e5f88ed4ebc5c3b48e183513ee7 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:13:48 +0200 Subject: [PATCH 06/32] remove unused vars --- .../src/libs/observable-api/observer.controller.test.ts | 6 +++--- .../details/data-type-details-workspace-view.stories.ts | 2 +- .../views/info/workspace-view-data-type-info.stories.ts | 2 +- .../repository/item/dictionary-item.server.data-source.ts | 5 +---- .../src/packages/dictionary/tree/manifests.ts | 1 - .../tree/document-blueprint-tree.server.data-source.ts | 2 +- .../workspace/document-blueprint-workspace.context.ts | 1 - .../documents/documents/entity-actions/manifests.ts | 2 -- .../documents/documents/entity-bulk-actions/manifests.ts | 5 ----- .../media/media/entity-bulk-actions/move/move.action.ts | 4 ++-- .../media/modals/media-picker/media-picker-modal.element.ts | 2 +- .../media/repository/item/media-item.server.data-source.ts | 2 +- .../media/media/tree/media-tree.server.data-source.ts | 6 +----- .../src/packages/object-type/input-object-type.element.ts | 2 +- .../views/created/created-packages-section-view.element.ts | 2 +- .../tree/folder/stylesheet-folder.server.data-source.ts | 2 +- 16 files changed, 15 insertions(+), 31 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.test.ts index a8a140a5bc..5688539233 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.test.ts @@ -20,7 +20,7 @@ describe('UmbObserverController', () => { const state = new UmbObjectState(undefined); const observable = state.asObservable(); - const callbackMethod = (state: unknown) => {}; + const callbackMethod = () => {}; const firstCtrl = new UmbObserverController(hostElement, observable, callbackMethod, 'my-test-alias'); const secondCtrl = new UmbObserverController(hostElement, observable, callbackMethod, 'my-test-alias'); @@ -33,7 +33,7 @@ describe('UmbObserverController', () => { const state = new UmbObjectState(undefined); const observable = state.asObservable(); - const callbackMethod = (state: unknown) => {}; + const callbackMethod = () => {}; const mySymbol = Symbol(); const firstCtrl = new UmbObserverController(hostElement, observable, callbackMethod, mySymbol); @@ -47,7 +47,7 @@ describe('UmbObserverController', () => { const state = new UmbObjectState(undefined); const observable = state.asObservable(); - const callbackMethod = (state: unknown) => {}; + const callbackMethod = () => {}; // Imitates the behavior of the observe method in the UmbClassMixin let controllerAlias1 = null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts index a0ea45dfca..8acf0b7488 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.stories.ts @@ -12,7 +12,7 @@ export default { component: 'umb-data-type-workspace-view-edit', id: 'umb-data-type-workspace-view-edit', decorators: [ - (story) => { + () => { return html`TODO: make use of mocked workspace context??`; /*html` ${story()} diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts index 01580af33f..5101c961a2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/info/workspace-view-data-type-info.stories.ts @@ -12,7 +12,7 @@ export default { component: 'umb-workspace-view-data-type-info', id: 'umb-workspace-view-data-type-info', decorators: [ - (story) => { + () => { return html`TODO: make use of mocked workspace context??`; /*html` ${story()} diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts index b9293d6afb..2ef2a48490 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts @@ -1,10 +1,7 @@ import { UMB_DICTIONARY_ENTITY_TYPE } from '../../entity.js'; import type { UmbDictionaryItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { - DictionaryItemItemResponseModel, - DictionaryItemResponseModel, -} from '@umbraco-cms/backoffice/external/backend-api'; +import type { DictionaryItemItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { DictionaryService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts index 9b38b4f6fd..93f0f644c4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts @@ -4,7 +4,6 @@ import { UMB_DICTIONARY_TREE_REPOSITORY_ALIAS, UMB_DICTIONARY_TREE_STORE_ALIAS, } from './constants.js'; -import { UmbDictionaryTreeStore } from './dictionary-tree.store.js'; import { manifests as reloadTreeItemChildrenManifests } from './reload-tree-item-children/manifests.js'; import type { ManifestRepository, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts index e9916b6a8b..eddbd1fb5c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts @@ -59,7 +59,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { } }; -const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => { +const getAncestorsOf = () => { throw new Error('Not implemented'); /** TODO: Implement when endpoint becomes available... */ }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts index 5a56cca1b0..aa48c508c8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts @@ -16,7 +16,6 @@ import { import { UmbSubmittableWorkspaceContextBase, UmbWorkspaceIsNewRedirectController, - UmbWorkspaceRouteManager, UmbWorkspaceSplitViewManager, } from '@umbraco-cms/backoffice/workspace'; import { UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts index e19caad085..4800606d69 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts @@ -2,8 +2,6 @@ import { UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, UMB_DOCUMENT_ITEM_REPOSITORY_ALIA import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js'; import { UMB_USER_PERMISSION_DOCUMENT_DELETE, - UMB_USER_PERMISSION_DOCUMENT_NOTIFICATIONS, - UMB_USER_PERMISSION_DOCUMENT_PERMISSIONS, UMB_USER_PERMISSION_DOCUMENT_PUBLISH, UMB_USER_PERMISSION_DOCUMENT_UNPUBLISH, } from '../user-permissions/constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts index de206ceb60..1ea725ee64 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts @@ -1,10 +1,5 @@ import { UMB_DOCUMENT_COLLECTION_ALIAS } from '../collection/index.js'; import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js'; -import { UmbDocumentDuplicateEntityBulkAction } from './duplicate/duplicate.action.js'; -import { UmbDocumentDeleteEntityBulkAction } from './delete/delete.action.js'; -import { UmbMoveDocumentEntityBulkAction } from './move/move.action.js'; -import { UmbDocumentPublishEntityBulkAction } from './publish/publish.action.js'; -import { UmbDocumentUnpublishEntityBulkAction } from './unpublish/unpublish.action.js'; import type { UmbCollectionBulkActionPermissions } from '@umbraco-cms/backoffice/collection'; import type { ManifestEntityBulkAction } from '@umbraco-cms/backoffice/extension-registry'; import { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/move/move.action.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/move/move.action.ts index d22ef9c539..e227b89b8c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/move/move.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/move/move.action.ts @@ -15,8 +15,8 @@ export class UmbMediaMoveEntityBulkAction extends UmbEntityBulkActionBase { + this.#repository.read().then(({ data }) => { if (!data) return; this._options = data.items.map((item) => ({ value: item.id, name: item.name ?? '' })); diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts index d19f3286d2..c3dd0a5746 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts @@ -49,7 +49,7 @@ export class UmbCreatedPackagesSectionViewElement extends UmbLitElement implemen routes.push({ path: workspace.meta.entityType, component: () => createExtensionElement(workspace), - setup: (component, info) => { + setup: (component) => { if (component) { (component as any).workspaceAlias = workspace.alias; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts index 24ba1fb4fc..43356b7179 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts @@ -109,7 +109,7 @@ export class UmbStylesheetFolderServerDataSource implements UmbFolderDataSource ); } - async update(args: UmbUpdateFolderModel): Promise { + async update(): Promise { throw new Error('Updating is not supported'); } } From f4cf8189f05b67cb6f56af3b5a705acbba907d5c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:34:15 +0200 Subject: [PATCH 07/32] remove unused vars --- .../src/libs/controller-api/controller.test.ts | 2 +- .../src/mocks/data/document/document.db.ts | 4 ++-- .../src/mocks/data/media/media-collection.manager.ts | 4 ---- .../src/mocks/data/user/user.db.ts | 2 +- .../data/utils/content/content-collection.manager.ts | 3 +-- .../src/mocks/handlers/webhook.handlers.ts | 4 ---- .../block-list/context/block-list-manager.context.ts | 2 ++ .../workspace/block-type-workspace.context.ts | 3 +++ .../block/block/context/block-manager.context.ts | 4 +++- .../multiple-color-picker-input.element.ts | 11 +---------- .../property-type-settings-modal.element.ts | 5 +---- ...u-variant-tree-structure-workspace-context-base.ts | 2 +- .../property-action-menu.element.ts | 6 +----- .../components/input-section/input-section.test.ts | 1 - .../section-sidebar-context-menu.element.ts | 1 - ...d-validation-message-to-form-control.controller.ts | 2 +- .../controllers/form-control-validator.controller.ts | 2 +- .../views/workspace-view-dictionary-editor.stories.ts | 2 +- .../document-blueprint-tree.server.data-source.ts | 6 +----- .../detail/document-detail.server.data-source.ts | 2 +- .../document-validation.server.data-source.ts | 3 +-- .../documents/documents/tree/document-tree.store.ts | 1 - .../packages/documents/documents/tree/manifests.ts | 1 - .../documents/workspace/document-workspace.context.ts | 6 +----- .../info/document-workspace-view-info.stories.ts | 2 +- .../log-viewer/repository/log-viewer.repository.ts | 3 --- .../components/log-viewer-log-types-chart.element.ts | 2 +- .../log-viewer-message-templates-overview.element.ts | 5 +---- .../search/components/log-viewer-message.element.ts | 2 -- .../detail/media-type-detail.server.data-source.ts | 2 +- ...operty-editor-ui-image-crops-configuration.test.ts | 1 - .../media/media/workspace/media-workspace.context.ts | 1 - .../packages/members/member-type/tree/manifests.ts | 2 -- .../member/workspace/member-workspace.context.ts | 1 - .../folder/partial-view-folder.server.data-source.ts | 4 ++-- .../script-create-options-modal.element.ts | 3 +-- .../tree/folder/script-folder.server.data-source.ts | 2 +- .../folder/stylesheet-folder.server.data-source.ts | 2 +- .../user/user/entity-bulk-actions/manifests.ts | 1 - 39 files changed, 33 insertions(+), 79 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/mocks/handlers/webhook.handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts index 325660cbd8..41a575024f 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts @@ -51,7 +51,7 @@ describe('UmbController', () => { let hostElement: UmbControllerHostElement; beforeEach(() => { - hostElement = document.createElement('test-my-controller-host') as UmbControllerHostElement; + hostElement = new UmbTestControllerHostElement(); }); describe('Controller Host Public API', () => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts index 0f6e13d5c6..d9a36ba11b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts @@ -33,11 +33,11 @@ export class UmbDocumentMockDB extends UmbEntityMockDbBase } // permissions - getUserPermissionsForDocument(id: string): Array { + getUserPermissionsForDocument(): Array { return []; } - getDomainsForDocument(id: string): DomainsResponseModel { + getDomainsForDocument(): DomainsResponseModel { return { defaultIsoCode: 'en-us', domains: [] }; } diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media-collection.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media-collection.manager.ts index bbcd972681..0ad8b41114 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media-collection.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media-collection.manager.ts @@ -14,10 +14,6 @@ export class UmbMockMediaCollectionManager { getCollectionMedia({ id, - dataTypeId, - orderBy, - orderDirection, - filter, skip = 0, take = 100, }: { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts index 63c5290bff..3f1ac5c5df 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts @@ -1,5 +1,5 @@ import { umbUserGroupMockDb } from '../user-group/user-group.db.js'; -import { arrayFilter, stringFilter, queryFilter, objectArrayFilter } from '../utils.js'; +import { stringFilter, queryFilter, objectArrayFilter } from '../utils.js'; import { UmbEntityMockDbBase } from '../utils/entity/entity-base.js'; import { UmbMockEntityItemManager } from '../utils/entity/entity-item.manager.js'; import { UmbMockEntityDetailManager } from '../utils/entity/entity-detail.manager.js'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/content/content-collection.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/content/content-collection.manager.ts index f63f639fbf..41ee046de3 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/content/content-collection.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/content/content-collection.manager.ts @@ -1,8 +1,7 @@ -import { queryFilter } from '../../utils.js'; import type { UmbMockDBBase } from '../mock-db-base.js'; import { pagedResult } from '../paged-result.js'; -const contentQueryFilter = (filterOptions: any, item: any) => { +const contentQueryFilter = () => { return true; console.log('implement filter logic for content items'); //queryFilter(filterOptions.filter, item.name); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/webhook.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/webhook.handlers.ts deleted file mode 100644 index a4081e6c4a..0000000000 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/webhook.handlers.ts +++ /dev/null @@ -1,4 +0,0 @@ -const { rest } = window.MockServiceWorker; -//import { umbracoPath } from '@umbraco-cms/backoffice/utils'; - -export const handlers = []; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-manager.context.ts index 5f78892ef2..b5610dab2c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-manager.context.ts @@ -21,6 +21,8 @@ export class UmbBlockListManagerContext< create( contentElementTypeKey: string, partialLayoutEntry?: Omit, + // TODO: [v15] ignoring unused modalData parameter to avoid breaking changes + // eslint-disable-next-line @typescript-eslint/no-unused-vars modalData?: UmbBlockListWorkspaceData, ) { return super.createBlockData(contentElementTypeKey, partialLayoutEntry); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts index cbfba97bfc..04eee5e75d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts @@ -133,6 +133,9 @@ export class UmbBlockTypeWorkspaceContext x.udi === contentUdi); } - setOneLayout(layoutData: BlockLayoutType, modalData?: UmbBlockWorkspaceData) { + setOneLayout(layoutData: BlockLayoutType) { this._layouts.appendOne(layoutData); } setOneContent(contentData: UmbBlockDataType) { @@ -264,6 +264,8 @@ export abstract class UmbBlockManagerContext< layoutEntry: BlockLayoutType, content: UmbBlockDataType, settings: UmbBlockDataType | undefined, + // TODO: [v15]: ignoring unused var here here to prevent a breaking change + // eslint-disable-next-line @typescript-eslint/no-unused-vars modalData: ModalDataType, ) { // Create content entry: diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts index 443e89fc53..11b9325f8b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts @@ -1,14 +1,5 @@ import type { UmbMultipleColorPickerItemInputElement } from './multiple-color-picker-item-input.element.js'; -import { - css, - customElement, - html, - ifDefined, - nothing, - repeat, - property, - state, -} from '@umbraco-cms/backoffice/external/lit'; +import { css, customElement, html, nothing, repeat, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts index ca2f2901c1..59dd001946 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts @@ -1,7 +1,4 @@ -import { - UMB_PROPERTY_TYPE_WORKSPACE_ALIAS, - UmbPropertyTypeWorkspaceContext, -} from './property-type-settings-modal.context.js'; +import { UMB_PROPERTY_TYPE_WORKSPACE_ALIAS } from './property-type-settings-modal.context.js'; import type { UmbPropertyTypeSettingsModalData, UmbPropertyTypeSettingsModalValue, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-variant-tree-structure-workspace-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-variant-tree-structure-workspace-context-base.ts index 9e1e1c2c98..82ba7df803 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-variant-tree-structure-workspace-context-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-variant-tree-structure-workspace-context-base.ts @@ -1,5 +1,5 @@ import type { UmbVariantStructureItemModel } from './types.js'; -import type { UmbTreeItemModel, UmbTreeRepository, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeRepository, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry'; import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; import { UMB_VARIANT_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts index 9b6c2c1ff6..7aa24b9c1e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts @@ -1,11 +1,7 @@ import type { UmbPropertyActionArgs } from '../property-action/types.js'; import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import type { - ManifestPropertyAction, - ManifestTypes, - MetaPropertyAction, -} from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestPropertyAction, MetaPropertyAction } from '@umbraco-cms/backoffice/extension-registry'; import { UmbExtensionsElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.test.ts index fd2387ad2b..5d0eec3033 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.test.ts @@ -1,4 +1,3 @@ -import { expect, fixture, html } from '@open-wc/testing'; //TODO: Test has been commented out while we figure out how to setup import maps for the test environment // import { UmbPickerSectionElement } from './picker-section.element.js'; // import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts index 5eebb945e1..8e588f910c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts @@ -5,7 +5,6 @@ import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffic import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { observeMultiple } from '@umbraco-cms/backoffice/observable-api'; import type { UmbContextRequestEvent } from '@umbraco-cms/backoffice/context-api'; -import { UMB_CONTENT_REQUEST_EVENT_TYPE } from '@umbraco-cms/backoffice/context-api'; @customElement('umb-section-sidebar-context-menu') export class UmbSectionSidebarContextMenuElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-validation-message-to-form-control.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-validation-message-to-form-control.controller.ts index be8111f07b..2bfc4e49c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-validation-message-to-form-control.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-validation-message-to-form-control.controller.ts @@ -3,7 +3,7 @@ import { UMB_VALIDATION_CONTEXT } from '../context/validation.context-token.js'; import type { UmbFormControlMixinInterface } from '../mixins/form-control.mixin.js'; import { jsonStringComparison } from '@umbraco-cms/backoffice/observable-api'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -import type { UmbControllerAlias, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; const ctrlSymbol = Symbol(); const observeSymbol = Symbol(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/form-control-validator.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/form-control-validator.controller.ts index 662926bb38..244025e09d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/form-control-validator.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/form-control-validator.controller.ts @@ -4,7 +4,7 @@ import type { UmbFormControlMixinInterface } from '../mixins/form-control.mixin. import { UmbValidationInvalidEvent } from '../events/validation-invalid.event.js'; import { UmbValidationValidEvent } from '../events/validation-valid.event.js'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -import type { UmbControllerAlias, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbFormControlValidator extends UmbControllerBase implements UmbValidator { // The path to the data that this validator is validating. diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.stories.ts index ca420b4ddc..2cc6700a0b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.stories.ts @@ -10,7 +10,7 @@ export default { component: 'umb-workspace-view-dictionary-editor', id: 'umb-workspace-view-dictionary-editor', decorators: [ - (story) => { + () => { return html`TODO: make use of mocked workspace context??`; /*html` ${story()} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts index eddbd1fb5c..c1d744d8ec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.server.data-source.ts @@ -8,11 +8,7 @@ import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import { DocumentBlueprintService } from '@umbraco-cms/backoffice/external/backend-api'; import type { DocumentBlueprintTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import type { - UmbTreeAncestorsOfRequestArgs, - UmbTreeChildrenOfRequestArgs, - UmbTreeRootItemsRequestArgs, -} from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeChildrenOfRequestArgs, UmbTreeRootItemsRequestArgs } from '@umbraco-cms/backoffice/tree'; /** * A data source for a data type tree that fetches data from the server diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts index e50e95ad9b..b9d5340862 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts @@ -1,4 +1,4 @@ -import type { UmbDocumentDetailModel, UmbDocumentVariantModel } from '../../types.js'; +import type { UmbDocumentDetailModel } from '../../types.js'; import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts index 02b354d9b1..2ba4e4ea08 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts @@ -4,7 +4,6 @@ import { DocumentService, type UpdateDocumentRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; /** @@ -21,7 +20,7 @@ export class UmbDocumentValidationServerDataSource { * @param {UmbControllerHost} host * @memberof UmbDocumentPublishingServerDataSource */ - constructor(host: UmbControllerHost) { + constructor() { //this.#host = host; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.store.ts index 32c6f146e2..160909934f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.store.ts @@ -1,5 +1,4 @@ import { UMB_DOCUMENT_TREE_STORE_CONTEXT } from './document-tree.store.context-token.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbUniqueTreeStore } from '@umbraco-cms/backoffice/tree'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts index 7dfb6a5a6e..cd89a8e8bb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts @@ -1,6 +1,5 @@ import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE } from '../entity.js'; import { manifests as reloadTreeItemChildrenManifests } from './reload-tree-item-children/manifests.js'; -import { UmbDocumentTreeItemContext } from './tree-item/document-tree-item.context.js'; import type { ManifestRepository, ManifestTree, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts index 7bc3e62ce7..24eb235fce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts @@ -34,7 +34,6 @@ import { type UmbPublishableWorkspaceContext, UmbSubmittableWorkspaceContextBase, UmbWorkspaceIsNewRedirectController, - UmbWorkspaceRouteManager, UmbWorkspaceSplitViewManager, } from '@umbraco-cms/backoffice/workspace'; import { @@ -53,10 +52,7 @@ import { UmbRequestReloadStructureForEntityEvent, } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import { - UmbServerModelValidationContext, - UmbVariantValuesValidationMessageTranslator, -} from '@umbraco-cms/backoffice/validation'; +import { UmbServerModelValidationContext } from '@umbraco-cms/backoffice/validation'; import { UmbDocumentBlueprintDetailRepository } from '@umbraco-cms/backoffice/document-blueprint'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbContentWorkspaceContext } from '@umbraco-cms/backoffice/content'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.stories.ts index 92dd7c9a25..fd997ee00f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.stories.ts @@ -12,7 +12,7 @@ export default { component: 'umb-document-workspace-view-info', id: 'umb-document-workspace-view-info', decorators: [ - (story) => { + () => { return html`TODO: make use of mocked workspace context??`; /*html` ${story()} diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts index 9337496d01..bc7dd36f67 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts @@ -1,8 +1,5 @@ import { UmbLogMessagesServerDataSource, UmbLogSearchesServerDataSource } from './sources/log-viewer.server.data.js'; -import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; -import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { DirectionModel, LogLevelModel, diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts index 82c0d88796..f7414a20c4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts @@ -42,7 +42,7 @@ export class UmbLogViewerLogTypesChartElement extends UmbLitElement { setLogLevelCount() { this.logLevelCount = this._logLevelCount - ? Object.entries(this._logLevelCount).filter(([level, number]) => !this._logLevelCountFilter.includes(level)) + ? Object.entries(this._logLevelCount).filter(([level]) => !this._logLevelCountFilter.includes(level)) : []; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts index 41e7fceac9..5d287f6569 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts @@ -3,10 +3,7 @@ import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -import type { - LogTemplateResponseModel, - SavedLogSearchResponseModel, -} from '@umbraco-cms/backoffice/external/backend-api'; +import type { LogTemplateResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui'; @customElement('umb-log-viewer-message-templates-overview') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts index 43bcf13905..db7d4d095f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts @@ -1,5 +1,3 @@ -import type { UmbLogViewerWorkspaceContext } from '../../../logviewer-workspace.context.js'; -import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer-workspace.context-token.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, property, query, state } from '@umbraco-cms/backoffice/external/lit'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts index 55f1efb5d1..97bb37b73f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts @@ -9,7 +9,7 @@ import type { import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { UmbPropertyContainerTypes, UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type'; +import type { UmbPropertyContainerTypes } from '@umbraco-cms/backoffice/content-type'; /** * A data source for the Media Type that fetches data from the server diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts index 06c714d10c..21e89b165a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts @@ -1,6 +1,5 @@ import { UmbPropertyEditorUIImageCropsConfigurationElement } from './property-editor-ui-image-crops-configuration.element.js'; import { expect, fixture, html } from '@open-wc/testing'; -import type { UmbTestRunnerWindow } from '@umbraco-cms/internal/test-utils'; //import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUIImageCropsConfigurationElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts index fd947b35e5..6c5f34884b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts @@ -9,7 +9,6 @@ import { type UmbCollectionWorkspaceContext, UmbSubmittableWorkspaceContextBase, UmbWorkspaceIsNewRedirectController, - UmbWorkspaceRouteManager, UmbWorkspaceSplitViewManager, } from '@umbraco-cms/backoffice/workspace'; import { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/manifests.ts index 6871b5f059..0cf25f48b6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/manifests.ts @@ -1,6 +1,4 @@ import { UMB_MEMBER_TYPE_ENTITY_TYPE, UMB_MEMBER_TYPE_ROOT_ENTITY_TYPE } from '../entity.js'; -import { UmbMemberTypeTreeRepository } from './member-type-tree.repository.js'; -import { UmbMemberTypeTreeStore } from './member-type-tree.store.js'; import { manifests as reloadTreeItemChildrenManifest } from './reload-tree-item-children/manifests.js'; import type { ManifestRepository, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts index eed6cd18cb..1e249d615a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts @@ -7,7 +7,6 @@ import { type UmbMemberTypeDetailModel, UmbMemberTypeDetailRepository } from '@u import { UmbSubmittableWorkspaceContextBase, UmbWorkspaceIsNewRedirectController, - UmbWorkspaceRouteManager, UmbWorkspaceSplitViewManager, } from '@umbraco-cms/backoffice/workspace'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts index 5cedef79c2..bdb3b96bcb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts @@ -1,5 +1,5 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; -import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbCreateFolderModel, UmbFolderDataSource } from '@umbraco-cms/backoffice/tree'; import type { CreatePartialViewFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { PartialViewService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -109,7 +109,7 @@ export class UmbPartialViewFolderServerDataSource implements UmbFolderDataSource ); } - async update(args: UmbUpdateFolderModel): Promise { + async update(): Promise { throw new Error('Updating is not supported'); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/script-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/script-create-options-modal.element.ts index d68b6e2209..e6e330e2a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/script-create-options-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/script-create-options-modal.element.ts @@ -1,8 +1,7 @@ import { UMB_SCRIPT_FOLDER_REPOSITORY_ALIAS } from '../../../tree/folder/index.js'; import type { UmbScriptCreateOptionsModalData } from './index.js'; import { html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; -import { UMB_MODAL_MANAGER_CONTEXT, UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; +import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { UmbCreateFolderEntityAction } from '@umbraco-cms/backoffice/tree'; @customElement('umb-script-create-options-modal') diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts index e77a405676..9ce702765a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts @@ -1,5 +1,5 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; -import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbCreateFolderModel, UmbFolderDataSource } from '@umbraco-cms/backoffice/tree'; import type { CreateScriptFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { ScriptService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts index 43356b7179..55477245fd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts @@ -1,5 +1,5 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; -import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbCreateFolderModel, UmbFolderDataSource } from '@umbraco-cms/backoffice/tree'; import type { CreateStylesheetFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { StylesheetService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts index 3b9e43a859..815ef4f367 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts @@ -1,7 +1,6 @@ import { UMB_USER_COLLECTION_ALIAS } from '../collection/manifests.js'; import { UMB_USER_ENTITY_TYPE } from '../entity.js'; import { UmbEnableUserEntityBulkAction } from './enable/enable.action.js'; -import { UmbSetGroupUserEntityBulkAction } from './set-group/set-group.action.js'; import { UmbUnlockUserEntityBulkAction } from './unlock/unlock.action.js'; import { UmbDisableUserEntityBulkAction } from './disable/disable.action.js'; import type { ManifestEntityBulkAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; From 0f83f1170b04e49c0b25d8415d04d7885af2df8d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:51:19 +0200 Subject: [PATCH 08/32] remove unused vars --- .../src/libs/element-api/element.test.ts | 2 ++ .../base-extension-initializer.controller.test.ts | 8 ++++---- .../extension-element-and-api-initializer.test.ts | 14 ++++++++------ .../extension-element-initializer.test.ts | 2 +- .../mocks/data/template/template-query.manager.ts | 2 +- .../src/mocks/data/webhooks.data.ts | 14 -------------- .../handlers/dictionary/import-export.handlers.ts | 4 +++- .../mocks/handlers/examine-management.handlers.ts | 1 - .../block-grid-area-type-workspace.context.ts | 3 +++ .../context/block-grid-manager.context.ts | 2 ++ .../block-rte/context/block-rte-manager.context.ts | 2 ++ .../tiny-mce-block-picker.plugin.ts | 2 +- .../core/components/table/table.stories.ts | 5 +++-- .../modal/create-blueprint-modal.element.ts | 1 - 14 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/mocks/data/webhooks.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts index cd2b33321c..e5de96511d 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts @@ -152,6 +152,7 @@ describe('UmbElementMixin', () => { expect(hostElement.hasUmbController(ctrl)).to.be.true; const ctrl2 = hostElement.observe(myObservable, (value) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const a = value + 'bla'; }); @@ -172,6 +173,7 @@ describe('UmbElementMixin', () => { const ctrl2 = hostElement.observe( undefined, () => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const a = 1; }, 'observer', diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts index a88410d347..e03c52f464 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts @@ -57,12 +57,12 @@ class UmbTestConditionAlwaysInvalid extends UmbControllerBase implements UmbExte describe('UmbBaseExtensionController', () => { describe('Manifest without conditions', () => { - let hostElement: UmbControllerHostElement; + //let hostElement: UmbControllerHostElement; let extensionRegistry: UmbExtensionRegistry; let manifest: ManifestWithDynamicConditions; beforeEach(async () => { - hostElement = await fixture(html``); + //hostElement = await fixture(html``); extensionRegistry = new UmbExtensionRegistry(); manifest = { type: 'section', @@ -94,12 +94,12 @@ describe('UmbBaseExtensionController', () => { }); describe('Manifest with empty conditions', () => { - let hostElement: UmbControllerHostElement; + //let hostElement: UmbControllerHostElement; let extensionRegistry: UmbExtensionRegistry; let manifest: ManifestWithDynamicConditions; beforeEach(async () => { - hostElement = await fixture(html``); + //hostElement = await fixture(html``); extensionRegistry = new UmbExtensionRegistry(); manifest = { type: 'section', diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-and-api-initializer.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-and-api-initializer.test.ts index c2c3429b02..82c6fd52d5 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-and-api-initializer.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-and-api-initializer.test.ts @@ -1,10 +1,10 @@ import { UmbExtensionRegistry } from '../registry/extension.registry.js'; import type { ManifestElementAndApi, ManifestWithDynamicConditions, UmbApi } from '../index.js'; import { UmbExtensionElementAndApiInitializer } from './extension-element-and-api-initializer.controller.js'; -import { expect, fixture } from '@open-wc/testing'; +import { expect } from '@open-wc/testing'; import type { UmbControllerHost, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api'; -import { customElement, html } from '@umbraco-cms/backoffice/external/lit'; +import { customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; @@ -12,6 +12,8 @@ import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; class UmbTestControllerHostElement extends UmbControllerHostElementMixin(HTMLElement) {} @customElement('umb-test-extension-element') +// Ignoring eslint rule. Element name is used for testing. +// eslint-disable-next-line @typescript-eslint/no-unused-vars class UmbTestExtensionElement extends UmbControllerHostElementMixin(HTMLElement) {} class UmbTestApiController extends UmbControllerBase implements UmbApi { @@ -35,7 +37,7 @@ describe('UmbExtensionElementAndApiController', () => { let manifest: TestManifest; beforeEach(async () => { - hostElement = await fixture(html``); + hostElement = new UmbTestControllerHostElement(); extensionRegistry = new UmbExtensionRegistry(); manifest = { type: 'test-type', @@ -105,7 +107,7 @@ describe('UmbExtensionElementAndApiController', () => { let manifest: TestManifest; beforeEach(async () => { - hostElement = await fixture(html``); + hostElement = new UmbTestControllerHostElement(); extensionRegistry = new UmbExtensionRegistry(); manifest = { @@ -175,7 +177,7 @@ describe('UmbExtensionElementAndApiController', () => { let manifest: TestManifest; beforeEach(async () => { - hostElement = await fixture(html``); + hostElement = new UmbTestControllerHostElement(); extensionRegistry = new UmbExtensionRegistry(); manifest = { type: 'test-type', @@ -238,7 +240,7 @@ describe('UmbExtensionElementAndApiController', () => { let manifest: TestManifest; beforeEach(async () => { - hostElement = await fixture(html``); + hostElement = new UmbTestControllerHostElement(); extensionRegistry = new UmbExtensionRegistry(); manifest = { diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-initializer.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-initializer.test.ts index 7c15521d93..6a8242c209 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-initializer.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-element-initializer.test.ts @@ -15,7 +15,7 @@ describe('UmbExtensionElementController', () => { let manifest: ManifestSection; beforeEach(async () => { - hostElement = await fixture(html``); + hostElement = new UmbTestControllerHostElement(); extensionRegistry = new UmbExtensionRegistry(); manifest = { type: 'section', diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-query.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-query.manager.ts index 960d4d0ba1..a8f870ec15 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-query.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-query.manager.ts @@ -1,4 +1,4 @@ -import { templateQueryResult, templateQuerySettings, type UmbMockTemplateModel } from './template.data.js'; +import { templateQueryResult, templateQuerySettings } from './template.data.js'; export class UmbMockTemplateQueryManager { constructor() {} diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/webhooks.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/webhooks.data.ts deleted file mode 100644 index 9685f3612e..0000000000 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/webhooks.data.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { UmbMockDBBase } from './utils/mock-db-base.js'; -//import { -// WebhooksResponseModel, -//} from '@umbraco-cms/backoffice/backend-api'; - -class UmbWebhooksData extends UmbMockDBBase { - constructor(data: any[]) { - super(data); - } -} - -export const umbWebhooksData = { - //webhooks: new UmbWebhooksData(webhooks), -}; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts index eebd1adac4..04b0dd81bf 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts @@ -1,9 +1,10 @@ const { rest } = window.MockServiceWorker; -import type { UmbMockDictionaryModel } from '../../data/dictionary/dictionary.data.js'; +//import type { UmbMockDictionaryModel } from '../../data/dictionary/dictionary.data.js'; import { umbDictionaryMockDb } from '../../data/dictionary/dictionary.db.js'; import { UMB_SLUG } from './slug.js'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; +/* const importResponse: UmbMockDictionaryModel = { parent: null, name: 'Uploaded dictionary', @@ -21,6 +22,7 @@ const importResponse: UmbMockDictionaryModel = { }, ], }; +*/ export const importExportHandlers = [ rest.post(umbracoPath(`${UMB_SLUG}/import`), async (req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts index 68d74955ab..51fca662e2 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts @@ -57,7 +57,6 @@ export const handlers = [ rest.get(umbracoPath('/searcher/:searcherName/query'), (_req, res, ctx) => { const query = _req.url.searchParams.get('term'); - const take = _req.url.searchParams.get('take'); const searcherName = _req.params.searcherName as string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts index d9ee93951c..875b2333d2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts @@ -106,6 +106,9 @@ export class UmbBlockGridAreaTypeWorkspaceContext getName() { return this.#data.getValue()?.alias; } + + // TODO: [v15] ignoring unused name parameter to avoid breaking changes + // eslint-disable-next-line @typescript-eslint/no-unused-vars setName(name: string | undefined) { throw new Error('You cannot set a name of a area-type.'); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts index 71bcbe39d8..a27b8bf65c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts @@ -63,6 +63,8 @@ export class UmbBlockGridManagerContext< create( contentElementTypeKey: string, partialLayoutEntry?: Omit, + // TODO: [v15] Ignore unused parameter to avoid breaking changes + // eslint-disable-next-line @typescript-eslint/no-unused-vars modalData?: UmbBlockGridWorkspaceData, ) { return super.createBlockData(contentElementTypeKey, partialLayoutEntry); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-manager.context.ts index db584d17be..54417230b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-manager.context.ts @@ -34,6 +34,8 @@ export class UmbBlockRteManagerContext< create( contentElementTypeKey: string, partialLayoutEntry?: Omit, + // TODO: [v15] ignoring unused modalData parameter to avoid breaking changes + // eslint-disable-next-line @typescript-eslint/no-unused-vars modalData?: UmbBlockRteWorkspaceData, ) { const data = super.createBlockData(contentElementTypeKey, partialLayoutEntry); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/tiny-mce-block-picker.plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/tiny-mce-block-picker.plugin.ts index fd7e3dc831..6156f9c6dc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/tiny-mce-block-picker.plugin.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/tiny-mce-block-picker.plugin.ts @@ -43,7 +43,7 @@ export default class UmbTinyMceMultiUrlPickerPlugin extends UmbTinyMcePluginBase } async showDialog() { - const blockEl = this.editor.selection.getNode(); + //const blockEl = this.editor.selection.getNode(); /*if (blockEl.nodeName === 'UMB-RTE-BLOCK' || blockEl.nodeName === 'UMB-RTE-BLOCK-INLINE') { const blockUdi = blockEl.getAttribute('data-content-udi') ?? undefined; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/table/table.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/table/table.stories.ts index 5fcddbc66f..fbadfef55f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/table/table.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/table/table.stories.ts @@ -1,8 +1,9 @@ +import type { UmbTableElement, UmbTableColumn, UmbTableItem } from './table.element.js'; import type { Meta, StoryObj } from '@storybook/web-components'; -import './table.element.js'; -import type { UmbTableElement, UmbTableColumn, UmbTableConfig, UmbTableItem } from './table.element.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; +import './table.element.js'; + const meta: Meta = { title: 'Components/Table', component: 'umb-table', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/modal/create-blueprint-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/modal/create-blueprint-modal.element.ts index 9e2bc7bef0..162b1ca593 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/modal/create-blueprint-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/modal/create-blueprint-modal.element.ts @@ -3,7 +3,6 @@ import type { UmbCreateBlueprintModalData, UmbCreateBlueprintModalValue } from ' import { html, customElement, css, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; -import type { UmbDocumentDetailModel } from '@umbraco-cms/backoffice/document'; import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; @customElement('umb-create-blueprint-modal') From 0a2b2e99f930f1475e92bdf23fcb5cafbb78dda3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:55:44 +0200 Subject: [PATCH 09/32] quick fixes to last errors --- .../controller/base-extension-initializer.controller.test.ts | 2 ++ .../extension-api/controller/extension-api-initializer.test.ts | 2 ++ .../components/input-tiny-mce/input-tiny-mce.sanitizer.ts | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts index e03c52f464..29624ff01c 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts @@ -16,6 +16,8 @@ import { UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @customElement('umb-test-controller-host') +// Element is used in tests +// eslint-disable-next-line @typescript-eslint/no-unused-vars class UmbTestControllerHostElement extends UmbControllerHostElementMixin(HTMLElement) {} class UmbTestExtensionController extends UmbBaseExtensionInitializer { diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts index 5aa9d2a806..78c6409286 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts @@ -9,6 +9,8 @@ import { customElement, html } from '@umbraco-cms/backoffice/external/lit'; import { type ManifestSection, UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-test-controller-host') +// Element is used in tests +// eslint-disable-next-line @typescript-eslint/no-unused-vars class UmbTestControllerHostElement extends UmbControllerHostElementMixin(HTMLElement) {} class UmbTestApiController extends UmbControllerBase { diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts index 67db804042..7419fbc616 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.sanitizer.ts @@ -1,3 +1,5 @@ +// TODO: clean up this file +/* eslint-disable @typescript-eslint/no-unused-vars */ import type { Editor } from '@umbraco-cms/backoffice/external/tinymce'; /** Setup sanitization for preventing injecting arbitrary JavaScript execution in attributes: From fdc880571ebeee3276f4070488b35381e2991bae Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 15:59:08 +0200 Subject: [PATCH 10/32] remove unused handlers --- src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts index 171103dd7a..a525c153fa 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts @@ -10,7 +10,6 @@ import { handlers as healthCheckHandlers } from './handlers/health-check.handler import { handlers as installHandlers } from './handlers/install.handlers.js'; import { handlers as languageHandlers } from './handlers/language/index.js'; import { handlers as logViewerHandlers } from './handlers/log-viewer.handlers.js'; -import { handlers as webhookHandlers } from './handlers/webhook.handlers.js'; import { handlers as mediaHandlers } from './handlers/media/index.js'; import { handlers as mediaTypeHandlers } from './handlers/media-type/index.js'; import { handlers as memberGroupHandlers } from './handlers/member-group/index.js'; @@ -50,7 +49,6 @@ const handlers = [ ...installHandlers, ...languageHandlers, ...logViewerHandlers, - ...webhookHandlers, ...mediaHandlers, ...mediaTypeHandlers, ...memberGroupHandlers, From 870342ce243db6e491c4d5edac990d4777088afa Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 17:20:00 +0200 Subject: [PATCH 11/32] Update block-manager.context.ts --- .../packages/block/block/context/block-manager.context.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts index 077bea1d6e..afcef0d7b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts @@ -166,8 +166,9 @@ export abstract class UmbBlockManagerContext< getContentOf(contentUdi: string) { return this.#contents.value.find((x) => x.udi === contentUdi); } - - setOneLayout(layoutData: BlockLayoutType) { + // TODO: [v15]: ignoring unused var here here to prevent a breaking change + // eslint-disable-next-line @typescript-eslint/no-unused-vars + setOneLayout(layoutData: BlockLayoutType, modalData?: UmbBlockWorkspaceData) { this._layouts.appendOne(layoutData); } setOneContent(contentData: UmbBlockDataType) { From b3c41f4d2f2a481f2ca43493f7bee9eb3bbe3782 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 17:20:06 +0200 Subject: [PATCH 12/32] Update permission.handlers.ts --- .../src/mocks/handlers/document/permission.handlers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/permission.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/permission.handlers.ts index c5f828261b..097afd9fe7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/permission.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/permission.handlers.ts @@ -8,7 +8,7 @@ export const permissionHandlers = [ rest.get(umbracoPath(`${UMB_SLUG}/:id/permissions`), (req, res, ctx) => { const id = req.params.id as string; if (!id) return; - const response = umbDocumentMockDb.getUserPermissionsForDocument(id); + const response = umbDocumentMockDb.getUserPermissionsForDocument(); return res(ctx.status(200), ctx.json(response)); }), ]; From 6d632fd85b33d5168ab868a7248901b214003132 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 17:20:08 +0200 Subject: [PATCH 13/32] Update domain.handlers.ts --- .../src/mocks/handlers/document/domain.handlers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/domain.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/domain.handlers.ts index 5b74c25e61..3d44b343f2 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/domain.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/domain.handlers.ts @@ -8,7 +8,7 @@ export const domainHandlers = [ rest.get(umbracoPath(`${UMB_SLUG}/:id/domains`), (req, res, ctx) => { const id = req.params.id as string; if (!id) return; - const response = umbDocumentMockDb.getDomainsForDocument(id); + const response = umbDocumentMockDb.getDomainsForDocument(); return res(ctx.status(200), ctx.json(response)); }), ]; From 7051efb0e62ef35dff2aaab5cf228ceceb519aca Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 17:22:41 +0200 Subject: [PATCH 14/32] Update document-validation.server.data-source.ts --- .../validation/document-validation.server.data-source.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts index 2ba4e4ea08..340ba822ce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/validation/document-validation.server.data-source.ts @@ -4,6 +4,7 @@ import { DocumentService, type UpdateDocumentRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; /** @@ -20,7 +21,9 @@ export class UmbDocumentValidationServerDataSource { * @param {UmbControllerHost} host * @memberof UmbDocumentPublishingServerDataSource */ - constructor() { + // TODO: [v15]: ignoring unused var here here to prevent a breaking change + // eslint-disable-next-line @typescript-eslint/no-unused-vars + constructor(host: UmbControllerHost) { //this.#host = host; } From 5ca5b8194a858b62995d8dbcff76e5d65c8c6c5d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 17:25:13 +0200 Subject: [PATCH 15/32] Update manifests.ts --- .../src/packages/media/media/entity-actions/create/manifests.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts index c3280e2cca..3120dec67d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/manifests.ts @@ -1,5 +1,4 @@ import { UMB_MEDIA_ENTITY_TYPE, UMB_MEDIA_ROOT_ENTITY_TYPE } from '../../entity.js'; -import { UmbCreateMediaEntityAction } from './create.action.js'; import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin'; import type { ManifestModal, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; From d932e874ae2264163684719edc79fae395bdd80d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 20:47:39 +0200 Subject: [PATCH 16/32] update workspaces --- src/Umbraco.Web.UI.Client/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index ae71c8cc76..9e3cece03d 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -141,7 +141,8 @@ "./src/packages/tags", "./src/packages/templating", "./src/packages/property-editors", - "./src/packages/media" + "./src/packages/media", + "./src/packages/user" ], "scripts": { "backoffice:test:e2e": "npx playwright test", From 48b8152fc001b353dc3505696acefeae3f828dea Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 20:47:47 +0200 Subject: [PATCH 17/32] add vite.config --- .../src/packages/user/vite.config.ts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/user/vite.config.ts new file mode 100644 index 0000000000..f498904a85 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/vite.config.ts @@ -0,0 +1,22 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/user'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ + dist, + entry: { + 'user-group/index': 'user-group/index.ts', + 'user-permission/index': 'user-permission/index.ts', + 'user/index': 'user/index.ts', + 'current-user/index': 'current-user/index.ts', + manifests: 'manifests.ts', + 'umbraco-package': 'umbraco-package.ts', + }, + }), +}); From f7f54990aee91851b66940ffb39c4e5d35eba2c4 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 20:48:15 +0200 Subject: [PATCH 18/32] Create package.json --- src/Umbraco.Web.UI.Client/src/packages/user/package.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/package.json diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/package.json b/src/Umbraco.Web.UI.Client/src/packages/user/package.json new file mode 100644 index 0000000000..f97c701835 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/user", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} \ No newline at end of file From af3b1a4236e2e89442ab75febd0d3f00c7d9ddab Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 20:53:39 +0200 Subject: [PATCH 19/32] Update package-lock.json --- src/Umbraco.Web.UI.Client/package-lock.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index fcfaf1e486..6873f22c44 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -23,7 +23,8 @@ "./src/packages/tags", "./src/packages/templating", "./src/packages/property-editors", - "./src/packages/media" + "./src/packages/media", + "./src/packages/user" ], "dependencies": { "@types/diff": "^5.2.1", @@ -7686,6 +7687,10 @@ "resolved": "src/packages/umbraco-news", "link": true }, + "node_modules/@umbraco-backoffice/user": { + "resolved": "src/packages/user", + "link": true + }, "node_modules/@umbraco-backoffice/webhook": { "resolved": "src/packages/webhook", "link": true @@ -22305,6 +22310,7 @@ "src/packages/umbraco-news": { "name": "@umbraco-backoffice/umbraco-news" }, + "src/packages/user": {}, "src/packages/webhook": { "name": "@umbraco-backoffice/webhook" } From dd6b467d7421a3a303416cd540def08fc6ff2c02 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 20:58:23 +0200 Subject: [PATCH 20/32] split tokens from implementation --- .../user/current-user/current-user.context.token.ts | 4 ++++ .../src/packages/user/current-user/current-user.context.ts | 4 +--- .../history/current-user-history.store.token.ts | 6 ++++++ .../user/current-user/history/current-user-history.store.ts | 6 +----- .../src/packages/user/current-user/index.ts | 1 + .../modals/current-user/current-user-modal.element.ts | 2 +- .../profile/change-password-current-user.action.ts | 2 +- .../user/current-user/profile/edit-current-user.action.ts | 2 +- .../src/packages/user/current-user/repository/constants.ts | 1 + .../user/current-user/repository/current-user.repository.ts | 2 +- .../current-user/repository/current-user.store.token.ts | 4 ++++ .../user/current-user/repository/current-user.store.ts | 4 +--- .../src/packages/user/current-user/repository/index.ts | 5 +++-- .../src/packages/user/current-user/repository/manifests.ts | 3 +-- .../user/current-user/utils/is-current-user.function.ts | 2 +- .../modals/change-password/change-password-modal.element.ts | 4 ++-- 16 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.token.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.token.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.token.ts new file mode 100644 index 0000000000..128c066997 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.token.ts @@ -0,0 +1,4 @@ +import type UmbCurrentUserContext from './current-user.context.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_CURRENT_USER_CONTEXT = new UmbContextToken('UmbCurrentUserContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.ts index 893d416c49..2719a144e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user.context.ts @@ -1,6 +1,6 @@ import type { UmbCurrentUserModel } from './types.js'; import { UmbCurrentUserRepository } from './repository/index.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_CURRENT_USER_CONTEXT } from './current-user.context.token.js'; import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs'; @@ -116,5 +116,3 @@ export class UmbCurrentUserContext extends UmbContextBase } export default UmbCurrentUserContext; - -export const UMB_CURRENT_USER_CONTEXT = new UmbContextToken('UmbCurrentUserContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.token.ts new file mode 100644 index 0000000000..ea0b1cd01c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.token.ts @@ -0,0 +1,6 @@ +import type UmbCurrentUserHistoryStore from './current-user-history.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_CURRENT_USER_HISTORY_STORE_CONTEXT = new UmbContextToken( + 'UmbCurrentUserHistoryStore', +); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.ts index e24ac6f72b..1c07a06fc0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history.store.ts @@ -1,4 +1,4 @@ -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT } from './current-user-history.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; @@ -61,9 +61,5 @@ export class UmbCurrentUserHistoryStore extends UmbStoreBase( - 'UmbCurrentUserHistoryStore', -); - // Default export for the globalContext manifest: export default UmbCurrentUserHistoryStore; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/index.ts index def7620871..5a4c7ecb02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/index.ts @@ -3,4 +3,5 @@ export * from './components/index.js'; export * from './history/current-user-history.store.js'; export * from './utils/index.js'; export * from './current-user.context.js'; +export * from './current-user.context.token.js'; export type * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts index 66ca80cdb4..cb87e79ad0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts @@ -1,4 +1,4 @@ -import { UMB_CURRENT_USER_CONTEXT } from '../../current-user.context.js'; +import { UMB_CURRENT_USER_CONTEXT } from '../../current-user.context.token.js'; import type { UmbCurrentUserModel } from '../../types.js'; import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts index 1b24d3e922..e249edc529 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts @@ -1,4 +1,4 @@ -import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.js'; +import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.token.js'; import { UmbActionBase } from '@umbraco-cms/backoffice/action'; import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts index ad02bc5285..554d0a2ee7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts @@ -1,4 +1,4 @@ -import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.js'; +import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.token.js'; import { UmbActionBase } from '@umbraco-cms/backoffice/action'; import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/constants.ts new file mode 100644 index 0000000000..7f5cd4ba6d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/constants.ts @@ -0,0 +1 @@ +export const UMB_CURRENT_USER_REPOSITORY_ALIAS = 'Umb.Repository.CurrentUser'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.repository.ts index ca0db09ecb..937e6973eb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.repository.ts @@ -1,5 +1,5 @@ import { UmbCurrentUserServerDataSource } from './current-user.server.data-source.js'; -import { UMB_CURRENT_USER_STORE_CONTEXT } from './current-user.store.js'; +import { UMB_CURRENT_USER_STORE_CONTEXT } from './current-user.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.token.ts new file mode 100644 index 0000000000..5c7f67a149 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.token.ts @@ -0,0 +1,4 @@ +import type UmbCurrentUserStore from './current-user.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_CURRENT_USER_STORE_CONTEXT = new UmbContextToken('UmbCurrentUserStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.ts index e21ccd2e36..973247ff4d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.store.ts @@ -3,10 +3,10 @@ import type { UmbCurrentUserMfaProviderModel, UmbCurrentUserModel, } from '../types.js'; +import { UMB_CURRENT_USER_STORE_CONTEXT } from './current-user.store.token.js'; import type { UmbUserDetailModel } from '@umbraco-cms/backoffice/user'; import { UMB_USER_DETAIL_STORE_CONTEXT } from '@umbraco-cms/backoffice/user'; import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbArrayState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; @@ -106,5 +106,3 @@ export class UmbCurrentUserStore extends UmbContextBase { } export default UmbCurrentUserStore; - -export const UMB_CURRENT_USER_STORE_CONTEXT = new UmbContextToken('UmbCurrentUserStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/index.ts index b00cb02a9e..d3e468a0b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/index.ts @@ -1,3 +1,4 @@ +export { UMB_CURRENT_USER_REPOSITORY_ALIAS } from './constants.js'; +export { UMB_CURRENT_USER_STORE_CONTEXT } from './current-user.store.token.js'; export { UmbCurrentUserRepository } from './current-user.repository.js'; -export { UMB_CURRENT_USER_REPOSITORY_ALIAS } from './manifests.js'; -export { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT } from './current-user.store.js'; +export { UmbCurrentUserStore } from './current-user.store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/manifests.ts index 743a336e9c..c255a1ef6c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_CURRENT_USER_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestStore, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_CURRENT_USER_REPOSITORY_ALIAS = 'Umb.Repository.CurrentUser'; - const repository: ManifestRepository = { type: 'repository', alias: UMB_CURRENT_USER_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts index 5fb077125e..bb0bda7e13 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/utils/is-current-user.function.ts @@ -1,4 +1,4 @@ -import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.js'; +import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.token.js'; import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts index 618a7aff02..09a0819e60 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts @@ -1,5 +1,5 @@ -import { UmbUserItemRepository } from '../../user/repository/item/user-item.repository.js'; -import { UMB_CURRENT_USER_CONTEXT } from '../../current-user/current-user.context.js'; +import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user'; +import { UmbUserItemRepository } from '@umbraco-cms/backoffice/user'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; From e0c977e122b9c4615fc70f2e93bcef928600de4d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 21:07:22 +0200 Subject: [PATCH 21/32] split tokens/consts from implementation --- .../src/packages/user/user/collection/constants.ts | 1 + .../src/packages/user/user/collection/index.ts | 1 + .../src/packages/user/user/collection/manifests.ts | 2 +- .../packages/user/user/collection/repository/constants.ts | 1 + .../packages/user/user/collection/repository/manifests.ts | 3 +-- .../src/packages/user/user/collection/views/constants.ts | 2 ++ .../src/packages/user/user/collection/views/index.ts | 3 +-- .../src/packages/user/user/collection/views/manifests.ts | 5 +---- .../src/packages/user/user/entity-bulk-actions/manifests.ts | 2 +- .../src/packages/user/user/invite/repository/constants.ts | 1 + .../src/packages/user/user/invite/repository/index.ts | 2 +- .../src/packages/user/user/invite/repository/manifests.ts | 2 +- .../src/packages/user/user/repository/avatar/constants.ts | 1 + .../src/packages/user/user/repository/avatar/index.ts | 2 +- .../src/packages/user/user/repository/avatar/manifests.ts | 3 +-- .../user/user/repository/change-password/constants.ts | 1 + .../packages/user/user/repository/change-password/index.ts | 2 +- .../user/user/repository/change-password/manifests.ts | 3 +-- .../src/packages/user/user/repository/detail/constants.ts | 2 ++ .../src/packages/user/user/repository/detail/index.ts | 2 +- .../src/packages/user/user/repository/detail/manifests.ts | 5 +---- .../user/user/section-view/users-section-view.element.ts | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/collection/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/constants.ts new file mode 100644 index 0000000000..dda3fbabe7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/constants.ts @@ -0,0 +1 @@ +export const UMB_USER_COLLECTION_ALIAS = 'Umb.Collection.User'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/index.ts index 3d76f338dd..4991633288 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/index.ts @@ -1 +1,2 @@ export * from './repository/index.js'; +export * from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts index ed2494e45b..72741e772e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts @@ -2,9 +2,9 @@ import { UMB_USER_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; +import { UMB_USER_COLLECTION_ALIAS } from './constants.js'; import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_COLLECTION_ALIAS = 'Umb.Collection.User'; const collectionManifest: ManifestTypes = { type: 'collection', alias: UMB_USER_COLLECTION_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/constants.ts new file mode 100644 index 0000000000..d0760765e1 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/constants.ts @@ -0,0 +1 @@ +export const UMB_USER_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.UserCollection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/manifests.ts index 772ef263ed..15afe81d2b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_USER_COLLECTION_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.UserCollection'; - const repository: ManifestRepository = { type: 'repository', alias: UMB_USER_COLLECTION_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/constants.ts new file mode 100644 index 0000000000..f0437f0645 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/constants.ts @@ -0,0 +1,2 @@ +export const UMB_COLLECTION_VIEW_USER_TABLE = 'Umb.CollectionView.User.Table'; +export const UMB_COLLECTION_VIEW_USER_GRID = 'Umb.CollectionView.User.Grid'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/index.ts index d0c7f1bb4a..4f07201dcf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/index.ts @@ -1,2 +1 @@ -export { UMB_COLLECTION_VIEW_USER_TABLE } from './manifests.js'; -export { UMB_COLLECTION_VIEW_USER_GRID } from './manifests.js'; +export * from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts index 1837436687..dcc1bd579b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts @@ -1,8 +1,7 @@ +import { UMB_COLLECTION_VIEW_USER_GRID, UMB_COLLECTION_VIEW_USER_TABLE } from './constants.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_COLLECTION_VIEW_USER_TABLE = 'Umb.CollectionView.User.Table'; - const tableCollectionView: ManifestCollectionView = { type: 'collectionView', alias: UMB_COLLECTION_VIEW_USER_TABLE, @@ -21,8 +20,6 @@ const tableCollectionView: ManifestCollectionView = { ], }; -export const UMB_COLLECTION_VIEW_USER_GRID = 'Umb.CollectionView.User.Grid'; - const gridCollectionView: ManifestCollectionView = { type: 'collectionView', alias: UMB_COLLECTION_VIEW_USER_GRID, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts index 3b9e43a859..72b43c8818 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts @@ -1,4 +1,4 @@ -import { UMB_USER_COLLECTION_ALIAS } from '../collection/manifests.js'; +import { UMB_USER_COLLECTION_ALIAS } from '../collection/index.js'; import { UMB_USER_ENTITY_TYPE } from '../entity.js'; import { UmbEnableUserEntityBulkAction } from './enable/enable.action.js'; import { UmbSetGroupUserEntityBulkAction } from './set-group/set-group.action.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/constants.ts new file mode 100644 index 0000000000..6846237bee --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/constants.ts @@ -0,0 +1 @@ +export const UMB_INVITE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Invite'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/index.ts index 9d8b0a75fe..f49723b7e3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/index.ts @@ -1,2 +1,2 @@ export { UmbInviteUserRepository } from './invite-user.repository.js'; -export { UMB_INVITE_USER_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_INVITE_USER_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/manifests.ts index 9bf092cbca..387f146850 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/manifests.ts @@ -1,6 +1,6 @@ +import { UMB_INVITE_USER_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_INVITE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Invite'; const inviteRepository: ManifestRepository = { type: 'repository', alias: UMB_INVITE_USER_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/constants.ts new file mode 100644 index 0000000000..79d661d45d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/constants.ts @@ -0,0 +1 @@ +export const UMB_USER_AVATAR_REPOSITORY_ALIAS = 'Umb.Repository.User.Avatar'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/index.ts index a7af3a805e..c823650a05 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/index.ts @@ -1,2 +1,2 @@ export { UmbUserAvatarRepository } from './user-avatar.repository.js'; -export { UMB_USER_AVATAR_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_USER_AVATAR_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/manifests.ts index ae4aa735fd..87961d59ff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_USER_AVATAR_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_AVATAR_REPOSITORY_ALIAS = 'Umb.Repository.User.Avatar'; - const avatarRepository: ManifestRepository = { type: 'repository', alias: UMB_USER_AVATAR_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/constants.ts new file mode 100644 index 0000000000..20d2c55398 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/constants.ts @@ -0,0 +1 @@ +export const UMB_CHANGE_USER_PASSWORD_REPOSITORY_ALIAS = 'Umb.Repository.User.ChangePassword'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/index.ts index 2088a93329..22eb448ee8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/index.ts @@ -1,2 +1,2 @@ export { UmbChangeUserPasswordRepository } from './change-user-password.repository.js'; -export { UMB_CHANGE_USER_PASSWORD_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_CHANGE_USER_PASSWORD_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/manifests.ts index 43bd6665aa..2283923820 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_CHANGE_USER_PASSWORD_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_CHANGE_USER_PASSWORD_REPOSITORY_ALIAS = 'Umb.Repository.User.ChangePassword'; - const changePasswordRepository: ManifestRepository = { type: 'repository', alias: UMB_CHANGE_USER_PASSWORD_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/constants.ts new file mode 100644 index 0000000000..a0b65e1d4e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/constants.ts @@ -0,0 +1,2 @@ +export const UMB_USER_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.User.Detail'; +export const UMB_USER_DETAIL_STORE_ALIAS = 'Umb.Store.User.Detail'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts index a01f34ea23..8df7e84ab6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts @@ -1,5 +1,5 @@ export { UmbUserDetailRepository } from './user-detail.repository.js'; -export { UMB_USER_DETAIL_REPOSITORY_ALIAS } from './manifests.js'; export { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.js'; +export * from './constants.js'; export type { UmbUserDetailStore } from './user-detail.store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/manifests.ts index 1f7b40d743..f110fb5c3d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_USER_DETAIL_REPOSITORY_ALIAS, UMB_USER_DETAIL_STORE_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestStore, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.User.Detail'; - const repository: ManifestRepository = { type: 'repository', alias: UMB_USER_DETAIL_REPOSITORY_ALIAS, @@ -9,8 +8,6 @@ const repository: ManifestRepository = { api: () => import('./user-detail.repository.js'), }; -export const UMB_USER_DETAIL_STORE_ALIAS = 'Umb.Store.User.Detail'; - const store: ManifestStore = { type: 'store', alias: UMB_USER_DETAIL_STORE_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts index 002fbf4d92..22f9d5069d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts @@ -1,4 +1,4 @@ -import { UMB_USER_COLLECTION_ALIAS } from '../collection/manifests.js'; +import { UMB_USER_COLLECTION_ALIAS } from '../collection/index.js'; import { UMB_USER_ENTITY_TYPE, UMB_USER_ROOT_ENTITY_TYPE } from '../entity.js'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; From 215d69a59cd1b8fb078f4a02ce7f5c6402fea6d3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 21:08:07 +0200 Subject: [PATCH 22/32] fix imports --- .../history/current-user-history-user-profile-app.element.ts | 2 +- .../src/packages/user/user/collection/repository/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history-user-profile-app.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history-user-profile-app.element.ts index 7f87f38104..f09ad28b8a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history-user-profile-app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/history/current-user-history-user-profile-app.element.ts @@ -1,5 +1,5 @@ import type { UmbCurrentUserHistoryItem, UmbCurrentUserHistoryStore } from './current-user-history.store.js'; -import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT } from './current-user-history.store.js'; +import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT } from './current-user-history.store.token.js'; import { html, customElement, state, map, ifDefined, css } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/index.ts index 8573b08457..23b6472e8e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/index.ts @@ -1,2 +1,2 @@ -export { UMB_USER_COLLECTION_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_USER_COLLECTION_REPOSITORY_ALIAS } from './constants.js'; export { UmbUserCollectionRepository } from './user-collection.repository.js'; From f2604b8977c5a88016b0a308080d0149c20242dc Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 21:14:33 +0200 Subject: [PATCH 23/32] split consts --- .../src/packages/user/user/repository/detail/index.ts | 2 +- .../user/user/repository/detail/user-detail.repository.ts | 2 +- .../user/user/repository/detail/user-detail.store.token.ts | 4 ++++ .../packages/user/user/repository/detail/user-detail.store.ts | 4 +--- .../src/packages/user/user/repository/disable/constants.ts | 1 + .../src/packages/user/user/repository/disable/index.ts | 2 +- .../src/packages/user/user/repository/disable/manifests.ts | 2 +- .../src/packages/user/user/repository/enable/constants.ts | 1 + .../src/packages/user/user/repository/enable/index.ts | 2 +- .../src/packages/user/user/repository/enable/manifests.ts | 2 +- .../src/packages/user/user/repository/item/constants.ts | 2 ++ .../src/packages/user/user/repository/item/index.ts | 4 ++-- .../src/packages/user/user/repository/item/manifests.ts | 4 +--- .../user/user/repository/item/user-item.repository.ts | 2 +- .../user/user/repository/item/user-item.store.token.ts | 4 ++++ .../src/packages/user/user/repository/item/user-item.store.ts | 4 +--- .../src/packages/user/user/repository/user-repository-base.ts | 4 ++-- 17 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.token.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts index 8df7e84ab6..2e069db245 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts @@ -1,5 +1,5 @@ export { UmbUserDetailRepository } from './user-detail.repository.js'; -export { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.js'; +export { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.token.js'; export * from './constants.js'; export type { UmbUserDetailStore } from './user-detail.store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts index 2275e361c4..ebec5762af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts @@ -1,7 +1,7 @@ import type { UmbUserDetailModel } from '../../types.js'; import type { UmbUserDetailDataSource } from './types.js'; import { UmbUserServerDataSource } from './user-detail.server.data-source.js'; -import { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.js'; +import { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbDetailRepositoryBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.token.ts new file mode 100644 index 0000000000..bbd416de3d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.token.ts @@ -0,0 +1,4 @@ +import type UmbUserDetailStore from './user-detail.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_USER_DETAIL_STORE_CONTEXT = new UmbContextToken('UmbUserDetailStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts index 99006c4a95..f642066bb5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts @@ -1,5 +1,5 @@ import type { UmbUserDetailModel } from '../../types.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.token.js'; import { UmbDetailStoreBase } from '@umbraco-cms/backoffice/store'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -21,5 +21,3 @@ export class UmbUserDetailStore extends UmbDetailStoreBase { } export default UmbUserDetailStore; - -export const UMB_USER_DETAIL_STORE_CONTEXT = new UmbContextToken('UmbUserDetailStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/constants.ts new file mode 100644 index 0000000000..cd6dd84b7b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/constants.ts @@ -0,0 +1 @@ +export const UMB_DISABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Disable'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts index 6f74b4aada..a2cc4da472 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts @@ -1,2 +1,2 @@ export { UmbDisableUserRepository } from './disable-user.repository.js'; -export { UMB_DISABLE_USER_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_DISABLE_USER_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts index 885fd52c36..a5db2cab19 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts @@ -1,6 +1,6 @@ +import { UMB_DISABLE_USER_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_DISABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Disable'; const disableRepository: ManifestRepository = { type: 'repository', alias: UMB_DISABLE_USER_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/constants.ts new file mode 100644 index 0000000000..c09d413b5c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/constants.ts @@ -0,0 +1 @@ +export const UMB_ENABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Enable'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts index 6ec39f65d9..4470f07792 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts @@ -1,2 +1,2 @@ export { UmbEnableUserRepository } from './enable-user.repository.js'; -export { UMB_ENABLE_USER_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_ENABLE_USER_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts index bc0f704f3e..d33d994a13 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts @@ -1,6 +1,6 @@ +import { UMB_ENABLE_USER_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_ENABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Enable'; const enableRepository: ManifestRepository = { type: 'repository', alias: UMB_ENABLE_USER_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/constants.ts new file mode 100644 index 0000000000..634eb32b48 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/constants.ts @@ -0,0 +1,2 @@ +export const UMB_USER_ITEM_REPOSITORY_ALIAS = 'Umb.Repository.User.Item'; +export const UMB_USER_ITEM_STORE_ALIAS = 'Umb.ItemStore.User'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts index 4df6b365f7..081cc63387 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts @@ -1,5 +1,5 @@ export { UmbUserItemRepository } from './user-item.repository.js'; -export { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.js'; -export { UMB_USER_ITEM_REPOSITORY_ALIAS, UMB_USER_ITEM_STORE_ALIAS } from './manifests.js'; +export { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.token.js'; +export * from './constants.js'; export type { UmbUserItemModel } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts index 3e3d05026a..68b5a3e41b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts @@ -1,8 +1,6 @@ +import { UMB_USER_ITEM_REPOSITORY_ALIAS, UMB_USER_ITEM_STORE_ALIAS } from './constants.js'; import type { ManifestItemStore, ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_ITEM_REPOSITORY_ALIAS = 'Umb.Repository.User.Item'; -export const UMB_USER_ITEM_STORE_ALIAS = 'Umb.ItemStore.User'; - const itemRepository: ManifestRepository = { type: 'repository', alias: UMB_USER_ITEM_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts index 653660f641..34b4805741 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts @@ -1,5 +1,5 @@ import { UmbUserItemServerDataSource } from './user-item.server.data-source.js'; -import { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.js'; +import { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.token.js'; import type { UmbUserItemModel } from './types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemRepositoryBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.token.ts new file mode 100644 index 0000000000..24daac759e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.token.ts @@ -0,0 +1,4 @@ +import type UmbUserItemStore from './user-item.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_USER_ITEM_STORE_CONTEXT = new UmbContextToken('UmbUserItemStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts index 1723b356b0..4d61eda455 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts @@ -1,5 +1,5 @@ import type { UmbUserItemModel } from './types.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemStoreBase } from '@umbraco-cms/backoffice/store'; @@ -23,5 +23,3 @@ export class UmbUserItemStore extends UmbItemStoreBase { } export default UmbUserItemStore; - -export const UMB_USER_ITEM_STORE_CONTEXT = new UmbContextToken('UmbUserItemStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts index b54da7d8fa..3a0e90fd41 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts @@ -1,7 +1,7 @@ import type { UmbUserDetailStore } from './detail/user-detail.store.js'; -import { UMB_USER_DETAIL_STORE_CONTEXT } from './detail/user-detail.store.js'; +import { UMB_USER_DETAIL_STORE_CONTEXT } from './detail/user-detail.store.token.js'; import type { UmbUserItemStore } from './item/user-item.store.js'; -import { UMB_USER_ITEM_STORE_CONTEXT } from './item/user-item.store.js'; +import { UMB_USER_ITEM_STORE_CONTEXT } from './item/user-item.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; From 58a955ba2f1fe5c88727ced8c41ccb31ae6c4603 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 21:18:23 +0200 Subject: [PATCH 24/32] split consts --- .../src/packages/user/user-group/collection/constants.ts | 1 + .../src/packages/user/user-group/collection/index.ts | 2 +- .../src/packages/user/user-group/collection/manifests.ts | 2 +- .../user/user/repository/new-password/constants.ts | 1 + .../packages/user/user/repository/new-password/index.ts | 2 +- .../user/user/repository/new-password/manifests.ts | 3 +-- .../src/packages/user/user/repository/unlock/constants.ts | 1 + .../src/packages/user/user/repository/unlock/index.ts | 2 +- .../src/packages/user/user/repository/unlock/manifests.ts | 3 +-- .../src/packages/user/user/workspace/constants.ts | 1 + .../src/packages/user/user/workspace/manifests.ts | 7 ++----- .../packages/user/user/workspace/user-workspace.context.ts | 2 +- 12 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/constants.ts new file mode 100644 index 0000000000..6f62fec463 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/constants.ts @@ -0,0 +1 @@ +export const UMB_USER_GROUP_COLLECTION_ALIAS = 'Umb.Collection.UserGroup'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/index.ts index 3d9a00e23f..5e5906d375 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/index.ts @@ -1,2 +1,2 @@ export * from './repository/index.js'; -export { UMB_USER_GROUP_COLLECTION_ALIAS } from './manifests.js'; +export { UMB_USER_GROUP_COLLECTION_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts index 22e5af0529..4b7b4fa7bc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts @@ -4,9 +4,9 @@ import { } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; +import { UMB_USER_GROUP_COLLECTION_ALIAS } from './constants.js'; import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_GROUP_COLLECTION_ALIAS = 'Umb.Collection.UserGroup'; const collection: ManifestTypes = { type: 'collection', alias: UMB_USER_GROUP_COLLECTION_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/constants.ts new file mode 100644 index 0000000000..0f9b79f131 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/constants.ts @@ -0,0 +1 @@ +export const UMB_NEW_USER_PASSWORD_REPOSITORY_ALIAS = 'Umb.Repository.User.NewPassword'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/index.ts index 587c0a2286..fe80fd4883 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/index.ts @@ -1,2 +1,2 @@ export { UmbNewUserPasswordRepository } from './new-user-password.repository.js'; -export { UMB_NEW_USER_PASSWORD_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_NEW_USER_PASSWORD_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/manifests.ts index 8f5a1c94ae..49e526ae71 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_NEW_USER_PASSWORD_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_NEW_USER_PASSWORD_REPOSITORY_ALIAS = 'Umb.Repository.User.NewPassword'; - const newPasswordRepository: ManifestRepository = { type: 'repository', alias: UMB_NEW_USER_PASSWORD_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/constants.ts new file mode 100644 index 0000000000..aea1c7add0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/constants.ts @@ -0,0 +1 @@ +export const UMB_UNLOCK_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Unlock'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/index.ts index 5cde89cdb1..205835f739 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/index.ts @@ -1,2 +1,2 @@ export { UmbUnlockUserRepository } from './unlock-user.repository.js'; -export { UMB_UNLOCK_USER_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_UNLOCK_USER_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/manifests.ts index df50e64fd8..56cbf5bd57 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_UNLOCK_USER_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_UNLOCK_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Unlock'; - const unlockRepository: ManifestRepository = { type: 'repository', alias: UMB_UNLOCK_USER_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/constants.ts new file mode 100644 index 0000000000..8988a6f2c0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/constants.ts @@ -0,0 +1 @@ +export const UMB_USER_WORKSPACE_ALIAS = 'Umb.Workspace.User'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts index 6f92fb8546..d2c5c90ec4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts @@ -1,14 +1,12 @@ import { UMB_USER_ENTITY_TYPE } from '../entity.js'; +import { UMB_USER_WORKSPACE_ALIAS } from './constants.js'; import { UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace'; import type { ManifestWorkspaces, ManifestWorkspaceActions, - ManifestWorkspaceView, ManifestTypes, } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_WORKSPACE_ALIAS = 'Umb.Workspace.User'; - const workspace: ManifestWorkspaces = { type: 'workspace', kind: 'routable', @@ -20,7 +18,6 @@ const workspace: ManifestWorkspaces = { }, }; -const workspaceViews: Array = []; const workspaceActions: Array = [ { type: 'workspaceAction', @@ -42,4 +39,4 @@ const workspaceActions: Array = [ }, ]; -export const manifests: Array = [workspace, ...workspaceViews, ...workspaceActions]; +export const manifests: Array = [workspace, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts index 5529398983..d5e1be971f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts @@ -2,7 +2,7 @@ import type { UmbUserDetailModel, UmbUserStartNodesModel, UmbUserStateEnum } fro import { UMB_USER_ENTITY_TYPE } from '../entity.js'; import { UmbUserDetailRepository } from '../repository/index.js'; import { UmbUserAvatarRepository } from '../repository/avatar/index.js'; -import { UMB_USER_WORKSPACE_ALIAS } from './manifests.js'; +import { UMB_USER_WORKSPACE_ALIAS } from './constants.js'; import { UmbUserWorkspaceEditorElement } from './user-workspace-editor.element.js'; import type { UmbSubmittableWorkspaceContext } from '@umbraco-cms/backoffice/workspace'; import { UmbSubmittableWorkspaceContextBase, UmbWorkspaceRouteManager } from '@umbraco-cms/backoffice/workspace'; From 067bf3309433a3a7e866229f788b81a4d996eaa7 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 21:24:21 +0200 Subject: [PATCH 25/32] split consts --- .../src/packages/user/user-group/collection/manifests.ts | 6 ++---- .../user/user-group/collection/repository/constants.ts | 1 + .../user/user-group/collection/repository/manifests.ts | 3 +-- .../packages/user/user-group/repository/detail/constants.ts | 2 ++ .../src/packages/user/user-group/repository/detail/index.ts | 4 ++-- .../packages/user/user-group/repository/detail/manifests.ts | 5 +---- .../repository/detail/user-group-detail.repository.ts | 2 +- .../repository/detail/user-group-detail.store.token.ts | 6 ++++++ .../user-group/repository/detail/user-group-detail.store.ts | 6 +----- .../packages/user/user-group/repository/item/constants.ts | 2 ++ .../src/packages/user/user-group/repository/item/index.ts | 2 +- .../packages/user/user-group/repository/item/manifests.ts | 4 +--- .../repository/item/user-group-item.repository.ts | 2 +- .../repository/item/user-group-item.store.token.ts | 4 ++++ .../user-group/repository/item/user-group-item.store.ts | 4 +--- 15 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.token.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts index 4b7b4fa7bc..04295c9ab8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts @@ -1,10 +1,8 @@ -import { - UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS, - manifests as repositoryManifests, -} from './repository/manifests.js'; +import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; import { UMB_USER_GROUP_COLLECTION_ALIAS } from './constants.js'; +import { UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS } from './repository/constants.js'; import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; const collection: ManifestTypes = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/constants.ts new file mode 100644 index 0000000000..30082c161d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/constants.ts @@ -0,0 +1 @@ +export const UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.UserGroupCollection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/manifests.ts index 9589556dc1..0d0f82235a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.UserGroupCollection'; - const repository: ManifestRepository = { type: 'repository', alias: UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/constants.ts new file mode 100644 index 0000000000..b270cc0ed2 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/constants.ts @@ -0,0 +1,2 @@ +export const UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.UserGroup.Detail'; +export const UMB_USER_GROUP_DETAIL_STORE_ALIAS = 'Umb.Store.UserGroup.Detail'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/index.ts index 13e053faaa..38151b28d2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/index.ts @@ -1,5 +1,5 @@ export { UmbUserGroupDetailRepository } from './user-group-detail.repository.js'; -export { UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS } from './manifests.js'; -export { UMB_USER_GROUP_DETAIL_STORE_CONTEXT } from './user-group-detail.store.js'; +export { UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS } from './constants.js'; +export { UMB_USER_GROUP_DETAIL_STORE_CONTEXT } from './user-group-detail.store.token.js'; export type { UmbUserGroupDetailStore } from './user-group-detail.store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/manifests.ts index 201f2474f4..207ae9436b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS, UMB_USER_GROUP_DETAIL_STORE_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestStore, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.UserGroup.Detail'; - const repository: ManifestRepository = { type: 'repository', alias: UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS, @@ -9,8 +8,6 @@ const repository: ManifestRepository = { api: () => import('./user-group-detail.repository.js'), }; -export const UMB_USER_GROUP_DETAIL_STORE_ALIAS = 'Umb.Store.UserGroup.Detail'; - const store: ManifestStore = { type: 'store', alias: UMB_USER_GROUP_DETAIL_STORE_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.repository.ts index 61cc67e6e8..d8d58dd13f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.repository.ts @@ -1,6 +1,6 @@ import type { UmbUserGroupDetailModel } from '../../types.js'; import { UmbUserGroupServerDataSource } from './user-group-detail.server.data-source.js'; -import { UMB_USER_GROUP_DETAIL_STORE_CONTEXT } from './user-group-detail.store.js'; +import { UMB_USER_GROUP_DETAIL_STORE_CONTEXT } from './user-group-detail.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbDetailRepositoryBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.token.ts new file mode 100644 index 0000000000..d8fb26b660 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.token.ts @@ -0,0 +1,6 @@ +import type UmbUserGroupDetailStore from './user-group-detail.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_USER_GROUP_DETAIL_STORE_CONTEXT = new UmbContextToken( + 'UmbUserGroupDetailStore', +); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.ts index bd47f9a6e9..5918b03db8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.store.ts @@ -1,5 +1,5 @@ import type { UmbUserGroupDetailModel } from '../../types.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_USER_GROUP_DETAIL_STORE_CONTEXT } from './user-group-detail.store.token.js'; import { UmbDetailStoreBase } from '@umbraco-cms/backoffice/store'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -21,7 +21,3 @@ export class UmbUserGroupDetailStore extends UmbDetailStoreBase( - 'UmbUserGroupDetailStore', -); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/constants.ts new file mode 100644 index 0000000000..b95dbf97fd --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/constants.ts @@ -0,0 +1,2 @@ +export const UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS = 'Umb.Repository.UserGroupItem'; +export const UMB_USER_GROUP_STORE_ALIAS = 'Umb.Store.UserGroupItem'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/index.ts index 69b396c4ec..ac14fba536 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/index.ts @@ -1,3 +1,3 @@ export { UmbUserGroupItemRepository } from './user-group-item.repository.js'; -export { UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS } from './constants.js'; export type { UmbUserGroupItemModel } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/manifests.ts index 85b9866a8d..57c949c4e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/manifests.ts @@ -1,8 +1,6 @@ +import { UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS, UMB_USER_GROUP_STORE_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestItemStore, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS = 'Umb.Repository.UserGroupItem'; -export const UMB_USER_GROUP_STORE_ALIAS = 'Umb.Store.UserGroupItem'; - const itemRepository: ManifestRepository = { type: 'repository', alias: UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.repository.ts index 0fe0583ae8..0b40ba3294 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.repository.ts @@ -1,5 +1,5 @@ import { UmbUserGroupItemServerDataSource } from './user-group-item.server.data-source.js'; -import { UMB_USER_GROUP_ITEM_STORE_CONTEXT } from './user-group-item.store.js'; +import { UMB_USER_GROUP_ITEM_STORE_CONTEXT } from './user-group-item.store.token.js'; import type { UmbUserGroupItemModel } from './types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemRepositoryBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.token.ts new file mode 100644 index 0000000000..352873e91e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.token.ts @@ -0,0 +1,4 @@ +import type UmbUserGroupItemStore from './user-group-item.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_USER_GROUP_ITEM_STORE_CONTEXT = new UmbContextToken('UmbUserGroupItemStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.ts index fbf4c257e5..4b1426acf6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.store.ts @@ -1,5 +1,5 @@ import type { UmbUserGroupItemModel } from './types.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_USER_GROUP_ITEM_STORE_CONTEXT } from './user-group-item.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemStoreBase } from '@umbraco-cms/backoffice/store'; @@ -22,5 +22,3 @@ export class UmbUserGroupItemStore extends UmbItemStoreBase('UmbUserGroupItemStore'); From 0e7586a6b5774f24fa1fb2a0b5d628004e071c53 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 21:25:22 +0200 Subject: [PATCH 26/32] split consts --- .../src/packages/user/user-section/constants.ts | 1 + .../src/packages/user/user-section/manifests.ts | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-section/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-section/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-section/constants.ts new file mode 100644 index 0000000000..4d677fca76 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-section/constants.ts @@ -0,0 +1 @@ +export const UMB_USER_MANAGEMENT_SECTION_ALIAS = 'Umb.Section.Users'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-section/manifests.ts index c177498856..74bb597e28 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-section/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-section/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_USER_MANAGEMENT_SECTION_ALIAS } from './constants.js'; import type { ManifestSection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_MANAGEMENT_SECTION_ALIAS = 'Umb.Section.Users'; - const section: ManifestSection = { type: 'section', alias: UMB_USER_MANAGEMENT_SECTION_ALIAS, From ef9e53a82153d271ae4a896330fa12728e56b232 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 21:27:24 +0200 Subject: [PATCH 27/32] fix imports --- .../src/packages/user/user-group/section-view/manifests.ts | 2 +- .../src/packages/user/user-section/index.ts | 1 + .../src/packages/user/user/section-view/manifests.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user-section/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts index 5a9a755619..3780224244 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts @@ -1,4 +1,4 @@ -import { UMB_USER_MANAGEMENT_SECTION_ALIAS } from '../../user-section/manifests.js'; +import { UMB_USER_MANAGEMENT_SECTION_ALIAS } from '../../user-section/index.js'; import type { ManifestSectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; const sectionsViews: Array = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-section/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-section/index.ts new file mode 100644 index 0000000000..4f07201dcf --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-section/index.ts @@ -0,0 +1 @@ +export * from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts index 776999b2cd..a9dbcd430b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts @@ -1,4 +1,4 @@ -import { UMB_USER_MANAGEMENT_SECTION_ALIAS } from '../../user-section/manifests.js'; +import { UMB_USER_MANAGEMENT_SECTION_ALIAS } from '../../user-section/index.js'; import type { ManifestSectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; const sectionsViews: Array = [ From b753379d05bdb5c93a0ce3da5f140cefa3460250 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 4 Jul 2024 23:13:28 +0200 Subject: [PATCH 28/32] lazy load apis --- .../configure-external-login-providers-action.ts | 2 ++ .../packages/user/current-user/external-login/manifests.ts | 3 +-- .../mfa-login/configure-mfa-providers-action.ts | 2 ++ .../src/packages/user/current-user/mfa-login/manifests.ts | 3 +-- .../profile/change-password-current-user.action.ts | 2 ++ .../user/current-user/profile/edit-current-user.action.ts | 2 ++ .../src/packages/user/current-user/profile/manifests.ts | 6 ++---- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/configure-external-login-providers-action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/configure-external-login-providers-action.ts index a3706c2988..bea240e191 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/configure-external-login-providers-action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/configure-external-login-providers-action.ts @@ -16,3 +16,5 @@ export class UmbConfigureExternalLoginProvidersApi await modalManagerContext.open(this, UMB_CURRENT_USER_EXTERNAL_LOGIN_MODAL).onSubmit(); } } + +export { UmbConfigureExternalLoginProvidersApi as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts index bef139a91b..1f104ac700 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts @@ -1,4 +1,3 @@ -import { UmbConfigureExternalLoginProvidersApi } from './configure-external-login-providers-action.js'; import type { ManifestCurrentUserActionDefaultKind, ManifestModal } from '@umbraco-cms/backoffice/extension-registry'; export const modals: Array = [ @@ -17,7 +16,7 @@ export const userProfileApps: Array = [ alias: 'Umb.CurrentUser.App.ExternalLoginProviders', name: 'External Login Providers Current User App', weight: 700, - api: UmbConfigureExternalLoginProvidersApi, + api: () => import('./configure-external-login-providers-action.js'), meta: { label: '#defaultdialogs_externalLoginProviders', icon: 'icon-lock', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/configure-mfa-providers-action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/configure-mfa-providers-action.ts index bc644ec9bd..d30d327861 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/configure-mfa-providers-action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/configure-mfa-providers-action.ts @@ -16,3 +16,5 @@ export class UmbConfigureMfaProvidersApi await modalManagerContext.open(this, UMB_CURRENT_USER_MFA_MODAL).onSubmit(); } } + +export { UmbConfigureMfaProvidersApi as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/manifests.ts index 9e50cc71c1..4ee342f239 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/manifests.ts @@ -1,4 +1,3 @@ -import { UmbConfigureMfaProvidersApi } from './configure-mfa-providers-action.js'; import type { ManifestCurrentUserActionDefaultKind, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const userProfileApps: Array = [ @@ -8,7 +7,7 @@ export const userProfileApps: Array = [ alias: 'Umb.CurrentUser.App.MfaLoginProviders', name: 'MFA Login Providers Current User App', weight: 800, - api: UmbConfigureMfaProvidersApi, + api: () => import('./configure-mfa-providers-action.js'), meta: { label: '#user_configureTwoFactor', icon: 'icon-rectangle-ellipsis', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts index e249edc529..e7607510f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts @@ -41,3 +41,5 @@ export class UmbChangePasswordCurrentUserAction }); } } + +export { UmbChangePasswordCurrentUserAction as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts index 554d0a2ee7..cdc03d8e09 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit-current-user.action.ts @@ -36,3 +36,5 @@ export class UmbEditCurrentUserAction return; } } + +export { UmbEditCurrentUserAction as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/manifests.ts index 748421f410..2cb745f149 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/manifests.ts @@ -1,5 +1,3 @@ -import { UmbChangePasswordCurrentUserAction } from './change-password-current-user.action.js'; -import { UmbEditCurrentUserAction } from './edit-current-user.action.js'; import type { ManifestCurrentUserActionDefaultKind, ManifestTypes, @@ -27,7 +25,7 @@ const currentUserActions: Array = [ alias: 'Umb.CurrentUser.Button.Edit', name: 'Current User Edit Button', weight: 1000, - api: UmbEditCurrentUserAction, + api: () => import('./edit-current-user.action.js'), meta: { label: '#general_edit', icon: 'edit', @@ -45,7 +43,7 @@ const currentUserActions: Array = [ alias: 'Umb.CurrentUser.Button.ChangePassword', name: 'Current User Change Password Button', weight: 900, - api: UmbChangePasswordCurrentUserAction, + api: () => import('./change-password-current-user.action.js'), meta: { label: '#general_changePassword', icon: 'lock', From fdd8039dc590c176369a2b045f9bd034b2be13d0 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 5 Jul 2024 09:18:48 +0200 Subject: [PATCH 29/32] lazy load apis --- .../entity-bulk-actions/manifests.ts | 4 +--- .../user/conditions/allow-delete/manifests.ts | 10 ++++++++ .../user-allow-delete-action.condition.ts | 7 ------ .../conditions/allow-disable/manifests.ts | 10 ++++++++ .../user-allow-disable-action.condition.ts | 8 ------- .../user/conditions/allow-enable/manifests.ts | 10 ++++++++ .../user-allow-enable-action.condition.ts | 16 +++++++++++++ .../allow-external-login/manifests.ts | 10 ++++++++ ...r-allow-external-login-action.condition.ts | 8 +------ .../user/conditions/allow-mfa/manifests.ts | 8 +++++++ .../user-allow-mfa-action.condition.ts | 8 +------ .../user-allow-unlock-action.condition.ts | 0 .../user/user/conditions/manifests.ts | 24 +++++++++---------- .../user-allow-enable-action.condition.ts | 22 ----------------- .../change-user-password.action.ts | 2 ++ .../disable/disable-user.action.ts | 2 ++ .../enable/enable-user.action.ts | 2 ++ .../user/user/entity-actions/manifests.ts | 15 ++++-------- .../entity-actions/mfa/mfa-user.action.ts | 2 ++ .../unlock/unlock-user.action.ts | 2 ++ .../delete/delete.action.ts | 2 ++ .../disable/disable.action.ts | 2 ++ .../enable/enable.action.ts | 2 ++ .../user/entity-bulk-actions/manifests.ts | 10 +++----- .../set-group/set-group.action.ts | 2 ++ .../unlock/unlock.action.ts | 2 ++ .../invite/collection-action/manifests.ts | 3 +-- .../user/invite/entity-action/manifests.ts | 7 +++--- .../entity-action/resend-invite/manifests.ts | 10 ++++++++ .../resend-invite.action.condition.ts | 8 +------ .../resend-invite/resend-invite.action.ts | 2 ++ 31 files changed, 124 insertions(+), 96 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/{ => allow-delete}/user-allow-delete-action.condition.ts (69%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/{ => allow-disable}/user-allow-disable-action.condition.ts (62%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/user-allow-enable-action.condition.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-external-login/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/{ => allow-external-login}/user-allow-external-login-action.condition.ts (69%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/{ => allow-mfa}/user-allow-mfa-action.condition.ts (69%) rename src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/{ => allow-unlock}/user-allow-unlock-action.condition.ts (100%) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts index 78f0e3edfb..cea41642f5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts @@ -1,7 +1,5 @@ import { UMB_USER_GROUP_COLLECTION_ALIAS } from '../collection/index.js'; import { UMB_USER_GROUP_ENTITY_TYPE } from '../entity.js'; -import { UMB_USER_GROUP_DETAIL_REPOSITORY_ALIAS } from '../repository/index.js'; -import { UmbDeleteUserGroupEntityBulkAction } from './delete/delete.action.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; import type { ManifestEntityBulkAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; @@ -11,7 +9,7 @@ const entityActions: Array = [ alias: 'Umb.EntityBulkAction.UserGroup.Delete', name: 'Delete User Group Entity Bulk Action', weight: 400, - api: UmbDeleteUserGroupEntityBulkAction, + api: () => import('./delete/delete.action.js'), forEntityTypes: [UMB_USER_GROUP_ENTITY_TYPE], meta: { label: 'Delete', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/manifests.ts new file mode 100644 index 0000000000..cbd8597b07 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/manifests.ts @@ -0,0 +1,10 @@ +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'User Allow Delete Action Condition', + alias: 'Umb.Condition.User.AllowDeleteAction', + api: () => import('./user-allow-delete-action.condition.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-delete-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts similarity index 69% rename from src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-delete-action.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts index 74cecc9700..5b32f404d2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-delete-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts @@ -11,10 +11,3 @@ export class UmbUserAllowDeleteActionCondition extends UmbUserActionConditionBas } } } - -export const manifest: ManifestCondition = { - type: 'condition', - name: 'User Allow Delete Action Condition', - alias: 'Umb.Condition.User.AllowDeleteAction', - api: UmbUserAllowDeleteActionCondition, -}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/manifests.ts new file mode 100644 index 0000000000..2c251b99bf --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/manifests.ts @@ -0,0 +1,10 @@ +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'User Allow Disable Action Condition', + alias: 'Umb.Condition.User.AllowDisableAction', + api: () => import('./user-allow-disable-action.condition.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-disable-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts similarity index 62% rename from src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-disable-action.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts index d7e518fa24..701c1bd3a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-disable-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts @@ -1,6 +1,5 @@ import { UmbUserStateEnum } from '../types.js'; import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; -import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; export class UmbUserAllowDisableActionCondition extends UmbUserActionConditionBase { async _onUserDataChange() { @@ -13,10 +12,3 @@ export class UmbUserAllowDisableActionCondition extends UmbUserActionConditionBa this.permitted = this.userState !== UmbUserStateEnum.DISABLED; } } - -export const manifest: ManifestCondition = { - type: 'condition', - name: 'User Allow Disable Action Condition', - alias: 'Umb.Condition.User.AllowDisableAction', - api: UmbUserAllowDisableActionCondition, -}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/manifests.ts new file mode 100644 index 0000000000..d1f35faf5b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/manifests.ts @@ -0,0 +1,10 @@ +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'User Allow Enable Action Condition', + alias: 'Umb.Condition.User.AllowEnableAction', + api: () => import('./user-allow-enable-action.condition.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/user-allow-enable-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/user-allow-enable-action.condition.ts new file mode 100644 index 0000000000..e44449d287 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-enable/user-allow-enable-action.condition.ts @@ -0,0 +1,16 @@ +import { UmbUserStateEnum } from '../../types.js'; +import { UmbUserActionConditionBase } from '../user-allow-action-base.condition.js'; + +export class UmbUserAllowEnableActionCondition extends UmbUserActionConditionBase { + async _onUserDataChange() { + // don't allow the current user to enable themselves + if (!this.userUnique || (await this.isCurrentUser())) { + this.permitted = false; + return; + } + + this.permitted = this.userState === UmbUserStateEnum.DISABLED; + } +} + +export { UmbUserAllowEnableActionCondition as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-external-login/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-external-login/manifests.ts new file mode 100644 index 0000000000..988f5a8b77 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-external-login/manifests.ts @@ -0,0 +1,10 @@ +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'User Allow ExternalLogin Action Condition', + alias: 'Umb.Condition.User.AllowExternalLoginAction', + api: () => import('./user-allow-external-login-action.condition.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-external-login-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-external-login/user-allow-external-login-action.condition.ts similarity index 69% rename from src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-external-login-action.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-external-login/user-allow-external-login-action.condition.ts index 05af0c57d0..79e83683c9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-external-login-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-external-login/user-allow-external-login-action.condition.ts @@ -1,5 +1,4 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; import { UmbConditionBase, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; export class UmbUserAllowExternalLoginActionCondition extends UmbConditionBase { @@ -16,9 +15,4 @@ export class UmbUserAllowExternalLoginActionCondition extends UmbConditionBase = [ + { + type: 'condition', + name: 'User Allow Mfa Action Condition', + alias: 'Umb.Condition.User.AllowMfaAction', + api: () => import('./user-allow-mfa-action.condition.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-mfa-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/user-allow-mfa-action.condition.ts similarity index 69% rename from src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-mfa-action.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/user-allow-mfa-action.condition.ts index af54e401b8..88bd9f4274 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-mfa-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/user-allow-mfa-action.condition.ts @@ -1,5 +1,4 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; import { UmbConditionBase, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; export class UmbUserAllowMfaActionCondition extends UmbConditionBase { @@ -16,9 +15,4 @@ export class UmbUserAllowMfaActionCondition extends UmbConditionBase { } } -export const manifest: ManifestCondition = { - type: 'condition', - name: 'User Allow Mfa Action Condition', - alias: 'Umb.Condition.User.AllowMfaAction', - api: UmbUserAllowMfaActionCondition, -}; +export { UmbUserAllowMfaActionCondition as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-unlock-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/user-allow-unlock-action.condition.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-unlock-action.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/user-allow-unlock-action.condition.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/manifests.ts index 04150acb7c..23b03f4ec4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/manifests.ts @@ -1,16 +1,16 @@ -import { manifest as userAllowDisableActionManifest } from './user-allow-disable-action.condition.js'; -import { manifest as userAllowEnableActionManifest } from './user-allow-enable-action.condition.js'; -import { manifest as userAllowUnlockActionManifest } from './user-allow-unlock-action.condition.js'; -import { manifest as userAllowExternalLoginActionManifest } from './user-allow-external-login-action.condition.js'; -import { manifest as userAllowMfaActionManifest } from './user-allow-mfa-action.condition.js'; -import { manifest as userAllowDeleteActionManifest } from './user-allow-delete-action.condition.js'; +import { manifests as userAllowDeleteActionManifests } from './allow-delete/manifests.js'; +import { manifests as userAllowDisableActionManifests } from './allow-disable/manifests.js'; +import { manifests as userAllowEnableActionManifests } from './allow-enable/manifests.js'; +import { manifests as userAllowExternalLoginActionManifests } from './allow-external-login/manifests.js'; +import { manifests as userAllowMfaActionManifests } from './allow-mfa/manifests.js'; +import { manifests as userAllowUnlockActionManifests } from './allow-unlock/manifests.js'; import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const manifests: Array = [ - userAllowDisableActionManifest, - userAllowEnableActionManifest, - userAllowUnlockActionManifest, - userAllowExternalLoginActionManifest, - userAllowMfaActionManifest, - userAllowDeleteActionManifest, + ...userAllowDisableActionManifests, + ...userAllowEnableActionManifests, + ...userAllowUnlockActionManifests, + ...userAllowExternalLoginActionManifests, + ...userAllowMfaActionManifests, + ...userAllowDeleteActionManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts deleted file mode 100644 index 534cd40d19..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { UmbUserStateEnum } from '../types.js'; -import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; -import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; - -export class UmbUserAllowEnableActionCondition extends UmbUserActionConditionBase { - async _onUserDataChange() { - // don't allow the current user to enable themselves - if (!this.userUnique || (await this.isCurrentUser())) { - this.permitted = false; - return; - } - - this.permitted = this.userState === UmbUserStateEnum.DISABLED; - } -} - -export const manifest: ManifestCondition = { - type: 'condition', - name: 'User Allow Enable Action Condition', - alias: 'Umb.Condition.User.AllowEnableAction', - api: UmbUserAllowEnableActionCondition, -}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/change-password/change-user-password.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/change-password/change-user-password.action.ts index 4f99a93714..a052d53082 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/change-password/change-user-password.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/change-password/change-user-password.action.ts @@ -27,3 +27,5 @@ export class UmbChangeUserPasswordEntityAction extends UmbEntityActionBase { await disableUserRepository.disable([this.args.unique]); } } + +export { UmbDisableUserEntityAction as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts index b99554cf1e..1d2af3c2c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts @@ -32,3 +32,5 @@ export class UmbEnableUserEntityAction extends UmbEntityActionBase { await enableRepository.enable([this.args.unique]); } } + +export { UmbEnableUserEntityAction as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts index 38ec8248f4..8e26c3c2f1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts @@ -1,10 +1,5 @@ import { UMB_USER_DETAIL_REPOSITORY_ALIAS, UMB_USER_ITEM_REPOSITORY_ALIAS } from '../repository/index.js'; import { UMB_USER_ENTITY_TYPE } from '../entity.js'; -import { UmbDisableUserEntityAction } from './disable/disable-user.action.js'; -import { UmbEnableUserEntityAction } from './enable/enable-user.action.js'; -import { UmbChangeUserPasswordEntityAction } from './change-password/change-user-password.action.js'; -import { UmbUnlockUserEntityAction } from './unlock/unlock-user.action.js'; -import { UmbMfaUserEntityAction } from './mfa/mfa-user.action.js'; import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; const entityActions: Array = [ @@ -30,7 +25,7 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.User.Enable', name: 'Enable User Entity Action', weight: 800, - api: UmbEnableUserEntityAction, + api: () => import('./enable/enable-user.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { icon: 'icon-check', @@ -48,7 +43,7 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.User.Disable', name: 'Disable User Entity Action', weight: 700, - api: UmbDisableUserEntityAction, + api: () => import('./disable/disable-user.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { icon: 'icon-block', @@ -66,7 +61,7 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.User.ChangePassword', name: 'Change User Password Entity Action', weight: 600, - api: UmbChangeUserPasswordEntityAction, + api: () => import('./change-password/change-user-password.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { icon: 'icon-key', @@ -79,7 +74,7 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.User.Unlock', name: 'Unlock User Entity Action', weight: 600, - api: UmbUnlockUserEntityAction, + api: () => import('./unlock/unlock-user.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { icon: 'icon-unlocked', @@ -97,7 +92,7 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.User.ConfigureMfa', name: 'Configure MFA Entity Action', weight: 500, - api: UmbMfaUserEntityAction, + api: () => import('./mfa/mfa-user.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { icon: 'icon-settings', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/mfa/mfa-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/mfa/mfa-user.action.ts index e541e71bfb..a6bdc5f5f0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/mfa/mfa-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/mfa/mfa-user.action.ts @@ -40,3 +40,5 @@ export class UmbMfaUserEntityAction extends UmbEntityActionBase { .catch(() => undefined); } } + +export { UmbMfaUserEntityAction as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/unlock/unlock-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/unlock/unlock-user.action.ts index 4fa6d43d05..1839f903e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/unlock/unlock-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/unlock/unlock-user.action.ts @@ -32,3 +32,5 @@ export class UmbUnlockUserEntityAction extends UmbEntityActionBase { await unlockUserRepository?.unlock([this.args.unique]); } } + +export { UmbUnlockUserEntityAction as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/delete/delete.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/delete/delete.action.ts index be843af87a..9d5bd56f57 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/delete/delete.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/delete/delete.action.ts @@ -24,3 +24,5 @@ export class UmbUserDeleteEntityBulkAction extends UmbEntityBulkActionBase = [ alias: 'Umb.EntityBulkAction.User.Enable', name: 'Enable User Entity Bulk Action', weight: 300, - api: UmbEnableUserEntityBulkAction, + api: () => import('./enable/enable.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { label: 'Enable', @@ -49,7 +45,7 @@ const entityActions: Array = [ alias: 'Umb.EntityBulkAction.User.Unlock', name: 'Unlock User Entity Bulk Action', weight: 200, - api: UmbUnlockUserEntityBulkAction, + api: () => import('./unlock/unlock.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { label: 'Unlock', @@ -66,7 +62,7 @@ const entityActions: Array = [ alias: 'Umb.EntityBulkAction.User.Disable', name: 'Disable User Entity Bulk Action', weight: 100, - api: UmbDisableUserEntityBulkAction, + api: () => import('./disable/disable.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { label: 'Disable', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/set-group/set-group.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/set-group/set-group.action.ts index d50c8f6f8d..85d238994e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/set-group/set-group.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/set-group/set-group.action.ts @@ -6,3 +6,5 @@ export class UmbSetGroupUserEntityBulkAction extends UmbEntityBulkActionBase import('./invite-user.collection-action.js'), weight: 100, meta: { label: '#user_invite', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts index e892368a6b..0782e1be54 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts @@ -1,6 +1,5 @@ import { UMB_USER_ENTITY_TYPE } from '../../entity.js'; -import { UmbResendInviteToUserEntityAction } from './resend-invite/resend-invite.action.js'; -import { manifest as conditionManifest } from './resend-invite/resend-invite.action.condition.js'; +import { manifests as resendInviteManifests } from './resend-invite/manifests.js'; import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; const entityActions: Array = [ @@ -10,7 +9,7 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.User.ResendInvite', name: 'Resend Invite User Entity Action', weight: 500, - api: UmbResendInviteToUserEntityAction, + api: () => import('./resend-invite/resend-invite.action.js'), forEntityTypes: [UMB_USER_ENTITY_TYPE], meta: { icon: 'icon-message', @@ -22,7 +21,7 @@ const entityActions: Array = [ }, ], }, - conditionManifest, + resendInviteManifests, ]; export const manifests: Array = [...entityActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/manifests.ts new file mode 100644 index 0000000000..87dac3af79 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/manifests.ts @@ -0,0 +1,10 @@ +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'User Allow Resend Invite Action Condition', + alias: 'Umb.Condition.User.AllowResendInviteAction', + api: () => import('./resend-invite.action.condition.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts index 61c21e57de..017e980c6a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts @@ -1,6 +1,5 @@ import { UmbUserActionConditionBase } from '../../../conditions/user-allow-action-base.condition.js'; import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; -import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; export class UmbUserAllowResendInviteActionCondition extends UmbUserActionConditionBase { async _onUserDataChange() { @@ -13,9 +12,4 @@ export class UmbUserAllowResendInviteActionCondition extends UmbUserActionCondit } } -export const manifest: ManifestCondition = { - type: 'condition', - name: 'User Allow Resend Invite Action Condition', - alias: 'Umb.Condition.User.AllowResendInviteAction', - api: UmbUserAllowResendInviteActionCondition, -}; +export { UmbUserAllowResendInviteActionCondition as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.ts index 2f58609172..53fc3ae5fa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.ts @@ -25,3 +25,5 @@ export class UmbResendInviteToUserEntityAction extends UmbEntityActionBase Date: Fri, 5 Jul 2024 09:31:55 +0200 Subject: [PATCH 30/32] lazy load apis --- src/Umbraco.Web.UI.Client/package-lock.json | 4 +++- .../user-allow-delete-action.condition.ts | 3 +-- .../user-allow-disable-action.condition.ts | 4 ++-- .../user/user/conditions/allow-unlock/manifests.ts | 10 ++++++++++ .../user-allow-unlock-action.condition.ts | 12 +++--------- 5 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 6873f22c44..0eb3414ca9 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -22310,7 +22310,9 @@ "src/packages/umbraco-news": { "name": "@umbraco-backoffice/umbraco-news" }, - "src/packages/user": {}, + "src/packages/user": { + "name": "@umbraco-backoffice/user" + }, "src/packages/webhook": { "name": "@umbraco-backoffice/webhook" } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts index 5b32f404d2..8ed8582d90 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts @@ -1,5 +1,4 @@ -import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; -import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; +import { UmbUserActionConditionBase } from '../user-allow-action-base.condition.js'; export class UmbUserAllowDeleteActionCondition extends UmbUserActionConditionBase { async _onUserDataChange() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts index 701c1bd3a7..9c45b723a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts @@ -1,5 +1,5 @@ -import { UmbUserStateEnum } from '../types.js'; -import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; +import { UmbUserStateEnum } from '../../types.js'; +import { UmbUserActionConditionBase } from '../user-allow-action-base.condition.js'; export class UmbUserAllowDisableActionCondition extends UmbUserActionConditionBase { async _onUserDataChange() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/manifests.ts new file mode 100644 index 0000000000..8bc2f87d2f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/manifests.ts @@ -0,0 +1,10 @@ +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'User Allow Unlock Action Condition', + alias: 'Umb.Condition.User.AllowUnlockAction', + api: () => import('./user-allow-unlock-action.condition.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/user-allow-unlock-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/user-allow-unlock-action.condition.ts index a3dfd0eba0..517bd0c12d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/user-allow-unlock-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-unlock/user-allow-unlock-action.condition.ts @@ -1,6 +1,5 @@ -import { UmbUserStateEnum } from '../types.js'; -import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; -import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; +import { UmbUserStateEnum } from '../../types.js'; +import { UmbUserActionConditionBase } from '../user-allow-action-base.condition.js'; export class UmbUserAllowUnlockActionCondition extends UmbUserActionConditionBase { async _onUserDataChange() { @@ -14,9 +13,4 @@ export class UmbUserAllowUnlockActionCondition extends UmbUserActionConditionBas } } -export const manifest: ManifestCondition = { - type: 'condition', - name: 'User Allow Unlock Action Condition', - alias: 'Umb.Condition.User.AllowUnlockAction', - api: UmbUserAllowUnlockActionCondition, -}; +export { UmbUserAllowUnlockActionCondition as api }; From 428966420dc0a345b11abb844a0944a2b300154e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 5 Jul 2024 09:34:05 +0200 Subject: [PATCH 31/32] lazy load apis --- .../allow-delete/user-allow-delete-action.condition.ts | 2 ++ .../allow-disable/user-allow-disable-action.condition.ts | 2 ++ .../src/packages/user/user/conditions/allow-mfa/manifests.ts | 2 ++ .../invite/collection-action/invite-user.collection-action.ts | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts index 8ed8582d90..3bde4033af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-delete/user-allow-delete-action.condition.ts @@ -10,3 +10,5 @@ export class UmbUserAllowDeleteActionCondition extends UmbUserActionConditionBas } } } + +export { UmbUserAllowDeleteActionCondition as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts index 9c45b723a9..208accbab7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-disable/user-allow-disable-action.condition.ts @@ -12,3 +12,5 @@ export class UmbUserAllowDisableActionCondition extends UmbUserActionConditionBa this.permitted = this.userState !== UmbUserStateEnum.DISABLED; } } + +export { UmbUserAllowDisableActionCondition as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/manifests.ts index 96fb27c7be..5907e011bb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/allow-mfa/manifests.ts @@ -1,3 +1,5 @@ +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + export const manifests: Array = [ { type: 'condition', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/invite-user.collection-action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/invite-user.collection-action.ts index 9169bb4a08..9c7810bb02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/invite-user.collection-action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/invite-user.collection-action.ts @@ -9,3 +9,5 @@ export class UmbInviteUserCollectionAction extends UmbCollectionActionBase { await modalContext?.onSubmit(); } } + +export { UmbInviteUserCollectionAction as api }; From f1059694187bcc66c4a2344e52ba87799463181c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 5 Jul 2024 09:35:01 +0200 Subject: [PATCH 32/32] fix exports --- .../user/user-group/entity-bulk-actions/delete/delete.action.ts | 2 ++ .../src/packages/user/user/invite/entity-action/manifests.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/delete/delete.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/delete/delete.action.ts index 0c07a4ea6d..2f2ab02225 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/delete/delete.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/delete/delete.action.ts @@ -25,3 +25,5 @@ export class UmbDeleteUserGroupEntityBulkAction extends UmbEntityBulkActionBase< } } } + +export { UmbDeleteUserGroupEntityBulkAction as api }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts index 0782e1be54..af09b5ff79 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts @@ -21,7 +21,7 @@ const entityActions: Array = [ }, ], }, - resendInviteManifests, + ...resendInviteManifests, ]; export const manifests: Array = [...entityActions];