@processmaker/modeler 1.40.2 → 1.40.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.40.2",
+  "version": "1.40.3",
   "scripts": {
     "serve": "vue-cli-service serve --mode development",
     "test:unit": "vue-cli-service test:unit",

package/src/components/inspectors/InspectorPanel.vue

@@ -102,6 +102,8 @@ export default {
     'highlightedNode.definition.assignedUsers'(current, previous) { this.handleAssignmentChanges(current, previous); },
     'highlightedNode.definition.assignedGroups'(current, previous) { this.handleAssignmentChanges(current, previous); },
     'highlightedNode.definition.assignmentRules'(current, previous) { this.handleAssignmentChanges(current, previous); },
+    'highlightedNode.definition.allowInterstitial'(current, previous) { this.handleAssignmentChanges(current, previous); },
+    'highlightedNode.definition.interstitialScreenRef'(current, previous) { this.handleAssignmentChanges(current, previous); },
   },
   computed: {
     inspectorHeaderTitle() {
@@ -254,7 +256,7 @@ export default {
     defaultInspectorHandler(value, isMultiplayer) {
       /* Go through each property and rebind it to our data */
       for (const key in omit(value, ['$type', 'eventDefinitions'])) {
-        if (this.highlightedNode.definition.get(key) !== value[key]) {        
+        if (this.highlightedNode.definition.get(key) !== value[key]) {
           this.multiplayerHook(key, value[key], isMultiplayer);
           this.setNodeProp(this.highlightedNode, key, value[key]);
         }

package/src/components/modeler/Modeler.vue

@@ -238,6 +238,7 @@ import ProcessmakerModelerGenericFlow from '@/components/nodes/genericFlow/gener
 import Selection from './Selection';
 import RemoteCursor from '@/components/multiplayer/remoteCursor/RemoteCursor.vue';
 import Multiplayer from '@/multiplayer/multiplayer';
+import { getBoundaryEventData } from '../nodes/boundaryEvent/boundaryEventUtils';
 
 export default {
   components: {
@@ -354,6 +355,13 @@ export default {
         'processmaker-modeler-data-output-association',
         'processmaker-modeler-association',
       ],
+      boundaryEventTypes: [
+        'processmaker-modeler-boundary-timer-event',
+        'processmaker-modeler-boundary-error-event',
+        'processmaker-modeler-boundary-signal-event',
+        'processmaker-modeler-boundary-conditional-event',
+        'processmaker-modeler-boundary-message-event',
+      ],
     };
   },
   watch: {
@@ -1184,11 +1192,7 @@ export default {
         'processmaker-modeler-sequence-flow',
         'processmaker-modeler-association',
         'processmaker-modeler-data-input-association',
-        'processmaker-modeler-boundary-timer-event',
-        'processmaker-modeler-boundary-error-event',
-        'processmaker-modeler-boundary-signal-event',
-        'processmaker-modeler-boundary-conditional-event',
-        'processmaker-modeler-boundary-message-event',
+        ...this.boundaryEventTypes,
       ];
       if (!this.isMultiplayer) {
         return;
@@ -1305,6 +1309,8 @@ export default {
       });
     },
     async addClonedNodes(nodes) {
+      const flowNodes = [];
+
       nodes.forEach(node => {
         if (!node.pool) {
           node.pool = this.poolTarget;
@@ -1314,10 +1320,24 @@ export default {
         addNodeToProcess(node, targetProcess);
 
         this.planeElements.push(node.diagram);
-        this.multiplayerHook(node, false);
+
+        if (this.flowTypes.includes(node.type)) {
+          // Add flow to array to render after
+          flowNodes.push(node);
+        } else if (this.boundaryEventTypes.includes(node.type)) {
+          // Get boundary event data
+          const defaultData = getBoundaryEventData(node);
+          window.ProcessMaker.EventBus.$emit('multiplayer-addBoundaryEvent', defaultData);
+        } else {
+          this.multiplayerHook(node, false);
+        }
+
         store.commit('addNode', node);
         this.poolTarget = null;
       });
+
+      // Render flows after all nodes have been added
+      flowNodes.forEach(node => this.multiplayerHook(node, false));
     },
     async removeNode(node, options) {
       // Check if the node is not replaced

package/src/components/modeler/Selection.vue

@@ -347,7 +347,7 @@ export default {
      */
     prepareConectedLinks(shapes){
       const { paper } = this.paperManager;
-      this.conectedLinks = [];
+      this.connectedLinks = [];
       this.isValidSelectionLinks = true;
       shapes.forEach((shape) => {
         let conectedLinks = this.graph.getConnectedLinks(shape.model);
@@ -368,8 +368,8 @@ export default {
         }
         conectedLinks.forEach((link) => {
           const linkView = paper.findViewByModel(link);
-          if (!this.conectedLinks.some(obj => obj.id === linkView.id)) {
-            this.conectedLinks.push(linkView);
+          if (!this.connectedLinks.some(obj => obj.id === linkView.id)) {
+            this.connectedLinks.push(linkView);
             this.validateSelectionLinks(linkView);
           }
         });
@@ -585,6 +585,7 @@ export default {
       this.updateSelectionBox();
       if (this.isMultiplayer) {
         window.ProcessMaker.EventBus.$emit('multiplayer-updateNodes', this.getProperties(this.selected));
+        window.ProcessMaker.EventBus.$emit('multiplayer-updateNodes', this.getConnectedLinkProperties(this.connectedLinks));
       }
     },
 
@@ -600,7 +601,6 @@ export default {
           if (shape.model.get('type') === 'processmaker.modeler.bpmn.pool') {
             const childrens = shape.model.component.getElementsUnderArea(shape.model, this.graph)
               .filter((element) => element.component);
-
             changed = [...changed, ...this.getContainerProperties(childrens, changed)];
           } else {
             const { node } = shape.model.component;
@@ -626,6 +626,38 @@ export default {
         
       return changed;
     },
+    /**
+     * Get connected link properties
+     * @param {Array} links 
+     */
+    getConnectedLinkProperties(links) {
+      let changed = [];
+      links.forEach((linkView) => {
+        const waypoint = [];
+        const { node } =  linkView.model.component;
+        node.diagram.waypoint?.forEach(point => {
+          waypoint.push({
+            x: point.x,
+            y: point.y,
+          });
+        });
+        const sourceRefId = linkView.sourceView.model.component.node.definition.id;
+        const targetRefId = linkView.targetView.model.component.node.definition.id;
+        const nodeType = linkView.model.component.node.type;
+        changed.push(
+          {
+            id: node.definition.id,
+            properties: {
+              type: nodeType,
+              waypoint,
+              sourceRefId,
+              targetRefId,
+            },
+          });
+      
+      });
+      return changed;
+    },
     /**
      * Get properties for each boundary inside a shape
      */
@@ -677,7 +709,7 @@ export default {
      * Selector will update the waypoints of the related flows
      */
     updateFlowsWaypoint(){
-      this.conectedLinks.forEach((link)=> {
+      this.connectedLinks.forEach((link)=> {
         if (link.model.component && link.model.get('type') === 'standard.Link'){
           const start = link.sourceAnchor;
           const end = link.targetAnchor;
@@ -885,7 +917,7 @@ export default {
         if (this.newPool){
           /* Remove the shape from its current pool */
           this.moveElements(this.selected, this.oldPool, this.newPool);
-          this.moveConectedLinks(this.conectedLinks, this.oldPool, this.newPool);
+          this.moveConnectedLinks(this.connectedLinks, this.oldPool, this.newPool);
           this.newPool = null;
           this.oldPool = null;
           this.updateLaneChildren(this.selected);
@@ -1025,7 +1057,7 @@ export default {
           oldPool.model.component.moveElement(shape.model, newPool.model);
         });
     },
-    moveConectedLinks(links, oldPool, newPool){
+    moveConnectedLinks(links, oldPool, newPool){
       links.forEach(link => {
         oldPool.model.component.moveFlow(link.model, newPool.model);
       });

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

@@ -15,13 +15,9 @@ export const setEventTimerDefinition = (moddle, node, type, body) => {
     [type]: moddle.create('bpmn:Expression', { body }),
   };
 
-  const eventDefinitions = [
+  return [
     moddle.create('bpmn:TimerEventDefinition', eventDefinition),
   ];
-
-  eventDefinitions[0].id = node.definition.get('eventDefinitions')[0].id;
-
-  return eventDefinitions;
 };
 
 export default merge(cloneDeep(boundaryEventConfig), {
@@ -73,9 +69,7 @@ export default merge(cloneDeep(boundaryEventConfig), {
         }
 
         const eventDefinitions = setEventTimerDefinition(moddle, node, type, body);
-
         setNodeProp(node, 'eventDefinitions', eventDefinitions);
-
         window.ProcessMaker.EventBus.$emit('multiplayer-updateInspectorProperty', {
           id: node.definition.id,
           key: 'eventTimerDefinition',

package/src/mixins/cloneSelection.js

@@ -47,7 +47,6 @@ export default {
             if (node.definition && node.definition.$type !== 'bpmn:BoundaryEvent') {
               clonedNodes.push(clonedElement);
             }  else {
-              clonedElement.fromCrown = true;
               clonedBoundaryEvents.push(clonedElement);
             }
           }