From ddb6439c87f78bf1099422f02402ee47f2153eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 23 Jan 2023 21:57:49 +0100 Subject: [PATCH] member type refactoring --- .../src/backoffice/backoffice.element.ts | 12 +++--- .../members/member-types/member-type.store.ts | 40 ------------------- .../member-types/member-type.tree.store.ts | 2 +- 3 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts index d606eb5a59..a52f8f5d52 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -4,7 +4,7 @@ import { css, html } from 'lit'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../core/modal'; import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN } from '../core/notification'; -import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from './users/users/user.store'; +import { UmbUserStore } from './users/users/user.store'; import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from './users/user-groups/user-group.store'; import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from './users/current-user/current-user.store'; import { @@ -16,11 +16,12 @@ import {UmbDocumentTypeDetailStore} from './documents/document-types/document-ty import {UmbDocumentTypeTreeStore} from './documents/document-types/document-type.tree.store'; import { UmbMediaTypeDetailStore } from './media/media-types/media-type.detail.store'; import { UmbMediaTypeTreeStore } from './media/media-types/media-type.tree.store'; -import { UmbMemberTypeStore, UMB_MEMBER_TYPE_STORE_CONTEXT_TOKEN } from './members/member-types/member-type.store'; import { UmbDocumentDetailStore } from './documents/documents/document.detail.store'; import { UmbDocumentTreeStore } from './documents/documents/document.tree.store'; import { UmbMediaDetailStore } from './media/media/media.detail.store'; import { UmbMediaTreeStore } from './media/media/media.tree.store'; +import { UmbMemberTypeDetailStore } from './members/member-types/member-type.detail.store'; +import { UmbMemberTypeTreeStore } from './members/member-types/member-type.tree.store'; import { UmbMemberGroupStore, UMB_MEMBER_GROUP_STORE_CONTEXT_TOKEN } from './members/member-groups/member-group.store'; import { UmbDictionaryStore, UMB_DICTIONARY_STORE_CONTEXT_TOKEN } from './translation/dictionary/dictionary.store'; import { @@ -79,10 +80,11 @@ export class UmbBackofficeElement extends UmbLitElement { new UmbUserStore(this); new UmbMediaTypeDetailStore(this); new UmbMediaTypeTreeStore(this); - new UmbMediaTypeDetailStore(this); - new UmbMediaTypeTreeStore(this); + new UmbDocumentTypeDetailStore(this); + new UmbDocumentTypeTreeStore(this); + new UmbMemberTypeDetailStore(this); + new UmbMemberTypeTreeStore(this); - this.provideContext(UMB_MEMBER_TYPE_STORE_CONTEXT_TOKEN, new UmbMemberTypeStore(this)); this.provideContext(UMB_USER_GROUP_STORE_CONTEXT_TOKEN, new UmbUserGroupStore(this)); this.provideContext(UMB_MEMBER_GROUP_STORE_CONTEXT_TOKEN, new UmbMemberGroupStore(this)); this.provideContext(UMB_SECTION_STORE_CONTEXT_TOKEN, new UmbSectionStore()); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts deleted file mode 100644 index 954d28e266..0000000000 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { map, Observable } from 'rxjs'; -import { UmbDataStoreBase } from '../../../core/stores/store'; -import { MemberTypeResource, EntityTreeItem } from '@umbraco-cms/backend-api'; -import type { MemberTypeDetails } from '@umbraco-cms/models'; -import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextToken } from '@umbraco-cms/context-api'; - -export type UmbMemberTypeStoreItemType = MemberTypeDetails | EntityTreeItem; - -export const STORE_ALIAS = 'UmbMemberTypeStore'; - -/** - * @export - * @class UmbMemberTypeStore - * @extends {UmbDataStoreBase} - * @description - Data Store for Member Types - */ -export class UmbMemberTypeStore extends UmbDataStoreBase { - public readonly storeAlias = STORE_ALIAS; - - getByKey(key: string): Observable { - return null as any; - } - - async save(mediaTypes: Array): Promise { - return null as any; - } - - getTreeRoot(): Observable> { - tryExecuteAndNotify(this.host, MemberTypeResource.getTreeMemberTypeRoot({})).then(({ data }) => { - if (data) { - this.updateItems(data.items); - } - }); - - return this.items.pipe(map((items) => items.filter((item) => item.parentKey === null))); - } -} - -export const UMB_MEMBER_TYPE_STORE_CONTEXT_TOKEN = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.tree.store.ts index 3716b2600f..4342809203 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.tree.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.tree.store.ts @@ -13,7 +13,7 @@ export const UMB_MEMBER_TYPE_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken