Renamed "workspace-action-default-kind.element.ts"

to a more suitable filename.

Exported element so can be reused in other packages,
e.g. documents, for the new "save and preview" feature.

Author: leekelleher

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/index.ts

@@ -0,0 +1 @@
+export * from './workspace-action-menu-item.element.js';

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/workspace-action-menu-item.element.ts

@@ -3,8 +3,8 @@ import type {
 	ManifestWorkspaceActionMenuItemDefaultKind,
 	MetaWorkspaceActionMenuItemDefaultKind,
 } from '../../../extensions/types.js';
+import { customElement, html, ifDefined, property, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
-import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UUIMenuItemEvent } from '@umbraco-cms/backoffice/external/uui';
 
@@ -48,15 +48,11 @@ export class UmbWorkspaceActionMenuItemElement<
 	override render() {
 		return html`
 			<uui-menu-item
-				label=${ifDefined(
-					this.manifest?.meta.label ? this.localize.string(this.manifest.meta.label) : this.manifest?.name,
-				)}
+				label=${ifDefined(this.localize.string(this.manifest?.meta.label ?? this.manifest?.name))}
 				href=${ifDefined(this._href)}
-				@click-label=${this.#onClickLabel}
-				@click=${this.#onClick}>
-				${this.manifest?.meta.icon
-					? html`<umb-icon slot="icon" name="${this.manifest?.meta.icon}"></umb-icon>`
-					: nothing}
+				@click=${this.#onClick}
+				@click-label=${this.#onClickLabel}>
+				${when(this.manifest?.meta.icon, (icon) => html`<umb-icon slot="icon" name=${icon}></umb-icon>`)}
 			</uui-menu-item>
 		`;
 	}

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/index.ts

@@ -1 +1,2 @@
+export * from './default/index.js';
 export * from './workspace-action-menu-item-base.controller.js';

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts

@@ -29,7 +29,8 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
 	override render() {
 		if (!this.items?.length) return nothing;
 
-		return html`<uui-button
+		return html`
+			<uui-button
 				id="popover-trigger"
 				popovertarget="workspace-action-popover"
 				look="${this.look}"
@@ -52,7 +53,8 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
 						)}
 					</uui-scroll-container>
 				</umb-popover-layout>
-			</uui-popover-container>`;
+			</uui-popover-container>
+		`;
 	}
 
 	static override styles = [

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/index.ts

@@ -0,0 +1 @@
+export * from './workspace-action.element.js';

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/manifests.ts

@@ -9,7 +9,7 @@ export const manifest: UmbExtensionManifestKind = {
 		type: 'workspaceAction',
 		kind: 'default',
 		weight: 1000,
-		element: () => import('./workspace-action-default-kind.element.js'),
+		element: () => import('./workspace-action.element.js'),
 		meta: {
 			label: '(Missing label in manifest)',
 		},

…workspace-action-default-kind.element.ts …tion/default/workspace-action.element.tssrc/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action-default-kind.element.ts renamed to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action.element.ts src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action-default-kind.element.ts renamed to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/workspace-action.element.ts

@@ -4,18 +4,14 @@ import type {
 	MetaWorkspaceActionDefaultKind,
 	UmbWorkspaceActionDefaultKind,
 } from '../../../types.js';
+import { customElement, html, property, state, when } from '@umbraco-cms/backoffice/external/lit';
+import { stringOrStringArrayIntersects } from '@umbraco-cms/backoffice/utils';
 import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
-import { html, customElement, property, state, when } from '@umbraco-cms/backoffice/external/lit';
-import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
-import {
-	type UmbExtensionElementAndApiInitializer,
-	UmbExtensionsElementAndApiInitializer,
-} from '@umbraco-cms/backoffice/extension-api';
-import { stringOrStringArrayIntersects } from '@umbraco-cms/backoffice/utils';
-
-import '../../workspace-action-menu/index.js';
+import { UmbExtensionsElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UmbExtensionElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api';
+import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-workspace-action')
 export class UmbWorkspaceActionElement<
@@ -167,7 +163,7 @@ export class UmbWorkspaceActionElement<
 			this,
 			umbExtensionsRegistry,
 			'workspaceActionMenuItem',
-			ExtensionApiArgsMethod,
+			(manifest) => [{ meta: manifest.meta }],
 			(action) => stringOrStringArrayIntersects(action.forWorkspaceActions, aliases),
 			(extensionControllers) => {
 				this._items = extensionControllers;
@@ -183,11 +179,11 @@ export class UmbWorkspaceActionElement<
 		return html`
 			<uui-button
 				data-mark="workspace-action:${this.#manifest?.alias}"
-				.href=${this._href}
-				look=${this.#manifest?.meta.look ?? 'default'}
 				color=${this.#manifest?.meta.color ?? 'default'}
+				look=${this.#manifest?.meta.look ?? 'default'}
 				label=${this._additionalOptions ? label + '…' : label}
 				.disabled=${this._isDisabled}
+				.href=${this._href}
 				.state=${this._buttonState}
 				@click=${this.#onClick}></uui-button>
 		`;
@@ -196,16 +192,16 @@ export class UmbWorkspaceActionElement<
 	#renderActionMenu() {
 		return html`
 			<umb-workspace-action-menu
-				.items=${this._items}
-				color="${this.#manifest?.meta.color ?? 'default'}"
-				look="${this.#manifest?.meta.look ?? 'default'}"></umb-workspace-action-menu>
+				color=${this.#manifest?.meta.color ?? 'default'}
+				look=${this.#manifest?.meta.look ?? 'default'}
+				.items=${this._items}></umb-workspace-action-menu>
 		`;
 	}
 
 	override render() {
 		return when(
 			this._items.length,
-			() => html` <uui-button-group> ${this.#renderButton()} ${this.#renderActionMenu()} </uui-button-group> `,
+			() => html`<uui-button-group>${this.#renderButton()}${this.#renderActionMenu()}</uui-button-group>`,
 			() => this.#renderButton(),
 		);
 	}
@@ -223,12 +219,3 @@ declare global {
 		'umb-workspace-action': UmbWorkspaceActionElement;
 	}
 }
-
-/**
- *
- * @param manifest
- * @returns An array of arguments to pass to the extension API initializer.
- */
-function ExtensionApiArgsMethod(manifest: ManifestWorkspaceActionMenuItem) {
-	return [{ meta: manifest.meta }];
-}

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/index.ts

@@ -1,2 +1,3 @@
 export * from './common/index.js';
+export * from './default/index.js';
 export * from './workspace-action-base.controller.js';