config-editor-base 3.0.8 → 3.1.0

package/dist/index.js

@@ -1320,7 +1320,6 @@ var saveUpdatedConfiguration = function saveUpdatedConfiguration(filename, conte
 var setUpdatedFormData = function setUpdatedFormData(formData) {
   return function (dispatch) {
     dispatch(setUpdatedFormDataValue(formData));
-    dispatch(setConfigContent(formData));
     dispatch(calcCrc32EditorLive());
   };
 };
@@ -19164,10 +19163,8 @@ var selectOptions$1 = function selectOptions(Files) {
   });
 };
 var pastCrc32 = "N/A";
-var _require$1 = require("difflib"),
-  unifiedDiff = _require$1.unifiedDiff;
-var _require2 = require("detect-browser"),
-  detect$1 = _require2.detect;
+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 EditorChangesComparison = /*#__PURE__*/function (_React$Component) {
@@ -19191,15 +19188,6 @@ 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,
@@ -19214,8 +19202,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 _require3 = require("crc"),
-        crc32 = _require3.crc32;
+      var _require2 = require("crc"),
+        crc32 = _require2.crc32;
       pastCrc32 = crc32(past).toString(16).toUpperCase().padStart(8, "0");
     } else {
       pastCrc32 = "N/A";
@@ -19277,15 +19265,16 @@ 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, isCompareChanges ? /*#__PURE__*/React.createElement(reactGhLikeDiff.ReactGhLikeDiff, {
+    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(reactGhLikeDiff.ReactGhLikeDiff, {
       options: {
         originalFileName: "original_config",
         updatedFileName: "new_config",
         matchWordsThreshold: 0.25,
         matchingMaxComparisons: 5000
       },
-      diffString: this.buildDiffString(this.state.hideWhiteSpace ? pastCleaned : past || "", current ? JSON.stringify(current, null, 2) : "")
-    }) : null))), /*#__PURE__*/React.createElement("div", {
+      past: this.state.hideWhiteSpace ? pastCleaned : past,
+      current: JSON.stringify(current, null, 2)
+    })))), /*#__PURE__*/React.createElement("div", {
       className: "modal-custom-footer"
     }, /*#__PURE__*/React.createElement("button", {
       type: "submit",
@@ -19311,7 +19300,6 @@ 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;
@@ -19363,37 +19351,37 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
     }
   };
   _proto.subMenuBtnClick = function subMenuBtnClick(name) {
-    var _this2 = this;
     var sideBar = this.state.activeSideBar == name ? 'none' : name;
+    this.props.setConfigContentPreSubmit();
     this.setState({
       activeSideBar: sideBar,
       isSideBarExpanded: sideBar === 'none' ? false : this.state.isSideBarExpanded
-    }, function () {
-      _this2.props.setConfigContentPreSubmit();
     });
   };
   _proto.toggleSideBarExpand = function toggleSideBarExpand() {
+    this.props.setConfigContentPreSubmit();
     this.setState({
       isSideBarExpanded: !this.state.isSideBarExpanded
     });
   };
   _proto.hideUischemaModal = function hideUischemaModal() {
+    this.props.setConfigContentPreSubmit();
     this.setState({
       showUischemaModal: false
     });
   };
   _proto.handleDropdownChange = function handleDropdownChange(selection, dropdown) {
     var _this$setState,
-      _this3 = this;
+      _this2 = this;
     var fileType = getFileType(dropdown);
     this.setState((_this$setState = {}, _this$setState[fileType] = selection, _this$setState['selected' + fileType] = selection, _this$setState[fileType.replace('-', '')] = {
       value: selection,
       label: selection
     }, _this$setState), function () {
-      if (_this3.s3 && !selection.includes('Simple') && !selection.includes('Advanced') && !selection.includes('(local)')) {
-        _this3.props.fetchFileContentExt(selection, fileType);
+      if (_this2.s3 && !selection.includes('Simple') && !selection.includes('Advanced') && !selection.includes('(local)')) {
+        _this2.props.fetchFileContentExt(selection, fileType);
       } else {
-        _this3.props.fetchFileContent(selection, fileType);
+        _this2.props.fetchFileContent(selection, fileType);
       }
     });
   };
@@ -19421,7 +19409,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
     document.removeEventListener('keydown', this.escFunction, false);
   };
   _proto.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-    var _this4 = this;
+    var _this3 = this;
     var uiLocal = nextProps.editorUISchemaFiles.filter(function (file) {
       return file.name.includes('(local)');
     });
@@ -19463,15 +19451,15 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
         }
       }, function () {
         if (configName.includes('(local)')) {
-          _this4.props.fetchFileContent(configName, 'config-review');
-        } else if (_this4.s3) {
-          _this4.props.fetchFileContentExt(configName, 'config-review');
+          _this3.props.fetchFileContent(configName, 'config-review');
+        } else if (_this3.s3) {
+          _this3.props.fetchFileContentExt(configName, 'config-review');
         }
       });
     }
   };
   _proto.onSubmit = function onSubmit(_ref2) {
-    var _this5 = this;
+    var _this4 = this;
     var formData = _ref2.formData;
     if (this.props.schemaContent == undefined || this.props.schemaContent == null) {
       this.props.showAlert('info', 'No Rule Schema has been loaded');
@@ -19491,12 +19479,12 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
       isSubmitting: true
     }, function () {
       var tempJson = JSON.stringify(formData, null, 2);
-      _this5.props.setConfigContent(JSON.parse(tempJson));
-      var revisedConfigFileSchema = _this5.state.schema;
+      _this4.props.setConfigContent(JSON.parse(tempJson));
+      var revisedConfigFileSchema = _this4.state.schema;
       var revisedConfigFile = "config-" + revisedConfigFileSchema.match(regexRevision);
-      if (_this5.state.isCompareChanges === false) {
-        _this5.props.runConfigurationWarningChecks(formData);
-        _this5.setState({
+      if (_this4.state.isCompareChanges === false) {
+        _this4.props.runConfigurationWarningChecks(formData);
+        _this4.setState({
           isCompareChanges: true,
           revisedConfigFile: {
             value: revisedConfigFile,
@@ -19506,16 +19494,16 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
         document.body.style.overflow = 'hidden';
       } else {
         if (isDownloadConfig) {
-          _this5.props.saveUpdatedConfiguration(revisedConfigFile, formData);
+          _this4.props.saveUpdatedConfiguration(revisedConfigFile, formData);
           isDownloadConfig = false;
           document.body.style.overflow = 'auto';
-          _this5.setState({
+          _this4.setState({
             isCompareChanges: false
           });
         } else {
-          _this5.props.updateConfigFileExt(JSON.stringify(formData, null, 2), "" + revisedConfigFile);
+          _this4.props.updateConfigFileExt(JSON.stringify(formData, null, 2), "" + revisedConfigFile);
           document.body.style.overflow = 'auto';
-          _this5.setState({
+          _this4.setState({
             isCompareChanges: false
           });
         }
@@ -19527,7 +19515,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
     this.props.showAlert('danger', 'The config contains validation errors (see top of editor) - please review and try again');
   };
   _proto.render = function render() {
-    var _this6 = this;
+    var _this5 = this;
     var _this$props = this.props,
       editorSchemaFiles = _this$props.editorSchemaFiles,
       editorConfigFiles = _this$props.editorConfigFiles,
@@ -19539,7 +19527,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 ? FormWithNavStable : Form;
+    var FormWithNav = schemaContent ? applyNav__default(Form, EditorNavs) : Form;
     var editorToolsFull = editorTools.concat({
       name: 'partialconfig-modal',
       comment: 'Partial config loader',
@@ -19575,16 +19563,16 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/React.createElement("div", {
         key: idx,
         style: {
-          display: modal.name == _this6.state.activeSideBar ? '' : 'none'
+          display: modal.name == _this5.state.activeSideBar ? '' : 'none'
         }
       }, /*#__PURE__*/React.createElement(EditorToolModalWrapper, {
         modal: modal.modal,
         name: modal.name,
         onClick: function onClick() {
-          return _this6.subMenuBtnClick('none');
+          return _this5.subMenuBtnClick('none');
         },
-        isExpanded: _this6.state.isSideBarExpanded,
-        onToggleExpand: _this6.toggleSideBarExpand
+        isExpanded: _this5.state.isSideBarExpanded,
+        onToggleExpand: _this5.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"
@@ -19660,7 +19648,7 @@ var EditorSection = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/React.createElement(EditorToolButton, {
         key: idx,
         onClick: function onClick() {
-          return _this6.subMenuBtnClick(modal.name);
+          return _this5.subMenuBtnClick(modal.name);
         },
         comment: modal.comment,
         className: modal["class"]