ProcessMaker · vehikl-jacare · Dec 9, 2020 · Nov 27, 2020 · Nov 30, 2020 · Nov 30, 2020
diff --git 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",

diff --git 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;
@@ -193,7 +195,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
@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <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-group>
+      <b-form-checkbox data-test="for-compensation" v-model="isForCompensation" name="for-compensation">For Compensation</b-form-checkbox>
+    </b-form-group>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: Object,
+      default() {
+        return {
+          loopCharacteristics: 'no_loop',
+          isForCompensation: false,
+        };
+      },
+    },
+  },
+  name: 'MarkerFlags',
+  data() {
+    return {
+      loopCharacteristics: this.value.loopCharacteristics,
+      isForCompensation: this.value.isForCompensation,
+    };
+  },
+  watch: {
+    loopCharacteristics(newVal) {
+      this.$emit('input', {loopCharacteristics: newVal});
+    },
+    isForCompensation(newVal) {
+      this.$emit('input', {isForCompensation: newVal});
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js b/src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js
@@ -0,0 +1,35 @@
+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,
+      name: 'taskMarkers',
+      config: {
+        label: 'Marker Flags',
+        name: 'markerFlags',
+      },
+    },
+  ],
+};
diff --git 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/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;
       }
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -65,7 +65,7 @@ export default {
             initiallyOpen: true,
             label: 'Configuration',
             icon: 'cog',
-            name: 'inspector-accordion',
+            name: 'inspector-accordion-sequence-flow',
           },
           items: [
             {