@processmaker/modeler 1.39.26 → 1.39.28

package/package.json

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

package/src/components/inspectors/preview_panel.scss

@@ -1,5 +1,5 @@
 $inspector-column-max-width: 400px;
-$inspector-column-min-width: 400px;
+$inspector-column-min-width: 200px;
 
 #preview_panel::after {
   display: flex;
@@ -12,10 +12,12 @@ $inspector-column-min-width: 400px;
 
 .preview-column {
   max-width: $inspector-column-max-width;
+  min-width: $inspector-column-min-width;
   resize: both;
   overflow:auto;
   background-color: #F5F5F5;
   border-left: 8px solid #EBEEF2;
+  z-index: 2;
 }
 
 .paneiframe {

package/src/components/modeler/Modeler.vue

@@ -84,7 +84,7 @@
         :parent-height="parentHeight"
         :canvas-drag-position="canvasDragPosition"
         @shape-resize="shapeResize(false)"
-        @toggleInspector="handleToggleInspector"
+        @toggleInspector="[handleToggleInspector($event), setInspectorButtonPosition($event)]"
       />
 
       <component

package/src/multiplayer/multiplayer.js

@@ -54,9 +54,9 @@ export default class Multiplayer {
             top: 90,
             left: 80,
           };
-
           this.modeler.addPlayer(newPlayer);
         });
+        this.syncLocalNodes(this.clientIO.id);
       }
     });
 
@@ -72,18 +72,7 @@ export default class Multiplayer {
 
       // Check if the current client is the first client
       if (firstClient.id === this.clientIO.id) {
-        // Get the process definition
-        const nodes = this.modeler.nodes.map((node) => this.modeler.multiplayerHook(node, false, true));
-
-        nodes.forEach((node) => {
-          const yMapNested = new Y.Map();
-          this.doTransact(yMapNested, node);
-          this.yArray.push([yMapNested]);
-          // Encode the state as an update and send it to the server
-          const stateUpdate = Y.encodeStateAsUpdate(this.yDoc);
-          // Send the update to the web socket server
-          this.clientIO.emit('createElement', { updateDoc: stateUpdate, clientId });
-        });
+        this.syncLocalNodes(clientId);
       }
     });
 
@@ -180,6 +169,24 @@ export default class Multiplayer {
       }
     });
   }
+  /**
+   * Sync the modeler nodes with the microservice
+   * @param {String} clientId 
+   */
+  syncLocalNodes(clientId){
+    // Get the process definition
+    const nodes = this.modeler.nodes.map((node) => this.modeler.multiplayerHook(node, false, true));
+
+    nodes.forEach((node) => {
+      const yMapNested = new Y.Map();
+      this.doTransact(yMapNested, node);
+      this.yArray.push([yMapNested]);
+      // Encode the state as an update and send it to the server
+      const stateUpdate = Y.encodeStateAsUpdate(this.yDoc);
+      // Send the update to the web socket server
+      this.clientIO.emit('createElement', { updateDoc: stateUpdate, clientId });
+    });
+  }
   addNode(data) {
     // Add the new element to the shared array
     const yMapNested = new Y.Map();

package/src/setup/initialLoad.js

@@ -27,18 +27,21 @@ window.ProcessMaker.EventBus.$on(
   'modeler-init',
   (event) => {
     event.registerPreview({
-      url:'/designer/screens/preview',
+      url: '/designer/screens/preview',
       receivingParams: ['screenRef'],
-      matcher: (nodeData) => {
-        return nodeData?.$type  === 'bpmn:Task';
-      },
+      matcher: (nodeData) => nodeData?.$type  === 'bpmn:Task',
     });
+
     event.registerPreview({
-      url:'/designer/scripts/preview',
+      url: '/designer/scripts/preview',
       receivingParams: ['scriptRef'],
-      matcher: (nodeData) => {
-        return nodeData?.$type === 'bpmn:ScriptTask';
-      },
+      matcher: (nodeData) => nodeData?.$type === 'bpmn:ScriptTask',
+    });
+
+    event.registerPreview({
+      url: '/designer/scripts/preview',
+      receivingParams: ['screenRef'],
+      matcher: (nodeData) => nodeData?.$type === 'bpmn:ManualTask',
     });
   });