diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts index 8df7e84ab6..2e069db245 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/index.ts @@ -1,5 +1,5 @@ export { UmbUserDetailRepository } from './user-detail.repository.js'; -export { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.js'; +export { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.token.js'; export * from './constants.js'; export type { UmbUserDetailStore } from './user-detail.store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts index 2275e361c4..ebec5762af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.repository.ts @@ -1,7 +1,7 @@ import type { UmbUserDetailModel } from '../../types.js'; import type { UmbUserDetailDataSource } from './types.js'; import { UmbUserServerDataSource } from './user-detail.server.data-source.js'; -import { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.js'; +import { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbDetailRepositoryBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.token.ts new file mode 100644 index 0000000000..bbd416de3d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.token.ts @@ -0,0 +1,4 @@ +import type UmbUserDetailStore from './user-detail.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_USER_DETAIL_STORE_CONTEXT = new UmbContextToken('UmbUserDetailStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts index 99006c4a95..f642066bb5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.store.ts @@ -1,5 +1,5 @@ import type { UmbUserDetailModel } from '../../types.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_USER_DETAIL_STORE_CONTEXT } from './user-detail.store.token.js'; import { UmbDetailStoreBase } from '@umbraco-cms/backoffice/store'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -21,5 +21,3 @@ export class UmbUserDetailStore extends UmbDetailStoreBase { } export default UmbUserDetailStore; - -export const UMB_USER_DETAIL_STORE_CONTEXT = new UmbContextToken('UmbUserDetailStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/constants.ts new file mode 100644 index 0000000000..cd6dd84b7b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/constants.ts @@ -0,0 +1 @@ +export const UMB_DISABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Disable'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts index 6f74b4aada..a2cc4da472 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/index.ts @@ -1,2 +1,2 @@ export { UmbDisableUserRepository } from './disable-user.repository.js'; -export { UMB_DISABLE_USER_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_DISABLE_USER_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts index 885fd52c36..a5db2cab19 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/manifests.ts @@ -1,6 +1,6 @@ +import { UMB_DISABLE_USER_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_DISABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Disable'; const disableRepository: ManifestRepository = { type: 'repository', alias: UMB_DISABLE_USER_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/constants.ts new file mode 100644 index 0000000000..c09d413b5c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/constants.ts @@ -0,0 +1 @@ +export const UMB_ENABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Enable'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts index 6ec39f65d9..4470f07792 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/index.ts @@ -1,2 +1,2 @@ export { UmbEnableUserRepository } from './enable-user.repository.js'; -export { UMB_ENABLE_USER_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_ENABLE_USER_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts index bc0f704f3e..d33d994a13 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/manifests.ts @@ -1,6 +1,6 @@ +import { UMB_ENABLE_USER_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_ENABLE_USER_REPOSITORY_ALIAS = 'Umb.Repository.User.Enable'; const enableRepository: ManifestRepository = { type: 'repository', alias: UMB_ENABLE_USER_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/constants.ts new file mode 100644 index 0000000000..634eb32b48 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/constants.ts @@ -0,0 +1,2 @@ +export const UMB_USER_ITEM_REPOSITORY_ALIAS = 'Umb.Repository.User.Item'; +export const UMB_USER_ITEM_STORE_ALIAS = 'Umb.ItemStore.User'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts index 4df6b365f7..081cc63387 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/index.ts @@ -1,5 +1,5 @@ export { UmbUserItemRepository } from './user-item.repository.js'; -export { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.js'; -export { UMB_USER_ITEM_REPOSITORY_ALIAS, UMB_USER_ITEM_STORE_ALIAS } from './manifests.js'; +export { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.token.js'; +export * from './constants.js'; export type { UmbUserItemModel } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts index 3e3d05026a..68b5a3e41b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/manifests.ts @@ -1,8 +1,6 @@ +import { UMB_USER_ITEM_REPOSITORY_ALIAS, UMB_USER_ITEM_STORE_ALIAS } from './constants.js'; import type { ManifestItemStore, ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_USER_ITEM_REPOSITORY_ALIAS = 'Umb.Repository.User.Item'; -export const UMB_USER_ITEM_STORE_ALIAS = 'Umb.ItemStore.User'; - const itemRepository: ManifestRepository = { type: 'repository', alias: UMB_USER_ITEM_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts index 653660f641..34b4805741 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts @@ -1,5 +1,5 @@ import { UmbUserItemServerDataSource } from './user-item.server.data-source.js'; -import { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.js'; +import { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.token.js'; import type { UmbUserItemModel } from './types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemRepositoryBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.token.ts new file mode 100644 index 0000000000..24daac759e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.token.ts @@ -0,0 +1,4 @@ +import type UmbUserItemStore from './user-item.store.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_USER_ITEM_STORE_CONTEXT = new UmbContextToken('UmbUserItemStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts index 1723b356b0..4d61eda455 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.store.ts @@ -1,5 +1,5 @@ import type { UmbUserItemModel } from './types.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UMB_USER_ITEM_STORE_CONTEXT } from './user-item.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemStoreBase } from '@umbraco-cms/backoffice/store'; @@ -23,5 +23,3 @@ export class UmbUserItemStore extends UmbItemStoreBase { } export default UmbUserItemStore; - -export const UMB_USER_ITEM_STORE_CONTEXT = new UmbContextToken('UmbUserItemStore'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts index b54da7d8fa..3a0e90fd41 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user-repository-base.ts @@ -1,7 +1,7 @@ import type { UmbUserDetailStore } from './detail/user-detail.store.js'; -import { UMB_USER_DETAIL_STORE_CONTEXT } from './detail/user-detail.store.js'; +import { UMB_USER_DETAIL_STORE_CONTEXT } from './detail/user-detail.store.token.js'; import type { UmbUserItemStore } from './item/user-item.store.js'; -import { UMB_USER_ITEM_STORE_CONTEXT } from './item/user-item.store.js'; +import { UMB_USER_ITEM_STORE_CONTEXT } from './item/user-item.store.token.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';