@processmaker/modeler 1.18.4 → 1.18.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.18.4",
+  "version": "1.18.5",
   "scripts": {
     "serve": "vue-cli-service serve",
     "open-cypress": "TZ=UTC cypress open",
@@ -48,7 +48,7 @@
     "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.4",
     "core-js": "^3.7.0",
     "file-saver": "^2.0.5",
     "jest-junit": "^12.0.0",

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);