From e07a57a43cb7519713623573348e60aa4a5bebf6 Mon Sep 17 00:00:00 2001
From: JackWilb <jackwilburn@tutanota.com>
Date: Mon, 7 Dec 2020 16:27:33 -0700
Subject: [PATCH 1/5] Re-enable no-mutating-props

---
 src/components/MultiLink/Legend.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/MultiLink/Legend.vue b/src/components/MultiLink/Legend.vue
index b501b080..23c66cb3 100644
--- a/src/components/MultiLink/Legend.vue
+++ b/src/components/MultiLink/Legend.vue
@@ -1,5 +1,4 @@
 <script lang="ts">
-/* eslint-disable vue/no-mutating-props */
 import Vue, { PropType } from 'vue';
 import { min, max } from 'd3-array';
 import { select } from 'd3-selection';

From e187927175df8814b72c90288bbe271430699701 Mon Sep 17 00:00:00 2001
From: JackWilb <jackwilburn@tutanota.com>
Date: Mon, 7 Dec 2020 16:44:50 -0700
Subject: [PATCH 2/5] Re-enable no-param-reassign

---
 .eslintrc.js                           |  2 --
 src/components/MultiLink/MultiLink.vue | 11 ++++++++---
 src/store/index.ts                     | 11 +++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 68a77399..0f66b0ba 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -24,8 +24,6 @@ module.exports = {
     'import/prefer-default-export': ['off'],
     // Required for _to, _id, _key, etc. from Arango
     'no-underscore-dangle': ['off'],
-    // Required for data loading/processing and D3-style mutating callbacks
-    'no-param-reassign': ['error', { props: false }],
   },
 
   parserOptions: {
diff --git a/src/components/MultiLink/MultiLink.vue b/src/components/MultiLink/MultiLink.vue
index 851f6ea7..401f658b 100644
--- a/src/components/MultiLink/MultiLink.vue
+++ b/src/components/MultiLink/MultiLink.vue
@@ -36,9 +36,10 @@ export default Vue.extend({
     simulationLinks(): SimulationLink[] | null {
       if (this.network !== null) {
         return this.network.edges.map((link: Link) => {
-          link.source = link._from;
-          link.target = link._to;
-          return (link as SimulationLink);
+          const newLink = link;
+          newLink.source = link._from;
+          newLink.target = link._to;
+          return (newLink as SimulationLink);
         });
       }
       return null;
@@ -197,7 +198,9 @@ export default Vue.extend({
       nodes.forEach((node) => {
         // If the position is not defined for x or y, generate it
         if (node.x === undefined || node.y === undefined) {
+          // eslint-disable-next-line no-param-reassign
           node.x = Math.random() * this.svgDimensions.width;
+          // eslint-disable-next-line no-param-reassign
           node.y = Math.random() * this.svgDimensions.height;
         }
       });
@@ -215,7 +218,9 @@ export default Vue.extend({
       event.preventDefault();
 
       const moveFn = (evt: Event) => {
+        // eslint-disable-next-line no-param-reassign
         node.x = (evt as MouseEvent).clientX - this.svgOffset.x - (this.markerSize / 2);
+        // eslint-disable-next-line no-param-reassign
         node.y = (evt as MouseEvent).clientY - this.svgOffset.y - (this.markerSize / 2);
         this.$forceUpdate();
       };
diff --git a/src/store/index.ts b/src/store/index.ts
index eac73d9e..76eb1c89 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -237,14 +237,15 @@ const {
     },
 
     setNestedVariables(state, nestedVariables: NestedVariables) {
+      const newNestedVars = nestedVariables;
       // Remove duplicates from the nested variables
-      nestedVariables.bar = [...new Set(nestedVariables.bar)];
-      nestedVariables.glyph = [...new Set(nestedVariables.glyph)];
+      newNestedVars.bar = [...new Set(nestedVariables.bar)];
+      newNestedVars.glyph = [...new Set(nestedVariables.glyph)];
 
       // Allow only 2 variables for the glyphs
-      nestedVariables.glyph.length = nestedVariables.glyph.length > 2 ? 2 : nestedVariables.glyph.length;
+      newNestedVars.glyph.length = newNestedVars.glyph.length > 2 ? 2 : newNestedVars.glyph.length;
 
-      state.nestedVariables = nestedVariables;
+      state.nestedVariables = newNestedVars;
     },
 
     setLinkVariables(state, linkVariables: LinkStyleVariables) {
@@ -322,7 +323,9 @@ const {
 
       if (context.state.network !== null) {
         context.state.network.nodes.forEach((n: Node) => {
+          // eslint-disable-next-line no-param-reassign
           n.fx = null;
+          // eslint-disable-next-line no-param-reassign
           n.fy = null;
         });
         commit.startSimulation();

From 2cbe12e20114f9a9d572b1efdde095f18269520c Mon Sep 17 00:00:00 2001
From: JackWilb <jackwilburn@tutanota.com>
Date: Mon, 7 Dec 2020 16:47:40 -0700
Subject: [PATCH 3/5] Make the underscore-dangle rule more strict, only allow
 arango names

---
 .eslintrc.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0f66b0ba..6561fc02 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,8 +22,7 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'max-len': ['off'],
     'import/prefer-default-export': ['off'],
-    // Required for _to, _id, _key, etc. from Arango
-    'no-underscore-dangle': ['off'],
+    'no-underscore-dangle': ['error', { allow: ['_id', '_from', '_to'] }],
   },
 
   parserOptions: {

From 927704a3fee2308a7a0f02d6dab111ef071587e7 Mon Sep 17 00:00:00 2001
From: JackWilb <jackwilburn@tutanota.com>
Date: Fri, 11 Dec 2020 14:58:42 -0700
Subject: [PATCH 4/5] Use spread and object literaly for newLink

---
 src/components/MultiLink/MultiLink.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/MultiLink/MultiLink.vue b/src/components/MultiLink/MultiLink.vue
index 401f658b..4359e687 100644
--- a/src/components/MultiLink/MultiLink.vue
+++ b/src/components/MultiLink/MultiLink.vue
@@ -36,10 +36,8 @@ export default Vue.extend({
     simulationLinks(): SimulationLink[] | null {
       if (this.network !== null) {
         return this.network.edges.map((link: Link) => {
-          const newLink = link;
-          newLink.source = link._from;
-          newLink.target = link._to;
-          return (newLink as SimulationLink);
+          const newLink: SimulationLink = { ...link, source: link._from, target: link._to };
+          return newLink;
         });
       }
       return null;

From e541f28416aeac77e286ba6311fded3a9a7f6247 Mon Sep 17 00:00:00 2001
From: JackWilb <jackwilburn@tutanota.com>
Date: Fri, 11 Dec 2020 15:08:38 -0700
Subject: [PATCH 5/5] Prefer Math.min, and spread/object literal

---
 src/store/index.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/store/index.ts b/src/store/index.ts
index 76eb1c89..ab28cbfc 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -237,13 +237,14 @@ const {
     },
 
     setNestedVariables(state, nestedVariables: NestedVariables) {
-      const newNestedVars = nestedVariables;
-      // Remove duplicates from the nested variables
-      newNestedVars.bar = [...new Set(nestedVariables.bar)];
-      newNestedVars.glyph = [...new Set(nestedVariables.glyph)];
+      const newNestedVars = {
+        ...nestedVariables,
+        bar: [...new Set(nestedVariables.bar)],
+        glyph: [...new Set(nestedVariables.glyph)],
+      };
 
       // Allow only 2 variables for the glyphs
-      newNestedVars.glyph.length = newNestedVars.glyph.length > 2 ? 2 : newNestedVars.glyph.length;
+      newNestedVars.glyph.length = Math.min(2, newNestedVars.glyph.length);
 
       state.nestedVariables = newNestedVars;
     },