From 5cee10258e1f4e852e4aa18f4ebb6a2a8274890d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 May 2024 07:17:47 +0200 Subject: [PATCH] add conditions to all entity actions --- .../entity-actions/create-blueprint/manifests.ts | 3 +++ .../documents/entity-actions/create/manifests.ts | 2 +- .../culture-and-hostnames/manifests.ts | 3 +++ .../documents/entity-actions/duplicate/manifests.ts | 3 +++ .../documents/documents/entity-actions/manifests.ts | 12 ++++++++++++ .../documents/entity-actions/move-to/manifests.ts | 3 +++ .../entity-actions/public-access/manifests.ts | 3 +++ .../entity-actions/sort-children-of/manifests.ts | 3 +++ .../documents/recycle-bin/entity-action/manifests.ts | 10 ++++++++++ 9 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/manifests.ts index cd349f9e66..e553d3be3f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint/manifests.ts @@ -20,6 +20,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_CREATE_BLUEPRINT], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts index 873c1e202f..ad6e8c192e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts @@ -21,7 +21,7 @@ const entityActions: Array = [ allOf: [UMB_USER_PERMISSION_DOCUMENT_CREATE], }, { - alias: 'Umb.Condition.IsTrashed', + alias: 'Umb.Condition.IsNotTrashed', }, ], }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts index 29c31b81ec..9ff57ea5b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts @@ -21,6 +21,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_CULTURE_AND_HOSTNAMES], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/manifests.ts index 24411dd39d..dfdb38c680 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/manifests.ts @@ -17,6 +17,9 @@ export const manifests: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_DUPLICATE], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, ...repositoryManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts index b391ce0e7a..ed71154ce8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts @@ -55,6 +55,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_PUBLISH], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, { @@ -74,6 +77,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_UNPUBLISH], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, { @@ -93,6 +99,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_PERMISSIONS], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, { @@ -112,6 +121,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_NOTIFICATIONS], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts index dd539de2e2..5bdd6ffe31 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts @@ -22,6 +22,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_MOVE], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts index 1ab9fb6d64..be5f75f29b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts @@ -21,6 +21,9 @@ const entityActions: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_PUBLIC_ACCESS], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/manifests.ts index 0476d0180a..a1901fca46 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/manifests.ts @@ -24,6 +24,9 @@ export const manifests: Array = [ alias: 'Umb.Condition.UserPermission.Document', allOf: [UMB_USER_PERMISSION_DOCUMENT_SORT], }, + { + alias: 'Umb.Condition.IsNotTrashed', + }, ], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts index 0ac0cd09be..e7398670be 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts @@ -16,6 +16,11 @@ export const manifests: Array = [ itemRepositoryAlias: UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS, recycleBinRepositoryAlias: UMB_DOCUMENT_RECYCLE_BIN_REPOSITORY_ALIAS, }, + conditions: [ + { + alias: 'Umb.Condition.IsNotTrashed', + }, + ], }, { type: 'entityAction', @@ -28,6 +33,11 @@ export const manifests: Array = [ recycleBinRepositoryAlias: UMB_DOCUMENT_RECYCLE_BIN_REPOSITORY_ALIAS, pickerModal: UMB_DOCUMENT_PICKER_MODAL, }, + conditions: [ + { + alias: 'Umb.Condition.IsTrashed', + }, + ], }, { type: 'entityAction',