Merge pull request #531 from breezertwo/fix/batch-translate

Author: sargreal

plugin/admin/src/utils/mutateCTBContentTypeSchema.ts

@@ -6,43 +6,34 @@ const localizedPath = ['pluginOptions', 'i18n', 'localized']
 const translatePath = ['pluginOptions', 'translate', 'translate']
 
 const addTranslationToFields = (attributes: Schema.ContentType['attributes']) =>
-  Object.keys(attributes).reduce<Schema.ContentType['attributes']>(
-    (acc, current) => {
-      const currentAttribute = attributes[current]
-
-      const attributeIsLocalized = get(currentAttribute, localizedPath, true)
-
-      const attributeDefaultTranslated =
-        currentAttribute.type === 'relation' || attributeIsLocalized
-
-      if (
-        attributeDefaultTranslated &&
-        TRANSLATABLE_FIELDS.includes(currentAttribute.type)
-      ) {
-        const translate = {
-          translate: get(
-            currentAttribute,
-            translatePath,
-            attributeDefaultTranslated ? 'translate' : 'copy'
-          ),
-        }
-
-        const pluginOptions = {
-          ...(currentAttribute.pluginOptions ?? {}),
-          translate,
-        }
-
-        acc[current] = { ...currentAttribute, pluginOptions }
-
-        return acc
+  Object.values(attributes).map((currentAttribute) => {
+    const attributeIsLocalized = get(currentAttribute, localizedPath, true)
+
+    const attributeDefaultTranslated =
+      currentAttribute.type === 'relation' || attributeIsLocalized
+
+    if (
+      attributeDefaultTranslated &&
+      TRANSLATABLE_FIELDS.includes(currentAttribute.type)
+    ) {
+      const translate = {
+        translate: get(
+          currentAttribute,
+          translatePath,
+          attributeDefaultTranslated ? 'translate' : 'copy'
+        ),
       }
 
-      acc[current] = currentAttribute
+      const pluginOptions = {
+        ...(currentAttribute.pluginOptions ?? {}),
+        translate,
+      }
+
+      return { ...currentAttribute, pluginOptions }
+    }
 
-      return acc
-    },
-    {}
-  )
+    return currentAttribute
+  })
 
 type OmitByPath<T extends object, K extends string[]> = Pick<
   T,

plugin/server/src/utils/clean-data.ts

@@ -82,7 +82,13 @@ export function cleanData<
         resultData[attr] = mediaFiles.id
       }
     }
+
+    // Remove attribute if it's an empty array
+    if (Array.isArray(resultData[attr]) && resultData[attr].length === 0) {
+      delete resultData[attr]
+    }
   })
+
   return resultData as unknown as Utils.If<
     ForFrontend,
     Modules.Documents.Document<TSchemaUID>,