From d5edfe27f87a1f6b59ceb1102976afc5de6a3854 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 21 Jun 2024 22:29:49 +0530
Subject: [PATCH] fix: render default colors also updated styles

---
 crm/api/doc.py                                |  8 +--
 .../crm_view_settings/crm_view_settings.py    |  4 +-
 frontend/src/components/Kanban/KanbanView.vue | 71 ++++++++++++++++---
 3 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/crm/api/doc.py b/crm/api/doc.py
index 8a162a35..4e420780 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -302,11 +302,11 @@ def get_data(
 			if field_meta.fieldtype == "Link":
 				columns = frappe.get_all(
 					field_meta.options,
-					pluck="name",
+					fields=["name"],
 					order_by="modified asc",
 				)
 			elif field_meta.fieldtype == "Select":
-				columns = [option for option in field_meta.options.split("\n")]
+				columns = [{"name": option} for option in field_meta.options.split("\n")]
 
 
 		if not rows:
@@ -316,8 +316,8 @@ def get_data(
 			rows = _list.default_kanban_data().get("rows")
 
 		for column in columns:
-			column_filters = { column_field: column }
-			if column_field in filters and filters.get(column_field) != column:
+			column_filters = { column_field: column.get('name') }
+			if column_field in filters and filters.get(column_field) != column.name:
 				column_data = []
 			else:
 				column_filters.update(filters.copy())
diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
index 1908443a..120e04d5 100644
--- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
+++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
@@ -113,11 +113,11 @@ def sync_default_columns(view):
 		if field_meta.fieldtype == "Link":
 			columns = frappe.get_all(
 				field_meta.options,
-				pluck="name",
+				fields=["name"],
 				order_by="modified asc",
 			)
 		elif field_meta.fieldtype == "Select":
-			columns = [option for option in field_meta.options.split("\n")]
+			columns = [{"name": option} for option in field_meta.options.split("\n")]
 	elif hasattr(list, "default_list_data"):
 		columns = list.default_list_data().get("columns")
 
diff --git a/frontend/src/components/Kanban/KanbanView.vue b/frontend/src/components/Kanban/KanbanView.vue
index 8b75c8f0..1d1a1640 100644
--- a/frontend/src/components/Kanban/KanbanView.vue
+++ b/frontend/src/components/Kanban/KanbanView.vue
@@ -1,22 +1,35 @@
 <template>
   <Draggable
-    :list="kanban?.data?.data"
+    v-if="columns"
+    :list="columns"
     item-key="column"
-    class="flex sm:mx-5 mx-3 pb-3 overflow-x-auto gap-2"
+    class="flex sm:mx-2.5 mx-2 pb-3.5 overflow-x-auto"
   >
     <template #item="{ element: column }">
-      <div class="flex flex-col gap-2 min-w-[268px]">
-        <div>{{ column.column }}</div>
+      <div
+        class="flex flex-col gap-2.5 min-w-[268px] hover:bg-gray-100 rounded-lg p-2.5 transition-all duration-300 ease-in-out"
+      >
+        <div class="flex gap-2 items-center justify-between">
+          <div class="flex gap-2 items-center text-base py-1.5">
+            <IndicatorIcon :class="colorClasses(column.column.color)" />
+            <div>{{ column.column.name }}</div>
+          </div>
+          <div>
+            <Button icon="plus" variant="ghost" />
+          </div>
+        </div>
         <Draggable
           :list="column.data"
           group="fields"
           item-key="name"
-          class="flex flex-col gap-2 overflow-y-auto h-full"
+          class="flex flex-col gap-3.5 overflow-y-auto h-full"
         >
           <template #item="{ element: fields }">
-            <div class="p-3 rounded border bg-white">
-              <div v-for="value in fields">
-                <div>{{ value }}</div>
+            <div
+              class="pt-3 px-3.5 pb-2.5 rounded-lg border bg-white text-base flex flex-col gap-2"
+            >
+              <div v-for="value in fields" :key="value">
+                <div class="truncate">{{ value }}</div>
               </div>
             </div>
           </template>
@@ -26,7 +39,49 @@
   </Draggable>
 </template>
 <script setup>
+import IndicatorIcon from '@/components/Icons/IndicatorIcon.vue'
 import Draggable from 'vuedraggable'
+import { computed } from 'vue'
 
 const kanban = defineModel()
+
+const columns = computed(() => {
+  if (!kanban.value?.data?.data || kanban.value.data.view_type != 'kanban')
+    return []
+  let _columns = kanban.value.data.data
+
+  let has_color = _columns.some((column) => column.column?.color)
+  if (!has_color) {
+    _columns.forEach((column, i) => {
+      column.column['color'] = colors[i % colors.length]
+    })
+  }
+  return _columns
+})
+
+function colorClasses(color) {
+  let textColor = `!text-${color}-600`
+  if (color == 'black') {
+    textColor = '!text-gray-900'
+  } else if (['gray', 'green'].includes(color)) {
+    textColor = `!text-${color}-700`
+  }
+  return [textColor]
+}
+
+const colors = [
+  'gray',
+  'blue',
+  'green',
+  'red',
+  'pink',
+  'orange',
+  'amber',
+  'yellow',
+  'cyan',
+  'teal',
+  'violet',
+  'purple',
+  'black',
+]
 </script>