config-editor-base 3.1.3 → 3.2.2

package/dist/index.js

@@ -5,7 +5,8 @@ var reactRedux = require('react-redux');
 var classNames = _interopDefault(require('classnames'));
 var validator = _interopDefault(require('@rjsf/validator-ajv6'));
 var Form = _interopDefault(require('@rjsf/core'));
-var saveAs = _interopDefault(require('file-saver'));
+var saveAs = require('file-saver');
+var saveAs__default = _interopDefault(saveAs);
 var Select = _interopDefault(require('react-select'));
 var Files = _interopDefault(require('react-files'));
 var applyNav = require('rjsf-tabs');
@@ -150,7 +151,7 @@ var loadFile = function loadFile(fileName) {
 var _require = require('detect-browser'),
   detect = _require.detect;
 var browser = detect();
-var crcBrowserSupport = ['chrome', 'firefox', 'opera', 'safari', 'edge'].includes(browser.name);
+var crcBrowserSupport = ['chrome', 'firefox', 'opera', 'safari', 'edge'].includes(browser && browser.name);
 
 var SET_SCHEMA_LIST = "editor/SET_SCHEMA_LIST";
 var SET_CONFIG_LIST = "editor/SET_CONFIG_LIST";
@@ -1062,6 +1063,19 @@ var checkConfigAwsEndpoint = function checkConfigAwsEndpoint(content) {
     }
   };
 };
+var checkS3OtaDisabled = function checkS3OtaDisabled(content) {
+  return function (dispatch) {
+    if (content.connect != undefined && content.connect.s3 != undefined && content.connect.s3.sync != undefined) {
+      if (content.connect.s3.sync.ota != undefined && content.connect.s3.sync.ota == 0) {
+        dispatch(set({
+          type: "warning",
+          message: "Your S3 firmware/config/certificate update interval (OTA) is set to 0, which disables over-the-air updates. The device will not fetch future configuration changes remotely. Set a non-zero interval unless this is intentional",
+          autoClear: false
+        }));
+      }
+    }
+  };
+};
 var checkS3EncryptedPasswordsNoKpub = function checkS3EncryptedPasswordsNoKpub(content) {
   return function (dispatch) {
     if (content.connect != undefined && content.connect.s3 != undefined && content.connect.s3.server != undefined && content.general != undefined && content.general.security != undefined) {
@@ -1274,6 +1288,7 @@ var runConfigurationWarningChecks = function runConfigurationWarningChecks(conte
       dispatch(checkConfigFilterLimits(content));
       dispatch(checkConfigTls(content));
       dispatch(checkConfigAwsEndpoint(content));
+      dispatch(checkS3OtaDisabled(content));
       dispatch(checkS3EncryptedPasswordsNoKpub(content));
       dispatch(checkWiFiEncryptedPasswordsNoKpub(content));
       dispatch(checkFileSplitOffsetPeriod(content));
@@ -1294,6 +1309,19 @@ var runConfigurationWarningChecks = function runConfigurationWarningChecks(conte
     dispatch(checkCANmodMonitoringMode(content));
   };
 };
+var collectConfigurationWarnings = function collectConfigurationWarnings(content) {
+  var messages = [];
+  var _capture = function capture(action) {
+    if (typeof action === "function") return action(_capture, function () {
+      return {};
+    });
+    if (action && action.type === "alert/SET" && action.alert && action.alert.type === "warning") {
+      messages.push(action.alert.message);
+    }
+  };
+  _capture(runConfigurationWarningChecks(content));
+  return messages;
+};
 var checkCANmodMonitoringMode = function checkCANmodMonitoringMode(content) {
   return function (dispatch) {
     var _content$phy, _content$phy$can, _content$phy$can$phy;
@@ -1314,7 +1342,7 @@ var saveUpdatedConfiguration = function saveUpdatedConfiguration(filename, conte
     var blob = new Blob([JSON.stringify(content, null, 2)], {
       type: "text/json"
     });
-    saveAs(blob, "" + filename);
+    saveAs__default(blob, "" + filename);
   };
 };
 var setUpdatedFormData = function setUpdatedFormData(formData) {
@@ -1417,6 +1445,7 @@ var actions = {
   checkConfigControlSignalZeroScalingFactor: checkConfigControlSignalZeroScalingFactor,
   checkConfigTls: checkConfigTls,
   checkConfigAwsEndpoint: checkConfigAwsEndpoint,
+  checkS3OtaDisabled: checkS3OtaDisabled,
   checkS3EncryptedPasswordsNoKpub: checkS3EncryptedPasswordsNoKpub,
   checkWiFiEncryptedPasswordsNoKpub: checkWiFiEncryptedPasswordsNoKpub,
   checkFileSplitOffsetPeriod: checkFileSplitOffsetPeriod,
@@ -1433,6 +1462,7 @@ var actions = {
   checkFileSplitValue: checkFileSplitValue,
   checkGNSSEstimate: checkGNSSEstimate,
   runConfigurationWarningChecks: runConfigurationWarningChecks,
+  collectConfigurationWarnings: collectConfigurationWarnings,
   checkCANmodMonitoringMode: checkCANmodMonitoringMode,
   saveUpdatedConfiguration: saveUpdatedConfiguration,
   setUpdatedFormData: setUpdatedFormData,
@@ -18938,11 +18968,9 @@ var PartialConfigLoader = /*#__PURE__*/function (_React$Component) {
     var _this$props = this.props,
       formData = _this$props.formData,
       schemaContent = _this$props.schemaContent;
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, "Partial config loader"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, "Partial config loader"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       className: "form-group pl0 field-string"
     }, /*#__PURE__*/React.createElement("p", {
-      className: "reduced-margin"
-    }, "Upload partial Configuration File"), /*#__PURE__*/React.createElement("p", {
       className: "field-description field-description-shift"
     }, "Select a JSON file containing a partial Configuration File. This lets you e.g. load a list of transmit messages or filters. The loaded JSON is validated vs. the Rule Schema, after which it can be merged into the editor Configuration File (even if it is not valid)")), /*#__PURE__*/React.createElement("div", null, formData ? /*#__PURE__*/React.createElement("div", {
       className: "text-area-wrapper row no-gutters reduced-margin"
@@ -18961,10 +18989,13 @@ var PartialConfigLoader = /*#__PURE__*/function (_React$Component) {
       minFileSize: 0,
       clickable: true
     }, /*#__PURE__*/React.createElement("button", {
-      className: "btn btn-primary"
+      className: "btn btn-primary",
+      title: "Upload a partial Configuration File to merge it"
     }, "Load JSON file"), /*#__PURE__*/React.createElement("div", {
       className: "browse-file-name"
-    }, jsonFileName))), Object.keys(jsonFile).length ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("pre", {
+    }, jsonFileName))), Object.keys(jsonFile).length ? /*#__PURE__*/React.createElement("div", {
+      className: "text-area-wrapper row no-gutters"
+    }, /*#__PURE__*/React.createElement("pre", {
       className: "browse-file-preview"
     }, JSON.stringify(jsonFile, null, 2)), formData ? /*#__PURE__*/React.createElement("div", null, mergedConfigValid ? /*#__PURE__*/React.createElement("div", {
       className: "btn-highlight",
@@ -19159,6 +19190,57 @@ function ArrayFieldTemplate(props) {
   }), " "))));
 }
 
+var isPlainObject = function isPlainObject(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
+};
+var jsonEqual = function jsonEqual(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+};
+var clone = function clone(value) {
+  return JSON.parse(JSON.stringify(value));
+};
+var computeConfigDelta = function computeConfigDelta(past, current) {
+  var deletions = [];
+  if (!isPlainObject(past) || !isPlainObject(current)) {
+    return {
+      partial: isPlainObject(current) ? clone(current) : {},
+      deletions: deletions
+    };
+  }
+  var _walk = function walk(pastNode, currentNode, path) {
+    var partialNode = {};
+    Object.keys(currentNode).forEach(function (key) {
+      var childPath = path ? path + '.' + key : key;
+      var pastValue = pastNode[key];
+      var currentValue = currentNode[key];
+      if (!(key in pastNode)) {
+        partialNode[key] = clone(currentValue);
+      } else if (isPlainObject(pastValue) && isPlainObject(currentValue)) {
+        var childPartial = _walk(pastValue, currentValue, childPath);
+        if (Object.keys(childPartial).length) {
+          partialNode[key] = childPartial;
+        }
+      } else if (!jsonEqual(pastValue, currentValue)) {
+        if (Array.isArray(pastValue) && isPlainObject(currentValue)) {
+          deletions.push(childPath);
+        } else {
+          partialNode[key] = clone(currentValue);
+        }
+      }
+    });
+    Object.keys(pastNode).forEach(function (key) {
+      if (!(key in currentNode)) {
+        deletions.push(path ? path + '.' + key : key);
+      }
+    });
+    return partialNode;
+  };
+  return {
+    partial: _walk(past, current, ''),
+    deletions: deletions
+  };
+};
+
 var selectOptions$1 = function selectOptions(Files) {
   Files = lodash.orderBy(Files, ["name"], ["desc"]);
   return [].concat(Files, [{
@@ -19174,7 +19256,7 @@ var pastCrc32 = "N/A";
 var _require$1 = require("detect-browser"),
   detect$1 = _require$1.detect;
 var browser$1 = detect$1();
-var crcBrowserSupport$1 = ["chrome", "firefox", "opera", "safari", "edge"].includes(browser$1.name);
+var crcBrowserSupport$1 = ["chrome", "firefox", "opera", "safari", "edge"].includes(browser$1 && browser$1.name);
 var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
   function EditorChangesComparison(props) {
     var _this;
@@ -19187,6 +19269,68 @@ var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
     _this.handleSelectChange = function (selectedValue) {
       _this.props.handleDropdownChange(selectedValue.value, "Previous Configuration File");
     };
+    _this.getPartialDelta = function () {
+      var _this$props = _this.props,
+        past = _this$props.past,
+        current = _this$props.current,
+        showAlert = _this$props.showAlert;
+      var pastObj = null;
+      try {
+        pastObj = JSON.parse(past);
+      } catch (e) {
+        pastObj = null;
+      }
+      if (!pastObj || typeof pastObj !== "object") {
+        if (showAlert) {
+          showAlert("info", "Select a Previous Configuration File first");
+        }
+        return null;
+      }
+      var _computeConfigDelta = computeConfigDelta(pastObj, current),
+        partial = _computeConfigDelta.partial,
+        deletions = _computeConfigDelta.deletions;
+      if (!Object.keys(partial).length) {
+        if (showAlert) {
+          showAlert("info", "No changes detected vs. the Previous Configuration File");
+        }
+        return null;
+      }
+      if (deletions.length && showAlert) {
+        showAlert("warning", deletions.length + " deleted setting(s) cannot be expressed in a partial config and were excluded: " + deletions.join(", "));
+      }
+      return {
+        partial: partial,
+        deletions: deletions
+      };
+    };
+    _this.onDownloadPartial = function () {
+      var delta = _this.getPartialDelta();
+      if (!delta) {
+        return;
+      }
+      var revisedConfigFile = _this.props.revisedConfigFile;
+      var fileName = "partial-" + (revisedConfigFile && revisedConfigFile.value || "config.json");
+      var blob = new Blob([JSON.stringify(delta.partial, null, 2)], {
+        type: "text/json"
+      });
+      saveAs.saveAs(blob, fileName);
+    };
+    _this.onTransferClick = function () {
+      var delta = _this.getPartialDelta();
+      if (!delta) {
+        return;
+      }
+      var _this$props2 = _this.props,
+        onTransferPartial = _this$props2.onTransferPartial,
+        closeChangesModal = _this$props2.closeChangesModal,
+        revisedConfigFile = _this$props2.revisedConfigFile;
+      closeChangesModal();
+      onTransferPartial({
+        partial: delta.partial,
+        deletions: delta.deletions,
+        configName: revisedConfigFile && revisedConfigFile.value || null
+      });
+    };
     _this.toggleCheckbox = _this.toggleCheckbox.bind(_this);
     _this.handleSelectChange = _this.handleSelectChange.bind(_this);
     _this.state = {
@@ -19197,17 +19341,17 @@ var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(EditorChangesComparison, _React$Component);
   var _proto = EditorChangesComparison.prototype;
   _proto.render = function render() {
-    var _this$props = this.props,
-      options = _this$props.options,
-      selected = _this$props.selected,
-      past = _this$props.past,
-      current = _this$props.current,
-      closeChangesModal = _this$props.closeChangesModal,
-      revisedConfigFile = _this$props.revisedConfigFile,
-      crc32EditorLive = _this$props.crc32EditorLive,
-      isCompareChanges = _this$props.isCompareChanges,
-      enableDownload = _this$props.enableDownload,
-      externalSubmit = _this$props.externalSubmit;
+    var _this$props3 = this.props,
+      options = _this$props3.options,
+      selected = _this$props3.selected,
+      past = _this$props3.past,
+      current = _this$props3.current,
+      closeChangesModal = _this$props3.closeChangesModal,
+      revisedConfigFile = _this$props3.revisedConfigFile,
+      crc32EditorLive = _this$props3.crc32EditorLive,
+      isCompareChanges = _this$props3.isCompareChanges,
+      enableDownload = _this$props3.enableDownload,
+      externalSubmit = _this$props3.externalSubmit;
     var pastCleaned = past && Object.keys(past).length ? JSON.stringify(JSON.parse(past), null, 2) : "";
     if (crcBrowserSupport$1 == 1 && past && Object.keys(past).length) {
       var _require2 = require("crc"),
@@ -19216,6 +19360,15 @@ var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
     } else {
       pastCrc32 = "N/A";
     }
+    var partialAvailable = false;
+    try {
+      var pastObj = past ? JSON.parse(past) : null;
+      if (pastObj && typeof pastObj === "object") {
+        partialAvailable = Object.keys(computeConfigDelta(pastObj, current).partial).length > 0;
+      }
+    } catch (e) {
+      partialAvailable = false;
+    }
     return /*#__PURE__*/React.createElement("div", {
       className: isCompareChanges ? "show modal-custom-wrapper" : "hidden modal-custom-wrapper"
     }, /*#__PURE__*/React.createElement("div", {
@@ -19292,7 +19445,19 @@ var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
       type: "submit",
       onClick: enableDownload,
       className: "btn btn-primary ml15"
-    }, " ", "Download to disk", " "))));
+    }, " ", "Download to disk", " "), /*#__PURE__*/React.createElement("button", {
+      type: "button",
+      onClick: this.onDownloadPartial,
+      className: "btn btn-white ml15",
+      disabled: !partialAvailable,
+      title: "Download the delta changes as a partial config JSON e.g. for application across multiple devices"
+    }, " ", "Download partial JSON to disk", " "), typeof this.props.onTransferPartial === "function" ? /*#__PURE__*/React.createElement("button", {
+      type: "button",
+      onClick: this.onTransferClick,
+      className: "btn btn-white ml15",
+      disabled: !partialAvailable,
+      title: "Transfer the delta changes as a partial config JSON to the OTA batch manager for application across multiple devices"
+    }, " ", "Transfer to OTA batch manager", " ") : null)));
   };
   return EditorChangesComparison;
 }(React.Component);
@@ -19627,7 +19792,9 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
       handleDropdownChange: this.handleDropdownChange,
       closeChangesModal: this.closeChangesModal,
       enableDownload: this.enableDownload.bind(this),
-      externalSubmit: this.props.fetchFileContentExt ? true : false
+      externalSubmit: this.props.fetchFileContentExt ? true : false,
+      showAlert: this.props.showAlert,
+      onTransferPartial: this.props.onTransferPartial
     }), /*#__PURE__*/React.createElement("div", {
       className: classNames({
         'config-bar': true,
@@ -22769,8 +22936,7 @@ var OBDTool = /*#__PURE__*/function (_React$Component) {
         });
       },
       style: {
-        marginRight: "6px",
-        marginBottom: "4px"
+        marginRight: "6px"
       }
     }), "Add filter to only log OBD data on ", channel === "can_1" ? "CAN-1" : "CAN-2"), /*#__PURE__*/React.createElement("p", {
       className: "field-description field-description-shift"
@@ -22799,8 +22965,7 @@ var OBDTool = /*#__PURE__*/function (_React$Component) {
       },
       disabled: !hasGnssSupport,
       style: {
-        marginRight: "6px",
-        marginBottom: "4px"
+        marginRight: "6px"
       }
     }), "Add GPS-based speed control signal"), /*#__PURE__*/React.createElement("p", {
       className: "field-description field-description-shift"
@@ -24917,7 +25082,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       style: {
         width: barWidth + "px",
         height: "10px",
-        backgroundColor: "#4a90d9",
+        backgroundColor: "#46a5e0",
         borderRadius: "2px",
         display: "inline-block"
       }
@@ -25035,8 +25200,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         });
       },
       style: {
-        marginRight: "6px",
-        marginBottom: "2px"
+        marginRight: "6px"
       }
     }), "Group 29-bit IDs as PGNs"), /*#__PURE__*/React.createElement("p", {
       className: "field-description field-description-shift"
@@ -25064,8 +25228,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         },
         disabled: !isEnabled,
         style: {
-          marginRight: "6px",
-          marginBottom: "2px"
+          marginRight: "6px"
         }
       }), "Show summary with current filters"), /*#__PURE__*/React.createElement("p", {
         className: "field-description field-description-shift"
@@ -25383,7 +25546,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       }
     }, "Select: "), /*#__PURE__*/React.createElement("span", {
       style: {
-        color: "#337ab7",
+        color: "#46a5e0",
         cursor: "pointer",
         marginLeft: "4px"
       },
@@ -25397,7 +25560,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       }
     }, "|"), /*#__PURE__*/React.createElement("span", {
       style: {
-        color: "#337ab7",
+        color: "#46a5e0",
         cursor: "pointer"
       },
       onClick: function onClick() {
@@ -25410,7 +25573,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       }
     }, "|"), /*#__PURE__*/React.createElement("span", {
       style: {
-        color: "#337ab7",
+        color: "#46a5e0",
         cursor: "pointer"
       },
       onClick: function onClick() {
@@ -25423,7 +25586,7 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       }
     }, "|"), /*#__PURE__*/React.createElement("span", {
       style: {
-        color: "#337ab7",
+        color: "#46a5e0",
         cursor: "pointer"
       },
       onClick: function onClick() {
@@ -25751,6 +25914,7 @@ var FilterBuilderTool$1 = reactRedux.connect(mapStateToProps$4, mapDispatchToPro
 exports.EditorSection = EditorSection$1;
 exports.FilterBuilderTool = FilterBuilderTool$1;
 exports.OBDTool = OBDTool$1;
+exports.computeConfigDelta = computeConfigDelta;
 exports.editor = reducer;
 exports.editorActions = actions;
 //# sourceMappingURL=index.js.map