From 6bd0cd42cdd2a5a52de0e1037bed0b365a9b60a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 2 Oct 2023 14:22:24 +0200 Subject: [PATCH] rename users to user --- src/Umbraco.Web.UI.Client/package.json | 6 +++--- .../src/apps/backoffice/backoffice.element.ts | 2 +- .../packages/core/extension-registry/conditions/types.ts | 2 +- .../packages/core/modal/token/user-picker-modal.token.ts | 2 +- .../{users => user}/current-user/conditions/index.ts | 0 .../current-user/conditions/user-permission.condition.ts | 0 .../current-user/current-user-header-app.element.ts | 0 .../current-user/current-user-history.store.ts | 0 .../src/packages/{users => user}/current-user/index.ts | 0 .../packages/{users => user}/current-user/manifests.ts | 0 .../change-password/change-password-modal.element.ts | 0 .../modals/current-user/current-user-modal.element.ts | 0 .../{users => user}/current-user/modals/manifests.ts | 0 .../current-user/user-profile-apps/manifests.ts | 0 .../user-profile-app-external-login-providers.element.ts | 0 .../user-profile-apps/user-profile-app-history.element.ts | 0 .../user-profile-apps/user-profile-app-profile.element.ts | 0 .../user-profile-apps/user-profile-app-themes.element.ts | 0 src/Umbraco.Web.UI.Client/src/packages/user/index.ts | 4 ++++ .../src/packages/{users => user}/manifests.ts | 8 ++++---- .../src/packages/{users => user}/umbraco-package.ts | 0 .../collection/user-group-collection-header.element.ts | 0 .../collection/user-group-collection-view.element.ts | 0 .../collection/user-group-collection.context.ts | 0 .../collection/user-group-collection.element.ts | 0 .../user-group-table-name-column-layout.element.ts | 0 .../user-group-table-sections-column-layout.element.ts | 0 .../user-groups => user/user-group}/components/index.ts | 0 .../input-user-group/user-group-input.context.ts | 0 .../input-user-group/user-group-input.element.ts | 0 .../input-user-group/user-group-input.stories.ts | 0 .../components/input-user-group/user-group-input.test.ts | 0 .../user-group}/entity-actions/manifests.ts | 0 .../entity-bulk-actions/delete/delete.action.ts | 0 .../user-group}/entity-bulk-actions/manifests.ts | 0 .../{users/user-groups => user/user-group}/index.ts | 0 .../{users/user-groups => user/user-group}/manifests.ts | 0 .../user-groups => user/user-group}/modals/manifests.ts | 0 .../user-group-picker/user-group-picker-modal.element.ts | 0 .../user-group-picker/user-group-picker-modal.test.ts | 0 .../user-group}/repository/manifests.ts | 2 +- .../sources/user-group-collection.server.data.ts | 0 .../repository/sources/user-group-item.server.data.ts | 0 .../repository/sources/user-group.server.data.ts | 0 .../user-group}/repository/user-group-item.store.ts | 0 .../user-group}/repository/user-group.repository.ts | 0 .../user-group}/repository/user-group.store.ts | 0 .../user-group}/section-view/manifests.ts | 0 .../section-view/user-groups-section-view.element.ts | 0 .../{users/user-groups => user/user-group}/types.ts | 0 .../actions/workspace-action-user-group-save.element.ts | 2 +- .../user-group-default-permission-list.element.ts | 2 +- .../user-group-granular-permission-list.element.ts | 0 .../user-group}/workspace/manifests.ts | 0 .../workspace/user-group-workspace-editor.element.ts | 2 +- .../user-group}/workspace/user-group-workspace.context.ts | 2 +- .../user-group}/workspace/user-group-workspace.element.ts | 0 .../packages/{users => user}/user-section/manifests.ts | 0 .../user}/collection/user-collection-header.element.ts | 0 .../user}/collection/user-collection.context.ts | 0 .../user}/collection/user-collection.element.ts | 0 .../views/grid/user-collection-grid-view.element.ts | 0 .../name/user-table-name-column-layout.element.ts | 0 .../status/user-table-status-column-layout.element.ts | 0 .../views/table/user-collection-table-view.element.ts | 4 ++-- .../{users/users => user/user}/components/index.ts | 0 .../user}/components/user-input/user-input.context.ts | 0 .../user}/components/user-input/user-input.element.ts | 0 .../user}/components/user-input/user-input.stories.ts | 0 .../user-permission-setting.element.ts | 0 .../user}/entity-bulk-actions/delete/delete.action.ts | 0 .../user}/entity-bulk-actions/disable/disable.action.ts | 0 .../user}/entity-bulk-actions/enable/enable.action.ts | 0 .../users => user/user}/entity-bulk-actions/manifests.ts | 0 .../entity-bulk-actions/set-group/set-group.action.ts | 0 .../user}/entity-bulk-actions/unlock/unlock.action.ts | 0 .../src/packages/{users/users => user/user}/index.ts | 0 .../src/packages/{users/users => user/user}/manifests.ts | 0 .../user}/modals/create/user-create-modal.element.ts | 2 +- .../user}/modals/invite/user-invite-modal.element.ts | 2 +- .../{users/users => user/user}/modals/manifests.ts | 0 .../user}/modals/user-picker/user-picker-modal.element.ts | 0 .../{users/users => user/user}/repository/index.ts | 0 .../{users/users => user/user}/repository/manifests.ts | 2 +- .../repository/sources/user-collection.server.data.ts | 0 .../user}/repository/sources/user-disable.server.data.ts | 0 .../user}/repository/sources/user-enable.server.data.ts | 0 .../user}/repository/sources/user-item.server.data.ts | 0 .../repository/sources/user-set-group.server.data.ts | 0 .../user}/repository/sources/user-unlock.server.data.ts | 0 .../user}/repository/sources/user.server.data.ts | 0 .../users => user/user}/repository/user-item.store.ts | 0 .../users => user/user}/repository/user.repository.ts | 0 .../{users/users => user/user}/repository/user.store.ts | 0 .../{users/users => user/user}/section-view/manifests.ts | 0 .../user}/section-view/users-section-view.element.ts | 0 .../src/packages/{users/users => user/user}/types.ts | 0 .../actions/user-workspace-action-save.element.ts | 0 .../{users/users => user/user}/workspace/manifests.ts | 0 .../user}/workspace/user-workspace-editor.element.ts | 4 ++-- .../user}/workspace/user-workspace.context.ts | 0 .../user}/workspace/user-workspace.element.ts | 0 .../users => user/user}/workspace/user-workspace.test.ts | 0 .../src/packages/{users => user}/utils.test.ts | 0 .../src/packages/{users => user}/utils.ts | 0 src/Umbraco.Web.UI.Client/src/packages/users/index.ts | 4 ---- src/Umbraco.Web.UI.Client/tsconfig.json | 6 +++--- src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 6 +++--- 108 files changed, 32 insertions(+), 32 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/conditions/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/conditions/user-permission.condition.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/current-user-header-app.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/current-user-history.store.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/modals/change-password/change-password-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/modals/current-user/current-user-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/modals/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/user-profile-apps/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/user-profile-apps/user-profile-app-history.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/user-profile-apps/user-profile-app-profile.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/current-user/user-profile-apps/user-profile-app-themes.element.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/index.ts rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/manifests.ts (63%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/umbraco-package.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/collection/user-group-collection-header.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/collection/user-group-collection-view.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/collection/user-group-collection.context.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/collection/user-group-collection.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/collection/user-group-table-name-column-layout.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/collection/user-group-table-sections-column-layout.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/components/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/components/input-user-group/user-group-input.context.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/components/input-user-group/user-group-input.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/components/input-user-group/user-group-input.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/components/input-user-group/user-group-input.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/entity-actions/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/entity-bulk-actions/delete/delete.action.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/entity-bulk-actions/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/modals/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/modals/user-group-picker/user-group-picker-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/modals/user-group-picker/user-group-picker-modal.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/repository/manifests.ts (91%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/repository/sources/user-group-collection.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/repository/sources/user-group-item.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/repository/sources/user-group.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/repository/user-group-item.store.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/repository/user-group.repository.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/repository/user-group.store.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/section-view/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/section-view/user-groups-section-view.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/types.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/workspace/actions/workspace-action-user-group-save.element.ts (93%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/workspace/components/user-group-default-permission-list.element.ts (97%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/workspace/components/user-group-granular-permission-list.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/workspace/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/workspace/user-group-workspace-editor.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/workspace/user-group-workspace.context.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/{users/user-groups => user/user-group}/workspace/user-group-workspace.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/user-section/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/collection/user-collection-header.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/collection/user-collection.context.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/collection/user-collection.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/collection/views/grid/user-collection-grid-view.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/collection/views/table/column-layouts/status/user-table-status-column-layout.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/collection/views/table/user-collection-table-view.element.ts (97%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/components/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/components/user-input/user-input.context.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/components/user-input/user-input.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/components/user-input/user-input.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/components/user-permission-setting/user-permission-setting.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/entity-bulk-actions/delete/delete.action.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/entity-bulk-actions/disable/disable.action.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/entity-bulk-actions/enable/enable.action.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/entity-bulk-actions/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/entity-bulk-actions/set-group/set-group.action.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/entity-bulk-actions/unlock/unlock.action.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/modals/create/user-create-modal.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/modals/invite/user-invite-modal.element.ts (97%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/modals/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/modals/user-picker/user-picker-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/manifests.ts (91%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/sources/user-collection.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/sources/user-disable.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/sources/user-enable.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/sources/user-item.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/sources/user-set-group.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/sources/user-unlock.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/sources/user.server.data.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/user-item.store.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/user.repository.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/repository/user.store.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/section-view/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/section-view/users-section-view.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/types.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/workspace/actions/user-workspace-action-save.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/workspace/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/workspace/user-workspace-editor.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/workspace/user-workspace.context.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/workspace/user-workspace.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users/users => user/user}/workspace/user-workspace.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/utils.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{users => user}/utils.ts (100%) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/index.ts diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 5a2d7a5967..d5f2306540 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -65,9 +65,9 @@ "./partial-view": "./dist-cms/packages/templating/partial-views/index.js", "./stylesheet": "./dist-cms/packages/templating/stylesheets/index.js", "./template": "./dist-cms/packages/templating/templates/index.js", - "./user-group": "./dist-cms/packages/users/user-groups/index.js", - "./current-user": "./dist-cms/packages/users/current-user/index.js", - "./users": "./dist-cms/packages/users/users/index.js", + "./user-group": "./dist-cms/packages/user/user-groups/index.js", + "./current-user": "./dist-cms/packages/user/current-user/index.js", + "./users": "./dist-cms/packages/user/user/index.js", "./code-editor": "./dist-cms/packages/templating/code-editor/index.js", "./external/*": "./dist-cms/external/*/index.js" }, diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts index b4e71e88c8..f16f4e6572 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts @@ -18,7 +18,7 @@ const CORE_PACKAGES = [ import('../../packages/media/umbraco-package.js'), import('../../packages/members/umbraco-package.js'), import('../../packages/dictionary/umbraco-package.js'), - import('../../packages/users/umbraco-package.js'), + import('../../packages/user/umbraco-package.js'), import('../../packages/packages/umbraco-package.js'), import('../../packages/search/umbraco-package.js'), import('../../packages/templating/umbraco-package.js'), diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts index 943dbe8d41..5dd7fe1920 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts @@ -2,7 +2,7 @@ import type { SectionAliasConditionConfig } from './section-alias.condition.js'; import type { SwitchConditionConfig } from './switch.condition.js'; import type { WorkspaceAliasConditionConfig } from '@umbraco-cms/backoffice/workspace'; import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; -import type { UserPermissionConditionConfig } from '@umbraco-cms/backoffice/current-user'; +import type { UserPermissionConditionConfig } from 'src/packages/user/current-user/index.js'; /* TODO: in theory should't the core package import from other packages. Are there any other way we can do this? */ diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts index 79b7ddaf45..5ebd36bc65 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts @@ -1,5 +1,5 @@ import { UmbModalToken, UmbPickerModalData } from '@umbraco-cms/backoffice/modal'; -import { UmbUserDetail } from '@umbraco-cms/backoffice/users'; +import { UmbUserDetail } from 'src/packages/user/user'; export type UmbUserPickerModalData = UmbPickerModalData; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/conditions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/conditions/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/conditions/user-permission.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/user-permission.condition.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/conditions/user-permission.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/conditions/user-permission.condition.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/current-user-header-app.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/current-user-header-app.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/current-user-history.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-history.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/current-user-history.store.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-history.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/change-password/change-password-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/change-password/change-password-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/change-password/change-password-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/change-password/change-password-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/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 similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/current-user/current-user-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-history.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-profile.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-profile.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-themes.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-themes.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/current-user/user-profile-apps/user-profile-app-themes.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-themes.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/index.ts new file mode 100644 index 0000000000..dc92400e30 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/index.ts @@ -0,0 +1,4 @@ +export * from './current-user/index.js'; +export * from './user-group/index.js'; +export * from './user/index.js'; +export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/manifests.ts similarity index 63% rename from src/Umbraco.Web.UI.Client/src/packages/users/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/manifests.ts index 74b7562a5d..02ea6974d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/manifests.ts @@ -1,10 +1,10 @@ -import { manifests as userGroupManifests } from './user-groups/manifests.js'; -import { manifests as userManifests } from './users/manifests.js'; +import { manifests as userGroupManifests } from './user-group/manifests.js'; +import { manifests as userManifests } from './user/manifests.js'; import { manifests as userSectionManifests } from './user-section/manifests.js'; import { manifests as currentUserManifests } from './current-user/manifests.js'; // We need to load any components that are not loaded by the user management bundle to register them in the browser. -import './user-groups/components/index.js'; -import './users/components/index.js'; +import './user-group/components/index.js'; +import './user/components/index.js'; export const manifests = [...userGroupManifests, ...userManifests, ...userSectionManifests, ...currentUserManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/user/umbraco-package.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/umbraco-package.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/umbraco-package.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-header.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection-header.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-header.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection-header.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection-view.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection-view.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection-view.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-collection.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-collection.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-table-name-column-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-name-column-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-table-name-column-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-sections-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-table-sections-column-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/user-group-table-sections-column-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/user-group-table-sections-column-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/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 similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-actions/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-actions/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-actions/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/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 similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-bulk-actions/delete/delete.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/delete/delete.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/entity-bulk-actions/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/entity-bulk-actions/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/modals/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/modals/user-group-picker/user-group-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/modals/user-group-picker/user-group-picker-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/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 similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/modals/user-group-picker/user-group-picker-modal.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/manifests.ts similarity index 91% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/manifests.ts index cc7861adc8..2e4ab82d51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/manifests.ts @@ -1,4 +1,4 @@ -import { UmbUserGroupRepository } from '../repository/user-group.repository.js'; +import { UmbUserGroupRepository } from './user-group.repository.js'; import { UmbUserGroupItemStore } from './user-group-item.store.js'; import { UmbUserGroupStore } from './user-group.store.js'; import type { ManifestStore, ManifestRepository, ManifestItemStore } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/sources/user-group-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-collection.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/sources/user-group-collection.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-collection.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/sources/user-group-item.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/sources/user-group-item.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/sources/user-group.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/sources/user-group.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group-item.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group-item.store.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group-item.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.store.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/section-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/section-view/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/section-view/user-groups-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/user-groups-section-view.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/section-view/user-groups-section-view.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/user-groups-section-view.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/types.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/types.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/actions/workspace-action-user-group-save.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/actions/workspace-action-user-group-save.element.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/actions/workspace-action-user-group-save.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/actions/workspace-action-user-group-save.element.ts index 3198445818..ba39d589e1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/actions/workspace-action-user-group-save.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/actions/workspace-action-user-group-save.element.ts @@ -1,4 +1,4 @@ -import { UMB_USER_WORKSPACE_CONTEXT } from '../../../users/workspace/user-workspace.context.js'; +import { UMB_USER_WORKSPACE_CONTEXT } from '../../../user/workspace/user-workspace.context.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from "@umbraco-cms/backoffice/style"; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts index b6920fc87c..c370cbb285 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts @@ -6,7 +6,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { ManifestUserPermission, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { groupBy } from '@umbraco-cms/backoffice/external/lodash'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; -import { type UmbUserPermissionSettingElement } from '@umbraco-cms/backoffice/users'; +import { type UmbUserPermissionSettingElement } from 'src/packages/user/user/index.js'; @customElement('umb-user-group-default-permission-list') export class UmbUserGroupDefaultPermissionListElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-granular-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-granular-permission-list.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts index 7b7453b3b2..9e1be3c878 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts @@ -7,7 +7,7 @@ import { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; import { UmbInputSectionElement } from '@umbraco-cms/backoffice/components'; -import { UmbUserInputElement } from '@umbraco-cms/backoffice/users'; +import { UmbUserInputElement } from 'src/packages/user/user/index.js'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; import { UmbInputMediaElement } from '@umbraco-cms/backoffice/media'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts index d750f28faf..196e529a54 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts @@ -1,5 +1,5 @@ import { UmbUserGroupRepository } from '../repository/user-group.repository.js'; -import { UmbUserRepository } from '../../users/repository/user.repository.js'; +import { UmbUserRepository } from '../../user/repository/user.repository.js'; import { UmbSaveableWorkspaceContextInterface, UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace'; import type { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbArrayState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-section/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-section/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-section/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/user-collection-header.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection-header.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/collection/user-collection-header.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection-header.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/user-collection.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/collection/user-collection.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/user-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/collection/user-collection.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/grid/user-collection-grid-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-collection-grid-view.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/grid/user-collection-grid-view.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-collection-grid-view.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/table/column-layouts/status/user-table-status-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/column-layouts/status/user-table-status-column-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/table/column-layouts/status/user-table-status-column-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/column-layouts/status/user-table-status-column-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/table/user-collection-table-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-collection-table-view.element.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/table/user-collection-table-view.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-collection-table-view.element.ts index 3fb57752f1..55e6c321f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/users/collection/views/table/user-collection-table-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-collection-table-view.element.ts @@ -2,7 +2,7 @@ import { UmbUserCollectionContext } from '../../user-collection.context.js'; import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN, -} from '../../../../user-groups/repository/user-group.store.js'; +} from '../../../../user-group/repository/user-group.store.js'; import type { UmbUserDetail } from '../../../types.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from "@umbraco-cms/backoffice/style"; @@ -15,7 +15,7 @@ import { UmbTableConfig, UmbTableOrderedEvent, } from '@umbraco-cms/backoffice/components'; -import type { UserGroupEntity } from '@umbraco-cms/backoffice/user-group'; +import type { UserGroupEntity } from 'src/packages/user/user-group/index.js'; import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/components/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/components/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-input/user-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-input/user-input.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-input/user-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-input/user-input.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-input/user-input.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-input/user-input.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-permission-setting/user-permission-setting.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-permission-setting/user-permission-setting.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-permission-setting/user-permission-setting.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-permission-setting/user-permission-setting.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/delete/delete.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/delete/delete.action.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/delete/delete.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/delete/delete.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/disable/disable.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/disable/disable.action.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/disable/disable.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/disable/disable.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/enable/enable.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/enable/enable.action.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/enable/enable.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/enable/enable.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/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 similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/set-group/set-group.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/set-group/set-group.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/unlock/unlock.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/unlock/unlock.action.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/entity-bulk-actions/unlock/unlock.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-bulk-actions/unlock/unlock.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/modals/create/user-create-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/user-create-modal.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/modals/create/user-create-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/user-create-modal.element.ts index ad14af49f8..5c2818a71f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/users/modals/create/user-create-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/user-create-modal.element.ts @@ -1,4 +1,4 @@ -import { UmbUserGroupInputElement } from '../../../user-groups/components/input-user-group/user-group-input.element.js'; +import { UmbUserGroupInputElement } from '../../../user-group/components/input-user-group/user-group-input.element.js'; import { UmbUserRepository } from '../../repository/user.repository.js'; import { UmbUserDetail } from '../../types.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/modals/invite/user-invite-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/invite/user-invite-modal.element.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/modals/invite/user-invite-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/modals/invite/user-invite-modal.element.ts index 3a1c9eb162..c40a105dcb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/users/modals/invite/user-invite-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/invite/user-invite-modal.element.ts @@ -1,4 +1,4 @@ -import { UmbUserGroupInputElement } from '../../../user-groups/components/input-user-group/user-group-input.element.js'; +import { UmbUserGroupInputElement } from '../../../user-group/components/input-user-group/user-group-input.element.js'; import { UmbUserRepository } from '../../repository/user.repository.js'; import { css, html, nothing, customElement, query, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from "@umbraco-cms/backoffice/style"; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/modals/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/modals/user-picker/user-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/user-picker/user-picker-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/modals/user-picker/user-picker-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/modals/user-picker/user-picker-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/manifests.ts similarity index 91% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/manifests.ts index d762ce87fc..b1f06eb822 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/manifests.ts @@ -1,4 +1,4 @@ -import { UmbUserRepository } from '../repository/user.repository.js'; +import { UmbUserRepository } from './user.repository.js'; import { UmbUserItemStore } from './user-item.store.js'; import { UmbUserStore } from './user.store.js'; import type { ManifestStore, ManifestRepository, ManifestItemStore } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-collection.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-collection.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-collection.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-disable.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-disable.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-disable.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-disable.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-enable.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-enable.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-enable.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-enable.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-item.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-item.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-item.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-item.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-set-group.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-set-group.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-unlock.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-unlock.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user-unlock.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-unlock.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/sources/user.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/user-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-item.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/user-item.store.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-item.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.repository.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/user.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.repository.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/repository/user.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/repository/user.store.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/section-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/section-view/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/section-view/users-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/section-view/users-section-view.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/types.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/types.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/actions/user-workspace-action-save.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/actions/user-workspace-action-save.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/actions/user-workspace-action-save.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/actions/user-workspace-action-save.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace-editor.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts index ed3b4afb6b..b92ba9da52 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts @@ -1,7 +1,7 @@ import { getDisplayStateFromUserStatus } from '../../utils.js'; import { type UmbUserDetail } from '../index.js'; import { UmbUserWorkspaceContext } from './user-workspace.context.js'; -import { UmbUserRepository } from '@umbraco-cms/backoffice/users'; +import { UmbUserRepository } from 'src/packages/user/user/index.js'; import { UUIInputElement, UUIInputEvent, UUISelectElement } from '@umbraco-cms/backoffice/external/uui'; import { css, @@ -21,7 +21,7 @@ import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_AUTH, type UmbLoggedInUser } from '@umbraco-cms/backoffice/auth'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { type UmbUserGroupInputElement } from '@umbraco-cms/backoffice/user-group'; +import { type UmbUserGroupInputElement } from 'src/packages/user/user-group/index.js'; @customElement('umb-user-workspace-editor') export class UmbUserWorkspaceEditorElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace.test.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/user-workspace.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/utils.test.ts b/src/Umbraco.Web.UI.Client/src/packages/user/utils.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/utils.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/utils.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/user/utils.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/utils.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/utils.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/index.ts deleted file mode 100644 index 2f1673f76b..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/users/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './current-user/index.js'; -export * from './user-groups/index.js'; -export * from './users/index.js'; -export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index d4de6fd9d6..32b08b6d58 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -101,9 +101,9 @@ "@umbraco-cms/backoffice/template": ["./src/packages/templating/templates/index.ts"], // USERS - "@umbraco-cms/backoffice/user-group": ["src/packages/users/user-groups"], - "@umbraco-cms/backoffice/current-user": ["src/packages/users/current-user"], - "@umbraco-cms/backoffice/users": ["src/packages/users/users"], + "@umbraco-cms/backoffice/user-group": ["src/packages/user/user-group"], + "@umbraco-cms/backoffice/current-user": ["src/packages/user/current-user"], + "@umbraco-cms/backoffice/user": ["src/packages/user/user"], // TEMPLATING "@umbraco-cms/backoffice/code-editor": ["src/packages/templating/code-editor"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 397aed2b1b..f0a95d12f4 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -101,9 +101,9 @@ export default { '@umbraco-cms/backoffice/stylesheet': './src/packages/templating/stylesheets/index.ts', '@umbraco-cms/backoffice/template': './src/packages/templating/templates/index.ts', - '@umbraco-cms/backoffice/user-group': './src/packages/users/user-groups/index.ts', - '@umbraco-cms/backoffice/current-user': './src/packages/users/current-user/index.ts', - '@umbraco-cms/backoffice/users': './src/packages/users/users/index.ts', + '@umbraco-cms/backoffice/user-group': './src/packages/user/user-groups/index.ts', + '@umbraco-cms/backoffice/current-user': './src/packages/user/current-user/index.ts', + '@umbraco-cms/backoffice/user': './src/packages/user/user/index.ts', '@umbraco-cms/backoffice/code-editor': './src/packages/templating/code-editor/index.ts',