@processmaker/screen-builder 2.83.11 → 2.83.12-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.83.11",
+  "version": "2.83.12-1",
   "scripts": {
     "dev": "VITE_COVERAGE=true vite",
     "build": "vite build",

package/src/DataProvider.js

@@ -71,18 +71,38 @@ export default {
 
   // Methods below are used in the components
 
-  getTasks(params) {
+  async getTasks(params) {
     const endpoint = get(
       window,
       "PM4ConfigOverrides.getTasksEndpoint",
       "/tasks"
     );
-    return this.get(endpoint + params).then((response) => {
-      if (response.data.screen && response.data.screen.nested) {
-        this.addNestedScreenCache(response.data.screen.nested);
-      }
-      return response;
-    });
+    const promises = [];
+    const hasIncludeScreen = params.match(/include=.*,screen,/);
+    const hasIncludeNested = params.match(/include=.*,nested,/);
+
+    // 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(
+        /\?.+$/,
+        ""
+      )}/screen?include=screen${hasIncludeNested ? ",nested" : ""}`;
+      promises.push(this.get(screenEndpoint));
+    }
+    // Await for both promises to resolve
+    const [taskData, taskScreen] = await Promise.all(promises);
+    const response = taskData;
+    if (taskScreen) {
+      response.data.screen = taskScreen.data;
+    }
+    if (response.data.screen && response.data.screen.nested) {
+      this.addNestedScreenCache(response.data.screen.nested);
+    }
+    return response;
   },
   addNestedScreenCache(nested) {
     nested.forEach((screen) => {

package/src/components/task.vue

@@ -481,8 +481,9 @@ export default {
     },
     processUpdated: _.debounce(function(data) {
       if (
-        data.event === 'ACTIVITY_COMPLETED' ||
-        data.event === 'ACTIVITY_ACTIVATED'
+        (data.event === "ACTIVITY_COMPLETED" ||
+          data.event === "ACTIVITY_ACTIVATED") &&
+        data.elementType === 'task'
       ) {
         this.reload();
       }
@@ -515,6 +516,13 @@ export default {
         this.reload();
       }
     },
+    existsEventMessage(id, data) {
+      if (sessionStorage.getItem(id)) {
+        return true;
+      }
+      sessionStorage.setItem(id, data);
+      return false;
+    },
     listenForParentChanges() {
       if (!this.parentRequest) {
         return;
@@ -524,10 +532,14 @@ export default {
         `ProcessMaker.Models.ProcessRequest.${this.parentRequest}`,
         '.ProcessUpdated',
         (data) => {
-          if (['ACTIVITY_ACTIVATED'].includes(data.event)) {
+          if (
+            ['ACTIVITY_ACTIVATED'].includes(data.event)
+          ) {
             this.closeTask(this.parentRequest);
           }
-          if (['ACTIVITY_COMPLETED'].includes(data.event)) {
+          if (
+            ["ACTIVITY_COMPLETED"].includes(data.event)
+          ) {
             if (this.task.process_request.status === 'COMPLETED') {
               this.processCompleted();
             }