From 72f2f081f7b304798271bd7ebacbd9a82081c4a3 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 6 Dec 2023 11:50:26 -0400
Subject: [PATCH 1/3] Reorder request list columns

---
 resources/js/requests/components/RequestsListing.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
index 55767d299e..03f6b08885 100644
--- a/resources/js/requests/components/RequestsListing.vue
+++ b/resources/js/requests/components/RequestsListing.vue
@@ -224,18 +224,18 @@ export default {
           sortable: true,
           default: true,
         },
-        {
-          label: "Status",
-          field: "status",
-          sortable: true,
-          default: true,
-        },
         {
           label: "Participants",
           field: "participants",
           sortable: false,
           default: true,
         },
+        {
+          label: "Status",
+          field: "status",
+          sortable: true,
+          default: true,
+        },
         {
           label: "Started",
           field: "initiated_at",

From c0c8d92dde6c0589d865d140ff7d2c1f50e7e05f Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 6 Dec 2023 13:06:00 -0400
Subject: [PATCH 2/3] Add Task Name column

---
 .../Http/Resources/ProcessRequests.php        |  7 +++++
 .../requests/components/RequestsListing.vue   | 28 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/ProcessMaker/Http/Resources/ProcessRequests.php b/ProcessMaker/Http/Resources/ProcessRequests.php
index fa4020e9fc..41061491f1 100644
--- a/ProcessMaker/Http/Resources/ProcessRequests.php
+++ b/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);
         }
diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
index 03f6b08885..f76922bacf 100644
--- a/resources/js/requests/components/RequestsListing.vue
+++ b/resources/js/requests/components/RequestsListing.vue
@@ -51,6 +51,22 @@
         >
           <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"
@@ -224,6 +240,13 @@ export default {
           sortable: true,
           default: true,
         },
+        {
+          label: "Task Name",
+          field: "active_tasks",
+          name: "__slot:active_tasks",
+          sortable: false,
+          default: true,
+        },
         {
           label: "Participants",
           field: "participants",
@@ -255,6 +278,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 +365,7 @@ export default {
             this.page +
             "&per_page=" +
             this.perPage +
-            "&include=process,participants,data" +
+            "&include=process,participants,activeTasks,data" +
             "&pmql=" +
             encodeURIComponent(pmql) +
             "&filter=" +

From 9247aae7807d5e51c8aafe23dbb1e6dadd0e3f20 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 6 Dec 2023 13:30:22 -0400
Subject: [PATCH 3/3] Add full name to participants

---
 .../js/requests/components/RequestsListing.vue   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
index f76922bacf..1f49e11eed 100644
--- a/resources/js/requests/components/RequestsListing.vue
+++ b/resources/js/requests/components/RequestsListing.vue
@@ -71,13 +71,17 @@
           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"