@processmaker/screen-builder 2.99.0 → 2.99.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.99.0",
+  "version": "2.99.2",
   "scripts": {
     "dev": "VITE_COVERAGE=true vite",
     "build": "vite build",
@@ -56,7 +56,7 @@
     "@fortawesome/fontawesome-free": "^5.6.1",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@panter/vue-i18next": "^0.15.2",
-    "@processmaker/vue-form-elements": "0.59.0",
+    "@processmaker/vue-form-elements": "0.60.0",
     "@processmaker/vue-multiselect": "2.3.0",
     "@storybook/addon-essentials": "^7.6.13",
     "@storybook/addon-interactions": "^7.6.13",
@@ -115,7 +115,7 @@
   },
   "peerDependencies": {
     "@panter/vue-i18next": "^0.15.0",
-    "@processmaker/vue-form-elements": "0.59.0",
+    "@processmaker/vue-form-elements": "0.60.0",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"

package/src/DataProvider.js

@@ -81,16 +81,26 @@ export default {
     const hasIncludeScreen = params.match(/include=.*,screen,/);
     const hasIncludeNested = params.match(/include=.*,nested,/);
 
+    // Extract screen_version from params.
+    const screenVersionMatch = params.match(/screen_version=([^&]+)/);
+    const screenVersion = screenVersionMatch ? screenVersionMatch[1] : null;
+
     // remove params ?...
     promises.push(
       this.get(endpoint + params.replace(/,screen,|,nested,/g, ","))
     );
     // Get the screen from a separated cached endpoint
     if (hasIncludeScreen) {
-      const screenEndpoint = `${(endpoint + params).replace(
+      let screenEndpoint = `${(endpoint + params).replace(
         /\?.+$/,
         ""
       )}/screen?include=screen${hasIncludeNested ? ",nested" : ""}`;
+
+      // Append screen_version only if screenVersion is not empty.
+      if (screenVersion) {
+        screenEndpoint += `&screen_version=${screenVersion}`;
+      }
+
       promises.push(this.get(screenEndpoint));
     }
     // Await for both promises to resolve

package/src/components/task.vue

@@ -94,6 +94,7 @@ export default {
     initialRequestId: { type: Number, default: null },
     initialProcessId: { type: Number, default: null },
     initialNodeId: { type: String, default: null },
+    screenVersion: { type: Number, default: null },
     userId: { type: Number, default: null },
     csrfToken: { type: String, default: null },
     value: { type: Object, default: () => {} },
@@ -260,12 +261,17 @@ export default {
         this.loadNextAssignedTask();
       }
     },
-    loadTask() {
+    loadTask(mounting = false) {
       if (!this.taskId) {
         return;
       }
 
-      const url = `/${this.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`;
+      let url = `/${this.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`;
+
+      if (this.screenVersion) {
+        url += `&screen_version=${this.screenVersion}`;
+      }
+
       // For Vocabularies
       if (window.ProcessMaker && window.ProcessMaker.packages && window.ProcessMaker.packages.includes('package-vocabularies')) {
         window.ProcessMaker.VocabulariesSchemaUrl = `vocabularies/task_schema/${this.taskId}`;
@@ -276,7 +282,7 @@ export default {
           .getTasks(url)
           .then((response) => {
             this.task = response.data;
-            this.linkTask();
+            this.linkTask(mounting);
             this.checkTaskStatus();
             if (
               window.PM4ConfigOverrides
@@ -296,12 +302,27 @@ export default {
           });
       });
     },
-    linkTask() {
+    linkTask(mounting) {
       this.nodeId = this.task.element_id;
       this.listenForParentChanges();
       if (this.task.process_request.status === 'COMPLETED') {
         if (!this.taskPreview) {
           this.$emit('completed', this.task.process_request.id);
+          // When the process ends before the request is opened
+          if (mounting) {
+            // get end event element destination config
+            window.ProcessMaker.apiClient.get(`/requests/${this.requestId}/end-event-destination`)
+              .then((response) => {
+                if (!response.data?.data?.endEventDestination) {
+                  // by default it goes to summary
+                  window.location.href = `/requests/${this.requestId}`;
+                  return;
+                }
+
+                // process the end event destination
+                this.processCompletedRedirect(response.data.data, this.userId, this.requestId);
+              });
+          }
         }
       }
       if (this.taskPreview && this.task.status === "CLOSED") {
@@ -517,6 +538,7 @@ export default {
           } else if (this.parentRequest && ['COMPLETED', 'CLOSED'].includes(this.task.process_request.status)) {
             this.$emit('completed', this.getAllowedRequestId());
           }
+          this.disabled = false;
         });
     },
     emitIfTaskCompleted(requestId) {
@@ -978,7 +1000,7 @@ export default {
     this.nodeId = this.initialNodeId;
     this.requestData = this.value;
     this.loopContext = this.initialLoopContext;
-    this.loadTask();
+    this.loadTask(true);
   },
   destroyed() {
     this.unsubscribeSocketListeners();