From b793e4bf4d68f1ffe1579c804975c85bc994366f Mon Sep 17 00:00:00 2001
From: Callum <callum.errington@manheim.co.uk>
Date: Fri, 3 May 2019 13:14:55 +0100
Subject: [PATCH] Added eslintignore file Added props to allow configuration of
 what datatypes are detected

---
 .eslintignore                                 |  1 +
 .eslintrc.js                                  |  8 +-
 src/js/components/VariableEditor.js           | 50 +++++------
 src/js/helpers/parseInput.js                  | 42 +++++-----
 src/js/index.js                               | 37 ++++++---
 test/tests/js/Index-test.js                   | 18 ++--
 .../js/components/VariableEditor-test.js      | 82 ++++++++++++-------
 7 files changed, 140 insertions(+), 98 deletions(-)
 create mode 100644 .eslintignore

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..30d74d25
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
index 299d8020..e90de35f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -19,12 +19,10 @@ module.exports = {
     "rules": {
         "indent": [
             "error",
-            4
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
+            4,
+            { "SwitchCase": 1 }
         ],
+        "linebreak-style": 0,
         "quotes": [
             "error",
             "single"
diff --git a/src/js/components/VariableEditor.js b/src/js/components/VariableEditor.js
index 18c6f969..c92a6f90 100644
--- a/src/js/components/VariableEditor.js
+++ b/src/js/components/VariableEditor.js
@@ -75,21 +75,21 @@ class VariableEditor extends React.PureComponent {
                         <div {...Theme(theme, 'colon')}>:</div>
                     </span>
                 ) : (
-                        <span>
-                            <span
-                                {...Theme(theme, 'object-name')}
-                                class="object-key"
-                                key={variable.name + '_' + namespace}
-                            >
-                                <span style={{ verticalAlign: 'top' }}>"</span>
-                                <span style={{ display: 'inline-block' }}>
-                                    {variable.name}
-                                </span>
-                                <span style={{ verticalAlign: 'top' }}>"</span>
+                    <span>
+                        <span
+                            {...Theme(theme, 'object-name')}
+                            class="object-key"
+                            key={variable.name + '_' + namespace}
+                        >
+                            <span style={{ verticalAlign: 'top' }}>"</span>
+                            <span style={{ display: 'inline-block' }}>
+                                {variable.name}
                             </span>
-                            <span {...Theme(theme, 'colon')}>:</span>
+                            <span style={{ verticalAlign: 'top' }}>"</span>
                         </span>
-                    )}
+                        <span {...Theme(theme, 'colon')}>:</span>
+                    </span>
+                )}
                 <div
                     class="variable-value"
                     onClick={
@@ -189,8 +189,9 @@ class VariableEditor extends React.PureComponent {
     }
 
     getValue = (variable, editMode) => {
-        const type = editMode ? false : variable.type;
         const { props } = this;
+        const type = editMode ? false : variable.type;
+
         switch (type) {
             case false:
                 return this.getEditInput();
@@ -314,12 +315,15 @@ class VariableEditor extends React.PureComponent {
     }
 
     showDetected = () => {
-        const { theme, variable, namespace, rjvId } = this.props;
+        const { theme, variable, namespace, rjvId, detectDatatypes } = this.props;
         const { type, value } = this.state.parsedInput;
-        const detected = this.getDetectedInput();
-        if (detected) {
-            return (
-                <div>
+
+        // check if props allow for detection parsed type
+
+        if (detectDatatypes[type]) {
+            const detected = this.getDetectedInput();
+            if (detected) {
+                return (
                     <div {...Theme(theme, 'detected-row')} title="Submit as Datatype">
                         {detected}
                         <CheckCircle
@@ -334,8 +338,8 @@ class VariableEditor extends React.PureComponent {
                             }}
                         />
                     </div>
-                </div>
-            );
+                );
+            }
         }
     }
 
@@ -365,7 +369,7 @@ class VariableEditor extends React.PureComponent {
                                 }}
                             >
                                 ...
-                        </span>
+                            </span>
                             <span
                                 style={{
                                     ...Theme(theme, 'brace').style,
@@ -394,7 +398,7 @@ class VariableEditor extends React.PureComponent {
                                 }}
                             >
                                 ...
-                        </span>
+                            </span>
                             <span
                                 style={{
                                     ...Theme(theme, 'brace').style,
diff --git a/src/js/helpers/parseInput.js b/src/js/helpers/parseInput.js
index 24030717..193e6891 100644
--- a/src/js/helpers/parseInput.js
+++ b/src/js/helpers/parseInput.js
@@ -35,28 +35,28 @@ export default function parseInput(input) {
     //run in case input was not serializable
     input = input.toLowerCase();
     switch (input) {
-    case 'undefined': {
-        return formatResponse('undefined', undefined);
-    }
-    case 'nan': {
-        return formatResponse('nan', NaN);
-    }
-    case 'null': {
-        return formatResponse('null', null);
-    }
-    case 'true': {
-        return formatResponse('boolean', true);
-    }
-    case 'false': {
-        return formatResponse('boolean', false);
-    }
-    default: {
-        //check to see if this is a date
-        input = Date.parse(input);
-        if (input) {
-            return (formatResponse('date', new Date(input)));
+        case 'undefined': {
+            return formatResponse('undefined', undefined);
+        }
+        case 'nan': {
+            return formatResponse('nan', NaN);
+        }
+        case 'null': {
+            return formatResponse('null', null);
+        }
+        case 'true': {
+            return formatResponse('boolean', true);
+        }
+        case 'false': {
+            return formatResponse('boolean', false);
+        }
+        default: {
+            //check to see if this is a date
+            input = Date.parse(input);
+            if (input) {
+                return (formatResponse('date', new Date(input)));
+            }
         }
-    }
     }
 
     return formatResponse(false, null);
diff --git a/src/js/index.js b/src/js/index.js
index 64773a3a..567158df 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1,9 +1,9 @@
 import React from 'react';
-import {polyfill} from 'react-lifecycles-compat';
+import { polyfill } from 'react-lifecycles-compat';
 import JsonViewer from './components/JsonViewer';
 import AddKeyRequest from './components/ObjectKeyModal/AddKeyRequest';
 import ValidationFailure from './components/ValidationFailure';
-import {toType, isTheme} from './helpers/util';
+import { toType, isTheme } from './helpers/util';
 import ObjectAttributes from './stores/ObjectAttributes';
 
 //global theme
@@ -59,6 +59,19 @@ class ReactJsonView extends React.PureComponent {
         style: {},
         validationMessage: 'Validation Error',
         defaultValue: null,
+        detectDatatypes: {
+            object: true,
+            array: true,
+            string: true,
+            integer: true,
+            float: true,
+            boolean: true,
+            date: true,
+            function: true,
+            null: true,
+            nan: true,
+            undefined: true
+        }
     }
 
     // will trigger whenever setState() is called, or parent passes in new props.
@@ -192,7 +205,7 @@ class ReactJsonView extends React.PureComponent {
         return (
             <div
                 class="react-json-view"
-                style={{...Theme(theme, 'app-container').style, ...style}}
+                style={{ ...Theme(theme, 'app-container').style, ...style }}
             >
                 <ValidationFailure
                     message={validationMessage}
@@ -238,15 +251,15 @@ class ReactJsonView extends React.PureComponent {
         };
 
         switch (type) {
-        case 'variable-added':
-            result = onAdd(on_edit_payload);
-            break;
-        case 'variable-edited':
-            result = onEdit(on_edit_payload);
-            break;
-        case 'variable-removed':
-            result = onDelete(on_edit_payload);
-            break;
+            case 'variable-added':
+                result = onAdd(on_edit_payload);
+                break;
+            case 'variable-edited':
+                result = onEdit(on_edit_payload);
+                break;
+            case 'variable-removed':
+                result = onDelete(on_edit_payload);
+                break;
         }
 
         if (result !== false) {
diff --git a/test/tests/js/Index-test.js b/test/tests/js/Index-test.js
index ad694379..714ca15b 100644
--- a/test/tests/js/Index-test.js
+++ b/test/tests/js/Index-test.js
@@ -10,10 +10,10 @@ const { window } = new JSDOM()
 global.window = window
 global.document = window.document
 
-describe("<Index />", function() {
+describe("<Index />", function () {
     const rjvId = 1
 
-    it("check data type labels from index", function() {
+    it("check data type labels from index", function () {
         const wrapper = render(
             <Index
                 src={{
@@ -22,7 +22,7 @@ describe("<Index />", function() {
                     int: 5,
                     nan: NaN,
                     null: null,
-                    func: test => {},
+                    func: test => { },
                     obj: {
                         arrChild: [1, 2, "three"],
                         objChild: {
@@ -39,7 +39,7 @@ describe("<Index />", function() {
         expect(wrapper.find(".data-type-label")).to.have.length(14)
     })
 
-    it("check object-size labels from index", function() {
+    it("check object-size labels from index", function () {
         const wrapper = mount(
             <Index
                 src={{
@@ -48,7 +48,7 @@ describe("<Index />", function() {
                     int: 5,
                     nan: NaN,
                     null: null,
-                    func: test => {},
+                    func: test => { },
                     obj: {
                         arrChild: [1, 2, "three"],
                         objChild: {
@@ -70,14 +70,14 @@ describe("<Index />", function() {
         expect(wrapper.find(".object-size")).to.have.length(0)
     })
 
-    it("src replaced with error message (ERROR OUTPUT EXPECTED)", function() {
+    it("src replaced with error message (ERROR OUTPUT EXPECTED)", function () {
         const wrapper = render(
             <Index src={"{jsonEncodedString:true, createError:true}"} />
         )
         expect(wrapper.find(".data-type-label")).to.have.length(1)
     })
 
-    it("make sure copy to clipboard is displayed all properties", function() {
+    it("make sure copy to clipboard is displayed all properties", function () {
         const wrapper = render(
             <Index
                 src={{
@@ -92,7 +92,7 @@ describe("<Index />", function() {
         expect(wrapper.find(".click-to-copy")).to.have.length(7)
     })
 
-    it("index test getDerivedStateFromProps", function() {
+    it("index test getDerivedStateFromProps", function () {
         sinon.spy(Index, "getDerivedStateFromProps")
         // mount() will cause getDerivedStateFromProps to be called twice.
         // 1. before first render()
@@ -107,7 +107,7 @@ describe("<Index />", function() {
         )
     })
 
-    it("index can have ArrayGroup root component", function() {
+    it("index can have ArrayGroup root component", function () {
         const wrapper = render(
             <Index
                 name="test"
diff --git a/test/tests/js/components/VariableEditor-test.js b/test/tests/js/components/VariableEditor-test.js
index 912016cd..bb6283bf 100644
--- a/test/tests/js/components/VariableEditor-test.js
+++ b/test/tests/js/components/VariableEditor-test.js
@@ -5,15 +5,28 @@ import { expect } from "chai"
 import Index from "./../../../../src/js/index"
 import VariableEditor from "./../../../../src/js/components/VariableEditor"
 
-describe("<VariableEditor />", function() {
+describe("<VariableEditor />", function () {
     const rjvId = 1
+    const detectDatatypesTrue = {
+        object: true,
+        array: true,
+        string: true,
+        integer: true,
+        float: true,
+        boolean: true,
+        date: true,
+        function: true,
+        null: true,
+        nan: true,
+        undefined: true
+    }
 
-    it("VariableEditor click-to-edit should be visible", function() {
+    it("VariableEditor click-to-edit should be visible", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
                 singleIndent={1}
                 variable={{
@@ -26,7 +39,7 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".click-to-edit")).to.have.length(1)
     })
 
-    it("VariableEditor click-to-edit should be hidden when onEdit disabled", function() {
+    it("VariableEditor click-to-edit should be hidden when onEdit disabled", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
@@ -43,13 +56,14 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".click-to-edit")).to.have.length(0)
     })
 
-    it("VariableEditor click-to-edit should be hidden when editMode is active", function() {
+    it("VariableEditor click-to-edit should be hidden when editMode is active", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: 5,
@@ -61,13 +75,14 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".click-to-edit")).to.have.length(0)
     })
 
-    it("VariableEditor test textarea and cancel icon", function() {
+    it("VariableEditor test textarea and cancel icon", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: 5,
@@ -83,7 +98,7 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".variable-editor").length).to.equal(0)
     })
 
-    it("VariableEditor test textarea and submit icon", function() {
+    it("VariableEditor test textarea and submit icon", function () {
         const existing_value = "existing_value"
         const new_value = "new_value"
         const wrapper = shallow(
@@ -95,6 +110,7 @@ describe("<VariableEditor />", function() {
                 }}
                 namespace={["test"]}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: existing_value,
@@ -121,7 +137,7 @@ describe("<VariableEditor />", function() {
         expect(wrapper.state("editMode")).to.equal(false)
     })
 
-    it("VariableEditor edit after src change should respect current src", function() {
+    it("VariableEditor edit after src change should respect current src", function () {
         const existing_value = "existing_value"
         const new_value = "new_value"
         const wrapper = shallow(
@@ -133,6 +149,7 @@ describe("<VariableEditor />", function() {
                 }}
                 namespace={["test"]}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: existing_value,
@@ -167,13 +184,14 @@ describe("<VariableEditor />", function() {
         )
     })
 
-    it("VariableEditor detected null", function() {
+    it("VariableEditor detected null", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "null",
@@ -187,13 +205,14 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".variable-editor").props().value).to.equal("null")
     })
 
-    it("VariableEditor detected undefined", function() {
+    it("VariableEditor detected undefined", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "undefined",
@@ -209,13 +228,14 @@ describe("<VariableEditor />", function() {
         )
     })
 
-    it("VariableEditor detected NaN", function() {
+    it("VariableEditor detected NaN", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "NaN",
@@ -229,13 +249,14 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".variable-editor").props().value).to.equal("NaN")
     })
 
-    it("VariableEditor detected string", function() {
+    it("VariableEditor detected string", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "test",
@@ -249,13 +270,14 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".variable-editor").props().value).to.equal("test")
     })
 
-    it("VariableEditor detected function", function() {
+    it("VariableEditor detected function", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "function test() {}",
@@ -271,13 +293,14 @@ describe("<VariableEditor />", function() {
         )
     })
 
-    it("VariableEditor detected object", function() {
+    it("VariableEditor detected object", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "{}",
@@ -291,13 +314,14 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".variable-editor").props().value).to.equal("{}")
     })
 
-    it("VariableEditor detected array", function() {
+    it("VariableEditor detected array", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "[1,2,3]",
@@ -313,13 +337,14 @@ describe("<VariableEditor />", function() {
         )
     })
 
-    it("VariableEditor detected float", function() {
+    it("VariableEditor detected float", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "-5.2",
@@ -333,13 +358,14 @@ describe("<VariableEditor />", function() {
         expect(wrapper.find(".variable-editor").props().value).to.equal("-5.2")
     })
 
-    it("VariableEditor detected integer", function() {
+    it("VariableEditor detected integer", function () {
         const wrapper = shallow(
             <VariableEditor
                 src={{ test: true }}
                 theme="rjv-default"
-                onEdit={edit => {}}
+                onEdit={edit => { }}
                 rjvId={rjvId}
+                detectDatatypes={detectDatatypesTrue}
                 variable={{
                     name: "test",
                     value: "5",