QA-15315 Backport from jcontent, clearing multiple localized props

Jahia · Jan 13, 2025 · c2eca7f · c2eca7f
1 parent 0fa70dd
commit c2eca7f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
         <yarn.arguments>build:production</yarn.arguments>
         <require-capability>osgi.extender;filter:="(osgi.extender=org.jahia.bundles.blueprint.extender.config)"</require-capability>
 	<jahia-module-signature>MC0CFQCB6Tj/KAJ69o/12IxKX1yVVKkChwIUK3E0DtOtg4CPyj37SoctBH0yMFI=</jahia-module-signature>
-        <jahia-depends>app-shell=2.7,graphql-dxm-provider=2.19.1,jcontent=2.9</jahia-depends>
+        <jahia-depends>app-shell=2.7,graphql-dxm-provider=2.22.0,jcontent=2.9</jahia-depends>
         <jahia.plugin.version>6.9</jahia.plugin.version>
         <import-package>
             com.fasterxml.jackson.annotation;version="[2.10,3)",

diff --git a/src/javascript/ContentEditor/updateNode/updateNode.gql-mutation.js b/src/javascript/ContentEditor/updateNode/updateNode.gql-mutation.js
@@ -5,10 +5,9 @@ export const SavePropertiesMutation = gql`
     mutation saveNodeProperties(
         $uuid:String!,
         $propertiesToSave: [InputJCRProperty],
-        $propertiesToDelete: [String],
+        $propertiesToDelete: [InputJCRDeletedProperty],
         $mixinsToAdd: [String]!,
         $mixinsToDelete: [String]!,
-        $language: String,
         $shouldModifyChildren: Boolean!,
         $childrenOrder: [String]!,
         $shouldRename: Boolean!,
@@ -27,9 +26,7 @@ export const SavePropertiesMutation = gql`
                 setPropertiesBatch(properties: $propertiesToSave) {
                     path
                 }
-                mutateProperties(names: $propertiesToDelete) {
-                    delete(language: $language)
-                }
+                deletePropertiesBatch(properties: $propertiesToDelete)
                 reorderChildren(names: $childrenOrder) @include(if: $shouldModifyChildren)
                 node {
                     ...NodeCacheRequiredFields

diff --git a/src/javascript/utils/fields.utils.js b/src/javascript/utils/fields.utils.js
@@ -100,7 +100,10 @@ function updateValue({field, value, lang, nodeData, sections, mixinsToMutate, pr
                 (fieldSetName &&
                     !mixinsToMutate.mixinsToDelete.includes(fieldSetName) &&
                     (hasNodeMixin(nodeData, fieldSetName) || mixinsToMutate.mixinsToAdd.includes(fieldSetName)))) {
-                propsToDelete.push(field.propertyName);
+                propsToDelete.push({
+                    name: field.propertyName,
+                    language: lang
+                });
             }
         }
     }

diff --git a/src/javascript/utils/fields.utils.spec.js b/src/javascript/utils/fields.utils.spec.js
@@ -281,7 +281,10 @@ describe('EditPanel utils', () => {
             formValues: {
                 [sections[0].fieldSets[2].name + '_prop']: ''
             },
-            ExpectedPropsToDelete: ['prop'],
+            ExpectedPropsToDelete: [{
+                language: 'fr',
+                name: 'prop'
+            }],
             expectedPropsFieldMapping: {
                 prop: sections[0].fieldSets[2].name + '_prop'
             }
@@ -299,7 +302,10 @@ describe('EditPanel utils', () => {
             formValues: {
                 [sections[0].fieldSets[2].name + '_prop']: null
             },
-            ExpectedPropsToDelete: ['prop'],
+            ExpectedPropsToDelete: [{
+                language: 'fr',
+                name: 'prop'
+            }],
             expectedPropsFieldMapping: {
                 prop: sections[0].fieldSets[2].name + '_prop'
             }
@@ -317,7 +323,10 @@ describe('EditPanel utils', () => {
             formValues: {
                 [sections[0].fieldSets[2].name + '_prop']: undefined
             },
-            ExpectedPropsToDelete: ['prop'],
+            ExpectedPropsToDelete: [{
+                language: 'fr',
+                name: 'prop'
+            }],
             expectedPropsFieldMapping: {
                 prop: sections[0].fieldSets[2].name + '_prop'
             }