versacall-core-library-react 2.0.61 → 2.0.63

package/dist/components/CoreTagFilter/CoreTagFilter.js

@@ -105,26 +105,24 @@ var CoreTagFilter = /*#__PURE__*/function (_Component) {
     key: "updateFilter",
     value: function updateFilter(newFilterProperties) {
       if (this.props.updateFilter) {
-        // this function should take changes to the array and write the string filter each time
-        var newBasicFilter = ''; // build new filter
+        // build new filter
+        var newFilter = _objectSpread(_objectSpread({}, this.props.filter), newFilterProperties); // this function should take changes to the array and write the string filter each time
 
-        var newFilter = _objectSpread(_objectSpread({}, this.props.filter), newFilterProperties); // join moduleTag and module location filters together using array.join(' OR ')
 
+        var newBasicFilter = '';
 
-        var moduleFilters = [].concat(_toConsumableArray(newFilter.moduleTagFilters), _toConsumableArray(newFilter.moduleLocationFilters));
-
-        if (moduleFilters.length > 0) {
-          newBasicFilter = "(".concat(moduleFilters.join(' OR '), ")");
-        } // if mpType has elements, add an AND and then joing those elemets with an ' OR '
+        if (newFilter.baseFilter && newFilter.baseFilter.length > 0) {
+          newBasicFilter = "(".concat(newFilter.baseFilter, ")");
+        } // join moduleTag and module location filters together using array.join(' OR ')
 
 
-        var typeFilters = _toConsumableArray(newFilter.monitoringPointTypeFilters);
+        var moduleFilters = [].concat(_toConsumableArray(newFilter.moduleTagFilters), _toConsumableArray(newFilter.moduleLocationFilters));
 
-        if (typeFilters.length > 0) {
-          if (moduleFilters.length > 0) {
-            newBasicFilter = "".concat(newBasicFilter, " AND (").concat(typeFilters.join(' OR '), ")");
+        if (moduleFilters.length > 0) {
+          if (newBasicFilter.length > 0) {
+            newBasicFilter = "".concat(newBasicFilter, " AND (").concat(moduleFilters.join(' OR '), ")");
           } else {
-            newBasicFilter = "(".concat(typeFilters.join(' OR '), ")");
+            newBasicFilter = "(".concat(moduleFilters.join(' OR '), ")");
           }
         } // if mpTag has elements add an AND and then joing those elemets with an ' OR '
 
@@ -132,11 +130,22 @@ var CoreTagFilter = /*#__PURE__*/function (_Component) {
         var tagFilters = _toConsumableArray(newFilter.monitoringPointTagFilters);
 
         if (tagFilters.length > 0) {
-          if (moduleFilters.length > 0 || typeFilters.length > 0) {
+          if (newBasicFilter.length > 0) {
             newBasicFilter = "".concat(newBasicFilter, " AND (").concat(tagFilters.join(' OR '), ")");
           } else {
             newBasicFilter = "(".concat(tagFilters.join(' OR '), ")");
           }
+        } // if mpType has elements, add an AND and then joing those elemets with an ' OR '
+
+
+        var typeFilters = _toConsumableArray(newFilter.monitoringPointTypeFilters);
+
+        if (typeFilters.length > 0) {
+          if (newBasicFilter.length > 0) {
+            newBasicFilter = "".concat(newBasicFilter, " AND (").concat(typeFilters.join(' OR '), ")");
+          } else {
+            newBasicFilter = "(".concat(typeFilters.join(' OR '), ")");
+          }
         } // merge new basicFilter with newFilter properties and re-call function
 
 
@@ -165,15 +174,31 @@ var CoreTagFilter = /*#__PURE__*/function (_Component) {
     value: function renderFilter() {
       var _this2 = this;
 
-      var filter = this.props.filter;
-      var moduleTagFilters = filter.moduleTagFilters,
+      var _this$props = this.props,
+          filter = _this$props.filter,
+          baseFilters = _this$props.baseFilters;
+      var baseFilter = filter.baseFilter,
+          moduleTagFilters = filter.moduleTagFilters,
           moduleLocationFilters = filter.moduleLocationFilters,
           monitoringPointTagFilters = filter.monitoringPointTagFilters,
           monitoringPointTypeFilters = filter.monitoringPointTypeFilters;
+      var haveBaseFilter = baseFilter && baseFilter.length > 0;
+      var showModuleAnd = (moduleTagFilters.length > 0 || moduleLocationFilters.length > 0) && haveBaseFilter;
       var showLocOr = moduleTagFilters.length > 0 && moduleLocationFilters.length > 0;
-      var showMpTagAnd = (moduleTagFilters.length > 0 || moduleLocationFilters.length > 0) && monitoringPointTagFilters.length > 0;
-      var showTypeAnd = (moduleTagFilters.length > 0 || moduleLocationFilters.length > 0 || monitoringPointTagFilters.length > 0) && monitoringPointTypeFilters.length > 0;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (moduleTagFilters.length > 0 || moduleLocationFilters.length > 0) && /*#__PURE__*/_react.default.createElement("span", null, "(", moduleTagFilters.map(function (tag, index) {
+      var showMpTagAnd = (haveBaseFilter || moduleTagFilters.length > 0 || moduleLocationFilters.length > 0) && monitoringPointTagFilters.length > 0;
+      var showTypeAnd = (haveBaseFilter || moduleTagFilters.length > 0 || moduleLocationFilters.length > 0 || monitoringPointTagFilters.length > 0) && monitoringPointTypeFilters.length > 0;
+      var baseError = false;
+
+      if (baseFilter && baseFilter.length > 0) {
+        if (baseFilters === null || !baseFilters.includes(baseFilter)) {
+          baseError = true;
+        }
+      }
+
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, haveBaseFilter && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "(", /*#__PURE__*/_react.default.createElement(_Chip.default, {
+        label: baseFilter,
+        color: baseError ? 'secondary' : 'default'
+      }), ")"), showModuleAnd && /*#__PURE__*/_react.default.createElement("span", null, "\xA0AND\xA0"), (moduleTagFilters.length > 0 || moduleLocationFilters.length > 0) && /*#__PURE__*/_react.default.createElement("span", null, "(", moduleTagFilters.map(function (tag, index) {
         return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
           key: "mtag_".concat(tag)
         }, index !== 0 && /*#__PURE__*/_react.default.createElement("span", null, "\xA0OR\xA0"), /*#__PURE__*/_react.default.createElement(_Chip.default, {
@@ -212,17 +237,18 @@ var CoreTagFilter = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this3 = this;
 
-      var _this$props = this.props,
-          intl = _this$props.intl,
-          tags = _this$props.tags,
-          filter = _this$props.filter,
-          hideModuleTagFilters = _this$props.hideModuleTagFilters,
-          hideModuleLocationFilters = _this$props.hideModuleLocationFilters,
-          hideMonitoringPointTagFilters = _this$props.hideMonitoringPointTagFilters,
-          hideMonitoringPointTypeFilters = _this$props.hideMonitoringPointTypeFilters,
-          hideAdvanced = _this$props.hideAdvanced,
-          disabled = _this$props.disabled,
-          customTitle = _this$props.customTitle;
+      var _this$props2 = this.props,
+          intl = _this$props2.intl,
+          tags = _this$props2.tags,
+          filter = _this$props2.filter,
+          hideModuleTagFilters = _this$props2.hideModuleTagFilters,
+          hideModuleLocationFilters = _this$props2.hideModuleLocationFilters,
+          hideMonitoringPointTagFilters = _this$props2.hideMonitoringPointTagFilters,
+          hideMonitoringPointTypeFilters = _this$props2.hideMonitoringPointTypeFilters,
+          hideAdvanced = _this$props2.hideAdvanced,
+          disabled = _this$props2.disabled,
+          customTitle = _this$props2.customTitle,
+          baseFilters = _this$props2.baseFilters;
       var openDialog = this.state.openDialog;
       return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -315,7 +341,8 @@ var CoreTagFilter = /*#__PURE__*/function (_Component) {
         hideModuleTagFilters: hideModuleTagFilters,
         hideModuleLocationFilters: hideModuleLocationFilters,
         hideMonitoringPointTagFilters: hideMonitoringPointTagFilters,
-        hideMonitoringPointTypeFilters: hideMonitoringPointTypeFilters
+        hideMonitoringPointTypeFilters: hideMonitoringPointTypeFilters,
+        baseFilters: baseFilters
       })));
     }
   }]);
@@ -335,7 +362,8 @@ CoreTagFilter.propTypes = {
   hideMonitoringPointTypeFilters: _propTypes.default.bool,
   disabled: _propTypes.default.bool,
   // mandatoryTags: PropTypes.arrayOf(PropTypes.string),
-  customTitle: _propTypes.default.node
+  customTitle: _propTypes.default.node,
+  baseFilters: _propTypes.default.arrayOf(_propTypes.default.string)
 };
 CoreTagFilter.defaultProps = {
   tags: null,
@@ -346,7 +374,8 @@ CoreTagFilter.defaultProps = {
   hideMonitoringPointTagFilters: false,
   hideMonitoringPointTypeFilters: false,
   disabled: false,
-  customTitle: null
+  customTitle: null,
+  baseFilters: null
 };
 
 var _default = (0, _reactIntl.injectIntl)(CoreTagFilter);

package/dist/components/CoreTagFilter/TagFilterBuilder.js

@@ -146,7 +146,8 @@ function TagFilterBuilder(props) {
       hideModuleTagFilters = props.hideModuleTagFilters,
       hideModuleLocationFilters = props.hideModuleLocationFilters,
       hideMonitoringPointTagFilters = props.hideMonitoringPointTagFilters,
-      hideMonitoringPointTypeFilters = props.hideMonitoringPointTypeFilters;
+      hideMonitoringPointTypeFilters = props.hideMonitoringPointTypeFilters,
+      baseFilters = props.baseFilters;
 
   var updateSearch = function updateSearch(value) {
     if (value.length > 0) {
@@ -390,7 +391,39 @@ function TagFilterBuilder(props) {
     style: {
       flexGrow: 1
     }
-  }, "Tag Filter Builder"), /*#__PURE__*/_react.default.createElement(_TextField.default, {
+  }, "Tag Filter Builder"), baseFilters && /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      minWidth: 200,
+      marginRight: 10
+    }
+  }, /*#__PURE__*/_react.default.createElement(_TextField.default, {
+    variant: "outlined",
+    label: "Base Filter",
+    InputLabelProps: {
+      shrink: true
+    },
+    value: filter.baseFilter ? filter.baseFilter : '',
+    onChange: function onChange(e) {
+      return updateFilter(_objectSpread(_objectSpread({}, filter), {}, {
+        baseFilter: e.target.value
+      }));
+    },
+    select: true,
+    SelectProps: {
+      displayEmpty: true
+    },
+    fullWidth: true,
+    size: "small"
+  }, /*#__PURE__*/_react.default.createElement("option", {
+    value: "",
+    style: {
+      fontStyle: 'italic'
+    }
+  }, "NONE"), baseFilters.map(function (bFilter, bfIndex) {
+    return /*#__PURE__*/_react.default.createElement("option", {
+      value: bFilter
+    }, bFilter);
+  }))), /*#__PURE__*/_react.default.createElement(_TextField.default, {
     id: "searchbar",
     placeholder: "Search...",
     value: search,
@@ -603,7 +636,11 @@ TagFilterBuilder.propTypes = {
   hideModuleTagFilters: _propTypes.default.bool.isRequired,
   hideModuleLocationFilters: _propTypes.default.bool.isRequired,
   hideMonitoringPointTagFilters: _propTypes.default.bool.isRequired,
-  hideMonitoringPointTypeFilters: _propTypes.default.bool.isRequired
+  hideMonitoringPointTypeFilters: _propTypes.default.bool.isRequired,
+  baseFilters: _propTypes.default.arrayOf(_propTypes.default.string)
+};
+TagFilterBuilder.defaultProps = {
+  baseFilters: null
 };
 
 var _default = (0, _reactIntl.injectIntl)(TagFilterBuilder);

package/package.json

@@ -2,10 +2,10 @@
   "versacall": {
     "title": "Versacall Core Library React",
     "applicationType": "react-library",
-    "build": 61
+    "build": 63
   },
   "name": "versacall-core-library-react",
-  "version": "2.0.61",
+  "version": "2.0.63",
   "description": "Versacall Core Library",
   "main": "dist/index.js",
   "module": "dist/index.js",