config-editor-base 3.0.7 → 3.0.8

package/dist/index.js

@@ -1116,6 +1116,17 @@ var checkRTCAdjustment = function checkRTCAdjustment(content) {
     }
   };
 };
+var checkRTCSyncManual = function checkRTCSyncManual(content) {
+  return function (dispatch) {
+    if (content.rtc != undefined && content.rtc.sync === 1) {
+      dispatch(set({
+        type: "warning",
+        message: "You have set the RTC synchronization method to 'Manual update'. This is only intended for one-off RTC resets. Once you have properly reset the RTC, change the method to one of the other methods",
+        autoClear: false
+      }));
+    }
+  };
+};
 var checkConfigTlsPort = function checkConfigTlsPort(content) {
   return function (dispatch) {
     if (content.connect != undefined && content.connect.s3 != undefined && content.connect.s3.server != undefined) {
@@ -1267,6 +1278,7 @@ var runConfigurationWarningChecks = function runConfigurationWarningChecks(conte
       dispatch(checkWiFiEncryptedPasswordsNoKpub(content));
       dispatch(checkFileSplitOffsetPeriod(content));
       dispatch(checkRTCAdjustment(content));
+      dispatch(checkRTCSyncManual(content));
       dispatch(checkConfigTlsPort(content));
       dispatch(checkFileSplitValue(content));
       dispatch(checkMissingAPN(content));
@@ -1308,6 +1320,7 @@ var saveUpdatedConfiguration = function saveUpdatedConfiguration(filename, conte
 var setUpdatedFormData = function setUpdatedFormData(formData) {
   return function (dispatch) {
     dispatch(setUpdatedFormDataValue(formData));
+    dispatch(setConfigContent(formData));
     dispatch(calcCrc32EditorLive());
   };
 };
@@ -1409,6 +1422,7 @@ var actions = {
   checkWiFiEncryptedPasswordsNoKpub: checkWiFiEncryptedPasswordsNoKpub,
   checkFileSplitOffsetPeriod: checkFileSplitOffsetPeriod,
   checkRTCAdjustment: checkRTCAdjustment,
+  checkRTCSyncManual: checkRTCSyncManual,
   checkConfigTlsPort: checkConfigTlsPort,
   checkMissingAPN: checkMissingAPN,
   checkMissingWiFi: checkMissingWiFi,
@@ -19150,8 +19164,10 @@ var selectOptions$1 = function selectOptions(Files) {
   });
 };
 var pastCrc32 = "N/A";
-var _require$1 = require("detect-browser"),
-  detect$1 = _require$1.detect;
+var _require$1 = require("difflib"),
+  unifiedDiff = _require$1.unifiedDiff;
+var _require2 = require("detect-browser"),
+  detect$1 = _require2.detect;
 var browser$1 = detect$1();
 var crcBrowserSupport$1 = ["chrome", "firefox", "opera", "safari", "edge"].includes(browser$1.name);
 var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
@@ -19175,6 +19191,15 @@ var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
   }
   _inheritsLoose(EditorChangesComparison, _React$Component);
   var _proto = EditorChangesComparison.prototype;
+  _proto.buildDiffString = function buildDiffString(past, current) {
+    var hunks = unifiedDiff(past.split(/\r\n|\r|\n/), current.split(/\r\n|\r|\n/), {
+      fromfile: "original_config",
+      tofile: "new_config"
+    });
+    return "diff --git original_config new_config\n" + hunks.map(function (line) {
+      return line.replace(/\n$/, "");
+    }).join("\n");
+  };
   _proto.render = function render() {
     var _this$props = this.props,
       options = _this$props.options,
@@ -19189,8 +19214,8 @@ var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
       externalSubmit = _this$props.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"),
-        crc32 = _require2.crc32;
+      var _require3 = require("crc"),
+        crc32 = _require3.crc32;
       pastCrc32 = crc32(past).toString(16).toUpperCase().padStart(8, "0");
     } else {
       pastCrc32 = "N/A";
@@ -19252,16 +19277,15 @@ var EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
       className: "field-description"
     }, "This will be the name of the new Configuration File"))))), /*#__PURE__*/React.createElement("div", {
       className: "modal-custom-content"
-    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(reactGhLikeDiff.ReactGhLikeDiff, {
+    }, /*#__PURE__*/React.createElement("div", null, isCompareChanges ? /*#__PURE__*/React.createElement(reactGhLikeDiff.ReactGhLikeDiff, {
       options: {
         originalFileName: "original_config",
         updatedFileName: "new_config",
         matchWordsThreshold: 0.25,
         matchingMaxComparisons: 5000
       },
-      past: this.state.hideWhiteSpace ? pastCleaned : past,
-      current: JSON.stringify(current, null, 2)
-    })))), /*#__PURE__*/React.createElement("div", {
+      diffString: this.buildDiffString(this.state.hideWhiteSpace ? pastCleaned : past || "", current ? JSON.stringify(current, null, 2) : "")
+    }) : null))), /*#__PURE__*/React.createElement("div", {
       className: "modal-custom-footer"
     }, /*#__PURE__*/React.createElement("button", {
       type: "submit",
@@ -19287,6 +19311,7 @@ var EditorChangesComparison$1 = reactRedux.connect(mapStateToProps$1)(EditorChan
 var regexRevision = new RegExp('\\d{2}\\.\\d{2}\\.json', 'g');
 var isDownloadConfig = false;
 var activatedTab;
+var FormWithNavStable = applyNav__default(Form, EditorNavs);
 var EditorSection = /*#__PURE__*/function (_React$Component) {
   function EditorSection(props) {
     var _this;
@@ -19323,14 +19348,8 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
       isDownloadConfig: false,
       isCompareChanges: false,
       activeSideBar: 'schema-modal',
-      isSideBarExpanded: false,
-      showNewToolsHighlight: true
+      isSideBarExpanded: false
     };
-    setTimeout(function () {
-      _this.setState({
-        showNewToolsHighlight: false
-      });
-    }, 10000);
     _this.toggleSideBarExpand = _this.toggleSideBarExpand.bind(_this);
     _this.input = '';
     _this.s3 = _this.props.fetchFileContentExt ? true : false;
@@ -19398,7 +19417,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
   _proto.componentDidMount = function componentDidMount() {
     document.addEventListener('keydown', this.escFunction, false);
   };
-  _proto.componentWillUnMount = function componentWillUnMount() {
+  _proto.componentWillUnmount = function componentWillUnmount() {
     document.removeEventListener('keydown', this.escFunction, false);
   };
   _proto.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
@@ -19520,7 +19539,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
       sideBarPadding = _this$props.sideBarPadding;
     var editorUISchemaFile = editorUISchemaFiles[0] ? editorUISchemaFiles[0].name : "";
     var editorUIAdvancedSimpleTest = editorUISchemaFile.includes("Simple") || editorUISchemaFile.includes("Advanced");
-    var FormWithNav = schemaContent ? applyNav__default(Form, EditorNavs) : Form;
+    var FormWithNav = schemaContent ? FormWithNavStable : Form;
     var editorToolsFull = editorTools.concat({
       name: 'partialconfig-modal',
       comment: 'Partial config loader',
@@ -19646,15 +19665,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
         comment: modal.comment,
         className: modal["class"]
       });
-    }), this.state.showNewToolsHighlight && /*#__PURE__*/React.createElement("span", {
-      style: {
-        fontSize: '12px',
-        color: '#337ab7',
-        marginLeft: '10px',
-        transition: 'opacity 1s ease-out',
-        opacity: this.state.showNewToolsHighlight ? 1 : 0
-      }
-    }, "Tip: New editor tools added"))))))), /*#__PURE__*/React.createElement("div", {
+    }))))))), /*#__PURE__*/React.createElement("div", {
       className: "config-bar-background"
     }));
   };