@builttocreate/engine-utils 1.8.1-rc.1.0.2 → 1.8.1-rc.1.0.4

package/dist/activityHelper.js

@@ -13,6 +13,8 @@ var _ActivityTypes = _interopRequireDefault(require("./constants/ActivityTypes")
 
 var _FileTypes = _interopRequireDefault(require("./constants/FileTypes"));
 
+var _tableHelper = require("./tableHelper");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -74,11 +76,19 @@ var getFormattedActivity = function getFormattedActivity(comments, deficiencies,
 exports.getFormattedActivity = getFormattedActivity;
 
 var addDocumentDataToActivities = function addDocumentDataToActivities(activities, doc, template) {
-  var fieldLookup = template && template.fieldLookup ? template.fieldLookup : null;
+  var templateFieldLookup = {};
+
+  if (template.fields && template.fields.length > 0) {
+    template.fields.forEach(function (field) {
+      return templateFieldLookup[field._id] = field;
+    });
+  } // const fieldLookup = template && template.fieldLookup ? template.fieldLookup : null;
+
+
   var fieldValues = doc && doc.fields ? doc.fields : null;
-  if (!activities || activities.length < 1 || !fieldLookup || !fieldValues) return activities;
-  var fieldRowLookups = {};
-  var fieldRowIndexLookups = {};
+  if (!activities || activities.length < 1 || !templateFieldLookup || !fieldValues) return activities;
+  var fieldRowsLookup = {};
+  var fieldRowIndexLookup = {};
   var nextActivities = [];
   activities.forEach(function (activity) {
     var nextActivity = _objectSpread({}, activity);
@@ -99,7 +109,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
          * just incase we have other deficiencies that reference the same table field.
          */
         if (!fieldRowsLookup[templateField._id]) {
-          fieldRowsLookup[templateField._id] = getRowLookupWithPopulatedDropdownCells(docFieldValue);
+          fieldRowsLookup[templateField._id] = (0, _tableHelper.getRowLookupWithPopulatedDropdownCells)(templateField.tableColumns, docFieldValue);
         }
         /**
          * Table Step 2: create an easy way to lookup a row index so we can use it in our row 
@@ -111,7 +121,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
 
 
         if (!fieldRowIndexLookup[templateField._id]) {
-          fieldRowIndexLookup[templateField._id] = getRowIndexLookup(templateField._id, template.fieldSettings, docFieldValue);
+          fieldRowIndexLookup[templateField._id] = (0, _tableHelper.getRowIndexLookup)(templateField._id, template.fieldSettings, docFieldValue);
         }
 
         ;
@@ -130,13 +140,13 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
          * We only need to generate the row lookup once per field (since input groups are just rows) 
          * to help increase performance, just incase we have other deficiencies that reference the same table field.
          */
-        if (fieldRowsLookup[templateField._id]) fieldRowsLookup[templateField._id] = getRowLookupWithPopulatedDropdownCells(docFieldValue);
+        // if (fieldRowsLookup[templateField._id]) fieldRowsLookup[templateField._id] = getRowLookupWithPopulatedDropdownCells(docFieldValue);
+
         /**
          * Input Group Step 2: Add invidual row.cell value. We only add the invidual cell value and not the 
          * whole row because input group display components are treated like regular field and not like table rows.
          */
-
-        nextActivity.document.value = fieldRowsLookup[activity.document.field][activity.document.row].cells[templateFieldColumn._id];
+        // nextActivity.document.value = fieldRowsLookup[activity.document.field][activity.document.row].cells[templateFieldColumn._id];
       } //This should handle adding the display value for selection and regular input fields
       else {
           var option = templateField.optionsLookup[docFieldValue];
@@ -151,6 +161,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
 
 exports.addDocumentDataToActivities = addDocumentDataToActivities;
 var _default = {
-  getFormattedActivity: getFormattedActivity
+  getFormattedActivity: getFormattedActivity,
+  addDocumentDataToActivities: addDocumentDataToActivities
 };
 exports["default"] = _default;

package/dist/tableHelper.js

@@ -732,10 +732,10 @@ var getRowLookupWithPopulatedDropdownCells = function getRowLookupWithPopulatedD
     });
 
     columns.forEach(function (column) {
-      var optionId = nextRow.cells[columnId];
+      var optionId = nextRow.cells[column._id];
 
       if (cellValue && column.type === _FieldTableColumnTypes["default"].dropdown) {
-        nextRow.cells[columnId] = column.optionsLookup[optionId] ? column.optionsLookup[optionId].value : optionId;
+        nextRow.cells[column._id] = column.optionsLookup[optionId] ? column.optionsLookup[optionId].value : optionId;
       }
     });
     rowsLookup[nextRow._id] = nextRow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "1.8.1-rc.1.0.2",
+  "version": "1.8.1-rc.1.0.4",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [