From 720d831f6e97ec8d1aec5af8aa6df07a80468f29 Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Fri, 16 Feb 2024 15:16:06 -0800
Subject: [PATCH 1/2] Use advanced filter for defaults and fix translations

---
 .../Http/Controllers/RequestController.php    |  2 +-
 .../Http/Controllers/TaskController.php       |  2 +-
 .../js/common/advancedFilterStatusMixin.js    |  7 +-----
 .../common/setDefaultAdvancedFilterStatus.js  | 25 +++++++++++++++++++
 resources/js/components/shared/PmqlInput.vue  |  9 ++++++-
 .../requests/components/RequestsListing.vue   | 18 ++++++-------
 resources/js/requests/index.js                | 13 ++--------
 resources/js/tasks/components/TasksList.vue   | 18 ++++++-------
 resources/js/tasks/index.js                   | 14 ++---------
 resources/lang/en.json                        |  5 +++-
 10 files changed, 62 insertions(+), 51 deletions(-)
 create mode 100644 resources/js/common/setDefaultAdvancedFilterStatus.js

diff --git a/ProcessMaker/Http/Controllers/RequestController.php b/ProcessMaker/Http/Controllers/RequestController.php
index 52798281da..36f26e271c 100644
--- a/ProcessMaker/Http/Controllers/RequestController.php
+++ b/ProcessMaker/Http/Controllers/RequestController.php
@@ -70,7 +70,7 @@ public function index($type = null)
                 SavedSearch::KEY_REQUESTS,
             );
             if ($defaultSavedSearch) {
-                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
+                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns, SavedSearch::TYPE_REQUEST);
             } else {
                 $defaultColumns = null;
             }
diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php
index 24948a90c3..0acf2a4718 100644
--- a/ProcessMaker/Http/Controllers/TaskController.php
+++ b/ProcessMaker/Http/Controllers/TaskController.php
@@ -52,7 +52,7 @@ public function index()
                 SavedSearch::KEY_TASKS,
             );
             if ($defaultSavedSearch) {
-                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
+                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns, SavedSearch::TYPE_TASK);
             } else {
                 $defaultColumns = null;
             }
diff --git a/resources/js/common/advancedFilterStatusMixin.js b/resources/js/common/advancedFilterStatusMixin.js
index 778a200489..d900237502 100644
--- a/resources/js/common/advancedFilterStatusMixin.js
+++ b/resources/js/common/advancedFilterStatusMixin.js
@@ -18,7 +18,7 @@ export default {
       for(const filter of filters) {
         result.push([
           this.formatBadgeSubject(filter),
-          [{name: this.formatBadgeValue(filter), advanced_filter: true}]
+          [{name: filter.value, operator: filter.operator, advanced_filter: true}]
         ]);
 
         if (filter.or && filter.or.length > 0) {
@@ -29,11 +29,6 @@ export default {
     formatBadgeSubject(filter) {
       return get(filter, '_column_label', '');
     },
-    formatBadgeValue(filter) {
-      let result = filter.operator;
-      result = result + " " + filter.value;
-      return result;
-    },
   },
   computed: {
     formatAdvancedFilterForBadges() {
diff --git a/resources/js/common/setDefaultAdvancedFilterStatus.js b/resources/js/common/setDefaultAdvancedFilterStatus.js
new file mode 100644
index 0000000000..a95dac93e7
--- /dev/null
+++ b/resources/js/common/setDefaultAdvancedFilterStatus.js
@@ -0,0 +1,25 @@
+import { get } from "lodash";
+
+export default (status, ignoreSavedFilter = false) => {
+  let advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
+  if (ignoreSavedFilter) {
+    // Remove any Status filters that might be set by the user
+    advancedFilter = advancedFilter.filter(f => f.subject?.type !== "Status");
+  } else {
+    if (advancedFilter.some(f => f.subject?.type === "Status")) {
+      // Already has a status filter set by the user
+      return;
+    }
+  }
+  advancedFilter.push({
+    subject: {
+      type: "Status"
+    },
+    operator: "=",
+    value: status,
+    _column_field: "status",
+    _column_label: "Status"
+  });
+  window.ProcessMaker.advanced_filter.filters = advancedFilter;
+
+}
\ No newline at end of file
diff --git a/resources/js/components/shared/PmqlInput.vue b/resources/js/components/shared/PmqlInput.vue
index 779d1a0aad..0b5d998407 100755
--- a/resources/js/components/shared/PmqlInput.vue
+++ b/resources/js/components/shared/PmqlInput.vue
@@ -153,7 +153,14 @@
           class="selected-filter-item d-flex align-items-center"
         >
           <span class="selected-filter-key mr-1">{{ $t(capitalizeString(filter[0])) }}<template v-if="!get(filter, '1.0.advanced_filter', false)">:</template></span>
-          {{ filter[1][0].name ? filter[1][0].name : filter[1][0].fullname }}
+          {{ filter[1][0].operator ?? '' }}
+          <template v-if="filter[0] === 'Status'">
+            <!-- translate status label -->
+            {{ $t(filter[1][0].name) }}
+          </template>
+          <template v-else>
+            {{ filter[1][0].name ? filter[1][0].name : filter[1][0].fullname }}
+          </template>
           <span
             v-if="filter[1].length > 1"
             class="badge badge-pill ml-2 filter-counter"
diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
index 4b0a6d027a..6a3d3c2880 100644
--- a/resources/js/requests/components/RequestsListing.vue
+++ b/resources/js/requests/components/RequestsListing.vue
@@ -14,7 +14,7 @@
         <template v-for="(column, index) in tableHeaders" v-slot:[column.field]>
           <PMColumnFilterIconAsc v-if="column.sortAsc"></PMColumnFilterIconAsc>
           <PMColumnFilterIconDesc v-if="column.sortDesc"></PMColumnFilterIconDesc>
-          <div :key="index" style="display: inline-block;">{{ column.label }}</div>
+          <div :key="index" style="display: inline-block;">{{ $t(column.label) }}</div>
         </template>
         <!-- Slot Table Header filter Button -->
         <template v-for="(column, index) in tableHeaders" v-slot:[`filter-${column.field}`]>
@@ -232,14 +232,14 @@ export default {
       }
       return [
         {
-          label: this.$t("Case #"),
+          label: "Case #",
           field: "case_number",
           sortable: true,
           default: true,
           width: 80,
         },
         {
-          label: this.$t("Case title"),
+          label: "Case title",
           field: "case_title",
           sortable: true,
           default: true,
@@ -247,7 +247,7 @@ export default {
           width: 220,
         },
         {
-          label: this.$t("Process"),
+          label: "Process",
           field: "name",
           sortable: true,
           default: true,
@@ -255,7 +255,7 @@ export default {
           truncate: true,
         },
         {
-          label: this.$t("Task"),
+          label: "Task",
           field: "active_tasks",
           sortable: false,
           default: true,
@@ -264,7 +264,7 @@ export default {
           tooltip: this.$t("This column can not be sorted or filtered."),
         },
         {
-          label: this.$t("Participants"),
+          label: "Participants",
           field: "participants",
           sortable: true,
           default: true,
@@ -274,7 +274,7 @@ export default {
           hideSortingButtons: true,
         },
         {
-          label: this.$t("Status"),
+          label: "Status",
           field: "status",
           sortable: true,
           default: true,
@@ -282,7 +282,7 @@ export default {
           filter_subject: { type: 'Status' },
         },
         {
-          label: this.$t("Started"),
+          label: "Started",
           field: "initiated_at",
           format: "datetime",
           sortable: true,
@@ -290,7 +290,7 @@ export default {
           width: 160,
         },
         {
-          label: this.$t("Completed"),
+          label: "Completed",
           field: "completed_at",
           format: "datetime",
           sortable: true,
diff --git a/resources/js/requests/index.js b/resources/js/requests/index.js
index 00d6322f96..527b07f89d 100644
--- a/resources/js/requests/index.js
+++ b/resources/js/requests/index.js
@@ -3,6 +3,7 @@ import CounterCard from "./components/CounterCard";
 import CounterCardGroup from "./components/CounterCardGroup";
 import RequestsListing from "./components/RequestsListing";
 import AvatarImage from "../components/AvatarImage";
+import setDefaultAdvancedFilterStatus from "../common/setDefaultAdvancedFilterStatus";
 
 Vue.component("AvatarImage", AvatarImage);
 
@@ -39,19 +40,9 @@ new Vue({
     }
 
     if (status) {
-      this.status.push({
-        name: status,
-        value: status,
-      });
+      setDefaultAdvancedFilterStatus(status, true);
     }
 
-    // translate status labels when available
-    window.ProcessMaker.i18nPromise.then(() => {
-      this.status.forEach((item) => {
-        item.name = this.$t(item.name);
-      });
-    });
-
     const urlParams = new URLSearchParams(window.location.search);
     this.urlPmql = urlParams.get("pmql");
   },
diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue
index dfde672450..737315c86c 100644
--- a/resources/js/tasks/components/TasksList.vue
+++ b/resources/js/tasks/components/TasksList.vue
@@ -17,7 +17,7 @@
         <template v-for="(column, index) in tableHeaders" v-slot:[column.field]>
           <PMColumnFilterIconAsc v-if="column.sortAsc"></PMColumnFilterIconAsc>
           <PMColumnFilterIconDesc v-if="column.sortDesc"></PMColumnFilterIconDesc>
-          <div :key="index" style="display: inline-block;">{{ column.label }}</div>
+          <div :key="index" style="display: inline-block;">{{ $t(column.label) }}</div>
         </template>
         <!-- Slot Table Header filter Button -->
         <template v-for="(column, index) in tableHeaders" v-slot:[`filter-${column.field}`]>
@@ -313,7 +313,7 @@ export default {
       const isStatusCompletedList = window.location.search.includes("status=CLOSED");
       const columns = [
         {
-          label: this.$t("Case #"),
+          label: "Case #",
           field: "case_number",
           sortable: true,
           default: true,
@@ -322,7 +322,7 @@ export default {
           order_column: 'process_requests.case_number',
         },
         {
-          label: this.$t("Case title"),
+          label: "Case title",
           field: "case_title",
           name: "__slot:case_number",
           sortable: true,
@@ -333,7 +333,7 @@ export default {
           order_column: 'process_requests.case_title',
         },
         {
-          label: this.$t("Process"),
+          label: "Process",
           field: "process",
           sortable: true,
           default: true,
@@ -343,7 +343,7 @@ export default {
           order_column: 'process_requests.name',
         },
         {
-          label: this.$t("Task"),
+          label: "Task",
           field: "task_name",
           sortable: true,
           default: true,
@@ -353,15 +353,15 @@ export default {
           order_column: 'element_name',
         },
         {
-          label: this.$t("Status"),
+          label: "Status",
           field: "status",
           sortable: true,
           default: true,
           width: 100,
-          filter_subject: { value: 'Status' },
+          filter_subject: { type: 'Status' },
         },
         {
-          label: this.$t("Due date"),
+          label: "Due date",
           field: "due_at",
           format: "datetime",
           sortable: true,
@@ -371,7 +371,7 @@ export default {
       ];
       if (isStatusCompletedList) {
         columns.push({
-          label: this.$t("Completed"),
+          label: "Completed",
           field: "completed_at",
           format: "datetime",
           sortable: true,
diff --git a/resources/js/tasks/index.js b/resources/js/tasks/index.js
index 8f6d4e5a9e..33b75d5238 100644
--- a/resources/js/tasks/index.js
+++ b/resources/js/tasks/index.js
@@ -1,5 +1,6 @@
 import Vue from "vue";
 import TasksList from "./components/TasksList";
+import setDefaultAdvancedFilterStatus from "../common/setDefaultAdvancedFilterStatus";
 
 new Vue({
   el: "#tasks",
@@ -38,18 +39,7 @@ new Vue({
         status = "In Progress";
         break;
     }
-
-    this.status.push({
-      name: status,
-      value: status,
-    });
-
-    // translate status labels when available
-    window.ProcessMaker.i18nPromise.then(() => {
-      this.status.forEach((item) => {
-        item.name = this.$t(item.name);
-      });
-    });
+    setDefaultAdvancedFilterStatus(status);
 
     if (this.urlPmql && this.urlPmql !== "") {
       this.onSearch();
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 751cb16488..872282d066 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -2088,5 +2088,8 @@
   "Google Places": "Google Places",
   "Add an action to submit your form or update a field": "Add an action to submit your form or update a field",
   "Add special buttons that link between subpages within this Form": "Add special buttons that link between subpages within this Form",
-  "input": "input"
+  "input": "input",
+  "Case #": "Case #",
+  "Case title": "Case title",
+  "Case Title": "Case Title"
 }

From 45f052dc1cc9a2f6b0bd3a40e7e13090c30d1f66 Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Fri, 16 Feb 2024 15:37:51 -0800
Subject: [PATCH 2/2] Sonarqube fixes

---
 ProcessMaker/Http/Controllers/RequestController.php   | 5 ++++-
 ProcessMaker/Http/Controllers/TaskController.php      | 5 ++++-
 resources/js/common/setDefaultAdvancedFilterStatus.js | 8 +++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/RequestController.php b/ProcessMaker/Http/Controllers/RequestController.php
index 36f26e271c..932c26b3cc 100644
--- a/ProcessMaker/Http/Controllers/RequestController.php
+++ b/ProcessMaker/Http/Controllers/RequestController.php
@@ -70,7 +70,10 @@ public function index($type = null)
                 SavedSearch::KEY_REQUESTS,
             );
             if ($defaultSavedSearch) {
-                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns, SavedSearch::TYPE_REQUEST);
+                $defaultColumns = SavedSearchController::adjustColumnsOf(
+                    $defaultSavedSearch->columns,
+                    SavedSearch::TYPE_REQUEST
+                );
             } else {
                 $defaultColumns = null;
             }
diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php
index 0acf2a4718..8aeaf6785f 100644
--- a/ProcessMaker/Http/Controllers/TaskController.php
+++ b/ProcessMaker/Http/Controllers/TaskController.php
@@ -52,7 +52,10 @@ public function index()
                 SavedSearch::KEY_TASKS,
             );
             if ($defaultSavedSearch) {
-                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns, SavedSearch::TYPE_TASK);
+                $defaultColumns = SavedSearchController::adjustColumnsOf(
+                    $defaultSavedSearch->columns,
+                    SavedSearch::TYPE_TASK
+                );
             } else {
                 $defaultColumns = null;
             }
diff --git a/resources/js/common/setDefaultAdvancedFilterStatus.js b/resources/js/common/setDefaultAdvancedFilterStatus.js
index a95dac93e7..615f650f92 100644
--- a/resources/js/common/setDefaultAdvancedFilterStatus.js
+++ b/resources/js/common/setDefaultAdvancedFilterStatus.js
@@ -5,11 +5,9 @@ export default (status, ignoreSavedFilter = false) => {
   if (ignoreSavedFilter) {
     // Remove any Status filters that might be set by the user
     advancedFilter = advancedFilter.filter(f => f.subject?.type !== "Status");
-  } else {
-    if (advancedFilter.some(f => f.subject?.type === "Status")) {
-      // Already has a status filter set by the user
-      return;
-    }
+  } else if (advancedFilter.some(f => f.subject?.type === "Status")) {
+    // Already has a status filter set by the user
+    return;
   }
   advancedFilter.push({
     subject: {