From ff36ddd97668cdc3ce762adf968141964151205d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 1 Oct 2023 20:06:06 +0200 Subject: [PATCH] move collection repo files into collection folder --- .../packages/users/user-groups/collection/index.ts | 1 + .../users/user-groups/collection/manifests.ts | 3 +++ .../user-groups/collection/repository/index.ts | 1 + .../user-groups/collection/repository/manifests.ts | 13 +++++++++++++ .../repository}/user-group-collection.repository.ts | 2 +- .../user-group-collection.server.data.ts | 0 .../collection/user-group-collection.context.ts | 2 +- .../src/packages/users/user-groups/manifests.ts | 2 ++ .../packages/users/user-groups/repository/index.ts | 1 - .../users/user-groups/repository/manifests.ts | 11 +---------- 10 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/users/user-groups/{repository/collection => collection/repository}/user-group-collection.repository.ts (96%) rename src/Umbraco.Web.UI.Client/src/packages/users/user-groups/{repository/collection => collection/repository}/user-group-collection.server.data.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/index.ts new file mode 100644 index 0000000000..3d76f338dd --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/index.ts @@ -0,0 +1 @@ +export * from './repository/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/manifests.ts new file mode 100644 index 0000000000..4e1826b900 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/manifests.ts @@ -0,0 +1,3 @@ +import { manifests as repositoryManifests } from './repository/manifests.js'; + +export const manifests = [...repositoryManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/index.ts new file mode 100644 index 0000000000..b502942922 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/index.ts @@ -0,0 +1 @@ +export * from './user-group-collection.repository.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/manifests.ts new file mode 100644 index 0000000000..173186f61a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/manifests.ts @@ -0,0 +1,13 @@ +import { UmbUserGroupCollectionRepository } from './user-group-collection.repository.js'; +import { ManifestRepository } from '@umbraco-cms/backoffice/extension-registry'; + +export const USER_GROUP_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.UserGroupCollection'; + +const repository: ManifestRepository = { + type: 'repository', + alias: USER_GROUP_COLLECTION_REPOSITORY_ALIAS, + name: 'User Group Collection Repository', + class: UmbUserGroupCollectionRepository, +}; + +export const manifests = [repository]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/collection/user-group-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/user-group-collection.repository.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/collection/user-group-collection.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/user-group-collection.repository.ts index 6cfaf3c684..2516f3884d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/collection/user-group-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/user-group-collection.repository.ts @@ -1,5 +1,5 @@ import { UmbUserGroupCollectionFilterModel } from '../../types.js'; -import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN, UmbUserGroupStore } from '../user-group.store.js'; +import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN, UmbUserGroupStore } from '../../repository/user-group.store.js'; import { UmbUserGroupCollectionServerDataSource } from './user-group-collection.server.data.js'; import { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/collection/user-group-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/user-group-collection.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/collection/user-group-collection.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/users/user-groups/collection/repository/user-group-collection.server.data.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/users/user-groups/collection/user-group-collection.context.ts index 1293a1afa5..da336368a7 100644 --- 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/users/user-groups/collection/user-group-collection.context.ts @@ -1,5 +1,5 @@ -import { USER_GROUP_COLLECTION_REPOSITORY_ALIAS } from '../repository/manifests.js'; import type { UmbUserGroupCollectionFilterModel } from '../types.js'; +import { USER_GROUP_COLLECTION_REPOSITORY_ALIAS } from './repository/manifests.js'; import { UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; import type { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts index 5d01d53186..0fd9d7fe94 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/manifests.ts @@ -1,3 +1,4 @@ +import { manifests as collectionManifests } from './collection/manifests.js'; import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; import { manifests as modalManifests } from './modals/manifests.js'; @@ -6,6 +7,7 @@ import { manifests as entityActionManifests } from './entity-actions/manifests.j import { manifests as entityBulkActionManifests } from './entity-bulk-actions/manifests.js'; export const manifests = [ + ...collectionManifests, ...repositoryManifests, ...workspaceManifests, ...modalManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/index.ts index 9b5841d1bb..019a8ceb26 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/index.ts @@ -1,2 +1 @@ export * from './user-group.repository.js'; -export * from './collection/user-group-collection.repository.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/manifests.ts index 4a46c4496b..cc7861adc8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/manifests.ts @@ -1,11 +1,9 @@ import { UmbUserGroupRepository } from '../repository/user-group.repository.js'; -import { UmbUserGroupCollectionRepository } from './collection/user-group-collection.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'; export const USER_GROUP_REPOSITORY_ALIAS = 'Umb.Repository.UserGroup'; -export const USER_GROUP_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.UserGroupCollection'; const repository: ManifestRepository = { type: 'repository', @@ -14,13 +12,6 @@ const repository: ManifestRepository = { class: UmbUserGroupRepository, }; -const collectionRepository: ManifestRepository = { - type: 'repository', - alias: USER_GROUP_COLLECTION_REPOSITORY_ALIAS, - name: 'User Group Collection Repository', - class: UmbUserGroupCollectionRepository, -}; - const store: ManifestStore = { type: 'store', alias: 'Umb.Store.UserGroup', @@ -35,4 +26,4 @@ const itemStore: ManifestItemStore = { class: UmbUserGroupItemStore, }; -export const manifests = [repository, collectionRepository, store, itemStore]; +export const manifests = [repository, store, itemStore];