versacall-core-library-react 2.0.44 → 2.0.46

package/dist/components/CoreSideBar/CoreSideBar.js

@@ -7,11 +7,21 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _LocationCity = _interopRequireDefault(require("@material-ui/icons/LocationCity"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _AccountCircle = _interopRequireDefault(require("@material-ui/icons/AccountCircle"));
+var _styles = require("@material-ui/core/styles");
 
-var _StarBorder = _interopRequireDefault(require("@material-ui/icons/StarBorder"));
+var _Avatar = _interopRequireDefault(require("@material-ui/core/Avatar"));
+
+var _Badge = _interopRequireDefault(require("@material-ui/core/Badge"));
+
+var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
+
+var _Divider = _interopRequireDefault(require("@material-ui/core/Divider"));
+
+var _Drawer = _interopRequireDefault(require("@material-ui/core/Drawer"));
+
+var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
 
 var _ListItem = _interopRequireDefault(require("@material-ui/core/ListItem"));
 
@@ -19,31 +29,37 @@ var _ListItemIcon = _interopRequireDefault(require("@material-ui/core/ListItemIc
 
 var _ListItemText = _interopRequireDefault(require("@material-ui/core/ListItemText"));
 
+var _Menu = _interopRequireDefault(require("@material-ui/core/Menu"));
+
+var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem"));
+
+var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
+
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
 
-var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
+var _AccountCircle = _interopRequireDefault(require("@material-ui/icons/AccountCircle"));
 
-var _styles = require("@material-ui/core/styles");
+var _Delete = _interopRequireDefault(require("@material-ui/icons/Delete"));
 
-var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem"));
+var _LocationCity = _interopRequireDefault(require("@material-ui/icons/LocationCity"));
 
-var _Divider = _interopRequireDefault(require("@material-ui/core/Divider"));
+var _Menu2 = _interopRequireDefault(require("@material-ui/icons/Menu"));
 
-var _Menu = _interopRequireDefault(require("@material-ui/icons/Menu"));
+var _ExitToApp = _interopRequireDefault(require("@material-ui/icons/ExitToApp"));
 
-var _Star = _interopRequireDefault(require("@material-ui/icons/Star"));
+var _Notifications = _interopRequireDefault(require("@material-ui/icons/Notifications"));
 
-var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
+var _Error = _interopRequireDefault(require("@material-ui/icons/Error"));
 
-var _Avatar = _interopRequireDefault(require("@material-ui/core/Avatar"));
+var _Info = _interopRequireDefault(require("@material-ui/icons/Info"));
 
-var _Drawer = _interopRequireDefault(require("@material-ui/core/Drawer"));
+var _Warning = _interopRequireDefault(require("@material-ui/icons/Warning"));
 
-var _reactIntl = require("react-intl");
+var _StarBorder = _interopRequireDefault(require("@material-ui/icons/StarBorder"));
 
-var _Menu2 = _interopRequireDefault(require("@material-ui/core/Menu"));
+var _Star = _interopRequireDefault(require("@material-ui/icons/Star"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _reactIntl = require("react-intl");
 
 var _context = require("../../context");
 
@@ -83,7 +99,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 var namespace = 'CoreSideBar';
 
-var styles = function styles() {
+var styles = function styles(theme) {
   return {
     root: {
       display: 'flex',
@@ -127,6 +143,29 @@ var styles = function styles() {
       height: 24,
       width: 24,
       filter: 'invert(1)'
+    },
+    inline: {
+      display: 'inline',
+      color: '#cccccc'
+    },
+    notificationRoot: {
+      width: 200
+    },
+    badgeError: {
+      backgroundColor: theme.palette.error.light,
+      color: theme.palette.error.contrastText
+    },
+    badgeWarning: {
+      backgroundColor: theme.palette.warning.light,
+      color: theme.palette.warning.contrastText
+    },
+    badgeInfo: {
+      backgroundColor: theme.palette.info.light,
+      color: theme.palette.info.contrastText
+    },
+    menuIconButton: {// background: '#3f5c67',
+      // borderRadius: 10,
+      // marginRight: 10,
     }
   };
 };
@@ -166,6 +205,24 @@ var style = {
     pointerEvents: 'none'
   }
 };
+/* const getNotificationsBadgeColor = notifications => {
+  return 'warning';
+  let hasError = false;
+  let hasWarning = false;
+  notifications.forEach(notification => {
+    if (notification.type === 'error') {
+      hasError = true;
+    } if (notification.type === 'warning') {
+      hasWarning = true;
+    }
+  });
+  if (hasError) {
+    return 'error';
+  } if (hasWarning) {
+    return 'warning';
+  }
+  return 'primary';
+}; */
 
 var CoreSideBar = /*#__PURE__*/function (_Component) {
   _inherits(CoreSideBar, _Component);
@@ -183,10 +240,13 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
       organizationAnchorEl: null,
       entityAnchorEl: null,
       authenticationAnchorEl: null,
+      notificationsAnchorEl: null,
       apps: [],
       organizations: [],
       entities: [],
-      favorites: []
+      favorites: [],
+      // subscription: null,
+      notifications: []
     };
     return _this;
   }
@@ -194,7 +254,9 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
   _createClass(CoreSideBar, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.getOrganizations();
+      this.getOrganizations(); // this.getSubscription();
+
+      this.getNotifications();
     }
   }, {
     key: "componentDidUpdate",
@@ -209,7 +271,9 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
 
       if (this.props.authentication.didChange(prevProps.authentication) || this.props.organization.didChange(prevProps.organization)) {
         this.getApps();
-        this.getFavorites();
+        this.getFavorites(); // this.getSubscription();
+
+        this.getNotifications();
       }
     }
   }, {
@@ -315,6 +379,53 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
         });
       }
     }
+  }, {
+    key: "getNotifications",
+    value: function getNotifications() {
+      var _this6 = this;
+
+      var methodName = 'getNotifications()';
+      var _this$props = this.props,
+          authentication = _this$props.authentication,
+          core = _this$props.core,
+          organization = _this$props.organization;
+
+      if (organization.organization !== null && organization.entity !== null) {
+        authentication.http({
+          method: 'get',
+          url: "".concat(core.baseUrl, "/api/user/activity/notifications"),
+          params: {
+            organizationId: organization.organization.id,
+            entityId: organization.entity.id
+          }
+        }).then(function (res) {
+          _this6.setState({
+            notifications: res.data
+          });
+        }).catch(function (error) {
+          core.log('error', namespace, methodName, error);
+        });
+      }
+    }
+    /* getSubscription() {
+      const methodName = 'getSubscription()';
+      const { authentication, core, organization } = this.props;
+      if (organization.organization !== null && organization.entity !== null) {
+        authentication.http({
+          method: 'get',
+          url: `${core.baseUrl}/api/subscriptions/primary`,
+          params: {
+            organizationId: organization.organization.id,
+            entityId: organization.entity.id,
+          },
+        }).then(res => {
+          this.setState({ subscription: res.data });
+        }).catch(error => {
+          core.log('error', namespace, methodName, error);
+        });
+      }
+    } */
+
   }, {
     key: "getUsersInitials",
     value: function getUsersInitials() {
@@ -333,10 +444,68 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
 
       return initials;
     }
+  }, {
+    key: "getNotificationBadgeClass",
+    value: function getNotificationBadgeClass() {
+      var notifications = this.state.notifications;
+      var classes = this.props.classes;
+      var hasError = false;
+      var hasWarning = false;
+      notifications.forEach(function (notification) {
+        if (notification.type === 'error') {
+          hasError = true;
+        }
+
+        if (notification.type === 'warning') {
+          hasWarning = true;
+        }
+      });
+
+      if (hasError) {
+        return classes.badgeError;
+      }
+
+      if (hasWarning) {
+        return classes.badgeWarning;
+      }
+
+      return classes.badgeInfo;
+    }
+  }, {
+    key: "getNotificationIcon",
+    value: function getNotificationIcon(type) {
+      var theme = this.props.theme;
+
+      switch (type.toLowerCase()) {
+        case 'error':
+          // '#ff6666'
+          return /*#__PURE__*/_react.default.createElement(_Error.default, {
+            style: {
+              color: theme.palette.error.light
+            }
+          });
+
+        case 'warning':
+          // 'yellow'
+          return /*#__PURE__*/_react.default.createElement(_Warning.default, {
+            style: {
+              color: theme.palette.warning.light
+            }
+          });
+
+        default:
+          // 'lightblue'
+          return /*#__PURE__*/_react.default.createElement(_Info.default, {
+            style: {
+              color: theme.palette.info.light
+            }
+          });
+      }
+    }
   }, {
     key: "favoriteApp",
     value: function favoriteApp() {
-      var _this6 = this;
+      var _this7 = this;
 
       var methodName = 'favoriteApp()';
 
@@ -350,16 +519,34 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
             favorite: !this.state.favorites.includes(this.props.componentID)
           }
         }).then(function () {
-          _this6.getFavorites();
+          _this7.getFavorites();
         }).catch(function (error) {
-          _this6.props.core.log('error', namespace, methodName, error);
+          _this7.props.core.log('error', namespace, methodName, error);
         });
       }
     }
+  }, {
+    key: "dismissNotification",
+    value: function dismissNotification(id) {
+      var methodName = "dismissNotification(".concat(id, ")");
+      var _this$props2 = this.props,
+          authentication = _this$props2.authentication,
+          core = _this$props2.core;
+      authentication.http({
+        method: 'delete',
+        url: "".concat(core.baseUrl, "/api/user/activity/notifications/").concat(id)
+      }).catch(function (error) {
+        core.log('error', namespace, methodName, error);
+      });
+    }
   }, {
     key: "handleMessage",
     value: function handleMessage(channel, obj) {
       switch (obj.what) {
+        case 'notifications_changed':
+          this.getNotifications();
+          break;
+
         case 'package_enabled':
         case 'package_disabled':
         case 'package_added':
@@ -381,20 +568,23 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this7 = this;
-
-      var _this$props = this.props,
-          title = _this$props.title,
-          componentID = _this$props.componentID,
-          authentication = _this$props.authentication,
-          organization = _this$props.organization,
-          classes = _this$props.classes;
+      var _this8 = this;
+
+      var _this$props3 = this.props,
+          title = _this$props3.title,
+          componentID = _this$props3.componentID,
+          authentication = _this$props3.authentication,
+          organization = _this$props3.organization,
+          classes = _this$props3.classes;
+      var _this$state = this.state,
+          notificationsAnchorEl = _this$state.notificationsAnchorEl,
+          notifications = _this$state.notifications;
       return /*#__PURE__*/_react.default.createElement("div", {
         className: classes.root
       }, /*#__PURE__*/_react.default.createElement(_context.ChannelsConsumer, {
         id: "coreappbar",
         handler: function handler(channel, obj) {
-          return _this7.handleMessage(channel, obj);
+          return _this8.handleMessage(channel, obj);
         }
       }), /*#__PURE__*/_react.default.createElement(_Drawer.default, {
         variant: "permanent",
@@ -419,18 +609,18 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
         },
         color: "inherit",
         onClick: function onClick() {
-          return _this7.setState({
+          return _this8.setState({
             drawer: true
           });
         }
-      }, /*#__PURE__*/_react.default.createElement(_Menu.default, null))), /*#__PURE__*/_react.default.createElement("div", {
+      }, /*#__PURE__*/_react.default.createElement(_Menu2.default, null))), /*#__PURE__*/_react.default.createElement("div", {
         style: style.orgEntity
       }, /*#__PURE__*/_react.default.createElement(_Button.default, {
         color: "inherit",
         style: style.titleButton,
         variant: "text",
         onClick: this.state.entities.length > 1 ? function (e) {
-          return _this7.setState({
+          return _this8.setState({
             entityAnchorEl: e.currentTarget
           });
         } : null
@@ -445,56 +635,63 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
           minHeight: 0,
           overflow: 'auto'
         }
-      }, this.props.content), /*#__PURE__*/_react.default.createElement(_Divider.default, null), componentID.length > 0 && /*#__PURE__*/_react.default.createElement(_ListItem.default, {
-        button: true,
-        color: "inherit",
-        onClick: function onClick() {
-          return _this7.favoriteApp();
+      }, this.props.content), /*#__PURE__*/_react.default.createElement(_Divider.default, null), /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          padding: 5
         }
-      }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, {
+      }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+        title: "".concat(this.props.authentication.token.userInfo.firstName, " ").concat(this.props.authentication.token.userInfo.lastName)
+      }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+        color: "inherit",
+        onClick: function onClick(e) {
+          return _this8.setState({
+            authenticationAnchorEl: e.currentTarget
+          });
+        },
+        className: classes.menuIconButton
+      }, /*#__PURE__*/_react.default.createElement(_AccountCircle.default, null))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+        title: notifications.length > 0 ? "You have ".concat(notifications.length, " notification").concat(notifications.length > 0 ? 's' : '') : 'There are no notifications'
+      }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+        color: "inherit",
+        onClick: notifications.length > 0 ? function (e) {
+          return _this8.setState({
+            notificationsAnchorEl: e.currentTarget
+          });
+        } : null,
+        className: classes.menuIconButton
+      }, /*#__PURE__*/_react.default.createElement(_Badge.default, {
+        badgeContent: notifications.length,
         classes: {
-          root: classes.listItemRoot
+          badge: this.getNotificationBadgeClass()
         },
-        color: "inherit"
+        showZero: false
+      }, /*#__PURE__*/_react.default.createElement(_Notifications.default, null)))), componentID.length > 0 && /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+        title: this.state.favorites.includes(componentID) ? /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
+          id: "__favorite"
+        }) : /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
+          id: "__click_to_favorite"
+        })
+      }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+        color: "inherit",
+        onClick: function onClick() {
+          return _this8.favoriteApp();
+        },
+        className: classes.menuIconButton
       }, this.state.favorites.includes(componentID) ? /*#__PURE__*/_react.default.createElement(_Star.default, {
         color: "inherit"
       }) : /*#__PURE__*/_react.default.createElement(_StarBorder.default, {
         color: "inherit"
-      })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
-        classes: {
-          primary: classes.listItemRoot
-        },
-        color: "inherit"
-      }, this.state.favorites.includes(componentID) ? /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
-        id: "__favorite"
-      }) : /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
-        id: "__click_to_favorite"
-      }))), /*#__PURE__*/_react.default.createElement(_ListItem.default, {
-        button: true,
-        onClick: function onClick(e) {
-          return _this7.setState({
-            authenticationAnchorEl: e.currentTarget
-          });
-        }
-      }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, {
-        classes: {
-          root: classes.listItemRoot
-        }
-      }, /*#__PURE__*/_react.default.createElement(_AccountCircle.default, null)), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
-        classes: {
-          primary: classes.listItemRoot
-        }
-      }, "".concat(this.props.authentication.token.userInfo.firstName, " ").concat(this.props.authentication.token.userInfo.lastName)))), /*#__PURE__*/_react.default.createElement("div", {
+      }))))), /*#__PURE__*/_react.default.createElement("div", {
         className: classes.content
       }, this.props.children), /*#__PURE__*/_react.default.createElement(_CoreSideBarDrawer.default, {
         open: this.state.drawer,
         onClose: function onClose() {
-          return _this7.setState({
+          return _this8.setState({
             drawer: false
           });
         },
         apps: this.state.apps
-      }), /*#__PURE__*/_react.default.createElement(_Menu2.default, {
+      }), /*#__PURE__*/_react.default.createElement(_Menu.default, {
         open: !!this.state.organizationAnchorEl,
         anchorEl: this.state.organizationAnchorEl,
         anchorOrigin: {
@@ -506,7 +703,7 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
           horizontal: 'center'
         },
         onClose: function onClose() {
-          return _this7.setState({
+          return _this8.setState({
             organizationAnchorEl: null
           });
         }
@@ -516,7 +713,7 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
           onClick: function onClick() {
             organization.setOrganization(org);
 
-            _this7.setState({
+            _this8.setState({
               organizationAnchorEl: null
             });
           }
@@ -524,7 +721,7 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
           primary: org.name,
           inset: true
         }));
-      })), /*#__PURE__*/_react.default.createElement(_Menu2.default, {
+      })), /*#__PURE__*/_react.default.createElement(_Menu.default, {
         classes: {
           paper: classes.menuPaper
         },
@@ -539,7 +736,7 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
         },
         open: !!this.state.entityAnchorEl,
         onClose: function onClose() {
-          return _this7.setState({
+          return _this8.setState({
             entityAnchorEl: null
           });
         }
@@ -552,7 +749,7 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
           onClick: function onClick() {
             organization.setEntity(entity);
 
-            _this7.setState({
+            _this8.setState({
               entityAnchorEl: null
             });
           }
@@ -567,14 +764,14 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
           primary: entity.name,
           inset: true
         }));
-      })), /*#__PURE__*/_react.default.createElement(_Menu2.default, {
+      })), /*#__PURE__*/_react.default.createElement(_Menu.default, {
         classes: {
           paper: classes.menuPaper
         },
         open: !!this.state.authenticationAnchorEl,
         anchorEl: this.state.authenticationAnchorEl,
         onClose: function onClose() {
-          return _this7.setState({
+          return _this8.setState({
             authenticationAnchorEl: null
           });
         }
@@ -616,7 +813,58 @@ var CoreSideBar = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
         id: "__log_out"
-      }))));
+      }))), /*#__PURE__*/_react.default.createElement(_Menu.default, {
+        classes: {
+          paper: classes.menuPaper,
+          root: classes.notificationRoot
+        },
+        open: !!notificationsAnchorEl,
+        anchorEl: notificationsAnchorEl,
+        onClose: function onClose() {
+          return _this8.setState({
+            notificationsAnchorEl: null
+          });
+        }
+      }, notifications.map(function (notification) {
+        return /*#__PURE__*/_react.default.createElement(_ListItem.default, {
+          key: notification.id,
+          classes: {
+            root: classes.menuItemRoot
+          }
+        }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, _this8.getNotificationIcon(notification.type)), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
+          primary: notification.title,
+          secondary: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Typography.default, {
+            component: "span",
+            variant: "body2",
+            className: classes.inline,
+            color: "inherit"
+          }, notification.description))
+        }), notification.url && notification.url.length > 0 && /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+          style: {
+            marginLeft: 5
+          },
+          "aria-label": "navigate",
+          onClick: function onClick() {
+            return window.open(notification.url, '__BLANK');
+          }
+        }, /*#__PURE__*/_react.default.createElement(_ExitToApp.default, {
+          style: {
+            color: '#ffffff'
+          }
+        })), notification.isDismissable && /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+          style: {
+            marginLeft: 5
+          },
+          "aria-label": "delete",
+          onClick: function onClick() {
+            return _this8.dismissNotification(notification.id);
+          }
+        }, /*#__PURE__*/_react.default.createElement(_Delete.default, {
+          style: {
+            color: '#ffffff'
+          }
+        })));
+      })));
     }
   }]);
 
@@ -632,6 +880,7 @@ CoreSideBar.propTypes = {
   // intl: PropTypes.shape().isRequired,
   organization: _propTypes.default.shape().isRequired,
   classes: _propTypes.default.shape().isRequired,
+  theme: _propTypes.default.shape().isRequired,
   children: _propTypes.default.node,
   content: _propTypes.default.node
 };
@@ -643,6 +892,6 @@ CoreSideBar.defaultProps = {
   content: null
 };
 
-var _default = (0, _reactIntl.injectIntl)((0, _context.withCore)((0, _context.withAuthentication)((0, _context.withOrganization)((0, _styles.withStyles)(styles)(CoreSideBar)))));
+var _default = (0, _reactIntl.injectIntl)((0, _context.withCore)((0, _context.withAuthentication)((0, _context.withOrganization)((0, _styles.withTheme)((0, _styles.withStyles)(styles)(CoreSideBar))))));
 
 exports.default = _default;

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/dist/components/CoreTheme/CoreTheme.js

@@ -15,6 +15,7 @@ require("./CoreTheme.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// https://v4.mui.com/customization/default-theme/?expand-path=$.palette
 var theme = (0, _styles.createTheme)({
   palette: {
     primary: {
@@ -23,6 +24,13 @@ var theme = (0, _styles.createTheme)({
     secondary: {
       main: '#496b78'
     }
+    /* warning: {
+      light: '#ffb74d',
+      main: '#ff9800',
+      dark: '#f57c00',
+      contrastText: 'rgba(0, 0, 0, 0.87)',
+    }, */
+
   },
   typography: {
     useNextVariants: true

package/dist/components/CoreTranslate/translations/en.json

@@ -348,6 +348,7 @@
   "__styles": "Styles",
   "__styles_editor": "Styles Editor",
   "__su": "Su",
+  "__subscription": "Subscription",
   "__success_delete": "Success: Delete",
   "__success_get": "Success: Get",
   "__success_save": "Success: Save",

package/package.json

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