@processmaker/modeler 1.36.9 → 1.37.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.36.9",
+  "version": "1.37.0",
   "scripts": {
     "serve": "vue-cli-service serve",
     "test:unit": "vue-cli-service test:unit",

package/src/components/modeler/Modeler.vue

@@ -637,7 +637,6 @@ export default {
       this.translateConfig(nodeType.inspectorConfig[0]);
       addLoopCharacteristics(nodeType);
       this.nodeRegistry[nodeType.id] = nodeType;
-
       Vue.component(nodeType.id, nodeType.component);
       this.nodeTypes.push(nodeType);
 
@@ -678,6 +677,10 @@ export default {
         : [pmBlockNode.bpmnType];
 
       types.forEach(bpmnType => {
+        if (!this.parsers[bpmnType]) {
+          this.parsers[bpmnType] = { custom: [], implementation: [], default: []};
+        }
+
         if (customParser) {
           this.parsers[bpmnType].custom.push(customParser);
           return;
@@ -846,16 +849,20 @@ export default {
       }
 
       this.removeUnsupportedElementAttributes(definition);
-      const type = parser(definition, this.moddle);
 
+      const config = definition.config ? JSON.parse(definition.config) : {};
+      const type = config?.processKey || parser(definition, this.moddle);
+      
       const unnamedElements = ['bpmn:TextAnnotation', 'bpmn:Association', 'bpmn:DataOutputAssociation', 'bpmn:DataInputAssociation'];
       const requireName = unnamedElements.indexOf(bpmnType) === -1;
       if (requireName && !definition.get('name')) {
         definition.set('name', '');
       }
 
-      const node = this.createNode(type, definition, diagram);
-
+      this.createNodeAsync(type, definition, diagram);
+    },
+    async createNodeAsync(type, definition, diagram) {
+      const node =  this.createNode(type, definition, diagram);
       store.commit('addNode', node);
     },
     createNode(type, definition, diagram) {

package/src/components/nodes/boundaryTimerEvent/index.js

@@ -65,6 +65,9 @@ export default merge(cloneDeep(boundaryEventConfig), {
         const eventDefinitions = [
           moddle.create('bpmn:TimerEventDefinition', eventDefinition),
         ];
+
+        eventDefinitions[0].id = node.definition.get('eventDefinitions')[0].id;
+
         setNodeProp(node, 'eventDefinitions', eventDefinitions);
       } else {
         setNodeProp(node, key, value[key]);

package/src/setup/registerPmBlock.js

@@ -0,0 +1,9 @@
+import bpmnExtension from '@processmaker/processmaker-bpmn-moddle/resources/processmaker';
+
+const nodeTypes = window.ProcessMaker.pmBlockNodes;
+
+export default function registerPmBlock({ registerPmBlock, registerBpmnExtension }) {
+  nodeTypes.forEach(config => registerPmBlock(config));
+
+  registerBpmnExtension('pm', bpmnExtension);
+}