@processmaker/screen-builder 2.83.12-1 → 2.83.13

package/package.json

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

package/src/DataProvider.js

@@ -71,38 +71,18 @@ export default {
 
   // Methods below are used in the components
 
-  async getTasks(params) {
+  getTasks(params) {
     const endpoint = get(
       window,
       "PM4ConfigOverrides.getTasksEndpoint",
       "/tasks"
     );
-    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;
+    return this.get(endpoint + params).then((response) => {
+      if (response.data.screen && response.data.screen.nested) {
+        this.addNestedScreenCache(response.data.screen.nested);
+      }
+      return response;
+    });
   },
   addNestedScreenCache(nested) {
     nested.forEach((screen) => {

package/src/components/renderer/card.vue

@@ -1,49 +1,47 @@
 <template>
   <div>
-    <template v-for="event in emptyStartEvents">
-      <div :key="event.id" class="mb-3 card-request">
-        <div class="card-body">
-          <div class="d-flex justify-content-between">
-            <div>
-              <span v-uni-id="event.id.toString()" class="card-info card-title">
-                {{ transformedName }}
-              </span>
-              <span class="card-info">
-                {{ event.name }}
-              </span>
-            </div>
-            <div class="d-flex align-items-center">
-              <button
-                :aria-expanded="ariaExpanded"
-                :aria-controls="getComputedId(process, event)"
-                class="btn btn-ellipsis btn-sm mr-1"
-                @click="showRequestDetails(process, event)"
-              >
-                <i class="fas fa-ellipsis-v"></i>
-              </button>
-              <button
-                v-uni-aria-describedby="event.id.toString()"
-                :href="getNewRequestLinkHref(process, event)"
-                class="btn btn-custom btn-sm"
-                @click.prevent="newRequestLink(process, event)"
-              >
-                {{ $t("Start") }}
-                <i class="fas fa-play mr-1 card-icon"></i>
-              </button>
-            </div>
+    <div class="mb-3 card-request">
+      <div class="card-body">
+        <div class="d-flex justify-content-between">
+          <div>
+            <span v-uni-id="event.id.toString()" class="card-info card-title">
+              {{ transformedName }}
+            </span>
+            <span class="card-info">
+              {{ event.name }}
+            </span>
+          </div>
+          <div class="d-flex align-items-center">
+            <button
+              :aria-expanded="ariaExpanded"
+              :aria-controls="getComputedId(process, event)"
+              class="btn btn-ellipsis btn-sm mr-1"
+              @click="showRequestDetails(process, event)"
+            >
+              <i class="fas fa-ellipsis-v"></i>
+            </button>
+            <button
+              v-uni-aria-describedby="event.id.toString()"
+              :href="getNewRequestLinkHref(process, event)"
+              class="btn btn-custom btn-sm"
+              @click.prevent="newRequestLink(process, event)"
+            >
+              {{ $t("Start") }}
+              <i class="fas fa-play mr-1 card-icon"></i>
+            </button>
           </div>
-          <b-collapse
-            :id="getComputedId(process, event)"
-            :aria-hidden="ariaHidden"
-          >
-            <hr />
-            <p class="card-text text-muted card-description">
-              {{ process.description }}
-            </p>
-          </b-collapse>
         </div>
+        <b-collapse
+          :id="getComputedId(process, event)"
+          :aria-hidden="ariaHidden"
+        >
+          <hr />
+          <p class="card-text text-muted card-description">
+            {{ process.description }}
+          </p>
+        </b-collapse>
       </div>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -54,7 +52,7 @@ const uniqIdsMixin = createUniqIdsMixin();
 
 export default {
   mixins: [uniqIdsMixin],
-  props: ["name", "description", "filter", "id", "process"],
+  props: ["name", "description", "filter", "id", "process", "event"],
   data() {
     return {
       disabled: false,

package/src/components/renderer/form-new-request.vue

@@ -1,15 +1,17 @@
 <template>
   <div>
     <div v-if="Object.keys(processes).length && !loading" class="process-list">
-      <b-container fluid>
-        <div v-for="(process, index) in processes" :key="`process-${index}`">
-          <ProcessCard
-            v-if="hasEmptyStartEvents(process)"
-            :filter="filter"
-            :process="process"
-          />
-        </div>
-      </b-container>
+      <div class="row">
+        <template v-for="(process, index) in processes">
+          <div v-for="(event, indexE) in emptyStartEvents(process)" :key="`process-${index}-${indexE}`" class="col-sm-6">
+            <ProcessCard
+              :filter="filter"
+              :process="process"
+              :event="event"
+            />
+          </div>
+        </template>
+      </div>
     </div>
     <div v-else>
       <formEmpty link="" title="No Request to Start" url="" />
@@ -39,6 +41,12 @@ export default {
     this.$root.$on("dropdownSelectionStart", this.fetchData);
   },
   methods: {
+    emptyStartEvents(process) {
+      return process.startEvents.filter(
+        (event) =>
+          !event.eventDefinitions || event.eventDefinitions.length === 0
+      );
+    },
     hasEmptyStartEvents(process) {
       return !!process.events.find(
         (event) =>

package/src/components/task.vue

@@ -480,11 +480,7 @@ export default {
       return allowed ? this.parentRequest : this.requestId
     },
     processUpdated: _.debounce(function(data) {
-      if (
-        (data.event === "ACTIVITY_COMPLETED" ||
-          data.event === "ACTIVITY_ACTIVATED") &&
-        data.elementType === 'task'
-      ) {
+      if (data.event === 'ACTIVITY_ACTIVATED') {
         this.reload();
       }
       if (data.event === 'ACTIVITY_EXCEPTION') {
@@ -533,12 +529,14 @@ export default {
         '.ProcessUpdated',
         (data) => {
           if (
-            ['ACTIVITY_ACTIVATED'].includes(data.event)
+            ['ACTIVITY_ACTIVATED'].includes(data.event) &&
+            !this.existsEventMessage(`${data.event}-${this.userId}-${this.taskId}`)
           ) {
             this.closeTask(this.parentRequest);
           }
           if (
-            ["ACTIVITY_COMPLETED"].includes(data.event)
+            ["ACTIVITY_COMPLETED"].includes(data.event) &&
+            !this.existsEventMessage(`${data.event}-${this.userId}-${this.taskId}`)
           ) {
             if (this.task.process_request.status === 'COMPLETED') {
               this.processCompleted();