config-editor-base 3.0.5 → 3.0.6

package/dist/index.js

@@ -1445,7 +1445,7 @@ var lodash = createCommonjsModule(function (module, exports) {
   var undefined$1;
 
   /** Used as the semantic version number. */
-  var VERSION = '4.17.21';
+  var VERSION = '4.17.23';
 
   /** Used as the size to enable large array optimizations. */
   var LARGE_ARRAY_SIZE = 200;
@@ -5199,7 +5199,7 @@ var lodash = createCommonjsModule(function (module, exports) {
           if (isArray(iteratee)) {
             return function(value) {
               return baseGet(value, iteratee.length === 1 ? iteratee[0] : iteratee);
-            }
+            };
           }
           return iteratee;
         });
@@ -5803,8 +5803,47 @@ var lodash = createCommonjsModule(function (module, exports) {
      */
     function baseUnset(object, path) {
       path = castPath(path, object);
-      object = parent(object, path);
-      return object == null || delete object[toKey(last(path))];
+
+      // Prevent prototype pollution, see: https://github.com/lodash/lodash/security/advisories/GHSA-xxjr-mmjv-4gpg
+      var index = -1,
+          length = path.length;
+
+      if (!length) {
+        return true;
+      }
+
+      var isRootPrimitive = object == null || (typeof object !== 'object' && typeof object !== 'function');
+
+      while (++index < length) {
+        var key = path[index];
+
+        // skip non-string keys (e.g., Symbols, numbers)
+        if (typeof key !== 'string') {
+          continue;
+        }
+
+        // Always block "__proto__" anywhere in the path if it's not expected
+        if (key === '__proto__' && !hasOwnProperty.call(object, '__proto__')) {
+          return false;
+        }
+
+        // Block "constructor.prototype" chains
+        if (key === 'constructor' &&
+            (index + 1) < length &&
+            typeof path[index + 1] === 'string' &&
+            path[index + 1] === 'prototype') {
+
+          // Allow ONLY when the path starts at a primitive root, e.g., _.unset(0, 'constructor.prototype.a')
+          if (isRootPrimitive && index === 0) {
+            continue;
+          }
+
+          return false;
+        }
+      }
+
+      var obj = parent(object, path);
+      return obj == null || delete obj[toKey(last(path))];
     }
 
     /**
@@ -18995,8 +19034,18 @@ var EditorToolModalWrapper = /*#__PURE__*/function (_React$Component) {
   var _proto = EditorToolModalWrapper.prototype;
   _proto.render = function render() {
     return /*#__PURE__*/React.createElement("div", {
-      className: "tools-side-bar"
-    }, /*#__PURE__*/React.createElement("button", {
+      className: classNames('tools-side-bar', {
+        'tools-side-bar-expanded': this.props.isExpanded
+      })
+    }, this.props.name === 'filter-builder-modal' && /*#__PURE__*/React.createElement("button", {
+      type: "button",
+      className: "close expand-toggle",
+      onClick: this.props.onToggleExpand
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: "gray"
+      }
+    }, this.props.isExpanded ? "\xBB" : "\xAB")), /*#__PURE__*/React.createElement("button", {
       type: "button",
       className: "close",
       onClick: this.props.onClick
@@ -19274,6 +19323,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
       isDownloadConfig: false,
       isCompareChanges: false,
       activeSideBar: 'schema-modal',
+      isSideBarExpanded: false,
       showNewToolsHighlight: true
     };
     setTimeout(function () {
@@ -19281,6 +19331,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
         showNewToolsHighlight: false
       });
     }, 10000);
+    _this.toggleSideBarExpand = _this.toggleSideBarExpand.bind(_this);
     _this.input = '';
     _this.s3 = _this.props.fetchFileContentExt ? true : false;
     return _this;
@@ -19296,11 +19347,17 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
     var _this2 = this;
     var sideBar = this.state.activeSideBar == name ? 'none' : name;
     this.setState({
-      activeSideBar: sideBar
+      activeSideBar: sideBar,
+      isSideBarExpanded: sideBar === 'none' ? false : this.state.isSideBarExpanded
     }, function () {
       _this2.props.setConfigContentPreSubmit();
     });
   };
+  _proto.toggleSideBarExpand = function toggleSideBarExpand() {
+    this.setState({
+      isSideBarExpanded: !this.state.isSideBarExpanded
+    });
+  };
   _proto.hideUischemaModal = function hideUischemaModal() {
     this.setState({
       showUischemaModal: false
@@ -19490,7 +19547,8 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       className: classNames({
         'config-editor fe-header': true,
-        'encryption-padding': this.state.activeSideBar != 'none'
+        'encryption-padding': this.state.activeSideBar != 'none' && !this.state.isSideBarExpanded,
+        'encryption-padding-expanded': this.state.activeSideBar != 'none' && this.state.isSideBarExpanded
       })
     }, /*#__PURE__*/React.createElement("header", {
       className: "top-header-offline"
@@ -19502,9 +19560,12 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
         }
       }, /*#__PURE__*/React.createElement(EditorToolModalWrapper, {
         modal: modal.modal,
+        name: modal.name,
         onClick: function onClick() {
           return _this6.subMenuBtnClick('none');
-        }
+        },
+        isExpanded: _this6.state.isSideBarExpanded,
+        onToggleExpand: _this6.toggleSideBarExpand
       }));
     }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", null, editorConfigFiles.length == 0 && this.props.demoMode == false ? /*#__PURE__*/React.createElement("div", {
       className: "schema-loader-callout config-loader"
@@ -24295,7 +24356,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     });
   };
   _proto.generateFilterConfig = function generateFilterConfig() {
-    var _this10 = this;
+    var _this0 = this;
     var _this$state6 = this.state,
       mergedEntries = _this$state6.mergedEntries,
       groupJ1939Pgns = _this$state6.groupJ1939Pgns,
@@ -24339,8 +24400,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       } else {
         var count11Bit = 0;
         var count29Bit = 0;
-        for (var _iterator10 = _createForOfIteratorHelperLoose(entries), _step10; !(_step10 = _iterator10()).done;) {
-          var entry = _step10.value;
+        for (var _iterator0 = _createForOfIteratorHelperLoose(entries), _step0; !(_step0 = _iterator0()).done;) {
+          var entry = _step0.value;
           if (entry.isGroup && entry.groupedIds) {
             count29Bit += 1;
           } else if (entry.idInt > 0x7FF) {
@@ -24377,8 +24438,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       var configKey = channelToConfigKey[_channel];
       if (!configKey) continue;
       var filters = [];
-      for (var _iterator11 = _createForOfIteratorHelperLoose(_entries), _step11; !(_step11 = _iterator11()).done;) {
-        var _entry4 = _step11.value;
+      for (var _iterator1 = _createForOfIteratorHelperLoose(_entries), _step1; !(_step1 = _iterator1()).done;) {
+        var _entry4 = _step1.value;
         var prescaler_type = 0;
         var prescaler_value = undefined;
         var filterTypeValue = filterType === "rejection" ? 1 : 0;
@@ -24514,12 +24575,12 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     this.setState({
       generatedFilterConfig: filterConfig
     }, function () {
-      _this10.testMergedFile();
+      _this0.testMergedFile();
     });
     return filterConfig;
   };
   _proto.testMergedFile = function testMergedFile() {
-    var _this11 = this;
+    var _this1 = this;
     var _this$state7 = this.state,
       generatedFilterConfig = _this$state7.generatedFilterConfig,
       filterMergeMode = _this$state7.filterMergeMode;
@@ -24553,7 +24614,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     this.setState({
       mergedConfig: mergedConfigTemp
     }, function () {
-      var schemaContent = _this11.props.schemaContent;
+      var schemaContent = _this1.props.schemaContent;
       if (schemaContent && mergedConfigTemp) {
         try {
           var ajv = new Ajv({
@@ -24566,12 +24627,12 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           if (!valid && validate.errors) {
             console.log("AJV validation errors:", validate.errors);
           }
-          _this11.setState({
+          _this1.setState({
             mergedConfigValid: valid
           });
         } catch (e) {
           console.log("AJV compilation/validation exception:", e);
-          _this11.setState({
+          _this1.setState({
             mergedConfigValid: false
           });
         }
@@ -24638,8 +24699,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         var existing11Bit = 0;
         var existing29Bit = 0;
         if (formData[_configKey] && formData[_configKey].filter && formData[_configKey].filter.id) {
-          for (var _iterator12 = _createForOfIteratorHelperLoose(formData[_configKey].filter.id), _step12; !(_step12 = _iterator12()).done;) {
-            var filter = _step12.value;
+          for (var _iterator10 = _createForOfIteratorHelperLoose(formData[_configKey].filter.id), _step10; !(_step10 = _iterator10()).done;) {
+            var filter = _step10.value;
             if (filter.id_format === 1) {
               existing29Bit++;
             } else {
@@ -24650,8 +24711,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         var new11Bit = 0;
         var new29Bit = 0;
         if (generatedFilterConfig[_configKey] && generatedFilterConfig[_configKey].filter && generatedFilterConfig[_configKey].filter.id) {
-          for (var _iterator13 = _createForOfIteratorHelperLoose(generatedFilterConfig[_configKey].filter.id), _step13; !(_step13 = _iterator13()).done;) {
-            var _filter3 = _step13.value;
+          for (var _iterator11 = _createForOfIteratorHelperLoose(generatedFilterConfig[_configKey].filter.id), _step11; !(_step11 = _iterator11()).done;) {
+            var _filter3 = _step11.value;
             if (_filter3.id_format === 1) {
               new29Bit++;
             } else {
@@ -24691,8 +24752,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           var filters = config.phy[channel].filter;
           var seen = new Set();
           var uniqueFilters = [];
-          for (var _iterator14 = _createForOfIteratorHelperLoose(filters), _step14; !(_step14 = _iterator14()).done;) {
-            var filter = _step14.value;
+          for (var _iterator12 = _createForOfIteratorHelperLoose(filters), _step12; !(_step12 = _iterator12()).done;) {
+            var filter = _step12.value;
             var fieldsWithoutName = _objectWithoutPropertiesLoose(filter, _excluded);
             var key = JSON.stringify(fieldsWithoutName);
             if (!seen.has(key)) {
@@ -24713,8 +24774,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           var _filters = config[_channel3].filter.id;
           var _seen = new Set();
           var _uniqueFilters = [];
-          for (var _iterator15 = _createForOfIteratorHelperLoose(_filters), _step15; !(_step15 = _iterator15()).done;) {
-            var _filter4 = _step15.value;
+          for (var _iterator13 = _createForOfIteratorHelperLoose(_filters), _step13; !(_step13 = _iterator13()).done;) {
+            var _filter4 = _step13.value;
             var _fieldsWithoutName = _objectWithoutPropertiesLoose(_filter4, _excluded2);
             var _key = JSON.stringify(_fieldsWithoutName);
             if (!_seen.has(_key)) {
@@ -24810,15 +24871,15 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     });
   };
   _proto.render = function render() {
-    var _this12 = this;
-    var _this$state10 = this.state,
-      csvFileName = _this$state10.csvFileName,
-      dbcFileNames = _this$state10.dbcFileNames,
-      csvData = _this$state10.csvData,
-      mergedEntries = _this$state10.mergedEntries,
-      searchQuery = _this$state10.searchQuery,
-      groupJ1939Pgns = _this$state10.groupJ1939Pgns,
-      isLoading = _this$state10.isLoading;
+    var _this10 = this;
+    var _this$state0 = this.state,
+      csvFileName = _this$state0.csvFileName,
+      dbcFileNames = _this$state0.dbcFileNames,
+      csvData = _this$state0.csvData,
+      mergedEntries = _this$state0.mergedEntries,
+      searchQuery = _this$state0.searchQuery,
+      groupJ1939Pgns = _this$state0.groupJ1939Pgns,
+      isLoading = _this$state0.isLoading;
     var filteredEntries = this.getFilteredEntries();
     var allFilteredSelected = filteredEntries.length > 0 && filteredEntries.every(function (e) {
       return e.selected;
@@ -24849,7 +24910,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     }, /*#__PURE__*/React.createElement(Files, {
       onChange: this.handleCsvUpload,
       onError: function onError(error) {
-        return _this12.props.showAlert("danger", error.message);
+        return _this10.props.showAlert("danger", error.message);
       },
       accepts: [".csv"],
       multiple: false,
@@ -24863,7 +24924,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     }, /*#__PURE__*/React.createElement(Files, {
       onChange: this.handleDbcUpload,
       onError: function onError(error) {
-        return _this12.props.showAlert("danger", error.message);
+        return _this10.props.showAlert("danger", error.message);
       },
       accepts: [".dbc"],
       multiple: true,
@@ -24873,14 +24934,14 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     }, /*#__PURE__*/React.createElement("button", {
       className: "btn btn-primary"
     }, "Load DBC(s)"))), function () {
-      var isFirmwareSupported = _this12.isFirmwareVersionSupported();
-      var isCanmod = _this12.props.deviceType === "CANmod";
-      var isCanmodRouter = isCanmod && _this12.isCanmodRouter();
+      var isFirmwareSupported = _this10.isFirmwareVersionSupported();
+      var isCanmod = _this10.props.deviceType === "CANmod";
+      var isCanmodRouter = isCanmod && _this10.isCanmodRouter();
       var isDeviceSupported = !isCanmod || isCanmodRouter;
-      var hasConfig = _this12.props.formData && Object.keys(_this12.props.formData).length > 0;
+      var hasConfig = _this10.props.formData && Object.keys(_this10.props.formData).length > 0;
       return /*#__PURE__*/React.createElement("button", {
         className: "btn",
-        onClick: _this12.onReset,
+        onClick: _this10.onReset,
         disabled: !hasConfig || !isFirmwareSupported || !isDeviceSupported,
         style: {
           backgroundColor: "#fff",
@@ -24914,10 +24975,10 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       type: "checkbox",
       checked: groupJ1939Pgns,
       onChange: function onChange() {
-        _this12.setState({
+        _this10.setState({
           groupJ1939Pgns: !groupJ1939Pgns
         }, function () {
-          _this12.mergeData();
+          _this10.mergeData();
         });
       },
       style: {
@@ -24927,7 +24988,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     }), "Group 29-bit IDs as PGNs"), /*#__PURE__*/React.createElement("p", {
       className: "field-description field-description-shift"
     }, "In J1939/ISOBUS/NMEA protocol use cases it can be relevant to evaluate messages at the 18-bit PGN level instead of the 29-bit ID level.")), csvData && function () {
-      var isEnabled = _this12.props.formData && _this12.isFirmwareVersionSupported();
+      var isEnabled = _this10.props.formData && _this10.isFirmwareVersionSupported();
       return /*#__PURE__*/React.createElement("div", {
         className: "form-group pl0 field-string",
         style: {
@@ -24944,9 +25005,9 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         }
       }, /*#__PURE__*/React.createElement("input", {
         type: "checkbox",
-        checked: _this12.state.showFilteredSummary,
+        checked: _this10.state.showFilteredSummary,
         onChange: function onChange() {
-          return _this12.toggleFilteredSummary();
+          return _this10.toggleFilteredSummary();
         },
         disabled: !isEnabled,
         style: {
@@ -24995,10 +25056,10 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       }, label, ":"), /*#__PURE__*/React.createElement("input", {
         type: "text",
         className: "form-control encryption-input",
-        value: _this12.state["channelMap" + label],
+        value: _this10.state["channelMap" + label],
         onChange: function onChange(e) {
-          var _this12$setState;
-          return _this12.setState((_this12$setState = {}, _this12$setState["channelMap" + label] = e.target.value, _this12$setState));
+          var _this10$setState;
+          return _this10.setState((_this10$setState = {}, _this10$setState["channelMap" + label] = e.target.value, _this10$setState));
         },
         style: {
           width: "36px",
@@ -25114,11 +25175,11 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         marginLeft: "8px"
       }
     }, "Signals")), filteredEntries.map(function (entry) {
-      var isChannelValid = _this12.props.deviceType === "CANmod" ? _this12.isChannelValid(entry.channel) : true;
+      var isChannelValid = _this10.props.deviceType === "CANmod" ? _this10.isChannelValid(entry.channel) : true;
       return /*#__PURE__*/React.createElement("div", {
         key: entry.uniqueId,
         onClick: function onClick() {
-          return isChannelValid && _this12.handleEntryToggle(entry.uniqueId);
+          return isChannelValid && _this10.handleEntryToggle(entry.uniqueId);
         },
         style: {
           display: "flex",
@@ -25146,7 +25207,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         checked: entry.selected,
         disabled: !isChannelValid,
         onChange: function onChange() {
-          return isChannelValid && _this12.handleEntryToggle(entry.uniqueId);
+          return isChannelValid && _this10.handleEntryToggle(entry.uniqueId);
         }
       }), /*#__PURE__*/React.createElement("span", null))), /*#__PURE__*/React.createElement("span", {
         className: "binary-text-alt-2",
@@ -25183,7 +25244,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           display: "flex",
           alignItems: "center"
         }
-      }, _this12.renderBarChart(entry.isGroup ? entry.groupedPercentage : entry.percentage, maxPercentage), /*#__PURE__*/React.createElement("span", {
+      }, _this10.renderBarChart(entry.isGroup ? entry.groupedPercentage : entry.percentage, maxPercentage), /*#__PURE__*/React.createElement("span", {
         style: {
           marginLeft: "4px",
           fontFamily: "monospace",
@@ -25274,7 +25335,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         marginLeft: "4px"
       },
       onClick: function onClick() {
-        return _this12.selectTop(30);
+        return _this10.selectTop(30);
       }
     }, "Top 30"), /*#__PURE__*/React.createElement("span", {
       style: {
@@ -25287,7 +25348,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         cursor: "pointer"
       },
       onClick: function onClick() {
-        return _this12.selectTop(50);
+        return _this10.selectTop(50);
       }
     }, "Top 50"), /*#__PURE__*/React.createElement("span", {
       style: {
@@ -25300,7 +25361,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         cursor: "pointer"
       },
       onClick: function onClick() {
-        return _this12.selectMatched(true);
+        return _this10.selectMatched(true);
       }
     }, "Matched"), /*#__PURE__*/React.createElement("span", {
       style: {
@@ -25313,13 +25374,13 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         cursor: "pointer"
       },
       onClick: function onClick() {
-        return _this12.selectMatched(false);
+        return _this10.selectMatched(false);
       }
     }, "Unmatched")), csvData && function () {
-      var activeCsvData = _this12.state.showFilteredSummary && _this12.state.filteredCsvData ? _this12.state.filteredCsvData : csvData;
-      var isFiltered = _this12.state.showFilteredSummary && _this12.state.filteredCsvData;
-      var originalFileSize = _this12.csvFileSize / (1024 * 1024);
-      var filteredFileSize = isFiltered ? originalFileSize * (1 - _this12.state.filterReductionPercent / 100) : originalFileSize;
+      var activeCsvData = _this10.state.showFilteredSummary && _this10.state.filteredCsvData ? _this10.state.filteredCsvData : csvData;
+      var isFiltered = _this10.state.showFilteredSummary && _this10.state.filteredCsvData;
+      var originalFileSize = _this10.csvFileSize / (1024 * 1024);
+      var filteredFileSize = isFiltered ? originalFileSize * (1 - _this10.state.filterReductionPercent / 100) : originalFileSize;
       return /*#__PURE__*/React.createElement("div", {
         style: {
           fontSize: "12px",
@@ -25346,7 +25407,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           color: "#5cb85c",
           marginTop: "4px"
         }
-      }, "Showing filtered summary (reduction: ", /*#__PURE__*/React.createElement("strong", null, _this12.state.filterReductionPercent.toFixed(1), "%"), ")"));
+      }, "Showing filtered summary (reduction: ", /*#__PURE__*/React.createElement("strong", null, _this10.state.filterReductionPercent.toFixed(1), "%"), ")"));
     }(), function () {
       var hasSelection = mergedEntries.some(function (e) {
         return e.selected;
@@ -25372,10 +25433,10 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("div", {
         className: "col-xs-6",
         style: {
-          opacity: _this12.props.deviceType === "CANmod" ? 0.5 : 1,
-          pointerEvents: _this12.props.deviceType === "CANmod" ? "none" : "auto"
+          opacity: _this10.props.deviceType === "CANmod" ? 0.5 : 1,
+          pointerEvents: _this10.props.deviceType === "CANmod" ? "none" : "auto"
         },
-        title: _this12.props.deviceType === "CANmod" ? "CANmod only supports acceptance filters" : ""
+        title: _this10.props.deviceType === "CANmod" ? "CANmod only supports acceptance filters" : ""
       }, /*#__PURE__*/React.createElement(SimpleDropdown, {
         name: "Type",
         options: [{
@@ -25385,53 +25446,53 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           value: "rejection",
           label: "Rejection"
         }],
-        value: _this12.state.filterType,
+        value: _this10.state.filterType,
         onChange: function onChange(opt) {
-          return _this12.setState({
+          return _this10.setState({
             filterType: opt.value
           }, function () {
-            return _this12.generateFilterConfig();
+            return _this10.generateFilterConfig();
           });
         }
-      })), _this12.state.filterType === "acceptance" && /*#__PURE__*/React.createElement("div", {
+      })), _this10.state.filterType === "acceptance" && /*#__PURE__*/React.createElement("div", {
         className: "col-xs-6"
       }, /*#__PURE__*/React.createElement(SimpleDropdown, {
         name: "Prescaler",
         options: prescalerOptions,
-        value: _this12.state.prescalerType,
+        value: _this10.state.prescalerType,
         onChange: function onChange(opt) {
-          return _this12.setState({
+          return _this10.setState({
             prescalerType: opt.value
           }, function () {
-            return _this12.generateFilterConfig();
+            return _this10.generateFilterConfig();
           });
         }
-      }))), _this12.state.filterType === "acceptance" && _this12.state.prescalerType !== "none" && /*#__PURE__*/React.createElement("div", {
+      }))), _this10.state.filterType === "acceptance" && _this10.state.prescalerType !== "none" && /*#__PURE__*/React.createElement("div", {
         className: "form-group pl0 field-string"
-      }, _this12.state.prescalerType === "count" && "Count value", _this12.state.prescalerType === "time" && "Time interval (ms)", _this12.state.prescalerType === "data" && "Data mask (hex)", (_this12.state.prescalerType === "count" || _this12.state.prescalerType === "time") && /*#__PURE__*/React.createElement("input", {
+      }, _this10.state.prescalerType === "count" && "Count value", _this10.state.prescalerType === "time" && "Time interval (ms)", _this10.state.prescalerType === "data" && "Data mask (hex)", (_this10.state.prescalerType === "count" || _this10.state.prescalerType === "time") && /*#__PURE__*/React.createElement("input", {
         type: "number",
         className: "form-control encryption-input",
         min: "1",
-        max: _this12.state.prescalerType === "count" ? 256 : 4194304,
-        value: _this12.state.prescalerValue,
+        max: _this10.state.prescalerType === "count" ? 256 : 4194304,
+        value: _this10.state.prescalerValue,
         onChange: function onChange(e) {
-          return _this12.setState({
+          return _this10.setState({
             prescalerValue: parseInt(e.target.value) || 1
           }, function () {
-            return _this12.generateFilterConfig();
+            return _this10.generateFilterConfig();
           });
         }
-      }), _this12.state.prescalerType === "data" && /*#__PURE__*/React.createElement("input", {
+      }), _this10.state.prescalerType === "data" && /*#__PURE__*/React.createElement("input", {
         type: "text",
         className: "form-control encryption-input",
-        value: _this12.state.dataPrescalerMask,
+        value: _this10.state.dataPrescalerMask,
         onChange: function onChange(e) {
           var val = e.target.value.toUpperCase();
           if (/^[a-fA-F0-9]*$/.test(val) && val.length <= 16) {
-            _this12.setState({
+            _this10.setState({
               dataPrescalerMask: val
             }, function () {
-              return _this12.generateFilterConfig();
+              return _this10.generateFilterConfig();
             });
           }
         },
@@ -25442,7 +25503,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         }
       }), /*#__PURE__*/React.createElement("span", {
         className: "field-description field-description-shift"
-      }, _this12.state.prescalerType === "count" && "Accept every Nth message (1-256)", _this12.state.prescalerType === "time" && "Minimum time between messages (1-4194304 ms)", _this12.state.prescalerType === "data" && "Hex mask for data change detection")), /*#__PURE__*/React.createElement("div", {
+      }, _this10.state.prescalerType === "count" && "Accept every Nth message (1-256)", _this10.state.prescalerType === "time" && "Minimum time between messages (1-4194304 ms)", _this10.state.prescalerType === "data" && "Hex mask for data change detection")), /*#__PURE__*/React.createElement("div", {
         className: "form-group pl0 field-string",
         style: {
           marginBottom: "10px"
@@ -25465,12 +25526,12 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         type: "radio",
         name: "filterMergeMode",
         value: "replace",
-        checked: _this12.state.filterMergeMode === "replace",
+        checked: _this10.state.filterMergeMode === "replace",
         onChange: function onChange(e) {
-          return _this12.setState({
+          return _this10.setState({
             filterMergeMode: e.target.value
           }, function () {
-            return _this12.generateFilterConfig();
+            return _this10.generateFilterConfig();
           });
         },
         style: {
@@ -25493,12 +25554,12 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         type: "radio",
         name: "filterMergeMode",
         value: "append_top",
-        checked: _this12.state.filterMergeMode === "append_top",
+        checked: _this10.state.filterMergeMode === "append_top",
         onChange: function onChange(e) {
-          return _this12.setState({
+          return _this10.setState({
             filterMergeMode: e.target.value
           }, function () {
-            return _this12.generateFilterConfig();
+            return _this10.generateFilterConfig();
           });
         },
         style: {
@@ -25521,12 +25582,12 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         type: "radio",
         name: "filterMergeMode",
         value: "append_bottom",
-        checked: _this12.state.filterMergeMode === "append_bottom",
+        checked: _this10.state.filterMergeMode === "append_bottom",
         onChange: function onChange(e) {
-          return _this12.setState({
+          return _this10.setState({
             filterMergeMode: e.target.value
           }, function () {
-            return _this12.generateFilterConfig();
+            return _this10.generateFilterConfig();
           });
         },
         style: {
@@ -25562,9 +25623,9 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         }, 0);
         return " (" + count11Bit + " 11-bit, " + count29Bit + " 29-bit) | " + sizePercent.toFixed(1) + "%";
       }()), function () {
-        var isFirmwareSupported = _this12.isFirmwareVersionSupported();
-        var isCanmod = _this12.props.deviceType === "CANmod";
-        var isCanmodRouter = isCanmod && _this12.isCanmodRouter();
+        var isFirmwareSupported = _this10.isFirmwareVersionSupported();
+        var isCanmod = _this10.props.deviceType === "CANmod";
+        var isCanmodRouter = isCanmod && _this10.isCanmodRouter();
         var minFirmware = isCanmod ? MIN_FIRMWARE_CANMOD_ROUTER : MIN_FIRMWARE_CANEDGE;
         var isDeviceSupported = !isCanmod || isCanmodRouter;
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -25575,25 +25636,25 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           }
         }, /*#__PURE__*/React.createElement("button", {
           className: "btn btn-primary",
-          onClick: _this12.onMerge,
-          disabled: !_this12.props.formData || Object.keys(_this12.props.formData).length === 0 || _this12.state.mergedConfigValid !== true || !isFirmwareSupported || !isDeviceSupported
+          onClick: _this10.onMerge,
+          disabled: !_this10.props.formData || Object.keys(_this10.props.formData).length === 0 || _this10.state.mergedConfigValid !== true || !isFirmwareSupported || !isDeviceSupported
         }, "Merge files"), /*#__PURE__*/React.createElement("button", {
           className: "btn btn-default",
-          onClick: _this12.onDownload,
-          disabled: Object.keys(_this12.state.generatedFilterConfig).length === 0
+          onClick: _this10.onDownload,
+          disabled: Object.keys(_this10.state.generatedFilterConfig).length === 0
         }, "Download JSON")), function () {
-          var mergeDisabled = !_this12.props.formData || Object.keys(_this12.props.formData).length === 0 || _this12.state.mergedConfigValid !== true || !isFirmwareSupported || !isDeviceSupported;
+          var mergeDisabled = !_this10.props.formData || Object.keys(_this10.props.formData).length === 0 || _this10.state.mergedConfigValid !== true || !isFirmwareSupported || !isDeviceSupported;
           if (!mergeDisabled) return null;
           var reason = "";
-          if (!_this12.props.formData || Object.keys(_this12.props.formData).length === 0) {
+          if (!_this10.props.formData || Object.keys(_this10.props.formData).length === 0) {
             reason = "No configuration file loaded";
           } else if (!isDeviceSupported) {
             reason = "Only CANmod.router is supported for CANmod devices";
           } else if (!isFirmwareSupported) {
             reason = "Merging requires firmware " + minFirmware + ".XX+ - please update your device";
-          } else if (_this12.state.mergedConfigValid === "Unknown") {
+          } else if (_this10.state.mergedConfigValid === "Unknown") {
             reason = "No filters selected";
-          } else if (_this12.state.mergedConfigValid === false) {
+          } else if (_this10.state.mergedConfigValid === false) {
             reason = "Generated filter configuration is invalid";
           }
           return reason ? /*#__PURE__*/React.createElement("div", {
@@ -25604,7 +25665,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
             }
           }, reason) : null;
         }());
-      }(), Object.keys(_this12.state.generatedFilterConfig).length > 0 && /*#__PURE__*/React.createElement("div", {
+      }(), Object.keys(_this10.state.generatedFilterConfig).length > 0 && /*#__PURE__*/React.createElement("div", {
         style: {
           marginTop: "10px"
         }
@@ -25617,17 +25678,17 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         }
       }, /*#__PURE__*/React.createElement("input", {
         type: "checkbox",
-        checked: _this12.state.showFilterPreview,
+        checked: _this10.state.showFilterPreview,
         onChange: function onChange() {
-          return _this12.setState({
-            showFilterPreview: !_this12.state.showFilterPreview
+          return _this10.setState({
+            showFilterPreview: !_this10.state.showFilterPreview
           });
         },
         style: {
           marginRight: "6px",
           marginBottom: "4px"
         }
-      }), "Show partial config preview"), _this12.state.showFilterPreview && /*#__PURE__*/React.createElement("div", {
+      }), "Show partial config preview"), _this10.state.showFilterPreview && /*#__PURE__*/React.createElement("div", {
         style: {
           marginTop: "10px"
         }
@@ -25638,7 +25699,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           overflow: "auto",
           fontSize: "11px"
         }
-      }, JSON.stringify(_this12.state.generatedFilterConfig, null, 2)))));
+      }, JSON.stringify(_this10.state.generatedFilterConfig, null, 2)))));
     }()), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null)));
   };
   return FilterBuilderTool;