From e14b05d16bfa55a9aa0b99a62b486ceb5d7dd0d1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 10 Sep 2022 17:08:37 +0800
Subject: [PATCH] fix(nc-gui): formatKanbanData logic

---
 packages/nc-gui/composables/useViewData.ts | 60 +++++++++++++---------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 02fa1f72b5..7393cbb830 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -15,29 +15,6 @@ import {
   useUIPermission,
 } from '#imports'
 
-const formatData = (list: Record<string, any>[]) =>
-  list.map((row) => ({
-    row: { ...row },
-    oldRow: { ...row },
-    rowMeta: {},
-  }))
-
-const formatKanbanData = (list: Record<string, any>[]) =>
-  list.reduce((acc: any, obj: any) => {
-    // TODO: grouping field
-    const groupingFeild = 'singleSelect2'
-    const key = obj[groupingFeild] === null ? 'Uncategorized' : obj[groupingFeild]
-    if (!acc[key]) {
-      acc[key] = []
-    }
-    acc[key].push({
-      row: { ...obj },
-      oldRow: { ...obj },
-      rowMeta: {},
-    })
-    return acc
-  }, {})
-
 export interface Row {
   row: Record<string, any>
   oldRow: Record<string, any>
@@ -76,6 +53,43 @@ export function useViewData(
   const { sorts, nestedFilters } = useSmartsheetStoreOrThrow()
   const { isUIAllowed } = useUIPermission()
 
+  const formatData = (list: Record<string, any>[]) =>
+    list.map((row) => ({
+      row: { ...row },
+      oldRow: { ...row },
+      rowMeta: {},
+    }))
+
+  const formatKanbanData = (list: Record<string, any>[]) => {
+    const groupingField = 'singleSelect2'
+    const groupingFieldColumn = meta?.value?.columns?.filter((f) => f.title === groupingField)[0] as Record<string, any>
+    const groupingFieldColumnOptions = [...groupingFieldColumn?.colOptions?.options, { title: 'Uncategorized', order: 0 }].sort(
+      (a: Record<string, any>, b: Record<string, any>) => a.order - b.order,
+    )
+    const initialAcc = groupingFieldColumnOptions.reduce((acc: any, obj: any) => {
+      if (!acc[obj.title]) {
+        acc[obj.title] = []
+      }
+      return acc
+    }, {})
+    return {
+      meta: groupingFieldColumnOptions,
+      data: list.reduce((acc: any, obj: any) => {
+        // TODO: grouping field
+        const key = obj[groupingField] === null ? 'Uncategorized' : obj[groupingField]
+        if (!acc[key]) {
+          acc[key] = []
+        }
+        acc[key].push({
+          row: { ...obj },
+          oldRow: { ...obj },
+          rowMeta: {},
+        })
+        return acc
+      }, initialAcc),
+    }
+  }
+
   const paginationData = computed({
     get: () => (isPublic.value ? sharedPaginationData.value : _paginationData.value),
     set: (value) => {