Skip to content

Commit d3f5126

Browse files
authored
Merge pull request #2323 from umbraco/v15/feature/entity-actions-additional-options
Feature: Entity Actions additional options
2 parents 5dd284d + 7c07064 commit d3f5126

File tree

43 files changed

+58
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+58
-6
lines changed

src/packages/core/entity-action/common/delete/delete.action.kind.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
1616
meta: {
1717
icon: 'icon-trash',
1818
label: '#actions_delete',
19+
additionalOptions: true,
1920
itemRepositoryAlias: '',
2021
detailRepositoryAlias: '',
2122
},

src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
1616
meta: {
1717
icon: 'icon-enter',
1818
label: '#actions_copy',
19+
additionalOptions: true,
1920
treeRepositoryAlias: '',
2021
duplicateRepositoryAlias: '',
2122
},

src/packages/core/entity-action/default/entity-action.element.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ export class UmbEntityActionDefaultElement<
6060
}
6161

6262
override render() {
63+
const label = this.manifest?.meta.label ? this.localize.string(this.manifest.meta.label) : this.manifest?.name;
64+
6365
return html`
6466
<uui-menu-item
65-
label=${ifDefined(
66-
this.manifest?.meta.label ? this.localize.string(this.manifest.meta.label) : this.manifest?.name,
67-
)}
67+
label=${ifDefined(this.manifest?.meta.additionalOptions ? label + '...' : label)}
6868
href=${ifDefined(this._href)}
6969
@click-label=${this.#onClickLabel}
7070
@click=${this.#onClick}>

src/packages/core/extension-registry/models/entity-action.model.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ export interface MetaEntityActionDefaultKind extends MetaEntityAction {
4040
* ]
4141
*/
4242
label: string;
43+
44+
/**
45+
* The action requires additional input from the user.
46+
* A dialog will prompt the user for more information or to make a choice.
47+
* @type {boolean}
48+
* @memberof MetaEntityActionDefaultKind
49+
*/
50+
additionalOptions?: boolean;
4351
}
4452

4553
// DELETE

src/packages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ export const manifest: UmbExtensionManifestKind = {
1515
forEntityTypes: [],
1616
meta: {
1717
icon: 'icon-trash',
18-
label: 'Empty Recycle Bin...',
18+
label: 'Empty Recycle Bin',
19+
additionalOptions: true,
1920
},
2021
},
2122
};

src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.kind.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ export const manifest: UmbExtensionManifestKind = {
1515
forEntityTypes: [],
1616
meta: {
1717
icon: 'icon-undo',
18-
label: 'Restore...',
18+
label: 'Restore',
1919
pickerModal: '',
20+
additionalOptions: true,
2021
},
2122
},
2223
};

src/packages/core/recycle-bin/entity-action/trash/trash.action.kind.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export const manifest: UmbExtensionManifestKind = {
1818
label: '#actions_trash',
1919
itemRepositoryAlias: '',
2020
recycleBinRepositoryAlias: '',
21+
additionalOptions: true,
2122
},
2223
},
2324
};

src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
1616
meta: {
1717
icon: 'icon-enter',
1818
label: '#actions_copyTo',
19+
additionalOptions: true,
1920
treeRepositoryAlias: '',
2021
duplicateRepositoryAlias: '',
2122
treeAlias: '',

src/packages/core/tree/entity-actions/move/move-to.action.kind.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
1616
meta: {
1717
icon: 'icon-enter',
1818
label: '#actions_move',
19+
additionalOptions: true,
1920
treeRepositoryAlias: '',
2021
moveRepositoryAlias: '',
2122
treeAlias: '',

src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
1616
meta: {
1717
icon: 'icon-height',
1818
label: '#actions_sort',
19+
additionalOptions: true,
1920
itemRepositoryAlias: '',
2021
sortRepositoryAlias: '',
2122
},

0 commit comments

Comments
 (0)