nox-validation 1.2.3 → 1.2.5

package/lib/helpers.js

@@ -1168,6 +1168,17 @@ const getDefaultValues = (tree) => {
   return defaultValues;
 };
 
+const extractRelationalParents=(path)=> {
+  const match = path?.match(/^(translations)\.(create|update|delete|existing)\[\d+\]/);
+  if (match) {
+    const secondParent = match[1];             
+    const firstParent = match[0].split('.')[0] + '.' + match[2] + '[' + path.match(/\[(\d+)\]/)[1] + ']'; // 
+    const afterKey = match[3] || '';     
+    return { firstParent, secondParent, afterKey };
+  }
+  return null;
+}
+
 module.exports = {
   generateModifiedRules,
   getFieldsGroupBySchemaId,
@@ -1186,4 +1197,5 @@ module.exports = {
   getAllFields,
   getForeignCollectionDetails,
   getDefaultValues,
+  extractRelationalParents
 };

package/lib/validate.js

@@ -8,6 +8,7 @@ const {
   setValue,
   isEmpty,
   getParentKey,
+  extractRelationalParents,
 } = require("./helpers");
 
 const choices = ["radio", "checkboxes", "dropdown_multiple", "dropdown"];
@@ -169,7 +170,9 @@ const validateMetaRules = (
   updateValue,
   error_messages,
   onlyFormFields,
-  apiVersion
+  apiVersion,
+  fieldOptions,
+  formData
 ) => {
   const fieldValue = providedValue;
   const { required = false, nullable = false, options } = field?.meta ?? {};
@@ -630,7 +633,8 @@ const validateField = (
   updateValue,
   error_messages,
   onlyFormFields,
-  apiVersion
+  apiVersion,
+  fieldOptions
 ) => {
   if (onlyFormFields == true && (value === undefined || value === null)) return;
 
@@ -645,7 +649,9 @@ const validateField = (
     updateValue,
     error_messages,
     onlyFormFields,
-    apiVersion
+    apiVersion,
+    fieldOptions,
+    formData
   );
 
   if (
@@ -694,7 +700,8 @@ const validateField = (
         updateValue,
         error_messages,
         onlyFormFields,
-        apiVersion
+        apiVersion,
+        fieldOptions
       )
     );
   } else if (field.type === constants.types.ARRAY && Array.isArray(value)) {
@@ -703,7 +710,7 @@ const validateField = (
       value.forEach((item, index) => {
         const itemPath = `${currentPath}[${index}]`;
 
-        if (choices.includes(field?.meta?.interface)) {
+        if (choices.includes(field?.meta?.interface) && !isEmpty(item)) {
           applyValidations(field, item, addError, itemPath, formData, error_messages);
         }
 
@@ -736,7 +743,8 @@ const validateField = (
             updateValue,
             error_messages,
             onlyFormFields,
-            apiVersion
+            apiVersion,
+            fieldOptions
           )
         );
       });
@@ -758,7 +766,7 @@ const validateField = (
 };
 
 const applyValidations = (field, value, addError, currentPath, formData, error_messages) => {
-  if (!field.validations || value === null || value === undefined) return true;
+  if (!field.validations || value === null || value === undefined || value === "") return true;
   return !field.validations.some(
     (rule) =>
       handleRule(rule, field, value, addError, currentPath, formData, error_messages) === false
@@ -820,6 +828,32 @@ const validate = (data) => {
   const addError = (fieldPath, obj, field) => {
     if (byPassKeys.some((key) => fieldPath.startsWith(key))) return;
     if (!result.errors[fieldPath] && !field?.meta?.hidden) {
+      const pathResult = extractRelationalParents(fieldPath);
+      if (pathResult) {
+        const { firstParent, secondParent } = pathResult;
+        const secondParentField = fields.find((f) => f.path === secondParent);
+        if (
+          secondParentField &&
+          secondParentField?.meta?.interface === constants.interfaces.TRANSLATIONS
+        ) {
+          const languageKey = secondParentField?.meta?.options?.language_field;
+          const firstParentValue = getValue(formData, firstParent);
+          if (firstParentValue && typeChecks[constants.types.OBJECT](firstParentValue)) {
+            const codeKey = Object.keys(firstParentValue).find((key) => key.includes(languageKey));
+            const codeValue = codeKey ? firstParentValue[codeKey] : null;
+            if (codeValue) {
+              const translation_key = fieldPath.replace(
+                firstParent,
+                `${secondParent}.${codeValue}`
+              );
+              if (translation_key) {
+                obj.translation_path = translation_key;
+              }
+            }
+          }
+        }
+      }
+
       result.errors[fieldPath] = obj;
       result.status = false;
     }
@@ -1008,7 +1042,8 @@ const validate = (data) => {
       updateValue,
       error_messages,
       onlyFormFields,
-      apiVersion
+      apiVersion,
+      fieldOptions
     );
   });
   return result;

package/package.json

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