From 78a023801d8dbde436f66597ab4e0189db524314 Mon Sep 17 00:00:00 2001
From: "Ghislain B." <gbeaulac@gmail.com>
Date: Sat, 19 Oct 2024 12:22:19 -0400
Subject: [PATCH] chore: rename `GroupingAndColspanService` to
 `HeaderGroupingService` (#415)

---
 .../components/slickgrid-react.tsx            | 33 ++++++++++---------
 .../slickgridReactInstance.interface.ts       |  7 ++--
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/slickgrid-react/components/slickgrid-react.tsx b/src/slickgrid-react/components/slickgrid-react.tsx
index 697681cf..32c26562 100644
--- a/src/slickgrid-react/components/slickgrid-react.tsx
+++ b/src/slickgrid-react/components/slickgrid-react.tsx
@@ -35,7 +35,7 @@ import {
   GridEventService,
   GridService,
   GridStateService,
-  GroupingAndColspanService,
+  HeaderGroupingService,
   type Observable,
   PaginationService,
   ResizerService,
@@ -164,13 +164,8 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
   gridEventService: GridEventService;
   gridService: GridService;
   gridStateService: GridStateService;
-  groupingService: GroupingAndColspanService;
-  protected get paginationService(): PaginationService {
-    return this.state?.paginationService;
-  }
-  protected set paginationService(value: PaginationService) {
-    this.setStateValue('paginationService', value);
-  }
+  headerGroupingService: HeaderGroupingService;
+
   resizerService!: ResizerService;
   rxjs?: RxJsFacade;
   sharedService: SharedService;
@@ -249,6 +244,13 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
     this._isDatasetHierarchicalInitialized = true;
   }
 
+  protected get paginationService(): PaginationService {
+    return this.state?.paginationService;
+  }
+  protected set paginationService(value: PaginationService) {
+    this.setStateValue('paginationService', value);
+  }
+
   constructor(public readonly props: SlickgridReactProps) {
     super(props);
     const slickgridConfig = new SlickgridConfig();
@@ -291,7 +293,7 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
 
     this.gridStateService = new GridStateService(this.extensionService, this.filterService, this._eventPubSubService, this.sharedService, this.sortService, this.treeDataService);
     this.gridService = new GridService(this.gridStateService, this.filterService, this._eventPubSubService, this.paginationService, this.sharedService, this.sortService, this.treeDataService);
-    this.groupingService = new GroupingAndColspanService(this.extensionUtility, this._eventPubSubService);
+    this.headerGroupingService = new HeaderGroupingService(this.extensionUtility, this._eventPubSubService);
 
     this.serviceList = [
       this.extensionService,
@@ -299,7 +301,7 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
       this.gridEventService,
       this.gridService,
       this.gridStateService,
-      this.groupingService,
+      this.headerGroupingService,
       this.paginationService,
       this.resizerService,
       this.sortService,
@@ -320,7 +322,7 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
     this.props.containerService.registerInstance('GridEventService', this.gridEventService);
     this.props.containerService.registerInstance('GridService', this.gridService);
     this.props.containerService.registerInstance('GridStateService', this.gridStateService);
-    this.props.containerService.registerInstance('GroupingAndColspanService', this.groupingService);
+    this.props.containerService.registerInstance('HeaderGroupingService', this.headerGroupingService);
     this.props.containerService.registerInstance('PaginationService', this.paginationService);
     this.props.containerService.registerInstance('ResizerService', this.resizerService);
     this.props.containerService.registerInstance('SharedService', this.sharedService);
@@ -589,12 +591,13 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
       // return all available Services (non-singleton)
       backendService: this.backendService,
       eventPubSubService: this._eventPubSubService,
+      extensionService: this.extensionService,
       filterService: this.filterService,
       gridEventService: this.gridEventService,
       gridStateService: this.gridStateService,
       gridService: this.gridService,
-      groupingService: this.groupingService,
-      extensionService: this.extensionService,
+      groupingService: this.headerGroupingService,
+      headerGroupingService: this.headerGroupingService,
       paginationService: this.paginationService,
       resizerService: this.resizerService,
       sortService: this.sortService,
@@ -763,7 +766,7 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
       if (gridOptions.enableTranslate) {
         this.extensionService.translateAllExtensions(lang);
         if ((gridOptions.createPreHeaderPanel && gridOptions.createTopHeaderPanel) || (gridOptions.createPreHeaderPanel && !gridOptions.enableDraggableGrouping)) {
-          this.groupingService.translateGroupingAndColSpan();
+          this.headerGroupingService.translateHeaderGrouping();
         }
       }
     });
@@ -1480,7 +1483,7 @@ export class SlickgridReact<TData = any> extends React.Component<SlickgridReactP
 
     // when using Grouping/DraggableGrouping/Colspan register its Service
     if ((this.gridOptions.createPreHeaderPanel && this.gridOptions.createTopHeaderPanel) || (this.gridOptions.createPreHeaderPanel && !this.gridOptions.enableDraggableGrouping)) {
-      this._registeredResources.push(this.groupingService);
+      this._registeredResources.push(this.headerGroupingService);
     }
 
     // when using Tree Data View, register its Service
diff --git a/src/slickgrid-react/models/slickgridReactInstance.interface.ts b/src/slickgrid-react/models/slickgridReactInstance.interface.ts
index 509d4388..6afc887c 100644
--- a/src/slickgrid-react/models/slickgridReactInstance.interface.ts
+++ b/src/slickgrid-react/models/slickgridReactInstance.interface.ts
@@ -5,7 +5,7 @@ import type {
   GridEventService,
   GridService,
   GridStateService,
-  GroupingAndColspanService,
+  HeaderGroupingService,
   PaginationService,
   ResizerService,
   SlickDataView,
@@ -53,8 +53,11 @@ export interface SlickgridReactInstance {
   /** Grid State Service */
   gridStateService: GridStateService;
 
+  /** @deprecated @use `headerGroupingService` */
+  groupingService: HeaderGroupingService;
+
   /** Grouping (and colspan) Service */
-  groupingService: GroupingAndColspanService;
+  headerGroupingService: HeaderGroupingService;
 
   /** Pagination Service (allows you to programmatically go to first/last page, etc...) */
   paginationService?: PaginationService;