From a54d7421815be5de02ec536500b788b46ea78f5c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 20:00:16 +0100 Subject: [PATCH 1/3] update publish repo --- .../documents/entity-actions/publish.action.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 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 6ece37ca99..a11ca84e73 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 @@ -2,18 +2,24 @@ import { umbPickDocumentVariantModal } from '../modals/pick-document-variant-mod import { UmbDocumentDetailRepository, UmbDocumentPublishingRepository } from '../repository/index.js'; import { UmbDocumentVariantState } from '../types.js'; import { UmbLanguageCollectionRepository } from '@umbraco-cms/backoffice/language'; +import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; + +export class UmbPublishDocumentEntityAction extends UmbEntityActionBase { + constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { + super(host, args); + } -export class UmbPublishDocumentEntityAction extends UmbEntityActionBase { async execute() { - if (!this.unique) throw new Error('The document unique identifier is missing'); + if (!this.args.unique) throw new Error('The document unique identifier is missing'); const languageRepository = new UmbLanguageCollectionRepository(this._host); const { data: languageData } = await languageRepository.requestCollection({}); const documentRepository = new UmbDocumentDetailRepository(this._host); - const { data: documentData } = await documentRepository.requestByUnique(this.unique); + const { data: documentData } = await documentRepository.requestByUnique(this.args.unique); if (!documentData) throw new Error('The document was not found'); @@ -21,7 +27,7 @@ export class UmbPublishDocumentEntityAction extends UmbEntityActionBase if (documentData.variants.length === 1) { const variantId = UmbVariantId.Create(documentData.variants[0]); const publishingRepository = new UmbDocumentPublishingRepository(this._host); - await publishingRepository.publish(this.unique, [variantId]); + await publishingRepository.publish(this.args.unique, [variantId]); return; } @@ -48,7 +54,9 @@ export class UmbPublishDocumentEntityAction extends UmbEntityActionBase if (selectedVariants.length) { const publishingRepository = new UmbDocumentPublishingRepository(this._host); - await publishingRepository.publish(this.unique, selectedVariants); + await publishingRepository.publish(this.args.unique, selectedVariants); } } + + destroy(): void {} } From fc2a4923958178d53686e1c8f9784e5c6a77fb53 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 20:03:17 +0100 Subject: [PATCH 2/3] fix create action --- .../entity-actions/create/create.action.ts | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts index 4fd091a750..80173b16d3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts @@ -1,27 +1,22 @@ -import type { UmbDocumentDetailRepository } from '../../repository/index.js'; import { UmbDocumentItemRepository } from '../../repository/index.js'; import { UMB_DOCUMENT_CREATE_OPTIONS_MODAL } from './document-create-options-modal.token.js'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -export class UmbCreateDocumentEntityAction extends UmbEntityActionBase { - #itemRepository; - - constructor(host: UmbControllerHost, repositoryAlias: string, unique: string, entityType: string) { - super(host, repositoryAlias, unique, entityType); - this.#itemRepository = new UmbDocumentItemRepository(host); +export class UmbCreateDocumentEntityAction extends UmbEntityActionBase { + constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { + super(host, args); } async execute() { - if (!this.repository) return; - // default to root let documentItem = null; - if (this.unique) { + if (this.args.unique) { // get document item to get the doc type id - const { data, error } = await this.#itemRepository.requestItems([this.unique]); + const itemRepository = new UmbDocumentItemRepository(this._host); + const { data, error } = await itemRepository.requestItems([this.args.unique]); if (error || !data) throw new Error(`Failed to load document item`); documentItem = data[0]; } @@ -29,11 +24,13 @@ export class UmbCreateDocumentEntityAction extends UmbEntityActionBase Date: Sun, 3 Mar 2024 20:03:50 +0100 Subject: [PATCH 3/3] fix import --- .../documents/documents/entity-actions/create/create.action.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts index 80173b16d3..259efa03cd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts @@ -1,5 +1,6 @@ import { UmbDocumentItemRepository } from '../../repository/index.js'; import { UMB_DOCUMENT_CREATE_OPTIONS_MODAL } from './document-create-options-modal.token.js'; +import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';