From f1c35da25e1e076c142bfd435398e4cae47bab07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 4 Aug 2023 10:10:08 +0200
Subject: [PATCH] fix workspace entity actions dropdown

---
 .../core/entity-action/entity-action-list.element.ts   |  2 +-
 .../workspace-action-menu.element.ts                   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts
index 7d81034192..1e5f7753b4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts
@@ -5,7 +5,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 @customElement('umb-entity-action-list')
 export class UmbEntityActionListElement extends UmbLitElement {
 	@property({ type: String, attribute: 'entity-type' })
-	private _entityType: string = '';
 	public get entityType(): string {
 		return this._entityType;
 	}
@@ -16,6 +15,7 @@ export class UmbEntityActionListElement extends UmbLitElement {
 		this._filter = (extension: ManifestEntityAction) => extension.meta.entityTypes.includes(this.entityType);
 		this.requestUpdate('_filter', oldValue);
 	}
+	private _entityType: string = '';
 
 	@state()
 	_filter?: (extension: ManifestEntityAction) => boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts
index 949ddec975..26189040c1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts
@@ -49,15 +49,17 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
 	}
 
 	#renderActionsMenu() {
-		return this._entityId
+		return this._entityId && this._entityType
 			? html`
 			<uui-popover  id="action-menu-popover" .open=${this._actionMenuIsOpen} @close=${this.#close}>
 				<uui-button slot="trigger" label="Actions" @click=${this.#open}></uui-button>
 				<div id="action-menu-dropdown" slot="popover">
 					<uui-scroll-container>
-						<umb-entity-action-list @executed=${this.#onActionExecuted} entity-type=${this._entityType as string} unique=${
-					this._entityId
-			  }></umb-entity-action-list>
+						<umb-entity-action-list
+							@executed=${this.#onActionExecuted}
+							.entityType=${this._entityType}
+							.unique=${this._entityId}>
+						</umb-entity-action-list>
 					</uui-scroll-container>
 				</div>
 			</uui-popover>