Merge branch 'main' into v15/fix/move-user-permission-settings-token

umbraco · Sep 24, 2024 · 2b8ac00 · 2b8ac00
2 parents 740f4d8 + d3f5126
commit 2b8ac00
Show file tree

Hide file tree

Showing 43 changed files with 58 additions and 6 deletions.
diff --git a/src/packages/core/entity-action/common/delete/delete.action.kind.ts b/src/packages/core/entity-action/common/delete/delete.action.kind.ts
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-trash',
 			label: '#actions_delete',
+			additionalOptions: true,
 			itemRepositoryAlias: '',
 			detailRepositoryAlias: '',
 		},

diff --git a/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts b/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-enter',
 			label: '#actions_copy',
+			additionalOptions: true,
 			treeRepositoryAlias: '',
 			duplicateRepositoryAlias: '',
 		},

diff --git a/src/packages/core/entity-action/default/entity-action.element.ts b/src/packages/core/entity-action/default/entity-action.element.ts
@@ -60,11 +60,11 @@ export class UmbEntityActionDefaultElement<
 	}
 
 	override render() {
+		const label = this.manifest?.meta.label ? this.localize.string(this.manifest.meta.label) : this.manifest?.name;
+
 		return html`
 			<uui-menu-item
-				label=${ifDefined(
-					this.manifest?.meta.label ? this.localize.string(this.manifest.meta.label) : this.manifest?.name,
-				)}
+				label=${ifDefined(this.manifest?.meta.additionalOptions ? label + '...' : label)}
 				href=${ifDefined(this._href)}
 				@click-label=${this.#onClickLabel}
 				@click=${this.#onClick}>

diff --git a/src/packages/core/extension-registry/models/entity-action.model.ts b/src/packages/core/extension-registry/models/entity-action.model.ts
@@ -40,6 +40,14 @@ export interface MetaEntityActionDefaultKind extends MetaEntityAction {
 	 * ]
 	 */
 	label: string;
+
+	/**
+	 * The action requires additional input from the user.
+	 * A dialog will prompt the user for more information or to make a choice.
+	 * @type {boolean}
+	 * @memberof MetaEntityActionDefaultKind
+	 */
+	additionalOptions?: boolean;
 }
 
 // DELETE

diff --git a/...ackages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.ts b/...ackages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.ts
@@ -15,7 +15,8 @@ export const manifest: UmbExtensionManifestKind = {
 		forEntityTypes: [],
 		meta: {
 			icon: 'icon-trash',
-			label: 'Empty Recycle Bin...',
+			label: 'Empty Recycle Bin',
+			additionalOptions: true,
 		},
 	},
 };
diff --git a/...ecycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.kind.ts b/...ecycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.kind.ts
@@ -15,8 +15,9 @@ export const manifest: UmbExtensionManifestKind = {
 		forEntityTypes: [],
 		meta: {
 			icon: 'icon-undo',
-			label: 'Restore...',
+			label: 'Restore',
 			pickerModal: '',
+			additionalOptions: true,
 		},
 	},
 };
diff --git a/src/packages/core/recycle-bin/entity-action/trash/trash.action.kind.ts b/src/packages/core/recycle-bin/entity-action/trash/trash.action.kind.ts
@@ -18,6 +18,7 @@ export const manifest: UmbExtensionManifestKind = {
 			label: '#actions_trash',
 			itemRepositoryAlias: '',
 			recycleBinRepositoryAlias: '',
+			additionalOptions: true,
 		},
 	},
 };
diff --git a/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts b/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-enter',
 			label: '#actions_copyTo',
+			additionalOptions: true,
 			treeRepositoryAlias: '',
 			duplicateRepositoryAlias: '',
 			treeAlias: '',

diff --git a/src/packages/core/tree/entity-actions/move/move-to.action.kind.ts b/src/packages/core/tree/entity-actions/move/move-to.action.kind.ts
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-enter',
 			label: '#actions_move',
+			additionalOptions: true,
 			treeRepositoryAlias: '',
 			moveRepositoryAlias: '',
 			treeAlias: '',

diff --git a/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts b/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts
@@ -16,6 +16,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-height',
 			label: '#actions_sort',
+			additionalOptions: true,
 			itemRepositoryAlias: '',
 			sortRepositoryAlias: '',
 		},

diff --git a/src/packages/core/tree/folder/entity-action/create-folder/create-folder.action.kind.ts b/src/packages/core/tree/folder/entity-action/create-folder/create-folder.action.kind.ts
@@ -17,6 +17,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_folderCreate',
+			additionalOptions: true,
 		},
 	},
 };
diff --git a/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.kind.ts b/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.kind.ts
@@ -17,6 +17,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-trash',
 			label: '#actions_folderDelete',
+			additionalOptions: true,
 		},
 	},
 };
diff --git a/src/packages/core/tree/folder/entity-action/update-folder/update-folder.action.kind.ts b/src/packages/core/tree/folder/entity-action/update-folder/update-folder.action.kind.ts
@@ -17,6 +17,7 @@ export const manifest: UmbExtensionManifestKind = {
 		meta: {
 			icon: 'icon-edit',
 			label: '#actions_folderRename',
+			additionalOptions: true,
 		},
 	},
 };
diff --git a/src/packages/data-type/entity-actions/create/manifests.ts b/src/packages/data-type/entity-actions/create/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/dictionary/entity-action/manifests.ts b/src/packages/dictionary/entity-action/manifests.ts
@@ -13,7 +13,8 @@ export const manifests: Array<UmbExtensionManifest> = [
 		forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE, UMB_DICTIONARY_ROOT_ENTITY_TYPE],
 		meta: {
 			icon: 'icon-add',
-			label: '#dictionary_createNew',
+			label: '#general_create',
+			additionalOptions: true,
 		},
 	},
 	{
@@ -27,6 +28,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-download-alt',
 			label: '#actions_export',
+			additionalOptions: true,
 		},
 	},
 	{
@@ -40,6 +42,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-page-up',
 			label: '#actions_import',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/documents/document-blueprints/entity-actions/create/manifests.ts b/src/packages/documents/document-blueprints/entity-actions/create/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_createblueprint',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/documents/document-types/entity-actions/create/manifests.ts b/src/packages/documents/document-types/entity-actions/create/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/documents/document-types/entity-actions/export/manifests.ts b/src/packages/documents/document-types/entity-actions/export/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-download-alt',
 			label: '#actions_export',
+			additionalOptions: true,
 		},
 	},
 	...repositoryManifests,

diff --git a/src/packages/documents/document-types/entity-actions/import/manifests.ts b/src/packages/documents/document-types/entity-actions/import/manifests.ts
@@ -13,6 +13,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-page-up',
 			label: '#actions_import',
+			additionalOptions: true,
 		},
 	},
 	...repositoryManifests,

diff --git a/src/packages/documents/document-types/entity-actions/manifests.ts b/src/packages/documents/document-types/entity-actions/manifests.ts
@@ -19,6 +19,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			itemRepositoryAlias: UMB_DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS,
 			detailRepositoryAlias: UMB_DOCUMENT_TYPE_DETAIL_REPOSITORY_ALIAS,
+			additionalOptions: true,
 		},
 	},
 	...createManifests,

diff --git a/src/packages/documents/documents/entity-actions/create-blueprint/manifests.ts b/src/packages/documents/documents/entity-actions/create-blueprint/manifests.ts
@@ -14,6 +14,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-blueprint',
 			label: '#actions_createblueprint',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/documents/documents/entity-actions/create/manifests.ts b/src/packages/documents/documents/entity-actions/create/manifests.ts
@@ -14,6 +14,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
@@ -14,6 +14,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-home',
 			label: '#actions_assigndomain',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/documents/documents/entity-actions/manifests.ts b/src/packages/documents/documents/entity-actions/manifests.ts
@@ -51,6 +51,7 @@ const entityActions: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-globe',
 			label: '#actions_publish',
+			additionalOptions: true,
 		},
 		conditions: [
 			{
@@ -73,6 +74,7 @@ const entityActions: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-globe',
 			label: '#actions_unpublish',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/documents/documents/entity-actions/notifications/manifests.ts b/src/packages/documents/documents/entity-actions/notifications/manifests.ts
@@ -17,6 +17,7 @@ const actionManifests: Array<ManifestEntityAction> = [
 		meta: {
 			icon: 'icon-megaphone',
 			label: '#actions_notify',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/documents/documents/entity-actions/public-access/manifests.ts b/src/packages/documents/documents/entity-actions/public-access/manifests.ts
@@ -14,6 +14,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-lock',
 			label: '#actions_protect',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/documents/documents/entity-actions/sort-children-of/manifests.ts b/src/packages/documents/documents/entity-actions/sort-children-of/manifests.ts
@@ -18,6 +18,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 			itemRepositoryAlias: UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS,
 			sortChildrenOfRepositoryAlias: UMB_SORT_CHILDREN_OF_DOCUMENT_REPOSITORY_ALIAS,
 			treeRepositoryAlias: UMB_DOCUMENT_TREE_REPOSITORY_ALIAS,
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/language/entity-actions/manifests.ts b/src/packages/language/entity-actions/manifests.ts
@@ -24,6 +24,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 ];
diff --git a/src/packages/media/media-types/entity-actions/create/manifests.ts b/src/packages/media/media-types/entity-actions/create/manifests.ts
@@ -16,6 +16,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/media/media-types/entity-actions/export/manifests.ts b/src/packages/media/media-types/entity-actions/export/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-download-alt',
 			label: '#actions_export',
+			additionalOptions: true,
 		},
 	},
 	...repositoryManifests,

diff --git a/src/packages/media/media-types/entity-actions/import/manifests.ts b/src/packages/media/media-types/entity-actions/import/manifests.ts
@@ -13,6 +13,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-page-up',
 			label: '#actions_import',
+			additionalOptions: true,
 		},
 	},
 	...repositoryManifests,

diff --git a/src/packages/media/media/entity-actions/create/manifests.ts b/src/packages/media/media/entity-actions/create/manifests.ts
@@ -13,6 +13,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/members/member-group/entity-actions/manifests.ts b/src/packages/members/member-group/entity-actions/manifests.ts
@@ -16,6 +16,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/members/member-type/entity-actions/manifests.ts b/src/packages/members/member-type/entity-actions/manifests.ts
@@ -16,6 +16,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/members/member/entity-actions/create/manifests.ts b/src/packages/members/member/entity-actions/create/manifests.ts
@@ -13,6 +13,7 @@ const entityActions: Array<ManifestTypes> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 ];

diff --git a/src/packages/templating/partial-views/entity-actions/create/manifests.ts b/src/packages/templating/partial-views/entity-actions/create/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/templating/scripts/entity-actions/create/manifests.ts b/src/packages/templating/scripts/entity-actions/create/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/templating/stylesheets/entity-actions/create/manifests.ts b/src/packages/templating/stylesheets/entity-actions/create/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/templating/templates/entity-actions/manifests.ts b/src/packages/templating/templates/entity-actions/manifests.ts
@@ -13,6 +13,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	{

diff --git a/src/packages/user/user/entity-actions/create/manifests.ts b/src/packages/user/user/entity-actions/create/manifests.ts
@@ -16,6 +16,7 @@ export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> =
 		meta: {
 			icon: 'icon-add',
 			label: '#actions_create',
+			additionalOptions: true,
 		},
 	},
 	...modalManifests,

diff --git a/src/packages/user/user/entity-actions/manifests.ts b/src/packages/user/user/entity-actions/manifests.ts
@@ -87,6 +87,7 @@ const entityActions: Array<ManifestEntityAction> = [
 		meta: {
 			icon: 'icon-settings',
 			label: '#user_configureMfa',
+			additionalOptions: true,
 		},
 		conditions: [
 			{

diff --git a/src/packages/user/user/invite/entity-action/invite/manifests.ts b/src/packages/user/user/invite/entity-action/invite/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-paper-plane',
 			label: '#user_invite',
+			additionalOptions: true,
 		},
 	},
 ];
diff --git a/src/packages/user/user/invite/entity-action/resend-invite/manifests.ts b/src/packages/user/user/invite/entity-action/resend-invite/manifests.ts
@@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [
 		meta: {
 			icon: 'icon-message',
 			label: '#actions_resendInvite',
+			additionalOptions: true,
 		},
 		conditions: [
 			{
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ export const manifests: Array<UmbExtensionManifest> = [ @@
     		meta: {
     			icon: 'icon-add',
     			label: '#actions_create',
+    			additionalOptions: true,
     		},
     	},
     	{
@@ Expand Down @@