From f1ef71fe5ad784940fa0725ed51e30eca0e715cf Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 21 Jun 2024 15:36:16 +0530
Subject: [PATCH] fix: render kanban for lead/deal and task

---
 frontend/src/components/Kanban/KanbanView.vue | 2 +-
 frontend/src/pages/Deals.vue                  | 4 +++-
 frontend/src/pages/Leads.vue                  | 4 +---
 frontend/src/pages/Tasks.vue                  | 4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Kanban/KanbanView.vue b/frontend/src/components/Kanban/KanbanView.vue
index 10c3d947..8b75c8f0 100644
--- a/frontend/src/components/Kanban/KanbanView.vue
+++ b/frontend/src/components/Kanban/KanbanView.vue
@@ -1,6 +1,6 @@
 <template>
   <Draggable
-    :list="kanban?.data"
+    :list="kanban?.data?.data"
     item-key="column"
     class="flex sm:mx-5 mx-3 pb-3 overflow-x-auto gap-2"
   >
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index 14dba1dd..fe5f6c53 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -28,9 +28,10 @@
       allowedViews: ['list', 'group_by', 'kanban'],
     }"
   />
+  <KanbanView v-if="route.params.viewType == 'kanban'" v-model="deals"  />
   <DealsListView
     ref="dealsListView"
-    v-if="deals.data && rows.length"
+    v-else-if="deals.data && rows.length"
     v-model="deals.data.page_length_count"
     v-model:list="deals"
     :rows="rows"
@@ -68,6 +69,7 @@ import IndicatorIcon from '@/components/Icons/IndicatorIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
+import KanbanView from '@/components/Kanban/KanbanView.vue'
 import DealModal from '@/components/Modals/DealModal.vue'
 import ViewControls from '@/components/ViewControls.vue'
 import { usersStore } from '@/stores/users'
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index 16d05728..3cde4593 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -20,7 +20,6 @@
   <ViewControls
     ref="viewControls"
     v-model="leads"
-    v-model:kanban="kanban"
     v-model:loadMore="loadMore"
     v-model:resizeColumn="triggerResize"
     v-model:updatedPageCount="updatedPageCount"
@@ -30,7 +29,7 @@
       allowedViews: ['list', 'group_by', 'kanban'],
     }"
   />
-  <KanbanView v-if="route.params.viewType == 'kanban'" v-model="kanban"  />
+  <KanbanView v-if="route.params.viewType == 'kanban'" v-model="leads"  />
   <LeadsListView
     ref="leadsListView"
     v-else-if="leads.data && rows.length"
@@ -102,7 +101,6 @@ const showLeadModal = ref(false)
 
 // leads data is loaded in the ViewControls component
 const leads = ref({})
-const kanban = ref({})
 const loadMore = ref(1)
 const triggerResize = ref(1)
 const updatedPageCount = ref(20)
diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue
index db0a75d4..4cc285d5 100644
--- a/frontend/src/pages/Tasks.vue
+++ b/frontend/src/pages/Tasks.vue
@@ -24,9 +24,10 @@
       allowedViews: ['list', 'kanban'],
     }"
   />
+  <KanbanView v-if="$route.params.viewType == 'kanban'" v-model="tasks"  />
   <TasksListView
     ref="tasksListView"
-    v-if="tasks.data && rows.length"
+    v-else-if="tasks.data && rows.length"
     v-model="tasks.data.page_length_count"
     v-model:list="tasks"
     :rows="rows"
@@ -65,6 +66,7 @@ import EmailIcon from '@/components/Icons/EmailIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import ViewControls from '@/components/ViewControls.vue'
 import TasksListView from '@/components/ListViews/TasksListView.vue'
+import KanbanView from '@/components/Kanban/KanbanView.vue'
 import TaskModal from '@/components/Modals/TaskModal.vue'
 import { usersStore } from '@/stores/users'
 import { dateFormat, dateTooltipFormat, timeAgo } from '@/utils'