From 7934b5d1376a426c88ee0c9fab89450a3026b772 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 20:51:45 +0100 Subject: [PATCH 1/4] more entity types --- .../tree/reload-tree-item-children/manifests.ts | 4 ++-- .../tree/reload-tree-item-children/manifests.ts | 4 ++-- .../scripts/entity-actions/create/create.action.ts | 14 ++++++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts index 53f82e24b0..731b2d8294 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts @@ -1,7 +1,7 @@ import { UMB_DICTIONARY_ROOT_ENTITY_TYPE, UMB_DICTIONARY_ENTITY_TYPE } from '../../entity.js'; -import type { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'entityAction', alias: 'Umb.EntityAction.Dictionary.Tree.ReloadChildrenOf', diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/reload-tree-item-children/manifests.ts index c16373a196..9133dbbe47 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/reload-tree-item-children/manifests.ts @@ -3,9 +3,9 @@ import { UMB_PARTIAL_VIEW_ENTITY_TYPE, UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE, } from '../../entity.js'; -import type { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'entityAction', alias: 'Umb.EntityAction.PartialView.Tree.ReloadChildrenOf', diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts index 507de94bd1..e981b5c35b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts @@ -1,21 +1,27 @@ import { UMB_SCRIPT_CREATE_OPTIONS_MODAL } from './options-modal/index.js'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; export class UmbScriptCreateOptionsEntityAction extends UmbEntityActionBase { - async execute() { - if (!this.repository) throw new Error('Repository is not available'); + constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { + super(host, args); + } + async execute() { const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); const modalContext = modalManager.open(this, UMB_SCRIPT_CREATE_OPTIONS_MODAL, { data: { parent: { - entityType: this.entityType, - unique: this.unique, + entityType: this.args.entityType, + unique: this.args.unique, }, }, }); await modalContext.onSubmit(); } + + destroy(): void {} } From c1895477df300121073e397fbd254393bc32b079 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 20:53:03 +0100 Subject: [PATCH 2/4] import interface --- .../src/libs/controller-api/controller-host-element.mixin.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-element.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-element.mixin.ts index a34b4fb2f2..9e32ebefc1 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-element.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-element.mixin.ts @@ -2,6 +2,7 @@ import type { UmbControllerAlias } from './controller-alias.type.js'; import { UmbControllerHostMixin } from './controller-host.mixin.js'; import type { UmbControllerHostElement } from './controller-host-element.interface.js'; import type { UmbController } from './controller.interface.js'; +import type { UmbControllerHost } from './controller-host.interface.js'; import type { HTMLElementConstructor } from '@umbraco-cms/backoffice/extension-api'; export declare class UmbControllerHostImplementationElement extends HTMLElement implements UmbControllerHostElement { From ad8a6dabdd8264cb90cf53ad20b3a88ee0d37bd1 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 20:53:50 +0100 Subject: [PATCH 3/4] fix import --- .../src/libs/controller-api/controller-host-provider.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts index aff423d648..c236602074 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts @@ -1,6 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; import { UmbControllerHostProviderElement } from './controller-host-provider.element.js'; -import type { UmbControllerHostElement } from './controller-host-element.mixin.js'; import { UmbControllerHostElementMixin } from './controller-host-element.mixin.js'; import { customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbContextConsumerController, UmbContextProviderController } from '@umbraco-cms/backoffice/context-api'; From d729083cc48b6b0512bd335ad5bebb65691a2fa2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 21:00:05 +0100 Subject: [PATCH 4/4] fix imports --- .../src/libs/controller-api/controller-host-provider.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts index c236602074..451f9e1bf7 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host-provider.test.ts @@ -1,6 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; import { UmbControllerHostProviderElement } from './controller-host-provider.element.js'; import { UmbControllerHostElementMixin } from './controller-host-element.mixin.js'; +import type { UmbControllerHostElement } from './controller-host-element.interface.js'; import { customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbContextConsumerController, UmbContextProviderController } from '@umbraco-cms/backoffice/context-api';