Merge pull request #5775 from ProcessMaker/feature/FOUR-12594

FOUR-12594 Request Columns final order

Author: caleeli

ProcessMaker/Http/Resources/ProcessRequests.php

@@ -20,6 +20,13 @@ public function toArray($request)
         if (in_array('participants', $include)) {
             $array['participants'] = $this->participants;
         }
+        if (in_array('activeTasks', $include)) {
+            $array['active_tasks'] = $this->tokens()
+                ->select(['id', 'element_name', 'status', 'user_id'])
+                ->where('status', 'ACTIVE')
+                ->where('element_type', 'task')
+                ->get();
+        }
         if (in_array('user', $include)) {
             $array['user'] = new Users($this->user);
         }

resources/js/requests/components/RequestsListing.vue

@@ -51,17 +51,37 @@
         >
           <span v-uni-id="props.rowData.id.toString()">{{ props.rowData.name }}</span>
         </template>
+        <template
+          slot="active_tasks"
+          slot-scope="props"
+        >
+          <div
+            v-for="task in props.rowData.active_tasks"
+            :key="`active_task-${task.id}`"
+          >
+            <b-link
+              class="text-nowrap"
+              :href="openTask(task)"
+            >
+              {{ task.element_name }}
+            </b-link>
+          </div>
+        </template>
         <template
           slot="participants"
           slot-scope="props"
         >
-          <avatar-image
+          <div
             v-for="participant in props.rowData.participants"
-            :key="participant.id"
-            size="25"
-            hide-name="true"
-            :input-data="participant"
-          />
+            :key="`participant-${participant.id}`"
+          >
+            <avatar-image
+              size="25"
+              hide-name="true"
+              :input-data="participant"
+            />
+            {{ participant.fullname }}
+          </div>
         </template>
         <template
           slot="actions"
@@ -225,9 +245,10 @@ export default {
           default: true,
         },
         {
-          label: "Status",
-          field: "status",
-          sortable: true,
+          label: "Task Name",
+          field: "active_tasks",
+          name: "__slot:active_tasks",
+          sortable: false,
           default: true,
         },
         {
@@ -236,6 +257,12 @@ export default {
           sortable: false,
           default: true,
         },
+        {
+          label: "Status",
+          field: "status",
+          sortable: true,
+          default: true,
+        },
         {
           label: "Started",
           field: "initiated_at",
@@ -255,6 +282,9 @@ export default {
     openRequest(data, index) {
       return `/requests/${data.id}`;
     },
+    openTask(task) {
+      return `/tasks/${task.id}/edit`;
+    },
     formatStatus(status) {
       let color = "success",
         label = "In Progress";
@@ -339,7 +369,7 @@ export default {
             this.page +
             "&per_page=" +
             this.perPage +
-            "&include=process,participants,data" +
+            "&include=process,participants,activeTasks,data" +
             "&pmql=" +
             encodeURIComponent(pmql) +
             "&filter=" +