From 59cf933abc3f4568f915b14e9147f69980e26731 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:28:11 +0700
Subject: [PATCH] feat: fix export group

---
 src/modules/reports/report-export/report-export.service.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/reports/report-export/report-export.service.ts b/src/modules/reports/report-export/report-export.service.ts
index ab7c764..d55a687 100644
--- a/src/modules/reports/report-export/report-export.service.ts
+++ b/src/modules/reports/report-export/report-export.service.ts
@@ -144,7 +144,6 @@ export class ReportExportService extends BaseReportService {
       // Create a new worksheet
       const reportSheet = workbook.addWorksheet('Report');
 
-      const columnStateIds = columnState.map((i) => i.colId);
       let configColumns = config.column_configs;
       const rowGroups = query_model?.rowGroupCols ?? [];
 
@@ -155,6 +154,11 @@ export class ReportExportService extends BaseReportService {
         });
       }
 
+      const columnStateIds = [
+        ...rowGroups.map((i) => i.id),
+        ...columnState.map((i) => i.colId),
+      ];
+
       const newConfigColumn = columnStateIds
         .map((i) => {
           const findData = configColumns.find((col) => col.column === i);