@processmaker/modeler 1.18.2 → 1.18.6

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.18.2",
+  "version": "1.18.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -6077,9 +6077,9 @@
           }
         },
         "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.1",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
-          "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -6127,9 +6127,9 @@
               "optional": true
             },
             "loader-utils": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "version": "2.0.2",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+              "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
               "dev": true,
               "optional": true,
               "requires": {
@@ -8014,9 +8014,9 @@
       "dev": true
     },
     "bpmnlint-plugin-processmaker": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/bpmnlint-plugin-processmaker/-/bpmnlint-plugin-processmaker-1.2.3.tgz",
-      "integrity": "sha512-FzHL/53H81wvPEj9vDG+4+ozREofot3fgH8t8ABTqXazAHLYHtV2SPOky4wo+C9Mv1z40KKLoRZnb621Ul0frg==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/bpmnlint-plugin-processmaker/-/bpmnlint-plugin-processmaker-1.2.5.tgz",
+      "integrity": "sha512-Y2nJ4rC7D4bRqB7TcnjlTqcFgohif/iH7o3i/F5wMZYU2oldHS3AUL7axX2WdvIpSyT87cZOredCMbnmCfvFkw==",
       "requires": {
         "bpmnlint": "^7.2.1",
         "bpmnlint-utils": "^1.0.1",
@@ -8039,9 +8039,9 @@
           }
         },
         "bpmnlint": {
-          "version": "7.2.1",
-          "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-7.2.1.tgz",
-          "integrity": "sha512-WbAGBbPN7mCJOUWriu8Zadu7HNxU+0oASvLAcfKYZ/2En9/aE9/e0RXUkhFqhoOx9Aw+xJGwKqH7QTI2BfigAw==",
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-7.4.0.tgz",
+          "integrity": "sha512-Kxlen+5NUzVqQullMXewmSJsS9QI8chUSyrDX5jXcOWU8gBbwq8RbQeAnhOmFD3aQFh+bL3q8jCcseX3RHbGtA==",
           "requires": {
             "ansi-colors": "^4.1.1",
             "bpmn-moddle": "^7.0.3",
@@ -16660,21 +16660,21 @@
       }
     },
     "jointjs": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jointjs/-/jointjs-3.2.0.tgz",
-      "integrity": "sha512-eI9XWSBlfgC8CuM8DD701o3aLqGtqOIB7qotxE98DNRZHQWQqRLihL/ffQ1SVqXMOmkk82lPVwBJzCjr+Nk+mQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/jointjs/-/jointjs-3.4.2.tgz",
+      "integrity": "sha512-iw/mOu+y2AD3lhCAQ5RloaRJH/oIWD6rtfGJ1BvhnaF6fn2Wfec/so64LTl5rwCP1IL9cQEMIuh3eth43UwwIw==",
       "requires": {
         "backbone": "~1.4.0",
-        "dagre": "~0.8.4",
-        "graphlib": "~2.1.7",
-        "jquery": "~3.5.0",
-        "lodash": "~4.17.14"
+        "dagre": "~0.8.5",
+        "graphlib": "~2.1.8",
+        "jquery": "~3.6.0",
+        "lodash": "~4.17.21"
       },
       "dependencies": {
-        "jquery": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-          "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         }
       }
     },
@@ -22249,7 +22249,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
@@ -24315,9 +24315,9 @@
       }
     },
     "underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
+      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
     },
     "unherit": {
       "version": "1.1.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.18.2",
+  "version": "1.18.6",
   "scripts": {
     "serve": "vue-cli-service serve",
     "open-cypress": "TZ=UTC cypress open",
@@ -48,11 +48,11 @@
     "bootstrap-vue": "^2.0.4",
     "bpmn-moddle": "^6.0.7",
     "bpmnlint": "^6.4.0",
-    "bpmnlint-plugin-processmaker": "1.2.3",
+    "bpmnlint-plugin-processmaker": "1.2.5",
     "core-js": "^3.7.0",
     "file-saver": "^2.0.5",
     "jest-junit": "^12.0.0",
-    "jointjs": "^3.2.0",
+    "jointjs": "^3.4.2",
     "js-yaml-loader": "^1.2.2",
     "lodash": "^4.17.20",
     "luxon": "^1.25.0",

package/src/components/crown/crownButtons/genericFlowButton.vue

@@ -26,6 +26,7 @@ const dontShowOn = [
   'processmaker-modeler-signal-end-event',
   'processmaker-modeler-terminate-end-event',
   'processmaker-modeler-text-annotation',
+  'processmaker-modeler-sequence-flow',
 ];
 
 export default {

package/src/components/inspectors/LoopCharacteristics.vue

@@ -6,14 +6,14 @@
       </b-form-select>
     </b-form-group>
     <template v-if="loopType === 'loop'">
-      <b-form-group :label="$t('Maximun Iterations')">
-        <b-form-input v-model="loopMaximum" type="number" min="0" step="1" @input="changeLoopMaximum"/>
-        <small class="form-text text-muted">{{ $t("Leave empty to continue until exist condition is satisfied") }}</small>
+      <b-form-group :label="$t('Maximum Iterations')">
+        <b-form-input v-model="loopMaximum" type="number" min="0" step="1" @input="changeLoopMaximum" data-cy="loopMaximum" />
+        <small class="form-text text-muted">{{ $t("Leave empty to continue until exit condition is satisfied") }}</small>
       </b-form-group>
 
       <b-form-group :label="$t('Exit Condition')">
-        <textarea class="form-control special-assignment-input" ref="specialAssignmentsInput"  v-model="loopCondition" :aria-label="$t('FEEL Syntax')" placeholder="FEEL Syntax" @input="changeLoopCondition"/>
-        <small class="form-text text-muted">{{ $t("When FEEL expresion evaluates to true then exit loop") }}</small>
+        <textarea class="form-control special-assignment-input" ref="specialAssignmentsInput"  v-model="loopCondition" :aria-label="$t('FEEL Syntax')" placeholder="FEEL Syntax" @input="changeLoopCondition" data-cy="loopCondition"/>
+        <small class="form-text text-muted">{{ $t("When FEEL expression evaluates to true then exit loop") }}</small>
       </b-form-group>
     </template>
     <template
@@ -382,10 +382,13 @@ export default {
       }
     },
     setLoopMaximum(value) {
+      if (!value) {
+        value = null;
+      }
       this.local.loopCharacteristics.loopMaximum = value;
     },
     getLoopMaximum() {
-      if (!this.local.loopCharacteristics) return 0;
+      if (!this.local.loopCharacteristics) return null;
       return this.local.loopCharacteristics.loopMaximum;
     },
     setLoopCondition(value) {

package/src/components/modeler/XMLManager.js

@@ -23,11 +23,46 @@ export default class XMLManager {
         definitions.exporter = 'ProcessMaker Modeler';
         definitions.exporterVersion = '1.0';
 
+        // Clean broken references when loading definitions
+        this.cleanBrokenReferences(definitions);
+
         resolve(definitions);
       });
     });
   }
 
+  cleanBrokenReferences(definitions) {
+    const { rootElements, diagrams } = definitions;
+    const removed = [];
+
+    // Remove broken bpmn:SequenceFlow from bpmn:Process
+    rootElements.forEach(element => {
+      if (element.$type === 'bpmn:Process' && element.flowElements) {
+        element.flowElements = element.flowElements.filter(child => {
+          if (child.$type === 'bpmn:SequenceFlow') {
+            if (!(child.sourceRef && child.targetRef)) {
+              removed.push(child);
+            }
+            return child.sourceRef && child.targetRef;
+          }
+          return true;
+        });
+      }
+    });
+
+    // Remove BPMNEdge from bpmndi:BPMNDiagram
+    diagrams.forEach(element => {
+      if (element.$type === 'bpmndi:BPMNDiagram' && element.plane && element.plane.planeElement) {
+        element.plane.planeElement = element.plane.planeElement.filter(child => {
+          if (child.$type === 'bpmndi:BPMNEdge') {
+            return child.bpmnElement && !removed.includes(child.bpmnElement);
+          }
+          return true;
+        });
+      }
+    });
+  }
+
   download() {
     if (!this.#definitions) {
       return;

package/src/components/nodes/subProcess/SubProcessFormSelect.vue

@@ -91,7 +91,8 @@ export default {
   methods: {
     filterValidProcesses(processes) {
       return processes.filter(process => {
-        return this.filterValidStartEvents(process.events).length > 0;
+        return process.category.is_system == false
+            && this.filterValidStartEvents(process.events).length > 0;
       });
     },
     filterValidStartEvents(events) {

package/src/setup/mockProcesses.json

@@ -23,7 +23,15 @@
           "ownerProcessId": "ProcessId",
           "ownerProcessName": "Process Name"
         }
-      ]
+      ],
+      "category": {
+        "id": 1,
+        "name": "Uncategorized",
+        "status": "ACTIVE",
+        "is_system": 0,
+        "created_at": "2021-09-01T06:11:30-07:00",
+        "updated_at": "2021-09-01T06:11:30-07:00"
+      }
     },
     {
       "id": 3,
@@ -48,7 +56,15 @@
           "ownerProcessId": "ProcessId",
           "ownerProcessName": "Process Name"
         }
-      ]
+      ],
+      "category": {
+        "id": 1,
+        "name": "Uncategorized",
+        "status": "ACTIVE",
+        "is_system": 0,
+        "created_at": "2021-09-01T06:11:30-07:00",
+        "updated_at": "2021-09-01T06:11:30-07:00"
+      }
     },
     {
       "id": 5,
@@ -93,7 +109,15 @@
           "ownerProcessId": "Subprocess2",
           "ownerProcessName": "Subprocess Two"
         }
-      ]
+      ],
+      "category": {
+        "id": 1,
+        "name": "Uncategorized",
+        "status": "ACTIVE",
+        "is_system": 0,
+        "created_at": "2021-09-01T06:11:30-07:00",
+        "updated_at": "2021-09-01T06:11:30-07:00"
+      }
     },
     {
       "id": 1,
@@ -107,7 +131,15 @@
       "deleted_at": null,
       "created_at": "2019-04-01T16:02:14+00:00",
       "updated_at": "2019-04-02T19:11:03+00:00",
-      "events": []
+      "events": [],
+      "category": {
+        "id": 1,
+        "name": "Uncategorized",
+        "status": "ACTIVE",
+        "is_system": 0,
+        "created_at": "2021-09-01T06:11:30-07:00",
+        "updated_at": "2021-09-01T06:11:30-07:00"
+      }
     },
     {
       "id": 13,
@@ -132,7 +164,15 @@
           "ownerProcessId": "Subprocess1",
           "ownerProcessName": "Subprocess One"
         }
-      ]
+      ],
+      "category": {
+        "id": 1,
+        "name": "Uncategorized",
+        "status": "ACTIVE",
+        "is_system": 0,
+        "created_at": "2021-09-01T06:11:30-07:00",
+        "updated_at": "2021-09-01T06:11:30-07:00"
+      }
     }
   ],
   "meta": {

package/src/store.js

@@ -130,8 +130,8 @@ export default new Vuex.Store({
           params: {
             order_direction: 'asc',
             per_page: 1000,
-            status: 'active',
-            include: 'events',
+            status: 'all',
+            include: 'events,category',
           },
         });
         commit('setGlobalProcesses', data.data);