config-editor-base 2.9.2 → 2.9.4

package/dist/index.js

@@ -980,8 +980,6 @@ var checkConfigFilterLimits = function checkConfigFilterLimits(content) {
             count11Bit++;
           }
         }
-        console.log("count11Bit", count11Bit);
-        console.log("count29Bit", count29Bit);
         if (count11Bit > MAX_11BIT_FILTERS) {
           dispatch(set({
             type: "warning",
@@ -19595,7 +19593,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
         transition: 'opacity 1s ease-out',
         opacity: this.state.showNewToolsHighlight ? 1 : 0
       }
-    }, "New: OBD & filter builder tools"))))))), /*#__PURE__*/React.createElement("div", {
+    }, "Tip: New editor tools added"))))))), /*#__PURE__*/React.createElement("div", {
       className: "config-bar-background"
     }));
   };
@@ -23980,16 +23978,29 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           var isPdu1 = (pgn & 0xFF00) < 0xF000;
           var mask = isPdu1 ? "3FF0000" : "3FFFF00";
           var filterId = isPdu1 ? ((pgn & 0x3FF00) << 8).toString(16).toUpperCase() : (pgn << 8).toString(16).toUpperCase();
-          var filter = {
-            name: (_entry4.messageName || "PGN " + pgn.toString(16).toUpperCase()).substring(0, 16),
-            state: 1,
-            type: filterTypeValue,
-            id_format: 1,
-            method: 1,
-            f1: filterId,
-            f2: mask,
-            prescaler_type: prescaler_type
-          };
+          var filter = void 0;
+          if (isCanmodRouter) {
+            filter = {
+              name: (_entry4.messageName || "PGN " + pgn.toString(16).toUpperCase()).substring(0, 16),
+              state: 1,
+              id_format: 1,
+              frame_format: 2,
+              f1: filterId,
+              f2: mask,
+              prescaler_type: prescaler_type
+            };
+          } else {
+            filter = {
+              name: (_entry4.messageName || "PGN " + pgn.toString(16).toUpperCase()).substring(0, 16),
+              state: 1,
+              type: filterTypeValue,
+              id_format: 1,
+              method: 1,
+              f1: filterId,
+              f2: mask,
+              prescaler_type: prescaler_type
+            };
+          }
           if (prescaler_value !== undefined) {
             filter.prescaler_value = prescaler_value;
           }
@@ -24096,10 +24107,14 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           });
           var validate = ajv.compile(schemaContent);
           var valid = validate(mergedConfigTemp);
+          if (!valid && validate.errors) {
+            console.log("AJV validation errors:", validate.errors);
+          }
           _this11.setState({
             mergedConfigValid: valid
           });
         } catch (e) {
+          console.log("AJV compilation/validation exception:", e);
           _this11.setState({
             mergedConfigValid: false
           });
@@ -24859,7 +24874,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         style: {
           opacity: _this12.props.deviceType === "CANmod" ? 0.5 : 1,
           pointerEvents: _this12.props.deviceType === "CANmod" ? "none" : "auto"
-        }
+        },
+        title: _this12.props.deviceType === "CANmod" ? "CANmod only supports acceptance filters" : ""
       }, /*#__PURE__*/React.createElement(SimpleDropdown, {
         name: "Type",
         options: [{
@@ -24877,13 +24893,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
             return _this12.generateFilterConfig();
           });
         }
-      }), _this12.props.deviceType === "CANmod" && /*#__PURE__*/React.createElement("span", {
-        className: "field-description",
-        style: {
-          fontSize: "11px",
-          color: "#999"
-        }
-      }, "CANmod only supports acceptance filters")), _this12.state.filterType === "acceptance" && /*#__PURE__*/React.createElement("div", {
+      })), _this12.state.filterType === "acceptance" && /*#__PURE__*/React.createElement("div", {
         className: "col-xs-6"
       }, /*#__PURE__*/React.createElement(SimpleDropdown, {
         name: "Prescaler",
@@ -25066,13 +25076,29 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
           className: "btn btn-default",
           onClick: _this12.onDownload,
           disabled: Object.keys(_this12.state.generatedFilterConfig).length === 0
-        }, "Download JSON")), _this12.props.formData && Object.keys(_this12.props.formData).length > 0 && isDeviceSupported && !isFirmwareSupported && /*#__PURE__*/React.createElement("div", {
-          style: {
-            fontSize: "12px",
-            color: "#666",
-            marginTop: "8px"
+        }, "Download JSON")), function () {
+          var mergeDisabled = !_this12.props.formData || Object.keys(_this12.props.formData).length === 0 || _this12.state.mergedConfigValid !== true || !isFirmwareSupported || !isDeviceSupported;
+          if (!mergeDisabled) return null;
+          var reason = "";
+          if (!_this12.props.formData || Object.keys(_this12.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") {
+            reason = "No filters selected";
+          } else if (_this12.state.mergedConfigValid === false) {
+            reason = "Generated filter configuration is invalid";
           }
-        }, "Merging requires firmware ", minFirmware, ".XX+ - please update your device"));
+          return reason ? /*#__PURE__*/React.createElement("div", {
+            style: {
+              fontSize: "12px",
+              color: "#d9534f",
+              marginTop: "8px"
+            }
+          }, reason) : null;
+        }());
       }(), Object.keys(_this12.state.generatedFilterConfig).length > 0 && /*#__PURE__*/React.createElement("div", {
         style: {
           marginTop: "10px"