From a32749533fc42406f52dc6af3a77b66d9042e898 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 21 Mar 2025 16:24:25 +0530
Subject: [PATCH] fix: code cleanup

---
 frontend/src/pages/Deals.vue | 16 ++++++++++------
 frontend/src/pages/Leads.vue | 16 ++++++++++------
 frontend/src/pages/Tasks.vue | 12 +++++++-----
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index 527a57e6..73e7f62c 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -350,7 +350,9 @@ function getGroupedByRows(listRows, groupByField, columns) {
     if (!option) {
       filteredRows = listRows.filter((row) => !row[groupByField.fieldname])
     } else {
-      filteredRows = listRows.filter((row) => row[groupByField.fieldname] == option)
+      filteredRows = listRows.filter(
+        (row) => row[groupByField.fieldname] == option,
+      )
     }
 
     let groupDetail = {
@@ -382,16 +384,18 @@ function getKanbanRows(data, columns) {
 }
 
 function parseRows(rows, columns = []) {
+  let view_type = deals.value.data.view_type
+  let key = view_type === 'kanban' ? 'fieldname' : 'key'
+  let type = view_type === 'kanban' ? 'fieldtype' : 'type'
+
   return rows.map((deal) => {
     let _rows = {}
     deals.value.data.rows.forEach((row) => {
       _rows[row] = deal[row]
 
-      let fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key'
-      let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type'
-      let fieldType = columns?.find(
-        (col) => (col[fieldname] || col.value) == row,
-      )?.[fieldtype]
+      let fieldType = columns?.find((col) => (col[key] || col.value) == row)?.[
+        type
+      ]
 
       if (
         fieldType &&
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index 03c5a314..9d65cbd5 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -370,7 +370,9 @@ function getGroupedByRows(listRows, groupByField, columns) {
     if (!option) {
       filteredRows = listRows.filter((row) => !row[groupByField.fieldname])
     } else {
-      filteredRows = listRows.filter((row) => row[groupByField.fieldname] == option)
+      filteredRows = listRows.filter(
+        (row) => row[groupByField.fieldname] == option,
+      )
     }
 
     let groupDetail = {
@@ -402,16 +404,18 @@ function getKanbanRows(data, columns) {
 }
 
 function parseRows(rows, columns = []) {
+  let view_type = leads.value.data.view_type
+  let key = view_type === 'kanban' ? 'fieldname' : 'key'
+  let type = view_type === 'kanban' ? 'fieldtype' : 'type'
+
   return rows.map((lead) => {
     let _rows = {}
     leads.value?.data.rows.forEach((row) => {
       _rows[row] = lead[row]
 
-      let fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key'
-      let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type'
-      let fieldType = columns?.find(
-        (col) => (col[fieldname] || col.value) == row,
-      )?.[fieldtype]
+      let fieldType = columns?.find((col) => (col[key] || col.value) == row)?.[
+        type
+      ]
 
       if (
         fieldType &&
diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue
index 93775863..894f96d8 100644
--- a/frontend/src/pages/Tasks.vue
+++ b/frontend/src/pages/Tasks.vue
@@ -257,16 +257,18 @@ function getKanbanRows(data, columns) {
 }
 
 function parseRows(rows, columns = []) {
+  let view_type = tasks.value.data.view_type
+  let key = view_type === 'kanban' ? 'fieldname' : 'key'
+  let type = view_type === 'kanban' ? 'fieldtype' : 'type'
+
   return rows.map((task) => {
     let _rows = {}
     tasks.value?.data.rows.forEach((row) => {
       _rows[row] = task[row]
 
-      let fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key'
-      let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type'
-      let fieldType = columns?.find(
-        (col) => (col[fieldname] || col.value) == row,
-      )?.[fieldtype]
+      let fieldType = columns?.find((col) => (col[key] || col.value) == row)?.[
+        type
+      ]
 
       if (
         fieldType &&