config-editor-base 1.5.7 → 1.5.8

package/LICENSE.md

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 CSS-Electronics
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2020 CSS-Electronics
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/README.md

@@ -1,165 +1,165 @@
-# Config Editor - Base Module
-
-This project includes a React based JSON Schema editor.
-
-[![NPM](https://img.shields.io/npm/v/config-editor-base.svg)](https://www.npmjs.com/package/config-editor-base) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-
-### Installation
-
-```bash
-npm install --save config-editor-base
-```
-
----
-
-### Development testing
-
-You can directly test the "raw" configuration editor by cloning this repository and running below `npm install` in root and in the `example/` folder. After this, run `npm start` in the root as well as in the `example/` folder.
-
----
-
-### Publishing a new package via npm
-
-To publish your own custom version as an npm package, you can modify the `package.json` and run `npm publish`. You'll need to be logged in first.
-
----
-
-### Usage in a parent app
-
-The module uses redux, hence you'll need to import the base module and the `reducer` as follows:
-
-```jsx
-// reducers.js
-
-import { combineReducers } from 'redux'
-import alert from './alert/reducer'
-
-import { editor } from 'config-editor-base'
-
-const rootReducer = combineReducers({
-  alert,
-  editor
-})
-
-export default rootReducer
-```
-
-In the parent App we can load an Editor module, which can be constructed as below:
-
-```jsx
-import React from 'react'
-import { connect } from 'react-redux'
-
-import { EncryptionModal } from 'config-editor-tools'
-import { EditorSection } from 'config-editor-base'
-
-import * as actionsAlert from '../alert/actions'
-import AlertContainer from '../alert/AlertContainer'
-
-class Editor extends React.Component {
-  render() {
-    let editorTools = [
-      {
-        name: 'encryption-modal',
-        comment: 'Encryption tool',
-        class: 'fa fa-lock',
-        modal: <EncryptionModal showAlert={this.props.showAlert} />
-      }
-    ]
-
-    return (
-      <div className='file-explorer'>
-        <div className='fe-body fe-body-offline'>
-          <AlertContainer />
-          <EditorSection
-            editorTools={editorTools}
-            showAlert={this.props.showAlert}
-          />
-        </div>
-      </div>
-    )
-  }
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    showAlert: (type, message) =>
-      dispatch(actionsAlert.set({ type: type, message: message }))
-  }
-}
-
-export default connect(null, mapDispatchToProps)(Editor)
-```
-
----
-
-## Parsing embedded Rule Schema and UISchema files
-
-The [config editor](https://github.com/CSS-Electronics/config-editor) can take a list of UIschema and Rule Schema files. This enables the editor to "auto-load" the UIschemas upon initial load, as well as "auto-load" the Rule Schema files matching the revision of the loaded Configuration File.
-
-Note that the parsed list of files should match the actual files that are included in the config-editor-base `dist/` folder.
-
-For example, the Rule Schema for `"schema-01.02.json | CANedge2"` should be contained in `dist/schema/CANedge2/schema-01.02.json`.
-
-The syntax for parsing these lists is as below (in the [config-editor](https://github.com/CSS-Electronics/config-editor) repo `Editor.js` file):
-
-```jsx
-
-// define UIschema and Rule Schema names for auto-loading embedded schema files
-export const uiSchemaAry = [
-  "uischema-01.02.json | Simple",
-  "uischema-01.02.json | Advanced",
-];
-
-export const schemaAry = [
-  "schema-01.02.json | CANedge2",
-  "schema-01.02.json | CANedge1",
-  "schema-00.07.json | CANedge2",
-  "schema-00.07.json | CANedge1",
-];
-
-...
-
-<EditorSection
-  editorTools={editorTools}
-  showAlert={this.props.showAlert}
-  uiSchemaAry={uiSchemaAry}
-  schemaAry={schemaAry}
-/>
-...
-
-```
-
-Note that the code distinguishes between a `config-XX.YY.json` file loaded from a CANedge1 and CANedge2 unit. This is done by evaluating whether a `connect` section exists or not in the Configuration File. Based on this test, the editor either loads the Rule Schema for the CANedge2 (if `connect` exists) or the CANedge1.
-
-
----
-
-## Parsing S3 functionality
-
-The config editor also supports various S3 calls, e.g. for loading Rule Schema and Configuration Files from a device S3 folder - as well as submitting updated Configuration Files to S3. See the [CANcloud](https://github.com/CSS-Electronics/cancloud) repository for an example of this implementation.
-
----
-
-## Regarding styling
-
-The config editor relies on styling from the parent application. For examples of styling, see the CANedge configuration editor.
-
---- 
-## Regarding JSON Schema files 
-
-The module expects to find JSON Schema files in the structure below to facilitate auto-loading of these:
-
-```
-/
-|-- dist/
-	|-- schema/
-		|-- Advanced/
-			|-- uischema-XX.YY.json 
-		|-- Simple/
-			|-- uischema-XX.YY.json 
-		|-- CANedge1/
-			|-- schema-XX.YY.json 
-		|-- CANedge2/
-			|-- schema-XX.YY.json 		
-```
+# Config Editor - Base Module
+
+This project includes a React based JSON Schema editor.
+
+[![NPM](https://img.shields.io/npm/v/config-editor-base.svg)](https://www.npmjs.com/package/config-editor-base) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+
+### Installation
+
+```bash
+npm install --save config-editor-base
+```
+
+---
+
+### Development testing
+
+You can directly test the "raw" configuration editor by cloning this repository and running below `npm install` in root and in the `example/` folder. After this, run `npm start` in the root as well as in the `example/` folder.
+
+---
+
+### Publishing a new package via npm
+
+To publish your own custom version as an npm package, you can modify the `package.json` and run `npm publish`. You'll need to be logged in first.
+
+---
+
+### Usage in a parent app
+
+The module uses redux, hence you'll need to import the base module and the `reducer` as follows:
+
+```jsx
+// reducers.js
+
+import { combineReducers } from 'redux'
+import alert from './alert/reducer'
+
+import { editor } from 'config-editor-base'
+
+const rootReducer = combineReducers({
+  alert,
+  editor
+})
+
+export default rootReducer
+```
+
+In the parent App we can load an Editor module, which can be constructed as below:
+
+```jsx
+import React from 'react'
+import { connect } from 'react-redux'
+
+import { EncryptionModal } from 'config-editor-tools'
+import { EditorSection } from 'config-editor-base'
+
+import * as actionsAlert from '../alert/actions'
+import AlertContainer from '../alert/AlertContainer'
+
+class Editor extends React.Component {
+  render() {
+    let editorTools = [
+      {
+        name: 'encryption-modal',
+        comment: 'Encryption tool',
+        class: 'fa fa-lock',
+        modal: <EncryptionModal showAlert={this.props.showAlert} />
+      }
+    ]
+
+    return (
+      <div className='file-explorer'>
+        <div className='fe-body fe-body-offline'>
+          <AlertContainer />
+          <EditorSection
+            editorTools={editorTools}
+            showAlert={this.props.showAlert}
+          />
+        </div>
+      </div>
+    )
+  }
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    showAlert: (type, message) =>
+      dispatch(actionsAlert.set({ type: type, message: message }))
+  }
+}
+
+export default connect(null, mapDispatchToProps)(Editor)
+```
+
+---
+
+## Parsing embedded Rule Schema and UISchema files
+
+The [config editor](https://github.com/CSS-Electronics/config-editor) can take a list of UIschema and Rule Schema files. This enables the editor to "auto-load" the UIschemas upon initial load, as well as "auto-load" the Rule Schema files matching the revision of the loaded Configuration File.
+
+Note that the parsed list of files should match the actual files that are included in the config-editor-base `dist/` folder.
+
+For example, the Rule Schema for `"schema-01.02.json | CANedge2"` should be contained in `dist/schema/CANedge2/schema-01.02.json`.
+
+The syntax for parsing these lists is as below (in the [config-editor](https://github.com/CSS-Electronics/config-editor) repo `Editor.js` file):
+
+```jsx
+
+// define UIschema and Rule Schema names for auto-loading embedded schema files
+export const uiSchemaAry = [
+  "uischema-01.02.json | Simple",
+  "uischema-01.02.json | Advanced",
+];
+
+export const schemaAry = [
+  "schema-01.02.json | CANedge2",
+  "schema-01.02.json | CANedge1",
+  "schema-00.07.json | CANedge2",
+  "schema-00.07.json | CANedge1",
+];
+
+...
+
+<EditorSection
+  editorTools={editorTools}
+  showAlert={this.props.showAlert}
+  uiSchemaAry={uiSchemaAry}
+  schemaAry={schemaAry}
+/>
+...
+
+```
+
+Note that the code distinguishes between a `config-XX.YY.json` file loaded from a CANedge1 and CANedge2 unit. This is done by evaluating whether a `connect` section exists or not in the Configuration File. Based on this test, the editor either loads the Rule Schema for the CANedge2 (if `connect` exists) or the CANedge1.
+
+
+---
+
+## Parsing S3 functionality
+
+The config editor also supports various S3 calls, e.g. for loading Rule Schema and Configuration Files from a device S3 folder - as well as submitting updated Configuration Files to S3. See the [CANcloud](https://github.com/CSS-Electronics/cancloud) repository for an example of this implementation.
+
+---
+
+## Regarding styling
+
+The config editor relies on styling from the parent application. For examples of styling, see the CANedge configuration editor.
+
+--- 
+## Regarding JSON Schema files 
+
+The module expects to find JSON Schema files in the structure below to facilitate auto-loading of these:
+
+```
+/
+|-- dist/
+	|-- schema/
+		|-- Advanced/
+			|-- uischema-XX.YY.json 
+		|-- Simple/
+			|-- uischema-XX.YY.json 
+		|-- CANedge1/
+			|-- schema-XX.YY.json 
+		|-- CANedge2/
+			|-- schema-XX.YY.json 		
+```

package/dist/index.js

@@ -12,7 +12,7 @@ var utils = require('react-jsonschema-form-pagination/lib/utils');
 var reactGhLikeDiff = require('react-gh-like-diff');
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -25,14 +25,22 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
 function _inheritsLoose(subClass, superClass) {
   subClass.prototype = Object.create(superClass.prototype);
   subClass.prototype.constructor = subClass;
-  subClass.__proto__ = superClass;
+
+  _setPrototypeOf(subClass, superClass);
+}
+
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+  return _setPrototypeOf(o, p);
 }
 
 function _assertThisInitialized(self) {
@@ -43,6 +51,41 @@ function _assertThisInitialized(self) {
   return self;
 }
 
+var SET = "alert/SET";
+var CLEAR = "alert/CLEAR";
+var alertId = 0;
+var set = function set(alert) {
+  var id = alertId++;
+  return function (dispatch) {
+    if (alert.type == "warning") {
+      setTimeout(function () {
+        dispatch({
+          type: CLEAR,
+          alert: {
+            id: id
+          }
+        });
+      }, 10000);
+    } else if (alert.type !== "danger" || alert.autoClear) {
+      setTimeout(function () {
+        dispatch({
+          type: CLEAR,
+          alert: {
+            id: id
+          }
+        });
+      }, 5000);
+    }
+
+    dispatch({
+      type: SET,
+      alert: Object.assign({}, alert, {
+        id: id
+      })
+    });
+  };
+};
+
 var demoConfig = 'config-01.04.json';
 var regexUISchemaPublic = new RegExp(/^uischema-\d{2}\.\d{2}\.json/, 'g');
 var regexSchemaPublic = new RegExp(/^schema-\d{2}\.\d{2}\.json/, 'g');
@@ -241,6 +284,16 @@ var handleUploadedFile = function handleUploadedFile(file, dropdown, schemaAry,
               dispatch(publicSchemaFiles(file.name, schemaAry, contentJSON, uiSchemaAry));
             }
 
+            var configIncludesServerDetails = JSON.stringify(contentJSON, null, 2).includes("http://") || JSON.stringify(contentJSON, null, 2).includes("https://");
+
+            if (configIncludesServerDetails) {
+              dispatch(set({
+                type: "warning",
+                message: "If your device is already connected to your server, changes made via the SD will be overwritten by the server Configuration File",
+                autoClear: false
+              }));
+            }
+
             dispatch(setConfigContentLocal(content));
             dispatch(setConfigContent(contentJSON));
             dispatch(resetLocalConfigList());
@@ -1555,14 +1608,15 @@ var lodash = createCommonjsModule(function (module, exports) {
   var undefined$1;
 
   /** Used as the semantic version number. */
-  var VERSION = '4.17.20';
+  var VERSION = '4.17.21';
 
   /** Used as the size to enable large array optimizations. */
   var LARGE_ARRAY_SIZE = 200;
 
   /** Error message constants. */
   var CORE_ERROR_TEXT = 'Unsupported core-js use. Try https://npms.io/search?q=ponyfill.',
-      FUNC_ERROR_TEXT = 'Expected a function';
+      FUNC_ERROR_TEXT = 'Expected a function',
+      INVALID_TEMPL_VAR_ERROR_TEXT = 'Invalid `variable` option passed into `_.template`';
 
   /** Used to stand-in for `undefined` hash values. */
   var HASH_UNDEFINED = '__lodash_hash_undefined__';
@@ -1695,10 +1749,11 @@ var lodash = createCommonjsModule(function (module, exports) {
   var reRegExpChar = /[\\^$.*+?()[\]{}|]/g,
       reHasRegExpChar = RegExp(reRegExpChar.source);
 
-  /** Used to match leading and trailing whitespace. */
-  var reTrim = /^\s+|\s+$/g,
-      reTrimStart = /^\s+/,
-      reTrimEnd = /\s+$/;
+  /** Used to match leading whitespace. */
+  var reTrimStart = /^\s+/;
+
+  /** Used to match a single whitespace character. */
+  var reWhitespace = /\s/;
 
   /** Used to match wrap detail comments. */
   var reWrapComment = /\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,
@@ -1708,6 +1763,18 @@ var lodash = createCommonjsModule(function (module, exports) {
   /** Used to match words composed of alphanumeric characters. */
   var reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
 
+  /**
+   * Used to validate the `validate` option in `_.template` variable.
+   *
+   * Forbids characters which could potentially change the meaning of the function argument definition:
+   * - "()," (modification of function parameters)
+   * - "=" (default value)
+   * - "[]{}" (destructuring of function parameters)
+   * - "/" (beginning of a comment)
+   * - whitespace
+   */
+  var reForbiddenIdentifierChars = /[()=,{}\[\]\/\s]/;
+
   /** Used to match backslashes in property paths. */
   var reEscapeChar = /\\(\\)?/g;
 
@@ -2536,6 +2603,19 @@ var lodash = createCommonjsModule(function (module, exports) {
     });
   }
 
+  /**
+   * The base implementation of `_.trim`.
+   *
+   * @private
+   * @param {string} string The string to trim.
+   * @returns {string} Returns the trimmed string.
+   */
+  function baseTrim(string) {
+    return string
+      ? string.slice(0, trimmedEndIndex(string) + 1).replace(reTrimStart, '')
+      : string;
+  }
+
   /**
    * The base implementation of `_.unary` without support for storing metadata.
    *
@@ -2869,6 +2949,21 @@ var lodash = createCommonjsModule(function (module, exports) {
       : asciiToArray(string);
   }
 
+  /**
+   * Used by `_.trim` and `_.trimEnd` to get the index of the last non-whitespace
+   * character of `string`.
+   *
+   * @private
+   * @param {string} string The string to inspect.
+   * @returns {number} Returns the index of the last non-whitespace character.
+   */
+  function trimmedEndIndex(string) {
+    var index = string.length;
+
+    while (index-- && reWhitespace.test(string.charAt(index))) {}
+    return index;
+  }
+
   /**
    * Used by `_.unescape` to convert HTML entities to characters.
    *
@@ -14037,7 +14132,7 @@ var lodash = createCommonjsModule(function (module, exports) {
       if (typeof value != 'string') {
         return value === 0 ? value : +value;
       }
-      value = value.replace(reTrim, '');
+      value = baseTrim(value);
       var isBinary = reIsBinary.test(value);
       return (isBinary || reIsOctal.test(value))
         ? freeParseInt(value.slice(2), isBinary ? 2 : 8)
@@ -16409,6 +16504,12 @@ var lodash = createCommonjsModule(function (module, exports) {
       if (!variable) {
         source = 'with (obj) {\n' + source + '\n}\n';
       }
+      // Throw an error if a forbidden character was found in `variable`, to prevent
+      // potential command injection attacks.
+      else if (reForbiddenIdentifierChars.test(variable)) {
+        throw new Error(INVALID_TEMPL_VAR_ERROR_TEXT);
+      }
+
       // Cleanup code by stripping empty strings.
       source = (isEvaluating ? source.replace(reEmptyStringLeading, '') : source)
         .replace(reEmptyStringMiddle, '$1')
@@ -16522,7 +16623,7 @@ var lodash = createCommonjsModule(function (module, exports) {
     function trim(string, chars, guard) {
       string = toString(string);
       if (string && (guard || chars === undefined$1)) {
-        return string.replace(reTrim, '');
+        return baseTrim(string);
       }
       if (!string || !(chars = baseToString(chars))) {
         return string;
@@ -16557,7 +16658,7 @@ var lodash = createCommonjsModule(function (module, exports) {
     function trimEnd(string, chars, guard) {
       string = toString(string);
       if (string && (guard || chars === undefined$1)) {
-        return string.replace(reTrimEnd, '');
+        return string.slice(0, trimmedEndIndex(string) + 1);
       }
       if (!string || !(chars = baseToString(chars))) {
         return string;