@builttocreate/engine-utils 2.10.1-beta.v593.17 → 2.10.1-beta.v593.18

package/dist/validateReadableId.js

@@ -148,43 +148,35 @@ var _default = exports["default"] = function _default(readableId, fields, tableC
   //6. Check for duplicateIds
   if (!Array.isArray(fields)) return;
 
-  // if (fieldId) {
-
-  //   const targetField = fields.find(field => field._id === fieldId);
-
-  //   if (targetField?.type === FieldTypes.collection) {
-  //     const flattenedSchema = flattenSchemaTree(targetField.schema);
-  //     const readableIdExists = flattenedSchema.some(schema => schema._id === readableId);
-
-  //     if (readableIdExists) {
-  //       console.warn(`validateReadableId: "${readableId}" is invalid - it already exists in fields`);
-  //       return false;
-  //     }
-  //   }
-
-  // } else {
-
-  var duplicateField = fields.find(function (field) {
-    return field._id === readableId;
-  });
-  console.log("duplicateField", duplicateField, readableId);
-  if (duplicateField && duplicateField.type !== _FieldTypes["default"].collection) {
-    console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it already exists in fields"));
-    return false;
-  }
-  if (duplicateField && duplicateField.type === _FieldTypes["default"].collection) {
-    var flattenedSchema = (0, _fieldHelper.flattenSchemaTree)(duplicateField.schema);
-    var readableIdExists = flattenedSchema.some(function (schema) {
-      return schema._id === readableId;
+  /**
+   * Duplication check for collection fields
+   * For the collection fields, we might get the nestedTableReadableId as the readableId, so we need
+   * the fieldId to check if the readableId already exists in the collection schema.
+   */
+  if (fieldId) {
+    var targetField = fields.find(function (field) {
+      return field._id === fieldId;
+    });
+    console.log('fieldId, targetField, readableId in engine utils', fieldId, targetField);
+    if ((targetField === null || targetField === void 0 ? void 0 : targetField.type) === _FieldTypes["default"].collection) {
+      var flattenedSchema = (0, _fieldHelper.flattenSchemaTree)(targetField.schema);
+      var readableIdExists = flattenedSchema.some(function (schema) {
+        return schema._id === readableId;
+      });
+      if (readableIdExists) {
+        console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it already exists in fields"));
+        return false;
+      }
+    }
+  } else {
+    var duplicateField = fields.find(function (field) {
+      return field._id === readableId;
     });
-    if (readableIdExists) {
+    if (duplicateField) {
       console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it already exists in fields"));
       return false;
     }
   }
-
-  // }
-
   if (tableColumns && Array.isArray(tableColumns)) {
     var duplicateColumnId = tableColumns.find(function (column) {
       return column._id === readableId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "2.10.1-beta.v593.17",
+  "version": "2.10.1-beta.v593.18",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [