@builttocreate/engine-utils 2.10.1-beta.v593.10 → 2.10.1-beta.v593.12

package/dist/fieldHelper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTargetOptionDeleted = exports.isFieldEmpty = exports.handleMultiSelectOptionToggle = exports.getTemplateWithLookups = exports.getMultiSelectFieldValue = exports.getImportFieldValues = exports.getDefaultOption = exports.getDefaultFieldValuesFromTemplate = exports.getChartFieldValue = exports["default"] = void 0;
+exports.isTargetOptionDeleted = exports.isFieldEmpty = exports.handleMultiSelectOptionToggle = exports.getTemplateWithLookups = exports.getMultiSelectFieldValue = exports.getImportFieldValues = exports.getDefaultOption = exports.getDefaultFieldValuesFromTemplate = exports.getChartFieldValue = exports.flattenSchemaTree = exports["default"] = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -298,6 +298,45 @@ var isTargetOptionDeleted = exports.isTargetOptionDeleted = function isTargetOpt
   var result = !(undeletedOptions.length > 0);
   return result;
 };
+
+/**
+ *
+ * Flattens a nested schema tree into an array of objects and adds a depth property to each object.
+ *
+ * @param {Object} schemaObj
+ * @returns {Array} // An array of objects with the schema's id, depth, and other properties.
+ */
+var flattenSchemaTree = exports.flattenSchemaTree = function flattenSchemaTree(schemaObj) {
+  var flattened = [];
+
+  // Recursive function to traverse the tree.
+  function traverse(schemaId, depth, parentId) {
+    var node = schemaObj[schemaId];
+    if (!node) return;
+
+    // Create a new object that includes the schema's id and its depth.
+    flattened.push(_objectSpread({
+      id: schemaId,
+      parentId: parentId,
+      depth: depth
+    }, node));
+
+    // If the node has children, traverse them with increased depth.
+    if (node.children && node.children.length > 0) {
+      node.children.forEach(function (childId) {
+        return traverse(childId, depth + 1, schemaId);
+      });
+    }
+  }
+
+  // Find and traverse each root node.
+  Object.keys(schemaObj).forEach(function (schemaId) {
+    if (schemaObj[schemaId].root) {
+      traverse(schemaId, 0);
+    }
+  });
+  return flattened;
+};
 var _default = exports["default"] = {
   getDefaultOption: getDefaultOption,
   getChartFieldValue: getChartFieldValue,

package/dist/generateReadableId.js

@@ -165,10 +165,11 @@ function generateReadableTableColumnId(tableId, tableColumns, columnId) {
       var readableId = "".concat(type).concat(counts[type]);
       if (col._id === columnId) {
         /**
-         * If the user drags one text column it would have text1 as the id. If he renames it to text2, we 
-         * need to esnure the newly generatedId is different than text2
+         * If the generatedReadableId is already present in the tableColumns,
+         * we need to increment the count until we find a unique ID.
+         * This ensures that the new column ID is unique.
          */
-        tableColumns.forEach(function (column) {
+        validColumns.forEach(function (column) {
           if (column._id === readableId) {
             readableId = "".concat(type).concat(counts[type] + 1);
           }

package/dist/validateReadableId.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _fieldHelper = require("./fieldHelper");
+var _FieldTypes = require("./FieldTypes.js");
 // Check if value follows a valid readableId pattern for use in JavaScript formulas
 // Note to test this please run npm test src/validateReadableId.test.js
 
@@ -81,7 +83,7 @@ var JOYDOC_PROPERTIES = new Set(['_id', 'identifier', 'name', 'type', 'files', '
  * @param {*} readableId - The ID to validate
  * @returns {boolean} - True if valid, false otherwise
  */
-var _default = exports["default"] = function _default(readableId, fields, tableColumns) {
+var _default = exports["default"] = function _default(readableId, fields, tableColumns, fieldId) {
   // Must be a non-empty string
   if (typeof readableId !== 'string' || readableId.length === 0) {
     console.warn("validateReadableId: Invalid input - expected non-empty string, got ".concat(typeof readableId === 'string' ? 'empty string' : (0, _typeof2["default"])(readableId)));
@@ -145,13 +147,27 @@ var _default = exports["default"] = function _default(readableId, fields, tableC
 
   //6. Check for duplicateIds
   if (fields && Array.isArray(fields)) {
+    var targetField = fields.find(function (field) {
+      return field._id === fieldId;
+    });
     var duplicateField = fields.find(function (field) {
-      return field._id === readableId;
+      return field._id === targetField._id;
     });
     if (duplicateField) {
       console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it already exists in fields"));
       return false;
     }
+    if (targetField.type === _FieldTypes.FieldTypes.collection) {
+      //Flatten the schema and check for duplicates
+      var flattenedSchema = (0, _fieldHelper.flattenSchemaTree)(targetField.schema);
+      var readableIdExists = flattenedSchema.find(function (schema) {
+        return schema._id === readableId;
+      });
+      if (readableIdExists) {
+        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) {

package/package.json

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