From 5769c880ac590d163d57018d509a1274d12bf3d2 Mon Sep 17 00:00:00 2001
From: henry jordan <jonathan.quispe@processmaker.com>
Date: Tue, 19 Apr 2022 21:56:07 +0000
Subject: [PATCH] PMCORE-3703

---
 .../customCaseList/CaseListSketch.vue         | 22 ++++++++++++++-----
 .../js/admin/settings/customCaseList/main.js  |  1 -
 .../js/home/CustomCaseList/CustomCaseList.vue |  5 ++++-
 .../src/ProcessMaker/Model/CaseList.php       |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue
index d9c198e22..b19aff3ef 100644
--- a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue
+++ b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue
@@ -250,15 +250,27 @@
                                             ></b-popover>
                                         </b-col>
                                         <b-col cols="6">
-                                            <b-form-checkbox 
+                                            <b-form-checkbox
+                                            v-if="props.row.field =='process_category' || props.row.field =='process_name'"
                                             v-model="enabledFilterRows"
                                             @change="onTongleFilter(props.row.field)" 
                                             name="check-button" 
                                             :checked="props.row.enableFilter"
                                             :value="props.row.field"
                                             switch
-                                        >
-                                        </b-form-checkbox>
+                                            disabled
+                                            >
+                                            </b-form-checkbox>
+                                            <b-form-checkbox
+                                                v-else
+                                                v-model="enabledFilterRows"
+                                                @change="onTongleFilter(props.row.field)"
+                                                name="check-button"
+                                                :checked="props.row.enableFilter"
+                                                :value="props.row.field"
+                                                switch
+                                            >
+                                            </b-form-checkbox>
                                         </b-col>
                                     </b-row>  
                                     </div>
@@ -294,7 +306,6 @@
     </div>
 </template>
 <script>
-import utils from "../../../utils/utils";
 import Multiselect from "vue-multiselect";
 import Api from "./Api/CaseList";
 import IconPicker from "../../../components/iconPicker/IconPicker.vue";
@@ -420,7 +431,8 @@ export default {
             this.data =this.params.columns.filter(elem => elem.set === false);
             this.dataCaseList =this.params.columns.filter(elem => elem.set === true);
             this.dataCaseList.forEach(function (value) {
-                if (value.enableFilter) {
+                //Force to false in process_category & process_name
+                if (value.enableFilter && (value.field != "process_category" && value.field != "process_name" )) {
                     that.enabledFilterRows.push(value.field);
                 }
             });
diff --git a/resources/assets/js/admin/settings/customCaseList/main.js b/resources/assets/js/admin/settings/customCaseList/main.js
index 26005d9a5..ae267b604 100644
--- a/resources/assets/js/admin/settings/customCaseList/main.js
+++ b/resources/assets/js/admin/settings/customCaseList/main.js
@@ -4,7 +4,6 @@ import VueSidebarMenu from "vue-sidebar-menu";
 import VueI18n from 'vue-i18n';
 import { BootstrapVue } from 'bootstrap-vue';
 import { ServerTable, Event, ClientTable} from 'vue-tables-2';
-import Sortable from 'sortablejs';
 import "@fortawesome/fontawesome-free/css/all.css";
 import 'bootstrap/dist/css/bootstrap-grid.css';
 import 'bootstrap/dist/css/bootstrap.min.css'
diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
index 57da6f242..190a510e5 100644
--- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
+++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
@@ -398,6 +398,7 @@ export default {
             },
             itemMap: {
                 case_number: "caseNumber",
+                task_title: "taskTitle",
                 thread_title: "caseTitle",
                 delegation_date: "delegationDate",
                 send_by: "bySendBy",
@@ -809,7 +810,9 @@ export default {
                                 }
                             }
                             that.headings[item.field] = item.name;
-                            columns.push(item.field);
+                            if(item.enableFilter){
+                                columns.push(item.field);
+                            }
                         });
                         that.filterItems = newItems;
                         dt = that.formatDataResponse(response.data.data);
diff --git a/workflow/engine/src/ProcessMaker/Model/CaseList.php b/workflow/engine/src/ProcessMaker/Model/CaseList.php
index eacd4140a..c825f20a8 100644
--- a/workflow/engine/src/ProcessMaker/Model/CaseList.php
+++ b/workflow/engine/src/ProcessMaker/Model/CaseList.php
@@ -401,7 +401,7 @@ class CaseList extends Model
                 'set' => true
             ], [
                 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
-                'field' => 'task',
+                'field' => 'task_title',
                 'name' => G::LoadTranslation('ID_TASK'),
                 'type' => 'string',
                 'source' => 'APPLICATION',