From 70c768175e03545df140f9df5067cc8715b2fb16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20M=C3=B8ller=20Jensen?= <26099018+JesmoDev@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:44:34 +1300 Subject: [PATCH] fix exports and types and naming --- .../src/packages/media/media-types/entity.ts | 3 +++ .../src/packages/media/media-types/index.ts | 15 +++++++++++---- .../media/media-types/repository/detail/index.ts | 5 +---- .../detail/media-type-detail.repository.ts | 4 ++-- ...ts => media-type-detail.server.data-source.ts} | 0 .../media/media-types/repository/detail/types.ts | 4 ++++ .../media/media-types/repository/item/index.ts | 8 +++----- .../src/packages/media/media-types/tree/index.ts | 10 ++++++++++ .../packages/media/media-types/tree/manifests.ts | 2 +- .../tree/media-type-tree.repository.ts | 4 ++-- ...e.ts => media-type-tree.server.data-source.ts} | 0 ...ype.tree.store.ts => media-type-tree.store.ts} | 0 .../workspace/media-type-workspace.context.ts | 5 +++-- 13 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity.ts rename src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/{media-type.server.data.ts => media-type-detail.server.data-source.ts} (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/types.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/index.ts rename src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/{media-type.tree.server.data-source.ts => media-type-tree.server.data-source.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/{media-type.tree.store.ts => media-type-tree.store.ts} (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity.ts new file mode 100644 index 0000000000..fdae21ac4a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity.ts @@ -0,0 +1,3 @@ +export const UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE = 'media-type-root'; +export const UMB_MEDIA_TYPE_ENTITY_TYPE = 'media-type'; +export const UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE = 'media-type-folder'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts index 44a4d20d5a..8cf991d68a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/index.ts @@ -1,7 +1,14 @@ import './components/index.js'; -export * from './repository/index.js'; +export { + UmbMediaTypeItemRepository, + UMB_MEDIA_TYPE_ITEM_STORE_ALIAS, + UMB_MEDIA_TYPE_DETAIL_STORE_ALIAS, + UMB_MEDIA_TYPE_DETAIL_STORE_CONTEXT, +} from './repository/index.js'; -export const UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE = 'media-type-root'; -export const UMB_MEDIA_TYPE_ENTITY_TYPE = 'media-type'; -export const UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE = 'media-type-folder'; +export { + UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE, + UMB_MEDIA_TYPE_ENTITY_TYPE, + UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE, +} from './entity.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/index.ts index 16fd2692c6..6b844c13ad 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/index.ts @@ -1,6 +1,3 @@ export { UmbMediaTypeDetailRepository } from './media-type-detail.repository.js'; -export { - UMB_MEDIA_TYPE_DETAIL_REPOSITORY_ALIAS as MEDIA_TYPE_DETAIL_REPOSITORY_ALIAS, - UMB_MEDIA_TYPE_DETAIL_STORE_ALIAS as MEDIA_TYPE_DETAIL_STORE_ALIAS, -} from './manifests.js'; +export { UMB_MEDIA_TYPE_DETAIL_REPOSITORY_ALIAS, UMB_MEDIA_TYPE_DETAIL_STORE_ALIAS } from './manifests.js'; export { UMB_MEDIA_TYPE_DETAIL_STORE_CONTEXT } from './media-type-detail.store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.repository.ts index 987ad2957f..8ca70c649f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.repository.ts @@ -1,6 +1,6 @@ -import { UMB_MEDIA_TYPE_TREE_STORE_CONTEXT, UmbMediaTypeTreeStore } from '../../tree/media-type.tree.store.js'; +import { UMB_MEDIA_TYPE_TREE_STORE_CONTEXT, UmbMediaTypeTreeStore } from '../../tree/media-type-tree.store.js'; import { UMB_MEDIA_TYPE_ITEM_STORE_CONTEXT, UmbMediaTypeItemStore } from '../item/media-type-item.store.js'; -import { UmbMediaTypeServerDataSource } from './media-type.server.data.js'; +import { UmbMediaTypeServerDataSource } from './media-type-detail.server.data-source.js'; import { UmbMediaTypeDetailStore, UMB_MEDIA_TYPE_DETAIL_STORE_CONTEXT } from './media-type-detail.store.js'; import { type UmbDetailRepository } from '@umbraco-cms/backoffice/repository'; import { UmbBaseController, type UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/types.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/types.ts new file mode 100644 index 0000000000..e461548b00 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/types.ts @@ -0,0 +1,4 @@ +import { UMB_MEDIA_TYPE_ENTITY_TYPE } from '../../entity.js'; +import { MediaTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; + +export type UmbMediaTypeDetailModel = MediaTypeResponseModel & { entityType: typeof UMB_MEDIA_TYPE_ENTITY_TYPE }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/index.ts index 2277e6c66b..48354e1b73 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/index.ts @@ -1,6 +1,4 @@ export { UmbMediaTypeItemRepository } from './media-type-item.repository.js'; -export { - UMB_MEDIA_TYPE_ITEM_REPOSITORY_ALIAS as MEDIA_TYPE_ITEM_REPOSITORY_ALIAS, - UMB_MEDIA_TYPE_ITEM_STORE_ALIAS as MEDIA_TYPE_ITEM_STORE_ALIAS, -} from './manifests.js'; -export * from './types.js'; +export { UMB_MEDIA_TYPE_ITEM_REPOSITORY_ALIAS, UMB_MEDIA_TYPE_ITEM_STORE_ALIAS } from './manifests.js'; +export { UMB_MEDIA_TYPE_ITEM_STORE_CONTEXT } from './media-type-item.store.js'; +export type { UmbMediaTypeItemModel } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/index.ts new file mode 100644 index 0000000000..c1e6582874 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/index.ts @@ -0,0 +1,10 @@ +export { + UMB_MEDIA_TYPE_TREE_ALIAS, + UMB_MEDIA_TYPE_TREE_STORE_ALIAS, + UMB_MEDIA_TYPE_TREE_REPOSITORY_ALIAS, +} from './manifests.js'; + +export { UmbMediaTypeTreeRepository } from './media-type-tree.repository.js'; +export { UMB_MEDIA_TYPE_TREE_STORE_CONTEXT } from './media-type-tree.store.js'; + +export type { UmbMediaTypeTreeItemModel, UmbMediaTypeTreeRootModel } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/manifests.ts index fba8faea74..03cbfddbcf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/manifests.ts @@ -1,5 +1,5 @@ import { UmbMediaTypeTreeRepository } from './media-type-tree.repository.js'; -import { UmbMediaTypeTreeStore } from './media-type.tree.store.js'; +import { UmbMediaTypeTreeStore } from './media-type-tree.store.js'; import type { ManifestRepository, ManifestTree, diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts index 68258e60f7..125d2ef283 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts @@ -1,6 +1,6 @@ import { UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE } from '../index.js'; -import { UmbMediaTypeTreeServerDataSource } from './media-type.tree.server.data-source.js'; -import { UMB_MEDIA_TYPE_TREE_STORE_CONTEXT } from './media-type.tree.store.js'; +import { UmbMediaTypeTreeServerDataSource } from './media-type-tree.server.data-source.js'; +import { UMB_MEDIA_TYPE_TREE_STORE_CONTEXT } from './media-type-tree.store.js'; import { UmbMediaTypeTreeItemModel, UmbMediaTypeTreeRootModel } from './types.js'; import { UmbTreeRepositoryBase } from '@umbraco-cms/backoffice/tree'; import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type.tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type.tree.server.data-source.ts rename to src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type.tree.store.ts rename to src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts index 650b0eb401..1a7272354c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts @@ -1,4 +1,5 @@ import { UmbMediaTypeDetailRepository } from '../repository/detail/media-type-detail.repository.js'; +import { UMB_MEDIA_TYPE_ENTITY_TYPE } from '../index.js'; import { UmbSaveableWorkspaceContextInterface, UmbEditableWorkspaceContextBase, @@ -65,7 +66,7 @@ export class UmbMediaTypeWorkspaceContext } getEntityType() { - return 'media-type'; + return UMB_MEDIA_TYPE_ENTITY_TYPE; } updateProperty(propertyName: PropertyName, value: EntityType[PropertyName]) { @@ -120,5 +121,5 @@ export const UMB_MEDIA_TYPE_WORKSPACE_CONTEXT = new UmbContextToken< UmbMediaTypeWorkspaceContext >( 'UmbWorkspaceContext', - (context): context is UmbMediaTypeWorkspaceContext => context.getEntityType?.() === 'media-type', + (context): context is UmbMediaTypeWorkspaceContext => context.getEntityType?.() === UMB_MEDIA_TYPE_ENTITY_TYPE, );