From e85bc935543b5ba9000510338b9d59d4290c8b91 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 8 Apr 2020 12:43:10 -0400
Subject: [PATCH 1/9] Add default flow marker

---
 src/components/nodes/sequenceFlow/sequenceFlow.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/nodes/sequenceFlow/sequenceFlow.vue b/src/components/nodes/sequenceFlow/sequenceFlow.vue
index 180f4881c..cb1a91d4e 100644
--- a/src/components/nodes/sequenceFlow/sequenceFlow.vue
+++ b/src/components/nodes/sequenceFlow/sequenceFlow.vue
@@ -137,11 +137,21 @@ export default {
         position: namePosition,
       }]);
     },
+    createDefaultFlowMarker() {
+      this.shape.attr('line', {
+        sourceMarker: {
+          'type': 'polyline',
+          'stroke-width': 0,
+          points: '2,6 4,-6',
+        },
+      });
+    },
   },
   mounted() {
     this.shape = new shapes.standard.Link();
     this.shape.connector('rounded', { radius: 5 });
     this.createLabel();
+    this.createDefaultFlowMarker();
 
     this.shape.addTo(this.graph);
     this.shape.component = this;

From fac19aebcef2d79b1e903c3726e3ec4cc4ff1419 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 8 Apr 2020 14:33:40 -0400
Subject: [PATCH 2/9] Add default flow crown button

---
 src/assets/default-flow.svg                   |  9 ++++++
 .../crown/crownButtons/defaultFlowButton.vue  | 32 +++++++++++++++++++
 .../crown/crownConfig/crownConfig.vue         |  7 ++++
 src/components/nodes/node.js                  |  4 +++
 4 files changed, 52 insertions(+)
 create mode 100644 src/assets/default-flow.svg
 create mode 100644 src/components/crown/crownButtons/defaultFlowButton.vue

diff --git a/src/assets/default-flow.svg b/src/assets/default-flow.svg
new file mode 100644
index 000000000..da950ef7b
--- /dev/null
+++ b/src/assets/default-flow.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+  version="1.1" width="16px" height="20px" viewBox="7 7 16 20">
+	<defs />
+	<g>
+		<path d="M 7 27 L 17.93 13.34" fill="none" stroke="#ffffff" stroke-miterlimit="10" pointer-events="stroke" />
+		<path d="M 22.3 7.87 L 20.66 15.53 L 15.2 11.15 Z" fill="#ffffff" stroke="#ffffff" stroke-miterlimit="10" pointer-events="all" />
+		<path d="M 7 20 L 18 20" fill="none" stroke="#ffffff" stroke-miterlimit="10" pointer-events="stroke" />
+	</g>
+</svg>
diff --git a/src/components/crown/crownButtons/defaultFlowButton.vue b/src/components/crown/crownButtons/defaultFlowButton.vue
new file mode 100644
index 000000000..b7065945c
--- /dev/null
+++ b/src/components/crown/crownButtons/defaultFlowButton.vue
@@ -0,0 +1,32 @@
+<template>
+  <crown-button
+    v-if="node.canBeDefaultFlow()"
+    :title="$t('Default Flow')"
+    v-b-tooltip.hover.viewport.d50="{ customClass: 'no-pointer-events' }"
+    aria-label="Default Flow"
+    data-test="default-flow"
+    role="menuitem"
+    :src="icon"
+    @click="click"
+  />
+</template>
+
+<script>
+import CrownButton from '@/components/crown/crownButtons/crownButton';
+import icon from '@/assets/default-flow.svg';
+
+export default {
+  components: { CrownButton },
+  props: ['node'],
+  data() {
+    return {
+      icon,
+    };
+  },
+  methods: {
+    click() {
+      this.$emit('default-flow', this.node);
+    },
+  },
+};
+</script>
diff --git a/src/components/crown/crownConfig/crownConfig.vue b/src/components/crown/crownConfig/crownConfig.vue
index 8e6e4d340..6dda2880f 100644
--- a/src/components/crown/crownConfig/crownConfig.vue
+++ b/src/components/crown/crownConfig/crownConfig.vue
@@ -26,6 +26,11 @@
       @toggle-crown-state="showCrown = $event"
     />
 
+    <default-flow
+      :node="node"
+      v-on="$listeners"
+    />
+
     <crown-dropdowns
       :dropdown-data="dropdownData"
       :boundary-event-dropdown-data="boundaryEventDropdownData"
@@ -72,6 +77,7 @@ import SequenceFlowButton from '@/components/crown/crownButtons/sequenceFlowButt
 import AssociationFlowButton from '@/components/crown/crownButtons/associationFlowButton';
 import CopyButton from '@/components/crown/crownButtons/copyButton.vue';
 import CrownDropdowns from '@/components/crown/crownButtons/crownDropdowns';
+import DefaultFlow from '@/components/crown/crownButtons/defaultFlowButton.vue';
 import poolLaneCrownConfig from '@/mixins/poolLaneCrownConfig';
 import { removeFlows } from '@/components/crown/utils.js';
 import pull from 'lodash/pull';
@@ -87,6 +93,7 @@ export default {
     SequenceFlowButton,
     AssociationFlowButton,
     CopyButton,
+    DefaultFlow,
   },
   props: {
     highlighted: Boolean,
diff --git a/src/components/nodes/node.js b/src/components/nodes/node.js
index d32a288ac..b06aaec23 100644
--- a/src/components/nodes/node.js
+++ b/src/components/nodes/node.js
@@ -25,6 +25,10 @@ export default class Node {
     return types.includes(this.definition.$type);
   }
 
+  canBeDefaultFlow() {
+    return true;
+  }
+
   isType(type) {
     return this.type === type;
   }

From a1afcc551ee40b7d62e946f7b0a1d2dc753abb87 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 8 Apr 2020 14:47:15 -0400
Subject: [PATCH 3/9] Verify if flow can be the default

---
 src/components/crown/crownButtons/defaultFlowButton.vue | 2 +-
 src/components/nodes/node.js                            | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/crown/crownButtons/defaultFlowButton.vue b/src/components/crown/crownButtons/defaultFlowButton.vue
index b7065945c..26e29d21f 100644
--- a/src/components/crown/crownButtons/defaultFlowButton.vue
+++ b/src/components/crown/crownButtons/defaultFlowButton.vue
@@ -1,7 +1,7 @@
 <template>
   <crown-button
     v-if="node.canBeDefaultFlow()"
-    :title="$t('Default Flow')"
+    :title="$t('Set as Default Flow')"
     v-b-tooltip.hover.viewport.d50="{ customClass: 'no-pointer-events' }"
     aria-label="Default Flow"
     data-test="default-flow"
diff --git a/src/components/nodes/node.js b/src/components/nodes/node.js
index b06aaec23..f6d31436d 100644
--- a/src/components/nodes/node.js
+++ b/src/components/nodes/node.js
@@ -26,7 +26,12 @@ export default class Node {
   }
 
   canBeDefaultFlow() {
-    return true;
+    const validSources = [
+      'bpmn:ExclusiveGateway',
+      'bpmn:InclusiveGateway',
+    ];
+    return this.definition.$type === 'bpmn:SequenceFlow'
+      && validSources.indexOf(this.definition.sourceRef.$type) > -1;
   }
 
   isType(type) {

From ba07b3abe72d12a8e0912319e29ee7bd0eb905b6 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 8 Apr 2020 15:08:36 -0400
Subject: [PATCH 4/9] Set default flow

---
 src/components/modeler/Modeler.vue | 5 +++++
 src/store.js                       | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index 8b1351d73..45e6156bb 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -96,6 +96,7 @@
         @setTooltip="tooltipTarget = $event"
         @replace-node="replaceNode"
         @copy-element="copyElement"
+        @default-flow="defaultFlow"
       />
     </b-row>
   </span>
@@ -250,6 +251,10 @@ export default {
     },
   },
   methods: {
+    defaultFlow(flow) {
+      const source = flow.definition.sourceRef;
+      store.commit('setDefaultFlow', { source, flow });
+    },
     copyElement(node, copyCount) {
       const clonedNode = node.clone(this.nodeRegistry, this.moddle, this.$t);
       const yOffset = (node.diagram.bounds.height + 30) * copyCount;
diff --git a/src/store.js b/src/store.js
index 2702d8601..ebc72f3c3 100644
--- a/src/store.js
+++ b/src/store.js
@@ -52,6 +52,10 @@ export default new Vuex.Store({
     allowSavingElementPosition: state => state.allowSavingElementPosition,
   },
   mutations: {
+    setDefaultFlow(state, { source, flow }) {
+      source.set('default', flow);
+      makeDefinitionPropertyReactive(source, 'default', flow);
+    },
     preventSavingElementPosition(state) {
       state.allowSavingElementPosition = false;
     },

From 31d4764e35593cfb654a8376f195ef321a70a6f7 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Thu, 9 Apr 2020 09:14:08 -0400
Subject: [PATCH 5/9] Set/unset default flow

---
 src/components/modeler/Modeler.vue            |  3 +++
 src/components/nodes/gateway/gateway.vue      |  1 +
 .../nodes/sequenceFlow/sequenceFlow.vue       | 27 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index 45e6156bb..4f2ea1fb9 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -253,6 +253,9 @@ export default {
   methods: {
     defaultFlow(flow) {
       const source = flow.definition.sourceRef;
+      if (source.default && source.default.id === flow.id) {
+        flow = null;
+      }
       store.commit('setDefaultFlow', { source, flow });
     },
     copyElement(node, copyCount) {
diff --git a/src/components/nodes/gateway/gateway.vue b/src/components/nodes/gateway/gateway.vue
index 391ca817a..e1c683f57 100644
--- a/src/components/nodes/gateway/gateway.vue
+++ b/src/components/nodes/gateway/gateway.vue
@@ -89,6 +89,7 @@ export default {
 
     this.shape.addTo(this.graph);
     this.shape.component = this;
+    this.$set(this.node.definition, 'default', null);
   },
 };
 </script>
diff --git a/src/components/nodes/sequenceFlow/sequenceFlow.vue b/src/components/nodes/sequenceFlow/sequenceFlow.vue
index cb1a91d4e..4cf822982 100644
--- a/src/components/nodes/sequenceFlow/sequenceFlow.vue
+++ b/src/components/nodes/sequenceFlow/sequenceFlow.vue
@@ -68,6 +68,18 @@ export default {
         });
       },
     },
+    defaultFlow: {
+      get() {
+        return this.shape.attr('line').sourceMarker['stroke-width'] > 0;
+      },
+      set(value) {
+        this.shape.attr('line', {
+          sourceMarker: {
+            'stroke-width': value ? 2 : 0,
+          },
+        });
+      },
+    },
   },
   watch: {
     'node.definition': {
@@ -77,6 +89,19 @@ export default {
         if (newNameLabel !== this.nameLabel) {
           this.nameLabel = newNameLabel;
         }
+        window.aa = (window.aa || 0) + 1;
+        this.defaultFlow = this.node.definition.sourceRef
+          && this.node.definition.sourceRef.default
+          && this.node.definition.sourceRef.default.id === this.node.definition.id;
+      },
+      deep: true,
+    },
+    'node.definition.sourceRef': {
+      handler() {
+        window.aa = (window.aa || 0) + 1;
+        this.defaultFlow = this.node.definition.sourceRef
+          && this.node.definition.sourceRef.default
+          && this.node.definition.sourceRef.default.id === this.node.definition.id;
       },
       deep: true,
     },
@@ -142,7 +167,7 @@ export default {
         sourceMarker: {
           'type': 'polyline',
           'stroke-width': 0,
-          points: '2,6 4,-6',
+          points: '2,6 6,-6',
         },
       });
     },

From 1b1e10ce0327ba72b1716d8ae7c6a9553d6dfe20 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Thu, 9 Apr 2020 11:27:15 -0400
Subject: [PATCH 6/9] Fix reactivity for default flow on load xml

---
 src/components/nodes/gateway/gateway.vue           | 6 +++++-
 src/components/nodes/sequenceFlow/sequenceFlow.vue | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/nodes/gateway/gateway.vue b/src/components/nodes/gateway/gateway.vue
index e1c683f57..37ae15679 100644
--- a/src/components/nodes/gateway/gateway.vue
+++ b/src/components/nodes/gateway/gateway.vue
@@ -42,6 +42,11 @@ export default {
     'isRendering',
   ],
   mixins: [highlightConfig, portsConfig, hideLabelOnDrag],
+  created() {
+    const flow = this.node.definition.default || null;
+    delete this.node.definition.default;
+    this.$set(this.node.definition, 'default', flow);
+  },
   data() {
     return {
       shape: null,
@@ -89,7 +94,6 @@ export default {
 
     this.shape.addTo(this.graph);
     this.shape.component = this;
-    this.$set(this.node.definition, 'default', null);
   },
 };
 </script>
diff --git a/src/components/nodes/sequenceFlow/sequenceFlow.vue b/src/components/nodes/sequenceFlow/sequenceFlow.vue
index 4cf822982..31cf86b04 100644
--- a/src/components/nodes/sequenceFlow/sequenceFlow.vue
+++ b/src/components/nodes/sequenceFlow/sequenceFlow.vue
@@ -89,7 +89,6 @@ export default {
         if (newNameLabel !== this.nameLabel) {
           this.nameLabel = newNameLabel;
         }
-        window.aa = (window.aa || 0) + 1;
         this.defaultFlow = this.node.definition.sourceRef
           && this.node.definition.sourceRef.default
           && this.node.definition.sourceRef.default.id === this.node.definition.id;
@@ -98,7 +97,6 @@ export default {
     },
     'node.definition.sourceRef': {
       handler() {
-        window.aa = (window.aa || 0) + 1;
         this.defaultFlow = this.node.definition.sourceRef
           && this.node.definition.sourceRef.default
           && this.node.definition.sourceRef.default.id === this.node.definition.id;
@@ -163,10 +161,13 @@ export default {
       }]);
     },
     createDefaultFlowMarker() {
+      const isDefault = this.node.definition.sourceRef
+        && this.node.definition.sourceRef.default
+        && this.node.definition.sourceRef.default.id === this.node.definition.id;
       this.shape.attr('line', {
         sourceMarker: {
           'type': 'polyline',
-          'stroke-width': 0,
+          'stroke-width': isDefault ? 2 : 0,
           points: '2,6 6,-6',
         },
       });

From c75d4d25d193ca2ddb89fc70d00f429524090578 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Thu, 9 Apr 2020 17:43:28 -0400
Subject: [PATCH 7/9] Update src/components/nodes/node.js

Co-Authored-By: Lisa Fehr <lisa-fehr@users.noreply.github.com>
---
 src/components/nodes/node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/nodes/node.js b/src/components/nodes/node.js
index f6d31436d..2e8c0e109 100644
--- a/src/components/nodes/node.js
+++ b/src/components/nodes/node.js
@@ -31,7 +31,7 @@ export default class Node {
       'bpmn:InclusiveGateway',
     ];
     return this.definition.$type === 'bpmn:SequenceFlow'
-      && validSources.indexOf(this.definition.sourceRef.$type) > -1;
+      && validSources.includes(this.definition.sourceRef.$type);
   }
 
   isType(type) {

From f254063765188087b0e92eba55f46edf96d61b58 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Thu, 9 Apr 2020 17:47:31 -0400
Subject: [PATCH 8/9] Add method isDefaultFlow()

---
 .../nodes/sequenceFlow/sequenceFlow.vue         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/nodes/sequenceFlow/sequenceFlow.vue b/src/components/nodes/sequenceFlow/sequenceFlow.vue
index 31cf86b04..95de7fa4b 100644
--- a/src/components/nodes/sequenceFlow/sequenceFlow.vue
+++ b/src/components/nodes/sequenceFlow/sequenceFlow.vue
@@ -89,22 +89,23 @@ export default {
         if (newNameLabel !== this.nameLabel) {
           this.nameLabel = newNameLabel;
         }
-        this.defaultFlow = this.node.definition.sourceRef
-          && this.node.definition.sourceRef.default
-          && this.node.definition.sourceRef.default.id === this.node.definition.id;
+        this.defaultFlow = this.isDefaultFlow();
       },
       deep: true,
     },
     'node.definition.sourceRef': {
       handler() {
-        this.defaultFlow = this.node.definition.sourceRef
-          && this.node.definition.sourceRef.default
-          && this.node.definition.sourceRef.default.id === this.node.definition.id;
+        this.defaultFlow = this.isDefaultFlow();
       },
       deep: true,
     },
   },
   methods: {
+    isDefaultFlow() {
+      return this.node.definition.sourceRef
+        && this.node.definition.sourceRef.default
+        && this.node.definition.sourceRef.default.id === this.node.definition.id;
+    },
     updateRouter() {
       this.shape.router('orthogonal', { padding: 1 });
     },
@@ -161,9 +162,7 @@ export default {
       }]);
     },
     createDefaultFlowMarker() {
-      const isDefault = this.node.definition.sourceRef
-        && this.node.definition.sourceRef.default
-        && this.node.definition.sourceRef.default.id === this.node.definition.id;
+      const isDefault = this.isDefaultFlow();
       this.shape.attr('line', {
         sourceMarker: {
           'type': 'polyline',

From 944c369d4f04a4adfd522aa3395435f807791657 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Mon, 13 Apr 2020 11:45:28 -0400
Subject: [PATCH 9/9] Fix CR comments

---
 src/components/modeler/Modeler.vue            |  6 ++---
 .../nodes/sequenceFlow/sequenceFlow.vue       | 26 +++++++------------
 src/store.js                                  |  4 ---
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index 4f2ea1fb9..5693a7d17 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -96,7 +96,7 @@
         @setTooltip="tooltipTarget = $event"
         @replace-node="replaceNode"
         @copy-element="copyElement"
-        @default-flow="defaultFlow"
+        @default-flow="toggleDefaultFlow"
       />
     </b-row>
   </span>
@@ -251,12 +251,12 @@ export default {
     },
   },
   methods: {
-    defaultFlow(flow) {
+    toggleDefaultFlow(flow) {
       const source = flow.definition.sourceRef;
       if (source.default && source.default.id === flow.id) {
         flow = null;
       }
-      store.commit('setDefaultFlow', { source, flow });
+      source.set('default', flow);
     },
     copyElement(node, copyCount) {
       const clonedNode = node.clone(this.nodeRegistry, this.moddle, this.$t);
diff --git a/src/components/nodes/sequenceFlow/sequenceFlow.vue b/src/components/nodes/sequenceFlow/sequenceFlow.vue
index 95de7fa4b..1d5fda8c8 100644
--- a/src/components/nodes/sequenceFlow/sequenceFlow.vue
+++ b/src/components/nodes/sequenceFlow/sequenceFlow.vue
@@ -68,18 +68,6 @@ export default {
         });
       },
     },
-    defaultFlow: {
-      get() {
-        return this.shape.attr('line').sourceMarker['stroke-width'] > 0;
-      },
-      set(value) {
-        this.shape.attr('line', {
-          sourceMarker: {
-            'stroke-width': value ? 2 : 0,
-          },
-        });
-      },
-    },
   },
   watch: {
     'node.definition': {
@@ -89,18 +77,25 @@ export default {
         if (newNameLabel !== this.nameLabel) {
           this.nameLabel = newNameLabel;
         }
-        this.defaultFlow = this.isDefaultFlow();
+        this.setDefaultMarker(this.isDefaultFlow());
       },
       deep: true,
     },
     'node.definition.sourceRef': {
       handler() {
-        this.defaultFlow = this.isDefaultFlow();
+        this.setDefaultMarker(this.isDefaultFlow());
       },
       deep: true,
     },
   },
   methods: {
+    setDefaultMarker(value) {
+      this.shape.attr('line', {
+        sourceMarker: {
+          'stroke-width': value ? 2 : 0,
+        },
+      });
+    },
     isDefaultFlow() {
       return this.node.definition.sourceRef
         && this.node.definition.sourceRef.default
@@ -162,11 +157,10 @@ export default {
       }]);
     },
     createDefaultFlowMarker() {
-      const isDefault = this.isDefaultFlow();
       this.shape.attr('line', {
         sourceMarker: {
           'type': 'polyline',
-          'stroke-width': isDefault ? 2 : 0,
+          'stroke-width': this.isDefaultFlow() ? 2 : 0,
           points: '2,6 6,-6',
         },
       });
diff --git a/src/store.js b/src/store.js
index ebc72f3c3..2702d8601 100644
--- a/src/store.js
+++ b/src/store.js
@@ -52,10 +52,6 @@ export default new Vuex.Store({
     allowSavingElementPosition: state => state.allowSavingElementPosition,
   },
   mutations: {
-    setDefaultFlow(state, { source, flow }) {
-      source.set('default', flow);
-      makeDefinitionPropertyReactive(source, 'default', flow);
-    },
     preventSavingElementPosition(state) {
       state.allowSavingElementPosition = false;
     },