From 0cd0322bdbd0c5cf6faa990585199cfa6da3b266 Mon Sep 17 00:00:00 2001
From: CarliPinell <carlos.pinell@processmaker.com>
Date: Thu, 15 Feb 2024 19:08:47 +0000
Subject: [PATCH 1/3] solving bugfix/FOUR-14155

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

diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
index 4b0a6d027a..f40f927f41 100644
--- a/resources/js/requests/components/RequestsListing.vue
+++ b/resources/js/requests/components/RequestsListing.vue
@@ -143,6 +143,7 @@ export default {
   },
   data() {
     return {
+      fetchFlag: 0,
       orderBy: "id",
       orderDirection: "DESC",
       additionalParams: "",
@@ -426,6 +427,13 @@ export default {
             },
           )
           .then((response) => {
+            if (response.data.data.length === 0 && this.fetchFlag === 0){
+              this.page = 1;
+              this.fetch();
+              this.fetchFlag = 1;
+            } else {
+              this.fetchFlag = 0;
+            }
             this.data = this.transform(response.data);
           }).catch((error) => {
             this.data = [];

From 04041d85137238021e165b1431f4a5c8d1e70645 Mon Sep 17 00:00:00 2001
From: CarliPinell <carlos.pinell@processmaker.com>
Date: Thu, 15 Feb 2024 23:05:31 +0000
Subject: [PATCH 2/3] solving issue with filters with pagination

---
 .../requests/components/RequestsListing.vue   | 20 +++++++++----------
 resources/js/tasks/components/ListMixin.js    |  4 ++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
index f40f927f41..fbe20f383d 100644
--- a/resources/js/requests/components/RequestsListing.vue
+++ b/resources/js/requests/components/RequestsListing.vue
@@ -143,7 +143,6 @@ export default {
   },
   data() {
     return {
-      fetchFlag: 0,
       orderBy: "id",
       orderDirection: "DESC",
       additionalParams: "",
@@ -157,6 +156,7 @@ export default {
       fields: [],
       previousFilter: "",
       previousPmql: "",
+      previousAdvancedFilter: "",
       tableHeaders: [],
       unreadColumnName: "user_viewed_at",
     };
@@ -400,7 +400,7 @@ export default {
 
         const CancelToken = ProcessMaker.apiClient.CancelToken;
 
-        const { pmql, filter } = this.buildPmqlAndFilter();
+        const { pmql, filter, advancedFilter } = this.buildPmqlAndFilter();
 
         // Load from our api client
         ProcessMaker.apiClient
@@ -419,7 +419,7 @@ export default {
             "&order_direction=" +
             this.orderDirection +
             this.additionalParams + 
-            this.getAdvancedFilter(),
+            advancedFilter,
             {
               cancelToken: new CancelToken((c) => {
                 this.cancelToken = c;
@@ -427,13 +427,6 @@ export default {
             },
           )
           .then((response) => {
-            if (response.data.data.length === 0 && this.fetchFlag === 0){
-              this.page = 1;
-              this.fetch();
-              this.fetchFlag = 1;
-            } else {
-              this.fetchFlag = 0;
-            }
             this.data = this.transform(response.data);
           }).catch((error) => {
             this.data = [];
@@ -478,7 +471,12 @@ export default {
 
       this.previousPmql = pmql;
 
-      return { pmql, filter };
+      const advancedFilter = this.getAdvancedFilter();
+      if (this.previousAdvancedFilter !== advancedFilter) {
+        this.page = 1;
+      }
+
+      return { pmql, filter, advancedFilter };
 
     },
     handleRowClick(row) {
diff --git a/resources/js/tasks/components/ListMixin.js b/resources/js/tasks/components/ListMixin.js
index 09e77e36d4..897bde8c72 100644
--- a/resources/js/tasks/components/ListMixin.js
+++ b/resources/js/tasks/components/ListMixin.js
@@ -49,6 +49,10 @@ const ListMixin = {
         this.previousPmql = pmql;
         
         let advancedFilter = this.getAdvancedFilter ? this.getAdvancedFilter(): "";
+        if (this.previousAdvancedFilter !== advancedFilter) {
+          this.page = 1;
+        }
+        this.previousAdvancedFilter = advancedFilter;
 
         // Load from our api client
         ProcessMaker.apiClient

From d699e94333f6064178145d7cc3ded8b4362562d6 Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Fri, 16 Feb 2024 03:47:27 -0400
Subject: [PATCH 3/3] FOUR-14155 add previousAdvancedFilter to
 resources/js/tasks/components/TasksList.vue in the data() method

---
 resources/js/tasks/components/TasksList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue
index d0b37e3c95..282d3ae526 100644
--- a/resources/js/tasks/components/TasksList.vue
+++ b/resources/js/tasks/components/TasksList.vue
@@ -221,6 +221,7 @@ export default {
       fields: [],
       previousFilter: "",
       previousPmql: "",
+      previousAdvancedFilter: "",
       tableHeaders: [],
       unreadColumnName: "user_viewed_at",
       rowPosition: {},