@processmaker/modeler 1.43.7 → 1.43.9

package/package.json

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

package/src/components/modeler/Modeler.vue

@@ -25,7 +25,7 @@
       @clearSelection="clearSelection"
       :players="filteredPlayers"
       @action="handleToolbarAction"
-      @onGenerateAssets="generateAssets()"
+      @onGenerateAssets="onGenerateAssets()"
     />
     <b-row class="modeler h-100">
       <b-tooltip
@@ -60,7 +60,7 @@
       <CreateAssetsCard
         ref="createAssetsCard"
         v-if="isAiGenerated"
-        @onGenerateAssets="generateAssets()"
+        @onGenerateAssets="onGenerateAssets()"
         @closeCreateAssets="isAiGenerated = false"
       />
 
@@ -654,7 +654,7 @@ export default {
     async close() {
       this.$emit('close');
     },
-    async saveBpmn(redirectTo = null, id = null) {
+    async saveBpmn(redirectTo = null, id = null, generatingAssets = false) {
       const svg = document.querySelector('.mini-paper svg');
       const css = 'text { font-family: sans-serif; }';
       const style = document.createElement('style');
@@ -663,7 +663,7 @@ export default {
       svg.appendChild(style);
       const xml = await this.getXmlFromDiagram();
       const svgString = (new XMLSerializer()).serializeToString(svg);
-      this.$emit('saveBpmn', { xml, svg: svgString, redirectUrl: redirectTo, nodeId: id });
+      this.$emit('saveBpmn', { xml, svg: svgString, redirectUrl: redirectTo, nodeId: id, generatingAssets });
     },
     borderOutline(nodeId) {
       return this.decorations.borderOutline && this.decorations.borderOutline[nodeId];
@@ -1904,9 +1904,15 @@ export default {
           }
         });
     },
+    onGenerateAssets() {
+      this.saveBpmn(null, null, true);
+    },
     generateAssets() {
       this.getNonce();
 
+      // Show Generating message
+      this.loadingAI = true;
+
       this.fetchHistory();
 
       const params = {
@@ -1918,8 +1924,12 @@ export default {
       const url = '/package-ai/generateProcessArtifacts';
 
       window.ProcessMaker.apiClient.post(url, params)
-        .then(() => {
-          // Response
+        .then((response) => {
+          if (response.data) {
+            if (response.data?.error) {
+              this.assetFail = true;
+            }
+          }
         })
         .catch((error) => {
           const errorMsg = error.response?.data?.message || error.message;
@@ -1994,6 +2004,31 @@ export default {
         },
       );
     },
+    subscribeToGenerationCompleted() {
+      const channel = `ProcessMaker.Models.User.${window.ProcessMaker?.modeler?.process?.user_id}`;
+      const streamCompletedEvent = '.ProcessMaker\\Package\\PackageAi\\Events\\GenerateArtifactsCompletedEvent';
+      window.Echo.private(channel).listen(
+        streamCompletedEvent,
+        (response) => {
+          if (response.data) {
+            setTimeout(() => {
+              window.location.replace(window.location.href.split('?')[0]);
+            }, 1500);
+          }
+        },
+      );
+    },
+    subscribeToErrors() {
+      const channel = `ProcessMaker.Models.User.${window.ProcessMaker?.modeler?.process?.user_id}`;
+      const streamProgressEvent = '.ProcessMaker\\Package\\PackageAi\\Events\\GenerateArtifactsErrorEvent';
+      window.Echo.private(channel).listen(
+        streamProgressEvent,
+        () => {
+          // Output error
+          this.assetFail = true;
+        },
+      );
+    },
     onStopAssetGeneration() {
       if (this.currentNonce) {
         this.cancelledJobs.push(this.currentNonce);
@@ -2184,10 +2219,13 @@ export default {
       this.replaceAiNode(data);
     });
 
-    window.ProcessMaker.EventBus.$on('save-changes', (redirectUrl) => {
+    window.ProcessMaker.EventBus.$on('save-changes', (redirectUrl, nodeId, generatingAssets) => {
       if (redirectUrl) {
         this.redirect(redirectUrl);
       }
+      if (generatingAssets) {
+        this.generateAssets();
+      }
     });
 
     // AI Setup
@@ -2203,6 +2241,8 @@ export default {
     this.promptSessionId = this.getPromptSessionForUser();
     this.fetchHistory();
     this.subscribeToProgress();
+    this.subscribeToGenerationCompleted();
+    this.subscribeToErrors();
   },
 };
 </script>