From 391cc9d469271a0153ef0dc20608b4e6688d1731 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 2 Jul 2026 00:27:58 +0100
Subject: [PATCH] refactor: expose group-by property from useKanbanColumns

---
 apps/client/src/ee/base/hooks/use-kanban-columns.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/ee/base/hooks/use-kanban-columns.ts b/apps/client/src/ee/base/hooks/use-kanban-columns.ts
index 493da5ab8..df7ee9213 100644
--- a/apps/client/src/ee/base/hooks/use-kanban-columns.ts
+++ b/apps/client/src/ee/base/hooks/use-kanban-columns.ts
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { IBase, IBaseView, KanbanColumn, NO_VALUE_CHOICE_ID, SelectTypeOptions } from "@/ee/base/types/base.types";
+import { IBase, IBaseProperty, IBaseView, KanbanColumn, NO_VALUE_CHOICE_ID, SelectTypeOptions } from "@/ee/base/types/base.types";
 
 export type KanbanGroup = KanbanColumn & { hidden: boolean };
 
@@ -8,6 +8,7 @@ export function useKanbanColumns(
   view: IBaseView | undefined,
 ): {
   groupByPropertyId: string | undefined;
+  groupByProperty: IBaseProperty | undefined;
   columns: KanbanColumn[];
   allGroups: KanbanGroup[];
   hasValidGroupBy: boolean;
@@ -18,7 +19,7 @@ export function useKanbanColumns(
     const groupable = prop && (prop.type === "select" || prop.type === "status");
 
     if (!groupable || !prop || !view) {
-      return { groupByPropertyId, columns: [], allGroups: [], hasValidGroupBy: false };
+      return { groupByPropertyId, groupByProperty: undefined, columns: [], allGroups: [], hasValidGroupBy: false };
     }
 
     const typeOptions = prop.typeOptions as SelectTypeOptions;
@@ -47,6 +48,6 @@ export function useKanbanColumns(
     });
     const columns: KanbanColumn[] = allGroups.filter((g) => !g.hidden);
 
-    return { groupByPropertyId, columns, allGroups, hasValidGroupBy: true };
+    return { groupByPropertyId, groupByProperty: prop, columns, allGroups, hasValidGroupBy: true };
   }, [base, view]);
 }