nox-validation 1.6.3 → 1.6.5

package/lib/helpers.js

@@ -1475,6 +1475,10 @@ const getSelectedNodes = ({
         currentNode.key,
         currentNode?.meta?.staticType
       );
+      currentNode.value = addIndexToStaticType(
+        currentNode.value,
+        currentNode?.meta?.staticType
+      );
     }
 
     if (parentKey)

package/lib/validate.js

@@ -278,7 +278,8 @@ const validateMetaRules = (
   formData,
   language_codes = [],
   existingForm = {},
-  getNodes = true
+  getNodes = true,
+  translatedPath = null
 ) => {
   const fieldValue = providedValue;
 
@@ -393,12 +394,20 @@ const validateMetaRules = (
         );
     addError(
       currentPath,
-      {
-        label: formatLabel(field.display_label),
-        fieldPath: currentPath,
-        description: "",
-        message,
-      },
+      translatedPath
+        ? {
+            label: formatLabel(field.display_label),
+            fieldPath: currentPath,
+            description: "",
+            translation_path: translatedPath,
+            message,
+          }
+        : {
+            label: formatLabel(field.display_label),
+            fieldPath: currentPath,
+            description: "",
+            message,
+          },
       field
     );
   }
@@ -464,7 +473,6 @@ const validateMetaRules = (
           field?.meta?.interface === constants.interfaces.TRANSLATIONS;
         let fPath = node.key?.replace("[0][0]", "[0]");
         const types = ["update", "delete", "existing", "create"];
-
         const extractFirstType = (key) => {
           const regex = new RegExp(`(${types.join("|")})\\[`, "i");
           const match = key.match(regex);
@@ -505,34 +513,50 @@ const validateMetaRules = (
           isTranslationNode &&
           Array.isArray(language_codes) &&
           language_codes.length > 1;
-
         if (isMultiLang) {
           language_codes.forEach((lang, index) => {
-            let langPath,
-              transformedPath,
-              isAdded = false;
+            let langPath, transformedPath;
+            let isAdded = false;
+
+            // Check if current language entry exists in fieldValue.create
+            if (
+              Array.isArray(fieldValue?.create) &&
+              fieldValue?.create.some((item, idx) => {
+                // Check by languages_code or by index match
+                return item.languages_code === lang || idx === index;
+              })
+            ) {
+              isAdded = true;
+            }
 
-            if (node?.value?.includes("create[0].")) {
-              const exist = fieldValue?.create?.find(
-                (item) => item.languages_code === lang
-              );
-              if (exist) isAdded = true;
+            if (
+              node?.value?.includes("create[0].") ||
+              node?.value?.includes("create[0]")
+            ) {
               langPath = rebuildFullPath(node.value, node.key, (path) =>
-                path.replace("create[0].", `create[${index}].`)
+                path.replace(/create\[0\]\./, `create[${index}].`)
               );
-              transformedPath = rebuildFullPath(node.value, node.key, (path) =>
-                path.replace("create[0].", `${lang}.`)
+              transformedPath = rebuildFullPath(
+                node.value,
+                node.key,
+                (path) => {
+                  const newPath = path.replace(/\[0\]\./, `${lang}.`);
+                  return newPath;
+                }
               );
             } else {
-              langPath = rebuildFullPath(node.value, node.key, (path) =>
-                path.replace("create.", `create[${index}].`)
-              );
+              langPath = rebuildFullPath(node.value, node.key, (path) => {
+                return path.replace(/create\./, `create[${index}].`);
+              });
+
               transformedPath = rebuildFullPath(node.value, node.key, (path) =>
-                path.replace("create.", `${lang}.`)
+                path.replace(/\[0\]\./, `${lang}.`)
               );
             }
 
-            if (!isAdded) buildError(langPath, transformedPath);
+            if (!isAdded) {
+              buildError(langPath, transformedPath);
+            }
           });
         } else {
           const singlePath = fPath.replace(
@@ -1083,7 +1107,8 @@ const validateField = (
   language_codes,
   existingForm,
   getNodes = true,
-  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+  timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,
+  translatedPath = null
 ) => {
   if (onlyFormFields == true && value === undefined) return;
 
@@ -1092,6 +1117,11 @@ const validateField = (
     ? `${fieldPath}.${field.key.split(".").pop()}`
     : field.key;
 
+  if (translatedPath) {
+    translatedPath = translatedPath
+      ? `${translatedPath}.${field.key.split(".").pop()}`
+      : field.key;
+  }
   const fieldLabel = formatLabel(field.display_label);
 
   validateMetaRules(
@@ -1107,7 +1137,8 @@ const validateField = (
     formData,
     language_codes,
     existingForm,
-    getNodes
+    getNodes,
+    translatedPath
   );
 
   if (
@@ -1146,7 +1177,8 @@ const validateField = (
         language_codes,
         existingForm,
         false,
-        timeZone
+        timeZone,
+        null
       )
     );
   } else if (field.type === constants.types.ARRAY && Array.isArray(value)) {
@@ -1205,7 +1237,11 @@ const validateField = (
             language_codes,
             existingForm,
             false,
-            timeZone
+            timeZone,
+            field?.meta?.parentInterface ===
+              constants.interfaces.TRANSLATIONS && item["languages_code"]
+              ? `${currentPath}.${item["languages_code"]}`
+              : null
           )
         );
       });
@@ -1581,7 +1617,8 @@ const validate = (data) => {
       data.language_codes,
       existingForm,
       true,
-      timeZone
+      timeZone,
+      null
     );
   });
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nox-validation",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "validate dynamic schema",
   "main": "index.js",
   "scripts": {