chore(boards): sort on multiple fields for organization

entur · Jun 14, 2024 · 5855372 · 5855372
1 parent 8bfc006
commit 5855372
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/next-tavla/app/(admin)/boards/hooks/useSortBoardFunction.ts b/next-tavla/app/(admin)/boards/hooks/useSortBoardFunction.ts
@@ -15,6 +15,17 @@ function useSortBoardFunction() {
                 column: sortParams?.[0] as TBoardsColumn,
                 type: sortParams?.[1] as TSort,
             }
+
+            const compareTitle = () => {
+                const titleA =
+                    boardA?.board.meta?.title?.toLowerCase() ??
+                    DEFAULT_BOARD_NAME
+                const titleB =
+                    boardB?.board.meta?.title?.toLowerCase() ??
+                    DEFAULT_BOARD_NAME
+                return titleB.localeCompare(titleA)
+            }
+
             switch (sort.column) {
                 case 'lastModified':
                     sortFunc = () => {
@@ -24,16 +35,23 @@ function useSortBoardFunction() {
                     }
                     break
                 case 'organization':
+                    sortFunc = () => {
+                        const orgNameA =
+                            boardA.organization?.name?.toLowerCase() ?? 'Privat'
+                        const orgNameB =
+                            boardB.organization?.name?.toLowerCase() ?? 'Privat'
 
+                        if (orgNameA == orgNameB) {
+                            return sort.type == 'ascending'
+                                ? compareTitle()
+                                : -compareTitle()
+                        }
+                        return orgNameB.localeCompare(orgNameA)
+                    }
+                    break
                 default:
                     sortFunc = () => {
-                        const titleA =
-                            boardA?.board.meta?.title?.toLowerCase() ??
-                            DEFAULT_BOARD_NAME
-                        const titleB =
-                            boardB?.board.meta?.title?.toLowerCase() ??
-                            DEFAULT_BOARD_NAME
-                        return titleB.localeCompare(titleA)
+                        return compareTitle()
                     }
                     break
             }