nox-validation 1.1.2 → 1.1.3

package/lib/helpers.js

@@ -355,7 +355,7 @@ const convertTypesV1 = (field) => {
   return { type, array_type, find_relations };
 };
 
-const generateField = (name, path, schema_definition_type, type, childrenFields = []) => {
+const generateField = (name, path, schema_definition_type, type, childrenFields = [],relationType="none") => {
   childrenFields = childrenFields?.map((child) => {
     return {
       ...child,
@@ -375,6 +375,7 @@ const generateField = (name, path, schema_definition_type, type, childrenFields
       required: false,
       nullable: false,
       hidden: false,
+      interface:relationType
     },
     validations: [],
     schema_definition: {
@@ -426,9 +427,24 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
     const deleteField = generateField(
       "delete",
       `${key}.delete`,
-      constants.types.OBJECT_ID,
+      constants.types.OBJECT,
       constants.types.ARRAY
     );
+    deleteField.children = [
+      generateField(
+        "collection",
+        `${key}.delete.collection`,
+        constants.types.STRING,
+        constants.types.STRING
+      ),
+      generateField("sort", `${key}.delete.sort`, constants.types.NUMBER, constants.types.NUMBER),
+      generateField(
+        "item",
+        `${key}.delete.item`,
+        constants.types.OBJECT_ID,
+        constants.types.OBJECT_ID
+      ),
+    ];
     const createField = generateField(
       "create",
       `${key}.create`,
@@ -449,7 +465,8 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
         `${key}.create.item`,
         constants.types.OBJECT,
         constants.types.OBJECT,
-        collectionFields
+        collectionFields,
+        relationType
       ),
     ];
     const updateField = generateField(
@@ -472,7 +489,8 @@ const generateRelationalField = (key = "", collectionFields = [], relationType)
         `${key}.update.item`,
         constants.types.OBJECT,
         constants.types.OBJECT,
-        collectionFields
+        collectionFields,
+        relationType
       ),
     ];
     return [existingField, deleteField, createField, updateField];
@@ -633,7 +651,23 @@ const getCachedOrFetchFields = (schemaId, allFields, relational_fields) => {
   return fields;
 };
 
-const getChildFields = (relationDetail, allFields, relational_fields, isTranslation) => {
+const getChildFields = (relationDetail, allFields, relational_fields, isTranslation,name) => {
+  if(name === "my_m2a"){
+    // this_collection: '67b41ff9d6461cfeabfc1216',
+    // this_field: '_id',
+    // foreign_collection: [
+    //   '6799ea49736e3f1cdbaa5f67',
+    //   '6799ea54736e3f1cdbaa5f82',
+    //   '6799ea9a736e3f1cdbaa5fbc'
+    // ],
+    // foreign_field: 'Primary Key',
+    // junction_collection: '67f35f70ff1653a843cca6b7',
+    // junction_field_this: 'time_test_id',
+    // junction_field_foreign: 'item',
+    // junction_field_ref: 'collection',
+    // foreign_collection_ref: 'products, comments, categories'
+    console.log(relationDetail.foreign_collection, 'test',name,relationDetail);
+  }
   let key = isTranslation
     ? [
         ...(Array.isArray(relationDetail.junction_collection)
@@ -714,7 +748,7 @@ const buildNestedStructure = ({
           relationDetail,
           allFields,
           relational_fields,
-          item?.meta?.interface === constants.interfaces.TRANSLATIONS
+          item?.meta?.interface === constants.interfaces.TRANSLATIONS,key
         );
       } else {
         childFields = getCachedFields(relationDetail, relational_fields);
@@ -740,6 +774,7 @@ const buildNestedStructure = ({
 
     const node = {
       field_id: item?._id,
+      schema_id: item?.schema_id,
       display_label: pathParts[pathParts.length - 1],
       key,
       value: key,

package/lib/validate.js

@@ -576,7 +576,37 @@ const validateField = (
     value &&
     typeChecks[constants.types.OBJECT](value)
   ) {
-    field.children.forEach((child) =>
+    const isManyToAnyItem =
+      field.display_label === "item" && field?.meta?.interface === constants.interfaces.MANY_TO_ANY;
+
+    const defaultKeys = new Set([
+      "_id",
+      "created_at",
+      "updated_at",
+      "__v",
+      "created_by",
+      "updated_by",
+      "nox_created_by",
+      "nox_updated_by",
+      "nox_created_at",
+      "nox_updated_at",
+    ]);
+
+    let itemSchemaId = null;
+
+    if (isManyToAnyItem) {
+      const itemKey = Object.keys(value).find((key) => !defaultKeys.has(key));
+      if (itemKey) {
+        const childField = field.children.find((child) => child.display_label === itemKey);
+        itemSchemaId = childField?.schema_id ?? null;
+      }
+    }
+
+    const childrenToValidate = itemSchemaId
+      ? field.children.filter((child) => child.schema_id === itemSchemaId)
+      : field.children;
+
+    childrenToValidate.forEach((child) =>
       validateField(
         child,
         value[child.key.split(".").pop()],
@@ -668,6 +698,9 @@ const schema = {
 };
 
 const validate = (data) => {
+  if (!data?.language) {
+    data.language = constants.LANGUAGES.en;
+  }
   const {
     formData,
     isSeparatedFields,
@@ -681,10 +714,6 @@ const validate = (data) => {
     language,
     maxLevel,
   } = data;
-  
-  if (!data?.language) {
-    data.language = constants.LANGUAGES.en;
-  }
 
   const error_messages = constants.LOCALE_MESSAGES[language];
 

package/package.json

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