@localazy/strapi-plugin 0.1.14 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localazy/strapi-plugin",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "The official Strapi Plugin by Localazy.",
   "strapi": {
     "name": "localazy",

package/server/controllers/localazy-transfer-controller.js

@@ -6,7 +6,7 @@ const {
   findSetupModelByCollectionName,
   findSetupModelByCollectionUid,
   isCollectionTransferEnabled,
-  getPickPaths,
+  getPickPathsWithComponents,
 } = require("../utils/transfer-setup-utils");
 const pickEntries = require("../utils/pick-entries");
 const config = require("../config").default;
@@ -113,7 +113,7 @@ module.exports = {
 
         // get only enabled fields paths
         const currentTransferSetupModel = transferSetupModel[collectionName];
-        const pickPaths = getPickPaths(currentTransferSetupModel);
+        const pickPaths = getPickPathsWithComponents(currentTransferSetupModel);
         if (!pickPaths.length) {
           const message = `No fields for collection ${collectionName} transfer are enabled.`;
           messageReport.push(message);
@@ -152,7 +152,7 @@ module.exports = {
             [modelUid]: entry,
           });
           // get only enabled fields; "__component" will be filtered out inside of the function
-          const pickedFlatten = pickEntries(flatten, pickPathsWithUid, currentTransferSetupModel);
+          const pickedFlatten = pickEntries(flatten, pickPathsWithUid);
 
           flattenContent = {
             ...flattenContent,

package/server/utils/__tests__/pick-entries.test.js

@@ -893,19 +893,19 @@ describe("pick entries test suite", () => {
       "api::lesson.lesson[1].start_time": "2022-09-28T09:00:00.000Z",
       "api::lesson.lesson[1].duration": "03:00:00.000",
       "api::lesson.lesson[1].description": "## Description\n\nIn this lesson, we'll learn about addition and what rules to follow...",
-      "api::lesson.lesson[1].lesson_type[1].__component": "lesson.lecture",
-      "api::lesson.lesson[1].lesson_type[1].content": "You need to follow these rules:\na) add one number to the other\nb) do not subtract nor multiply\nc) ...",
+      "api::lesson.lesson[1].lesson_type[1;lesson.lecture].__component": "lesson.lecture",
+      "api::lesson.lesson[1].lesson_type[1;lesson.lecture].content": "You need to follow these rules:\na) add one number to the other\nb) do not subtract nor multiply\nc) ...",
     };
 
     const pickPaths = [
       "api::lesson.lesson.title",
       "api::lesson.lesson.description",
-      "api::lesson.lesson.lesson_type[0].content",
-      "api::lesson.lesson.lesson_type[1].description",
-      "api::lesson.lesson.lesson_type[1].questions.question",
-      "api::lesson.lesson.lesson_type[2].title",
-      "api::lesson.lesson.lesson_type[2].questions.question",
-      "api::lesson.lesson.lesson_type[2].answers.correct_answer",
+      "api::lesson.lesson.lesson_type[lecture].content",
+      "api::lesson.lesson.lesson_type[survey].description",
+      "api::lesson.lesson.lesson_type[survey].questions.question",
+      "api::lesson.lesson.lesson_type[quiz].title",
+      "api::lesson.lesson.lesson_type[quiz].questions.question",
+      "api::lesson.lesson.lesson_type[quiz].answers.correct_answer",
       "api::lesson.lesson.id",
     ];
 

package/server/utils/flatten-object.js

@@ -22,8 +22,13 @@ const flattenObject = (object, prefix = "") => {
         const flattenedArray = object[objectKey].reduce(
           (accumulator, item, index) => {
             // No id should use the index of the array item
-            accumulator[`${objectKey}[${item.id || index}]`] =
-              flattenObject(item);
+            let key = `${objectKey}[${item.id || index}]`;
+            // is Dynamic Zone
+            if (item.id && item.__component) {
+              key = `${objectKey}[${item.id};${item.__component}]`;
+            }
+
+            accumulator[key] = flattenObject(item);
             return accumulator;
           },
           {}

package/server/utils/pick-entries.js

@@ -1,93 +1,12 @@
 "use strict";
 
-const map = require("lodash/map");
-const pickDeep = require("./pick-deep");
-const flattenObject = require("./flatten-object");
-
-const isDynamicZoneKey = (key, transferSetupModel) => {
-  const matches = key.match(/\[\d+\]+/g);
-
-  if (matches.length < 2) {
-    return false;
-  }
-
-  const dynamicPropertyEntryIdWithSquareBrackets = matches[1];
-  const dynamicPropertyNamePart = key
-    .split(".")
-    .find(
-      (s, index) =>
-        index > 1 && s.includes(dynamicPropertyEntryIdWithSquareBrackets)
-    );
-  const dynamicPropertyName = dynamicPropertyNamePart.replace(
-    dynamicPropertyEntryIdWithSquareBrackets,
-    ""
-  );
-
-  return Array.isArray(transferSetupModel[dynamicPropertyName]);
-};
-
-const getDynamicZoneEntryId = (key, transferSetupModel) => {
-  if (!isDynamicZoneKey(key, transferSetupModel)) {
-    return undefined;
-  }
-
-  const matches = key.match(/\[\d+\]+/g);
-  // remove square brackets
-  const id = matches[1].replace(/[\[\]']+/g, "");
-  return id;
-};
-
-const getUniqueDynamicZoneEntryId = (key, transferSetupModel) => {
-  if (!isDynamicZoneKey(key, transferSetupModel)) {
-    return undefined;
-  }
-
-  const keySplittedByDot = key.split(".");
-
-  return keySplittedByDot[2];
-};
-
-const doesPickPathsIncludeTheComponent = (pickPaths, dzParameterKey) => {
-  return pickPaths.some((pp) => pp.includes(dzParameterKey));
+const isDynamicZoneKey = (key) => {
+  const matches = key.match(/\[\d+;\w+\./g);
+  return matches !== null;
 };
 
-const pickEntries = (flatten, pickPaths, transferSetupModel) => {
-  // * dynamic zones properties must! always be in 1st level (not in component; Strapi restrictions)
-
-  const dzEntryIdComponentMap = {};
-  const flattenComponentProps = Object.fromEntries(
-    Object.entries(flatten).filter(([key]) => key.includes("__component"))
-  );
-
-  const pickedDeep = pickDeep(transferSetupModel, ["__component__"]);
-  const flattenedPickedDeep = flattenObject(pickedDeep);
-  map(flattenedPickedDeep, (v, i) => {
-    const newI = i.replace(".__component__", "");
-    flattenedPickedDeep[newI] = v;
-    delete flattenedPickedDeep[i];
-  });
-
-  Object.keys(flattenComponentProps).map((key) => {
-    if (!isDynamicZoneKey(key, transferSetupModel)) {
-      return;
-    }
-
-    const keySplittedByDot = key.replace(".__component", "").split(".");
-    const componentName = keySplittedByDot[keySplittedByDot.length - 1].replace(
-      /\[.*\]/g,
-      ""
-    );
-    const uniqueEntryId = getUniqueDynamicZoneEntryId(key, transferSetupModel);
-
-    const keyOfEntry = Object.keys(flattenedPickedDeep)
-      .filter((fpdk) => fpdk.replace(/\[.*\]/g, "") == componentName)
-      .find((fpdk) => flattenedPickedDeep[fpdk] === flattenComponentProps[key]);
-    dzEntryIdComponentMap[uniqueEntryId] = {
-      component: flattenComponentProps[key],
-      key: keyOfEntry,
-    };
-  });
-
+const pickEntries = (flatten, pickPaths) => {
+  // * Dynamic zones properties must! always be in 1st level (not in component; Strapi restrictions)
   const pickedEntries = {};
   const mappedPickPaths = pickPaths.map((pickPath) =>
     pickPath.replace(/\[\d+\]/g, "")
@@ -98,44 +17,13 @@ const pickEntries = (flatten, pickPaths, transferSetupModel) => {
     Object.entries(flatten).filter(([key]) => !key.includes("__component"))
   );
   Object.keys(filteredFlatten).forEach((key) => {
-    // decide whether it is a dynamic zone
-    // handle dynamic zones, in case of similarly-named fields across more components
-    const isDynamicZone = isDynamicZoneKey(key, transferSetupModel);
-    if (isDynamicZone) {
-      const uniqueDzEntryId = getUniqueDynamicZoneEntryId(
-        key,
-        transferSetupModel
-      );
-      const dzParameterKey = dzEntryIdComponentMap[uniqueDzEntryId].key;
-
-      if (!doesPickPathsIncludeTheComponent(pickPaths, dzParameterKey)) {
-        return;
-      }
+    let filteredKey = key;
+    filteredKey = filteredKey.replace(/\[\d+\]/g, "");
+    if (isDynamicZoneKey(key)) {
+      filteredKey = filteredKey.replace(/\[\d+;\w+\./g, `[`);
     }
-
-    const filteredKey = key.replace(/\[\d+\]/g, "");
     if (mappedPickPaths.includes(filteredKey)) {
-      if (isDynamicZone) {
-        const dzEntryId = getDynamicZoneEntryId(key, transferSetupModel);
-        const uniqueDzEntryId = getUniqueDynamicZoneEntryId(
-          key,
-          transferSetupModel
-        );
-        const dzParameterKey = dzEntryIdComponentMap[uniqueDzEntryId].key;
-
-        const dzParameterName = dzParameterKey.substring(
-          0,
-          dzParameterKey.indexOf("[")
-        );
-        const toBeReplaced = `${dzParameterName}[${dzEntryId}]`;
-        const dzParameterComponent =
-          dzEntryIdComponentMap[uniqueDzEntryId].component;
-        const componentAddition = `${dzParameterName}[${dzEntryId};${dzParameterComponent}]`;
-        const replacedKey = key.replace(toBeReplaced, componentAddition);
-        pickedEntries[replacedKey] = flatten[key];
-      } else {
-        pickedEntries[key] = flatten[key];
-      }
+      pickedEntries[key] = flatten[key];
     }
   });
   return pickedEntries;

package/server/utils/transfer-setup-utils.js

@@ -49,10 +49,44 @@ const getPickPaths = (transferSetupModelProps) => {
   return pickPaths;
 };
 
+const getPickPathsWithComponents = (transferSetupModelProps) => {
+  const flattenedObject = flattenObject(transferSetupModelProps);
+  let pickComponents = {};
+  Object.keys(flattenedObject).forEach((key) => {
+    if (key.includes(".__component__")) {
+      const componentKey = key.split(".__component__")[0];
+      if (!pickComponents[componentKey]) {
+        const splitByDot = flattenedObject[key].split(".");
+        pickComponents[key.split(".__component__")[0]] = `${splitByDot[0]}[${splitByDot[1]}]`;
+      }
+    }
+  });
+  const pickPaths = Object.keys(flattenedObject)
+    .filter(
+      (key) => flattenedObject[key] === true && key.indexOf("__model__") === -1
+    );
+
+  // id needs to be always included
+  pickPaths.push("id");
+
+  let pickPathsWithComponents = [];
+  Object.entries(pickPaths).forEach(([, value]) => {
+    const componentKey = value.split(".")[0];
+    let pushValue = value;
+    if (pickComponents[componentKey]) {
+      pushValue = value.replace(componentKey, pickComponents[componentKey]);
+    }
+    pickPathsWithComponents.push(pushValue);
+  });
+
+  return pickPathsWithComponents;
+};
+
 module.exports = {
   findSetupModelByCollectionName,
   findSetupModelByCollectionUid,
   getCollectionsNames,
   isCollectionTransferEnabled,
   getPickPaths,
+  getPickPathsWithComponents,
 };