From 0426142faa5d9e9ae8f91967e9c214e29da18575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Busso?= <90727999+agustinbusso@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:30:32 -0300 Subject: [PATCH 1/2] Search by process anme instead using a selectList in tasks --- resources/js/common/PMColumnFilterPopoverCommonMixin.js | 5 +---- resources/js/tasks/components/TasksList.vue | 9 +++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/resources/js/common/PMColumnFilterPopoverCommonMixin.js b/resources/js/common/PMColumnFilterPopoverCommonMixin.js index 6b03592443..e9a34d98ce 100644 --- a/resources/js/common/PMColumnFilterPopoverCommonMixin.js +++ b/resources/js/common/PMColumnFilterPopoverCommonMixin.js @@ -123,7 +123,7 @@ const PMColumnFilterCommonMixin = { if (column.format) { format = column.format; } - if (column.field === "status" || column.field === "assignee" || column.field === "participants" || column.field === 'process') { + if (column.field === "status" || column.field === "assignee" || column.field === "participants") { format = "stringSelect"; } return format; @@ -139,9 +139,6 @@ const PMColumnFilterCommonMixin = { if (column.field === "participants") { formatRange = this.viewParticipants; } - if (column.field === "process") { - formatRange = this.viewProcesses; - } return formatRange; }, getOperators(column) { diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index 1586c17c33..a86c154c7b 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -538,12 +538,10 @@ export default { if (value === "case_number" || value === "case_title" || value === "processRequest.case_number" || - value === "processRequest.case_title") { + value === "processRequest.case_title" || + value === "process") { type = "Relationship"; } - if (value === "process") { - type = "Process"; - } if (value === "status") { type = "Status"; } @@ -556,6 +554,9 @@ export default { if (value === "case_title") { value = "processRequest.case_title"; } + if (value === "process") { + value = "processRequest.name"; + } if (value === "task_name") { value = "element_name"; } From eecc36fe5f21491b9f09b3ddaf780670a26005f3 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Tue, 6 Feb 2024 16:16:02 -0400 Subject: [PATCH 2/2] FOUR-13977 Formatting of operators for columns that work with strings. --- resources/js/common/PMColumnFilterPopoverCommonMixin.js | 5 ++++- resources/js/tasks/components/TasksList.vue | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/js/common/PMColumnFilterPopoverCommonMixin.js b/resources/js/common/PMColumnFilterPopoverCommonMixin.js index e9a34d98ce..b1685a2260 100644 --- a/resources/js/common/PMColumnFilterPopoverCommonMixin.js +++ b/resources/js/common/PMColumnFilterPopoverCommonMixin.js @@ -143,7 +143,10 @@ const PMColumnFilterCommonMixin = { }, getOperators(column) { let operators = []; - if (column.field === "status" || column.field === "assignee" || column.field === "participants" || column.field === 'process') { + if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name") { + operators = ["=", "in", "contains", "regex"]; + } + if (column.field === "status" || column.field === "assignee" || column.field === "participants") { operators = ["=", "in"]; } return operators; diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index a86c154c7b..be0769f7a9 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -535,11 +535,12 @@ export default { let type = "Field"; //The inclusion of the alias in the comparison is necessary to ensure the correct //type is obtained when the column has been modified by the method getAliasColumnForFilter(). - if (value === "case_number" || - value === "case_title" || - value === "processRequest.case_number" || + if (value === "case_number" || + value === "case_title" || + value === "process" || + value === "processRequest.case_number" || value === "processRequest.case_title" || - value === "process") { + value === "processRequest.name") { type = "Relationship"; } if (value === "status") {