From 7dc10e44ac0333b08ce403bb02a4847d2aa6dcf4 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 29 Feb 2024 16:26:46 +0100 Subject: [PATCH] fixes --- .../entity-actions/publish.action.ts | 2 ++ .../entity-actions/unpublish.action.ts | 2 ++ .../media/media/tree/media-tree.store.ts | 32 +++---------------- .../workspace/member-workspace.context.ts | 5 +-- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/publish.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/publish.action.ts index c78c81227a..0858ab78e9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/publish.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/publish.action.ts @@ -7,6 +7,8 @@ import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; export class UmbPublishDocumentEntityAction extends UmbEntityActionBase { async execute() { + if (!this.unique) throw new Error('The document unique identifier is missing'); + const languageRepository = new UmbLanguageCollectionRepository(this._host); const { data: languageData } = await languageRepository.requestCollection({}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts index 03b6925fd2..e4e31995cb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts @@ -7,6 +7,8 @@ import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; export class UmbUnpublishDocumentEntityAction extends UmbEntityActionBase { async execute() { + if (!this.unique) throw new Error('The document unique identifier is missing'); + const languageRepository = new UmbLanguageCollectionRepository(this._host); const { data: languageData } = await languageRepository.requestCollection({}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.store.ts index 6e60607455..ab40a9619e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.store.ts @@ -21,35 +21,13 @@ export class UmbMediaTreeStore extends UmbUniqueTreeStore { constructor(host: UmbControllerHostElement) { super(host, UMB_MEDIA_TREE_STORE_CONTEXT.toString()); - new UmbStoreConnector( - host, - this, - UMB_MEDIA_DETAIL_STORE_CONTEXT, - (item) => this.#createTreeItemMapper(item), - (item) => this.#updateTreeItemMapper(item), - ); + new UmbStoreConnector(host, { + store: this, + connectToStoreAlias: UMB_MEDIA_DETAIL_STORE_CONTEXT, + updateStoreItemMapper: (item) => this.#updateTreeItemMapper(item), + }); } - // TODO: revisit this when we have decided on detail model sizes - // TODO: Fix tree model - #createTreeItemMapper = (item: UmbMediaDetailModel) => { - const treeItem: UmbMediaTreeItemModel = { - unique: item.unique, - parentUnique: item.parentUnique, - name: item.variants[0].name, - entityType: item.entityType, - isFolder: false, - hasChildren: false, - variants: item.variants, - isTrashed: item.isTrashed, - mediaType: { unique: item.mediaType.unique, icon: '', collection: null }, - noAccess: false, - }; - - return treeItem; - }; - - // TODO: revisit this when we have decided on detail model sizes #updateTreeItemMapper = (item: UmbMediaDetailModel) => { return { name: item.variants[0].name, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts index 82866f2c65..afdbe7e572 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member-workspace.context.ts @@ -16,8 +16,6 @@ export class UmbMemberWorkspaceContext { public readonly repository = new UmbMemberDetailRepository(this); - #parentUnique: string | null = null; - #persistedData = new UmbObjectState(undefined); #currentData = new UmbObjectState(undefined); @@ -45,9 +43,8 @@ export class UmbMemberWorkspaceContext } } - async create(parentUnique: string | null, memberTypeUnique: string) { + async create(memberTypeUnique: string) { this.resetState(); - this.#parentUnique = parentUnique; const { data } = await this.repository.createScaffold({ memberType: { unique: memberTypeUnique }, });