From bce1a0752078d1c7291214f0a70c3defca44d1ef Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 26 Sep 2024 16:57:24 +0200 Subject: [PATCH] reorganize --- .../partial-views/tree/folder/index.ts | 6 +---- .../partial-views/tree/folder/manifests.ts | 10 +++------ .../tree/folder/repository/constants.ts | 2 ++ .../tree/folder/repository/index.ts | 2 ++ .../tree/folder/repository/manifests.ts | 16 ++++++++++++++ .../partial-view-folder.repository.ts | 3 ++- .../partial-view-folder.server.data-source.ts | 2 +- ...partial-view-folder.store.context.token.ts | 6 +++++ .../repository/partial-view-folder.store.ts | 22 +++++++++++++++++++ 9 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/{ => repository}/partial-view-folder.repository.ts (72%) rename src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/{ => repository}/partial-view-folder.server.data-source.ts (98%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.context.token.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/index.ts index c8314ac30b..3d76f338dd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/index.ts @@ -1,5 +1 @@ -export { UmbPartialViewFolderRepository } from './partial-view-folder.repository.js'; -export { - UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS, - UMB_DELETE_PARTIAL_VIEW_FOLDER_ENTITY_ACTION_ALIAS, -} from './manifests.js'; +export * from './repository/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/manifests.ts index 8dcfcfae73..45945addca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/manifests.ts @@ -1,15 +1,10 @@ import { UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE } from '../../entity.js'; +import { UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS } from './repository/index.js'; +import { manifests as repositoryManifests } from './repository/manifests.js'; -export const UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS = 'Umb.Repository.PartialView.Folder'; export const UMB_DELETE_PARTIAL_VIEW_FOLDER_ENTITY_ACTION_ALIAS = 'Umb.EntityAction.PartialView.Folder.Delete'; export const manifests: Array = [ - { - type: 'repository', - alias: UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS, - name: 'Partial View Folder Repository', - api: () => import('./partial-view-folder.repository.js'), - }, { type: 'entityAction', kind: 'folderDelete', @@ -20,4 +15,5 @@ export const manifests: Array = [ folderRepositoryAlias: UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS, }, }, + ...repositoryManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/constants.ts new file mode 100644 index 0000000000..1c56f4cc61 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/constants.ts @@ -0,0 +1,2 @@ +export const UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS = 'Umb.Repository.PartialView.Folder'; +export const UMB_PARTIAL_VIEW_FOLDER_STORE_ALIAS = 'Umb.Store.PartialView.Folder'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/index.ts new file mode 100644 index 0000000000..14cc06e2f1 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/index.ts @@ -0,0 +1,2 @@ +export * from './constants.js'; +export * from './partial-view-folder.repository.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/manifests.ts new file mode 100644 index 0000000000..294900f1c9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/manifests.ts @@ -0,0 +1,16 @@ +import { UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS, UMB_PARTIAL_VIEW_FOLDER_STORE_ALIAS } from './constants.js'; + +export const manifests: Array = [ + { + type: 'repository', + alias: UMB_PARTIAL_VIEW_FOLDER_REPOSITORY_ALIAS, + name: 'Partial View Folder Repository', + api: () => import('./partial-view-folder.repository.js'), + }, + { + type: 'store', + alias: UMB_PARTIAL_VIEW_FOLDER_STORE_ALIAS, + name: 'Partial View Folder Store', + api: () => import('./partial-view-folder.store.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.repository.ts similarity index 72% rename from src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.repository.ts index 05474738b5..2cdecc71a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.repository.ts @@ -1,11 +1,12 @@ import { UmbPartialViewFolderServerDataSource } from './partial-view-folder.server.data-source.js'; +import { UMB_PARTIAL_VIEW_FOLDER_STORE_CONTEXT } from './partial-view-folder.store.context.token.js'; import { UmbDetailRepositoryBase } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbFolderModel } from '@umbraco-cms/backoffice/tree'; export class UmbPartialViewFolderRepository extends UmbDetailRepositoryBase { constructor(host: UmbControllerHost) { - super(host, UmbPartialViewFolderServerDataSource); + super(host, UmbPartialViewFolderServerDataSource, UMB_PARTIAL_VIEW_FOLDER_STORE_CONTEXT); } } 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/repository/partial-view-folder.server.data-source.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts rename to src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.server.data-source.ts index c7603507b4..e56ae5b048 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/repository/partial-view-folder.server.data-source.ts @@ -1,4 +1,4 @@ -import { UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE } from '../../entity.js'; +import { UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE } from '../../../entity.js'; import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import type { UmbFolderModel } from '@umbraco-cms/backoffice/tree'; import type { CreatePartialViewFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.context.token.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.context.token.ts new file mode 100644 index 0000000000..12dd66c663 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.context.token.ts @@ -0,0 +1,6 @@ +import type { UmbPartialViewFolderStore } from './partial-view-folder.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_PARTIAL_VIEW_FOLDER_STORE_CONTEXT = new UmbContextToken( + 'UmbPartialViewFolderStore', +); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.ts new file mode 100644 index 0000000000..4a90cc50d3 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/repository/partial-view-folder.store.ts @@ -0,0 +1,22 @@ +import { UMB_PARTIAL_VIEW_FOLDER_STORE_CONTEXT } from './partial-view-folder.store.context.token.js'; +import { UmbDetailStoreBase } from '@umbraco-cms/backoffice/store'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbFolderModel } from '@umbraco-cms/backoffice/tree'; + +/** + * @class UmbPartialViewFolderStore + * @augments {UmbStoreBase} + * @description - Data Store for Partial View Folders + */ +export class UmbPartialViewFolderStore extends UmbDetailStoreBase { + /** + * Creates an instance of UmbPartialViewFolderStore. + * @param {UmbControllerHost} host - The controller host for this controller to be appended to + * @memberof UmbPartialViewFolderStore + */ + constructor(host: UmbControllerHost) { + super(host, UMB_PARTIAL_VIEW_FOLDER_STORE_CONTEXT.toString()); + } +} + +export { UmbPartialViewFolderStore as api };