From 34628e7a20c923000f13e06dd81ec877af5fa307 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Fri, 27 Nov 2020 11:36:55 -0500
Subject: [PATCH 01/37] WIP add marker flags control to tasks

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/inspectors/MarkerFlags.vue     | 15 ++++++++
 .../advancedAccordionConfigWithMarkerFlags.js | 34 +++++++++++++++++++
 src/components/nodes/task/index.js            |  4 +--
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 src/components/inspectors/MarkerFlags.vue
 create mode 100644 src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js

diff --git a/src/components/inspectors/MarkerFlags.vue b/src/components/inspectors/MarkerFlags.vue
new file mode 100644
index 000000000..da612a207
--- /dev/null
+++ b/src/components/inspectors/MarkerFlags.vue
@@ -0,0 +1,15 @@
+<template>
+  <div>
+    Marker flags
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MarkerFlags',
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js b/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js
new file mode 100644
index 000000000..49feb56be
--- /dev/null
+++ b/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js
@@ -0,0 +1,34 @@
+import idConfigSettings from './idConfigSettings';
+import DocumentationFormTextArea from './DocumentationFormTextArea';
+import MarkerFlags from '@/components/inspectors/MarkerFlags';
+
+export default {
+  component: 'FormAccordion',
+  container: true,
+  config: {
+    initiallyOpen: false,
+    label: 'Advanced',
+    icon: 'cogs',
+    name: 'advanced-accordion',
+  },
+  items: [
+    {
+      component: 'FormInput',
+      config: idConfigSettings,
+    },
+    {
+      component: DocumentationFormTextArea,
+      config: {
+        label: 'Description',
+        name: 'documentation',
+      },
+    },
+    {
+      component: MarkerFlags,
+      config: {
+        label: 'Marker Flags',
+        name: 'markerFlags',
+      },
+    },
+  ],
+};
diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 3c3dc5d0f..c195e710b 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -1,8 +1,8 @@
 import component from './task.vue';
 import nameConfigSettings from '@/components/inspectors/nameConfigSettings';
 import { taskHeight, taskWidth } from './taskConfig';
-import advancedAccordionConfig from '@/components/inspectors/advancedAccordionConfig';
 import defaultNames from '@/components/nodes/task/defaultNames';
+import advancedAccordionConfigWithMarkerFlags from '@/components/inspectors/advancedAccordionConfigWithMarkerFlags';
 
 export const id = 'processmaker-modeler-task';
 
@@ -49,7 +49,7 @@ export default {
             },
           ],
         },
-        advancedAccordionConfig,
+        advancedAccordionConfigWithMarkerFlags,
       ],
     },
   ],

From 62d373c41b7796b1255a620aaf7952c2ec0abad8 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 10:05:36 -0500
Subject: [PATCH 02/37] WIP: add task marker options in advanced inspector

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/inspectors/InspectorPanel.vue  |  2 +-
 src/components/inspectors/MarkerFlags.vue     | 25 ++++++++++++++++++-
 .../advancedAccordionConfigWithMarkerFlags.js |  1 +
 src/components/nodes/task/index.js            | 18 +++++++++++++
 src/components/nodes/task/task.vue            | 12 +++++++++
 5 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/components/inspectors/InspectorPanel.vue b/src/components/inspectors/InspectorPanel.vue
index 202094e24..a42c69537 100644
--- a/src/components/inspectors/InspectorPanel.vue
+++ b/src/components/inspectors/InspectorPanel.vue
@@ -193,7 +193,7 @@ export default {
       return definition.targetRef.$type === 'bpmn:CallActivity';
     },
     customInspectorHandler(value) {
-      return this.nodeRegistry[this.highlightedNode.type].inspectorHandler(value, this.highlightedNode, this.setNodeProp, this.moddle, this.definitions);
+      return this.nodeRegistry[this.highlightedNode.type].inspectorHandler(value, this.highlightedNode, this.setNodeProp, this.moddle, this.definitions, this.defaultInspectorHandler);
     },
     processNodeInspectorHandler(value) {
       return this.defaultInspectorHandler(omit(value, ['artifacts', 'flowElements', 'laneSets']));
diff --git a/src/components/inspectors/MarkerFlags.vue b/src/components/inspectors/MarkerFlags.vue
index da612a207..cd3ac2173 100644
--- a/src/components/inspectors/MarkerFlags.vue
+++ b/src/components/inspectors/MarkerFlags.vue
@@ -1,12 +1,35 @@
 <template>
   <div>
-    Marker flags
+    <b-form-group label="Loop characteristics">
+      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="no_loop">No loop characteristics</b-form-radio>
+      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="parallel_mi">Parallel multi-instance</b-form-radio>
+      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="sequential_mi">Sequential multi-instance</b-form-radio>
+      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="loop">Loop</b-form-radio>
+    </b-form-group>
+    <b-form-checkbox v-model="isForCompensation" name="for-compensation">For Compensation</b-form-checkbox>
+
+    <div class="mt-3">Selected: <strong>{{ loopCharacteristics }}</strong></div>
+    <div class="mt-3">Compensation: <strong>{{ isForCompensation }}</strong></div>
   </div>
 </template>
 
 <script>
 export default {
   name: 'MarkerFlags',
+  data() {
+    return {
+      loopCharacteristics: 'no_loop',
+      isForCompensation: false,
+    };
+  },
+  watch: {
+    loopCharacteristics(newVal) {
+      this.$emit('input', {loopCharacteristics: newVal});
+    },
+    isForCompensation(newVal) {
+      this.$emit('input', {isForCompensation: newVal});
+    },
+  },
 };
 </script>
 
diff --git a/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js b/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js
index 49feb56be..2901f7f64 100644
--- a/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js
+++ b/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js
@@ -25,6 +25,7 @@ export default {
     },
     {
       component: MarkerFlags,
+      name: 'taskMarkers',
       config: {
         label: 'Marker Flags',
         name: 'markerFlags',
diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index c195e710b..938cb34fe 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -3,6 +3,7 @@ import nameConfigSettings from '@/components/inspectors/nameConfigSettings';
 import { taskHeight, taskWidth } from './taskConfig';
 import defaultNames from '@/components/nodes/task/defaultNames';
 import advancedAccordionConfigWithMarkerFlags from '@/components/inspectors/advancedAccordionConfigWithMarkerFlags';
+import omit from 'lodash/omit';
 
 export const id = 'processmaker-modeler-task';
 
@@ -19,6 +20,7 @@ export default {
     return moddle.create('bpmn:Task', {
       name: $t(defaultNames[id]),
       assignment: 'requester',
+      isForCompensation: false,
     });
   },
   diagram(moddle) {
@@ -29,6 +31,22 @@ export default {
       }),
     });
   },
+  inspectorHandler(value, node, setNodeProp, moddle, definitions, defaultInspectorHandler) {
+    if (value.markerFlags) {
+      if (value.markerFlags.loopCharacteristics) {
+        //TODO: set the loop characteristics up
+      }
+
+      const currentIsForCompensationValue = node.definition.get('isForCompensation');
+      const newIsForCompensationValue = value.markerFlags.isForCompensation;
+
+      if (newIsForCompensationValue != null && newIsForCompensationValue !== currentIsForCompensationValue) {
+        setNodeProp(node, 'isForCompensation', newIsForCompensationValue);
+      }
+    }
+
+    defaultInspectorHandler(omit(value, 'markerFlags', 'isForCompensation'));
+  },
   inspectorConfig: [
     {
       name: defaultNames[id],
diff --git a/src/components/nodes/task/task.vue b/src/components/nodes/task/task.vue
index 13d605866..7672e4427 100644
--- a/src/components/nodes/task/task.vue
+++ b/src/components/nodes/task/task.vue
@@ -101,6 +101,18 @@ export default {
         this.recalcMarkersAlignment();
       }
     },
+    node: {
+      handler({definition}) {
+        if (definition.isForCompensation == null) {
+          return;
+        }
+        setupCompensationMarker(this.node.definition, this.markers, this.$set);
+      },
+      deep: true,
+    },
+    'node.definition.loopCharacteristics'() {
+      setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set);
+    },
   },
   methods: {
     getElementsUnderArea(element) {

From 4efa251c866e7ee6beb901610dc284f50439fa4d Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 10:24:13 -0500
Subject: [PATCH 03/37] add custom data transform for task

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/inspectors/InspectorPanel.vue | 14 ++++++++------
 src/components/nodes/task/index.js           |  3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/inspectors/InspectorPanel.vue b/src/components/inspectors/InspectorPanel.vue
index a42c69537..46c172395 100644
--- a/src/components/inspectors/InspectorPanel.vue
+++ b/src/components/inspectors/InspectorPanel.vue
@@ -175,13 +175,15 @@ export default {
 
       const type = this.highlightedNode && this.highlightedNode.type;
 
-      this.data = type && this.nodeRegistry[type].inspectorData
-        ? this.nodeRegistry[type].inspectorData(this.highlightedNode)
-        : Object.entries(this.highlightedNode.definition).reduce((data, [key, value]) => {
-          data[key] = value;
+      const defaultDataTransform = (node) => Object.entries(node.definition).reduce((data, [key, value]) => {
+        data[key] = value;
+
+        return data;
+      }, {});
 
-          return data;
-        }, {});
+      this.data = type && this.nodeRegistry[type].inspectorData
+        ? this.nodeRegistry[type].inspectorData(this.highlightedNode, defaultDataTransform)
+        : defaultDataTransform(this.highlightedNode);
     },
     isSequenceFlow(type) {
       return type === sequenceFlowId;
diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 938cb34fe..685f44520 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -47,6 +47,9 @@ export default {
 
     defaultInspectorHandler(omit(value, 'markerFlags', 'isForCompensation'));
   },
+  inspectorData(node, defaultDataTransform) {
+    return defaultDataTransform(node);
+  },
   inspectorConfig: [
     {
       name: defaultNames[id],

From 6f7044fce3229f59cddc4239384a680e66af53d6 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 10:57:59 -0500
Subject: [PATCH 04/37] set some default values for markerFlags

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/inspectors/MarkerFlags.vue | 15 +++++++++++++--
 src/components/nodes/task/index.js        | 11 +++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/inspectors/MarkerFlags.vue b/src/components/inspectors/MarkerFlags.vue
index cd3ac2173..f7e6cc602 100644
--- a/src/components/inspectors/MarkerFlags.vue
+++ b/src/components/inspectors/MarkerFlags.vue
@@ -15,11 +15,22 @@
 
 <script>
 export default {
+  props: {
+    value: {
+      type: Object,
+      default() {
+        return {
+          loopCharacteristics: 'no_loop',
+          isForCompensation: false,
+        };
+      },
+    },
+  },
   name: 'MarkerFlags',
   data() {
     return {
-      loopCharacteristics: 'no_loop',
-      isForCompensation: false,
+      loopCharacteristics: this.value.loopCharacteristics,
+      isForCompensation: this.value.isForCompensation,
     };
   },
   watch: {
diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 685f44520..2fd412f0d 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -45,10 +45,17 @@ export default {
       }
     }
 
-    defaultInspectorHandler(omit(value, 'markerFlags', 'isForCompensation'));
+    defaultInspectorHandler(omit(value, 'markerFlags'));
   },
   inspectorData(node, defaultDataTransform) {
-    return defaultDataTransform(node);
+    const inspectorData =  defaultDataTransform(node);
+
+    inspectorData.markerFlags = {
+      isForCompensation: inspectorData.isForCompensation,
+    };
+    delete inspectorData.isForCompensation;
+
+    return inspectorData;
   },
   inspectorConfig: [
     {

From cdaadd252e1dcdf0b9f72042cebc0bbed55b0de1 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 11:15:47 -0500
Subject: [PATCH 05/37] remove compensation icon if isForCompensation is false

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/setupCompensationMarker.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/nodes/task/setupCompensationMarker.js b/src/components/nodes/task/setupCompensationMarker.js
index 07feb9e16..8fd6a77e2 100644
--- a/src/components/nodes/task/setupCompensationMarker.js
+++ b/src/components/nodes/task/setupCompensationMarker.js
@@ -3,5 +3,7 @@ import compensationIcon from '@/assets/compensation.svg';
 export default function setupCompensationMarker(nodeDefinition, markers, $set) {
   if (nodeDefinition.isForCompensation) {
     $set(markers.bottomCenter, 'compensation', compensationIcon);
+  } else {
+    $set(markers.bottomCenter, 'compensation', null);
   }
 }

From f26c5d8e5d44d468a4139a1fa7904ce832922d01 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 11:17:52 -0500
Subject: [PATCH 06/37] cleanup compensation icon logic

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/setupCompensationMarker.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/nodes/task/setupCompensationMarker.js b/src/components/nodes/task/setupCompensationMarker.js
index 8fd6a77e2..89dda3ee0 100644
--- a/src/components/nodes/task/setupCompensationMarker.js
+++ b/src/components/nodes/task/setupCompensationMarker.js
@@ -1,9 +1,6 @@
 import compensationIcon from '@/assets/compensation.svg';
 
 export default function setupCompensationMarker(nodeDefinition, markers, $set) {
-  if (nodeDefinition.isForCompensation) {
-    $set(markers.bottomCenter, 'compensation', compensationIcon);
-  } else {
-    $set(markers.bottomCenter, 'compensation', null);
-  }
+  const icon = nodeDefinition.isForCompensation ? compensationIcon : null;
+  $set(markers.bottomCenter, 'compensation', icon);
 }

From 125e4df5d3b10c2e0d27b9e419a15ebc229f8fd4 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 11:19:37 -0500
Subject: [PATCH 07/37] refactor watcher for compensation

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/task.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/nodes/task/task.vue b/src/components/nodes/task/task.vue
index 7672e4427..c28068207 100644
--- a/src/components/nodes/task/task.vue
+++ b/src/components/nodes/task/task.vue
@@ -101,14 +101,8 @@ export default {
         this.recalcMarkersAlignment();
       }
     },
-    node: {
-      handler({definition}) {
-        if (definition.isForCompensation == null) {
-          return;
-        }
-        setupCompensationMarker(this.node.definition, this.markers, this.$set);
-      },
-      deep: true,
+    'node.definition.isForCompensation'() {
+      setupCompensationMarker(this.node.definition, this.markers, this.$set);
     },
     'node.definition.loopCharacteristics'() {
       setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set);

From 802294caf06c17f3883c8e0208b4152bd4a64d26 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 11:49:38 -0500
Subject: [PATCH 08/37] get standard loop characteristic to show up

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 2fd412f0d..22adbd4f2 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -21,6 +21,7 @@ export default {
       name: $t(defaultNames[id]),
       assignment: 'requester',
       isForCompensation: false,
+      loopCharacteristics: null,
     });
   },
   diagram(moddle) {
@@ -34,7 +35,10 @@ export default {
   inspectorHandler(value, node, setNodeProp, moddle, definitions, defaultInspectorHandler) {
     if (value.markerFlags) {
       if (value.markerFlags.loopCharacteristics) {
-        //TODO: set the loop characteristics up
+        const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
+        if (value.markerFlags.loopCharacteristics === 'loop' && currentLoopCharacteristics.$type !== 'bpmn:StandardLoopCharacteristics') {
+          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:StandardLoopCharacteristics'));
+        }
       }
 
       const currentIsForCompensationValue = node.definition.get('isForCompensation');
@@ -52,8 +56,10 @@ export default {
 
     inspectorData.markerFlags = {
       isForCompensation: inspectorData.isForCompensation,
+      loopCharacteristics: inspectorData.loopCharacteristics ? 'loop' : 'no_loop',
     };
     delete inspectorData.isForCompensation;
+    delete inspectorData.loopCharacteristics;
 
     return inspectorData;
   },

From b44cda4a47230ef3480cc7cade28ab9e078e3921 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 11:52:30 -0500
Subject: [PATCH 09/37] unset loop icon

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js                     | 4 ++++
 src/components/nodes/task/setupMultiInstanceMarkers.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 22adbd4f2..18da92fed 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -35,6 +35,10 @@ export default {
   inspectorHandler(value, node, setNodeProp, moddle, definitions, defaultInspectorHandler) {
     if (value.markerFlags) {
       if (value.markerFlags.loopCharacteristics) {
+        if (value.markerFlags.loopCharacteristics === 'no_loop') {
+          setNodeProp(node, 'loopCharacteristics', null);
+        }
+
         const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
         if (value.markerFlags.loopCharacteristics === 'loop' && currentLoopCharacteristics.$type !== 'bpmn:StandardLoopCharacteristics') {
           setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:StandardLoopCharacteristics'));
diff --git a/src/components/nodes/task/setupMultiInstanceMarkers.js b/src/components/nodes/task/setupMultiInstanceMarkers.js
index 82bc0b66d..998571d3c 100644
--- a/src/components/nodes/task/setupMultiInstanceMarkers.js
+++ b/src/components/nodes/task/setupMultiInstanceMarkers.js
@@ -14,6 +14,7 @@ export default function setupMultiInstanceMarkers(nodeDefinition, markers, $set)
   ];
 
   if (!loopCharacteristics || !handledLoopTypes.includes(loopCharacteristics.$type)) {
+    $set(markers.bottomCenter, 'loopCharacteristics', null);
     return;
   }
 

From d2c5440d777952441ef85d22d168fd4dee3812b3 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 13:39:55 -0500
Subject: [PATCH 10/37] properly remove marker

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js                     |  6 +++++-
 src/components/nodes/task/setupCompensationMarker.js   | 10 +++++++---
 src/components/nodes/task/setupMultiInstanceMarkers.js |  5 +++--
 src/components/nodes/task/task.vue                     |  8 ++++----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 18da92fed..88939c278 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -60,7 +60,7 @@ export default {
 
     inspectorData.markerFlags = {
       isForCompensation: inspectorData.isForCompensation,
-      loopCharacteristics: inspectorData.loopCharacteristics ? 'loop' : 'no_loop',
+      loopCharacteristics: getLoopCharacteristicsRadioValue(inspectorData.loopCharacteristics),
     };
     delete inspectorData.isForCompensation;
     delete inspectorData.loopCharacteristics;
@@ -92,3 +92,7 @@ export default {
     },
   ],
 };
+
+function getLoopCharacteristicsRadioValue(loopCharacteristics) {
+  return loopCharacteristics ? 'loop' : 'no_loop';
+}
diff --git a/src/components/nodes/task/setupCompensationMarker.js b/src/components/nodes/task/setupCompensationMarker.js
index 89dda3ee0..8c7d9f7a3 100644
--- a/src/components/nodes/task/setupCompensationMarker.js
+++ b/src/components/nodes/task/setupCompensationMarker.js
@@ -1,6 +1,10 @@
 import compensationIcon from '@/assets/compensation.svg';
 
-export default function setupCompensationMarker(nodeDefinition, markers, $set) {
-  const icon = nodeDefinition.isForCompensation ? compensationIcon : null;
-  $set(markers.bottomCenter, 'compensation', icon);
+export default function setupCompensationMarker(nodeDefinition, markers, $set, $delete) {
+  if (!nodeDefinition.isForCompensation) {
+    $delete(markers.bottomCenter, 'compensation');
+    return;
+  }
+
+  $set(markers.bottomCenter, 'compensation', compensationIcon);
 }
diff --git a/src/components/nodes/task/setupMultiInstanceMarkers.js b/src/components/nodes/task/setupMultiInstanceMarkers.js
index 998571d3c..a62ef5097 100644
--- a/src/components/nodes/task/setupMultiInstanceMarkers.js
+++ b/src/components/nodes/task/setupMultiInstanceMarkers.js
@@ -5,7 +5,7 @@ import loopIcon from '@/assets/loop.svg';
 const standardLoop = 'bpmn:StandardLoopCharacteristics';
 const multiInstanceLoop = 'bpmn:MultiInstanceLoopCharacteristics';
 
-export default function setupMultiInstanceMarkers(nodeDefinition, markers, $set) {
+export default function setupMultiInstanceMarkers(nodeDefinition, markers, $set, $delete) {
   const loopCharacteristics = nodeDefinition.get('loopCharacteristics');
 
   const handledLoopTypes = [
@@ -14,7 +14,8 @@ export default function setupMultiInstanceMarkers(nodeDefinition, markers, $set)
   ];
 
   if (!loopCharacteristics || !handledLoopTypes.includes(loopCharacteristics.$type)) {
-    $set(markers.bottomCenter, 'loopCharacteristics', null);
+    // TODO: remove the loopCharacteristics key completely, don't just set it to null
+    $delete(markers.bottomCenter, 'loopCharacteristics');
     return;
   }
 
diff --git a/src/components/nodes/task/task.vue b/src/components/nodes/task/task.vue
index c28068207..0de49ce1f 100644
--- a/src/components/nodes/task/task.vue
+++ b/src/components/nodes/task/task.vue
@@ -102,10 +102,10 @@ export default {
       }
     },
     'node.definition.isForCompensation'() {
-      setupCompensationMarker(this.node.definition, this.markers, this.$set);
+      setupCompensationMarker(this.node.definition, this.markers, this.$set, this.$delete);
     },
     'node.definition.loopCharacteristics'() {
-      setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set);
+      setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set, this.$delete);
     },
   },
   methods: {
@@ -138,8 +138,8 @@ export default {
     let bounds = this.node.diagram.bounds;
     this.shape.position(bounds.x, bounds.y);
     this.shape.resize(bounds.width, bounds.height);
-    setupCompensationMarker(this.node.definition, this.markers, this.$set);
-    setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set);
+    setupCompensationMarker(this.node.definition, this.markers, this.$set, this.$delete);
+    setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set, this.$delete);
     this.shape.attr({
       body: {
         rx: 8,

From b433ab0351f43c4c8f930e423f9320403ed4e586 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 14:08:42 -0500
Subject: [PATCH 11/37] sort the bottom center markers alphabetically

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 .../modules/recalculateMarkerAlignment.js       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/mixins/modules/recalculateMarkerAlignment.js b/src/mixins/modules/recalculateMarkerAlignment.js
index 0ccf331a3..fb99589f3 100644
--- a/src/mixins/modules/recalculateMarkerAlignment.js
+++ b/src/mixins/modules/recalculateMarkerAlignment.js
@@ -4,6 +4,7 @@ export const markerPadding = 4;
 
 export default function recalculateMarkerAlignment(markers, shape) {
   const { width, height } = shape.size();
+
   for (let position in markers) {
 
     alignMarkersFromLeftToRight(shape, position, width);
@@ -38,7 +39,10 @@ function alignMarkersFromCenter(shape, position, markers, width) {
   for (let i = 0; i < markersLimit; i++) {
     shape.attr(position + '.' + i + '/xlink:href', null);
   }
-  for (let marker in markers[position]) {
+
+  const orderedMarkers = orderMarkers(markers, position);
+
+  for (let marker in orderedMarkers) {
     shape.attr(position + '.' + c + '/xlink:href', markers[position][marker]);
     c++;
     if (c >= markersLimit) {
@@ -51,6 +55,17 @@ function alignMarkersFromCenter(shape, position, markers, width) {
   }
 }
 
+function orderMarkers(markers, position) {
+  if (position === 'bottomCenter') {
+    const orderedMarkers = {};
+    Object.keys(markers[position]).sort().forEach(key => {
+      orderedMarkers[key] = markers[position][key];
+    });
+    return orderedMarkers;
+  }
+  return markers[position];
+}
+
 function hasTaskMarker(shape) {
   return !!shape.attr('image/xlink:href');
 }

From 41f76d04f35870e5d9f817d14580518e9ad2b616 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 14:26:54 -0500
Subject: [PATCH 12/37] assert that bottom centre markers get sorted

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 .../modules/recalculateMarkerAlignment.spec.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/unit/components/mixins/modules/recalculateMarkerAlignment.spec.js b/tests/unit/components/mixins/modules/recalculateMarkerAlignment.spec.js
index 8988c683a..30df8690f 100644
--- a/tests/unit/components/mixins/modules/recalculateMarkerAlignment.spec.js
+++ b/tests/unit/components/mixins/modules/recalculateMarkerAlignment.spec.js
@@ -42,4 +42,22 @@ describe('recalculateMarkerAlignment', () => {
     });
 
   });
+
+  it('sorts the bottom centre markers alphabetically by key', () => {
+    const shape = new TaskShape();
+    const markers = {
+      topLeft: {},
+      topCenter: {},
+      topRight: {},
+      bottomLeft: {},
+      bottomCenter: { c: 'third', b: 'second', a: 'first' },
+      bottomRight: {},
+    };
+
+    recalculateMarkerAlignment(markers, shape);
+
+    expect(shape.attributes.attrs['bottomCenter.0']['xlink:href']).toEqual('first');
+    expect(shape.attributes.attrs['bottomCenter.1']['xlink:href']).toEqual('second');
+    expect(shape.attributes.attrs['bottomCenter.2']['xlink:href']).toEqual('third');
+  });
 });

From 86edac8a8deef5897c2a70b546bc5dbd634196be Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:05:03 -0500
Subject: [PATCH 13/37] did do the todo

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/setupMultiInstanceMarkers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/nodes/task/setupMultiInstanceMarkers.js b/src/components/nodes/task/setupMultiInstanceMarkers.js
index a62ef5097..8c7c11a7c 100644
--- a/src/components/nodes/task/setupMultiInstanceMarkers.js
+++ b/src/components/nodes/task/setupMultiInstanceMarkers.js
@@ -14,7 +14,6 @@ export default function setupMultiInstanceMarkers(nodeDefinition, markers, $set,
   ];
 
   if (!loopCharacteristics || !handledLoopTypes.includes(loopCharacteristics.$type)) {
-    // TODO: remove the loopCharacteristics key completely, don't just set it to null
     $delete(markers.bottomCenter, 'loopCharacteristics');
     return;
   }

From c48a2d9a5bc90d08e2e5c3a62e79cf5eb63f2258 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:05:43 -0500
Subject: [PATCH 14/37] set the MarkerFlags radio values from the bpmn

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js | 37 +++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 88939c278..cb4dcb5b4 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -1,6 +1,6 @@
 import component from './task.vue';
 import nameConfigSettings from '@/components/inspectors/nameConfigSettings';
-import { taskHeight, taskWidth } from './taskConfig';
+import {taskHeight, taskWidth} from './taskConfig';
 import defaultNames from '@/components/nodes/task/defaultNames';
 import advancedAccordionConfigWithMarkerFlags from '@/components/inspectors/advancedAccordionConfigWithMarkerFlags';
 import omit from 'lodash/omit';
@@ -40,9 +40,24 @@ export default {
         }
 
         const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
+
         if (value.markerFlags.loopCharacteristics === 'loop' && currentLoopCharacteristics.$type !== 'bpmn:StandardLoopCharacteristics') {
           setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:StandardLoopCharacteristics'));
         }
+
+        if (value.markerFlags.loopCharacteristics === 'parallel_mi' ) {
+          if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && !currentLoopCharacteristics.isSequential){
+            return;
+          }
+          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics'));
+        }
+
+        if (value.markerFlags.loopCharacteristics === 'sequential_mi') {
+          if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && currentLoopCharacteristics.isSequential){
+            return;
+          }
+          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics', {isSequential: true}));
+        }
       }
 
       const currentIsForCompensationValue = node.definition.get('isForCompensation');
@@ -56,7 +71,7 @@ export default {
     defaultInspectorHandler(omit(value, 'markerFlags'));
   },
   inspectorData(node, defaultDataTransform) {
-    const inspectorData =  defaultDataTransform(node);
+    const inspectorData = defaultDataTransform(node);
 
     inspectorData.markerFlags = {
       isForCompensation: inspectorData.isForCompensation,
@@ -94,5 +109,21 @@ export default {
 };
 
 function getLoopCharacteristicsRadioValue(loopCharacteristics) {
-  return loopCharacteristics ? 'loop' : 'no_loop';
+  if (!loopCharacteristics) {
+    return 'no_loop';
+  }
+
+  if (loopCharacteristics.$type === 'bpmn:StandardLoopCharacteristics') {
+    return 'loop';
+  }
+
+  if (loopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && !loopCharacteristics.isSequential) {
+    return 'parallel_mi';
+  }
+
+  if (loopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && loopCharacteristics.isSequential) {
+    return 'sequential_mi';
+  }
+
+  return 'no_loop';
 }

From 9a7cfa8ace1f570779de06756c9751b911461803 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:37:48 -0500
Subject: [PATCH 15/37] WIP: add e2e tests for adding task marker flags

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/inspectors/MarkerFlags.vue |  8 ++++----
 tests/e2e/specs/TaskMarkerFlags.spec.js   | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 tests/e2e/specs/TaskMarkerFlags.spec.js

diff --git a/src/components/inspectors/MarkerFlags.vue b/src/components/inspectors/MarkerFlags.vue
index f7e6cc602..657ee6e5b 100644
--- a/src/components/inspectors/MarkerFlags.vue
+++ b/src/components/inspectors/MarkerFlags.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <b-form-group label="Loop characteristics">
-      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="no_loop">No loop characteristics</b-form-radio>
-      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="parallel_mi">Parallel multi-instance</b-form-radio>
-      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="sequential_mi">Sequential multi-instance</b-form-radio>
-      <b-form-radio v-model="loopCharacteristics" name="marker-flags-radios" value="loop">Loop</b-form-radio>
+      <b-form-radio data-test="no_loop" v-model="loopCharacteristics" name="marker-flags-radios" value="no_loop">No loop characteristics</b-form-radio>
+      <b-form-radio data-test="parallel_mi" v-model="loopCharacteristics" name="marker-flags-radios" value="parallel_mi">Parallel multi-instance</b-form-radio>
+      <b-form-radio data-test="sequential_mi" v-model="loopCharacteristics" name="marker-flags-radios" value="sequential_mi">Sequential multi-instance</b-form-radio>
+      <b-form-radio data-test="loop" v-model="loopCharacteristics" name="marker-flags-radios" value="loop">Loop</b-form-radio>
     </b-form-group>
     <b-form-checkbox v-model="isForCompensation" name="for-compensation">For Compensation</b-form-checkbox>
 
diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
new file mode 100644
index 000000000..405b7c3f1
--- /dev/null
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -0,0 +1,23 @@
+import {
+  assertDownloadedXmlContainsExpected,
+  dragFromSourceToDest,
+} from '../support/utils';
+
+import { nodeTypes } from '../support/constants';
+
+describe('Task Marker Flags', () => {
+
+  it('can set loop characteristics and compensation markers', () => {
+    const taskPosition = { x: 250, y: 250 };
+
+    dragFromSourceToDest(nodeTypes.task, taskPosition);
+
+    cy.contains('Advanced').click();
+    cy.get('[data-test=loop]').check({ force: true });
+    assertDownloadedXmlContainsExpected('<bpmn:standardLoopCharacteristics />');
+
+    cy.get('.main-paper [data-type="processmaker.components.nodes.task.Shape"] [joint-selector="bottomCenter.0"]')
+      .should('have.attr', 'xlink:href')
+      .and('match',  /loop.*\.svg/);
+  });
+});

From 1192d00c4720c5fa9473a5ea0dcb0014efc6d02b Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Tue, 1 Dec 2020 10:38:51 -0500
Subject: [PATCH 16/37] add tests for task markers

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/inspectors/MarkerFlags.vue |  9 ++--
 tests/e2e/specs/TaskMarkerFlags.spec.js   | 50 +++++++++++++++++++----
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/components/inspectors/MarkerFlags.vue b/src/components/inspectors/MarkerFlags.vue
index 657ee6e5b..aba606892 100644
--- a/src/components/inspectors/MarkerFlags.vue
+++ b/src/components/inspectors/MarkerFlags.vue
@@ -1,15 +1,14 @@
 <template>
   <div>
-    <b-form-group label="Loop characteristics">
+    <b-form-group label="Loop Characteristics">
       <b-form-radio data-test="no_loop" v-model="loopCharacteristics" name="marker-flags-radios" value="no_loop">No loop characteristics</b-form-radio>
       <b-form-radio data-test="parallel_mi" v-model="loopCharacteristics" name="marker-flags-radios" value="parallel_mi">Parallel multi-instance</b-form-radio>
       <b-form-radio data-test="sequential_mi" v-model="loopCharacteristics" name="marker-flags-radios" value="sequential_mi">Sequential multi-instance</b-form-radio>
       <b-form-radio data-test="loop" v-model="loopCharacteristics" name="marker-flags-radios" value="loop">Loop</b-form-radio>
     </b-form-group>
-    <b-form-checkbox v-model="isForCompensation" name="for-compensation">For Compensation</b-form-checkbox>
-
-    <div class="mt-3">Selected: <strong>{{ loopCharacteristics }}</strong></div>
-    <div class="mt-3">Compensation: <strong>{{ isForCompensation }}</strong></div>
+    <b-form-group>
+      <b-form-checkbox data-test="for-compensation" v-model="isForCompensation" name="for-compensation">For Compensation</b-form-checkbox>
+    </b-form-group>
   </div>
 </template>
 
diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
index 405b7c3f1..3fb09af47 100644
--- a/tests/e2e/specs/TaskMarkerFlags.spec.js
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -5,19 +5,55 @@ import {
 
 import { nodeTypes } from '../support/constants';
 
-describe('Task Marker Flags', () => {
+function assertBottomCenterTaskMarkerHasImage(iconName, markerIndex = 0) {
+  cy.get(`.main-paper [data-type="processmaker.components.nodes.task.Shape"] [joint-selector="bottomCenter.${markerIndex}"]`)
+    .should('have.attr', 'xlink:href')
+    // eslint-disable-next-line no-useless-escape
+    .and('match', new RegExp(`${iconName}.*\.svg`));
+}
 
-  it('can set loop characteristics and compensation markers', () => {
+describe('Task Marker Flags', () => {
+  beforeEach(() => {
     const taskPosition = { x: 250, y: 250 };
-
     dragFromSourceToDest(nodeTypes.task, taskPosition);
-
     cy.contains('Advanced').click();
+  });
+
+  it('can set parallel multi-instance', () => {
+    cy.get('[data-test=parallel_mi]').check({ force: true });
+    cy.get('[data-test=for-compensation').uncheck({ force: true });
+
+    assertDownloadedXmlContainsExpected('<bpmn:multiInstanceLoopCharacteristics />');
+    assertBottomCenterTaskMarkerHasImage('parallel');
+  });
+
+  it('can set sequential multi-instance', () => {
+    cy.get('[data-test=sequential_mi]').check({ force: true });
+    cy.get('[data-test=for-compensation').uncheck({ force: true });
+
+    assertDownloadedXmlContainsExpected('<bpmn:multiInstanceLoopCharacteristics isSequential="true" />');
+    assertBottomCenterTaskMarkerHasImage('sequential');
+  });
+
+  it('can set standard loop', () => {
     cy.get('[data-test=loop]').check({ force: true });
+    cy.get('[data-test=for-compensation').uncheck({ force: true });
+
     assertDownloadedXmlContainsExpected('<bpmn:standardLoopCharacteristics />');
+    assertBottomCenterTaskMarkerHasImage('loop');
+  });
+
+  it('can set a task as "for compensation"', () => {
+    cy.get('[data-test=for-compensation').check({ force: true });
+    assertDownloadedXmlContainsExpected('<bpmn:task id="node_2" name="Form Task" isForCompensation="true" pm:assignment="requester" />');
+    assertBottomCenterTaskMarkerHasImage('compensation');
+  });
+
+  it('keeps compensation as the leftmost of the center icons', () => {
+    cy.get('[data-test=loop]').check({ force: true });
+    cy.get('[data-test=for-compensation').check({ force: true });
 
-    cy.get('.main-paper [data-type="processmaker.components.nodes.task.Shape"] [joint-selector="bottomCenter.0"]')
-      .should('have.attr', 'xlink:href')
-      .and('match',  /loop.*\.svg/);
+    assertBottomCenterTaskMarkerHasImage('compensation');
+    assertBottomCenterTaskMarkerHasImage('loop', '1');
   });
 });

From c2f4cc0ea9be9f433477f62e2db9d6cfa1ce636e Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Tue, 1 Dec 2020 11:17:17 -0500
Subject: [PATCH 17/37] Fix spacing

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index cb4dcb5b4..44d26caaa 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -1,6 +1,6 @@
 import component from './task.vue';
 import nameConfigSettings from '@/components/inspectors/nameConfigSettings';
-import {taskHeight, taskWidth} from './taskConfig';
+import { taskHeight, taskWidth } from './taskConfig';
 import defaultNames from '@/components/nodes/task/defaultNames';
 import advancedAccordionConfigWithMarkerFlags from '@/components/inspectors/advancedAccordionConfigWithMarkerFlags';
 import omit from 'lodash/omit';

From 99aafdfa2381496d3b76a67de677719a57df1b07 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Tue, 1 Dec 2020 11:19:31 -0500
Subject: [PATCH 18/37] reword tests

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 tests/e2e/specs/TaskMarkerFlags.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
index 3fb09af47..a015fd689 100644
--- a/tests/e2e/specs/TaskMarkerFlags.spec.js
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -19,7 +19,7 @@ describe('Task Marker Flags', () => {
     cy.contains('Advanced').click();
   });
 
-  it('can set parallel multi-instance', () => {
+  it('sets a task as "parallel multi-instance"', () => {
     cy.get('[data-test=parallel_mi]').check({ force: true });
     cy.get('[data-test=for-compensation').uncheck({ force: true });
 
@@ -27,7 +27,7 @@ describe('Task Marker Flags', () => {
     assertBottomCenterTaskMarkerHasImage('parallel');
   });
 
-  it('can set sequential multi-instance', () => {
+  it('sets a task as "sequential multi-instance"', () => {
     cy.get('[data-test=sequential_mi]').check({ force: true });
     cy.get('[data-test=for-compensation').uncheck({ force: true });
 
@@ -35,7 +35,7 @@ describe('Task Marker Flags', () => {
     assertBottomCenterTaskMarkerHasImage('sequential');
   });
 
-  it('can set standard loop', () => {
+  it('sets a task as "standard loop"', () => {
     cy.get('[data-test=loop]').check({ force: true });
     cy.get('[data-test=for-compensation').uncheck({ force: true });
 
@@ -43,7 +43,7 @@ describe('Task Marker Flags', () => {
     assertBottomCenterTaskMarkerHasImage('loop');
   });
 
-  it('can set a task as "for compensation"', () => {
+  it('sets a task as "for compensation"', () => {
     cy.get('[data-test=for-compensation').check({ force: true });
     assertDownloadedXmlContainsExpected('<bpmn:task id="node_2" name="Form Task" isForCompensation="true" pm:assignment="requester" />');
     assertBottomCenterTaskMarkerHasImage('compensation');

From b5ee459e1b057732b1f8a5d5e4a034b36dc5fbd7 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Tue, 1 Dec 2020 11:25:23 -0500
Subject: [PATCH 19/37] fix failing test

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 .../components/nodes/task/setupMultiInstanceMarkers.spec.js   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/unit/components/nodes/task/setupMultiInstanceMarkers.spec.js b/tests/unit/components/nodes/task/setupMultiInstanceMarkers.spec.js
index 1bdc6363f..4e1f121d5 100644
--- a/tests/unit/components/nodes/task/setupMultiInstanceMarkers.spec.js
+++ b/tests/unit/components/nodes/task/setupMultiInstanceMarkers.spec.js
@@ -5,6 +5,7 @@ import loopIcon from '@/assets/loop.svg';
 
 describe('setupMultiInstanceMarkers', () => {
   let $set = jest.fn();
+  let $delete = jest.fn();
   let markers = {
     bottomCenter: {},
   };
@@ -12,9 +13,10 @@ describe('setupMultiInstanceMarkers', () => {
   it('does not set up markers for task without loop characteristics', () => {
     const nodeDefinition = { get(){} };
 
-    setupMultiInstanceMarkers(nodeDefinition, {}, $set);
+    setupMultiInstanceMarkers(nodeDefinition, {}, $set, $delete);
 
     expect($set).not.toHaveBeenCalled();
+    expect($delete).toHaveBeenCalledTimes(1);
   });
 
   it('sets sequential icon for sequential multi instance task', () => {

From 2de44f880688acb58a0ac430b4a392914d228d6f Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Wed, 2 Dec 2020 14:54:42 -0500
Subject: [PATCH 20/37] add failing test

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 tests/e2e/fixtures/withLoopMarker.xml   | 16 ++++++++++++++++
 tests/e2e/specs/TaskMarkerFlags.spec.js | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/e2e/fixtures/withLoopMarker.xml

diff --git a/tests/e2e/fixtures/withLoopMarker.xml b/tests/e2e/fixtures/withLoopMarker.xml
new file mode 100644
index 000000000..563c8d011
--- /dev/null
+++ b/tests/e2e/fixtures/withLoopMarker.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:pm="http://processmaker.com/BPMN/2.0/Schema.xsd" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0">
+    <bpmn:process id="Process_1" isExecutable="true">
+        <bpmn:task id="node_1" name="Form Task" pm:assignment="requester">
+            <bpmn:standardLoopCharacteristics />
+        </bpmn:task>
+    </bpmn:process>
+    <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+        <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+            <bpmndi:BPMNShape id="node_1_di" bpmnElement="node_1">
+                <dc:Bounds x="130" y="210" width="116" height="76" />
+            </bpmndi:BPMNShape>
+        </bpmndi:BPMNPlane>
+    </bpmndi:BPMNDiagram>
+</bpmn:definitions>
+s
diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
index a015fd689..cb8842444 100644
--- a/tests/e2e/specs/TaskMarkerFlags.spec.js
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -1,6 +1,6 @@
 import {
   assertDownloadedXmlContainsExpected,
-  dragFromSourceToDest,
+  dragFromSourceToDest, uploadXml,
 } from '../support/utils';
 
 import { nodeTypes } from '../support/constants';
@@ -56,4 +56,17 @@ describe('Task Marker Flags', () => {
     assertBottomCenterTaskMarkerHasImage('compensation');
     assertBottomCenterTaskMarkerHasImage('loop', '1');
   });
+
+  it.only('can still set "for compensation" after undo/redo', () => {
+    uploadXml('withLoopMarker.xml');
+
+    cy.get('.main-paper [data-type="processmaker.components.nodes.task.Shape"]').click();
+    cy.contains('Advanced').click();
+    cy.get('[data-test=for-compensation').check({ force: true });
+
+    assertBottomCenterTaskMarkerHasImage('compensation');
+    assertBottomCenterTaskMarkerHasImage('loop', 1);
+    assertDownloadedXmlContainsExpected('<bpmn:task id="node_1" name="Form Task" isForCompensation="true" pm:assignment="requester" />');
+  });
+
 });

From e105d326e12dbef724b00d42b9c8ec7519111480 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:20:52 -0500
Subject: [PATCH 21/37] space

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 tests/e2e/specs/TaskMarkerFlags.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
index cb8842444..8c60971e9 100644
--- a/tests/e2e/specs/TaskMarkerFlags.spec.js
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -68,5 +68,4 @@ describe('Task Marker Flags', () => {
     assertBottomCenterTaskMarkerHasImage('loop', 1);
     assertDownloadedXmlContainsExpected('<bpmn:task id="node_1" name="Form Task" isForCompensation="true" pm:assignment="requester" />');
   });
-
 });

From f4ff120bc9cdcb5f1d4c9df28cc334ba59f59f4b Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:21:28 -0500
Subject: [PATCH 22/37] remove .only

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 tests/e2e/specs/TaskMarkerFlags.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
index 8c60971e9..f1c41f7a7 100644
--- a/tests/e2e/specs/TaskMarkerFlags.spec.js
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -57,7 +57,7 @@ describe('Task Marker Flags', () => {
     assertBottomCenterTaskMarkerHasImage('loop', '1');
   });
 
-  it.only('can still set "for compensation" after undo/redo', () => {
+  it('can still set "for compensation" after undo/redo', () => {
     uploadXml('withLoopMarker.xml');
 
     cy.get('.main-paper [data-type="processmaker.components.nodes.task.Shape"]').click();

From cc0061c392bc022b2e5d886cfceeda2f93fcd4ff Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 10:45:19 -0500
Subject: [PATCH 23/37] fix watcher bug

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/task.vue      | 13 +++++++++++++
 tests/e2e/specs/TaskMarkerFlags.spec.js |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/nodes/task/task.vue b/src/components/nodes/task/task.vue
index 0de49ce1f..120ef97ac 100644
--- a/src/components/nodes/task/task.vue
+++ b/src/components/nodes/task/task.vue
@@ -131,9 +131,22 @@ export default {
     middleIsOddNumber(value) {
       return Math.abs((value / 2) % 2) === 1;
     },
+    makeDefinitionPropertiesReactive() {
+      const deleteAndReset = (prop, val) => {
+        if (this.node.definition.hasOwnProperty(prop)) {
+          return;
+        }
 
+        delete Object.getPrototypeOf(this.node.definition)[prop];
+        this.$set(this.node.definition, prop, val);
+      };
+
+      deleteAndReset('isForCompensation', false);
+      deleteAndReset('loopCharacteristics', null);
+    },
   },
   mounted() {
+    this.makeDefinitionPropertiesReactive();
     this.shape = new TaskShape();
     let bounds = this.node.diagram.bounds;
     this.shape.position(bounds.x, bounds.y);
diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
index f1c41f7a7..181cfd7b0 100644
--- a/tests/e2e/specs/TaskMarkerFlags.spec.js
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -66,6 +66,10 @@ describe('Task Marker Flags', () => {
 
     assertBottomCenterTaskMarkerHasImage('compensation');
     assertBottomCenterTaskMarkerHasImage('loop', 1);
-    assertDownloadedXmlContainsExpected('<bpmn:task id="node_1" name="Form Task" isForCompensation="true" pm:assignment="requester" />');
+    assertDownloadedXmlContainsExpected(`
+      <bpmn:task id="node_1" name="Form Task" isForCompensation="true" pm:assignment="requester">
+        <bpmn:standardLoopCharacteristics />
+      </bpmn:task>
+    `);
   });
 });

From 83a26d1f0a346a7173e47466aa3abd9f9003ca67 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:22:12 -0500
Subject: [PATCH 24/37] fix setting props so they are reactive

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/task.vue | 14 --------------
 src/store.js                       |  9 ++++-----
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/components/nodes/task/task.vue b/src/components/nodes/task/task.vue
index 120ef97ac..15a82a47b 100644
--- a/src/components/nodes/task/task.vue
+++ b/src/components/nodes/task/task.vue
@@ -131,22 +131,8 @@ export default {
     middleIsOddNumber(value) {
       return Math.abs((value / 2) % 2) === 1;
     },
-    makeDefinitionPropertiesReactive() {
-      const deleteAndReset = (prop, val) => {
-        if (this.node.definition.hasOwnProperty(prop)) {
-          return;
-        }
-
-        delete Object.getPrototypeOf(this.node.definition)[prop];
-        this.$set(this.node.definition, prop, val);
-      };
-
-      deleteAndReset('isForCompensation', false);
-      deleteAndReset('loopCharacteristics', null);
-    },
   },
   mounted() {
-    this.makeDefinitionPropertiesReactive();
     this.shape = new TaskShape();
     let bounds = this.node.diagram.bounds;
     this.shape.position(bounds.x, bounds.y);
diff --git a/src/store.js b/src/store.js
index b7e507e44..6806a8b71 100644
--- a/src/store.js
+++ b/src/store.js
@@ -5,11 +5,13 @@ import uniq from 'lodash/uniq';
 
 Vue.use(Vuex);
 
-function makeDefinitionPropertyReactive(definition, key, value) {
+function setDefinitionPropertyReactive(definition, key, value) {
   if (definition.hasOwnProperty(key)) {
+    definition.set(key, value);
     return;
   }
 
+  delete Object.getPrototypeOf(definition)[key];
   Vue.set(definition, key, value);
 }
 
@@ -74,14 +76,11 @@ export default new Vuex.Store({
       });
     },
     updateNodeProp(state, { node, key, value }) {
-      node.definition.set(key, value);
+      setDefinitionPropertyReactive(node.definition, key, value);
 
       if (value === undefined) {
         Vue.delete(node.definition, key);
-        return;
       }
-
-      makeDefinitionPropertyReactive(node.definition, key, value);
     },
     clearNodes(state) {
       state.nodes = [];

From 7e3aae972c0514ab2fdfc499e99abdcdd1f3261d Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:34:36 -0500
Subject: [PATCH 25/37] update data input and output association ids

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/modeler/Modeler.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index 5b5b67121..6974b1ad5 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -125,7 +125,8 @@ import { id as laneId } from '../nodes/poolLane';
 import { id as sequenceFlowId } from '../nodes/sequenceFlow';
 import { id as associationId } from '../nodes/association';
 import { id as messageFlowId } from '../nodes/messageFlow';
-import { id as dataAssociationFlowId } from '../nodes/dataOutputAssociation';
+import { id as dataOutputAssociationFlowId } from '../nodes/dataOutputAssociation/config';
+import { id as dataInputAssociationFlowId } from '../nodes/dataInputAssociation/config';
 
 import PaperManager from '../paperManager';
 import registerInspectorExtension from '@/components/InspectorExtensionManager';
@@ -431,7 +432,7 @@ export default {
 
       types.forEach(bpmnType => {
         if (!this.parsers[bpmnType]) {
-          this.parsers[bpmnType] = { custom: [], implementation: [], default: [] };
+          this.parsers[bpmnType] = { custom: [], implementation: [], default: []};
         }
 
         if (customParser) {
@@ -746,7 +747,7 @@ export default {
       store.commit('addNode', node);
       this.poolTarget = null;
 
-      if ([sequenceFlowId, laneId, associationId, messageFlowId, dataAssociationFlowId].includes(node.type)) {
+      if ([sequenceFlowId, laneId, associationId, messageFlowId, dataOutputAssociationFlowId, dataInputAssociationFlowId].includes(node.type)) {
         return;
       }
 

From 536a750c74a7506a9bb49275c624c4006aa6c9b9 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:49:06 -0500
Subject: [PATCH 26/37] lint spacinig

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 44d26caaa..1a85ffabf 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -56,7 +56,7 @@ export default {
           if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && currentLoopCharacteristics.isSequential){
             return;
           }
-          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics', {isSequential: true}));
+          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics', { isSequential: true }));
         }
       }
 

From c9258afd92f9118cff92775a0ea32b2a78212cde Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:49:28 -0500
Subject: [PATCH 27/37] fix null definitiion reference error

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 1a85ffabf..229755207 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -20,8 +20,6 @@ export default {
     return moddle.create('bpmn:Task', {
       name: $t(defaultNames[id]),
       assignment: 'requester',
-      isForCompensation: false,
-      loopCharacteristics: null,
     });
   },
   diagram(moddle) {
@@ -36,7 +34,7 @@ export default {
     if (value.markerFlags) {
       if (value.markerFlags.loopCharacteristics) {
         if (value.markerFlags.loopCharacteristics === 'no_loop') {
-          setNodeProp(node, 'loopCharacteristics', null);
+          setNodeProp(node, 'loopCharacteristics', undefined);
         }
 
         const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};

From 1e48d3f1d88e5d4368df166a24528534b4c46570 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 13:49:43 -0500
Subject: [PATCH 28/37] Update ci test spec

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b0406a525..8464c9cb4 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "check-peer-deps": "npm ls --depth=0",
     "posttest": "npm run report:combined",
     "test-unit": "JEST_JUNIT_OUTPUT_DIR=test_summary_reports/jest/ vue-cli-service test:unit --ci --runInBand --reporters=default --reporters=jest-junit",
-    "test-ci": "TZ=UTC vue-cli-service test:e2e --spec tests/e2e/specs/Modeler.spec.js --mode test --headless --browser chrome --reporter mocha-junit-reporter --reporter-options mochaFile=test_summary_reports/mocha/test-results.xml",
+    "test-ci": "TZ=UTC vue-cli-service test:e2e --mode test --headless --browser chrome -- --reporter mocha-junit-reporter --reporter-options mochaFile=reports/mocha/test-results.xml",
     "mkdir:reports": "mkdir reports || true",
     "precopy:reports": "npm run mkdir:reports",
     "copy:reports": "cp cypress-coverage/coverage-final.json reports/from-cypress.json && cp jest-coverage/coverage-final.json reports/from-jest.json",

From 1eb43450d98d8d2a81787544512efdc55c031bb4 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 14:03:56 -0500
Subject: [PATCH 29/37] add test for no validation errors

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 .../validationStatus/ValidationStatus.vue       |  2 +-
 tests/e2e/specs/Validation.spec.js              | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/validationStatus/ValidationStatus.vue b/src/components/validationStatus/ValidationStatus.vue
index c3d268b1e..06c2adc5c 100644
--- a/src/components/validationStatus/ValidationStatus.vue
+++ b/src/components/validationStatus/ValidationStatus.vue
@@ -15,7 +15,7 @@
 
     <div class="status-bar-container d-flex align-items-center justify-content-end">
       <template v-if="autoValidate">
-        <button v-if="numberOfProblemsToDisplay === 0" type="button" class="btn btn-light" :disabled="true">
+        <button v-if="numberOfProblemsToDisplay === 0" type="button" data-test="validation-list-valid" class="btn btn-light" :disabled="true">
           {{ $t('BPMN Valid') }}
           <span class="badge badge-success badge-pill">
             <font-awesome-icon :icon="faCheck"/>
diff --git a/tests/e2e/specs/Validation.spec.js b/tests/e2e/specs/Validation.spec.js
index 6e6d33c78..c3ca4182f 100644
--- a/tests/e2e/specs/Validation.spec.js
+++ b/tests/e2e/specs/Validation.spec.js
@@ -131,4 +131,21 @@ describe('Validation', () => {
       expect(win.console.error).to.have.callCount(0);
     });
   });
+
+  it('has no validation errors for a valid basic diagram', () => {
+    const startEventPosition = { x: 150, y: 150 };
+    const taskPosition = { x: 250, y: 250 };
+    const endEventPosition = { x: 350, y: 350 };
+
+    dragFromSourceToDest(nodeTypes.task, taskPosition);
+    dragFromSourceToDest(nodeTypes.endEvent, endEventPosition);
+
+    connectNodesWithFlow('sequence-flow-button', startEventPosition, taskPosition);
+    connectNodesWithFlow('sequence-flow-button', taskPosition, endEventPosition);
+
+    cy.get('[data-test="validation-toggle"]').click({ force: true });
+
+    cy.get('[data-test=validation-list-valid]')
+      .should('contain.text', 'BPMN Valid');
+  });
 });

From 320767c0bf71b1a8b15d481e73a540c14ac97598 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Thu, 3 Dec 2020 14:24:52 -0500
Subject: [PATCH 30/37] update assertion as timer and name accordions are now
 linked

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 tests/e2e/specs/BoundaryTimerEvent.spec.js     | 3 ---
 tests/e2e/specs/IntermediateTimerEvent.spec.js | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/tests/e2e/specs/BoundaryTimerEvent.spec.js b/tests/e2e/specs/BoundaryTimerEvent.spec.js
index acb8b1bd9..6dfa9bfee 100644
--- a/tests/e2e/specs/BoundaryTimerEvent.spec.js
+++ b/tests/e2e/specs/BoundaryTimerEvent.spec.js
@@ -29,9 +29,6 @@ describe('Boundary Timer Event', () => {
     const name = 'Test name';
     typeIntoTextInput('[name=name]', name);
 
-    const timingControlAccordion = '.fa-clock';
-    cy.get(timingControlAccordion).click();
-
     const durationValue = 4;
     typeIntoTextInput('.repeat', durationValue);
 
diff --git a/tests/e2e/specs/IntermediateTimerEvent.spec.js b/tests/e2e/specs/IntermediateTimerEvent.spec.js
index 8d87b1e0c..799fb1d58 100644
--- a/tests/e2e/specs/IntermediateTimerEvent.spec.js
+++ b/tests/e2e/specs/IntermediateTimerEvent.spec.js
@@ -41,7 +41,6 @@ describe('Intermediate Timer Event', () => {
     const nameInput = '[name=name]';
     const testString = 'testing';
     typeIntoTextInput(nameInput, testString);
-    cy.contains('Timing Control').click();
     cy.get('[data-test=intermediateTypeSelect]').select('Date/Time');
     const startDateTime = '02/27/2019 12:30 AM';
     typeIntoTextInput('[data-test=date-picker]', startDateTime);
@@ -65,7 +64,6 @@ describe('Intermediate Timer Event', () => {
     dragFromSourceToDest(nodeTypes.intermediateCatchEvent, intermediateCatchEventPosition);
 
     getElementAtPosition(intermediateCatchEventPosition).click();
-    cy.contains('Timing Control').click();
     cy.get('[data-test=intermediateTypeSelect]').select('Date/Time');
 
     const defaultTimeDate = '<bpmn:timeDate>1970-01-01T00:00:00.000Z</bpmn:timeDate>';
@@ -83,7 +81,6 @@ describe('Intermediate Timer Event', () => {
   it('should toggle between showing the weekday select when week is selected, and hidiing it when it is not', () => {
     const intermediateTimerEventPosition = { x: 250, y: 250 };
     addNodeTypeToPaper(intermediateTimerEventPosition, nodeTypes.intermediateCatchEvent, 'switch-to-intermediate-timer-catch-event');
-    cy.contains('Timing Control').click();
     cy.get('[data-test=intermediateTypeSelect]').select('Cycle');
 
     cy.get('[data-test="periods"]').select('week');

From a76485f1eae1c99f730c1afe35ae58cd2027a153 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Fri, 4 Dec 2020 09:47:53 -0500
Subject: [PATCH 31/37] Revert "update assertion as timer and name accordions
 are now linked"

This reverts commit 320767c0bf71b1a8b15d481e73a540c14ac97598.
---
 tests/e2e/specs/BoundaryTimerEvent.spec.js     | 3 +++
 tests/e2e/specs/IntermediateTimerEvent.spec.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tests/e2e/specs/BoundaryTimerEvent.spec.js b/tests/e2e/specs/BoundaryTimerEvent.spec.js
index 6dfa9bfee..acb8b1bd9 100644
--- a/tests/e2e/specs/BoundaryTimerEvent.spec.js
+++ b/tests/e2e/specs/BoundaryTimerEvent.spec.js
@@ -29,6 +29,9 @@ describe('Boundary Timer Event', () => {
     const name = 'Test name';
     typeIntoTextInput('[name=name]', name);
 
+    const timingControlAccordion = '.fa-clock';
+    cy.get(timingControlAccordion).click();
+
     const durationValue = 4;
     typeIntoTextInput('.repeat', durationValue);
 
diff --git a/tests/e2e/specs/IntermediateTimerEvent.spec.js b/tests/e2e/specs/IntermediateTimerEvent.spec.js
index 799fb1d58..8d87b1e0c 100644
--- a/tests/e2e/specs/IntermediateTimerEvent.spec.js
+++ b/tests/e2e/specs/IntermediateTimerEvent.spec.js
@@ -41,6 +41,7 @@ describe('Intermediate Timer Event', () => {
     const nameInput = '[name=name]';
     const testString = 'testing';
     typeIntoTextInput(nameInput, testString);
+    cy.contains('Timing Control').click();
     cy.get('[data-test=intermediateTypeSelect]').select('Date/Time');
     const startDateTime = '02/27/2019 12:30 AM';
     typeIntoTextInput('[data-test=date-picker]', startDateTime);
@@ -64,6 +65,7 @@ describe('Intermediate Timer Event', () => {
     dragFromSourceToDest(nodeTypes.intermediateCatchEvent, intermediateCatchEventPosition);
 
     getElementAtPosition(intermediateCatchEventPosition).click();
+    cy.contains('Timing Control').click();
     cy.get('[data-test=intermediateTypeSelect]').select('Date/Time');
 
     const defaultTimeDate = '<bpmn:timeDate>1970-01-01T00:00:00.000Z</bpmn:timeDate>';
@@ -81,6 +83,7 @@ describe('Intermediate Timer Event', () => {
   it('should toggle between showing the weekday select when week is selected, and hidiing it when it is not', () => {
     const intermediateTimerEventPosition = { x: 250, y: 250 };
     addNodeTypeToPaper(intermediateTimerEventPosition, nodeTypes.intermediateCatchEvent, 'switch-to-intermediate-timer-catch-event');
+    cy.contains('Timing Control').click();
     cy.get('[data-test=intermediateTypeSelect]').select('Cycle');
 
     cy.get('[data-test="periods"]').select('week');

From c77803528a6df02037f5e66f9ddd6c607a081441 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Fri, 4 Dec 2020 11:12:45 -0500
Subject: [PATCH 32/37] rename inspector accordion names to be unique

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/inspectors/process.js                   | 2 +-
 src/components/nodes/association/index.js              | 2 +-
 src/components/nodes/baseStartEvent/index.js           | 2 +-
 src/components/nodes/boundaryEvent/index.js            | 2 +-
 src/components/nodes/boundaryTimerEvent/index.js       | 2 +-
 src/components/nodes/dataInputAssociation/index.js     | 2 +-
 src/components/nodes/dataObject/index.js               | 2 +-
 src/components/nodes/dataOutputAssociation/index.js    | 2 +-
 src/components/nodes/dataStore/index.js                | 2 +-
 src/components/nodes/endEvent/index.js                 | 2 +-
 src/components/nodes/eventBasedGateway/index.js        | 2 +-
 src/components/nodes/exclusiveGateway/index.js         | 2 +-
 src/components/nodes/gateway/index.js                  | 2 +-
 src/components/nodes/inclusiveGateway/index.js         | 4 ++--
 src/components/nodes/intermediateEvent/index.js        | 2 +-
 src/components/nodes/intermediateMessageEvent/index.js | 2 +-
 src/components/nodes/intermediateTimerEvent/index.js   | 4 ++--
 src/components/nodes/manualTask/index.js               | 2 +-
 src/components/nodes/messageFlow/index.js              | 2 +-
 src/components/nodes/parallelGateway/index.js          | 4 ++--
 src/components/nodes/pool/index.js                     | 2 +-
 src/components/nodes/poolLane/index.js                 | 2 +-
 src/components/nodes/scriptTask/index.js               | 2 +-
 src/components/nodes/sequenceFlow/index.js             | 2 +-
 src/components/nodes/serviceTask/index.js              | 2 +-
 src/components/nodes/startTimerEvent/index.js          | 2 +-
 src/components/nodes/subProcess/index.js               | 2 +-
 src/components/nodes/task/index.js                     | 2 +-
 src/components/nodes/textAnnotation/index.js           | 2 +-
 29 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/components/inspectors/process.js b/src/components/inspectors/process.js
index 6aa3434dd..4f70cd3d4 100644
--- a/src/components/inspectors/process.js
+++ b/src/components/inspectors/process.js
@@ -16,7 +16,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-process',
           },
           items: [
             {
diff --git a/src/components/nodes/association/index.js b/src/components/nodes/association/index.js
index cbb94c004..e6809dc28 100644
--- a/src/components/nodes/association/index.js
+++ b/src/components/nodes/association/index.js
@@ -25,7 +25,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-association',
           },
           items: [
             {
diff --git a/src/components/nodes/baseStartEvent/index.js b/src/components/nodes/baseStartEvent/index.js
index 081b3d9fa..f6953ca23 100644
--- a/src/components/nodes/baseStartEvent/index.js
+++ b/src/components/nodes/baseStartEvent/index.js
@@ -34,7 +34,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-start-event',
           },
           items: [
             {
diff --git a/src/components/nodes/boundaryEvent/index.js b/src/components/nodes/boundaryEvent/index.js
index 7378edf8b..56ffce63b 100644
--- a/src/components/nodes/boundaryEvent/index.js
+++ b/src/components/nodes/boundaryEvent/index.js
@@ -36,7 +36,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-boundary-event',
           },
           items: [
             {
diff --git a/src/components/nodes/boundaryTimerEvent/index.js b/src/components/nodes/boundaryTimerEvent/index.js
index 69deefc80..72b47bd25 100644
--- a/src/components/nodes/boundaryTimerEvent/index.js
+++ b/src/components/nodes/boundaryTimerEvent/index.js
@@ -83,7 +83,7 @@ export default merge(cloneDeep(boundaryEventConfig), {
         config: {
           label: 'Timing Control',
           icon: 'clock',
-          name: 'inspector-accordion',
+          name: 'inspector-accordion-boundary-timer-event',
         },
         items: [
           {
diff --git a/src/components/nodes/dataInputAssociation/index.js b/src/components/nodes/dataInputAssociation/index.js
index fe9e7984e..4b71220d4 100644
--- a/src/components/nodes/dataInputAssociation/index.js
+++ b/src/components/nodes/dataInputAssociation/index.js
@@ -17,7 +17,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-data-input-association',
           },
           items: [
             {
diff --git a/src/components/nodes/dataObject/index.js b/src/components/nodes/dataObject/index.js
index 1586291cf..c139fefaf 100644
--- a/src/components/nodes/dataObject/index.js
+++ b/src/components/nodes/dataObject/index.js
@@ -40,7 +40,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-data-object',
           },
           items: [
             {
diff --git a/src/components/nodes/dataOutputAssociation/index.js b/src/components/nodes/dataOutputAssociation/index.js
index ee30cce71..5538d5f53 100644
--- a/src/components/nodes/dataOutputAssociation/index.js
+++ b/src/components/nodes/dataOutputAssociation/index.js
@@ -17,7 +17,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-data-output-association',
           },
           items: [
             {
diff --git a/src/components/nodes/dataStore/index.js b/src/components/nodes/dataStore/index.js
index 0bc9c5513..2eb77f79a 100644
--- a/src/components/nodes/dataStore/index.js
+++ b/src/components/nodes/dataStore/index.js
@@ -40,7 +40,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-data-store',
           },
           items: [
             {
diff --git a/src/components/nodes/endEvent/index.js b/src/components/nodes/endEvent/index.js
index 1793c967a..f99eae310 100644
--- a/src/components/nodes/endEvent/index.js
+++ b/src/components/nodes/endEvent/index.js
@@ -40,7 +40,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-end-event',
           },
           items: [
             {
diff --git a/src/components/nodes/eventBasedGateway/index.js b/src/components/nodes/eventBasedGateway/index.js
index 0cac59674..7a6b7f2f2 100644
--- a/src/components/nodes/eventBasedGateway/index.js
+++ b/src/components/nodes/eventBasedGateway/index.js
@@ -35,7 +35,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-event-based-gateway',
           },
           items: [
             {
diff --git a/src/components/nodes/exclusiveGateway/index.js b/src/components/nodes/exclusiveGateway/index.js
index 4c539b694..de9ef65b4 100644
--- a/src/components/nodes/exclusiveGateway/index.js
+++ b/src/components/nodes/exclusiveGateway/index.js
@@ -38,7 +38,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-exlcusive-gateway',
           },
           items: [
             {
diff --git a/src/components/nodes/gateway/index.js b/src/components/nodes/gateway/index.js
index 93057298d..a4e428a7e 100644
--- a/src/components/nodes/gateway/index.js
+++ b/src/components/nodes/gateway/index.js
@@ -33,7 +33,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-gateway',
           },
           items: [
             {
diff --git a/src/components/nodes/inclusiveGateway/index.js b/src/components/nodes/inclusiveGateway/index.js
index 07b074053..a800ae91b 100644
--- a/src/components/nodes/inclusiveGateway/index.js
+++ b/src/components/nodes/inclusiveGateway/index.js
@@ -39,7 +39,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-inclusive-gateway-config',
           },
           items: [
             {
@@ -55,7 +55,7 @@ export default {
             initiallyOpen: false,
             label: 'Advanced',
             icon: 'cogs',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-inclusive-gateway-advanced',
           },
           items: [
             {
diff --git a/src/components/nodes/intermediateEvent/index.js b/src/components/nodes/intermediateEvent/index.js
index faeaf3f0b..428805325 100644
--- a/src/components/nodes/intermediateEvent/index.js
+++ b/src/components/nodes/intermediateEvent/index.js
@@ -35,7 +35,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-intermediate-gateway-config',
           },
           items: [
             {
diff --git a/src/components/nodes/intermediateMessageEvent/index.js b/src/components/nodes/intermediateMessageEvent/index.js
index 6153134d1..91c957f43 100644
--- a/src/components/nodes/intermediateMessageEvent/index.js
+++ b/src/components/nodes/intermediateMessageEvent/index.js
@@ -38,7 +38,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-intermediate-message-event',
           },
           items: [
             {
diff --git a/src/components/nodes/intermediateTimerEvent/index.js b/src/components/nodes/intermediateTimerEvent/index.js
index d61aed979..7773c8756 100644
--- a/src/components/nodes/intermediateTimerEvent/index.js
+++ b/src/components/nodes/intermediateTimerEvent/index.js
@@ -92,7 +92,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-intermediate-timer-config',
           },
           items: [
             {
@@ -107,7 +107,7 @@ export default {
           config: {
             label: 'Timing Control',
             icon: 'clock',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-intermediate-timer-event-timing-control',
           },
           items: [
             {
diff --git a/src/components/nodes/manualTask/index.js b/src/components/nodes/manualTask/index.js
index c66dc230a..616e1c143 100644
--- a/src/components/nodes/manualTask/index.js
+++ b/src/components/nodes/manualTask/index.js
@@ -38,7 +38,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-manual-task',
           },
           items: [
             {
diff --git a/src/components/nodes/messageFlow/index.js b/src/components/nodes/messageFlow/index.js
index 8a4267a8d..09df3c866 100644
--- a/src/components/nodes/messageFlow/index.js
+++ b/src/components/nodes/messageFlow/index.js
@@ -25,7 +25,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-message-flow',
           },
           items: [
             {
diff --git a/src/components/nodes/parallelGateway/index.js b/src/components/nodes/parallelGateway/index.js
index 71cf06f6c..d957c2981 100644
--- a/src/components/nodes/parallelGateway/index.js
+++ b/src/components/nodes/parallelGateway/index.js
@@ -36,7 +36,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-parallel-gateway-config',
           },
           items: [
             {
@@ -52,7 +52,7 @@ export default {
             initiallyOpen: false,
             label: 'Advanced',
             icon: 'cogs',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-parallel-gateway-direction',
           },
           items: [
             {
diff --git a/src/components/nodes/pool/index.js b/src/components/nodes/pool/index.js
index f3131be7c..38bf33182 100644
--- a/src/components/nodes/pool/index.js
+++ b/src/components/nodes/pool/index.js
@@ -36,7 +36,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-pool',
           },
           items: [
             {
diff --git a/src/components/nodes/poolLane/index.js b/src/components/nodes/poolLane/index.js
index 512684edd..a16a86b74 100644
--- a/src/components/nodes/poolLane/index.js
+++ b/src/components/nodes/poolLane/index.js
@@ -34,7 +34,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-pool-lane',
           },
           items: [
             {
diff --git a/src/components/nodes/scriptTask/index.js b/src/components/nodes/scriptTask/index.js
index 944cc813b..6d97e6ca8 100644
--- a/src/components/nodes/scriptTask/index.js
+++ b/src/components/nodes/scriptTask/index.js
@@ -38,7 +38,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-script-task',
           },
           items: [
             {
diff --git a/src/components/nodes/sequenceFlow/index.js b/src/components/nodes/sequenceFlow/index.js
index 8be8d37e2..107fccc41 100644
--- a/src/components/nodes/sequenceFlow/index.js
+++ b/src/components/nodes/sequenceFlow/index.js
@@ -65,7 +65,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-sequence-flow',
           },
           items: [
             {
diff --git a/src/components/nodes/serviceTask/index.js b/src/components/nodes/serviceTask/index.js
index b52d1dc70..226d3e0ec 100644
--- a/src/components/nodes/serviceTask/index.js
+++ b/src/components/nodes/serviceTask/index.js
@@ -24,7 +24,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-service-task',
           },
           items: [
             {
diff --git a/src/components/nodes/startTimerEvent/index.js b/src/components/nodes/startTimerEvent/index.js
index e83364003..de8bf645d 100644
--- a/src/components/nodes/startTimerEvent/index.js
+++ b/src/components/nodes/startTimerEvent/index.js
@@ -66,7 +66,7 @@ export default merge(cloneDeep(baseStartEventConfig), {
           config: {
             label: 'Timing Control',
             icon: 'clock',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-start-timer-timing-control',
           },
           items: [
             {
diff --git a/src/components/nodes/subProcess/index.js b/src/components/nodes/subProcess/index.js
index 571c71954..33da56de9 100644
--- a/src/components/nodes/subProcess/index.js
+++ b/src/components/nodes/subProcess/index.js
@@ -57,7 +57,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-subprocess',
           },
           items: [
             {
diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 229755207..f6fd21c9a 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -91,7 +91,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-task',
           },
           items: [
             {
diff --git a/src/components/nodes/textAnnotation/index.js b/src/components/nodes/textAnnotation/index.js
index abb7246a0..3e0875dbe 100644
--- a/src/components/nodes/textAnnotation/index.js
+++ b/src/components/nodes/textAnnotation/index.js
@@ -51,7 +51,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-text-annotation',
           },
           items: [
             {

From 2ee7f705f74e62fe3df2f11a11bd7fe266dd4874 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Fri, 4 Dec 2020 11:34:52 -0500
Subject: [PATCH 33/37] fix unsetting definition value

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/index.js | 2 +-
 src/store.js                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index f6fd21c9a..1330a012e 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -34,7 +34,7 @@ export default {
     if (value.markerFlags) {
       if (value.markerFlags.loopCharacteristics) {
         if (value.markerFlags.loopCharacteristics === 'no_loop') {
-          setNodeProp(node, 'loopCharacteristics', undefined);
+          setNodeProp(node, 'loopCharacteristics', null);
         }
 
         const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
diff --git a/src/store.js b/src/store.js
index 6806a8b71..954881d22 100644
--- a/src/store.js
+++ b/src/store.js
@@ -78,7 +78,7 @@ export default new Vuex.Store({
     updateNodeProp(state, { node, key, value }) {
       setDefinitionPropertyReactive(node.definition, key, value);
 
-      if (value === undefined) {
+      if (value == null) {
         Vue.delete(node.definition, key);
       }
     },

From c2f7f7e6d8e4e081ea3aee692c9f33ab6cc6f9e9 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Fri, 4 Dec 2020 11:35:06 -0500
Subject: [PATCH 34/37] add test for unsetting loop characteristics

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 tests/e2e/specs/TaskMarkerFlags.spec.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/specs/TaskMarkerFlags.spec.js b/tests/e2e/specs/TaskMarkerFlags.spec.js
index 181cfd7b0..9d395d8f7 100644
--- a/tests/e2e/specs/TaskMarkerFlags.spec.js
+++ b/tests/e2e/specs/TaskMarkerFlags.spec.js
@@ -1,6 +1,6 @@
 import {
-  assertDownloadedXmlContainsExpected,
-  dragFromSourceToDest, uploadXml,
+  assertDownloadedXmlContainsExpected, assertDownloadedXmlDoesNotContainExpected,
+  dragFromSourceToDest, uploadXml, waitToRenderNodeUpdates,
 } from '../support/utils';
 
 import { nodeTypes } from '../support/constants';
@@ -43,6 +43,23 @@ describe('Task Marker Flags', () => {
     assertBottomCenterTaskMarkerHasImage('loop');
   });
 
+  it('can unset loop characteristics', () => {
+    cy.get('[data-test=loop]').check({ force: true });
+    waitToRenderNodeUpdates();
+    cy.get('[data-test=for-compensation').uncheck({ force: true });
+    waitToRenderNodeUpdates();
+
+    assertDownloadedXmlContainsExpected('<bpmn:standardLoopCharacteristics />');
+    assertBottomCenterTaskMarkerHasImage('loop');
+
+    cy.get('[data-test=no_loop]').check({ force: true });
+    waitToRenderNodeUpdates();
+
+    assertDownloadedXmlDoesNotContainExpected('<bpmn:standardLoopCharacteristics />');
+    cy.get('.main-paper [data-type="processmaker.components.nodes.task.Shape"] [joint-selector="bottomCenter.0"]')
+      .should('not.have.attr', 'xlink:href');
+  });
+
   it('sets a task as "for compensation"', () => {
     cy.get('[data-test=for-compensation').check({ force: true });
     assertDownloadedXmlContainsExpected('<bpmn:task id="node_2" name="Form Task" isForCompensation="true" pm:assignment="requester" />');

From 99281af8ca726bc088f12eeaa335fa578e688579 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Fri, 4 Dec 2020 11:35:11 -0500
Subject: [PATCH 35/37] rename

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
---
 src/components/nodes/task/task.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/nodes/task/task.vue b/src/components/nodes/task/task.vue
index 20532225e..6e588d454 100644
--- a/src/components/nodes/task/task.vue
+++ b/src/components/nodes/task/task.vue
@@ -29,7 +29,7 @@ import CrownConfig from '@/components/crown/crownConfig/crownConfig';
 import { gridSize } from '@/graph';
 import defaultNames from '@/components/nodes/task/defaultNames';
 import boundaryEventDropdownData from '@/components/nodes/boundaryEvent/boundaryEventDropdownData';
-import setupMultiInstanceMarkers from '@/components/nodes/task/setupMultiInstanceMarkers';
+import setupLoopCharacteristicsMarkers from '@/components/nodes/task/setupMultiInstanceMarkers';
 import setupCompensationMarker from '@/components/nodes/task/setupCompensationMarker';
 import { getRectangleAnchorPoint } from '@/portsUtils';
 
@@ -107,7 +107,7 @@ export default {
       setupCompensationMarker(this.node.definition, this.markers, this.$set, this.$delete);
     },
     'node.definition.loopCharacteristics'() {
-      setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set, this.$delete);
+      setupLoopCharacteristicsMarkers(this.node.definition, this.markers, this.$set, this.$delete);
     },
   },
   methods: {
@@ -140,7 +140,7 @@ export default {
     this.shape.position(bounds.x, bounds.y);
     this.shape.resize(bounds.width, bounds.height);
     setupCompensationMarker(this.node.definition, this.markers, this.$set, this.$delete);
-    setupMultiInstanceMarkers(this.node.definition, this.markers, this.$set, this.$delete);
+    setupLoopCharacteristicsMarkers(this.node.definition, this.markers, this.$set, this.$delete);
     this.shape.attr({
       body: {
         rx: 8,

From 5af7081002017b960c2e4e8bdd6bac0089b96695 Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 7 Dec 2020 10:16:31 -0500
Subject: [PATCH 36/37] refactor method so early return works without skipping
 other updates

---
 src/components/nodes/task/index.js | 73 ++++++++++++++++--------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 1330a012e..8dab3b2df 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -31,41 +31,7 @@ export default {
     });
   },
   inspectorHandler(value, node, setNodeProp, moddle, definitions, defaultInspectorHandler) {
-    if (value.markerFlags) {
-      if (value.markerFlags.loopCharacteristics) {
-        if (value.markerFlags.loopCharacteristics === 'no_loop') {
-          setNodeProp(node, 'loopCharacteristics', null);
-        }
-
-        const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
-
-        if (value.markerFlags.loopCharacteristics === 'loop' && currentLoopCharacteristics.$type !== 'bpmn:StandardLoopCharacteristics') {
-          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:StandardLoopCharacteristics'));
-        }
-
-        if (value.markerFlags.loopCharacteristics === 'parallel_mi' ) {
-          if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && !currentLoopCharacteristics.isSequential){
-            return;
-          }
-          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics'));
-        }
-
-        if (value.markerFlags.loopCharacteristics === 'sequential_mi') {
-          if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && currentLoopCharacteristics.isSequential){
-            return;
-          }
-          setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics', { isSequential: true }));
-        }
-      }
-
-      const currentIsForCompensationValue = node.definition.get('isForCompensation');
-      const newIsForCompensationValue = value.markerFlags.isForCompensation;
-
-      if (newIsForCompensationValue != null && newIsForCompensationValue !== currentIsForCompensationValue) {
-        setNodeProp(node, 'isForCompensation', newIsForCompensationValue);
-      }
-    }
-
+    handleMarkerFlagsValue(value.markerFlags, node, setNodeProp, moddle);
     defaultInspectorHandler(omit(value, 'markerFlags'));
   },
   inspectorData(node, defaultDataTransform) {
@@ -106,6 +72,43 @@ export default {
   ],
 };
 
+function handleMarkerFlagsValue(markerFlags, node, setNodeProp, moddle) {
+  if (markerFlags) {
+    if (markerFlags.loopCharacteristics) {
+      if (markerFlags.loopCharacteristics === 'no_loop') {
+        setNodeProp(node, 'loopCharacteristics', null);
+      }
+
+      const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
+
+      if (markerFlags.loopCharacteristics === 'loop' && currentLoopCharacteristics.$type !== 'bpmn:StandardLoopCharacteristics') {
+        setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:StandardLoopCharacteristics'));
+      }
+
+      if (markerFlags.loopCharacteristics === 'parallel_mi' ) {
+        if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && !currentLoopCharacteristics.isSequential){
+          return;
+        }
+        setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics'));
+      }
+
+      if (markerFlags.loopCharacteristics === 'sequential_mi') {
+        if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && currentLoopCharacteristics.isSequential){
+          return;
+        }
+        setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics', { isSequential: true }));
+      }
+    }
+
+    const currentIsForCompensationValue = node.definition.get('isForCompensation');
+    const newIsForCompensationValue = markerFlags.isForCompensation;
+
+    if (newIsForCompensationValue != null && newIsForCompensationValue !== currentIsForCompensationValue) {
+      setNodeProp(node, 'isForCompensation', newIsForCompensationValue);
+    }
+  }
+}
+
 function getLoopCharacteristicsRadioValue(loopCharacteristics) {
   if (!loopCharacteristics) {
     return 'no_loop';

From d7fffb31b0936f7cf3bb7157df53f9028c997c2f Mon Sep 17 00:00:00 2001
From: vehikl-jacare <vehikl-jacare@users.noreply.github.com>
Date: Mon, 7 Dec 2020 10:17:31 -0500
Subject: [PATCH 37/37] early return to remove one level of if block

---
 src/components/nodes/task/index.js | 50 ++++++++++++++++--------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/components/nodes/task/index.js b/src/components/nodes/task/index.js
index 8dab3b2df..cf4be7c63 100644
--- a/src/components/nodes/task/index.js
+++ b/src/components/nodes/task/index.js
@@ -73,39 +73,41 @@ export default {
 };
 
 function handleMarkerFlagsValue(markerFlags, node, setNodeProp, moddle) {
-  if (markerFlags) {
-    if (markerFlags.loopCharacteristics) {
-      if (markerFlags.loopCharacteristics === 'no_loop') {
-        setNodeProp(node, 'loopCharacteristics', null);
-      }
+  if (!markerFlags) {
+    return;
+  }
 
-      const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
+  if (markerFlags.loopCharacteristics) {
+    if (markerFlags.loopCharacteristics === 'no_loop') {
+      setNodeProp(node, 'loopCharacteristics', null);
+    }
 
-      if (markerFlags.loopCharacteristics === 'loop' && currentLoopCharacteristics.$type !== 'bpmn:StandardLoopCharacteristics') {
-        setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:StandardLoopCharacteristics'));
-      }
+    const currentLoopCharacteristics = node.definition.get('loopCharacteristics') || {};
 
-      if (markerFlags.loopCharacteristics === 'parallel_mi' ) {
-        if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && !currentLoopCharacteristics.isSequential){
-          return;
-        }
-        setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics'));
+    if (markerFlags.loopCharacteristics === 'loop' && currentLoopCharacteristics.$type !== 'bpmn:StandardLoopCharacteristics') {
+      setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:StandardLoopCharacteristics'));
+    }
+
+    if (markerFlags.loopCharacteristics === 'parallel_mi' ) {
+      if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && !currentLoopCharacteristics.isSequential){
+        return;
       }
+      setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics'));
+    }
 
-      if (markerFlags.loopCharacteristics === 'sequential_mi') {
-        if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && currentLoopCharacteristics.isSequential){
-          return;
-        }
-        setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics', { isSequential: true }));
+    if (markerFlags.loopCharacteristics === 'sequential_mi') {
+      if (currentLoopCharacteristics.$type === 'bpmn:MultiInstanceLoopCharacteristics' && currentLoopCharacteristics.isSequential){
+        return;
       }
+      setNodeProp(node, 'loopCharacteristics', moddle.create('bpmn:MultiInstanceLoopCharacteristics', { isSequential: true }));
     }
+  }
 
-    const currentIsForCompensationValue = node.definition.get('isForCompensation');
-    const newIsForCompensationValue = markerFlags.isForCompensation;
+  const currentIsForCompensationValue = node.definition.get('isForCompensation');
+  const newIsForCompensationValue = markerFlags.isForCompensation;
 
-    if (newIsForCompensationValue != null && newIsForCompensationValue !== currentIsForCompensationValue) {
-      setNodeProp(node, 'isForCompensation', newIsForCompensationValue);
-    }
+  if (newIsForCompensationValue != null && newIsForCompensationValue !== currentIsForCompensationValue) {
+    setNodeProp(node, 'isForCompensation', newIsForCompensationValue);
   }
 }