versacall-core-library-react 2.0.44 → 2.0.45

package/dist/components/CoreTagFilter/TagFilterBuilder.js

@@ -93,6 +93,26 @@ var style = {
   }
 };
 
+var consolidateTags = function consolidateTags(tagList) {
+  var newTagList = [];
+  tagList.forEach(function (tagInfo) {
+    var existing = newTagList.find(function (x) {
+      return x.tag === tagInfo.tag;
+    });
+
+    if (existing) {
+      existing.count += tagInfo.count;
+    } else {
+      newTagList.push({
+        tag: tagInfo.tag,
+        type: tagInfo.type,
+        count: tagInfo.count
+      });
+    }
+  });
+  return newTagList;
+};
+
 function TagFilterBuilder(props) {
   var _useState = (0, _react.useState)(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -269,9 +289,9 @@ function TagFilterBuilder(props) {
   var columns = 0;
   if (showModules) columns++;
   if (showMonitoringPoints) columns++; // Add any tags that aren't on the supplied list to the supplied list.  This is needed in case we reference tags that have been deleted/etc.
+  // const adjustedModuleTags = [...tags.moduleTags];
 
-  var adjustedModuleTags = _toConsumableArray(tags.moduleTags);
-
+  var adjustedModuleTags = consolidateTags(tags.moduleTags);
   filter.moduleTagFilters.forEach(function (x) {
     if (!adjustedModuleTags.find(function (tagInfo) {
       return tagInfo.tag === x;
@@ -281,10 +301,9 @@ function TagFilterBuilder(props) {
         count: 0
       });
     }
-  });
-
-  var adjustedLocationTags = _toConsumableArray(tags.locationTags);
+  }); // const adjustedLocationTags = [...tags.locationTags];
 
+  var adjustedLocationTags = consolidateTags(tags.locationTags);
   filter.moduleLocationFilters.forEach(function (x) {
     if (!adjustedLocationTags.find(function (tagInfo) {
       return tagInfo.tag === x;
@@ -294,10 +313,9 @@ function TagFilterBuilder(props) {
         count: 0
       });
     }
-  });
-
-  var adjustedMonitoringPointTags = _toConsumableArray(tags.monitoringPointTags);
+  }); // const adjustedMonitoringPointTags = [...tags.monitoringPointTags];
 
+  var adjustedMonitoringPointTags = consolidateTags(tags.monitoringPointTags);
   filter.monitoringPointTagFilters.forEach(function (x) {
     if (!adjustedMonitoringPointTags.find(function (tagInfo) {
       return tagInfo.tag === x;
@@ -307,10 +325,9 @@ function TagFilterBuilder(props) {
         count: 0
       });
     }
-  });
-
-  var adjustedMonitoringPointTypes = _toConsumableArray(tags.typeTags);
+  }); // const adjustedMonitoringPointTypes = [...tags.typeTags];
 
+  var adjustedMonitoringPointTypes = consolidateTags(tags.typeTags);
   filter.monitoringPointTypeFilters.forEach(function (x) {
     if (!adjustedMonitoringPointTypes.find(function (tagInfo) {
       return tagInfo.tag === x;
@@ -337,7 +354,11 @@ function TagFilterBuilder(props) {
   }) : _toConsumableArray(adjustedMonitoringPointTags);
   var filteredTypeTags = search.length > 0 ? adjustedMonitoringPointTypes.filter(function (x) {
     return x.tag.includes(search);
-  }) : _toConsumableArray(adjustedMonitoringPointTypes); // Sort by highest quantities of tags
+  }) : _toConsumableArray(adjustedMonitoringPointTypes); // const filteredModuleTags = adjustedModuleTags;
+  // const filteredLocationTags = adjustedLocationTags;
+  // const filteredMonitoringPointTags = adjustedMonitoringPointTags;
+  // const filteredTypeTags = adjustedMonitoringPointTypes;
+  // Sort by highest quantities of tags
 
   filteredModuleTags.sort(function (a, b) {
     return b.count - a.count;

package/package.json

@@ -2,10 +2,10 @@
   "versacall": {
     "title": "Versacall Core Library React",
     "applicationType": "react-library",
-    "build": 44
+    "build": 45
   },
   "name": "versacall-core-library-react",
-  "version": "2.0.44",
+  "version": "2.0.45",
   "description": "Versacall Core Library",
   "main": "dist/index.js",
   "module": "dist/index.js",