@builttocreate/engine-utils 1.9.1 → 1.9.3-rc.1.0.2

package/dist/activityHelper.js

@@ -94,7 +94,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
   activities.forEach(function (activity) {
     var nextActivity = _objectSpread({}, activity);
 
-    if (activity.document && activity.document._id && activity.document.field) {
+    if (activity.document && activity.document.field) {
       var docFieldValue = fieldValues[activity.document.field];
       var templateField = templateFieldLookup[activity.document.field];
       nextActivity.document.title = templateField.title;

package/dist/tableHelper.js

@@ -15,6 +15,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _shortid = _interopRequireDefault(require("shortid"));
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _hotFormulaParser = require("@builttocreate/hot-formula-parser");
 
 var _Table = _interopRequireWildcard(require("./constants/Table"));
@@ -39,7 +41,7 @@ exports.getTableFieldLookupKey = getTableFieldLookupKey;
 
 var getDefaultRow = function getDefaultRow() {
   return {
-    _id: _shortid["default"].generate(),
+    _id: "".concat(_shortid["default"].generate()).concat((0, _moment["default"])().valueOf()),
     deleted: false,
     cells: {}
   };
@@ -98,6 +100,17 @@ var getFilteredRowOrder = function getFilteredRowOrder(rowOrder, rows, filters)
       return row._id;
     });
   }
+  /**
+   * Remove any duplicate rowIds. We have had instances where
+   * users encounter duplicate rowIds in the rowOrder.
+   * See: https://github.com/zionlabs/Issues/issues/1589
+   */
+
+
+  var cleanedValidRowOrder = [];
+  validRowOrder.forEach(function (rowId) {
+    if (cleanedValidRowOrder.indexOf(rowId) === -1) cleanedValidRowOrder.push(rowId);
+  });
 
   if (filteredColumnIds.length > 0) {
     var matchedRows = {};
@@ -111,11 +124,11 @@ var getFilteredRowOrder = function getFilteredRowOrder(rowOrder, rows, filters)
       });
       if (rowMatched) matchedRows[row._id] = true;
     });
-    return validRowOrder.filter(function (rowId) {
+    return cleanedValidRowOrder.filter(function (rowId) {
       return matchedRows[rowId];
     });
   } else {
-    return validRowOrder;
+    return cleanedValidRowOrder;
   }
 };
 /**
@@ -657,7 +670,7 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
     activity.forEach(function (act) {
       var rowId = act.document.row;
       var columnId = act.document.column;
-      var cellKey = "".concat(field._id, "-").concat(rowId, "-").concat(columnId);
+      var cellKey = "".concat(field._id).concat(rowId).concat(columnId);
       if (!cellActivityLookup[cellKey]) cellActivityLookup[cellKey] = 0;
       cellActivityLookup[cellKey] += 1;
     });
@@ -671,7 +684,7 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
      */
 
     tableReferences.push({
-      uniqueId: "".concat(field._id, "-").concat(row._id),
+      uniqueId: "".concat(field._id).concat(row._id),
       _id: field._id,
       title: field.title,
       type: _Table.inputGroupFieldTypes.inputGroupRowHeader,
@@ -690,7 +703,7 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
       var lastColumnIndex = columnIndex === tableColumns.length - 1;
       var value = row && row.cells ? row.cells[column._id] : '';
       var displayValue = column.type === _FieldTableColumnTypes["default"].dropdown ? columnOptionValueLookup[column._id][value] : value;
-      var cellKey = "".concat(field._id, "-").concat(row._id, "-").concat(column._id);
+      var cellKey = "".concat(field._id).concat(row._id).concat(column._id);
       tableReferences.push({
         uniqueId: cellKey,
         _id: field._id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "1.9.1",
+  "version": "1.9.3-rc.1.0.2",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [
@@ -46,6 +46,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "@builttocreate/hot-formula-parser": "4.0.1",
+    "moment": "^2.29.1",
     "shortid": "^2.2.16"
   },
   "jest": {