@processmaker/modeler 1.41.0 → 1.42.1

package/package.json

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

package/src/components/modeler/Modeler.vue

@@ -1128,6 +1128,8 @@ export default {
       const diagram = this.nodeRegistry[data.type].diagram(this.moddle);
       diagram.bounds.x = data.x;
       diagram.bounds.y = data.y;
+      diagram.bounds.width = data.width;
+      diagram.bounds.height = data.height;
       const newNode = this.createNode(data.type, definition, diagram);
       //verify if the node has a pool as a container
       if (data.poolId) {

package/src/components/modeler/Selection.vue

@@ -632,7 +632,7 @@ export default {
      */
     getConnectedLinkProperties(links) {
       let changed = [];
-      links.forEach((linkView) => {
+      links?.forEach((linkView) => {
         const vertices = linkView.model.component.shape.vertices();
         if (vertices?.length) {
           const waypoint = [];
@@ -719,7 +719,7 @@ export default {
      * Selector will update the waypoints of the related flows
      */
     updateFlowsWaypoint(){
-      this.connectedLinks.forEach((link)=> {
+      this.connectedLinks?.forEach((link)=> {
         if (link.model.component && link.model.get('type') === 'standard.Link'){
           const start = link.sourceAnchor;
           const end = link.targetAnchor;

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

@@ -58,6 +58,11 @@ export default {
     const definition = modeler.moddle.create('bpmn:Lane', {
       name: data.name,
     });
+    // Set the position of the pool
+    if (data.poolX && data.poolY) {
+      pool.set('position', { x: data.poolX, y: data.poolY });
+    }
+
     if (!pool.component.laneSet && pool.component.createLaneSet) {
       pool.component.createLaneSet([data.laneSetId]);
       /* If there are currently elements in the pool, add them to the first lane */
@@ -81,6 +86,10 @@ export default {
       definition,
       diagram,
     );
+
+    // Set the pool as the parent of the lane
+    node.pool = pool;
+
     await modeler.addNode(node, data.id, true);
     modeler.setShapeStacking(pool.component.shape);
 

package/src/multiplayer/multiplayer.js

@@ -203,13 +203,17 @@ export default class Multiplayer {
    * Sync the modeler nodes with the microservice
    * @param {String} clientId
    */
-  syncLocalNodes(clientId){
+  syncLocalNodes(clientId) {
     // Get the process definition
     const nodes = this.modeler.nodes.map((node) => {
       if (node.definition.$type === 'bpmn:BoundaryEvent') {
         return getBoundaryEventData(node);
       }
 
+      if (node.definition.$type === 'bpmn:Lane') {
+        return this.prepareLaneData(node);
+      }
+
       return this.modeler.multiplayerHook(node, false, true);
     });
 
@@ -484,7 +488,8 @@ export default class Multiplayer {
   }
   addLaneNodes(lanes) {
     const pool = this.getPool(lanes);
-    window.ProcessMaker.EventBus.$emit('multiplayer-updateNodes', [{
+
+    const defaultPoolData = {
       id: pool.component.node.definition.id,
       properties: {
         x: pool.component.node.diagram.bounds.x,
@@ -493,7 +498,10 @@ export default class Multiplayer {
         width: pool.component.node.diagram.bounds.width,
         isAddingLaneAbove: pool.isAddingLaneAbove,
       },
-    }]);
+    };
+
+    window.ProcessMaker.EventBus.$emit('multiplayer-updateNodes', [defaultPoolData]);
+
     this.yDoc.transact(() => {
       lanes.forEach((lane) => {
         const yMapNested = new Y.Map();
@@ -516,6 +524,8 @@ export default class Multiplayer {
       height: lane.diagram.bounds.height,
       poolId: lane.pool.component.node.definition.id,
       laneSetId: lane.pool.component.laneSet.id,
+      poolX: lane.pool.component.node.diagram.bounds.x,
+      poolY: lane.pool.component.node.diagram.bounds.y,
     };
     return data;
   }