From cef8273fe300f130876e2ef7daa179ae0171f4f9 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Thu, 6 Feb 2025 16:15:58 +0100
Subject: [PATCH 01/47] feat: table groups

---
 src/app/components/table/table.component.html |   9 +-
 src/app/services/invert-filter.service.ts     | 164 ++++++++++++++++++
 src/app/sessions/index.component.ts           |   2 +
 .../services/sessions-data.service.ts         |  11 ++
 src/app/types/groups.ts                       |  14 ++
 src/app/types/services/data-filter.service.ts |   6 +-
 6 files changed, 203 insertions(+), 3 deletions(-)
 create mode 100644 src/app/services/invert-filter.service.ts
 create mode 100644 src/app/types/groups.ts

diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index 825bf0d5f..b24948fcf 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -1,9 +1,13 @@
 <app-table-container>
-  <table mat-table [trackBy]="trackBy" matSort [matSortActive]="options.sort.active.toString()"
+  <table mat-table [trackBy]="trackBy" matSort [matSortActive]="options.sort.active.toString()" multiTemplateDataRows
     [matSortDirection]="options.sort.direction" matSortDisableClear cdkDropList cdkDropListOrientation="horizontal"
     [cdkDropListDisabled]="lockColumns" (cdkDropListDropped)="onDrop($event)" [dataSource]="data" i18n-aria-label
     aria-label="Data Table">
 
+    <ng-container matColumnDef="test">
+      <td mat-cell [attr.colspan]="columns.length" *matCellDef="let element">test</td>
+    </ng-container>
+
     @for (column of columns; track column.key) {
     <ng-container [matColumnDef]="column.key.toString()">
       <!-- Header -->
@@ -35,7 +39,8 @@
     </tr>
 
     <tr mat-header-row *matHeaderRowDef="columnsKeys; sticky: true"></tr>
-    <tr mat-row *matRowDef="let row; columns: columnsKeys;"></tr>
+    <tr mat-row *matRowDef="let row; columns: columnsKeys;" ></tr>
+    <tr mat-row *matRowDef="let row; columns: ['test']"></tr>
   </table>
 
   <mat-paginator [length]="total" [pageIndex]="options.pageIndex" [pageSize]="options.pageSize"
diff --git a/src/app/services/invert-filter.service.ts b/src/app/services/invert-filter.service.ts
new file mode 100644
index 000000000..968fd4c76
--- /dev/null
+++ b/src/app/services/invert-filter.service.ts
@@ -0,0 +1,164 @@
+import { FilterArrayOperator, FilterDateOperator, FilterDurationOperator, FilterNumberOperator, FilterStatusOperator, FilterStringOperator } from '@aneoconsultingfr/armonik.api.angular';
+import { inject, Injectable } from '@angular/core';
+import { Filter, FilterOperators, FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { DataFilterService } from '@app/types/services/data-filter.service';
+
+@Injectable()
+export class InvertFilterService<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
+  private readonly dataFilterService = inject(DataFilterService<F, FO>);
+
+  private readonly emptyFilter: Filter<F, FO> = {
+    for: null,
+    field: null,
+    operator: null,
+    value: null,
+  };
+
+  invert(filters: FiltersOr<F, FO>): FiltersOr<F, FO> {
+    return filters.map((filterAnd) => filterAnd.map((filter) => this.invertFilter(filter)));
+  }
+
+  private invertFilter(filter: Filter<F,FO>) {
+    const type = this.dataFilterService.getType(filter);
+    switch (type) {
+    case 'string':
+      return this.invertStringFilter(filter);
+    case 'number':
+      return this.invertNumberFilter(filter);
+    case 'array':
+      return this.invertArrayFilter(filter);
+    case 'boolean':
+      return this.invertBooleanFilter(filter);
+    case 'date':
+      return this.invertDateFilter(filter);
+    case 'duration':
+      return this.invertDurationFilter(filter);
+    case 'status':
+      return this.invertStatusFilter(filter);
+    default:
+      return {
+        ...this.emptyFilter
+      };
+    }
+  }
+
+  private updateOperator(filter: Filter<F, FO>, operator: FilterOperators): Filter<F, FO> {
+    return {
+      ...filter,
+      operator
+    };
+  }
+  
+  private invertStringFilter(filter: Filter<F, FO>) {
+    switch(filter.operator) {
+    case FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS:
+      return this.updateOperator(filter, FilterStringOperator.FILTER_STRING_OPERATOR_NOT_CONTAINS);
+    case FilterStringOperator.FILTER_STRING_OPERATOR_NOT_CONTAINS:
+      return this.updateOperator(filter, FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS);
+    case FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL:
+      return this.updateOperator(filter, FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL);
+    case FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL:
+      return this.updateOperator(filter, FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL);
+    default: 
+      return {
+        ...this.emptyFilter
+      };
+    }
+  }
+
+  private invertNumberFilter(filter: Filter<F, FO>) {
+    switch(filter.operator) {
+    case FilterNumberOperator.FILTER_NUMBER_OPERATOR_EQUAL:
+      return this.updateOperator(filter, FilterNumberOperator.FILTER_NUMBER_OPERATOR_NOT_EQUAL);
+    case FilterNumberOperator.FILTER_NUMBER_OPERATOR_NOT_EQUAL:
+      return this.updateOperator(filter, FilterNumberOperator.FILTER_NUMBER_OPERATOR_EQUAL);
+    case FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN:
+      return this.updateOperator(filter, FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN_OR_EQUAL);
+    case FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN_OR_EQUAL:
+      return this.updateOperator(filter, FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN);
+    case FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN:
+      return this.updateOperator(filter, FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN_OR_EQUAL);
+    case FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN_OR_EQUAL:
+      return this.updateOperator(filter, FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN);
+    default: 
+      return {
+        ...this.emptyFilter
+      };
+    }
+  }
+
+  private invertDateFilter(filter: Filter<F, FO>) {
+    switch(filter.operator) {
+    case FilterDateOperator.FILTER_DATE_OPERATOR_EQUAL:
+      return this.updateOperator(filter, FilterDateOperator.FILTER_DATE_OPERATOR_NOT_EQUAL);
+    case FilterDateOperator.FILTER_DATE_OPERATOR_NOT_EQUAL:
+      return this.updateOperator(filter, FilterDateOperator.FILTER_DATE_OPERATOR_EQUAL);
+    case FilterDateOperator.FILTER_DATE_OPERATOR_AFTER:
+      return this.updateOperator(filter, FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE_OR_EQUAL);
+    case FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL:
+      return this.updateOperator(filter, FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE);
+    case FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE:
+      return this.updateOperator(filter, FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL);
+    case FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE_OR_EQUAL:
+      return this.updateOperator(filter, FilterDateOperator.FILTER_DATE_OPERATOR_AFTER);
+    default: 
+      return {
+        ...this.emptyFilter
+      }; 
+    }
+  }
+
+  private invertArrayFilter(filter: Filter<F, FO>) {
+    switch(filter.operator as FilterArrayOperator) {
+    case FilterArrayOperator.FILTER_ARRAY_OPERATOR_CONTAINS:
+      return this.updateOperator(filter, FilterArrayOperator.FILTER_ARRAY_OPERATOR_NOT_CONTAINS);
+    case FilterArrayOperator.FILTER_ARRAY_OPERATOR_NOT_CONTAINS:
+      return this.updateOperator(filter, FilterArrayOperator.FILTER_ARRAY_OPERATOR_CONTAINS);
+    default:
+      return {
+        ...this.emptyFilter
+      };
+    }
+  }
+
+  private invertStatusFilter(filter: Filter<F, FO>) {
+    switch(filter.operator as FilterStatusOperator) {
+    case FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL:
+      return this.updateOperator(filter, FilterStatusOperator.FILTER_STATUS_OPERATOR_NOT_EQUAL);
+    case FilterStatusOperator.FILTER_STATUS_OPERATOR_NOT_EQUAL:
+      return this.updateOperator(filter, FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL);
+    default:
+      return {
+        ...this.emptyFilter
+      };
+    }
+  }
+
+  private invertBooleanFilter(filter: Filter<F, FO>) {
+    return {
+      ...filter,
+      value: !filter.value
+    };
+  }
+
+  private invertDurationFilter(filter: Filter<F, FO>) {
+    switch(filter.operator as FilterDurationOperator) {
+    case FilterDurationOperator.FILTER_DURATION_OPERATOR_EQUAL:
+      return this.updateOperator(filter, FilterDurationOperator.FILTER_DURATION_OPERATOR_NOT_EQUAL);
+    case FilterDurationOperator.FILTER_DURATION_OPERATOR_NOT_EQUAL:
+      return this.updateOperator(filter, FilterDurationOperator.FILTER_DURATION_OPERATOR_EQUAL);
+    case FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN:
+      return this.updateOperator(filter, FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN_OR_EQUAL);
+    case FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN_OR_EQUAL:
+      return this.updateOperator(filter, FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN);
+    case FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN:
+      return this.updateOperator(filter, FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN_OR_EQUAL);
+    case FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN_OR_EQUAL:
+      return this.updateOperator(filter, FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN);
+    default:
+      return {
+        ...this.emptyFilter
+      };
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/sessions/index.component.ts b/src/app/sessions/index.component.ts
index a31a11cb7..228cc732e 100644
--- a/src/app/sessions/index.component.ts
+++ b/src/app/sessions/index.component.ts
@@ -23,6 +23,7 @@ import { TableIndexActionsToolbarComponent } from '@components/table-index-actio
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { QueryParamsService } from '@services/query-params.service';
 import { ShareUrlService } from '@services/share-url.service';
@@ -71,6 +72,7 @@ import { SessionRaw } from './types';
     NotificationService,
     TasksGrpcService,
     GrpcSortFieldService,
+    InvertFilterService,
   ],
   imports: [
     PageHeaderComponent,
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index df89c0cdf..a692af8ce 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -5,9 +5,11 @@ import { TaskOptions, TaskSummaryFilters } from '@app/tasks/types';
 import { Scope } from '@app/types/config';
 import { ColumnKey, SessionData } from '@app/types/data';
 import { Filter, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { AbstractTableDataService } from '@app/types/services/table-data.service';
 import { Duration, Timestamp } from '@ngx-grpc/well-known-types';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { Subject, map, mergeAll } from 'rxjs';
 import { SessionsGrpcService } from './sessions-grpc.service';
 import { SessionRaw } from '../types';
@@ -15,9 +17,17 @@ import { SessionRaw } from '../types';
 @Injectable()
 export class SessionsDataService extends AbstractTableDataService<SessionRaw, SessionRawEnumField, TaskOptions, TaskOptionEnumField> {
   readonly grpcService = inject(SessionsGrpcService);
+  readonly invertFiltersService: InvertFilterService<SessionRawEnumField, TaskOptionEnumField> = inject(InvertFilterService);
 
   scope: Scope = 'sessions';
 
+  groupsConditions: GroupConditions<SessionRawEnumField, TaskOptionEnumField>[] = [
+    {
+      name: 'Group 1',
+      conditions: []
+    }
+  ];
+
   constructor() {
     super();
     this.subscribeToDurationSubjects();
@@ -54,6 +64,7 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
 
   override preparefilters(): FiltersOr<SessionRawEnumField, TaskOptionEnumField> {
     const filtersOr = super.preparefilters();
+    this.groupsConditions.forEach((groupConditions) => (filtersOr.push(...this.invertFiltersService.invert(groupConditions.conditions))));
     if(this.isDurationDisplayed && this.options.sort.active === 'duration') {
       const date = new Date();
       date.setDate(date.getDate() - 3);
diff --git a/src/app/types/groups.ts b/src/app/types/groups.ts
new file mode 100644
index 000000000..9b9b660e6
--- /dev/null
+++ b/src/app/types/groups.ts
@@ -0,0 +1,14 @@
+import { TaskOptions } from '@app/tasks/types';
+import { ArmonikData, DataRaw } from './data';
+import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from './filters';
+
+export type GroupConditions<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
+  name: string;
+  conditions: FiltersOr<F, FO>,
+}
+
+export type Group<T extends DataRaw, O extends TaskOptions | null = null> = {
+  name: string;
+  opened: boolean;
+  data: ArmonikData<T, O>[]
+}
\ No newline at end of file
diff --git a/src/app/types/services/data-filter.service.ts b/src/app/types/services/data-filter.service.ts
index 9c9335030..166f7fe77 100644
--- a/src/app/types/services/data-filter.service.ts
+++ b/src/app/types/services/data-filter.service.ts
@@ -9,7 +9,7 @@ import { FiltersCacheService } from '@services/filters-cache.service';
 import { TableService } from '@services/table.service';
 import { Scope } from '../config';
 import { FilterDefinition } from '../filter-definition';
-import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '../filters';
+import { Filter, FiltersEnums, FiltersOptionsEnums, FiltersOr } from '../filters';
 import { Status, StatusService } from '../status';
 
 export type FilterFor = TaskFilterFor | ResultFilterFor | SessionFilterFor | PartitionFilterFor | ApplicationFilterFor;
@@ -55,6 +55,10 @@ export abstract class DataFilterService<F extends FiltersEnums, O extends Filter
     return this.tableService.restoreShowFilters(`${this.scope}-show-filters`) ?? true;
   }
 
+  getType(filter: Filter<F, O>) {
+    return this.filtersDefinitions.find(definition => definition.field === filter.field && definition.for === filter.for)?.type;
+  } 
+
   abstract retrieveLabel(filterFor: FilterFor, filterField: FilterField): string;
   abstract retrieveField(filterField: string): FilterField;
 }

From 02d8f8a085246bc7a095d567d72f73bdcd275991 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Fri, 7 Feb 2025 09:58:22 +0100
Subject: [PATCH 02/47] feat: group fetching data

---
 .../services/sessions-data.service.ts         | 71 +++++++++++++++++--
 src/app/types/services/table-data.service.ts  |  9 ++-
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index a692af8ce..8deac07fa 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -1,36 +1,55 @@
 import { FilterDateOperator, FilterStringOperator, ListSessionsResponse, ResultRawEnumField, SessionRawEnumField, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { Injectable, inject } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { Params } from '@angular/router';
 import { TaskOptions, TaskSummaryFilters } from '@app/tasks/types';
 import { Scope } from '@app/types/config';
 import { ColumnKey, SessionData } from '@app/types/data';
 import { Filter, FiltersOr } from '@app/types/filters';
-import { GroupConditions } from '@app/types/groups';
+import { Group, GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { AbstractTableDataService } from '@app/types/services/table-data.service';
 import { Duration, Timestamp } from '@ngx-grpc/well-known-types';
 import { InvertFilterService } from '@services/invert-filter.service';
-import { Subject, map, mergeAll } from 'rxjs';
+import { Subject, Subscription, map, mergeAll, switchMap } from 'rxjs';
 import { SessionsGrpcService } from './sessions-grpc.service';
 import { SessionRaw } from '../types';
 
 @Injectable()
-export class SessionsDataService extends AbstractTableDataService<SessionRaw, SessionRawEnumField, TaskOptions, TaskOptionEnumField> {
+export class SessionsDataService extends AbstractTableDataService<SessionRaw, SessionRawEnumField, TaskOptions, TaskOptionEnumField> implements OnDestroy {
   readonly grpcService = inject(SessionsGrpcService);
   readonly invertFiltersService: InvertFilterService<SessionRawEnumField, TaskOptionEnumField> = inject(InvertFilterService);
 
   scope: Scope = 'sessions';
 
+  groups: Group<SessionRaw, TaskOptions>[] = [];
+  private readonly groupsSubscriptions: Map<string, Subscription> = new Map();
+
   groupsConditions: GroupConditions<SessionRawEnumField, TaskOptionEnumField>[] = [
     {
       name: 'Group 1',
-      conditions: []
+      conditions: [
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: '7ce2655a-b811-4845-802a-9969cf92ff68'
+          }
+        ]
+      ]
     }
   ];
 
   constructor() {
     super();
     this.subscribeToDurationSubjects();
+    this.setGroups();
+  }
+
+  ngOnDestroy(): void {
+    this.onDestroy();
+    this.groupsSubscriptions.forEach((groupSubscription) => groupSubscription.unsubscribe());
+    this.groupsSubscriptions.clear();
   }
 
   computeGrpcData(entries: ListSessionsResponse): SessionRaw[] | undefined {
@@ -189,6 +208,48 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     ];
   }
 
+  initGroup(groupCondition: GroupConditions<SessionRawEnumField, TaskOptionEnumField>) {
+    const group: Group<SessionRaw, TaskOptions> = {
+      name: groupCondition.name,
+      opened: false,
+      data: []
+    };
+    const groupSubscription = this.refresh$.pipe(
+      switchMap(() => this.grpcService.list$(this.options, groupCondition.conditions)),
+      map((data) => this.computeGrpcData(data)),
+      map((data) => {
+        if (data) {
+          return data.map(entry => this.createNewLine(entry));
+        }
+        return undefined;
+      })
+    ).subscribe((data) => {
+      if (data) {
+        group.data = data;
+        console.log(data);
+      }
+    });
+
+    this.groupsSubscriptions.set(groupCondition.name, groupSubscription);
+  }
+
+  setGroups() {
+    this.groupsConditions.forEach((g) => this.initGroup(g));
+  }
+
+  addGroup(groupCondition: GroupConditions<SessionRawEnumField, TaskOptionEnumField>) {
+    this.groupsConditions.push(groupCondition);
+    this.initGroup(groupCondition);
+  }
+
+  removeGroup(groupName: string) {
+    const subscription = this.groupsSubscriptions.get(groupName);
+    if (subscription) {
+      subscription.unsubscribe();
+      this.groupsSubscriptions.delete(groupName);
+    }
+  }
+
   // Duration computation
   isDurationDisplayed = false;
   private dataRaw: SessionRaw[];
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index 9b3cca2a2..aebd988f5 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -7,7 +7,7 @@ import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
 import { NotificationService } from '@services/notification.service';
-import { Subject, catchError, map, of, switchMap } from 'rxjs';
+import { Subject, Subscription, catchError, map, of, switchMap } from 'rxjs';
 import { GrpcTableService } from './grpcService';
 import { Scope } from '../config';
 
@@ -26,6 +26,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   readonly loading = signal<boolean>(false);
   readonly total = signal<number>(0);
   readonly data = signal<ArmonikData<T, O>[]>([]);
+  protected dataSubscription: Subscription;
 
   filters: FiltersOr<F, FO> = [];
   options: ListOptions<T, O>;
@@ -57,7 +58,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
    * Catch errors if needed.
    */
   private subscribeToGrpcList() {
-    this.refresh$.pipe(
+    this.dataSubscription = this.refresh$.pipe(
       switchMap(() => {
         this.loading.set(true);
 
@@ -131,6 +132,10 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   warning(message: string) {
     this.notificationService.warning(message);
   }
+
+  protected onDestroy() {
+    this.dataSubscription.unsubscribe();
+  }
   
   /**
    * Transform a ListGrpcResponse into a readable DataRaw array.

From 77630f5b727572c2cf2f9edbdc8fd6363a8c144d Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Fri, 7 Feb 2025 14:03:19 +0100
Subject: [PATCH 03/47] chore: update display in table

---
 src/app/components/table/table.component.html | 36 ++++++++++---------
 src/app/components/table/table.component.ts   | 22 +++++++++---
 .../sessions/components/table.component.html  |  2 +-
 .../sessions/components/table.component.ts    |  5 +--
 .../services/sessions-data.service.ts         |  5 +--
 src/app/types/data.ts                         |  2 +-
 6 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index b24948fcf..58725eb43 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -1,13 +1,9 @@
 <app-table-container>
-  <table mat-table [trackBy]="trackBy" matSort [matSortActive]="options.sort.active.toString()" multiTemplateDataRows
+  <table mat-table [trackBy]="trackBy" matSort [matSortActive]="options.sort.active.toString()"
     [matSortDirection]="options.sort.direction" matSortDisableClear cdkDropList cdkDropListOrientation="horizontal"
     [cdkDropListDisabled]="lockColumns" (cdkDropListDropped)="onDrop($event)" [dataSource]="data" i18n-aria-label
     aria-label="Data Table">
 
-    <ng-container matColumnDef="test">
-      <td mat-cell [attr.colspan]="columns.length" *matCellDef="let element">test</td>
-    </ng-container>
-
     @for (column of columns; track column.key) {
     <ng-container [matColumnDef]="column.key.toString()">
       <!-- Header -->
@@ -17,19 +13,26 @@
           (statusesChange)="onPersonnalizeTasksByStatus()" />
       </th>
       <!-- Columns -->
-      @if (column.type !== 'actions') {
-      <td mat-cell *matCellDef="let element" appNoWrap>
-        <app-table-cell [column]="column" [element]="element" [statusesService]="statusesService"
-          [statusesGroups]="statusesGroups" [isSelected]="isSelected(element.raw)"
-          (changeSelection)="toggleRow(element.raw)" />
-      </td>
-      } @else {
-      <td mat-cell *matCellDef="let element" appNoWrap>
-        <app-table-actions [actions]="actions" [element]="element" />
-      </td>
-      }
+      <ng-container *matCellDef="let element" >
+        @if (isData(element)) {
+          @if (column.type !== 'actions') {
+            <td mat-cell appNoWrap>
+              <app-table-cell [column]="column" [element]="element" [statusesService]="statusesService"
+              [statusesGroups]="statusesGroups" [isSelected]="isSelected(element.raw)"
+              (changeSelection)="toggleRow(element.raw)" />
+            </td>
+          } @else {
+            <td mat-cell appNoWrap>
+              <app-table-actions [actions]="actions" [element]="element" />
+            </td>
+          }
+        }
+      </ng-container>
     </ng-container>
     }
+    <ng-container>
+      @if (!isData(element)) {}
+    </ng-container>
 
     <!-- Empty -->
     <tr *matNoDataRow>
@@ -40,7 +43,6 @@
 
     <tr mat-header-row *matHeaderRowDef="columnsKeys; sticky: true"></tr>
     <tr mat-row *matRowDef="let row; columns: columnsKeys;" ></tr>
-    <tr mat-row *matRowDef="let row; columns: ['test']"></tr>
   </table>
 
   <mat-paginator [length]="total" [pageIndex]="options.pageIndex" [pageSize]="options.pageSize"
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index aa930eb71..fc9b42088 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -8,6 +8,7 @@ import { TasksStatusesGroup } from '@app/dashboard/types';
 import { TaskOptions } from '@app/tasks/types';
 import { TableColumn } from '@app/types/column.type';
 import { ArmonikData, ColumnKey, DataRaw } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { Status, StatusService } from '@app/types/status';
 import { ActionTable } from '@app/types/table';
@@ -51,6 +52,8 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
     }
   }
 
+  @Input({ required: false }) groups: Group<T, O>[];
+
   @Input({ required: true }) total: number;
 
   @Input({ required: true }) options: ListOptions<T, O>;
@@ -63,7 +66,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   @Input({ required: false }) dataComparator: ((a: T, b: T) => boolean) | undefined;
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  @Input({ required: false }) trackBy(index: number, item: ArmonikData<T, O>): number | string {
+  @Input({ required: false }) trackBy(index: number, item: ArmonikData<T, O> |Group<T, O>): number | string {
     return index;
   }
 
@@ -80,8 +83,8 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   private _columnsKeys: ColumnKey<T, O>[];
   private _isAllSelected: boolean = false;
 
-  get data(): ArmonikData<T, O>[] {
-    return this._data;
+  get data(): (ArmonikData<T, O> | Group<T, O>)[] {
+    return [...this.groups, ...this._data];
   }
 
   get columns(): TableColumn<T, O>[] {
@@ -109,7 +112,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
     });
 
     this.paginator.page.subscribe(() => {
-      if (this.options.pageSize > this.paginator.pageSize) this.data = this.data.slice(0, this.paginator.pageSize);
+      if (this.options.pageSize > this.paginator.pageSize) this._data = this._data.slice(0, this.paginator.pageSize);
       this.options.pageIndex = this.paginator.pageIndex;
       this.options.pageSize = this.paginator.pageSize;
       this.optionsChange.emit();
@@ -147,7 +150,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
       this.selection.clear();
       this._isAllSelected = false;
     } else {
-      this.selection.select(...(this.data.map(d => d.raw)));
+      this.selection.select(...(this._data.map(d => d.raw)));
       this._isAllSelected = true;
     }
     this.emitSelectionChange();
@@ -165,4 +168,13 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   onPersonnalizeTasksByStatus(): void {
     this.personnalizeTasksByStatus.emit();
   }
+
+  isData(element: ArmonikData<T, O> | Group<T, O>) {
+    return (element as ArmonikData<T, O>).raw !== undefined && (element as Group<T, O>).name === undefined;
+  }
+
+  test(e: unknown) {
+    console.log(e);
+    return '';
+  }
 }
\ No newline at end of file
diff --git a/src/app/sessions/components/table.component.html b/src/app/sessions/components/table.component.html
index b2f394052..d3ab4e45d 100644
--- a/src/app/sessions/components/table.component.html
+++ b/src/app/sessions/components/table.component.html
@@ -1,3 +1,3 @@
-<app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [total]="total()" [options]="options" [lockColumns]="lockColumns"
+<app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [groups]="tableDataService.groups" [total]="total()" [options]="options" [lockColumns]="lockColumns"
   [actions]="actions" [statusesService]="statusesService" [statusesGroups]="statusesGroups"
   (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()" (personnalizeTasksByStatus)="personalizeTasksByStatus()" />
diff --git a/src/app/sessions/components/table.component.ts b/src/app/sessions/components/table.component.ts
index b30913cd8..eaee5f645 100644
--- a/src/app/sessions/components/table.component.ts
+++ b/src/app/sessions/components/table.component.ts
@@ -159,7 +159,8 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
     this.tableDataService.onDelete(sessionId);
   }
 
-  trackBy(index: number, item: ArmonikData<SessionRaw, TaskOptions>) {
-    return item.raw.sessionId;
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  trackBy(index: number, _item: ArmonikData<SessionRaw, TaskOptions>) {
+    return index;
   }
 }
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index 8deac07fa..7b79e0914 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -33,7 +33,7 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
             field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
             for: 'root',
             operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
-            value: '7ce2655a-b811-4845-802a-9969cf92ff68'
+            value: '0a773a41-0668-4af6-81db-32a50a5c978c'
           }
         ]
       ]
@@ -226,10 +226,11 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     ).subscribe((data) => {
       if (data) {
         group.data = data;
-        console.log(data);
       }
     });
 
+    this.groups.push(group);
+
     this.groupsSubscriptions.set(groupCondition.name, groupSubscription);
   }
 
diff --git a/src/app/types/data.ts b/src/app/types/data.ts
index df2650d4e..0939eb3fe 100644
--- a/src/app/types/data.ts
+++ b/src/app/types/data.ts
@@ -17,7 +17,7 @@ export type DataRaw = SessionRaw | ApplicationRaw | PartitionRaw | ResultRaw | T
 export type CustomColumn = `options.options.${string}`;
 
 export interface ArmonikData<T extends DataRaw, O extends TaskOptions | null = null> {
-  raw: T,
+  raw: T;
   queryParams?: Map<ColumnKey<T, O>, Params>;
 }
 

From 922e2ed27894730117630de7ddd6a458fc06c603 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 10 Feb 2025 16:11:49 +0100
Subject: [PATCH 04/47] feat: working groups

---
 .../table/group/group.component.css           | 47 +++++++++++
 .../table/group/group.component.html          | 41 +++++++++
 .../table/group/group.component.spec.ts       |  0
 .../components/table/group/group.component.ts | 84 +++++++++++++++++++
 .../group-tasks-by-status.component.css       |  0
 .../group-tasks-by-status.component.html      |  1 +
 .../group-tasks-by-status.component.spec.ts   |  0
 .../group-tasks-by-status.component.ts        | 36 ++++++++
 src/app/components/table/table.component.html | 16 +++-
 src/app/components/table/table.component.ts   | 13 ++-
 .../view-tasks-by-status.component.ts         | 27 +++---
 src/app/services/icons.service.ts             |  1 +
 .../services/sessions-data.service.ts         | 16 +++-
 src/app/types/groups.ts                       |  1 +
 14 files changed, 256 insertions(+), 27 deletions(-)
 create mode 100644 src/app/components/table/group/group.component.css
 create mode 100644 src/app/components/table/group/group.component.html
 create mode 100644 src/app/components/table/group/group.component.spec.ts
 create mode 100644 src/app/components/table/group/group.component.ts
 create mode 100644 src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.css
 create mode 100644 src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html
 create mode 100644 src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
 create mode 100644 src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts

diff --git a/src/app/components/table/group/group.component.css b/src/app/components/table/group/group.component.css
new file mode 100644
index 000000000..5a4deb33a
--- /dev/null
+++ b/src/app/components/table/group/group.component.css
@@ -0,0 +1,47 @@
+.detailed-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
+
+.general-data {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  min-width: 20rem;
+}
+
+.general-actions {
+  display: flex;
+  align-items: center;
+}
+
+.group-info {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  font-weight: bolder;
+}
+
+.table-actions {
+  display: flex;
+  justify-content: space-between;
+  padding-top: 1rem;
+}
+
+app-refresh-button {
+  padding-left: 1rem;
+}
+
+mat-card {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  border-radius: 0;
+  background-color: var(--mat-sidenav-content-background-color) !important;
+}
+
+p {
+  margin: 0;
+}
\ No newline at end of file
diff --git a/src/app/components/table/group/group.component.html b/src/app/components/table/group/group.component.html
new file mode 100644
index 000000000..8072065b5
--- /dev/null
+++ b/src/app/components/table/group/group.component.html
@@ -0,0 +1,41 @@
+<section class="detailed-row">
+  <div class="general-data">
+    <div class="group-info">
+      <mat-icon [fontIcon]="getIcon('table-group')" />
+      <p>{{ group.name }}</p>
+    </div>
+    <p>
+      <span i18n>Total: </span>
+      <span>{{ group.total }}</span>
+    </p>
+  </div>
+  <div class="general-actions">
+    <app-group-tasks-by-status [groupData]="group.data" [statusesGroups]="statusesGroups" />
+    <button mat-icon-button (click)="switchView()">
+      <mat-icon [@rotateFull]="group.opened" [fontIcon]="getIcon('arrow-down')" />
+    </button>
+  </div>
+</section>
+<section [@expand]="group.opened">
+  <article class="table-actions">
+    <app-refresh-button />
+    <mat-paginator [length]="group.total" [pageIndex]="pageIndex" (page)="pageChange($event)" pageSize="1" aria-label="Select page" i18n-aria-label />
+  </article>
+  <mat-card class="table-container">
+    <table mat-table [dataSource]="group.data">
+      @for (column of displayedColumns; track $index) {
+        <ng-container [matColumnDef]="column.key.toString()">
+          <ng-container *matHeaderCellDef></ng-container>
+          <td *matCellDef="let element" mat-cell>
+            @if (column.type !== 'actions') {
+              <app-table-cell [column]="column" [element]="element" [statusesService]="statusesService" [statusesGroups]="statusesGroups" />
+            } @else {
+              <app-table-actions [actions]="actions" [element]="element" />
+            }
+          </td>
+        </ng-container>
+      }
+      <tr mat-row *matRowDef="let row; columns: columnsKeys;"></tr>
+    </table>
+  </mat-card>
+</section>
\ No newline at end of file
diff --git a/src/app/components/table/group/group.component.spec.ts b/src/app/components/table/group/group.component.spec.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/table/group/group.component.ts b/src/app/components/table/group/group.component.ts
new file mode 100644
index 000000000..d57b64f32
--- /dev/null
+++ b/src/app/components/table/group/group.component.ts
@@ -0,0 +1,84 @@
+import { animate, state, style, transition, trigger } from '@angular/animations';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { MatIconModule } from '@angular/material/icon';
+import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
+import { MatTableModule } from '@angular/material/table';
+import { TasksStatusesGroup } from '@app/dashboard/types';
+import { TaskOptions } from '@app/tasks/types';
+import { TableColumn } from '@app/types/column.type';
+import { ColumnKey, DataRaw } from '@app/types/data';
+import { Group } from '@app/types/groups';
+import { Status, StatusService } from '@app/types/status';
+import { ActionTable } from '@app/types/table';
+import { IconsService } from '@services/icons.service';
+import { RefreshButtonComponent } from '../../refresh-button.component';
+import { GroupTasksByStatusComponent } from '../grouped-tasks-by-status/group-tasks-by-status.component';
+import { TableActionsComponent } from '../table-actions.component';
+import { TableCellComponent } from '../table-cell.component';
+
+@Component({
+  selector: 'app-table-group',
+  templateUrl: 'group.component.html',
+  styleUrl: 'group.component.css',
+  standalone: true,
+  imports: [
+    MatButtonModule,
+    MatIconModule,
+    MatTableModule,
+    MatPaginatorModule,
+    MatCardModule,
+    TableCellComponent,
+    TableActionsComponent,
+    RefreshButtonComponent,
+    GroupTasksByStatusComponent
+  ],
+  providers: [
+    IconsService
+  ],
+  animations: [
+    trigger('rotateFull', [
+      state('true', style({ transform: 'rotate(-180deg)' })),
+      state('false', style({ transform: 'rotate(0deg)' })),
+      transition('true <=> false', [animate('125ms ease-in')])
+    ]),
+    trigger('expand', [
+      state('false', style({ 'height': '0' })),
+      state('true', style({})),
+      transition('true <=> false', [animate('500ms cubic-bezier(0.4, 0.0, 0.2, 1)')])
+    ])
+  ]
+})
+export class TableGroupComponent<T extends DataRaw, S extends Status, O extends TaskOptions | null = null> {
+  @Input({ required: true }) group: Group<T, O>;
+  @Input({ required: true }) set columns(entry: TableColumn<T, O>[]) {
+    this.displayedColumns = entry;
+    this.columnsKeys = entry.map(column => column.key);
+  }
+
+  @Input({ required: false }) actions: ActionTable<T, O>[];
+  @Input({ required: false }) statusesService: StatusService<S>;
+  @Input({ required: false }) statusesGroups: TasksStatusesGroup[];
+
+  columnsKeys: ColumnKey<T, O>[];
+  displayedColumns: TableColumn<T, O>[];
+
+  @Output() page = new EventEmitter<number>();
+
+  private readonly iconsService = inject(IconsService);
+
+  pageIndex = 0;
+
+  getIcon(name: string) {
+    return this.iconsService.getIcon(name);
+  }
+
+  switchView() {
+    this.group.opened = !this.group.opened;
+  }
+
+  pageChange(event: PageEvent) {
+    this.page.emit(event.pageIndex);
+  }
+}
\ No newline at end of file
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.css b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html
new file mode 100644
index 000000000..9d14ba291
--- /dev/null
+++ b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html
@@ -0,0 +1 @@
+<app-count-tasks-by-status [refresh]="refresh" [queryParams]="queryParams" [filters]="filters" [statusesGroups]="statusesGroups" />
\ No newline at end of file
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
new file mode 100644
index 000000000..c9f0875b2
--- /dev/null
+++ b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
@@ -0,0 +1,36 @@
+import { Component, Input } from '@angular/core';
+import { TasksStatusesGroup } from '@app/dashboard/types';
+import { TaskOptions, TaskSummaryFilters } from '@app/tasks/types';
+import { ApplicationData, ArmonikData, DataRaw, PartitionData, SessionData } from '@app/types/data';
+import { CountTasksByStatusComponent } from '@components/count-tasks-by-status.component';
+import { Subject } from 'rxjs';
+
+@Component({
+  selector: 'app-group-tasks-by-status',
+  templateUrl: 'group-tasks-by-status.component.html',
+  styleUrl: 'group-tasks-by-status.component.css',
+  standalone: true,
+  imports: [
+    CountTasksByStatusComponent,
+  ]
+})
+export class GroupTasksByStatusComponent<T extends DataRaw, O extends TaskOptions | null = null> {
+  @Input({ required: true }) set groupData(entry: ArmonikData<T, O>[]) {
+    this.filters = [];
+    this.queryParams = {};
+    const groupData = entry as unknown as (SessionData | ApplicationData | PartitionData)[];
+    groupData.forEach((data) => {
+      this.filters.push(...data.filters);
+    });
+    groupData.forEach((data, index) => {
+      const keys = Object.keys(data.queryTasksParams);
+      keys.forEach((key) => (this.queryParams[`${index}${key.slice(1)}`] = data.queryTasksParams[key]));
+    });
+  }
+
+  @Input({ required: true }) statusesGroups: TasksStatusesGroup[];
+
+  filters: TaskSummaryFilters;
+  queryParams: Record<string, string>;
+  refresh = new Subject<void>();
+}
\ No newline at end of file
diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index 58725eb43..b60489533 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -4,6 +4,17 @@
     [cdkDropListDisabled]="lockColumns" (cdkDropListDropped)="onDrop($event)" [dataSource]="data" i18n-aria-label
     aria-label="Data Table">
 
+    <ng-container matColumnDef="group">
+      <ng-container *matHeaderCellDef></ng-container>
+      <ng-container *matCellDef="let element">
+        @if (!isData(element)) {
+          <td mat-cell [attr.colspan]="columns.length" style="padding: 0;">
+            <app-table-group [group]="element" [columns]="columns" [actions]="actions" [statusesService]="statusesService" [statusesGroups]="statusesGroups"/>
+          </td>
+        }
+      </ng-container>
+    </ng-container>
+
     @for (column of columns; track column.key) {
     <ng-container [matColumnDef]="column.key.toString()">
       <!-- Header -->
@@ -30,9 +41,6 @@
       </ng-container>
     </ng-container>
     }
-    <ng-container>
-      @if (!isData(element)) {}
-    </ng-container>
 
     <!-- Empty -->
     <tr *matNoDataRow>
@@ -42,7 +50,7 @@
     </tr>
 
     <tr mat-header-row *matHeaderRowDef="columnsKeys; sticky: true"></tr>
-    <tr mat-row *matRowDef="let row; columns: columnsKeys;" ></tr>
+    <tr mat-row *matRowDef="let row; columns: columnsKeys;"></tr>
   </table>
 
   <mat-paginator [length]="total" [pageIndex]="options.pageIndex" [pageSize]="options.pageSize"
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index fc9b42088..3517334bd 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -13,6 +13,7 @@ import { ListOptions } from '@app/types/options';
 import { Status, StatusService } from '@app/types/status';
 import { ActionTable } from '@app/types/table';
 import { TableContainerComponent } from '@components/table-container.component';
+import { TableGroupComponent } from './group/group.component';
 import { TableActionsComponent } from './table-actions.component';
 import { TableCellComponent } from './table-cell.component';
 import { TableColumnHeaderComponent } from './table-column-header.component';
@@ -32,6 +33,7 @@ import { TableEmptyDataComponent } from './table-empty-data.component';
     MatSortModule,
     TableActionsComponent,
     TableContainerComponent,
+    TableGroupComponent,
   ],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
@@ -66,7 +68,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   @Input({ required: false }) dataComparator: ((a: T, b: T) => boolean) | undefined;
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  @Input({ required: false }) trackBy(index: number, item: ArmonikData<T, O> |Group<T, O>): number | string {
+  @Input({ required: false }) trackBy(index: number, item: ArmonikData<T, O> | Group<T, O>): number | string {
     return index;
   }
 
@@ -84,7 +86,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   private _isAllSelected: boolean = false;
 
   get data(): (ArmonikData<T, O> | Group<T, O>)[] {
-    return [...this.groups, ...this._data];
+    return [...(this.groups ?? []), ...this._data];
   }
 
   get columns(): TableColumn<T, O>[] {
@@ -92,7 +94,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   }
 
   get columnsKeys(): ColumnKey<T, O>[] {
-    return this._columnsKeys;
+    return [...this._columnsKeys, 'group'] as ColumnKey<T, O>[];
   }
 
   get isAllSelected(): boolean {
@@ -172,9 +174,4 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   isData(element: ArmonikData<T, O> | Group<T, O>) {
     return (element as ArmonikData<T, O>).raw !== undefined && (element as Group<T, O>).name === undefined;
   }
-
-  test(e: unknown) {
-    console.log(e);
-    return '';
-  }
 }
\ No newline at end of file
diff --git a/src/app/components/view-tasks-by-status.component.ts b/src/app/components/view-tasks-by-status.component.ts
index 2bc872d41..1ea963476 100644
--- a/src/app/components/view-tasks-by-status.component.ts
+++ b/src/app/components/view-tasks-by-status.component.ts
@@ -14,7 +14,7 @@ import { SpinnerComponent } from './spinner.component';
   @if (loading) {
     <app-spinner />
   } @else {
-    @for (group of statusesGroups; track group.name) {
+    @for (group of groups; track group.name) {
       <a mat-button
         [matTooltip]="group.name"
         [routerLink]="['/tasks']"
@@ -45,22 +45,23 @@ import { SpinnerComponent } from './spinner.component';
 })
 export class ViewTasksByStatusComponent {
   @Input({ required: true }) loading = true;
-  @Input({ required: true }) defaultQueryParams: Record<string, string> = {};
-
-  @Input() set statusesGroups(entries: TasksStatusesGroup[]) {
-    this._statusesGroups = entries.map(group => this.completeGroup(group));
+  @Input({ required: true }) set defaultQueryParams(entry: Record<string, string>) {
+    this.queryParams = entry;
+    this.groups.forEach((group) => group.queryParams = this.createQueryParams(group));
   }
 
-  private _statusesGroups: TasksStatusesGroup[] = [];
+  private queryParams: Record<string, string> = {};
 
-  get statusesGroups(): TasksStatusesGroup[] {
-    return this._statusesGroups;
+  @Input() set statusesGroups(entries: TasksStatusesGroup[]) {
+    this.groups = entries.map(group => this.completeGroup(group));
   }
 
+  groups: TasksStatusesGroup[] = [];
+
   @Input() set statusesCount(entries: StatusCount[] | null) {
-    this.statusesGroups.forEach(group => group.statusCount = 0);
+    this.groups.forEach(group => group.statusCount = 0);
     entries?.forEach((entry) => {
-      this.statusesGroups.forEach(group => {
+      this.groups.forEach(group => {
         if (group.statuses.includes(entry.status) && group.statusCount !== undefined) {
           group.statusCount += entry.count;
         }
@@ -69,9 +70,9 @@ export class ViewTasksByStatusComponent {
   }
 
   createQueryParams(group: TasksStatusesGroup) {
-    const queryOrs = Object.keys(this.defaultQueryParams).map(key => key[0]).filter((key, index, self) => self.indexOf(key) === index);
-    const queryParamsKeys = Object.keys(this.defaultQueryParams);
-    const queryParamsValues = Object.values(this.defaultQueryParams);
+    const queryOrs = Object.keys(this.queryParams).map(key => key[0]).filter((key, index, self) => self.indexOf(key) === index);
+    const queryParamsKeys = Object.keys(this.queryParams);
+    const queryParamsValues = Object.values(this.queryParams);
     const taskStatusQueryParams: Record<string, string> = {};
     let orGroups = 0;
 
diff --git a/src/app/services/icons.service.ts b/src/app/services/icons.service.ts
index e9adf973a..777630813 100644
--- a/src/app/services/icons.service.ts
+++ b/src/app/services/icons.service.ts
@@ -83,6 +83,7 @@ export class IconsService {
     'processed': 'offline_pin',
     'retry': 'repeat_on',
     'pending': 'pending',
+    'table-group': 'diversity_2'
   };
 
   getIcon(name: string | null | undefined): string {
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index 7b79e0914..b344c9cbe 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -33,7 +33,15 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
             field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
             for: 'root',
             operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
-            value: '0a773a41-0668-4af6-81db-32a50a5c978c'
+            value: '335af491-ff89-4b9a-8952-8cb2e800be65'
+          }
+        ],
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: '5bb6d33a-0931-485a-a7d9-d5263218c1bd'
           }
         ]
       ]
@@ -212,11 +220,15 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     const group: Group<SessionRaw, TaskOptions> = {
       name: groupCondition.name,
       opened: false,
+      total: 0,
       data: []
     };
     const groupSubscription = this.refresh$.pipe(
       switchMap(() => this.grpcService.list$(this.options, groupCondition.conditions)),
-      map((data) => this.computeGrpcData(data)),
+      map((data) => {
+        group.total = data.total;
+        return this.computeGrpcData(data);
+      }),
       map((data) => {
         if (data) {
           return data.map(entry => this.createNewLine(entry));
diff --git a/src/app/types/groups.ts b/src/app/types/groups.ts
index 9b9b660e6..d3e3927b3 100644
--- a/src/app/types/groups.ts
+++ b/src/app/types/groups.ts
@@ -10,5 +10,6 @@ export type GroupConditions<F extends FiltersEnums, FO extends FiltersOptionsEnu
 export type Group<T extends DataRaw, O extends TaskOptions | null = null> = {
   name: string;
   opened: boolean;
+  total: number;
   data: ArmonikData<T, O>[]
 }
\ No newline at end of file

From 87a8d40e95735618f1662ce767a0124c0e469c74 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 10 Feb 2025 16:21:07 +0100
Subject: [PATCH 05/47] feat: group settings button

---
 src/app/components/table/group/group.component.html | 5 ++++-
 src/app/components/table/group/group.component.ts   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/components/table/group/group.component.html b/src/app/components/table/group/group.component.html
index 8072065b5..b6191219f 100644
--- a/src/app/components/table/group/group.component.html
+++ b/src/app/components/table/group/group.component.html
@@ -8,9 +8,12 @@
       <span i18n>Total: </span>
       <span>{{ group.total }}</span>
     </p>
+    <app-group-tasks-by-status [groupData]="group.data" [statusesGroups]="statusesGroups" />
   </div>
   <div class="general-actions">
-    <app-group-tasks-by-status [groupData]="group.data" [statusesGroups]="statusesGroups" />
+    <button mat-icon-button (mouseenter)="settingsRotate = true" (mouseleave)="settingsRotate = false">
+      <mat-icon [@rotateFull]="settingsRotate" [fontIcon]="getIcon('settings')" />
+    </button>
     <button mat-icon-button (click)="switchView()">
       <mat-icon [@rotateFull]="group.opened" [fontIcon]="getIcon('arrow-down')" />
     </button>
diff --git a/src/app/components/table/group/group.component.ts b/src/app/components/table/group/group.component.ts
index d57b64f32..7323e3975 100644
--- a/src/app/components/table/group/group.component.ts
+++ b/src/app/components/table/group/group.component.ts
@@ -69,6 +69,7 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
   private readonly iconsService = inject(IconsService);
 
   pageIndex = 0;
+  settingsRotate = false;
 
   getIcon(name: string) {
     return this.iconsService.getIcon(name);

From 333c5ed8ae1ba33b7ffd3d80bf047f4718c00be1 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 10 Feb 2025 16:47:56 +0100
Subject: [PATCH 06/47] chore: better ui

---
 src/app/components/table/group/group.component.css  | 13 ++++++++++---
 src/app/components/table/group/group.component.html | 11 +++++++----
 .../group-tasks-by-status.component.html            |  4 +++-
 .../group-tasks-by-status.component.ts              |  3 +++
 src/app/services/invert-filter.service.ts           |  3 ++-
 src/app/sessions/services/sessions-data.service.ts  |  2 +-
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/app/components/table/group/group.component.css b/src/app/components/table/group/group.component.css
index 5a4deb33a..7455dee56 100644
--- a/src/app/components/table/group/group.component.css
+++ b/src/app/components/table/group/group.component.css
@@ -13,6 +13,11 @@
   min-width: 20rem;
 }
 
+.tasks-statuses {
+  display: flex;
+  align-items: center;
+}
+
 .general-actions {
   display: flex;
   align-items: center;
@@ -28,18 +33,20 @@
 .table-actions {
   display: flex;
   justify-content: space-between;
-  padding-top: 1rem;
+  align-items: center;
+  background-color: var(--mat-table-background-color);
 }
 
 app-refresh-button {
-  padding-left: 1rem;
+  padding-left: 0.5rem;
 }
 
 mat-card {
+  padding: 1rem;
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
   border-radius: 0;
-  background-color: var(--mat-sidenav-content-background-color) !important;
+  background-color: var(--mat-sidenav-content-background-color);
 }
 
 p {
diff --git a/src/app/components/table/group/group.component.html b/src/app/components/table/group/group.component.html
index b6191219f..a5458ab17 100644
--- a/src/app/components/table/group/group.component.html
+++ b/src/app/components/table/group/group.component.html
@@ -8,6 +8,9 @@
       <span i18n>Total: </span>
       <span>{{ group.total }}</span>
     </p>
+  </div>
+  <div class="tasks-statuses">
+    <p>Tasks statuses: </p>
     <app-group-tasks-by-status [groupData]="group.data" [statusesGroups]="statusesGroups" />
   </div>
   <div class="general-actions">
@@ -20,11 +23,11 @@
   </div>
 </section>
 <section [@expand]="group.opened">
-  <article class="table-actions">
-    <app-refresh-button />
-    <mat-paginator [length]="group.total" [pageIndex]="pageIndex" (page)="pageChange($event)" pageSize="1" aria-label="Select page" i18n-aria-label />
-  </article>
   <mat-card class="table-container">
+    <article class="table-actions">
+      <app-refresh-button />
+      <mat-paginator [length]="group.total" [pageIndex]="pageIndex" (page)="pageChange($event)" pageSize="1" aria-label="Select page" i18n-aria-label />
+    </article>
     <table mat-table [dataSource]="group.data">
       @for (column of displayedColumns; track $index) {
         <ng-container [matColumnDef]="column.key.toString()">
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html
index 9d14ba291..96e18c463 100644
--- a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html
+++ b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html
@@ -1 +1,3 @@
-<app-count-tasks-by-status [refresh]="refresh" [queryParams]="queryParams" [filters]="filters" [statusesGroups]="statusesGroups" />
\ No newline at end of file
+@if (queryParamsLength !== 0 && filters.length !== 0) {
+  <app-count-tasks-by-status [refresh]="refresh" [queryParams]="queryParams" [filters]="filters" [statusesGroups]="statusesGroups" />
+}
\ No newline at end of file
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
index c9f0875b2..9330e5ba9 100644
--- a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
+++ b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
@@ -22,15 +22,18 @@ export class GroupTasksByStatusComponent<T extends DataRaw, O extends TaskOption
     groupData.forEach((data) => {
       this.filters.push(...data.filters);
     });
+
     groupData.forEach((data, index) => {
       const keys = Object.keys(data.queryTasksParams);
       keys.forEach((key) => (this.queryParams[`${index}${key.slice(1)}`] = data.queryTasksParams[key]));
     });
+    this.queryParamsLength = Object.keys(this.queryParams).length;
   }
 
   @Input({ required: true }) statusesGroups: TasksStatusesGroup[];
 
   filters: TaskSummaryFilters;
   queryParams: Record<string, string>;
+  queryParamsLength = 0;
   refresh = new Subject<void>();
 }
\ No newline at end of file
diff --git a/src/app/services/invert-filter.service.ts b/src/app/services/invert-filter.service.ts
index 968fd4c76..08ac61d6f 100644
--- a/src/app/services/invert-filter.service.ts
+++ b/src/app/services/invert-filter.service.ts
@@ -15,7 +15,8 @@ export class InvertFilterService<F extends FiltersEnums, FO extends FiltersOptio
   };
 
   invert(filters: FiltersOr<F, FO>): FiltersOr<F, FO> {
-    return filters.map((filterAnd) => filterAnd.map((filter) => this.invertFilter(filter)));
+    return [filters.map((filterAnd) => filterAnd.map((filter) => this.invertFilter(filter))).flat()];
+
   }
 
   private invertFilter(filter: Filter<F,FO>) {
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index b344c9cbe..7f235643d 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -41,7 +41,7 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
             field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
             for: 'root',
             operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
-            value: '5bb6d33a-0931-485a-a7d9-d5263218c1bd'
+            value: '03b69175-b3fb-47e4-b1b1-b5a6ab302601'
           }
         ]
       ]

From 4caa8c2b770115144beba8aba4a888a32f6201b9 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 10 Feb 2025 17:17:31 +0100
Subject: [PATCH 07/47] feat: group change page

---
 .../table/group/group.component.css           |  2 +-
 .../table/group/group.component.html          |  9 ++--
 .../components/table/group/group.component.ts | 18 ++++---
 .../group-tasks-by-status.component.ts        | 28 +++++-----
 src/app/components/table/table.component.html | 10 +++-
 src/app/components/table/table.component.ts   |  5 ++
 .../sessions/components/table.component.html  |  2 +-
 .../sessions/components/table.component.ts    |  4 ++
 .../services/sessions-data.service.ts         | 54 +++++++++----------
 src/app/types/groups.ts                       |  5 +-
 10 files changed, 79 insertions(+), 58 deletions(-)

diff --git a/src/app/components/table/group/group.component.css b/src/app/components/table/group/group.component.css
index 7455dee56..a1bb3e51d 100644
--- a/src/app/components/table/group/group.component.css
+++ b/src/app/components/table/group/group.component.css
@@ -32,7 +32,7 @@
 
 .table-actions {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-end;
   align-items: center;
   background-color: var(--mat-table-background-color);
 }
diff --git a/src/app/components/table/group/group.component.html b/src/app/components/table/group/group.component.html
index a5458ab17..8f9c8553c 100644
--- a/src/app/components/table/group/group.component.html
+++ b/src/app/components/table/group/group.component.html
@@ -11,7 +11,7 @@
   </div>
   <div class="tasks-statuses">
     <p>Tasks statuses: </p>
-    <app-group-tasks-by-status [groupData]="group.data" [statusesGroups]="statusesGroups" />
+    <app-group-tasks-by-status [groupData]="group.data|async" [statusesGroups]="statusesGroups" />
   </div>
   <div class="general-actions">
     <button mat-icon-button (mouseenter)="settingsRotate = true" (mouseleave)="settingsRotate = false">
@@ -24,10 +24,9 @@
 </section>
 <section [@expand]="group.opened">
   <mat-card class="table-container">
-    <article class="table-actions">
-      <app-refresh-button />
-      <mat-paginator [length]="group.total" [pageIndex]="pageIndex" (page)="pageChange($event)" pageSize="1" aria-label="Select page" i18n-aria-label />
-    </article>
+    <div class="table-actions">
+      <mat-paginator [length]="group.total" [pageIndex]="group.page" (page)="pageChange($event)" pageSize="100" aria-label="Select page" i18n-aria-label />
+    </div>
     <table mat-table [dataSource]="group.data">
       @for (column of displayedColumns; track $index) {
         <ng-container [matColumnDef]="column.key.toString()">
diff --git a/src/app/components/table/group/group.component.ts b/src/app/components/table/group/group.component.ts
index 7323e3975..c825d52cb 100644
--- a/src/app/components/table/group/group.component.ts
+++ b/src/app/components/table/group/group.component.ts
@@ -1,4 +1,5 @@
 import { animate, state, style, transition, trigger } from '@angular/animations';
+import { AsyncPipe } from '@angular/common';
 import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
@@ -8,12 +9,11 @@ import { MatTableModule } from '@angular/material/table';
 import { TasksStatusesGroup } from '@app/dashboard/types';
 import { TaskOptions } from '@app/tasks/types';
 import { TableColumn } from '@app/types/column.type';
-import { ColumnKey, DataRaw } from '@app/types/data';
+import { ArmonikData, ColumnKey, DataRaw } from '@app/types/data';
 import { Group } from '@app/types/groups';
 import { Status, StatusService } from '@app/types/status';
 import { ActionTable } from '@app/types/table';
 import { IconsService } from '@services/icons.service';
-import { RefreshButtonComponent } from '../../refresh-button.component';
 import { GroupTasksByStatusComponent } from '../grouped-tasks-by-status/group-tasks-by-status.component';
 import { TableActionsComponent } from '../table-actions.component';
 import { TableCellComponent } from '../table-cell.component';
@@ -31,8 +31,8 @@ import { TableCellComponent } from '../table-cell.component';
     MatCardModule,
     TableCellComponent,
     TableActionsComponent,
-    RefreshButtonComponent,
-    GroupTasksByStatusComponent
+    GroupTasksByStatusComponent,
+    AsyncPipe,
   ],
   providers: [
     IconsService
@@ -60,15 +60,18 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
   @Input({ required: false }) actions: ActionTable<T, O>[];
   @Input({ required: false }) statusesService: StatusService<S>;
   @Input({ required: false }) statusesGroups: TasksStatusesGroup[];
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  @Input({ required: false }) trackBy(index: number, item: ArmonikData<T, O> | Group<T, O>): number | string {
+    return index;
+  }
 
   columnsKeys: ColumnKey<T, O>[];
   displayedColumns: TableColumn<T, O>[];
 
-  @Output() page = new EventEmitter<number>();
+  @Output() page = new EventEmitter<void>();
 
   private readonly iconsService = inject(IconsService);
 
-  pageIndex = 0;
   settingsRotate = false;
 
   getIcon(name: string) {
@@ -80,6 +83,7 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
   }
 
   pageChange(event: PageEvent) {
-    this.page.emit(event.pageIndex);
+    this.group.page = event.pageIndex;
+    this.page.emit();
   }
 }
\ No newline at end of file
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
index 9330e5ba9..2b71c8039 100644
--- a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
+++ b/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
@@ -15,19 +15,21 @@ import { Subject } from 'rxjs';
   ]
 })
 export class GroupTasksByStatusComponent<T extends DataRaw, O extends TaskOptions | null = null> {
-  @Input({ required: true }) set groupData(entry: ArmonikData<T, O>[]) {
-    this.filters = [];
-    this.queryParams = {};
-    const groupData = entry as unknown as (SessionData | ApplicationData | PartitionData)[];
-    groupData.forEach((data) => {
-      this.filters.push(...data.filters);
-    });
-
-    groupData.forEach((data, index) => {
-      const keys = Object.keys(data.queryTasksParams);
-      keys.forEach((key) => (this.queryParams[`${index}${key.slice(1)}`] = data.queryTasksParams[key]));
-    });
-    this.queryParamsLength = Object.keys(this.queryParams).length;
+  @Input({ required: true }) set groupData(entry: ArmonikData<T, O>[] | null) {
+    if (entry !== null) {
+      this.filters = [];
+      this.queryParams = {};
+      const groupData = entry as unknown as (SessionData | ApplicationData | PartitionData)[];
+      groupData.forEach((data) => {
+        this.filters.push(...data.filters);
+      });
+  
+      groupData.forEach((data, index) => {
+        const keys = Object.keys(data.queryTasksParams);
+        keys.forEach((key) => (this.queryParams[`${index}${key.slice(1)}`] = data.queryTasksParams[key]));
+      });
+      this.queryParamsLength = Object.keys(this.queryParams).length;
+    }
   }
 
   @Input({ required: true }) statusesGroups: TasksStatusesGroup[];
diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index b60489533..602234b7c 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -9,7 +9,15 @@
       <ng-container *matCellDef="let element">
         @if (!isData(element)) {
           <td mat-cell [attr.colspan]="columns.length" style="padding: 0;">
-            <app-table-group [group]="element" [columns]="columns" [actions]="actions" [statusesService]="statusesService" [statusesGroups]="statusesGroups"/>
+            <app-table-group
+              [group]="element"
+              [columns]="columns"
+              [actions]="actions"
+              [statusesService]="statusesService"
+              [statusesGroups]="statusesGroups"
+              [trackBy]="trackBy"
+              (page)="groupPageUpdate(element.name)"
+            />
           </td>
         }
       </ng-container>
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index 3517334bd..1d7150d41 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -76,6 +76,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   @Output() optionsChange = new EventEmitter<never>();
   @Output() selectionChange = new EventEmitter<T[]>();
   @Output() personnalizeTasksByStatus = new EventEmitter<void>();
+  @Output() groupPageChange = new EventEmitter<string>();
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
@@ -174,4 +175,8 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   isData(element: ArmonikData<T, O> | Group<T, O>) {
     return (element as ArmonikData<T, O>).raw !== undefined && (element as Group<T, O>).name === undefined;
   }
+
+  groupPageUpdate(groupName: string) {
+    this.groupPageChange.emit(groupName);
+  }
 }
\ No newline at end of file
diff --git a/src/app/sessions/components/table.component.html b/src/app/sessions/components/table.component.html
index d3ab4e45d..2e2e31db8 100644
--- a/src/app/sessions/components/table.component.html
+++ b/src/app/sessions/components/table.component.html
@@ -1,3 +1,3 @@
 <app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [groups]="tableDataService.groups" [total]="total()" [options]="options" [lockColumns]="lockColumns"
   [actions]="actions" [statusesService]="statusesService" [statusesGroups]="statusesGroups"
-  (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()" (personnalizeTasksByStatus)="personalizeTasksByStatus()" />
+  (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()" (personnalizeTasksByStatus)="personalizeTasksByStatus()" (groupPageChange)="groupPageChange($event)" />
diff --git a/src/app/sessions/components/table.component.ts b/src/app/sessions/components/table.component.ts
index eaee5f645..2a1f2f702 100644
--- a/src/app/sessions/components/table.component.ts
+++ b/src/app/sessions/components/table.component.ts
@@ -163,4 +163,8 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
   trackBy(index: number, _item: ArmonikData<SessionRaw, TaskOptions>) {
     return index;
   }
+
+  groupPageChange(groupName: string) {
+    this.tableDataService.refreshGroup(groupName);
+  }
 }
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index 7f235643d..0d6b4882e 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -10,7 +10,7 @@ import { ListOptions } from '@app/types/options';
 import { AbstractTableDataService } from '@app/types/services/table-data.service';
 import { Duration, Timestamp } from '@ngx-grpc/well-known-types';
 import { InvertFilterService } from '@services/invert-filter.service';
-import { Subject, Subscription, map, mergeAll, switchMap } from 'rxjs';
+import { Subject, map, merge, mergeAll, switchMap } from 'rxjs';
 import { SessionsGrpcService } from './sessions-grpc.service';
 import { SessionRaw } from '../types';
 
@@ -22,7 +22,6 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
   scope: Scope = 'sessions';
 
   groups: Group<SessionRaw, TaskOptions>[] = [];
-  private readonly groupsSubscriptions: Map<string, Subscription> = new Map();
 
   groupsConditions: GroupConditions<SessionRawEnumField, TaskOptionEnumField>[] = [
     {
@@ -56,8 +55,6 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
 
   ngOnDestroy(): void {
     this.onDestroy();
-    this.groupsSubscriptions.forEach((groupSubscription) => groupSubscription.unsubscribe());
-    this.groupsSubscriptions.clear();
   }
 
   computeGrpcData(entries: ListSessionsResponse): SessionRaw[] | undefined {
@@ -217,33 +214,29 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
   }
 
   initGroup(groupCondition: GroupConditions<SessionRawEnumField, TaskOptionEnumField>) {
+    const groupRefresh$ = new Subject<void>();
     const group: Group<SessionRaw, TaskOptions> = {
       name: groupCondition.name,
       opened: false,
       total: 0,
-      data: []
+      page: 0,
+      refresh$: groupRefresh$,
+      data: merge(this.refresh$, groupRefresh$).pipe(
+        switchMap(() => this.grpcService.list$({pageSize: 100, pageIndex: group.page, sort: this.options.sort}, groupCondition.conditions)),
+        map((data) => {
+          group.total = data.total;
+          return this.computeGrpcData(data);
+        }),
+        map((data) => {
+          if (data) {
+            return data.map(entry => this.createNewLine(entry));
+          }
+          return [];
+        })
+      )
     };
-    const groupSubscription = this.refresh$.pipe(
-      switchMap(() => this.grpcService.list$(this.options, groupCondition.conditions)),
-      map((data) => {
-        group.total = data.total;
-        return this.computeGrpcData(data);
-      }),
-      map((data) => {
-        if (data) {
-          return data.map(entry => this.createNewLine(entry));
-        }
-        return undefined;
-      })
-    ).subscribe((data) => {
-      if (data) {
-        group.data = data;
-      }
-    });
 
     this.groups.push(group);
-
-    this.groupsSubscriptions.set(groupCondition.name, groupSubscription);
   }
 
   setGroups() {
@@ -255,14 +248,17 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     this.initGroup(groupCondition);
   }
 
-  removeGroup(groupName: string) {
-    const subscription = this.groupsSubscriptions.get(groupName);
-    if (subscription) {
-      subscription.unsubscribe();
-      this.groupsSubscriptions.delete(groupName);
+  refreshGroup(groupName: string) {
+    const group = this.groups.find((group) => group.name === groupName);
+    if (group) {
+      group.refresh$.next();
     }
   }
 
+  removeGroup(groupName: string) {
+    this.groups = this.groups.filter((group) => group.name !== groupName);
+  }
+
   // Duration computation
   isDurationDisplayed = false;
   private dataRaw: SessionRaw[];
diff --git a/src/app/types/groups.ts b/src/app/types/groups.ts
index d3e3927b3..8b37135cf 100644
--- a/src/app/types/groups.ts
+++ b/src/app/types/groups.ts
@@ -1,4 +1,5 @@
 import { TaskOptions } from '@app/tasks/types';
+import { Observable, Subject } from 'rxjs';
 import { ArmonikData, DataRaw } from './data';
 import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from './filters';
 
@@ -11,5 +12,7 @@ export type Group<T extends DataRaw, O extends TaskOptions | null = null> = {
   name: string;
   opened: boolean;
   total: number;
-  data: ArmonikData<T, O>[]
+  page: number;
+  refresh$: Subject<void>,
+  data: Observable<ArmonikData<T, O>[]>
 }
\ No newline at end of file

From 4f230ccee5b24067682a81e4dd28b158870fa2b8 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 10 Feb 2025 17:39:27 +0100
Subject: [PATCH 08/47] chore: better html

---
 src/app/components/table/group/group.component.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/components/table/group/group.component.html b/src/app/components/table/group/group.component.html
index 8f9c8553c..bfe9cea7c 100644
--- a/src/app/components/table/group/group.component.html
+++ b/src/app/components/table/group/group.component.html
@@ -1,5 +1,5 @@
 <section class="detailed-row">
-  <div class="general-data">
+  <article class="general-data">
     <div class="group-info">
       <mat-icon [fontIcon]="getIcon('table-group')" />
       <p>{{ group.name }}</p>
@@ -8,19 +8,19 @@
       <span i18n>Total: </span>
       <span>{{ group.total }}</span>
     </p>
-  </div>
-  <div class="tasks-statuses">
+  </article>
+  <article class="tasks-statuses">
     <p>Tasks statuses: </p>
     <app-group-tasks-by-status [groupData]="group.data|async" [statusesGroups]="statusesGroups" />
-  </div>
-  <div class="general-actions">
+  </article>
+  <article class="general-actions">
     <button mat-icon-button (mouseenter)="settingsRotate = true" (mouseleave)="settingsRotate = false">
       <mat-icon [@rotateFull]="settingsRotate" [fontIcon]="getIcon('settings')" />
     </button>
     <button mat-icon-button (click)="switchView()">
       <mat-icon [@rotateFull]="group.opened" [fontIcon]="getIcon('arrow-down')" />
     </button>
-  </div>
+  </article>
 </section>
 <section [@expand]="group.opened">
   <mat-card class="table-container">

From e49b265ebc91bd2bf18cdd47f425eeea64d145f6 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 10 Feb 2025 17:49:20 +0100
Subject: [PATCH 09/47] chore: update animations location

---
 eslint.config.mjs                                 |  3 ++-
 jest.config.ts                                    |  3 ++-
 src/app/components/table/group/group.component.ts | 14 +++-----------
 src/app/shared/animations.ts                      | 13 +++++++++++++
 tsconfig.json                                     |  3 +++
 5 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 src/app/shared/animations.ts

diff --git a/eslint.config.mjs b/eslint.config.mjs
index da6b6d418..74d397510 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -62,7 +62,8 @@ export default tseslint.config(
             "^@components/",
             "^@services/",
             "^@angular/",
-            "^@pipes/"
+            "^@pipes/",
+            "^@shared/",
           ]
         }
       ],
diff --git a/jest.config.ts b/jest.config.ts
index f0c6d4279..65d11fa92 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -97,7 +97,8 @@ const config: Config = {
     '@components/(.*)': '<rootDir>/src/app/components/$1',
     '@services/(.*)': '<rootDir>/src/app/services/$1',
     '@pipes/(.*)': '<rootDir>/src/app/pipes/$1',
-    '@app/(.*)': '<rootDir>/src/app/$1'
+    '@app/(.*)': '<rootDir>/src/app/$1',
+    '@shared/(.*)': '<rootDir>/src/app/shared/$1',
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
diff --git a/src/app/components/table/group/group.component.ts b/src/app/components/table/group/group.component.ts
index c825d52cb..fbc53229f 100644
--- a/src/app/components/table/group/group.component.ts
+++ b/src/app/components/table/group/group.component.ts
@@ -1,4 +1,3 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
 import { AsyncPipe } from '@angular/common';
 import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
@@ -14,6 +13,7 @@ import { Group } from '@app/types/groups';
 import { Status, StatusService } from '@app/types/status';
 import { ActionTable } from '@app/types/table';
 import { IconsService } from '@services/icons.service';
+import { rotateFull, expand } from '@shared/animations';
 import { GroupTasksByStatusComponent } from '../grouped-tasks-by-status/group-tasks-by-status.component';
 import { TableActionsComponent } from '../table-actions.component';
 import { TableCellComponent } from '../table-cell.component';
@@ -38,16 +38,8 @@ import { TableCellComponent } from '../table-cell.component';
     IconsService
   ],
   animations: [
-    trigger('rotateFull', [
-      state('true', style({ transform: 'rotate(-180deg)' })),
-      state('false', style({ transform: 'rotate(0deg)' })),
-      transition('true <=> false', [animate('125ms ease-in')])
-    ]),
-    trigger('expand', [
-      state('false', style({ 'height': '0' })),
-      state('true', style({})),
-      transition('true <=> false', [animate('500ms cubic-bezier(0.4, 0.0, 0.2, 1)')])
-    ])
+    rotateFull,
+    expand,
   ]
 })
 export class TableGroupComponent<T extends DataRaw, S extends Status, O extends TaskOptions | null = null> {
diff --git a/src/app/shared/animations.ts b/src/app/shared/animations.ts
new file mode 100644
index 000000000..298332053
--- /dev/null
+++ b/src/app/shared/animations.ts
@@ -0,0 +1,13 @@
+import { animate, state, style, transition, trigger } from '@angular/animations';
+
+export const rotateFull = trigger('rotateFull', [
+  state('true', style({ transform: 'rotate(-180deg)' })),
+  state('false', style({ transform: 'rotate(0deg)' })),
+  transition('true <=> false', [animate('125ms ease-in')])
+]);
+
+export const expand = trigger('expand', [
+  state('false', style({ 'height': '0' })),
+  state('true', style({})),
+  transition('true <=> false', [animate('500ms cubic-bezier(0.4, 0.0, 0.2, 1)')])
+]);
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 3ed0cd3ef..7d2dc8eab 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,9 @@
       "@app/*": [
         "src/app/*"
       ],
+      "@shared/*": [
+        "src/app/shared/*"
+      ]
     },
     "rootDir": "./",
     "outDir": "./dist/out-tsc",

From f2a89effee5bc4a95533dce7f7fda51ad7c9facd Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Tue, 11 Feb 2025 09:42:53 +0100
Subject: [PATCH 10/47] chore: moved group components location

---
 .../table/group/{ => group-row}/group.component.css           | 0
 .../table/group/{ => group-row}/group.component.html          | 0
 .../table/group/{ => group-row}/group.component.spec.ts       | 0
 .../components/table/group/{ => group-row}/group.component.ts | 4 ++--
 .../group-tasks-by-status.component.css                       | 0
 .../group-tasks-by-status.component.html                      | 0
 .../group-tasks-by-status.component.spec.ts                   | 0
 .../group-tasks-by-status.component.ts                        | 0
 src/app/components/table/table.component.ts                   | 2 +-
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename src/app/components/table/group/{ => group-row}/group.component.css (100%)
 rename src/app/components/table/group/{ => group-row}/group.component.html (100%)
 rename src/app/components/table/group/{ => group-row}/group.component.spec.ts (100%)
 rename src/app/components/table/group/{ => group-row}/group.component.ts (94%)
 rename src/app/components/table/{ => group}/grouped-tasks-by-status/group-tasks-by-status.component.css (100%)
 rename src/app/components/table/{ => group}/grouped-tasks-by-status/group-tasks-by-status.component.html (100%)
 rename src/app/components/table/{ => group}/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts (100%)
 rename src/app/components/table/{ => group}/grouped-tasks-by-status/group-tasks-by-status.component.ts (100%)

diff --git a/src/app/components/table/group/group.component.css b/src/app/components/table/group/group-row/group.component.css
similarity index 100%
rename from src/app/components/table/group/group.component.css
rename to src/app/components/table/group/group-row/group.component.css
diff --git a/src/app/components/table/group/group.component.html b/src/app/components/table/group/group-row/group.component.html
similarity index 100%
rename from src/app/components/table/group/group.component.html
rename to src/app/components/table/group/group-row/group.component.html
diff --git a/src/app/components/table/group/group.component.spec.ts b/src/app/components/table/group/group-row/group.component.spec.ts
similarity index 100%
rename from src/app/components/table/group/group.component.spec.ts
rename to src/app/components/table/group/group-row/group.component.spec.ts
diff --git a/src/app/components/table/group/group.component.ts b/src/app/components/table/group/group-row/group.component.ts
similarity index 94%
rename from src/app/components/table/group/group.component.ts
rename to src/app/components/table/group/group-row/group.component.ts
index fbc53229f..84b66e433 100644
--- a/src/app/components/table/group/group.component.ts
+++ b/src/app/components/table/group/group-row/group.component.ts
@@ -12,11 +12,11 @@ import { ArmonikData, ColumnKey, DataRaw } from '@app/types/data';
 import { Group } from '@app/types/groups';
 import { Status, StatusService } from '@app/types/status';
 import { ActionTable } from '@app/types/table';
+import { TableActionsComponent } from '@components/table/table-actions.component';
+import { TableCellComponent } from '@components/table/table-cell.component';
 import { IconsService } from '@services/icons.service';
 import { rotateFull, expand } from '@shared/animations';
 import { GroupTasksByStatusComponent } from '../grouped-tasks-by-status/group-tasks-by-status.component';
-import { TableActionsComponent } from '../table-actions.component';
-import { TableCellComponent } from '../table-cell.component';
 
 @Component({
   selector: 'app-table-group',
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.css b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css
similarity index 100%
rename from src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.css
rename to src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.html
similarity index 100%
rename from src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.html
rename to src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.html
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
similarity index 100%
rename from src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
rename to src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
diff --git a/src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
similarity index 100%
rename from src/app/components/table/grouped-tasks-by-status/group-tasks-by-status.component.ts
rename to src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index 1d7150d41..98e7d5ab8 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -13,7 +13,7 @@ import { ListOptions } from '@app/types/options';
 import { Status, StatusService } from '@app/types/status';
 import { ActionTable } from '@app/types/table';
 import { TableContainerComponent } from '@components/table-container.component';
-import { TableGroupComponent } from './group/group.component';
+import { TableGroupComponent } from './group/group-row/group.component';
 import { TableActionsComponent } from './table-actions.component';
 import { TableCellComponent } from './table-cell.component';
 import { TableColumnHeaderComponent } from './table-column-header.component';

From 85eb0e34392c8bbaec4c7ce0a64b45b53ce357a7 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Tue, 11 Feb 2025 16:31:26 +0100
Subject: [PATCH 11/47] feat: manage groups dialog component

---
 .../manage-groups-dialog.component.css        |  66 +++++++++
 .../manage-groups-dialog.component.html       |  41 ++++++
 .../manage-groups-dialog.component.spec.ts    |   0
 .../manage-groups-dialog.component.ts         | 139 ++++++++++++++++++
 src/app/services/icons.service.ts             |   3 +-
 src/app/sessions/index.component.html         |   6 +
 src/app/sessions/index.component.ts           |  18 ++-
 7 files changed, 269 insertions(+), 4 deletions(-)
 create mode 100644 src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.css
 create mode 100644 src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
 create mode 100644 src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.spec.ts
 create mode 100644 src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts

diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.css b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.css
new file mode 100644
index 000000000..0c78c41d6
--- /dev/null
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.css
@@ -0,0 +1,66 @@
+mat-dialog-content {
+  display: flex;
+  justify-content: space-between;
+  min-height: 40vh;
+  max-height: 65vh;
+  width: 80vw;
+}
+
+mat-divider {
+  margin-top: 1rem;
+}
+
+#groups-names {
+  display: flex;
+  flex-direction: column;
+  padding-right: 1rem;
+  margin-right: 1rem;
+  border-right: 1px solid white;
+  width: 25%;
+  max-height: 55vh;
+}
+
+#group-conditions {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  align-items: center;
+}
+
+#no-groups {
+  height: 100%;
+  display: flex;
+  align-items: center;
+}
+
+#conditions-area {
+  max-height: 55vh;
+  overflow-y: auto;
+}
+
+mat-form-field {
+  width: 50vw;
+}
+
+span {
+  width: fit-content;
+}
+
+ul {
+  padding: 0;
+  overflow: auto;
+  max-height: 55vh;
+}
+
+li {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-between;
+}
+
+#or-button {
+  width: fit-content;
+  margin-left: 5rem;
+  margin-top: 1rem;
+}
\ No newline at end of file
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
new file mode 100644
index 000000000..a3734428d
--- /dev/null
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
@@ -0,0 +1,41 @@
+<mat-dialog-content>
+  <section id="groups-names">
+    <button mat-button (click)="addGroup()">
+      <mat-icon [fontIcon]="getIcon('add')"/>
+      <span>Add a group</span>
+    </button>
+    <mat-divider />
+    <ul>
+      @for (group of groups; track $index) {
+        <li>
+          <button mat-button (click)="selectGroup(group, true)">
+            {{group.name}}
+          </button>
+          <button mat-icon-button (click)="removeGroup($index)">
+            <mat-icon [fontIcon]="getIcon('delete')" />
+          </button>
+        </li>
+      }
+    </ul>
+  </section>
+  <section id="group-conditions">
+    @if (selectedGroup) {
+      <mat-form-field appearance="outline">
+        <input matInput placeholder="Group Name" [value]="selectedGroup.name" (input)="updateName($event)" />
+      </mat-form-field>
+      <article id="conditions-area">
+        @for (filters of selectedGroup.conditions; track $index) {
+          <app-filters-dialog-or [first]="$first" [filtersOr]="filters" (removeChange)="removeOrFilter($event)" />
+        }
+      </article>
+      <button mat-button id="or-button" (click)="addOrFilter()">
+        <mat-icon [fontIcon]="getIcon('add')" />
+        <span i18n>Add an or Filter</span>
+      </button>
+    } @else {
+      <div id="no-groups">
+        <p>Please select or create a group.</p>
+      </div>
+    }
+  </section>
+</mat-dialog-content>
\ No newline at end of file
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.spec.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.spec.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
new file mode 100644
index 000000000..658db78f4
--- /dev/null
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
@@ -0,0 +1,139 @@
+import { Component, inject, Inject } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { Filter, FiltersEnums, FiltersOptionsEnums } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
+import { FiltersDialogOrComponent } from '@components/filters/filters-dialog-or.component';
+import { FiltersService } from '@services/filters.service';
+import { IconsService } from '@services/icons.service';
+
+export type ManageGroupsDialogInput<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
+  groups: GroupConditions<F, FO>[];
+  selected?: string;
+}
+
+export type ManageGroupsDialogResult<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
+  addedGroups: GroupConditions<F, FO>[];
+  editedGroups: Record<string, GroupConditions<F, FO>>;
+  deletedGroups: string[];
+}
+
+@Component({
+  selector: 'app-manage-groups-dialog',
+  templateUrl: 'manage-groups-dialog.component.html',
+  styleUrl: 'manage-groups-dialog.component.css',
+  standalone: true,
+  imports: [
+    MatDialogModule,
+    MatButtonModule,
+    MatIconModule,
+    FiltersDialogOrComponent,
+    MatDividerModule,
+    MatFormFieldModule,
+    MatInputModule,
+  ],
+  providers: [
+    FiltersService
+  ]
+})
+export class ManageGroupsDialogComponent<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
+  private readonly dialogRef: MatDialogRef<ManageGroupsDialogComponent<F, FO>, ManageGroupsDialogResult<F, FO>> = inject(MatDialogRef);
+  constructor(@Inject(MAT_DIALOG_DATA) private readonly dialogData: ManageGroupsDialogInput<F, FO>) {
+    this.groups = [...dialogData.groups];
+    if (dialogData.selected !== undefined) {
+      this.selectedGroup = this.groups.find(group => group.name === dialogData.selected);
+    }
+  }
+
+  private readonly iconsService = inject(IconsService);
+
+  groups: GroupConditions<F, FO>[];
+
+  addedGroups: GroupConditions<F, FO>[];
+  editedGroups: Record<string, GroupConditions<F, FO>>;
+  deletedGroups: string[];
+
+  selectedGroup: GroupConditions<F, FO> | undefined;
+
+  selectGroup(group: GroupConditions<F, FO>, setAsEdited: boolean = false) {
+    this.selectedGroup = group;
+    if (setAsEdited) {
+      const groupName = `${group.name}`;
+      this.editedGroups[groupName] = group;
+    }
+  }
+
+  addGroup() {
+    const group: GroupConditions<F, FO> = {
+      name: $localize`New Group`,
+      conditions: [[{
+        field: null,
+        for: null,
+        operator: null,
+        value: null,
+      }]]
+    };
+    this.groups.push(group);
+    this.selectGroup(group);
+    this.addedGroups.push(group);
+  }
+
+  removeGroup(index: number) {
+    const deletedGroup = this.groups.splice(index, 1)[0];
+    if (this.selectedGroup === deletedGroup) {
+      this.selectedGroup = undefined;
+    }
+    if (this.addedGroups.includes(deletedGroup)) {
+      const index = this.addedGroups.indexOf(deletedGroup);
+      this.addedGroups.splice(index, 1);
+    } else {
+      this.deletedGroups.push(deletedGroup.name);
+    }
+  }
+
+  updateName(event: Event) {
+    if (this.selectedGroup) {
+      const name = (event.target as HTMLInputElement).value;
+      this.selectedGroup.name = name;
+    }
+  }
+
+  addOrFilter() {
+    if (this.selectedGroup) {
+      this.selectedGroup.conditions.push([{
+        field: null,
+        for: null,
+        operator: null,
+        value: null,
+      }]);
+    }
+  }
+
+  removeOrFilter(filter: Filter<F, FO>[]) {
+    if (this.selectedGroup) {
+      const index = this.selectedGroup.conditions.indexOf(filter);
+      if (index !== -1) {
+        this.selectedGroup.conditions.splice(index, 1);
+      }
+      if (this.selectedGroup.conditions.length === 0) {
+        this.addOrFilter();
+      }
+    }
+  }
+
+  getIcon(name: string) {
+    return this.iconsService.getIcon(name);
+  }
+
+  confirmClose() {
+    this.dialogRef.close({
+      addedGroups: this.addedGroups,
+      deletedGroups: this.deletedGroups,
+      editedGroups: this.editedGroups
+    });
+  }
+}
\ No newline at end of file
diff --git a/src/app/services/icons.service.ts b/src/app/services/icons.service.ts
index 777630813..7081174b8 100644
--- a/src/app/services/icons.service.ts
+++ b/src/app/services/icons.service.ts
@@ -83,7 +83,8 @@ export class IconsService {
     'processed': 'offline_pin',
     'retry': 'repeat_on',
     'pending': 'pending',
-    'table-group': 'diversity_2'
+    'table-group': 'diversity_2',
+    'save': 'save',
   };
 
   getIcon(name: string | null | undefined): string {
diff --git a/src/app/sessions/index.component.html b/src/app/sessions/index.component.html
index 4fd82d3b9..d44015621 100644
--- a/src/app/sessions/index.component.html
+++ b/src/app/sessions/index.component.html
@@ -21,6 +21,12 @@
       (lockColumnsChange)="onLockColumnsChange()"
       (addToDashboard)="onAddToDashboard()"
     >
+      <ng-container extra-buttons-right>
+        <button mat-button (click)="openGroups()">
+          <mat-icon [fontIcon]="getIcon('table-group')" />
+          <span i18n>Manage Groups</span>
+        </button>
+      </ng-container>
       <ng-container extra-menu-items>
         <button mat-menu-item (click)="addCustomColumn()">
           <mat-icon aria-hidden="true" [fontIcon]="getIcon('manage-customs')"></mat-icon>
diff --git a/src/app/sessions/index.component.ts b/src/app/sessions/index.component.ts
index 228cc732e..dc1998f3f 100644
--- a/src/app/sessions/index.component.ts
+++ b/src/app/sessions/index.component.ts
@@ -1,5 +1,5 @@
 import { SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { AfterViewInit, Component, OnDestroy, OnInit, inject } from '@angular/core';
+import { AfterViewInit, Component, OnDestroy, OnInit, ViewContainerRef, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
@@ -19,6 +19,7 @@ import { DataFilterService } from '@app/types/services/data-filter.service';
 import { TableType } from '@app/types/table';
 import { FiltersToolbarComponent } from '@components/filters/filters-toolbar.component';
 import { PageHeaderComponent } from '@components/page-header.component';
+import { ManageGroupsDialogComponent, ManageGroupsDialogInput } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { TableIndexActionsToolbarComponent } from '@components/table-index-actions-toolbar.component';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { FiltersService } from '@services/filters.service';
@@ -61,7 +62,7 @@ import { SessionRaw } from './types';
     SessionsFiltersService,
     {
       provide: DataFilterService,
-      useExisting: SessionsFiltersService
+      useExisting: SessionsFiltersService,
     },
     SessionsStatusesService,
     MatDialog,
@@ -83,13 +84,14 @@ import { SessionRaw } from './types';
     MatIconModule,
     MatButtonModule,
     MatMenuModule,
-    SessionsTableComponent
+    SessionsTableComponent,
   ]
 })
 export class IndexComponent extends TableHandlerCustomValues<SessionRaw, SessionRawEnumField, TaskOptions, TaskOptionEnumField> implements OnInit, AfterViewInit, OnDestroy {
   readonly filtersService = inject(SessionsFiltersService);
   readonly indexService = inject(SessionsIndexService);
   readonly tableDataService = inject(SessionsDataService);
+  private readonly viewContainerRef = inject(ViewContainerRef);
 
   tableType: TableType = 'Sessions';
 
@@ -99,6 +101,7 @@ export class IndexComponent extends TableHandlerCustomValues<SessionRaw, Session
 
   ngAfterViewInit(): void {
     this.mergeSubscriptions();
+    this.openGroups();
   }
 
   ngOnDestroy(): void {
@@ -120,4 +123,13 @@ export class IndexComponent extends TableHandlerCustomValues<SessionRaw, Session
       this.refresh();
     }
   }
+
+  openGroups() {
+    this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField,TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
+      data: {
+        groups: this.tableDataService.groupsConditions
+      },
+      viewContainerRef: this.viewContainerRef
+    });
+  }
 }

From ed7aeaf55435c56c01b96214e91af2b26cd7dcc5 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Tue, 11 Feb 2025 16:44:38 +0100
Subject: [PATCH 12/47] feat: click settings button to edit group

---
 .../table/group/group-row/group.component.html     |  2 +-
 .../table/group/group-row/group.component.ts       |  5 +++++
 src/app/components/table/table.component.html      |  1 +
 src/app/components/table/table.component.ts        |  5 +++++
 src/app/sessions/components/table.component.html   |  2 +-
 src/app/sessions/components/table.component.ts     | 14 +++++++++++++-
 src/app/sessions/index.component.ts                |  1 -
 7 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/app/components/table/group/group-row/group.component.html b/src/app/components/table/group/group-row/group.component.html
index bfe9cea7c..4aae17b27 100644
--- a/src/app/components/table/group/group-row/group.component.html
+++ b/src/app/components/table/group/group-row/group.component.html
@@ -14,7 +14,7 @@
     <app-group-tasks-by-status [groupData]="group.data|async" [statusesGroups]="statusesGroups" />
   </article>
   <article class="general-actions">
-    <button mat-icon-button (mouseenter)="settingsRotate = true" (mouseleave)="settingsRotate = false">
+    <button mat-icon-button (mouseenter)="settingsRotate = true" (mouseleave)="settingsRotate = false" (click)="groupSettingsEmit()">
       <mat-icon [@rotateFull]="settingsRotate" [fontIcon]="getIcon('settings')" />
     </button>
     <button mat-icon-button (click)="switchView()">
diff --git a/src/app/components/table/group/group-row/group.component.ts b/src/app/components/table/group/group-row/group.component.ts
index 84b66e433..e70741915 100644
--- a/src/app/components/table/group/group-row/group.component.ts
+++ b/src/app/components/table/group/group-row/group.component.ts
@@ -61,6 +61,7 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
   displayedColumns: TableColumn<T, O>[];
 
   @Output() page = new EventEmitter<void>();
+  @Output() groupSettings = new EventEmitter<string>();
 
   private readonly iconsService = inject(IconsService);
 
@@ -78,4 +79,8 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
     this.group.page = event.pageIndex;
     this.page.emit();
   }
+
+  groupSettingsEmit() {
+    this.groupSettings.emit(this.group.name);
+  }
 }
\ No newline at end of file
diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index 602234b7c..510f00530 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -17,6 +17,7 @@
               [statusesGroups]="statusesGroups"
               [trackBy]="trackBy"
               (page)="groupPageUpdate(element.name)"
+              (groupSettings)="onGroupSettingsEmit($event)"
             />
           </td>
         }
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index 98e7d5ab8..da74bbb18 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -77,6 +77,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   @Output() selectionChange = new EventEmitter<T[]>();
   @Output() personnalizeTasksByStatus = new EventEmitter<void>();
   @Output() groupPageChange = new EventEmitter<string>();
+  @Output() groupSettings = new EventEmitter<string>();
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
@@ -179,4 +180,8 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   groupPageUpdate(groupName: string) {
     this.groupPageChange.emit(groupName);
   }
+
+  onGroupSettingsEmit(groupName: string) {
+    this.groupSettings.emit(groupName);
+  }
 }
\ No newline at end of file
diff --git a/src/app/sessions/components/table.component.html b/src/app/sessions/components/table.component.html
index 2e2e31db8..e1702eb6e 100644
--- a/src/app/sessions/components/table.component.html
+++ b/src/app/sessions/components/table.component.html
@@ -1,3 +1,3 @@
 <app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [groups]="tableDataService.groups" [total]="total()" [options]="options" [lockColumns]="lockColumns"
   [actions]="actions" [statusesService]="statusesService" [statusesGroups]="statusesGroups"
-  (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()" (personnalizeTasksByStatus)="personalizeTasksByStatus()" (groupPageChange)="groupPageChange($event)" />
+  (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()" (personnalizeTasksByStatus)="personalizeTasksByStatus()" (groupPageChange)="groupPageChange($event)" (groupSettings)="groupeSettingsDisplay($event)" />
diff --git a/src/app/sessions/components/table.component.ts b/src/app/sessions/components/table.component.ts
index 2a1f2f702..41ab79184 100644
--- a/src/app/sessions/components/table.component.ts
+++ b/src/app/sessions/components/table.component.ts
@@ -1,12 +1,13 @@
 import { SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { Clipboard} from '@angular/cdk/clipboard';
-import { Component, OnInit, inject } from '@angular/core';
+import { Component, OnInit, ViewContainerRef, inject } from '@angular/core';
 import { MatDialogModule } from '@angular/material/dialog';
 import { Router, RouterModule } from '@angular/router';
 import { TaskOptions } from '@app/tasks/types';
 import { AbstractTaskByStatusTableComponent } from '@app/types/components/table';
 import { ArmonikData, SessionData } from '@app/types/data';
 import { ActionTable } from '@app/types/table';
+import { ManageGroupsDialogComponent, ManageGroupsDialogInput } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { TableComponent } from '@components/table/table.component';
 import { TableTasksByStatus, TasksByStatusService } from '@services/tasks-by-status.service';
 import { Subject } from 'rxjs';
@@ -33,6 +34,7 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
   readonly statusesService = inject(SessionsStatusesService);
   readonly router = inject(Router);
   readonly copyService = inject(Clipboard);
+  private readonly viewContainerRef = inject(ViewContainerRef);
 
   readonly tableDataService = inject(SessionsDataService);
 
@@ -167,4 +169,14 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
   groupPageChange(groupName: string) {
     this.tableDataService.refreshGroup(groupName);
   }
+
+  groupeSettingsDisplay(groupName: string) {
+    this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField, TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
+      data: {
+        groups: this.tableDataService.groupsConditions,
+        selected: groupName,
+      },
+      viewContainerRef: this.viewContainerRef
+    });
+  }
 }
diff --git a/src/app/sessions/index.component.ts b/src/app/sessions/index.component.ts
index dc1998f3f..031dc5714 100644
--- a/src/app/sessions/index.component.ts
+++ b/src/app/sessions/index.component.ts
@@ -101,7 +101,6 @@ export class IndexComponent extends TableHandlerCustomValues<SessionRaw, Session
 
   ngAfterViewInit(): void {
     this.mergeSubscriptions();
-    this.openGroups();
   }
 
   ngOnDestroy(): void {

From 5d5b56e2bbe3d2239bd1797fee3abfa2d01d5cf7 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Tue, 11 Feb 2025 16:47:56 +0100
Subject: [PATCH 13/47] feat: dialog close buttons

---
 .../manage-groups-dialog.component.html                    | 7 ++++++-
 .../manage-groups-dialog/manage-groups-dialog.component.ts | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
index a3734428d..fd12c2b61 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
@@ -38,4 +38,9 @@
       </div>
     }
   </section>
-</mat-dialog-content>
\ No newline at end of file
+</mat-dialog-content>
+
+<mat-dialog-actions align="end">
+  <button mat-button (click)="close()">Cancel</button>
+  <button mat-flat-button color="primary" (click)="confirmClose()">Confirm</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
index 658db78f4..fc88fbb25 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
@@ -136,4 +136,8 @@ export class ManageGroupsDialogComponent<F extends FiltersEnums, FO extends Filt
       editedGroups: this.editedGroups
     });
   }
+
+  close() {
+    this.dialogRef.close();
+  }
 }
\ No newline at end of file

From 3b28b94e1182d688b895212329887e525f999601 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Tue, 11 Feb 2025 17:03:43 +0100
Subject: [PATCH 14/47] chore: handle manage group result

---
 .../manage-groups-dialog.component.ts         |  8 +++----
 src/app/sessions/index.component.ts           |  8 ++++++-
 .../services/sessions-data.service.ts         | 24 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
index fc88fbb25..d391c29d2 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
@@ -43,7 +43,7 @@ export type ManageGroupsDialogResult<F extends FiltersEnums, FO extends FiltersO
 export class ManageGroupsDialogComponent<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
   private readonly dialogRef: MatDialogRef<ManageGroupsDialogComponent<F, FO>, ManageGroupsDialogResult<F, FO>> = inject(MatDialogRef);
   constructor(@Inject(MAT_DIALOG_DATA) private readonly dialogData: ManageGroupsDialogInput<F, FO>) {
-    this.groups = [...dialogData.groups];
+    this.groups = structuredClone(dialogData.groups);
     if (dialogData.selected !== undefined) {
       this.selectedGroup = this.groups.find(group => group.name === dialogData.selected);
     }
@@ -53,9 +53,9 @@ export class ManageGroupsDialogComponent<F extends FiltersEnums, FO extends Filt
 
   groups: GroupConditions<F, FO>[];
 
-  addedGroups: GroupConditions<F, FO>[];
-  editedGroups: Record<string, GroupConditions<F, FO>>;
-  deletedGroups: string[];
+  addedGroups: GroupConditions<F, FO>[] = [];
+  editedGroups: Record<string, GroupConditions<F, FO>> = {};
+  deletedGroups: string[] = [];
 
   selectedGroup: GroupConditions<F, FO> | undefined;
 
diff --git a/src/app/sessions/index.component.ts b/src/app/sessions/index.component.ts
index 031dc5714..be038617b 100644
--- a/src/app/sessions/index.component.ts
+++ b/src/app/sessions/index.component.ts
@@ -124,11 +124,17 @@ export class IndexComponent extends TableHandlerCustomValues<SessionRaw, Session
   }
 
   openGroups() {
-    this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField,TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
+    const dialogRef = this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField,TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
       data: {
         groups: this.tableDataService.groupsConditions
       },
       viewContainerRef: this.viewContainerRef
     });
+
+    dialogRef.afterClosed().subscribe((result) => {
+      if (result) {
+        this.tableDataService.manageGroupDialogResult(result);
+      }
+    });
   }
 }
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index 0d6b4882e..3a5dd42c7 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -8,6 +8,7 @@ import { Filter, FiltersOr } from '@app/types/filters';
 import { Group, GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { AbstractTableDataService } from '@app/types/services/table-data.service';
+import { ManageGroupsDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { Duration, Timestamp } from '@ngx-grpc/well-known-types';
 import { InvertFilterService } from '@services/invert-filter.service';
 import { Subject, map, merge, mergeAll, switchMap } from 'rxjs';
@@ -239,6 +240,24 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     this.groups.push(group);
   }
 
+  manageGroupDialogResult(dialogResult: ManageGroupsDialogResult<SessionRawEnumField, TaskOptionEnumField>) {
+    const editedKeys = Object.keys(dialogResult.editedGroups);
+    editedKeys.forEach((key) => {
+      const conditionsIndex =  this.groupsConditions.findIndex((group) => group.name === key);
+      if (conditionsIndex !== -1) {
+        this.groupsConditions[conditionsIndex] = dialogResult.editedGroups[key];
+      }
+      const groupIndex = this.groups.findIndex((group) => group.name === key);
+      if (groupIndex) {
+        this.groupsConditions[groupIndex].name = dialogResult.editedGroups[key].name;
+      }
+    });
+
+    dialogResult.addedGroups.forEach((group) => (this.addGroup(group)));
+
+    dialogResult.deletedGroups.forEach((groupName) => (this.removeGroup(groupName)));
+  }
+
   setGroups() {
     this.groupsConditions.forEach((g) => this.initGroup(g));
   }
@@ -256,7 +275,10 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
   }
 
   removeGroup(groupName: string) {
-    this.groups = this.groups.filter((group) => group.name !== groupName);
+    const index = this.groups.findIndex((group) => group.name === groupName);
+    if (index !== -1) {
+      this.groups.splice(index, 1);
+    }
   }
 
   // Duration computation

From 6bd2d56dcae2e26715820da42ab14830e017f2a3 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 12 Feb 2025 10:18:59 +0100
Subject: [PATCH 15/47] fix: informations update on groups

---
 .../group/group-row/group.component.html      |  2 +-
 .../table/group/group-row/group.component.ts  |  2 +-
 .../manage-groups-dialog.component.ts         |  7 ++-
 .../sessions/components/table.component.ts    |  8 +++-
 .../services/sessions-data.service.ts         | 48 ++++++++++++-------
 src/app/types/groups.ts                       |  3 +-
 6 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/app/components/table/group/group-row/group.component.html b/src/app/components/table/group/group-row/group.component.html
index 4aae17b27..2f195a0f9 100644
--- a/src/app/components/table/group/group-row/group.component.html
+++ b/src/app/components/table/group/group-row/group.component.html
@@ -2,7 +2,7 @@
   <article class="general-data">
     <div class="group-info">
       <mat-icon [fontIcon]="getIcon('table-group')" />
-      <p>{{ group.name }}</p>
+      <p>{{ group.name() }}</p>
     </div>
     <p>
       <span i18n>Total: </span>
diff --git a/src/app/components/table/group/group-row/group.component.ts b/src/app/components/table/group/group-row/group.component.ts
index e70741915..a69a4c5db 100644
--- a/src/app/components/table/group/group-row/group.component.ts
+++ b/src/app/components/table/group/group-row/group.component.ts
@@ -81,6 +81,6 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
   }
 
   groupSettingsEmit() {
-    this.groupSettings.emit(this.group.name);
+    this.groupSettings.emit(this.group.name());
   }
 }
\ No newline at end of file
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
index d391c29d2..a3557e876 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
@@ -42,10 +42,13 @@ export type ManageGroupsDialogResult<F extends FiltersEnums, FO extends FiltersO
 })
 export class ManageGroupsDialogComponent<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
   private readonly dialogRef: MatDialogRef<ManageGroupsDialogComponent<F, FO>, ManageGroupsDialogResult<F, FO>> = inject(MatDialogRef);
-  constructor(@Inject(MAT_DIALOG_DATA) private readonly dialogData: ManageGroupsDialogInput<F, FO>) {
+  constructor(@Inject(MAT_DIALOG_DATA) dialogData: ManageGroupsDialogInput<F, FO>) {
     this.groups = structuredClone(dialogData.groups);
     if (dialogData.selected !== undefined) {
-      this.selectedGroup = this.groups.find(group => group.name === dialogData.selected);
+      const group = this.groups.find(group => group.name === dialogData.selected);
+      if (group) {
+        this.selectGroup(group, true);
+      }
     }
   }
 
diff --git a/src/app/sessions/components/table.component.ts b/src/app/sessions/components/table.component.ts
index 41ab79184..8b1f0399c 100644
--- a/src/app/sessions/components/table.component.ts
+++ b/src/app/sessions/components/table.component.ts
@@ -171,12 +171,18 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
   }
 
   groupeSettingsDisplay(groupName: string) {
-    this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField, TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
+    const dialogRef = this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField, TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
       data: {
         groups: this.tableDataService.groupsConditions,
         selected: groupName,
       },
       viewContainerRef: this.viewContainerRef
     });
+
+    dialogRef.afterClosed().subscribe((result) => {
+      if (result) {
+        this.tableDataService.manageGroupDialogResult(result);
+      }
+    });
   }
 }
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index 3a5dd42c7..919414137 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -1,5 +1,5 @@
 import { FilterDateOperator, FilterStringOperator, ListSessionsResponse, ResultRawEnumField, SessionRawEnumField, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { Injectable, OnDestroy, inject } from '@angular/core';
+import { Injectable, OnDestroy, inject, signal } from '@angular/core';
 import { Params } from '@angular/router';
 import { TaskOptions, TaskSummaryFilters } from '@app/tasks/types';
 import { Scope } from '@app/types/config';
@@ -11,7 +11,7 @@ import { AbstractTableDataService } from '@app/types/services/table-data.service
 import { ManageGroupsDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { Duration, Timestamp } from '@ngx-grpc/well-known-types';
 import { InvertFilterService } from '@services/invert-filter.service';
-import { Subject, map, merge, mergeAll, switchMap } from 'rxjs';
+import { Subject, map, merge, mergeAll, of, switchMap } from 'rxjs';
 import { SessionsGrpcService } from './sessions-grpc.service';
 import { SessionRaw } from '../types';
 
@@ -51,7 +51,7 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
   constructor() {
     super();
     this.subscribeToDurationSubjects();
-    this.setGroups();
+    this.initGroups();
   }
 
   ngOnDestroy(): void {
@@ -214,19 +214,33 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     ];
   }
 
-  initGroup(groupCondition: GroupConditions<SessionRawEnumField, TaskOptionEnumField>) {
+  setGroup(groupName: string) {
     const groupRefresh$ = new Subject<void>();
     const group: Group<SessionRaw, TaskOptions> = {
-      name: groupCondition.name,
+      name: signal(groupName),
       opened: false,
       total: 0,
       page: 0,
       refresh$: groupRefresh$,
       data: merge(this.refresh$, groupRefresh$).pipe(
-        switchMap(() => this.grpcService.list$({pageSize: 100, pageIndex: group.page, sort: this.options.sort}, groupCondition.conditions)),
+        switchMap(() => {
+          const options = {
+            pageSize: 100,
+            pageIndex: group.page,
+            sort: this.options.sort
+          };
+          const groupConditions = this.groupsConditions.find((condition) => condition.name === group.name());
+          if (groupConditions) {
+            return this.grpcService.list$(options, groupConditions.conditions);
+          }
+          return of(undefined);
+        }),
         map((data) => {
-          group.total = data.total;
-          return this.computeGrpcData(data);
+          if (data) {
+            group.total = data.total;
+            return this.computeGrpcData(data);
+          }
+          return undefined;
         }),
         map((data) => {
           if (data) {
@@ -247,35 +261,37 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
       if (conditionsIndex !== -1) {
         this.groupsConditions[conditionsIndex] = dialogResult.editedGroups[key];
       }
-      const groupIndex = this.groups.findIndex((group) => group.name === key);
-      if (groupIndex) {
-        this.groupsConditions[groupIndex].name = dialogResult.editedGroups[key].name;
+      const groupIndex = this.groups.findIndex((group) => group.name() === key);
+      if (groupIndex !== -1) {
+        this.groups[groupIndex].name.set(dialogResult.editedGroups[key].name);
       }
     });
 
     dialogResult.addedGroups.forEach((group) => (this.addGroup(group)));
 
     dialogResult.deletedGroups.forEach((groupName) => (this.removeGroup(groupName)));
+
+    this.refresh$.next();
   }
 
-  setGroups() {
-    this.groupsConditions.forEach((g) => this.initGroup(g));
+  initGroups() {
+    this.groupsConditions.forEach((g) => this.setGroup(g.name));
   }
 
   addGroup(groupCondition: GroupConditions<SessionRawEnumField, TaskOptionEnumField>) {
     this.groupsConditions.push(groupCondition);
-    this.initGroup(groupCondition);
+    this.setGroup(groupCondition.name);
   }
 
   refreshGroup(groupName: string) {
-    const group = this.groups.find((group) => group.name === groupName);
+    const group = this.groups.find((group) => group.name() === groupName);
     if (group) {
       group.refresh$.next();
     }
   }
 
   removeGroup(groupName: string) {
-    const index = this.groups.findIndex((group) => group.name === groupName);
+    const index = this.groups.findIndex((group) => group.name() === groupName);
     if (index !== -1) {
       this.groups.splice(index, 1);
     }
diff --git a/src/app/types/groups.ts b/src/app/types/groups.ts
index 8b37135cf..b0feeac4a 100644
--- a/src/app/types/groups.ts
+++ b/src/app/types/groups.ts
@@ -1,3 +1,4 @@
+import { WritableSignal } from '@angular/core';
 import { TaskOptions } from '@app/tasks/types';
 import { Observable, Subject } from 'rxjs';
 import { ArmonikData, DataRaw } from './data';
@@ -9,7 +10,7 @@ export type GroupConditions<F extends FiltersEnums, FO extends FiltersOptionsEnu
 }
 
 export type Group<T extends DataRaw, O extends TaskOptions | null = null> = {
-  name: string;
+  name: WritableSignal<string>;
   opened: boolean;
   total: number;
   page: number;

From 4cd68a844db9bafd0f5da2fa625ecb9455919faf Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 12 Feb 2025 11:09:02 +0100
Subject: [PATCH 16/47] feat: added groups everywhere

---
 src/app/applications/index.component.html     |   1 +
 .../components/columns-button.component.ts    |   1 -
 .../table-actions-toolbar.component.html      |   5 +
 .../table-actions-toolbar.component.ts        |   5 +
 ...e-dashboard-actions-toolbar.component.html |   1 +
 ...ble-dashboard-actions-toolbar.component.ts |   5 +
 ...table-index-actions-toolbar.component.html |   1 +
 .../table-index-actions-toolbar.component.ts  |   5 +
 .../manage-groups-dialog.component.ts         |  10 +-
 .../lines/applications-line.component.html    |   1 +
 .../lines/partitions-line.component.html      |   1 +
 .../lines/results-line.component.html         |   1 +
 .../lines/sessions-line.component.html        |   1 +
 .../lines/tasks-line.component.html           |   1 +
 src/app/dashboard/index.component.ts          |  15 +--
 src/app/dashboard/types.ts                    |   2 +
 src/app/partitions/index.component.html       |   1 +
 src/app/results/index.component.html          |   1 +
 src/app/services/default-config.service.ts    |   5 +
 src/app/services/table.service.ts             |  24 +++-
 .../sessions/components/table.component.html  |  10 +-
 .../sessions/components/table.component.ts    |  24 +---
 src/app/sessions/index.component.html         |   5 +-
 src/app/sessions/index.component.ts           |  19 +--
 .../services/sessions-data.service.ts         | 116 +-----------------
 src/app/tasks/index.component.html            |   1 +
 .../types/components/dashboard-line-table.ts  |  29 ++++-
 src/app/types/components/index.ts             |  28 ++++-
 src/app/types/components/table.ts             |  28 ++++-
 src/app/types/config.ts                       |   3 +-
 src/app/types/services/data-filter.service.ts |  15 ++-
 src/app/types/services/table-data.service.ts  |  90 +++++++++++++-
 32 files changed, 266 insertions(+), 189 deletions(-)

diff --git a/src/app/applications/index.component.html b/src/app/applications/index.component.html
index 33d861f3b..3d1fd39e5 100644
--- a/src/app/applications/index.component.html
+++ b/src/app/applications/index.component.html
@@ -20,6 +20,7 @@
       (resetFilters)="onFiltersReset()"
       (lockColumnsChange)="onLockColumnsChange()"
       (addToDashboard)="onAddToDashboard()"
+      (groupSettings)="openGroupsSettings()"
     >
     </app-table-index-actions-toolbar>
   </mat-toolbar-row>
diff --git a/src/app/components/columns-button.component.ts b/src/app/components/columns-button.component.ts
index 62f1c13ed..8c17165f4 100644
--- a/src/app/components/columns-button.component.ts
+++ b/src/app/components/columns-button.component.ts
@@ -20,7 +20,6 @@ import { ColumnsModifyDialogComponent } from './columns-modify-dialog.component'
   `],
   standalone: true,
   imports: [
-    ColumnsModifyDialogComponent,
     MatDialogModule,
     MatButtonModule,
     MatIconModule
diff --git a/src/app/components/table-actions-toolbar.component.html b/src/app/components/table-actions-toolbar.component.html
index fbe6deb0a..aee9c9c7d 100644
--- a/src/app/components/table-actions-toolbar.component.html
+++ b/src/app/components/table-actions-toolbar.component.html
@@ -9,6 +9,11 @@
   
     <app-actions-toolbar-group>
       <ng-content select="[extra-buttons-right]"></ng-content>
+
+      <button mat-button (click)="openGroupsSettings()">
+        <mat-icon [fontIcon]="getIcon('table-group')" />
+        <span i18n>Manage Groups</span>
+      </button>
   
       <app-columns-button
         [columnsLabels]="columnsLabels"
diff --git a/src/app/components/table-actions-toolbar.component.ts b/src/app/components/table-actions-toolbar.component.ts
index b88883472..213cfd82d 100644
--- a/src/app/components/table-actions-toolbar.component.ts
+++ b/src/app/components/table-actions-toolbar.component.ts
@@ -50,6 +50,7 @@ export class TableActionsToolbarComponent<T extends DataRaw, O extends TaskOptio
   @Output() resetColumns: EventEmitter<void> = new EventEmitter<void>();
   @Output() resetFilters: EventEmitter<void> = new EventEmitter<void>();
   @Output() lockColumnsChange = new EventEmitter<void>();
+  @Output() groupSettings = new EventEmitter<void>();
 
   getIcon(name: string): string {
     return this.iconsService.getIcon(name);
@@ -78,4 +79,8 @@ export class TableActionsToolbarComponent<T extends DataRaw, O extends TaskOptio
   onLockColumnsChange(): void {
     this.lockColumnsChange.emit();
   }
+
+  openGroupsSettings(): void {
+    this.groupSettings.emit();
+  }
 }
diff --git a/src/app/components/table-dashboard-actions-toolbar.component.html b/src/app/components/table-dashboard-actions-toolbar.component.html
index 4693b00f9..d60b39e01 100644
--- a/src/app/components/table-dashboard-actions-toolbar.component.html
+++ b/src/app/components/table-dashboard-actions-toolbar.component.html
@@ -12,6 +12,7 @@
 (resetColumns)="onColumnsReset()"
 (resetFilters)="onFiltersReset()"
 (lockColumnsChange)="onLockColumnsChange()"
+(groupSettings)="openGroupsSettings()"
 >
 <ng-content extra-buttons-right select="[extra-buttons-right]"></ng-content>
 <ng-container extra-menu-items>
diff --git a/src/app/components/table-dashboard-actions-toolbar.component.ts b/src/app/components/table-dashboard-actions-toolbar.component.ts
index 2004f76f0..67e966b1e 100644
--- a/src/app/components/table-dashboard-actions-toolbar.component.ts
+++ b/src/app/components/table-dashboard-actions-toolbar.component.ts
@@ -35,6 +35,7 @@ export class TableDashboardActionsToolbarComponent<T extends DataRaw, O extends
   @Output() lockColumnsChange = new EventEmitter<void>();
   @Output() editNameLine = new EventEmitter<void>();
   @Output() deleteLine = new EventEmitter<void>();
+  @Output() groupSettings = new EventEmitter<void>();
 
   getIcon(name: string): string {
     return this.iconsService.getIcon(name);
@@ -71,4 +72,8 @@ export class TableDashboardActionsToolbarComponent<T extends DataRaw, O extends
   onDeleteLine() {
     this.deleteLine.emit();
   }
+
+  openGroupsSettings(): void {
+    this.groupSettings.emit();
+  }
 }
\ No newline at end of file
diff --git a/src/app/components/table-index-actions-toolbar.component.html b/src/app/components/table-index-actions-toolbar.component.html
index 8e9e3fe82..a7ec5cd95 100644
--- a/src/app/components/table-index-actions-toolbar.component.html
+++ b/src/app/components/table-index-actions-toolbar.component.html
@@ -12,6 +12,7 @@
 (resetColumns)="onColumnsReset()"
 (resetFilters)="onFiltersReset()"
 (lockColumnsChange)="onLockColumnsChange()"
+(groupSettings)="openGroupsSettings()"
 >
 <ng-content extra-buttons-right select="[extra-buttons-right]"></ng-content>
 <ng-container extra-menu-items>
diff --git a/src/app/components/table-index-actions-toolbar.component.ts b/src/app/components/table-index-actions-toolbar.component.ts
index 37a7a1b5c..6da3e9a69 100644
--- a/src/app/components/table-index-actions-toolbar.component.ts
+++ b/src/app/components/table-index-actions-toolbar.component.ts
@@ -35,6 +35,7 @@ export class TableIndexActionsToolbarComponent<T extends DataRaw, O extends Task
   @Output() resetFilters: EventEmitter<void> = new EventEmitter<void>();
   @Output() lockColumnsChange = new EventEmitter<void>();
   @Output() addToDashboard = new EventEmitter<void>();
+  @Output() groupSettings = new EventEmitter<void>();
 
   getIcon(value: string): string {
     return this.iconsService.getIcon(value);
@@ -67,4 +68,8 @@ export class TableIndexActionsToolbarComponent<T extends DataRaw, O extends Task
   onAddToDashboard(): void {
     this.addToDashboard.emit();
   }
+
+  openGroupsSettings(): void {
+    this.groupSettings.emit();
+  }
 }
\ No newline at end of file
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
index a3557e876..6303ad8ce 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
@@ -11,12 +11,12 @@ import { FiltersDialogOrComponent } from '@components/filters/filters-dialog-or.
 import { FiltersService } from '@services/filters.service';
 import { IconsService } from '@services/icons.service';
 
-export type ManageGroupsDialogInput<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
+export type ManageGroupsTableDialogInput<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
   groups: GroupConditions<F, FO>[];
   selected?: string;
 }
 
-export type ManageGroupsDialogResult<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
+export type ManageGroupsTableDialogResult<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
   addedGroups: GroupConditions<F, FO>[];
   editedGroups: Record<string, GroupConditions<F, FO>>;
   deletedGroups: string[];
@@ -40,9 +40,9 @@ export type ManageGroupsDialogResult<F extends FiltersEnums, FO extends FiltersO
     FiltersService
   ]
 })
-export class ManageGroupsDialogComponent<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
-  private readonly dialogRef: MatDialogRef<ManageGroupsDialogComponent<F, FO>, ManageGroupsDialogResult<F, FO>> = inject(MatDialogRef);
-  constructor(@Inject(MAT_DIALOG_DATA) dialogData: ManageGroupsDialogInput<F, FO>) {
+export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
+  private readonly dialogRef: MatDialogRef<ManageTableGroupsDialogComponent<F, FO>, ManageGroupsTableDialogResult<F, FO>> = inject(MatDialogRef);
+  constructor(@Inject(MAT_DIALOG_DATA) dialogData: ManageGroupsTableDialogInput<F, FO>) {
     this.groups = structuredClone(dialogData.groups);
     if (dialogData.selected !== undefined) {
       const group = this.groups.find(group => group.name === dialogData.selected);
diff --git a/src/app/dashboard/components/lines/applications-line.component.html b/src/app/dashboard/components/lines/applications-line.component.html
index a4b26d040..822e99dca 100644
--- a/src/app/dashboard/components/lines/applications-line.component.html
+++ b/src/app/dashboard/components/lines/applications-line.component.html
@@ -16,6 +16,7 @@
         (lockColumnsChange)="onLockColumnsChange()"
         (deleteLine)="onDeleteLine()"
         (editNameLine)="onEditNameLine()"
+        (groupSettings)="openGroupsSettings()"
       >
       </app-table-dashboard-actions-toolbar>
     </mat-toolbar-row>
diff --git a/src/app/dashboard/components/lines/partitions-line.component.html b/src/app/dashboard/components/lines/partitions-line.component.html
index 402b611be..d5f15d323 100644
--- a/src/app/dashboard/components/lines/partitions-line.component.html
+++ b/src/app/dashboard/components/lines/partitions-line.component.html
@@ -16,6 +16,7 @@
       (lockColumnsChange)="onLockColumnsChange()"
       (deleteLine)="onDeleteLine()"
       (editNameLine)="onEditNameLine()"
+      (groupSettings)="openGroupsSettings()"
     >
     </app-table-dashboard-actions-toolbar>
   </mat-toolbar-row>
diff --git a/src/app/dashboard/components/lines/results-line.component.html b/src/app/dashboard/components/lines/results-line.component.html
index 3754cc45d..35740959d 100644
--- a/src/app/dashboard/components/lines/results-line.component.html
+++ b/src/app/dashboard/components/lines/results-line.component.html
@@ -16,6 +16,7 @@
       (lockColumnsChange)="onLockColumnsChange()"
       (deleteLine)="onDeleteLine()"
       (editNameLine)="onEditNameLine()"
+      (groupSettings)="openGroupsSettings()"
     >
     </app-table-dashboard-actions-toolbar>
   </mat-toolbar-row>
diff --git a/src/app/dashboard/components/lines/sessions-line.component.html b/src/app/dashboard/components/lines/sessions-line.component.html
index 0f628f8b5..7c2fef4c6 100644
--- a/src/app/dashboard/components/lines/sessions-line.component.html
+++ b/src/app/dashboard/components/lines/sessions-line.component.html
@@ -16,6 +16,7 @@
       (lockColumnsChange)="onLockColumnsChange()"
       (deleteLine)="onDeleteLine()"
       (editNameLine)="onEditNameLine()"
+      (groupSettings)="openGroupsSettings()"
     >
       <ng-container extra-menu-items>
         <button mat-menu-item (click)="addCustomColumn()">
diff --git a/src/app/dashboard/components/lines/tasks-line.component.html b/src/app/dashboard/components/lines/tasks-line.component.html
index c750fd1ad..66c27e25d 100644
--- a/src/app/dashboard/components/lines/tasks-line.component.html
+++ b/src/app/dashboard/components/lines/tasks-line.component.html
@@ -16,6 +16,7 @@
       (lockColumnsChange)="onLockColumnsChange()"
       (deleteLine)="onDeleteLine()"
       (editNameLine)="onEditNameLine()"
+      (groupSettings)="openGroupsSettings()"
     >
     <ng-container extra-buttons-right>
       <button mat-flat-button color="accent" (click)="onCancelTasksSelection()" [disabled]="!selection.length">
diff --git a/src/app/dashboard/index.component.ts b/src/app/dashboard/index.component.ts
index f3ca934ae..ee685e699 100644
--- a/src/app/dashboard/index.component.ts
+++ b/src/app/dashboard/index.component.ts
@@ -10,15 +10,9 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TasksStatusesService } from '@app/tasks/services/tasks-statuses.service';
 import { AddLineDialogData, AddLineDialogResult, ReorganizeLinesDialogData, ReorganizeLinesDialogResult, SplitLinesDialogData, SplitLinesDialogResult } from '@app/types/dialog';
-import { ActionsToolbarGroupComponent } from '@components/actions-toolbar-group.component';
-import { ActionsToolbarComponent } from '@components/actions-toolbar.component';
-import { AutoRefreshButtonComponent } from '@components/auto-refresh-button.component';
-import { FiltersToolbarComponent } from '@components/filters/filters-toolbar.component';
 import { PageHeaderComponent } from '@components/page-header.component';
 import { PageSectionHeaderComponent } from '@components/page-section-header.component';
 import { PageSectionComponent } from '@components/page-section.component';
-import { RefreshButtonComponent } from '@components/refresh-button.component';
-import { SpinnerComponent } from '@components/spinner.component';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { FiltersService } from '@services/filters.service';
 import { IconsService } from '@services/icons.service';
@@ -106,12 +100,7 @@ import { Line, LineType } from './types';
   imports: [
     PageHeaderComponent,
     PageSectionComponent,
-    SpinnerComponent,
     PageSectionHeaderComponent,
-    ActionsToolbarComponent,
-    ActionsToolbarGroupComponent,
-    RefreshButtonComponent,
-    AutoRefreshButtonComponent,
     MatIconModule,
     MatToolbarModule,
     MatButtonModule,
@@ -120,7 +109,6 @@ import { Line, LineType } from './types';
     MatCardModule,
     MatTooltipModule,
     MatProgressSpinnerModule,
-    FiltersToolbarComponent,
     TaskByStatusLineComponent,
     ApplicationsLineComponent,
     ResultsLineComponent,
@@ -191,6 +179,7 @@ export class IndexComponent implements OnInit {
           interval: 5,
           hideGroupsHeader: false,
           filters: [],
+          groups: [],
           taskStatusesGroups: [
             {
               name: 'Finished',
@@ -224,7 +213,7 @@ export class IndexComponent implements OnInit {
           name: result.name,
           type: result.type,
           interval: 5,
-          filters: []
+          filters: [],
         });
       }
       this.onSaveChange();
diff --git a/src/app/dashboard/types.ts b/src/app/dashboard/types.ts
index 9feb862f0..c942c211c 100644
--- a/src/app/dashboard/types.ts
+++ b/src/app/dashboard/types.ts
@@ -6,6 +6,7 @@ import { SessionRaw } from '@app/sessions/types';
 import { TaskOptions, TaskSummary } from '@app/tasks/types';
 import { ColumnKey, CustomColumn, DataRaw } from '@app/types/data';
 import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { StatusLabelColor } from '@app/types/status';
 import { TableType } from '@app/types/table';
@@ -29,6 +30,7 @@ export interface CountLine extends Line {
 
 export interface TableLine<T extends DataRaw, O extends TaskOptions | null = null> extends Line {
   options?: ListOptions<T, O>;
+  groups?: GroupConditions<FiltersEnums, FiltersOptionsEnums>[];
   displayedColumns?: ColumnKey<T, O>[],
   lockColumns?: boolean;
   customColumns?: CustomColumn[],
diff --git a/src/app/partitions/index.component.html b/src/app/partitions/index.component.html
index dd69db783..fc1baebeb 100644
--- a/src/app/partitions/index.component.html
+++ b/src/app/partitions/index.component.html
@@ -20,6 +20,7 @@
       (resetFilters)="onFiltersReset()"
       (lockColumnsChange)="onLockColumnsChange()"
       (addToDashboard)="onAddToDashboard()"
+      (groupSettings)="openGroupsSettings()"
       >
     </app-table-index-actions-toolbar>
   </mat-toolbar-row>
diff --git a/src/app/results/index.component.html b/src/app/results/index.component.html
index c928b5511..a03a0be0f 100644
--- a/src/app/results/index.component.html
+++ b/src/app/results/index.component.html
@@ -20,6 +20,7 @@
       (resetFilters)="onFiltersReset()"
       (lockColumnsChange)="onLockColumnsChange()"
       (addToDashboard)="onAddToDashboard()"
+      (groupSettings)="openGroupsSettings()"
       >
     </app-table-index-actions-toolbar>
   </mat-toolbar-row>
diff --git a/src/app/services/default-config.service.ts b/src/app/services/default-config.service.ts
index 8fd3899f6..aec501417 100644
--- a/src/app/services/default-config.service.ts
+++ b/src/app/services/default-config.service.ts
@@ -312,6 +312,11 @@ export class DefaultConfigService {
     'tasks-show-filters': this.#defaultTasks.showFilters,
     'tasks-custom-columns': [],
     'sessions-custom-columns': [],
+    'applications-groups': [],
+    'partitions-groups': [],
+    'sessions-groups': [],
+    'tasks-groups': [],
+    'results-groups': [],
   };
 
   get exportedDefaultConfig(): ExportedDefaultConfig {
diff --git a/src/app/services/table.service.ts b/src/app/services/table.service.ts
index 0f88b755b..d01e54d3e 100644
--- a/src/app/services/table.service.ts
+++ b/src/app/services/table.service.ts
@@ -4,7 +4,8 @@ import { TaskOptions } from '@app/tasks/types';
 import { CustomScope, Scope } from '@app/types/config';
 import { DataRaw, FieldKey } from '@app/types/data';
 import { FilterDefinition } from '@app/types/filter-definition';
-import { FiltersOr } from '@app/types/filters';
+import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { TableStorageService } from './table-storage.service';
 import { TableURLService } from './table-url.service';
@@ -122,6 +123,27 @@ export class TableService {
     return this.tableStorageService.restore(key) as boolean;
   }
 
+  /**
+   * Save groups for a given table.
+   */
+  saveGroups<F extends FiltersEnums, O extends FiltersOptionsEnums | null>(key: `${Scope}-groups`, groups: GroupConditions<F, O>[]) {
+    this.tableStorageService.save(key, groups);
+  }
+
+  /**
+   * Retrieve groups for a given table.
+   */
+  restoreGroups<F extends FiltersEnums, O extends FiltersOptionsEnums | null>(key: `${Scope}-groups`): GroupConditions<F, O>[] {
+    return (this.tableStorageService.restore(key) ?? []) as GroupConditions<F, O>[];
+  }
+
+  /**
+   * Reset groups for a given table.
+   */
+  resetGroups(key: `${Scope}-groups`) {
+    return this.tableStorageService.remove(key);
+  }
+
   /**
    * Save columns to the local storage
    */
diff --git a/src/app/sessions/components/table.component.html b/src/app/sessions/components/table.component.html
index e1702eb6e..6d70327e7 100644
--- a/src/app/sessions/components/table.component.html
+++ b/src/app/sessions/components/table.component.html
@@ -1,3 +1,9 @@
-<app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [groups]="tableDataService.groups" [total]="total()" [options]="options" [lockColumns]="lockColumns"
+<app-table 
+  [trackBy]="trackBy" [columns]="columns" [data]="data()"
+  [groups]="tableDataService.groups" [total]="total()"
+  [options]="options" [lockColumns]="lockColumns"
   [actions]="actions" [statusesService]="statusesService" [statusesGroups]="statusesGroups"
-  (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()" (personnalizeTasksByStatus)="personalizeTasksByStatus()" (groupPageChange)="groupPageChange($event)" (groupSettings)="groupeSettingsDisplay($event)" />
+  (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()"
+  (personnalizeTasksByStatus)="personalizeTasksByStatus()" (groupPageChange)="updateGroupPage($event)"
+  (groupSettings)="openGroupSettings($event)"
+/>
diff --git a/src/app/sessions/components/table.component.ts b/src/app/sessions/components/table.component.ts
index 8b1f0399c..eaee5f645 100644
--- a/src/app/sessions/components/table.component.ts
+++ b/src/app/sessions/components/table.component.ts
@@ -1,13 +1,12 @@
 import { SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { Clipboard} from '@angular/cdk/clipboard';
-import { Component, OnInit, ViewContainerRef, inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { MatDialogModule } from '@angular/material/dialog';
 import { Router, RouterModule } from '@angular/router';
 import { TaskOptions } from '@app/tasks/types';
 import { AbstractTaskByStatusTableComponent } from '@app/types/components/table';
 import { ArmonikData, SessionData } from '@app/types/data';
 import { ActionTable } from '@app/types/table';
-import { ManageGroupsDialogComponent, ManageGroupsDialogInput } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { TableComponent } from '@components/table/table.component';
 import { TableTasksByStatus, TasksByStatusService } from '@services/tasks-by-status.service';
 import { Subject } from 'rxjs';
@@ -34,7 +33,6 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
   readonly statusesService = inject(SessionsStatusesService);
   readonly router = inject(Router);
   readonly copyService = inject(Clipboard);
-  private readonly viewContainerRef = inject(ViewContainerRef);
 
   readonly tableDataService = inject(SessionsDataService);
 
@@ -165,24 +163,4 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
   trackBy(index: number, _item: ArmonikData<SessionRaw, TaskOptions>) {
     return index;
   }
-
-  groupPageChange(groupName: string) {
-    this.tableDataService.refreshGroup(groupName);
-  }
-
-  groupeSettingsDisplay(groupName: string) {
-    const dialogRef = this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField, TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
-      data: {
-        groups: this.tableDataService.groupsConditions,
-        selected: groupName,
-      },
-      viewContainerRef: this.viewContainerRef
-    });
-
-    dialogRef.afterClosed().subscribe((result) => {
-      if (result) {
-        this.tableDataService.manageGroupDialogResult(result);
-      }
-    });
-  }
 }
diff --git a/src/app/sessions/index.component.html b/src/app/sessions/index.component.html
index d44015621..3da2d3791 100644
--- a/src/app/sessions/index.component.html
+++ b/src/app/sessions/index.component.html
@@ -20,12 +20,9 @@
       (resetFilters)="onFiltersReset()"
       (lockColumnsChange)="onLockColumnsChange()"
       (addToDashboard)="onAddToDashboard()"
+      (groupSettings)="openGroupsSettings()"
     >
       <ng-container extra-buttons-right>
-        <button mat-button (click)="openGroups()">
-          <mat-icon [fontIcon]="getIcon('table-group')" />
-          <span i18n>Manage Groups</span>
-        </button>
       </ng-container>
       <ng-container extra-menu-items>
         <button mat-menu-item (click)="addCustomColumn()">
diff --git a/src/app/sessions/index.component.ts b/src/app/sessions/index.component.ts
index be038617b..be641a819 100644
--- a/src/app/sessions/index.component.ts
+++ b/src/app/sessions/index.component.ts
@@ -1,5 +1,5 @@
 import { SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { AfterViewInit, Component, OnDestroy, OnInit, ViewContainerRef, inject } from '@angular/core';
+import { AfterViewInit, Component, OnDestroy, OnInit, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
@@ -19,7 +19,6 @@ import { DataFilterService } from '@app/types/services/data-filter.service';
 import { TableType } from '@app/types/table';
 import { FiltersToolbarComponent } from '@components/filters/filters-toolbar.component';
 import { PageHeaderComponent } from '@components/page-header.component';
-import { ManageGroupsDialogComponent, ManageGroupsDialogInput } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { TableIndexActionsToolbarComponent } from '@components/table-index-actions-toolbar.component';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { FiltersService } from '@services/filters.service';
@@ -91,7 +90,6 @@ export class IndexComponent extends TableHandlerCustomValues<SessionRaw, Session
   readonly filtersService = inject(SessionsFiltersService);
   readonly indexService = inject(SessionsIndexService);
   readonly tableDataService = inject(SessionsDataService);
-  private readonly viewContainerRef = inject(ViewContainerRef);
 
   tableType: TableType = 'Sessions';
 
@@ -122,19 +120,4 @@ export class IndexComponent extends TableHandlerCustomValues<SessionRaw, Session
       this.refresh();
     }
   }
-
-  openGroups() {
-    const dialogRef = this.dialog.open<ManageGroupsDialogComponent<SessionRawEnumField,TaskOptionEnumField>, ManageGroupsDialogInput<SessionRawEnumField,TaskOptionEnumField>>(ManageGroupsDialogComponent, {
-      data: {
-        groups: this.tableDataService.groupsConditions
-      },
-      viewContainerRef: this.viewContainerRef
-    });
-
-    dialogRef.afterClosed().subscribe((result) => {
-      if (result) {
-        this.tableDataService.manageGroupDialogResult(result);
-      }
-    });
-  }
 }
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index 919414137..1d9a3d65c 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -1,17 +1,15 @@
 import { FilterDateOperator, FilterStringOperator, ListSessionsResponse, ResultRawEnumField, SessionRawEnumField, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { Injectable, OnDestroy, inject, signal } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { Params } from '@angular/router';
 import { TaskOptions, TaskSummaryFilters } from '@app/tasks/types';
 import { Scope } from '@app/types/config';
 import { ColumnKey, SessionData } from '@app/types/data';
 import { Filter, FiltersOr } from '@app/types/filters';
-import { Group, GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { AbstractTableDataService } from '@app/types/services/table-data.service';
-import { ManageGroupsDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { Duration, Timestamp } from '@ngx-grpc/well-known-types';
 import { InvertFilterService } from '@services/invert-filter.service';
-import { Subject, map, merge, mergeAll, of, switchMap } from 'rxjs';
+import { Subject, map, mergeAll } from 'rxjs';
 import { SessionsGrpcService } from './sessions-grpc.service';
 import { SessionRaw } from '../types';
 
@@ -22,36 +20,9 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
 
   scope: Scope = 'sessions';
 
-  groups: Group<SessionRaw, TaskOptions>[] = [];
-
-  groupsConditions: GroupConditions<SessionRawEnumField, TaskOptionEnumField>[] = [
-    {
-      name: 'Group 1',
-      conditions: [
-        [
-          {
-            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
-            for: 'root',
-            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
-            value: '335af491-ff89-4b9a-8952-8cb2e800be65'
-          }
-        ],
-        [
-          {
-            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
-            for: 'root',
-            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
-            value: '03b69175-b3fb-47e4-b1b1-b5a6ab302601'
-          }
-        ]
-      ]
-    }
-  ];
-
   constructor() {
     super();
     this.subscribeToDurationSubjects();
-    this.initGroups();
   }
 
   ngOnDestroy(): void {
@@ -214,89 +185,6 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     ];
   }
 
-  setGroup(groupName: string) {
-    const groupRefresh$ = new Subject<void>();
-    const group: Group<SessionRaw, TaskOptions> = {
-      name: signal(groupName),
-      opened: false,
-      total: 0,
-      page: 0,
-      refresh$: groupRefresh$,
-      data: merge(this.refresh$, groupRefresh$).pipe(
-        switchMap(() => {
-          const options = {
-            pageSize: 100,
-            pageIndex: group.page,
-            sort: this.options.sort
-          };
-          const groupConditions = this.groupsConditions.find((condition) => condition.name === group.name());
-          if (groupConditions) {
-            return this.grpcService.list$(options, groupConditions.conditions);
-          }
-          return of(undefined);
-        }),
-        map((data) => {
-          if (data) {
-            group.total = data.total;
-            return this.computeGrpcData(data);
-          }
-          return undefined;
-        }),
-        map((data) => {
-          if (data) {
-            return data.map(entry => this.createNewLine(entry));
-          }
-          return [];
-        })
-      )
-    };
-
-    this.groups.push(group);
-  }
-
-  manageGroupDialogResult(dialogResult: ManageGroupsDialogResult<SessionRawEnumField, TaskOptionEnumField>) {
-    const editedKeys = Object.keys(dialogResult.editedGroups);
-    editedKeys.forEach((key) => {
-      const conditionsIndex =  this.groupsConditions.findIndex((group) => group.name === key);
-      if (conditionsIndex !== -1) {
-        this.groupsConditions[conditionsIndex] = dialogResult.editedGroups[key];
-      }
-      const groupIndex = this.groups.findIndex((group) => group.name() === key);
-      if (groupIndex !== -1) {
-        this.groups[groupIndex].name.set(dialogResult.editedGroups[key].name);
-      }
-    });
-
-    dialogResult.addedGroups.forEach((group) => (this.addGroup(group)));
-
-    dialogResult.deletedGroups.forEach((groupName) => (this.removeGroup(groupName)));
-
-    this.refresh$.next();
-  }
-
-  initGroups() {
-    this.groupsConditions.forEach((g) => this.setGroup(g.name));
-  }
-
-  addGroup(groupCondition: GroupConditions<SessionRawEnumField, TaskOptionEnumField>) {
-    this.groupsConditions.push(groupCondition);
-    this.setGroup(groupCondition.name);
-  }
-
-  refreshGroup(groupName: string) {
-    const group = this.groups.find((group) => group.name() === groupName);
-    if (group) {
-      group.refresh$.next();
-    }
-  }
-
-  removeGroup(groupName: string) {
-    const index = this.groups.findIndex((group) => group.name() === groupName);
-    if (index !== -1) {
-      this.groups.splice(index, 1);
-    }
-  }
-
   // Duration computation
   isDurationDisplayed = false;
   private dataRaw: SessionRaw[];
diff --git a/src/app/tasks/index.component.html b/src/app/tasks/index.component.html
index 491a71d3a..9f8b4e7fa 100644
--- a/src/app/tasks/index.component.html
+++ b/src/app/tasks/index.component.html
@@ -20,6 +20,7 @@
       (resetFilters)="onFiltersReset()"
       (lockColumnsChange)="onLockColumnsChange()"
       (addToDashboard)="onAddToDashboard()"
+      (groupSettings)="openGroupsSettings()"
       >
         <ng-container extra-buttons-right>
           <button mat-flat-button color="accent" (click)="onCancelTasksSelection()" [disabled]="!selection.length">
diff --git a/src/app/types/components/dashboard-line-table.ts b/src/app/types/components/dashboard-line-table.ts
index 4ea85a281..36090fd41 100644
--- a/src/app/types/components/dashboard-line-table.ts
+++ b/src/app/types/components/dashboard-line-table.ts
@@ -1,9 +1,10 @@
-import { Component, EventEmitter, Input, Output, inject, signal } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ViewContainerRef, inject, signal } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { EditNameLineDialogComponent } from '@app/dashboard/components/edit-name-line-dialog.component';
 import { TableLine } from '@app/dashboard/types';
 import { TaskOptions } from '@app/tasks/types';
 import { ManageCustomColumnDialogComponent } from '@components/manage-custom-dialog.component';
+import { ManageGroupsTableDialogInput, ManageGroupsTableDialogResult, ManageTableGroupsDialogComponent } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { DefaultConfigService } from '@services/default-config.service';
 import { IconsService } from '@services/icons.service';
@@ -13,6 +14,7 @@ import { ScopeConfig } from '../config';
 import { ColumnKey, CustomColumn, DataRaw } from '../data';
 import { EditNameLineData } from '../dialog';
 import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '../filters';
+import { GroupConditions } from '../groups';
 import { ListOptions } from '../options';
 import { IndexServiceCustomInterface, IndexServiceInterface } from '../services/indexService';
 import { AbstractTableDataService } from '../services/table-data.service';
@@ -26,6 +28,7 @@ export abstract class DashboardLineTableComponent<T extends DataRaw, F extends F
   readonly iconsService = inject(IconsService);
   readonly defaultConfigService = inject(DefaultConfigService);
   readonly dialog = inject(MatDialog);
+  private readonly viewContainerRef = inject(ViewContainerRef);
 
   abstract readonly tableDataService: AbstractTableDataService<T, F, O, FO>;
   abstract readonly indexService: IndexServiceInterface<T, O>;
@@ -67,7 +70,7 @@ export abstract class DashboardLineTableComponent<T extends DataRaw, F extends F
     this.updateDisplayedColumns();
     this.initOptions();
     this.initFilters();
-    this.initFilters();
+    this.initGroups();
     this.initInterval();
     this.handleAutoRefreshStart();
   }
@@ -87,6 +90,11 @@ export abstract class DashboardLineTableComponent<T extends DataRaw, F extends F
     this.showFilters = this.line.showFilters ?? this.defaultConfig.showFilters;
   }
 
+  private initGroups() {
+    this.tableDataService.groupsConditions = this.line.groups as GroupConditions<F, FO>[];
+    this.tableDataService.initGroups();
+  }
+
   initInterval() {
     this.intervalValue = this.line.interval ?? 10;
     this.interval.next(this.line.interval);
@@ -210,6 +218,23 @@ export abstract class DashboardLineTableComponent<T extends DataRaw, F extends F
     this.line.lockColumns = this.lockColumns;
     this.lineChange.emit();
   }
+
+  openGroupsSettings() {
+    const dialogRef = this.dialog.open<ManageTableGroupsDialogComponent<F, FO>, ManageGroupsTableDialogInput<F, FO>, ManageGroupsTableDialogResult<F, FO>>(ManageTableGroupsDialogComponent, {
+      data: {
+        groups: this.tableDataService.groupsConditions,
+      },
+      viewContainerRef: this.viewContainerRef
+    });
+
+    const subscription = dialogRef.afterClosed().subscribe((result) => {
+      if (result) {
+        this.tableDataService.manageGroupDialogResult(result);
+      }
+    });
+
+    subscription.unsubscribe();
+  }
 }
 
 @Component({
diff --git a/src/app/types/components/index.ts b/src/app/types/components/index.ts
index 4a24df0a4..4316ca74f 100644
--- a/src/app/types/components/index.ts
+++ b/src/app/types/components/index.ts
@@ -1,10 +1,11 @@
-import { inject, signal } from '@angular/core';
+import { ViewContainerRef, inject, signal } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { DashboardIndexService } from '@app/dashboard/services/dashboard-index.service';
 import { TableLine } from '@app/dashboard/types';
 import { TaskOptions } from '@app/tasks/types';
 import { ManageCustomColumnDialogComponent } from '@components/manage-custom-dialog.component';
+import { ManageGroupsTableDialogInput, ManageGroupsTableDialogResult, ManageTableGroupsDialogComponent } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { IconsService } from '@services/icons.service';
 import { ShareUrlService } from '@services/share-url.service';
@@ -24,6 +25,7 @@ export abstract class TableHandler<T extends DataRaw, F extends FiltersEnums, O
   readonly dialog = inject(MatDialog);
   readonly dashboardIndexService = inject(DashboardIndexService);
   readonly router = inject(Router);
+  private readonly viewContainerRef = inject(ViewContainerRef);
 
   abstract readonly indexService: IndexServiceInterface<T, O>;
   abstract readonly filtersService: DataFilterService<F, FO>;
@@ -64,6 +66,7 @@ export abstract class TableHandler<T extends DataRaw, F extends FiltersEnums, O
     this.updateDisplayedColumns();
     this.initFilters();
     this.initOptions();
+    this.initGroups();
     this.intervalValue = this.indexService.restoreIntervalValue();
     this.sharableURL = this.shareUrlService.generateSharableURL(this.options, this.filters);
   }
@@ -86,6 +89,11 @@ export abstract class TableHandler<T extends DataRaw, F extends FiltersEnums, O
     this.tableDataService.options = this.indexService.restoreOptions();
   }
 
+  private initGroups() {
+    this.tableDataService.groupsConditions = this.filtersService.restoreGroups();
+    this.tableDataService.initGroups();
+  }
+
   mergeSubscriptions() {
     const intervalSubscription = this.interval$.subscribe(() => this.refresh());
     this.subscriptions.add(intervalSubscription);
@@ -183,6 +191,23 @@ export abstract class TableHandler<T extends DataRaw, F extends FiltersEnums, O
     this.router.navigate(['/dashboard']);
   }
 
+  openGroupsSettings() {
+    const dialogRef = this.dialog.open<ManageTableGroupsDialogComponent<F, FO>, ManageGroupsTableDialogInput<F, FO>, ManageGroupsTableDialogResult<F, FO>>(ManageTableGroupsDialogComponent, {
+      data: {
+        groups: this.tableDataService.groupsConditions,
+      },
+      viewContainerRef: this.viewContainerRef
+    });
+
+    const subscription = dialogRef.afterClosed().subscribe((result) => {
+      if (result) {
+        this.tableDataService.manageGroupDialogResult(result);
+      }
+    });
+
+    subscription.unsubscribe();
+  }
+
   protected createDashboardLine(): TableLine<T, O> {
     return {
       name: this.tableType,
@@ -190,6 +215,7 @@ export abstract class TableHandler<T extends DataRaw, F extends FiltersEnums, O
       interval: 10,
       filters: this.filters,
       options: this.options,
+      groups: this.tableDataService.groupsConditions,
       displayedColumns: this.displayedColumnsKeys,
       lockColumns: this.lockColumns,
       showFilters: this.showFilters
diff --git a/src/app/types/components/table.ts b/src/app/types/components/table.ts
index 12959502b..9895a81f5 100644
--- a/src/app/types/components/table.ts
+++ b/src/app/types/components/table.ts
@@ -1,9 +1,10 @@
 import { SelectionModel } from '@angular/cdk/collections';
-import { Component, EventEmitter, Input, Output, Signal, inject } from '@angular/core';
+import { Component, EventEmitter, Input, Output, Signal, ViewContainerRef, inject } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { ManageGroupsDialogData, ManageGroupsDialogResult, TasksStatusesGroup } from '@app/dashboard/types';
 import { TaskOptions } from '@app/tasks/types';
 import { ManageGroupsDialogComponent } from '@components/statuses/manage-groups-dialog.component';
+import { ManageGroupsTableDialogInput, ManageGroupsTableDialogResult, ManageTableGroupsDialogComponent } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { NotificationService } from '@services/notification.service';
 import { TableTasksByStatus, TasksByStatusService } from '@services/tasks-by-status.service';
 import { TableColumn } from '../column.type';
@@ -45,6 +46,8 @@ export abstract class AbstractTableComponent<T extends DataRaw, F extends Filter
   
   readonly notificationService = inject(NotificationService);
   abstract readonly tableDataService: AbstractTableDataService<T, F, O, FO>;
+  readonly dialog = inject(MatDialog);
+  private readonly viewContainerRef = inject(ViewContainerRef);
 
   protected initTableDataService() {
     this.data = this.tableDataService.data;
@@ -61,6 +64,28 @@ export abstract class AbstractTableComponent<T extends DataRaw, F extends Filter
     this.optionsUpdate.emit();
   }
 
+  updateGroupPage(groupName: string) {
+    this.tableDataService.refreshGroup(groupName);
+  }
+
+  openGroupSettings(groupName: string) {
+    const dialogRef = this.dialog.open<ManageTableGroupsDialogComponent<F, FO>, ManageGroupsTableDialogInput<F, FO>, ManageGroupsTableDialogResult<F, FO>>(ManageTableGroupsDialogComponent, {
+      data: {
+        groups: this.tableDataService.groupsConditions,
+        selected: groupName,
+      },
+      viewContainerRef: this.viewContainerRef
+    });
+
+    const subscription = dialogRef.afterClosed().subscribe((result) => {
+      if (result) {
+        this.tableDataService.manageGroupDialogResult(result);
+      }
+    });
+
+    subscription.unsubscribe();
+  }
+
   abstract isDataRawEqual(value: T, entry: T): boolean;
   abstract trackBy(index: number, item: ArmonikData<T>): string | number;
 }
@@ -72,7 +97,6 @@ export abstract class AbstractTableComponent<T extends DataRaw, F extends Filter
 export abstract class AbstractTaskByStatusTableComponent<T extends DataRaw, F extends FiltersEnums, O extends TaskOptions | null = null, FO extends FiltersOptionsEnums | null = null>
   extends AbstractTableComponent<T, F, O, FO> {
   readonly tasksByStatusService = inject(TasksByStatusService);
-  readonly dialog = inject(MatDialog);
 
   statusesGroups: TasksStatusesGroup[];
   abstract table: TableTasksByStatus;
diff --git a/src/app/types/config.ts b/src/app/types/config.ts
index 07175c06b..12827c95d 100644
--- a/src/app/types/config.ts
+++ b/src/app/types/config.ts
@@ -30,7 +30,8 @@ export type Key =
   'tasks-view-in-logs' |
   `${CustomScope}-custom-columns` |
   `${Scope}-${Element}` |
-  `${Scope}-show-filters`;
+  `${Scope}-show-filters` |
+  `${Scope}-groups`;
 
 export type ExportedDefaultConfig = {
   [key in Key]: unknown;
diff --git a/src/app/types/services/data-filter.service.ts b/src/app/types/services/data-filter.service.ts
index 166f7fe77..d583c2136 100644
--- a/src/app/types/services/data-filter.service.ts
+++ b/src/app/types/services/data-filter.service.ts
@@ -10,6 +10,7 @@ import { TableService } from '@services/table.service';
 import { Scope } from '../config';
 import { FilterDefinition } from '../filter-definition';
 import { Filter, FiltersEnums, FiltersOptionsEnums, FiltersOr } from '../filters';
+import { GroupConditions } from '../groups';
 import { Status, StatusService } from '../status';
 
 export type FilterFor = TaskFilterFor | ResultFilterFor | SessionFilterFor | PartitionFilterFor | ApplicationFilterFor;
@@ -57,7 +58,19 @@ export abstract class DataFilterService<F extends FiltersEnums, O extends Filter
 
   getType(filter: Filter<F, O>) {
     return this.filtersDefinitions.find(definition => definition.field === filter.field && definition.for === filter.for)?.type;
-  } 
+  }
+
+  saveGroups(groups: GroupConditions<F, O>[]) {
+    this.tableService.saveGroups(`${this.scope}-groups`, groups);
+  }
+
+  restoreGroups() {
+    return this.tableService.restoreGroups<F, O>(`${this.scope}-groups`);
+  }
+
+  resetGroups() {
+    this.tableService.resetGroups(`${this.scope}-groups`);
+  }
 
   abstract retrieveLabel(filterFor: FilterFor, filterField: FilterField): string;
   abstract retrieveField(filterField: string): FilterField;
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index aebd988f5..3275b078c 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -3,13 +3,15 @@ import { TaskOptions } from '@app/tasks/types';
 import { ArmonikData, DataRaw, GrpcResponse } from '@app/types/data';
 import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
 import { ListOptions } from '@app/types/options';
+import { ManageGroupsTableDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
 import { NotificationService } from '@services/notification.service';
-import { Subject, Subscription, catchError, map, of, switchMap } from 'rxjs';
+import { Subject, Subscription, catchError, map, merge, of, switchMap } from 'rxjs';
 import { GrpcTableService } from './grpcService';
 import { Scope } from '../config';
+import { Group, GroupConditions } from '../groups';
 
 @Injectable()
 /**
@@ -31,6 +33,9 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   filters: FiltersOr<F, FO> = [];
   options: ListOptions<T, O>;
 
+  groups: Group<T, O>[] = [];
+  groupsConditions: GroupConditions<F, FO>[] = [];
+
   abstract scope: Scope;
 
   constructor() {
@@ -109,6 +114,89 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
     this.loading.set(false);
   }
 
+  setGroup(groupName: string) {
+    const groupRefresh$ = new Subject<void>();
+    const group: Group<T, O> = {
+      name: signal(groupName),
+      opened: false,
+      total: 0,
+      page: 0,
+      refresh$: groupRefresh$,
+      data: merge(this.refresh$, groupRefresh$).pipe(
+        switchMap(() => {
+          const options = {
+            pageSize: 100,
+            pageIndex: group.page,
+            sort: this.options.sort
+          };
+          const groupConditions = this.groupsConditions.find((condition) => condition.name === group.name());
+          if (groupConditions) {
+            return this.grpcService.list$(options, groupConditions.conditions);
+          }
+          return of(undefined);
+        }),
+        map((data) => {
+          if (data) {
+            group.total = data.total;
+            return this.computeGrpcData(data);
+          }
+          return undefined;
+        }),
+        map((data) => {
+          if (data) {
+            return data.map(entry => this.createNewLine(entry));
+          }
+          return [];
+        })
+      )
+    };
+
+    this.groups.push(group);
+  }
+
+  manageGroupDialogResult(dialogResult: ManageGroupsTableDialogResult<F, FO>) {
+    const editedKeys = Object.keys(dialogResult.editedGroups);
+    editedKeys.forEach((key) => {
+      const conditionsIndex =  this.groupsConditions.findIndex((group) => group.name === key);
+      if (conditionsIndex !== -1) {
+        this.groupsConditions[conditionsIndex] = dialogResult.editedGroups[key];
+      }
+      const groupIndex = this.groups.findIndex((group) => group.name() === key);
+      if (groupIndex !== -1) {
+        this.groups[groupIndex].name.set(dialogResult.editedGroups[key].name);
+      }
+    });
+
+    dialogResult.addedGroups.forEach((group) => (this.addGroup(group)));
+
+    dialogResult.deletedGroups.forEach((groupName) => (this.removeGroup(groupName)));
+
+    this.refresh$.next();
+  }
+
+  initGroups() {
+    this.groupsConditions.forEach((g) => this.setGroup(g.name));
+  }
+
+  addGroup(groupCondition: GroupConditions<F, FO>) {
+    this.groupsConditions.push(groupCondition);
+    this.setGroup(groupCondition.name);
+  }
+
+  refreshGroup(groupName: string) {
+    const group = this.groups.find((group) => group.name() === groupName);
+    if (group) {
+      group.refresh$.next();
+    }
+  }
+
+  removeGroup(groupName: string) {
+    const index = this.groups.findIndex((group) => group.name() === groupName);
+    if (index !== -1) {
+      this.groups.splice(index, 1);
+    }
+  }
+
   /**
    * Display a success message to the user.
    */

From 784b7718b607740a2b4766ba8a762d01bb4c2317 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 12 Feb 2025 11:38:00 +0100
Subject: [PATCH 17/47] fix: better refresh control

---
 src/app/applications/components/table.component.ts   | 11 +++++++++--
 .../table/group/group-row/group.component.html       |  2 +-
 src/app/partitions/components/table.component.ts     | 11 +++++++++--
 src/app/results/components/table.component.ts        | 11 +++++++++--
 src/app/sessions/components/table.component.ts       | 12 +++++++++---
 src/app/tasks/components/table.component.ts          | 11 +++++++++--
 src/app/types/components/index.ts                    |  5 ++---
 src/app/types/components/table.ts                    |  7 ++++---
 src/app/types/services/table-data.service.ts         | 10 +++++++---
 9 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/src/app/applications/components/table.component.ts b/src/app/applications/components/table.component.ts
index 10b36cb9b..e558de8f4 100644
--- a/src/app/applications/components/table.component.ts
+++ b/src/app/applications/components/table.component.ts
@@ -4,6 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { AbstractTaskByStatusTableComponent } from '@app/types/components/table';
 import { ArmonikData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { ActionTable } from '@app/types/table';
 import { TableComponent } from '@components/table/table.component';
 import { FiltersService } from '@services/filters.service';
@@ -11,6 +12,7 @@ import { IconsService } from '@services/icons.service';
 import { TableTasksByStatus, TasksByStatusService } from '@services/tasks-by-status.service';
 import { Subject } from 'rxjs';
 import ApplicationsDataService from '../services/applications-data.service';
+import { ApplicationsFiltersService } from '../services/applications-filters.service';
 import { ApplicationRaw } from '../types';
 
 @Component({
@@ -31,6 +33,7 @@ export class ApplicationsTableComponent extends AbstractTaskByStatusTableCompone
   table: TableTasksByStatus = 'applications';
   
   readonly tableDataService = inject(ApplicationsDataService);
+  readonly filtersService = inject(ApplicationsFiltersService);
   readonly iconsService = inject(IconsService);
   readonly router = inject(Router);
 
@@ -65,7 +68,11 @@ export class ApplicationsTableComponent extends AbstractTaskByStatusTableCompone
     };
   }
 
-  trackBy(index: number, item: ArmonikData<ApplicationRaw>) {
-    return `${item.raw.name}-${item.raw.version}`;
+  trackBy(index: number, item: ArmonikData<ApplicationRaw> | Group<ApplicationRaw>) {
+    if ((item as ArmonikData<ApplicationRaw>).raw !== undefined) {
+      return `${(item as ArmonikData<ApplicationRaw>).raw.name}-${(item as ArmonikData<ApplicationRaw>).raw.version}`;
+    } else {
+      return (item as Group<ApplicationRaw>).name();
+    }
   }
 }
\ No newline at end of file
diff --git a/src/app/components/table/group/group-row/group.component.html b/src/app/components/table/group/group-row/group.component.html
index 2f195a0f9..1497476b4 100644
--- a/src/app/components/table/group/group-row/group.component.html
+++ b/src/app/components/table/group/group-row/group.component.html
@@ -27,7 +27,7 @@
     <div class="table-actions">
       <mat-paginator [length]="group.total" [pageIndex]="group.page" (page)="pageChange($event)" pageSize="100" aria-label="Select page" i18n-aria-label />
     </div>
-    <table mat-table [dataSource]="group.data">
+    <table mat-table [dataSource]="group.data" [trackBy]="trackBy">
       @for (column of displayedColumns; track $index) {
         <ng-container [matColumnDef]="column.key.toString()">
           <ng-container *matHeaderCellDef></ng-container>
diff --git a/src/app/partitions/components/table.component.ts b/src/app/partitions/components/table.component.ts
index a39e62491..c0e6c527d 100644
--- a/src/app/partitions/components/table.component.ts
+++ b/src/app/partitions/components/table.component.ts
@@ -2,10 +2,12 @@ import { PartitionRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { Component, OnInit, inject } from '@angular/core';
 import { AbstractTaskByStatusTableComponent } from '@app/types/components/table';
 import { ArmonikData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { TableComponent } from '@components/table/table.component';
 import { FiltersService } from '@services/filters.service';
 import { TableTasksByStatus, TasksByStatusService } from '@services/tasks-by-status.service';
 import PartitionsDataService from '../services/partitions-data.service';
+import { PartitionsFiltersService } from '../services/partitions-filters.service';
 import { PartitionRaw } from '../types';
 
 @Component({
@@ -24,6 +26,7 @@ export class PartitionsTableComponent extends AbstractTaskByStatusTableComponent
   implements OnInit {
   
   readonly tableDataService = inject(PartitionsDataService);
+  readonly filtersService = inject(PartitionsFiltersService);
   
   table: TableTasksByStatus = 'partitions';
 
@@ -36,7 +39,11 @@ export class PartitionsTableComponent extends AbstractTaskByStatusTableComponent
     return value.id === entry.id;
   }
 
-  trackBy(index: number, items: ArmonikData<PartitionRaw>) {
-    return items.raw.id;
+  trackBy(index: number, item: ArmonikData<PartitionRaw> | Group<PartitionRaw>) {
+    if ((item as ArmonikData<PartitionRaw>).raw !== undefined) {
+      return (item as ArmonikData<PartitionRaw>).raw.id;
+    } else {
+      return (item as Group<PartitionRaw>).name();
+    }
   }
 }
\ No newline at end of file
diff --git a/src/app/results/components/table.component.ts b/src/app/results/components/table.component.ts
index 46fec411e..9dc27f8b1 100644
--- a/src/app/results/components/table.component.ts
+++ b/src/app/results/components/table.component.ts
@@ -2,9 +2,11 @@ import { ResultRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { Component, OnInit, inject } from '@angular/core';
 import { AbstractTableComponent } from '@app/types/components/table';
 import { ArmonikData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { TableComponent } from '@components/table/table.component';
 import { NotificationService } from '@services/notification.service';
 import ResultsDataService from '../services/results-data.service';
+import { ResultsFiltersService } from '../services/results-filters.service';
 import { ResultsStatusesService } from '../services/results-statuses.service';
 import { ResultRaw } from '../types';
 
@@ -22,6 +24,7 @@ import { ResultRaw } from '../types';
 })
 export class ResultsTableComponent extends AbstractTableComponent<ResultRaw, ResultRawEnumField> implements OnInit {
   readonly tableDataService = inject(ResultsDataService);
+  readonly filtersService = inject(ResultsFiltersService);
   readonly statusesService = inject(ResultsStatusesService);
 
   ngOnInit(): void {
@@ -32,7 +35,11 @@ export class ResultsTableComponent extends AbstractTableComponent<ResultRaw, Res
     return value.resultId === entry.resultId;
   }
 
-  trackBy(index: number, item: ArmonikData<ResultRaw>): string | number {
-    return item.raw.resultId;
+  trackBy(index: number, item: ArmonikData<ResultRaw> | Group<ResultRaw>): string | number {
+    if ((item as ArmonikData<ResultRaw>).raw !== undefined) {
+      return (item as ArmonikData<ResultRaw>).raw.resultId;
+    } else {
+      return (item as Group<ResultRaw>).name();
+    }
   }
 }
\ No newline at end of file
diff --git a/src/app/sessions/components/table.component.ts b/src/app/sessions/components/table.component.ts
index eaee5f645..a7338848b 100644
--- a/src/app/sessions/components/table.component.ts
+++ b/src/app/sessions/components/table.component.ts
@@ -6,11 +6,13 @@ import { Router, RouterModule } from '@angular/router';
 import { TaskOptions } from '@app/tasks/types';
 import { AbstractTaskByStatusTableComponent } from '@app/types/components/table';
 import { ArmonikData, SessionData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { ActionTable } from '@app/types/table';
 import { TableComponent } from '@components/table/table.component';
 import { TableTasksByStatus, TasksByStatusService } from '@services/tasks-by-status.service';
 import { Subject } from 'rxjs';
 import { SessionsDataService } from '../services/sessions-data.service';
+import { SessionsFiltersService } from '../services/sessions-filters.service';
 import { SessionsStatusesService } from '../services/sessions-statuses.service';
 import { SessionRaw } from '../types';
 
@@ -31,6 +33,7 @@ import { SessionRaw } from '../types';
 export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<SessionRaw, SessionRawEnumField, TaskOptions, TaskOptionEnumField>
   implements OnInit {  
   readonly statusesService = inject(SessionsStatusesService);
+  readonly filtersService = inject(SessionsFiltersService);
   readonly router = inject(Router);
   readonly copyService = inject(Clipboard);
 
@@ -159,8 +162,11 @@ export class SessionsTableComponent extends AbstractTaskByStatusTableComponent<S
     this.tableDataService.onDelete(sessionId);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  trackBy(index: number, _item: ArmonikData<SessionRaw, TaskOptions>) {
-    return index;
+  trackBy(index: number, item: ArmonikData<SessionRaw, TaskOptions> | Group<SessionRaw, TaskOptions>) {
+    if ((item as ArmonikData<SessionRaw, TaskOptions>).raw !== undefined) {
+      return (item as ArmonikData<SessionRaw, TaskOptions>).raw.sessionId;
+    } else {
+      return (item as Group<SessionRaw, TaskOptions>).name();
+    }
   }
 }
diff --git a/src/app/tasks/components/table.component.ts b/src/app/tasks/components/table.component.ts
index 0af17419a..46ed5564a 100644
--- a/src/app/tasks/components/table.component.ts
+++ b/src/app/tasks/components/table.component.ts
@@ -5,10 +5,12 @@ import { Router} from '@angular/router';
 import { AbstractTableComponent } from '@app/types/components/table';
 import { Scope } from '@app/types/config';
 import { ArmonikData, TaskData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { ActionTable } from '@app/types/table';
 import { TableComponent } from '@components/table/table.component';
 import { Subject } from 'rxjs';
 import TasksDataService from '../services/tasks-data.service';
+import { TasksFiltersService } from '../services/tasks-filters.service';
 import { TasksStatusesService } from '../services/tasks-statuses.service';
 import { TaskOptions, TaskSummary } from '../types';
 
@@ -50,6 +52,7 @@ export class TasksTableComponent extends AbstractTableComponent<TaskSummary, Tas
   @Output() selectionChange = new EventEmitter<string[]>();
 
   readonly tableDataService = inject(TasksDataService);
+  readonly filtersService = inject(TasksFiltersService);
   readonly router = inject(Router);
   readonly clipboard = inject(Clipboard);
   readonly tasksStatusesService = inject(TasksStatusesService);
@@ -171,7 +174,11 @@ export class TasksTableComponent extends AbstractTableComponent<TaskSummary, Tas
     }
   }
 
-  trackBy(index: number, item: ArmonikData<TaskSummary, TaskOptions>) {
-    return item.raw.id;
+  trackBy(index: number, item: ArmonikData<TaskSummary, TaskOptions> | Group<TaskSummary, TaskOptions>) {
+    if ((item as ArmonikData<TaskSummary, TaskOptions>).raw !== undefined) {
+      return (item as ArmonikData<TaskSummary, TaskOptions>).raw.id;
+    } else {
+      return (item as Group<TaskSummary, TaskOptions>).name();
+    }
   }
 }
\ No newline at end of file
diff --git a/src/app/types/components/index.ts b/src/app/types/components/index.ts
index 4316ca74f..31dcd673c 100644
--- a/src/app/types/components/index.ts
+++ b/src/app/types/components/index.ts
@@ -199,13 +199,12 @@ export abstract class TableHandler<T extends DataRaw, F extends FiltersEnums, O
       viewContainerRef: this.viewContainerRef
     });
 
-    const subscription = dialogRef.afterClosed().subscribe((result) => {
+    dialogRef.afterClosed().subscribe((result) => {
       if (result) {
         this.tableDataService.manageGroupDialogResult(result);
+        this.filtersService.saveGroups(this.tableDataService.groupsConditions);
       }
     });
-
-    subscription.unsubscribe();
   }
 
   protected createDashboardLine(): TableLine<T, O> {
diff --git a/src/app/types/components/table.ts b/src/app/types/components/table.ts
index 9895a81f5..885f0df75 100644
--- a/src/app/types/components/table.ts
+++ b/src/app/types/components/table.ts
@@ -11,6 +11,7 @@ import { TableColumn } from '../column.type';
 import { ArmonikData, ColumnKey, DataRaw } from '../data';
 import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '../filters';
 import { ListOptions } from '../options';
+import { DataFilterService } from '../services/data-filter.service';
 import { AbstractTableDataService } from '../services/table-data.service';
 
 export interface SelectableTable<D extends DataRaw> {
@@ -48,6 +49,7 @@ export abstract class AbstractTableComponent<T extends DataRaw, F extends Filter
   abstract readonly tableDataService: AbstractTableDataService<T, F, O, FO>;
   readonly dialog = inject(MatDialog);
   private readonly viewContainerRef = inject(ViewContainerRef);
+  abstract readonly filtersService: DataFilterService<F, FO>;
 
   protected initTableDataService() {
     this.data = this.tableDataService.data;
@@ -77,13 +79,12 @@ export abstract class AbstractTableComponent<T extends DataRaw, F extends Filter
       viewContainerRef: this.viewContainerRef
     });
 
-    const subscription = dialogRef.afterClosed().subscribe((result) => {
+    dialogRef.afterClosed().subscribe((result) => {
       if (result) {
         this.tableDataService.manageGroupDialogResult(result);
+        this.filtersService.saveGroups(this.tableDataService.groupsConditions);
       }
     });
-
-    subscription.unsubscribe();
   }
 
   abstract isDataRawEqual(value: T, entry: T): boolean;
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index 3275b078c..b88f323f8 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -191,9 +191,13 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   }
 
   removeGroup(groupName: string) {
-    const index = this.groups.findIndex((group) => group.name() === groupName);
-    if (index !== -1) {
-      this.groups.splice(index, 1);
+    const conditionsIndex =  this.groupsConditions.findIndex((group) => group.name === groupName);
+    if (conditionsIndex !== -1) {
+      this.groupsConditions.splice(conditionsIndex, 1);
+    }
+    const groupIndex = this.groups.findIndex((group) => group.name() === groupName);
+    if (groupIndex !== -1) {
+      this.groups.splice(groupIndex, 1);
     }
   }
 

From 0640cc036f12f39a571432914deae1aa248b13f5 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 12 Feb 2025 11:50:13 +0100
Subject: [PATCH 18/47] added groups to tables

---
 src/app/applications/components/table.component.html   | 10 +++++++---
 .../table/group/group-row/group.component.html         | 10 ++++++----
 src/app/partitions/components/table.component.html     |  8 ++++++--
 src/app/results/components/table.component.html        | 10 +++++++---
 src/app/tasks/components/table.component.html          | 10 +++++++---
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/app/applications/components/table.component.html b/src/app/applications/components/table.component.html
index f0db90e2d..25765d810 100644
--- a/src/app/applications/components/table.component.html
+++ b/src/app/applications/components/table.component.html
@@ -1,3 +1,7 @@
-<app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [total]="total()" [options]="options"
-  [lockColumns]="lockColumns" [actions]="actions" [statusesGroups]="statusesGroups" (optionsChange)="onOptionsChange()"
-  (personnalizeTasksByStatus)="personalizeTasksByStatus()" (columnDrop)="onDrop($event)" />
\ No newline at end of file
+<app-table
+  [trackBy]="trackBy" [columns]="columns" [data]="data()" [total]="total()"
+  [options]="options" [lockColumns]="lockColumns" [actions]="actions" [groups]="tableDataService.groups"
+  [statusesGroups]="statusesGroups" (optionsChange)="onOptionsChange()"
+  (personnalizeTasksByStatus)="personalizeTasksByStatus()" (columnDrop)="onDrop($event)"
+  (groupPageChange)="updateGroupPage($event)" (groupSettings)="openGroupSettings($event)"  
+/>
\ No newline at end of file
diff --git a/src/app/components/table/group/group-row/group.component.html b/src/app/components/table/group/group-row/group.component.html
index 1497476b4..1aaeafb4b 100644
--- a/src/app/components/table/group/group-row/group.component.html
+++ b/src/app/components/table/group/group-row/group.component.html
@@ -9,10 +9,12 @@
       <span>{{ group.total }}</span>
     </p>
   </article>
-  <article class="tasks-statuses">
-    <p>Tasks statuses: </p>
-    <app-group-tasks-by-status [groupData]="group.data|async" [statusesGroups]="statusesGroups" />
-  </article>
+  @if (statusesGroups) {
+    <article class="tasks-statuses">
+      <p>Tasks statuses: </p>
+      <app-group-tasks-by-status [groupData]="group.data|async" [statusesGroups]="statusesGroups" />
+    </article>
+  }
   <article class="general-actions">
     <button mat-icon-button (mouseenter)="settingsRotate = true" (mouseleave)="settingsRotate = false" (click)="groupSettingsEmit()">
       <mat-icon [@rotateFull]="settingsRotate" [fontIcon]="getIcon('settings')" />
diff --git a/src/app/partitions/components/table.component.html b/src/app/partitions/components/table.component.html
index 3f8d5136c..d63db98d4 100644
--- a/src/app/partitions/components/table.component.html
+++ b/src/app/partitions/components/table.component.html
@@ -1,3 +1,7 @@
-<app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [total]="total()" [lockColumns]="lockColumns" [options]="options"
+<app-table
+  [trackBy]="trackBy" [columns]="columns" [data]="data()" [total]="total()"
+  [lockColumns]="lockColumns" [options]="options" [groups]="tableDataService.groups"
   (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()" [statusesGroups]="statusesGroups"
-  (personnalizeTasksByStatus)="personalizeTasksByStatus()" />
+  (personnalizeTasksByStatus)="personalizeTasksByStatus()" (groupPageChange)="updateGroupPage($event)"
+  (groupSettings)="openGroupSettings($event)"
+/>
diff --git a/src/app/results/components/table.component.html b/src/app/results/components/table.component.html
index 0867fc5f8..7a22a1418 100644
--- a/src/app/results/components/table.component.html
+++ b/src/app/results/components/table.component.html
@@ -1,3 +1,7 @@
-<app-table [trackBy]="trackBy" [columns]="columns" [data]="data()" [total]="total()" 
-  [options]="options" [lockColumns]="lockColumns" (optionsChange)="onOptionsChange()"
-  [statusesService]="statusesService" (columnDrop)="onDrop($event)" />
+<app-table
+  [trackBy]="trackBy" [columns]="columns" [data]="data()" [groups]="tableDataService.groups"
+  [total]="total()" [options]="options" [lockColumns]="lockColumns"
+  (optionsChange)="onOptionsChange()" [statusesService]="statusesService"
+  (columnDrop)="onDrop($event)" (groupPageChange)="updateGroupPage($event)"
+  (groupSettings)="openGroupSettings($event)"
+/>
diff --git a/src/app/tasks/components/table.component.html b/src/app/tasks/components/table.component.html
index f4c56142c..076a03091 100644
--- a/src/app/tasks/components/table.component.html
+++ b/src/app/tasks/components/table.component.html
@@ -1,3 +1,7 @@
-<app-table [trackBy]="trackBy" [columns]="columns" [dataComparator]="isDataRawEqual" [data]="data()" [total]="total()"
-  [options]="options" [lockColumns]="lockColumns" [actions]="actions" (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()"
-  (selectionChange)="onSelectionChange($event)" [statusesService]="tasksStatusesService" />
+<app-table
+  [trackBy]="trackBy" [columns]="columns" [dataComparator]="isDataRawEqual" [groups]="tableDataService.groups"
+  [data]="data()" [total]="total()" [options]="options" [lockColumns]="lockColumns"
+  [actions]="actions" (columnDrop)="onDrop($event)" (optionsChange)="onOptionsChange()"
+  (selectionChange)="onSelectionChange($event)" [statusesService]="tasksStatusesService"
+  (groupPageChange)="updateGroupPage($event)" (groupSettings)="openGroupSettings($event)"
+/>

From b13802fc19c0b1b05d5304c141fd4b78c4d6abe4 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 12 Feb 2025 14:18:36 +0100
Subject: [PATCH 19/47] chore: removed duplicates

---
 .../manage-groups-dialog.component.ts              | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
index 6303ad8ce..ec1dfda7c 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
@@ -8,7 +8,6 @@ import { MatInputModule } from '@angular/material/input';
 import { Filter, FiltersEnums, FiltersOptionsEnums } from '@app/types/filters';
 import { GroupConditions } from '@app/types/groups';
 import { FiltersDialogOrComponent } from '@components/filters/filters-dialog-or.component';
-import { FiltersService } from '@services/filters.service';
 import { IconsService } from '@services/icons.service';
 
 export type ManageGroupsTableDialogInput<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
@@ -36,9 +35,6 @@ export type ManageGroupsTableDialogResult<F extends FiltersEnums, FO extends Fil
     MatFormFieldModule,
     MatInputModule,
   ],
-  providers: [
-    FiltersService
-  ]
 })
 export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
   private readonly dialogRef: MatDialogRef<ManageTableGroupsDialogComponent<F, FO>, ManageGroupsTableDialogResult<F, FO>> = inject(MatDialogRef);
@@ -62,7 +58,12 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
 
   selectedGroup: GroupConditions<F, FO> | undefined;
 
+  duplicates: number = 0;
+
   selectGroup(group: GroupConditions<F, FO>, setAsEdited: boolean = false) {
+    if (this.selectedGroup && this.duplicates !== 0) {
+      this.selectedGroup.name += ` ${this.duplicates}`;
+    }
     this.selectedGroup = group;
     if (setAsEdited) {
       const groupName = `${group.name}`;
@@ -71,8 +72,10 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
   }
 
   addGroup() {
+    const name = $localize`New Group`;
+    const countName = this.groups.filter((group) => group.name.includes(name)).length;
     const group: GroupConditions<F, FO> = {
-      name: $localize`New Group`,
+      name: name + (countName !== 0 ? ` ${countName}` : ''),
       conditions: [[{
         field: null,
         for: null,
@@ -101,6 +104,7 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
   updateName(event: Event) {
     if (this.selectedGroup) {
       const name = (event.target as HTMLInputElement).value;
+      this.duplicates = this.groups.filter((group) => group.name.includes(name)).length;
       this.selectedGroup.name = name;
     }
   }

From 564f253855ac14270a45f5655038249faef65605 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 12 Feb 2025 17:09:47 +0100
Subject: [PATCH 20/47] fix: inverted filters

---
 src/app/services/invert-filter.service.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app/services/invert-filter.service.ts b/src/app/services/invert-filter.service.ts
index 08ac61d6f..c2d1503a9 100644
--- a/src/app/services/invert-filter.service.ts
+++ b/src/app/services/invert-filter.service.ts
@@ -15,7 +15,18 @@ export class InvertFilterService<F extends FiltersEnums, FO extends FiltersOptio
   };
 
   invert(filters: FiltersOr<F, FO>): FiltersOr<F, FO> {
-    return [filters.map((filterAnd) => filterAnd.map((filter) => this.invertFilter(filter))).flat()];
+    let invertedFilters: FiltersOr<F, FO> = [];
+    
+    filters.forEach((filterAnd) => {
+      if (invertedFilters.length === 0) {
+        invertedFilters.push(...filterAnd.map((filter) => [this.invertFilter(filter)]));
+      } else {
+        const result = invertedFilters.map((invertedAnd) => filterAnd.map((filter) => [...invertedAnd, this.invertFilter(filter)]));
+        invertedFilters = [];
+        result.forEach((r) => invertedFilters.push(...r));
+      }
+    });
+    return invertedFilters;
 
   }
 

From 5441c4cea586eef9815562b89079aad8c871f9c8 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 12 Feb 2025 17:48:02 +0100
Subject: [PATCH 21/47] feat: handle no conditions for groups

---
 .../table/group/group-row/group.component.css |  9 ++++++++
 .../group/group-row/group.component.html      |  6 +++++
 .../table/group/group-row/group.component.ts  |  2 ++
 src/app/types/groups.ts                       |  1 +
 src/app/types/services/table-data.service.ts  | 22 +++++++++++++++----
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/app/components/table/group/group-row/group.component.css b/src/app/components/table/group/group-row/group.component.css
index a1bb3e51d..fb5b4ac89 100644
--- a/src/app/components/table/group/group-row/group.component.css
+++ b/src/app/components/table/group/group-row/group.component.css
@@ -49,6 +49,15 @@ mat-card {
   background-color: var(--mat-sidenav-content-background-color);
 }
 
+mat-chip {
+  background-color: red !important;
+  box-shadow: 0 0 10px red;
+}
+
+mat-chip p, mat-chip mat-icon {
+  color: white !important;
+}
+
 p {
   margin: 0;
 }
\ No newline at end of file
diff --git a/src/app/components/table/group/group-row/group.component.html b/src/app/components/table/group/group-row/group.component.html
index 1aaeafb4b..f03d002f6 100644
--- a/src/app/components/table/group/group-row/group.component.html
+++ b/src/app/components/table/group/group-row/group.component.html
@@ -16,6 +16,12 @@
     </article>
   }
   <article class="general-actions">
+    @if (group.emptyCondition) {
+    <mat-chip disableRipple>
+      <mat-icon matChipAvatar [fontIcon]="getIcon('error')" />
+      <p i18n>No conditions</p>
+    </mat-chip>
+    }
     <button mat-icon-button (mouseenter)="settingsRotate = true" (mouseleave)="settingsRotate = false" (click)="groupSettingsEmit()">
       <mat-icon [@rotateFull]="settingsRotate" [fontIcon]="getIcon('settings')" />
     </button>
diff --git a/src/app/components/table/group/group-row/group.component.ts b/src/app/components/table/group/group-row/group.component.ts
index a69a4c5db..315e597c0 100644
--- a/src/app/components/table/group/group-row/group.component.ts
+++ b/src/app/components/table/group/group-row/group.component.ts
@@ -2,6 +2,7 @@ import { AsyncPipe } from '@angular/common';
 import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
+import { MatChipsModule } from '@angular/material/chips';
 import { MatIconModule } from '@angular/material/icon';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { MatTableModule } from '@angular/material/table';
@@ -33,6 +34,7 @@ import { GroupTasksByStatusComponent } from '../grouped-tasks-by-status/group-ta
     TableActionsComponent,
     GroupTasksByStatusComponent,
     AsyncPipe,
+    MatChipsModule,
   ],
   providers: [
     IconsService
diff --git a/src/app/types/groups.ts b/src/app/types/groups.ts
index b0feeac4a..044cb7c65 100644
--- a/src/app/types/groups.ts
+++ b/src/app/types/groups.ts
@@ -14,6 +14,7 @@ export type Group<T extends DataRaw, O extends TaskOptions | null = null> = {
   opened: boolean;
   total: number;
   page: number;
+  emptyCondition: boolean;
   refresh$: Subject<void>,
   data: Observable<ArmonikData<T, O>[]>
 }
\ No newline at end of file
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index b88f323f8..280cff199 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -121,6 +121,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
       opened: false,
       total: 0,
       page: 0,
+      emptyCondition: false,
       refresh$: groupRefresh$,
       data: merge(this.refresh$, groupRefresh$).pipe(
         switchMap(() => {
@@ -131,7 +132,10 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
           };
           const groupConditions = this.groupsConditions.find((condition) => condition.name === group.name());
           if (groupConditions) {
-            return this.grpcService.list$(options, groupConditions.conditions);
+            if (this.isNotEmptyCondition(groupConditions)) {
+              return this.grpcService.list$(options, groupConditions.conditions);
+            }
+            group.emptyCondition = true;
           }
           return of(undefined);
         }),
@@ -139,8 +143,10 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
           if (data) {
             group.total = data.total;
             return this.computeGrpcData(data);
+          } else {
+            group.total = 0;
+            return undefined;
           }
-          return undefined;
         }),
         map((data) => {
           if (data) {
@@ -178,7 +184,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
     this.groupsConditions.forEach((g) => this.setGroup(g.name));
   }
 
-  addGroup(groupCondition: GroupConditions<F, FO>) {
+  private addGroup(groupCondition: GroupConditions<F, FO>) {
     this.groupsConditions.push(groupCondition);
     this.setGroup(groupCondition.name);
   }
@@ -190,7 +196,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
     }
   }
 
-  removeGroup(groupName: string) {
+  private removeGroup(groupName: string) {
     const conditionsIndex =  this.groupsConditions.findIndex((group) => group.name === groupName);
     if (conditionsIndex !== -1) {
       this.groupsConditions.splice(conditionsIndex, 1);
@@ -201,6 +207,14 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
     }
   }
 
+  private isNotEmptyCondition(groupCondition: GroupConditions<F, FO>): boolean {
+    return groupCondition.conditions.map((condition) => 
+      condition
+        .map((filter) => filter.for !== null && filter.field !== null && filter.operator !== null && filter.value !== null)
+        .reduce((acc, current) => acc || current, false)
+    ).reduce((acc, current) => acc || current, false);
+  }
+
   /**
    * Display a success message to the user.
    */

From 0c410be1bcd95ec7d8c4e4cf4eabc26c08978ff2 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 11:15:28 +0100
Subject: [PATCH 22/47] fix: filters and  multiple groups are now filtering as
 wanted.

---
 src/app/applications/index.component.ts       |  2 ++
 .../lines/applications-line.component.ts      |  2 ++
 .../lines/partitions-line.component.ts        |  2 ++
 .../lines/results-line.component.ts           |  2 ++
 .../lines/sessions-line.component.ts          |  2 ++
 .../components/lines/tasks-line.component.ts  |  2 ++
 src/app/partitions/index.component.ts         |  2 ++
 src/app/results/index.component.ts            |  2 ++
 .../services/sessions-data.service.ts         |  3 ---
 src/app/tasks/index.component.ts              |  2 ++
 src/app/types/services/table-data.service.ts  | 27 ++++++++++++++-----
 11 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/app/applications/index.component.ts b/src/app/applications/index.component.ts
index ca33c66a1..c86556e1d 100644
--- a/src/app/applications/index.component.ts
+++ b/src/app/applications/index.component.ts
@@ -19,6 +19,7 @@ import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
 import { IconsService } from '@services/icons.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { QueryParamsService } from '@services/query-params.service';
 import { ShareUrlService } from '@services/share-url.service';
@@ -63,6 +64,7 @@ import { ApplicationRaw } from './types';
     NotificationService,
     FiltersService,
     GrpcSortFieldService,
+    InvertFilterService,
   ],
   imports: [
     PageHeaderComponent,
diff --git a/src/app/dashboard/components/lines/applications-line.component.ts b/src/app/dashboard/components/lines/applications-line.component.ts
index e4de80d3a..755dcd211 100644
--- a/src/app/dashboard/components/lines/applications-line.component.ts
+++ b/src/app/dashboard/components/lines/applications-line.component.ts
@@ -18,6 +18,7 @@ import { AutoRefreshService } from '@services/auto-refresh.service';
 import { DefaultConfigService } from '@services/default-config.service';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { ShareUrlService } from '@services/share-url.service';
 
@@ -41,6 +42,7 @@ import { ShareUrlService } from '@services/share-url.service';
     FiltersService,
     ApplicationsDataService,
     GrpcSortFieldService,
+    InvertFilterService,
   ],
   imports: [
     FiltersToolbarComponent,
diff --git a/src/app/dashboard/components/lines/partitions-line.component.ts b/src/app/dashboard/components/lines/partitions-line.component.ts
index 8d4f8cc35..bcd355a17 100644
--- a/src/app/dashboard/components/lines/partitions-line.component.ts
+++ b/src/app/dashboard/components/lines/partitions-line.component.ts
@@ -15,6 +15,7 @@ import { DataFilterService } from '@app/types/services/data-filter.service';
 import { FiltersToolbarComponent } from '@components/filters/filters-toolbar.component';
 import { TableDashboardActionsToolbarComponent } from '@components/table-dashboard-actions-toolbar.component';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 
 @Component({
@@ -33,6 +34,7 @@ import { NotificationService } from '@services/notification.service';
     PartitionsGrpcService,
     PartitionsDataService,
     GrpcSortFieldService,
+    InvertFilterService,
   ],
   imports: [
     MatToolbarModule,
diff --git a/src/app/dashboard/components/lines/results-line.component.ts b/src/app/dashboard/components/lines/results-line.component.ts
index e0d793d28..8b1bd0c19 100644
--- a/src/app/dashboard/components/lines/results-line.component.ts
+++ b/src/app/dashboard/components/lines/results-line.component.ts
@@ -17,6 +17,7 @@ import { FiltersToolbarComponent } from '@components/filters/filters-toolbar.com
 import { TableDashboardActionsToolbarComponent } from '@components/table-dashboard-actions-toolbar.component';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 
 @Component({
@@ -37,6 +38,7 @@ import { NotificationService } from '@services/notification.service';
     GrpcSortFieldService,
     FiltersService,
     NotificationService,
+    InvertFilterService,
   ],
   imports: [
     MatIconModule,
diff --git a/src/app/dashboard/components/lines/sessions-line.component.ts b/src/app/dashboard/components/lines/sessions-line.component.ts
index 055436ae0..782d78594 100644
--- a/src/app/dashboard/components/lines/sessions-line.component.ts
+++ b/src/app/dashboard/components/lines/sessions-line.component.ts
@@ -21,6 +21,7 @@ import { FiltersToolbarComponent } from '@components/filters/filters-toolbar.com
 import { TableDashboardActionsToolbarComponent } from '@components/table-dashboard-actions-toolbar.component';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 
 @Component({
@@ -44,6 +45,7 @@ import { NotificationService } from '@services/notification.service';
     GrpcSortFieldService,
     FiltersService,
     TasksGrpcService,
+    InvertFilterService,
   ],
   imports: [
     MatToolbarModule,
diff --git a/src/app/dashboard/components/lines/tasks-line.component.ts b/src/app/dashboard/components/lines/tasks-line.component.ts
index 5435eb0af..4df80e951 100644
--- a/src/app/dashboard/components/lines/tasks-line.component.ts
+++ b/src/app/dashboard/components/lines/tasks-line.component.ts
@@ -19,6 +19,7 @@ import { FiltersToolbarComponent } from '@components/filters/filters-toolbar.com
 import { TableDashboardActionsToolbarComponent } from '@components/table-dashboard-actions-toolbar.component';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 
 @Component({
@@ -38,6 +39,7 @@ import { NotificationService } from '@services/notification.service';
     GrpcSortFieldService,
     TasksDataService,
     FiltersService,
+    InvertFilterService,
   ],
   imports: [
     MatToolbarModule,
diff --git a/src/app/partitions/index.component.ts b/src/app/partitions/index.component.ts
index 6b617c490..d4d39a34c 100644
--- a/src/app/partitions/index.component.ts
+++ b/src/app/partitions/index.component.ts
@@ -18,6 +18,7 @@ import { TableIndexActionsToolbarComponent } from '@components/table-index-actio
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { QueryParamsService } from '@services/query-params.service';
 import { ShareUrlService } from '@services/share-url.service';
@@ -62,6 +63,7 @@ import { PartitionRaw } from './types';
     PartitionsDataService,
     GrpcSortFieldService,
     PartitionsGrpcService,
+    InvertFilterService,
   ],
   imports: [
     PageHeaderComponent,
diff --git a/src/app/results/index.component.ts b/src/app/results/index.component.ts
index ebb4b5368..854f198f7 100644
--- a/src/app/results/index.component.ts
+++ b/src/app/results/index.component.ts
@@ -17,6 +17,7 @@ import { TableIndexActionsToolbarComponent } from '@components/table-index-actio
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { QueryParamsService } from '@services/query-params.service';
 import { ShareUrlService } from '@services/share-url.service';
@@ -61,6 +62,7 @@ import { ResultRaw } from './types';
     ResultsGrpcService,
     GrpcSortFieldService,
     FiltersService,
+    InvertFilterService,
   ],
   imports: [
     PageHeaderComponent,
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index 1d9a3d65c..cb6e23084 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -8,7 +8,6 @@ import { Filter, FiltersOr } from '@app/types/filters';
 import { ListOptions } from '@app/types/options';
 import { AbstractTableDataService } from '@app/types/services/table-data.service';
 import { Duration, Timestamp } from '@ngx-grpc/well-known-types';
-import { InvertFilterService } from '@services/invert-filter.service';
 import { Subject, map, mergeAll } from 'rxjs';
 import { SessionsGrpcService } from './sessions-grpc.service';
 import { SessionRaw } from '../types';
@@ -16,7 +15,6 @@ import { SessionRaw } from '../types';
 @Injectable()
 export class SessionsDataService extends AbstractTableDataService<SessionRaw, SessionRawEnumField, TaskOptions, TaskOptionEnumField> implements OnDestroy {
   readonly grpcService = inject(SessionsGrpcService);
-  readonly invertFiltersService: InvertFilterService<SessionRawEnumField, TaskOptionEnumField> = inject(InvertFilterService);
 
   scope: Scope = 'sessions';
 
@@ -60,7 +58,6 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
 
   override preparefilters(): FiltersOr<SessionRawEnumField, TaskOptionEnumField> {
     const filtersOr = super.preparefilters();
-    this.groupsConditions.forEach((groupConditions) => (filtersOr.push(...this.invertFiltersService.invert(groupConditions.conditions))));
     if(this.isDurationDisplayed && this.options.sort.active === 'duration') {
       const date = new Date();
       date.setDate(date.getDate() - 3);
diff --git a/src/app/tasks/index.component.ts b/src/app/tasks/index.component.ts
index b69d76253..4860b4381 100644
--- a/src/app/tasks/index.component.ts
+++ b/src/app/tasks/index.component.ts
@@ -17,6 +17,7 @@ import { TableIndexActionsToolbarComponent } from '@components/table-index-actio
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { FiltersService } from '@services/filters.service';
 import { GrpcSortFieldService } from '@services/grpc-sort-field.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { QueryParamsService } from '@services/query-params.service';
 import { ShareUrlService } from '@services/share-url.service';
@@ -71,6 +72,7 @@ import { TaskOptions, TaskSummary, TaskSummaryFilter } from './types';
     DashboardStorageService,
     GrpcSortFieldService,
     TasksDataService,
+    InvertFilterService,
   ],
 })
 export class IndexComponent extends TableHandlerCustomValues<TaskSummary, TaskSummaryEnumField, TaskOptions, TaskOptionEnumField> implements OnInit, AfterViewInit, OnDestroy {
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index 280cff199..e0f436547 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -7,6 +7,7 @@ import { ManageGroupsTableDialogResult } from '@components/table/group/manage-gr
 import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { Subject, Subscription, catchError, map, merge, of, switchMap } from 'rxjs';
 import { GrpcTableService } from './grpcService';
@@ -22,6 +23,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   private readonly cacheService = inject(CacheService);
   private readonly notificationService = inject(NotificationService);
   readonly filtersService = inject(FiltersService);
+  readonly invertFiltersService: InvertFilterService<F, FO> = inject(InvertFilterService);
 
   readonly refresh$ = new Subject<void>();
 
@@ -99,10 +101,23 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   }
 
   /**
-   * Clone the filter object and transform it if needed.
+   * Clone the filter object, and add the inverted conditions of every groupConditions to it.
    */
   preparefilters(): FiltersOr<F, FO> {
-    return structuredClone(this.filters);
+    let filtersOr = structuredClone(this.filters);
+    this.groupsConditions.forEach((groupConditions) => {
+      const inverted = this.invertFiltersService.invert(groupConditions.conditions);
+      if (!this.isNotEmptyFilter(filtersOr)) {
+        filtersOr.push(...inverted);
+      } else {
+        const result: FiltersOr<F, FO> = [];
+        filtersOr.forEach((filterAnd) => {
+          inverted.map((invertedAnd) => [...invertedAnd, ...filterAnd]).forEach((r) => result.push(r));
+        });
+        filtersOr = result;
+      }
+    });
+    return filtersOr;
   }
 
   /**
@@ -132,7 +147,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
           };
           const groupConditions = this.groupsConditions.find((condition) => condition.name === group.name());
           if (groupConditions) {
-            if (this.isNotEmptyCondition(groupConditions)) {
+            if (this.isNotEmptyFilter(groupConditions.conditions)) {
               return this.grpcService.list$(options, groupConditions.conditions);
             }
             group.emptyCondition = true;
@@ -207,9 +222,9 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
     }
   }
 
-  private isNotEmptyCondition(groupCondition: GroupConditions<F, FO>): boolean {
-    return groupCondition.conditions.map((condition) => 
-      condition
+  private isNotEmptyFilter(filters: FiltersOr<F, FO>): boolean {
+    return filters.map((filterAnd) => 
+      filterAnd
         .map((filter) => filter.for !== null && filter.field !== null && filter.operator !== null && filter.value !== null)
         .reduce((acc, current) => acc || current, false)
     ).reduce((acc, current) => acc || current, false);

From d729f388ed5c9a1e31742356f6da860b9228f2cb Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 11:18:59 +0100
Subject: [PATCH 23/47] chore: address sonarcloud issues

---
 src/app/components/table/group/group-row/group.component.html   | 2 +-
 .../grouped-tasks-by-status/group-tasks-by-status.component.css | 0
 .../grouped-tasks-by-status/group-tasks-by-status.component.ts  | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css

diff --git a/src/app/components/table/group/group-row/group.component.html b/src/app/components/table/group/group-row/group.component.html
index f03d002f6..4af0fe412 100644
--- a/src/app/components/table/group/group-row/group.component.html
+++ b/src/app/components/table/group/group-row/group.component.html
@@ -38,7 +38,7 @@
     <table mat-table [dataSource]="group.data" [trackBy]="trackBy">
       @for (column of displayedColumns; track $index) {
         <ng-container [matColumnDef]="column.key.toString()">
-          <ng-container *matHeaderCellDef></ng-container>
+          <th *matHeaderCellDef></th>
           <td *matCellDef="let element" mat-cell>
             @if (column.type !== 'actions') {
               <app-table-cell [column]="column" [element]="element" [statusesService]="statusesService" [statusesGroups]="statusesGroups" />
diff --git a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
index 2b71c8039..f705b1fc6 100644
--- a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
+++ b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
@@ -8,7 +8,6 @@ import { Subject } from 'rxjs';
 @Component({
   selector: 'app-group-tasks-by-status',
   templateUrl: 'group-tasks-by-status.component.html',
-  styleUrl: 'group-tasks-by-status.component.css',
   standalone: true,
   imports: [
     CountTasksByStatusComponent,

From 6fe9d3e3abb61084e5dbc9f6675e9b2c7e810303 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 11:36:50 +0100
Subject: [PATCH 24/47] tests: group tasks by status component

---
 .../group-tasks-by-status.component.spec.ts   | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
index e69de29bb..2adf46207 100644
--- a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
+++ b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.spec.ts
@@ -0,0 +1,82 @@
+import { FilterStringOperator, TaskStatus, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { TasksStatusesGroup } from '@app/dashboard/types';
+import { SessionRaw } from '@app/sessions/types';
+import { TaskOptions, TaskSummaryFilters } from '@app/tasks/types';
+import { SessionData } from '@app/types/data';
+import { GroupTasksByStatusComponent } from './group-tasks-by-status.component';
+
+describe('GroupTasksByStatusComponent', () => {
+  const component = new GroupTasksByStatusComponent<SessionRaw, TaskOptions>();
+
+  const data: SessionData[] = [
+    {
+      raw: {} as SessionRaw,
+      filters: [[
+        {
+          field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_SESSION_ID,
+          for: 'root',
+          operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+          value: 'session-1'
+        }
+      ]],
+      queryTasksParams: {
+        '0-root-1-0': 'session-1'
+      },
+      resultsQueryParams: {},
+    },
+    {
+      raw: {} as SessionRaw,
+      filters: [[
+        {
+          field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_SESSION_ID,
+          for: 'root',
+          operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+          value: 'session-2'
+        }
+      ]],
+      queryTasksParams: {
+        '0-root-1-0': 'session-2'
+      },
+      resultsQueryParams: {},
+    },
+  ];
+
+  const statusesGroups: TasksStatusesGroup[] = [
+    {
+      name: 'Validated',
+      statuses: [TaskStatus.TASK_STATUS_COMPLETED, TaskStatus.TASK_STATUS_PROCESSED],
+      color: 'green',
+    },
+    {
+      name: 'Error',
+      statuses: [TaskStatus.TASK_STATUS_ERROR, TaskStatus.TASK_STATUS_RETRIED],
+      color: 'red',
+    }
+  ];
+
+  beforeEach(() => {
+    component.groupData = data;
+    component.statusesGroups = statusesGroups;
+  });
+
+  describe('initialisation', () => {
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+  
+    it('should set filters', () => {
+      expect(component.filters).toEqual(data.reduce((acc: TaskSummaryFilters, current) => [...acc, ...current.filters], []));
+    });
+  
+    it('should set queryParams', () => {
+      expect(component.queryParams).toEqual({
+        '0-root-1-0': 'session-1',
+        '1-root-1-0': 'session-2'
+      });
+    });
+  
+    it('should set queryParamsLength', () => {
+      expect(component.queryParamsLength).toEqual(2);
+    });
+  });
+});
\ No newline at end of file

From f39084f2fca0a257346991e1c955b0add1ad68d9 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 11:57:36 +0100
Subject: [PATCH 25/47] tests: group component

---
 .../group/group-row/group.component.spec.ts   | 151 ++++++++++++++++++
 .../table/group/group-row/group.component.ts  |   3 +-
 2 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/src/app/components/table/group/group-row/group.component.spec.ts b/src/app/components/table/group/group-row/group.component.spec.ts
index e69de29bb..cd0ceeb8e 100644
--- a/src/app/components/table/group/group-row/group.component.spec.ts
+++ b/src/app/components/table/group/group-row/group.component.spec.ts
@@ -0,0 +1,151 @@
+import { FilterStringOperator, SessionStatus, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { SessionRaw } from '@app/sessions/types';
+import { TaskOptions } from '@app/tasks/types';
+import { TableColumn } from '@app/types/column.type';
+import { SessionData } from '@app/types/data';
+import { Group } from '@app/types/groups';
+import { IconsService } from '@services/icons.service';
+import { Subject, of } from 'rxjs';
+import { TableGroupComponent } from './group.component';
+
+describe('TableGroupComponent', () => {
+  let component: TableGroupComponent<SessionRaw, SessionStatus, TaskOptions>;
+
+  const data: SessionData[] = [
+    {
+      raw: {} as SessionRaw,
+      filters: [[
+        {
+          field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_SESSION_ID,
+          for: 'root',
+          operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+          value: 'session-1'
+        }
+      ]],
+      queryTasksParams: {
+        '0-root-1-0': 'session-1'
+      },
+      resultsQueryParams: {},
+    },
+    {
+      raw: {} as SessionRaw,
+      filters: [[
+        {
+          field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_SESSION_ID,
+          for: 'root',
+          operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+          value: 'session-2'
+        }
+      ]],
+      queryTasksParams: {
+        '0-root-1-0': 'session-2'
+      },
+      resultsQueryParams: {},
+    },
+  ];
+
+  const group: Group<SessionRaw, TaskOptions> = {
+    name: signal('Goup 1'),
+    page: 0,
+    opened: false,
+    total: 2,
+    refresh$: new Subject<void>(),
+    emptyCondition: false,
+    data: of(data),
+  };
+
+  const columns: TableColumn<SessionRaw, TaskOptions>[] = [
+    {
+      key: 'sessionId',
+      name: 'Session Id',
+      sortable: true,
+      link: '/sessions',
+      type: 'link'
+    },
+    {
+      key: 'actions',
+      name: 'Actions',
+      sortable: false,
+    },
+  ];
+
+  beforeEach(() => {
+    component = TestBed.configureTestingModule({
+      providers: [
+        TableGroupComponent,
+        IconsService,
+      ]
+    }).inject(TableGroupComponent<SessionRaw, SessionStatus, TaskOptions>);
+    component.group = group;
+    component.columns = columns;
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('initialisation', () => {
+    it('should set the group', () => {
+      expect(component.group).toBe(group);
+    });
+
+    it('should set columnsKeys', () => {
+      expect(component.columnsKeys).toEqual(columns.map((col) => col.key));
+    });
+
+    it('should set displayedColumns', () => {
+      expect(component.displayedColumns).toEqual(columns);
+    });
+  });
+
+  it('should get icons', () => {
+    expect(component.getIcon('heart')).toEqual('favorite');
+  });
+
+  it('should switch the view of the group', () => {
+    component.switchView();
+    expect(component.group.opened).toBeTruthy();
+  });
+
+  describe('pageChange', () => {
+    let pageSpy: jest.SpyInstance;
+    const newPage = 1;
+
+    beforeEach(() => {
+      pageSpy = jest.spyOn(component.page, 'emit');
+      component.pageChange({
+        length: 100,
+        pageIndex: newPage,
+        pageSize: 100,
+        previousPageIndex: 0
+      });
+    });
+
+    it('should emit on page change', () => {
+      expect(pageSpy).toHaveBeenCalled();
+    });
+
+    it('should update group page', () => {
+      expect(group.page).toEqual(newPage);
+    });
+  });
+
+  describe('groupSettingsEmit', () => {
+    let groupSettingsSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      groupSettingsSpy = jest.spyOn(component.groupSettings, 'emit');
+      component.groupSettingsEmit();
+    });
+
+    it('should emit the group name', () => {
+      expect(groupSettingsSpy).toHaveBeenCalledWith(group.name());
+    });
+  });
+
+  it('should track the index of data by default', () => {
+    expect(component.trackBy(1, data[0])).toEqual(1);
+  });
+});
\ No newline at end of file
diff --git a/src/app/components/table/group/group-row/group.component.ts b/src/app/components/table/group/group-row/group.component.ts
index 315e597c0..1db26d79f 100644
--- a/src/app/components/table/group/group-row/group.component.ts
+++ b/src/app/components/table/group/group-row/group.component.ts
@@ -61,14 +61,13 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
 
   columnsKeys: ColumnKey<T, O>[];
   displayedColumns: TableColumn<T, O>[];
+  settingsRotate = false;
 
   @Output() page = new EventEmitter<void>();
   @Output() groupSettings = new EventEmitter<string>();
 
   private readonly iconsService = inject(IconsService);
 
-  settingsRotate = false;
-
   getIcon(name: string) {
     return this.iconsService.getIcon(name);
   }

From 1c8a12717a2f7dc55dc5dbbe296fcb2889bd69e6 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 16:21:40 +0100
Subject: [PATCH 26/47] chore: tests and docs on manage groups dialog

---
 .../manage-groups-dialog.component.html       |   2 +-
 .../manage-groups-dialog.component.spec.ts    | 248 ++++++++++++++++++
 .../manage-groups-dialog.component.ts         | 115 +++++---
 3 files changed, 333 insertions(+), 32 deletions(-)

diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
index fd12c2b61..74d09a9e3 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.html
@@ -25,7 +25,7 @@
       </mat-form-field>
       <article id="conditions-area">
         @for (filters of selectedGroup.conditions; track $index) {
-          <app-filters-dialog-or [first]="$first" [filtersOr]="filters" (removeChange)="removeOrFilter($event)" />
+          <app-filters-dialog-or [first]="$first" [filtersOr]="filters" (removeChange)="removeOrFilter($index)" />
         }
       </article>
       <button mat-button id="or-button" (click)="addOrFilter()">
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.spec.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.spec.ts
index e69de29bb..0550c48c8 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.spec.ts
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.spec.ts
@@ -0,0 +1,248 @@
+import { FilterDateOperator, FilterStringOperator, SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { TestBed } from '@angular/core/testing';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { GroupConditions } from '@app/types/groups';
+import { IconsService } from '@services/icons.service';
+import { ManageGroupsTableDialogInput, ManageTableGroupsDialogComponent } from './manage-groups-dialog.component';
+
+describe('ManageTableGroupsDialogComponent', () => {
+  let component: ManageTableGroupsDialogComponent<SessionRawEnumField, TaskOptionEnumField>;
+
+  const groupConditions: GroupConditions<SessionRawEnumField, TaskOptionEnumField>[] = [
+    {
+      name: 'Group 1',
+      conditions: [[
+        {
+          field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+          for: 'root',
+          operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+          value: 'some'
+        }
+      ]]
+    },
+    {
+      name: 'ToBeDeleted',
+      conditions: [[
+        {
+          field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_DELETED_AT,
+          for: 'root',
+          operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+          value: '17345800',
+        }
+      ]]
+    }
+  ];
+
+  const dialogData: ManageGroupsTableDialogInput<SessionRawEnumField, TaskOptionEnumField> = {
+    selected: 'Group 1',
+    groups: groupConditions
+  };
+
+  const dialogRef = {
+    close: jest.fn()
+  };
+
+  beforeEach(() => {
+    component = TestBed.configureTestingModule({
+      providers: [
+        ManageTableGroupsDialogComponent,
+        IconsService,
+        { provide: MAT_DIALOG_DATA, useValue: dialogData },
+        { provide: MatDialogRef, useValue: dialogRef },
+      ]
+    }).inject(ManageTableGroupsDialogComponent);
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('Initialisation', () => {
+    it('should create groups', () => {
+      expect(component.groups).toEqual(groupConditions);
+    });
+
+    it('should select a group', () => {
+      expect(component.selectedGroup).toEqual(groupConditions[0]);
+    });
+  });
+
+  describe('selectGroup', () => {
+    const fakeSelectedGroup: GroupConditions<SessionRawEnumField, TaskOptionEnumField> = {
+      name: 'Fake selected',
+      conditions: [],
+    };
+
+    beforeEach(() => {
+      component.groups.push(groupConditions[0]);
+      component.selectGroup(fakeSelectedGroup, true);
+    });
+
+    it('should select the fakeSelectedGroup', () => {
+      expect(component.selectedGroup).toBe(fakeSelectedGroup);
+    });
+
+    it('should set the newly selected group as "edited"', () => {
+      expect(component['editedGroups'][fakeSelectedGroup.name]).toEqual(fakeSelectedGroup);
+    });
+
+    it('should edit the name of the last selected group', () => {
+      expect(component.groups[0].name).toEqual(`Group 1 ${1}`);
+    });
+  });
+
+  describe('addGroup', () => {
+    beforeEach(() => {
+      component.addGroup();
+    });
+
+    it('should add a group', () => {
+      expect(component.groups.at(-1)).toEqual({
+        name: 'New Group',
+        conditions: [[{
+          field: null,
+          for: null,
+          operator: null,
+          value: null,
+        }]],
+      });
+    });
+
+    it('should select the newly added group', () => {
+      expect(component.selectedGroup).toEqual(component.groups.at(-1));
+    });
+
+    it('should add the group to the "addedGroups" array', () => {
+      expect(component['addedGroups']).toEqual([{
+        name: 'New Group',
+        conditions: [[{
+          field: null,
+          for: null,
+          operator: null,
+          value: null,
+        }]],
+      }]);
+    });
+
+    it('should avoid duplicate names', () => {
+      component.addGroup();
+      expect(component.groups.at(-1)!.name).toEqual('New Group 1');
+    });
+  });
+
+  describe('removeGroup', () => {
+    const index = groupConditions.findIndex((group) => group.name === 'ToBeDeleted');
+    const deletedGroup = groupConditions.find((group) => group.name === 'ToBeDeleted') as GroupConditions<SessionRawEnumField, TaskOptionEnumField>;
+
+    describe('if not included in the "addedGroup" array', () => {
+      beforeEach(() => {
+        component.selectedGroup = deletedGroup;
+        component['editedGroups'][deletedGroup.name] = deletedGroup;
+        component.removeGroup(index);
+      });
+  
+      it('should remove the group at the correct index', () => {
+        expect(component.groups).not.toContain(deletedGroup);
+      });
+  
+      it('should add the group to the "deletedGroup" array', () => {
+        expect(component['deletedGroups']).toEqual([deletedGroup.name]);
+      });
+  
+      it('should unselect the selected group if it is the one deleted', () => {
+        expect(component.selectedGroup).toBeUndefined();
+      });
+  
+      it('should remove the group from the "editedGroups" record', () => {
+        expect(component['editedGroups'][deletedGroup.name]).toBeUndefined();
+      });
+    });
+
+    describe('if included in the "addedGroup" array', () => {
+      beforeEach(() => {
+        component['addedGroups'].push(deletedGroup);
+        component.removeGroup(index);
+      });
+      
+      it('should remove the group from the "addedGroups" array', () => {
+        expect(component['addedGroups']).toEqual([]);
+      });
+
+      it('should not add the group to the "deletedGroup" array if included in the "addedGroups" first', () => {
+        expect(component['deletedGroups']).not.toContain(deletedGroup);
+      });
+    });
+
+    describe('updateName', () => {
+      const event = {target: {value: 'New Name'}} as unknown as Event;
+      
+      beforeEach(() => {
+        component.groups.push({name: 'New Name', conditions: []});
+        component.updateName(event);
+      });
+
+      it('should update the name of the selectedGroup', () => {
+        expect(component.selectedGroup?.name).toEqual((event.target as HTMLInputElement).value);
+      });
+    });
+  });
+
+  describe('addOrFilter', () => {
+    beforeEach(() => {
+      component.addOrFilter();
+    });
+
+    it('should add an empty filter', () => {
+      expect(component.selectedGroup?.conditions.at(-1)).toEqual([{
+        field: null,
+        for: null,
+        operator: null,
+        value: null,
+      }]);
+    });
+  });
+
+  describe('removeOrFilter', () => {
+    beforeEach(() => {
+      component.selectedGroup?.conditions.push([{
+        field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_APPLICATION_NAME,
+        for: 'options',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+        value: 'application'
+      }]);
+      component.removeOrFilter(1);
+    });
+
+    it('should remove the filter from the selected group', () => {
+      expect(component.selectedGroup?.conditions[1]).toBeUndefined();
+    });
+
+    it('should add an empty filter if the conditions array is empty', () => {
+      component.removeOrFilter(0);
+      expect(component.selectedGroup?.conditions).toEqual([[{
+        field: null,
+        for: null,
+        operator: null,
+        value: null,
+      }]]);
+    });
+  });
+
+  it('should get icons', () => {
+    expect(component.getIcon('heart')).toEqual('favorite');
+  });
+
+  it('should close with all required data on confirm', () => {
+    component.confirmClose();
+    expect(dialogRef.close).toHaveBeenCalledWith({
+      addedGroups: component['addedGroups'],
+      editedGroups: component['editedGroups'],
+      deletedGroups: component['deletedGroups'],
+    });
+  });
+
+  it('should close with nothing', () => {
+    component.close();
+    expect(dialogRef.close).toHaveBeenCalledWith();
+  });
+});
\ No newline at end of file
diff --git a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
index ec1dfda7c..c72659c81 100644
--- a/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
+++ b/src/app/components/table/group/manage-groups-dialog/manage-groups-dialog.component.ts
@@ -5,22 +5,36 @@ import { MatDividerModule } from '@angular/material/divider';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
-import { Filter, FiltersEnums, FiltersOptionsEnums } from '@app/types/filters';
+import { FiltersEnums, FiltersOptionsEnums } from '@app/types/filters';
 import { GroupConditions } from '@app/types/groups';
 import { FiltersDialogOrComponent } from '@components/filters/filters-dialog-or.component';
 import { IconsService } from '@services/icons.service';
 
+/**
+ * Data required by the ManageTableGroupsDialog component in order to manage groups correctly.
+ * - groups: Array of GroupConditions, all currently created groups.
+ * - selected: string, represent a name of a group to focus when the dialog opens.
+ */
 export type ManageGroupsTableDialogInput<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
   groups: GroupConditions<F, FO>[];
   selected?: string;
 }
 
+/**
+ * Data returned by the ManageTableGroupsDialog component in order to modify groups in the simpliest way possible.
+ * - addedGroups: Array of GroupConditions, Groups to add once the dialog is closed.
+ * - editedGroups: Record according a string to GroupCondition.
+ * - deletedGroups: Array of string, names of groups to delete once the dialog is closed.
+ */
 export type ManageGroupsTableDialogResult<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> = {
   addedGroups: GroupConditions<F, FO>[];
   editedGroups: Record<string, GroupConditions<F, FO>>;
   deletedGroups: string[];
 }
 
+/**
+ * Dialog made to manage (create, edit and delete) group conditions for a specific table.
+ */
 @Component({
   selector: 'app-manage-groups-dialog',
   templateUrl: 'manage-groups-dialog.component.html',
@@ -38,6 +52,16 @@ export type ManageGroupsTableDialogResult<F extends FiltersEnums, FO extends Fil
 })
 export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends FiltersOptionsEnums | null = null> {
   private readonly dialogRef: MatDialogRef<ManageTableGroupsDialogComponent<F, FO>, ManageGroupsTableDialogResult<F, FO>> = inject(MatDialogRef);
+  private readonly iconsService = inject(IconsService);
+
+  groups: GroupConditions<F, FO>[];
+
+  private readonly addedGroups: GroupConditions<F, FO>[] = [];
+  private readonly editedGroups: Record<string, GroupConditions<F, FO>> = {};
+  private readonly deletedGroups: string[] = [];
+
+  selectedGroup: GroupConditions<F, FO> | undefined;
+
   constructor(@Inject(MAT_DIALOG_DATA) dialogData: ManageGroupsTableDialogInput<F, FO>) {
     this.groups = structuredClone(dialogData.groups);
     if (dialogData.selected !== undefined) {
@@ -48,21 +72,20 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
     }
   }
 
-  private readonly iconsService = inject(IconsService);
-
-  groups: GroupConditions<F, FO>[];
-
-  addedGroups: GroupConditions<F, FO>[] = [];
-  editedGroups: Record<string, GroupConditions<F, FO>> = {};
-  deletedGroups: string[] = [];
-
-  selectedGroup: GroupConditions<F, FO> | undefined;
-
-  duplicates: number = 0;
-
+  /**
+   * Set a group as selected.
+   * - If the previously selected group has a name that is already existing in the **groups** array,
+   * updates its with the number of duplicates.
+   * 
+   * @param group GroupCondition. group to select.
+   * @param setAsEdited boolean. If set to true, will add the selectedGroup in the editedArray.
+   */
   selectGroup(group: GroupConditions<F, FO>, setAsEdited: boolean = false) {
-    if (this.selectedGroup && this.duplicates !== 0) {
-      this.selectedGroup.name += ` ${this.duplicates}`;
+    if (this.selectedGroup) {
+      const duplicates = this.groups.filter((group) => group.name.includes(this.selectedGroup!.name)).length;
+      if (duplicates > 1) {
+        this.selectedGroup.name += ` ${duplicates-1}`;
+      }
     }
     this.selectedGroup = group;
     if (setAsEdited) {
@@ -71,11 +94,15 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
     }
   }
 
+  /**
+   * Add a group with the name "New Group" and an empty filter.
+   * If a group with the same name already exists, will add a number at the end of the name. 
+   */
   addGroup() {
     const name = $localize`New Group`;
-    const countName = this.groups.filter((group) => group.name.includes(name)).length;
+    const duplicates = this.groups.filter((group) => group.name.includes(name)).length;
     const group: GroupConditions<F, FO> = {
-      name: name + (countName !== 0 ? ` ${countName}` : ''),
+      name: name + (duplicates !== 0 ? ` ${duplicates}` : ''),
       conditions: [[{
         field: null,
         for: null,
@@ -88,27 +115,41 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
     this.addedGroups.push(group);
   }
 
+  /**
+   * Remove a group at the specified index.
+   * @param index number.
+   */
   removeGroup(index: number) {
     const deletedGroup = this.groups.splice(index, 1)[0];
-    if (this.selectedGroup === deletedGroup) {
-      this.selectedGroup = undefined;
-    }
-    if (this.addedGroups.includes(deletedGroup)) {
-      const index = this.addedGroups.indexOf(deletedGroup);
-      this.addedGroups.splice(index, 1);
-    } else {
-      this.deletedGroups.push(deletedGroup.name);
+    if (deletedGroup) {
+      if (this.selectedGroup?.name === deletedGroup?.name) {
+        this.selectedGroup = undefined;
+      }
+      const addedIndex = this.addedGroups.findIndex((group) => group.name === deletedGroup.name);
+      if (addedIndex !== -1) {
+        this.addedGroups.splice(addedIndex, 1);
+      } else {
+        this.deletedGroups.push(deletedGroup.name);
+        delete this.editedGroups[deletedGroup.name];
+      }
     }
   }
 
+  /**
+   * Update the group name on user input.
+   * Will compute the number of duplicates of this name.
+   * @param event Event
+   */
   updateName(event: Event) {
     if (this.selectedGroup) {
       const name = (event.target as HTMLInputElement).value;
-      this.duplicates = this.groups.filter((group) => group.name.includes(name)).length;
       this.selectedGroup.name = name;
     }
   }
 
+  /**
+   * Add an FiltersAnd to the selectedGroup condition.
+   */
   addOrFilter() {
     if (this.selectedGroup) {
       this.selectedGroup.conditions.push([{
@@ -120,22 +161,31 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
     }
   }
 
-  removeOrFilter(filter: Filter<F, FO>[]) {
+  /**
+   * Remove the FiltersAnd from the selectedGroup condition at the specified index.
+   * @param index number.
+   */
+  removeOrFilter(index: number) {
     if (this.selectedGroup) {
-      const index = this.selectedGroup.conditions.indexOf(filter);
-      if (index !== -1) {
-        this.selectedGroup.conditions.splice(index, 1);
-      }
+      this.selectedGroup.conditions.splice(index, 1);
       if (this.selectedGroup.conditions.length === 0) {
         this.addOrFilter();
       }
     }
   }
 
+  /**
+   * Retrieves an icon.
+   * @param name icon name
+   * @returns Material icon name
+   */
   getIcon(name: string) {
     return this.iconsService.getIcon(name);
   }
 
+  /**
+   * Close the dialog on confirm.
+   */
   confirmClose() {
     this.dialogRef.close({
       addedGroups: this.addedGroups,
@@ -144,6 +194,9 @@ export class ManageTableGroupsDialogComponent<F extends FiltersEnums, FO extends
     });
   }
 
+  /**
+   * Close the dialog on cancel.
+   */
   close() {
     this.dialogRef.close();
   }

From c46991398d2a0115f944e910ea7d2c7aea209b82 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 16:25:53 +0100
Subject: [PATCH 27/47] docs: Group tasks by status

---
 .../group-tasks-by-status.component.ts                     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
index f705b1fc6..aa9cbd0d8 100644
--- a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
+++ b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
@@ -5,6 +5,9 @@ import { ApplicationData, ArmonikData, DataRaw, PartitionData, SessionData } fro
 import { CountTasksByStatusComponent } from '@components/count-tasks-by-status.component';
 import { Subject } from 'rxjs';
 
+/**
+ * For a group of (Applications, Partitions or Sessions) rows, display the additionned tasks by status of all loaded data.
+ */
 @Component({
   selector: 'app-group-tasks-by-status',
   templateUrl: 'group-tasks-by-status.component.html',
@@ -14,6 +17,10 @@ import { Subject } from 'rxjs';
   ]
 })
 export class GroupTasksByStatusComponent<T extends DataRaw, O extends TaskOptions | null = null> {
+  /**
+   * Takes data from a group, and for each filter and queryTasksParams of this data,
+   * will prepare every needed objects for the taskByStatus component. 
+   */
   @Input({ required: true }) set groupData(entry: ArmonikData<T, O>[] | null) {
     if (entry !== null) {
       this.filters = [];

From 9bcaf87f033497a5563a196a1cc6f90e4fe74507 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 16:29:53 +0100
Subject: [PATCH 28/47] docs: group component

---
 .../table/group/group-row/group.component.ts   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/app/components/table/group/group-row/group.component.ts b/src/app/components/table/group/group-row/group.component.ts
index 1db26d79f..a01f4c9f3 100644
--- a/src/app/components/table/group/group-row/group.component.ts
+++ b/src/app/components/table/group/group-row/group.component.ts
@@ -19,6 +19,9 @@ import { IconsService } from '@services/icons.service';
 import { rotateFull, expand } from '@shared/animations';
 import { GroupTasksByStatusComponent } from '../grouped-tasks-by-status/group-tasks-by-status.component';
 
+/**
+ * Display groups row in tables.
+ */
 @Component({
   selector: 'app-table-group',
   templateUrl: 'group.component.html',
@@ -68,19 +71,34 @@ export class TableGroupComponent<T extends DataRaw, S extends Status, O extends
 
   private readonly iconsService = inject(IconsService);
 
+  /**
+   * Retrieves an icon.
+   * @param name icon name
+   * @returns Material icon name
+   */
   getIcon(name: string) {
     return this.iconsService.getIcon(name);
   }
 
+  /**
+   * Expand or close the group row.
+   */
   switchView() {
     this.group.opened = !this.group.opened;
   }
 
+  /**
+   * Emits the page change to the parent component.
+   * @param event PageEvent
+   */
   pageChange(event: PageEvent) {
     this.group.page = event.pageIndex;
     this.page.emit();
   }
 
+  /**
+   * Emits the name of the group to open its settings. 
+   */
   groupSettingsEmit() {
     this.groupSettings.emit(this.group.name());
   }

From d55555a52559c971c85f8cff9dcfdce362f097ad Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Thu, 13 Feb 2025 16:39:46 +0100
Subject: [PATCH 29/47] tests: table component

---
 .../components/table/table.component.spec.ts  | 27 ++++++++++++++++++-
 src/app/components/table/table.component.ts   |  3 ++-
 src/app/types/data.ts                         |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/app/components/table/table.component.spec.ts b/src/app/components/table/table.component.spec.ts
index e0428d7f6..cc57c1f6e 100644
--- a/src/app/components/table/table.component.spec.ts
+++ b/src/app/components/table/table.component.spec.ts
@@ -7,6 +7,7 @@ import { SessionRaw } from '@app/sessions/types';
 import { TaskOptions } from '@app/tasks/types';
 import { TableColumn } from '@app/types/column.type';
 import { SessionData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { TableComponent } from './table.component';
 
@@ -94,7 +95,7 @@ describe('TableComponent', () => {
   });
 
   it('should set columnsKeys', () => {
-    expect(component.columnsKeys).toEqual(columns.map((entry) => entry.key));
+    expect(component.columnsKeys).toEqual([...columns.map((entry) => entry.key), 'group']);
   });
 
   describe('sortChange', () => {
@@ -241,6 +242,30 @@ describe('TableComponent', () => {
     expect(component.trackBy(index, data[0])).toEqual(index);
   });
 
+  describe('isData', () => {
+    it('should return true if the element is an ArmonikData', () => {
+      expect(component.isData({raw: {sessionId: ''}} as SessionData));
+    });
+
+    it('should return false if the element is a group', () => {
+      expect(component.isData({name: 'group'} as unknown as Group<SessionRaw, TaskOptions>));
+    });
+  });
+
+  it('should emit on group page update', () => {
+    const name = 'group';
+    const spy = jest.spyOn(component.groupPageChange, 'emit');
+    component.groupPageUpdate(name);
+    expect(spy).toHaveBeenCalledWith(name);
+  });
+
+  it('should emit on group settings open', () => {
+    const name = 'group';
+    const spy = jest.spyOn(component.groupSettings, 'emit');
+    component.onGroupSettingsEmit(name);
+    expect(spy).toHaveBeenCalledWith(name);
+  });
+
   it('should unsubscribe on destroy', () => {
     const sortSpy = jest.spyOn(component.sort.sortChange, 'unsubscribe');
     const paginatorSpy = jest.spyOn(component.paginator.page, 'unsubscribe');
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index da74bbb18..0ac52dac4 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -42,6 +42,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   @Input({ required: true }) set columns(entries: TableColumn<T, O>[]) {
     this._columns = entries;
     this._columnsKeys = entries.map((entry) => entry.key);
+    this._columnsKeys.push('group');
   }
 
   @Input({ required: true }) set data(entries: ArmonikData<T, O>[]) {
@@ -96,7 +97,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   }
 
   get columnsKeys(): ColumnKey<T, O>[] {
-    return [...this._columnsKeys, 'group'] as ColumnKey<T, O>[];
+    return this._columnsKeys as ColumnKey<T, O>[];
   }
 
   get isAllSelected(): boolean {
diff --git a/src/app/types/data.ts b/src/app/types/data.ts
index 0939eb3fe..714791ffa 100644
--- a/src/app/types/data.ts
+++ b/src/app/types/data.ts
@@ -8,7 +8,7 @@ import { TaskOptions, TaskRaw, TaskSummary, TaskSummaryFilters } from '@app/task
 
 export type PrefixedOptions<T> = `options.${keyof T extends string ? keyof T : never}`;
 
-export type ColumnKey<T extends DataRaw, O extends TaskOptions | null = null> = keyof T | 'actions' | PrefixedOptions<O> | CustomColumn | 'count' | 'select';
+export type ColumnKey<T extends DataRaw, O extends TaskOptions | null = null> = keyof T | 'actions' | PrefixedOptions<O> | CustomColumn | 'count' | 'select' | 'group';
 
 export type FieldKey<T extends DataRaw | TaskOptions> = keyof T;
 

From de6f208303a334cf1ea4c3adbbb9a21dbc9fb005 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Fri, 14 Feb 2025 09:41:15 +0100
Subject: [PATCH 30/47] tests: added invert filters

---
 .../services/invert-filter.service.spec.ts    | 163 ++++++++++++++++++
 src/app/services/invert-filter.service.ts     |   2 +-
 2 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 src/app/services/invert-filter.service.spec.ts

diff --git a/src/app/services/invert-filter.service.spec.ts b/src/app/services/invert-filter.service.spec.ts
new file mode 100644
index 000000000..d5cfd05fc
--- /dev/null
+++ b/src/app/services/invert-filter.service.spec.ts
@@ -0,0 +1,163 @@
+import { FilterDateOperator, FilterStringOperator, SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { TestBed } from '@angular/core/testing';
+import { Filter, FiltersOr } from '@app/types/filters';
+import { DataFilterService } from '@app/types/services/data-filter.service';
+import { InvertFilterService } from './invert-filter.service';
+
+describe('InvertFilterService', () => {
+  let service: InvertFilterService<SessionRawEnumField, TaskOptionEnumField>;
+
+  const filters: FiltersOr<SessionRawEnumField, TaskOptionEnumField> = [
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: '10000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+        value: '20000',
+      }
+    ],
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+        value: 'sessionId',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: '30000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+        value: '40000'
+      },
+    ]
+  ];
+
+  const invertedFilters: FiltersOr<SessionRawEnumField, TaskOptionEnumField> = [
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+        value: '10000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL,
+        value: 'sessionId',
+      },
+    ],
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+        value: '10000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+        value: '30000',
+      },
+    ],
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+        value: '10000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: '40000'
+      },
+    ],
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: '20000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL,
+        value: 'sessionId',
+      },
+    ],
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: '20000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+        value: '30000',
+      },
+    ],
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: '20000',
+      },
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: '40000'
+      },
+    ],
+  ];
+
+  const mockedDataFilterService = {
+    getType: jest.fn((filter: Filter<SessionRawEnumField, TaskOptionEnumField>) => {
+      switch (filter.field) {
+      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT:
+        return 'date';
+      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT:
+        return 'date';
+      default:
+        return 'string';
+      }
+    })
+  };
+
+  beforeEach(() => {
+    service = TestBed.configureTestingModule({
+      providers: [
+        InvertFilterService,
+        { provide: DataFilterService, useValue: mockedDataFilterService },
+      ]
+    }).inject(InvertFilterService);
+  });
+
+  it('should create', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should invert filters properly', () => {
+    expect(service.invert(filters)).toEqual(invertedFilters);
+  });
+});
\ No newline at end of file
diff --git a/src/app/services/invert-filter.service.ts b/src/app/services/invert-filter.service.ts
index c2d1503a9..8c78c8c43 100644
--- a/src/app/services/invert-filter.service.ts
+++ b/src/app/services/invert-filter.service.ts
@@ -30,7 +30,7 @@ export class InvertFilterService<F extends FiltersEnums, FO extends FiltersOptio
 
   }
 
-  private invertFilter(filter: Filter<F,FO>) {
+  private invertFilter(filter: Filter<F, FO>) {
     const type = this.dataFilterService.getType(filter);
     switch (type) {
     case 'string':

From b082967a68025645ae3766d2bb1584fe36f83c2e Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Fri, 14 Feb 2025 11:22:53 +0100
Subject: [PATCH 31/47] tests: invert filter service

---
 .../services/invert-filter.service.spec.ts    | 368 +++++++++++++++++-
 1 file changed, 357 insertions(+), 11 deletions(-)

diff --git a/src/app/services/invert-filter.service.spec.ts b/src/app/services/invert-filter.service.spec.ts
index d5cfd05fc..f28d91ce7 100644
--- a/src/app/services/invert-filter.service.spec.ts
+++ b/src/app/services/invert-filter.service.spec.ts
@@ -1,4 +1,4 @@
-import { FilterDateOperator, FilterStringOperator, SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { FilterArrayOperator, FilterBooleanOperator, FilterDateOperator, FilterDurationOperator, FilterNumberOperator, FilterStatusOperator, FilterStringOperator, SessionRawEnumField, SessionStatus, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { TestBed } from '@angular/core/testing';
 import { Filter, FiltersOr } from '@app/types/filters';
 import { DataFilterService } from '@app/types/services/data-filter.service';
@@ -16,7 +16,7 @@ describe('InvertFilterService', () => {
         value: '10000',
       },
       {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
         for: 'root',
         operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
         value: '20000',
@@ -36,7 +36,7 @@ describe('InvertFilterService', () => {
         value: '30000',
       },
       {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
         for: 'root',
         operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
         value: '40000'
@@ -81,7 +81,7 @@ describe('InvertFilterService', () => {
         value: '10000',
       },
       {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
         for: 'root',
         operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
         value: '40000'
@@ -89,7 +89,7 @@ describe('InvertFilterService', () => {
     ],
     [
       {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
         for: 'root',
         operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
         value: '20000',
@@ -103,7 +103,7 @@ describe('InvertFilterService', () => {
     ],
     [
       {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
         for: 'root',
         operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
         value: '20000',
@@ -117,13 +117,13 @@ describe('InvertFilterService', () => {
     ],
     [
       {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
         for: 'root',
         operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
         value: '20000',
       },
       {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT,
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
         for: 'root',
         operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
         value: '40000'
@@ -136,14 +136,31 @@ describe('InvertFilterService', () => {
       switch (filter.field) {
       case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT:
         return 'date';
-      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLOSED_AT:
-        return 'date';
-      default:
+      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLIENT_SUBMISSION:
+        return 'boolean';
+      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_STATUS:
+        return 'status';
+      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_PARTITION_IDS:
+        return 'array';
+      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_DURATION:
+        return 'duration';
+      case TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_APPLICATION_VERSION:
+        return 'number';
+      case SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID:
         return 'string';
+      default:
+        return null;
       }
     })
   };
 
+  const emptyFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+    field: null,
+    for: null,
+    operator: null,
+    value: null,
+  };
+
   beforeEach(() => {
     service = TestBed.configureTestingModule({
       providers: [
@@ -160,4 +177,333 @@ describe('InvertFilterService', () => {
   it('should invert filters properly', () => {
     expect(service.invert(filters)).toEqual(invertedFilters);
   });
+
+  describe('string', () => {
+    const stringFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+      field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+      for: 'root',
+      value: 'sessionId',
+      operator: null
+    };
+
+    it('should turn a EQUAL to NOT_EQUAL', () => {
+      stringFilter.operator = FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL;
+      expect(service.invert([[stringFilter]])).toEqual([[{
+        ...stringFilter,
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL
+      }]]);
+    });
+
+    it('should turn a NOT_EQUAL to EQUAL', () => {
+      stringFilter.operator = FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL;
+      expect(service.invert([[stringFilter]])).toEqual([[{
+        ...stringFilter,
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL
+      }]]);
+    });
+
+    it('should turn a CONTAINS to NOT_CONTAINS', () => {
+      stringFilter.operator = FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS;
+      expect(service.invert([[stringFilter]])).toEqual([[{
+        ...stringFilter,
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_NOT_CONTAINS
+      }]]);
+    });
+
+    it('should turn a NOT_CONTAINS to CONTAINS', () => {
+      stringFilter.operator = FilterStringOperator.FILTER_STRING_OPERATOR_NOT_CONTAINS;
+      expect(service.invert([[stringFilter]])).toEqual([[{
+        ...stringFilter,
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS
+      }]]);
+    });
+
+    it('should turn a START_WITH to an empty filter', () => {
+      stringFilter.operator = FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH;
+      expect(service.invert([[stringFilter]])).toEqual([[emptyFilter]]);
+    });
+
+    it('should turn a END_WITH to an empty filter', () => {
+      stringFilter.operator = FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH;
+      expect(service.invert([[stringFilter]])).toEqual([[emptyFilter]]);
+    });
+
+    it('should turn a null to an empty filter', () => {
+      stringFilter.operator = null;
+      expect(service.invert([[stringFilter]])).toEqual([[emptyFilter]]);
+    });
+  });
+
+  describe('number filter', () => {
+    const numberFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+      field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_APPLICATION_VERSION,
+      for: 'root',
+      value: 5,
+      operator: null
+    };
+
+    it('should turn a EQUAL to a NOT_EQUAL', () => {
+      numberFilter.operator = FilterNumberOperator.FILTER_NUMBER_OPERATOR_EQUAL;
+      expect(service.invert([[numberFilter]])).toEqual([[{
+        ...numberFilter,
+        operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_NOT_EQUAL
+      }]]);
+    });
+
+    it('should turn a NOT_EQUAL to a EQUAL', () => {
+      numberFilter.operator = FilterNumberOperator.FILTER_NUMBER_OPERATOR_NOT_EQUAL;
+      expect(service.invert([[numberFilter]])).toEqual([[{
+        ...numberFilter,
+        operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_EQUAL
+      }]]);
+    });
+
+    it('should turn a GREATER to a LESS OR EQUAL', () => {
+      numberFilter.operator = FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN;
+      expect(service.invert([[numberFilter]])).toEqual([[{
+        ...numberFilter,
+        operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN_OR_EQUAL
+      }]]);
+    });
+
+    it('should turn a LESS to a GREATER OR EQUAL', () => {
+      numberFilter.operator = FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN;
+      expect(service.invert([[numberFilter]])).toEqual([[{
+        ...numberFilter,
+        operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN_OR_EQUAL
+      }]]);
+    });
+
+    it('should turn a GREATER OR EQUAL to a LESS', () => {
+      numberFilter.operator = FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN_OR_EQUAL;
+      expect(service.invert([[numberFilter]])).toEqual([[{
+        ...numberFilter,
+        operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN
+      }]]);
+    });
+
+    it('should turn a LESS OR EQUAL to a GREATER', () => {
+      numberFilter.operator = FilterNumberOperator.FILTER_NUMBER_OPERATOR_LESS_THAN_OR_EQUAL;
+      expect(service.invert([[numberFilter]])).toEqual([[{
+        ...numberFilter,
+        operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_GREATER_THAN
+      }]]);
+    });
+
+    it('should turn a null to an empty filter', () => {
+      numberFilter.operator = null;
+      expect(service.invert([[numberFilter]])).toEqual([[emptyFilter]]);
+    });
+  });
+
+  describe('date', () => {
+    const dateFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+      field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+      for: 'root',
+      value: '1243900',
+      operator: null,
+    };
+
+    it('should turn EQUAL to NOT_EQUAL', () => {
+      dateFilter.operator = FilterDateOperator.FILTER_DATE_OPERATOR_EQUAL;
+      expect(service.invert([[dateFilter]])).toEqual([[{
+        ...dateFilter,
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_NOT_EQUAL,
+      }]]);
+    });
+
+    it('should turn NOT_EQUAL to EQUAL', () => {
+      dateFilter.operator = FilterDateOperator.FILTER_DATE_OPERATOR_NOT_EQUAL;
+      expect(service.invert([[dateFilter]])).toEqual([[{
+        ...dateFilter,
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_EQUAL,
+      }]]);
+    });
+
+    it('should turn AFTER to BEFORE OR EQUAL', () => {
+      dateFilter.operator = FilterDateOperator.FILTER_DATE_OPERATOR_AFTER;
+      expect(service.invert([[dateFilter]])).toEqual([[{
+        ...dateFilter,
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE_OR_EQUAL,
+      }]]);
+    });
+
+    it('should turn BEFORE to AFTER OR EQUAL', () => {
+      dateFilter.operator = FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE;
+      expect(service.invert([[dateFilter]])).toEqual([[{
+        ...dateFilter,
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+      }]]);
+    });
+
+    it('should turn AFTER OR EQUAL to BEFORE', () => {
+      dateFilter.operator = FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL;
+      expect(service.invert([[dateFilter]])).toEqual([[{
+        ...dateFilter,
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE,
+      }]]);
+    });
+
+    it('should turn BEFORE OR EQUAL to AFTER', () => {
+      dateFilter.operator = FilterDateOperator.FILTER_DATE_OPERATOR_BEFORE_OR_EQUAL;
+      expect(service.invert([[dateFilter]])).toEqual([[{
+        ...dateFilter,
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER,
+      }]]);
+    });
+
+    it('should turn a null to an empty filter', () => {
+      dateFilter.operator = null;
+      expect(service.invert([[dateFilter]])).toEqual([[emptyFilter]]);
+    });
+  });
+
+  describe('array', () => {
+    const arrayFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+      field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_PARTITION_IDS,
+      for: 'root',
+      value: 'partition-Id',
+      operator: null,
+    };
+
+    it('should turn CONTAINS to NOT_CONTAINS', () => {
+      arrayFilter.operator = FilterArrayOperator.FILTER_ARRAY_OPERATOR_CONTAINS;
+      expect(service.invert([[arrayFilter]])).toEqual([[{
+        ...arrayFilter,
+        operator: FilterArrayOperator.FILTER_ARRAY_OPERATOR_NOT_CONTAINS,
+      }]]);
+    });
+
+    it('should turn NOT_CONTAINS to CONTAINS', () => {
+      arrayFilter.operator = FilterArrayOperator.FILTER_ARRAY_OPERATOR_NOT_CONTAINS;
+      expect(service.invert([[arrayFilter]])).toEqual([[{
+        ...arrayFilter,
+        operator: FilterArrayOperator.FILTER_ARRAY_OPERATOR_CONTAINS,
+      }]]);
+    });
+
+    it('should turn a null to an empty filter', () => {
+      arrayFilter.operator = null;
+      expect(service.invert([[arrayFilter]])).toEqual([[emptyFilter]]);
+    });
+  });
+
+  describe('status', () => {
+    const statusFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+      field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_STATUS,
+      for: 'root',
+      value: SessionStatus.SESSION_STATUS_RUNNING,
+      operator: null
+    };
+
+    it('should turn EQUAL to NOT_EQUAL', () => {
+      statusFilter.operator = FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL;
+      expect(service.invert([[statusFilter]])).toEqual([[{
+        ...statusFilter,
+        operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_NOT_EQUAL
+      }]]);
+    });
+
+    it('should turn NOT_EQUAL to EQUAL', () => {
+      statusFilter.operator = FilterStatusOperator.FILTER_STATUS_OPERATOR_NOT_EQUAL;
+      expect(service.invert([[statusFilter]])).toEqual([[{
+        ...statusFilter,
+        operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL
+      }]]);
+    });
+
+    it('should turn a null to an empty filter', () => {
+      statusFilter.operator = null;
+      expect(service.invert([[statusFilter]])).toEqual([[emptyFilter]]);
+    });
+  });
+
+  describe('boolean', () => {
+    const booleanFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+      field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CLIENT_SUBMISSION,
+      for: 'root',
+      operator: FilterBooleanOperator.FILTER_BOOLEAN_OPERATOR_IS,
+      value: true,
+    };
+
+    it('should invert the value', () => {
+      expect(service.invert([[booleanFilter]])).toEqual([[{
+        ...booleanFilter,
+        value: false,
+      }]]);
+    });
+  });
+
+  describe('duration', () => {
+    const durationFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+      field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_DURATION,
+      for: 'root',
+      value: '12345689',
+      operator: null,
+    };
+
+    it('should turn EQUAL to NOT_EQUAL', () => {
+      durationFilter.operator = FilterDurationOperator.FILTER_DURATION_OPERATOR_EQUAL;
+      expect(service.invert([[durationFilter]])).toEqual([[{
+        ...durationFilter,
+        operator: FilterDurationOperator.FILTER_DURATION_OPERATOR_NOT_EQUAL,
+      }]]);
+    });
+
+    it('should turn NOT_EQUAL to EQUAL', () => {
+      durationFilter.operator = FilterDurationOperator.FILTER_DURATION_OPERATOR_NOT_EQUAL;
+      expect(service.invert([[durationFilter]])).toEqual([[{
+        ...durationFilter,
+        operator: FilterDurationOperator.FILTER_DURATION_OPERATOR_EQUAL,
+      }]]);
+    });
+
+    it('should turn LONGER to SHORTER OR EQUAL', () => {
+      durationFilter.operator = FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN;
+      expect(service.invert([[durationFilter]])).toEqual([[{
+        ...durationFilter,
+        operator: FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN_OR_EQUAL,
+      }]]);
+    });
+
+    it('should turn SHORTER to LONGER OR EQUAL', () => {
+      durationFilter.operator = FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN;
+      expect(service.invert([[durationFilter]])).toEqual([[{
+        ...durationFilter,
+        operator: FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN_OR_EQUAL,
+      }]]);
+    });
+
+    it('should turn LONGER OR EQUAL to SHORTER', () => {
+      durationFilter.operator = FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN_OR_EQUAL;
+      expect(service.invert([[durationFilter]])).toEqual([[{
+        ...durationFilter,
+        operator: FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN,
+      }]]);
+    });
+
+    it('should turn SHORTER OR EQUAL to LONGER', () => {
+      durationFilter.operator = FilterDurationOperator.FILTER_DURATION_OPERATOR_SHORTER_THAN_OR_EQUAL;
+      expect(service.invert([[durationFilter]])).toEqual([[{
+        ...durationFilter,
+        operator: FilterDurationOperator.FILTER_DURATION_OPERATOR_LONGER_THAN,
+      }]]);
+    });
+
+    it('should turn null to empty filter', () => {
+      durationFilter.operator = null;
+      expect(service.invert([[durationFilter]])).toEqual([[emptyFilter]]);
+    });
+  });
+
+  describe('Unrecognized field', () => {
+    it('should return empty filter', () => {
+      expect(service.invert([[{
+        field: -1 as SessionRawEnumField,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+        value: 'sessionId'
+      }]])).toEqual([[emptyFilter]]);
+    });
+  });
 });
\ No newline at end of file

From 939d48a3a26bb1f8ba8c6278ee33eb0a178780b3 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Fri, 14 Feb 2025 11:55:35 +0100
Subject: [PATCH 32/47] tests: index update

---
 src/app/applications/index.component.spec.ts | 54 +++++++++++++++-----
 src/app/partitions/index.component.spec.ts   | 33 +++++++++++-
 src/app/results/index.component.spec.ts      | 33 +++++++++++-
 src/app/sessions/index.component.spec.ts     | 33 ++++++++++++
 src/app/tasks/index.component.spec.ts        | 33 ++++++++++++
 5 files changed, 170 insertions(+), 16 deletions(-)

diff --git a/src/app/applications/index.component.spec.ts b/src/app/applications/index.component.spec.ts
index 7b9ca97e9..c4a684e0f 100644
--- a/src/app/applications/index.component.spec.ts
+++ b/src/app/applications/index.component.spec.ts
@@ -1,4 +1,5 @@
 import { ApplicationRawEnumField, FilterStringOperator } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { DashboardIndexService } from '@app/dashboard/services/dashboard-index.service';
@@ -129,7 +130,10 @@ describe('Application component', () => {
     saveFilters: jest.fn(),
     resetFilters: jest.fn(() => defaultFilters),
     saveShowFilters: jest.fn(),
-    restoreShowFilters: jest.fn(() => defaultShowFilters)
+    restoreShowFilters: jest.fn(() => defaultShowFilters),
+    restoreGroups: jest.fn(() => []),
+    saveGroups: jest.fn(),
+    resetGroups: jest.fn()
   };
 
 
@@ -152,6 +156,21 @@ describe('Application component', () => {
     refresh$: {
       next: jest.fn()
     },
+    groups: [],
+    groupsConditions: [],
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
+  };
+
+  const dialogResult: unknown[] = [];
+  const mockmatDialog = {
+    open: () => {
+      return {
+        afterClosed: () => {
+          return of(dialogResult);
+        }
+      };
+    }
   };
 
   beforeEach(() => {
@@ -164,19 +183,10 @@ describe('Application component', () => {
         { provide: ShareUrlService, useValue: mockShareUrlService },
         { provide: ApplicationsIndexService, useValue: mockApplicationIndexService },
         { provide: AutoRefreshService, useValue: mockAutoRefreshService },
-        { provide: MatDialog, useValue:
-          {
-            open: () => {
-              return {
-                afterClosed: () => {
-                  return of([]);
-                }
-              };
-            }
-          }
-        },
+        { provide: MatDialog, useValue: mockmatDialog },
         { provide: DashboardIndexService, useValue: mockDashboardIndexService },
         DefaultConfigService,
+        { provide: ViewContainerRef, useValue: {} },
       ]
     }).inject(IndexComponent);
 
@@ -201,6 +211,11 @@ describe('Application component', () => {
     expect(component.availableColumns).toEqual(displayedColumns.map(col => col.key));
   });
 
+  it('should init groups on init', () => {
+    expect(mockApplicationsDataService.groupsConditions).toEqual(mockApplicationsFilterService.restoreGroups());
+    expect(mockApplicationsDataService.initGroups).toHaveBeenCalled();
+  });
+
   it('should get page icon', () => {
     expect(component.getIcon('applications')).toEqual('apps');
   });
@@ -409,6 +424,7 @@ describe('Application component', () => {
         displayedColumns: component.displayedColumnsKeys,
         options: defaultOptions,
         filters: component.filters,
+        groups: mockApplicationsDataService.groupsConditions,
       });
     });
   });
@@ -426,4 +442,18 @@ describe('Application component', () => {
       expect(mockApplicationsFilterService.saveShowFilters).toHaveBeenCalledWith(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    beforeEach(() => {
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockApplicationsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(mockApplicationsFilterService.saveGroups).toHaveBeenCalledWith(mockApplicationsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/partitions/index.component.spec.ts b/src/app/partitions/index.component.spec.ts
index ecf0b1cd3..3467074df 100644
--- a/src/app/partitions/index.component.spec.ts
+++ b/src/app/partitions/index.component.spec.ts
@@ -1,4 +1,5 @@
 import { FilterStringOperator, PartitionRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
@@ -21,12 +22,12 @@ import { PartitionRaw } from './types';
 describe('Partitions Index Component', () => {
   let component: IndexComponent;
 
-  const newCustomColumns: CustomColumn[] = ['options.options.FastCompute', 'options.options.NewCustom'];
+  const dialogResult: CustomColumn[] = ['options.options.FastCompute', 'options.options.NewCustom'];
 
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed: (): unknown => of(newCustomColumns)
+        afterClosed: (): unknown => of(dialogResult)
       };
     })
   };
@@ -110,6 +111,10 @@ describe('Partitions Index Component', () => {
     refresh$: {
       next: jest.fn()
     },
+    groups: [],
+    groupsConditions: [],
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
   };
 
   const mockPartitionsIndexService = {
@@ -133,6 +138,9 @@ describe('Partitions Index Component', () => {
     resetFilters: jest.fn(() => []),
     saveShowFilters: jest.fn(),
     restoreShowFilters: jest.fn(() => defaultShowFilters),
+    restoreGroups: jest.fn(() => []),
+    saveGroups: jest.fn(),
+    resetGroups: jest.fn()
   };
   
   const mockShareUrlService = {
@@ -159,6 +167,7 @@ describe('Partitions Index Component', () => {
         { provide: PartitionsFiltersService, useValue: mockPartititionsFiltersService },
         { provide: ShareUrlService, useValue: mockShareUrlService },
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, useValue: {} },
       ]
     }).inject(IndexComponent);
     component.ngOnInit();
@@ -222,6 +231,11 @@ describe('Partitions Index Component', () => {
     it('should merge subscriptions', () => {
       expect(component.subscriptions).toBeDefined();
     });
+
+    it('should init groups on init', () => {
+      expect(mockPartitionsDataService.groupsConditions).toEqual(mockPartititionsFiltersService.restoreGroups());
+      expect(mockPartitionsDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   describe('on destroy', () => {
@@ -448,6 +462,7 @@ describe('Partitions Index Component', () => {
         displayedColumns: defaultColumns,
         options: defaultOptions,
         filters: [],
+        groups: mockPartitionsDataService.groupsConditions,
       });
     });
   });
@@ -465,4 +480,18 @@ describe('Partitions Index Component', () => {
       expect(mockPartititionsFiltersService.saveShowFilters).toHaveBeenCalledWith(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    beforeEach(() => {
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockPartitionsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(mockPartititionsFiltersService.saveGroups).toHaveBeenCalledWith(mockPartitionsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/results/index.component.spec.ts b/src/app/results/index.component.spec.ts
index 274e542d3..81e950e97 100644
--- a/src/app/results/index.component.spec.ts
+++ b/src/app/results/index.component.spec.ts
@@ -1,4 +1,5 @@
 import { FilterStringOperator, ResultRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
@@ -21,12 +22,12 @@ import { ResultRaw } from './types';
 describe('Results Index Component', () => {
   let component: IndexComponent;
 
-  const newCustomColumns: CustomColumn[] = ['options.options.FastCompute', 'options.options.NewCustom'];
+  const dialogResult: CustomColumn[] = ['options.options.FastCompute', 'options.options.NewCustom'];
 
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed: (): unknown => of(newCustomColumns)
+        afterClosed: (): unknown => of(dialogResult)
       };
     })
   };
@@ -122,6 +123,9 @@ describe('Results Index Component', () => {
     resetFilters: jest.fn(() => []),
     saveShowFilters: jest.fn(),
     restoreShowFilters: jest.fn(() => defaultShowFilters),
+    restoreGroups: jest.fn(() => []),
+    saveGroups: jest.fn(),
+    resetGroups: jest.fn()
   };
   
   const mockShareUrlService = {
@@ -143,6 +147,10 @@ describe('Results Index Component', () => {
     refresh$: {
       next: jest.fn()
     },
+    groups: [],
+    groupsConditions: [],
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
   };
 
   beforeEach(() => {
@@ -159,6 +167,7 @@ describe('Results Index Component', () => {
         { provide: ResultsFiltersService, useValue: mockResultsFiltersService },
         { provide: ShareUrlService, useValue: mockShareUrlService },
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, useValue: {} },
       ]
     }).inject(IndexComponent);
     component.ngOnInit();
@@ -223,6 +232,11 @@ describe('Results Index Component', () => {
     it('should merge subscriptions', () => {
       expect(component.subscriptions).toBeDefined();
     });
+
+    it('should init groups on init', () => {
+      expect(mockResultsDataService.groupsConditions).toEqual(mockResultsFiltersService.restoreGroups());
+      expect(mockResultsDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   describe('on destroy', () => {
@@ -451,6 +465,7 @@ describe('Results Index Component', () => {
         displayedColumns: defaultColumns,
         options: defaultOptions,
         filters: [],
+        groups: mockResultsDataService.groupsConditions
       });
     });
   });
@@ -468,4 +483,18 @@ describe('Results Index Component', () => {
       expect(mockResultsFiltersService.saveShowFilters).toHaveBeenCalledWith(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    beforeEach(() => {
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockResultsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(mockResultsFiltersService.saveGroups).toHaveBeenCalledWith(mockResultsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/sessions/index.component.spec.ts b/src/app/sessions/index.component.spec.ts
index 43a2dd2dd..be08ffe7a 100644
--- a/src/app/sessions/index.component.spec.ts
+++ b/src/app/sessions/index.component.spec.ts
@@ -1,4 +1,5 @@
 import { FilterStringOperator, SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
@@ -38,6 +39,10 @@ describe('Sessions Index Component', () => {
     onPurge: jest.fn(),
     onClose: jest.fn(),
     onDelete: jest.fn(),
+    groups: [],
+    groupsConditions: [],
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
   };
 
   const newCustomColumns: CustomColumn[] = ['options.options.FastCompute', 'options.options.NewCustom'];
@@ -150,6 +155,9 @@ describe('Sessions Index Component', () => {
     resetFilters: jest.fn(() => []),
     saveShowFilters: jest.fn(),
     restoreShowFilters: jest.fn(() => defaultShowFilters),
+    restoreGroups: jest.fn(() => []),
+    saveGroups: jest.fn(),
+    resetGroups: jest.fn()
   };
   
   const mockShareUrlService = {
@@ -176,6 +184,7 @@ describe('Sessions Index Component', () => {
         { provide: SessionsFiltersService, useValue: mockSessionFiltersService },
         { provide: ShareUrlService, useValue: mockShareUrlService },
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, useValue: {} },
       ]
     }).inject(IndexComponent);
     component.ngOnInit();
@@ -243,6 +252,11 @@ describe('Sessions Index Component', () => {
     it('should merge subscriptions', () => {
       expect(component.subscriptions).toBeDefined();
     });
+
+    it('should init groups on init', () => {
+      expect(mockSessionsDataService.groupsConditions).toEqual(mockSessionFiltersService.restoreGroups());
+      expect(mockSessionsDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   describe('on destroy', () => {
@@ -483,6 +497,7 @@ describe('Sessions Index Component', () => {
         customColumns: defaultCustomColumns,
         options: defaultOptions,
         filters: [],
+        groups: mockSessionsDataService.groupsConditions,
       });
     });
   });
@@ -527,4 +542,22 @@ describe('Sessions Index Component', () => {
       expect(mockSessionFiltersService.saveShowFilters).toHaveBeenCalledWith(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    const dialogResult: unknown = [];
+    beforeEach(() => {
+      mockMatDialog.open.mockReturnValueOnce({
+        afterClosed: () => of(dialogResult)
+      });
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockSessionsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(mockSessionFiltersService.saveGroups).toHaveBeenCalledWith(mockSessionsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/tasks/index.component.spec.ts b/src/app/tasks/index.component.spec.ts
index 71ccd4784..49a310b23 100644
--- a/src/app/tasks/index.component.spec.ts
+++ b/src/app/tasks/index.component.spec.ts
@@ -1,4 +1,5 @@
 import { FilterStringOperator, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
@@ -136,6 +137,9 @@ describe('Tasks Index Component', () => {
     resetFilters: jest.fn(() => []),
     saveShowFilters: jest.fn(),
     restoreShowFilters: jest.fn(() => defaultShowFilters),
+    restoreGroups: jest.fn(() => []),
+    saveGroups: jest.fn(),
+    resetGroups: jest.fn()
   };
   
   const mockShareUrlService = {
@@ -158,6 +162,10 @@ describe('Tasks Index Component', () => {
       next: jest.fn()
     },
     cancelTasks: jest.fn(),
+    groups: [],
+    groupsConditions: [],
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
   };
 
   beforeEach(() => {
@@ -174,6 +182,7 @@ describe('Tasks Index Component', () => {
         { provide: TasksFiltersService, useValue: mockTaskFiltersService },
         { provide: ShareUrlService, useValue: mockShareUrlService },
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, useValue: {} },
       ]
     }).inject(IndexComponent);
     component.ngOnInit();
@@ -251,6 +260,11 @@ describe('Tasks Index Component', () => {
       expect(component.serviceName).toEqual(defaultViewInLogs.serviceName);
       expect(component.urlTemplate).toEqual(defaultViewInLogs.urlTemplate);
     });
+
+    it('should init groups on init', () => {
+      expect(mockTasksDataService.groupsConditions).toEqual(mockTaskFiltersService.restoreGroups());
+      expect(mockTasksDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   describe('on destroy', () => {
@@ -480,6 +494,7 @@ describe('Tasks Index Component', () => {
         customColumns: defaultCustomColumns,
         options: defaultOptions,
         filters: [],
+        groups: mockTasksDataService.groupsConditions,
       });
     });
   });
@@ -585,4 +600,22 @@ describe('Tasks Index Component', () => {
       expect(mockTaskFiltersService.saveShowFilters).toHaveBeenCalledWith(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    const dialogResult: unknown = [];
+    beforeEach(() => {
+      mockMatDialog.open.mockReturnValueOnce({
+        afterClosed: () => of(dialogResult)
+      });
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockTasksDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(mockTaskFiltersService.saveGroups).toHaveBeenCalledWith(mockTasksDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file

From d30f58a3be208d67afb8a2827edaab97cde14d89 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Fri, 14 Feb 2025 15:04:41 +0100
Subject: [PATCH 33/47] tests: lines components

---
 .../lines/applications-line.component.spec.ts | 51 +++++++++++++++++--
 .../lines/partitions-line.component.spec.ts   | 47 +++++++++++++++--
 .../lines/results-line.component.spec.ts      | 49 ++++++++++++++++--
 .../lines/sessions-line.component.spec.ts     | 45 +++++++++++++++-
 .../lines/tasks-line.component.spec.ts        | 45 +++++++++++++++-
 .../types/components/dashboard-line-table.ts  |  1 +
 6 files changed, 222 insertions(+), 16 deletions(-)

diff --git a/src/app/dashboard/components/lines/applications-line.component.spec.ts b/src/app/dashboard/components/lines/applications-line.component.spec.ts
index f7ebabbf1..194ecc029 100644
--- a/src/app/dashboard/components/lines/applications-line.component.spec.ts
+++ b/src/app/dashboard/components/lines/applications-line.component.spec.ts
@@ -1,4 +1,5 @@
-import { ApplicationRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ApplicationRawEnumField, FilterStringOperator } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import ApplicationsDataService from '@app/applications/services/applications-data.service';
@@ -6,7 +7,8 @@ import { ApplicationsIndexService } from '@app/applications/services/application
 import { ApplicationRaw, ApplicationRawColumnKey, ApplicationRawFieldKey, ApplicationRawListOptions } from '@app/applications/types';
 import { TableColumn } from '@app/types/column.type';
 import { ColumnKey } from '@app/types/data';
-import { FiltersOr } from '@app/types/filters';
+import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { DefaultConfigService } from '@services/default-config.service';
 import { IconsService } from '@services/icons.service';
@@ -72,6 +74,16 @@ describe('ApplicationsLineComponent', () => {
     },
   };
 
+  const lineGroup: GroupConditions<ApplicationRawEnumField> = {
+    name: 'Group 1',
+    conditions: [[{
+      field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+      for: 'root',
+      operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+      value: 'name'
+    }]],
+  };
+
   const line: TableLine<ApplicationRaw> = {
     name: 'Tasks',
     type: 'Applications',
@@ -79,7 +91,8 @@ describe('ApplicationsLineComponent', () => {
     filters: [],
     interval: 20,
     options: options,
-    showFilters: false
+    showFilters: false,
+    groups: lineGroup as unknown as GroupConditions<FiltersEnums, FiltersOptionsEnums>[],
   };
 
   const nameLine = {
@@ -88,7 +101,7 @@ describe('ApplicationsLineComponent', () => {
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed() {
+        afterClosed(): unknown {
           return of(nameLine);
         }
       };
@@ -104,6 +117,10 @@ describe('ApplicationsLineComponent', () => {
     refresh$: {
       next: jest.fn()
     },
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
+    groupsConditions: [],
+    groups: [],
   };
 
   const mockApplicationsIndexService = {
@@ -129,7 +146,8 @@ describe('ApplicationsLineComponent', () => {
         IconsService,
         { provide: ApplicationsIndexService, useValue: mockApplicationsIndexService },
         DefaultConfigService,
-        { provide: NotificationService, useValue: mockNotificationService }
+        { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, usevalue: {} },
       ]
     }).inject(ApplicationsLineComponent);
     component.line = line;
@@ -166,6 +184,11 @@ describe('ApplicationsLineComponent', () => {
       expect(component.intervalValue).toEqual(10);
       expect(component.options).toEqual(defaultConfigService.defaultApplications.options);
     });
+
+    it('should init groups', () => {
+      expect(mockApplicationsDataService.groupsConditions).toBe(lineGroup);
+      expect(mockApplicationsDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   it('should unsubscribe on destroy', () => {
@@ -390,4 +413,22 @@ describe('ApplicationsLineComponent', () => {
       expect(component.line.showFilters).toEqual(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    const dialogResult = [{fake: 'return'}];
+    beforeEach(() => {
+      mockMatDialog.open.mockReturnValueOnce({
+        afterClosed: () => of(dialogResult)
+      });
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockApplicationsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(component.line.groups).toEqual(mockApplicationsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/dashboard/components/lines/partitions-line.component.spec.ts b/src/app/dashboard/components/lines/partitions-line.component.spec.ts
index d4f615982..789bfb453 100644
--- a/src/app/dashboard/components/lines/partitions-line.component.spec.ts
+++ b/src/app/dashboard/components/lines/partitions-line.component.spec.ts
@@ -1,4 +1,5 @@
-import { PartitionRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { FilterStringOperator, PartitionRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import PartitionsDataService from '@app/partitions/services/partitions-data.service';
@@ -6,7 +7,8 @@ import { PartitionsIndexService } from '@app/partitions/services/partitions-inde
 import { PartitionRaw, PartitionRawColumnKey, PartitionRawFieldKey, PartitionRawListOptions } from '@app/partitions/types';
 import { TableColumn } from '@app/types/column.type';
 import { ColumnKey } from '@app/types/data';
-import { FiltersOr } from '@app/types/filters';
+import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { DefaultConfigService } from '@services/default-config.service';
 import { IconsService } from '@services/icons.service';
@@ -65,6 +67,16 @@ describe('PartitionsLineComponent', () => {
     },
   };
 
+  const lineGroup: GroupConditions<PartitionRawEnumField> = {
+    name: 'Group 1',
+    conditions: [[{
+      field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+      for: 'root',
+      operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+      value: 'name'
+    }]],
+  };
+
   const line: TableLine<PartitionRaw> = {
     name: 'Tasks',
     type: 'Partitions',
@@ -73,6 +85,7 @@ describe('PartitionsLineComponent', () => {
     interval: 20,
     options: options,
     showFilters: false,
+    groups: lineGroup as unknown as GroupConditions<FiltersEnums, FiltersOptionsEnums>[],
   };
 
   const nameLine = {
@@ -81,7 +94,7 @@ describe('PartitionsLineComponent', () => {
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed() {
+        afterClosed(): unknown {
           return of(nameLine);
         }
       };
@@ -97,6 +110,10 @@ describe('PartitionsLineComponent', () => {
     refresh$: {
       next: jest.fn()
     },
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
+    groupsConditions: [],
+    groups: [],
   };
 
   const mockPartitionsIndexService = {
@@ -122,6 +139,7 @@ describe('PartitionsLineComponent', () => {
         { provide: PartitionsIndexService, useValue: mockPartitionsIndexService },
         DefaultConfigService,
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, usevalue: {} },
       ]
     }).inject(PartitionsLineComponent);
     component.line = line;
@@ -158,6 +176,11 @@ describe('PartitionsLineComponent', () => {
       expect(component.options).toEqual(defaultConfigService.defaultPartitions.options);
       expect(component.showFilters).toEqual(line.showFilters);
     });
+
+    it('should init groups', () => {
+      expect(mockPartitionsDataService.groupsConditions).toBe(lineGroup);
+      expect(mockPartitionsDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   it('should unsubscribe on destroy', () => {
@@ -383,4 +406,22 @@ describe('PartitionsLineComponent', () => {
       expect(component.line.showFilters).toEqual(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    const dialogResult = [{fake: 'return'}];
+    beforeEach(() => {
+      mockMatDialog.open.mockReturnValueOnce({
+        afterClosed: () => of(dialogResult)
+      });
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockPartitionsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(component.line.groups).toEqual(mockPartitionsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/dashboard/components/lines/results-line.component.spec.ts b/src/app/dashboard/components/lines/results-line.component.spec.ts
index 051b59366..4fce5455c 100644
--- a/src/app/dashboard/components/lines/results-line.component.spec.ts
+++ b/src/app/dashboard/components/lines/results-line.component.spec.ts
@@ -1,11 +1,13 @@
-import { ResultRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { FilterStringOperator, ResultRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import ResultsDataService from '@app/results/services/results-data.service';
 import { ResultsIndexService } from '@app/results/services/results-index.service';
 import { ResultRaw, ResultRawColumnKey, ResultRawFieldKey, ResultRawListOptions } from '@app/results/types';
 import { TableColumn } from '@app/types/column.type';
-import { FiltersOr } from '@app/types/filters';
+import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { DefaultConfigService } from '@services/default-config.service';
 import { IconsService } from '@services/icons.service';
@@ -64,6 +66,16 @@ describe('ResultsLineComponent', () => {
     },
   };
 
+  const lineGroup: GroupConditions<ResultRawEnumField> = {
+    name: 'Group 1',
+    conditions: [[{
+      field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_NAME,
+      for: 'root',
+      operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+      value: 'name'
+    }]],
+  };
+
   const line: TableLine<ResultRaw> = {
     name: 'Tasks',
     type: 'Results',
@@ -72,6 +84,7 @@ describe('ResultsLineComponent', () => {
     interval: 20,
     options: options,
     showFilters: false,
+    groups: lineGroup as unknown as GroupConditions<FiltersEnums, FiltersOptionsEnums>[],
   };
 
   const nameLine = {
@@ -80,7 +93,7 @@ describe('ResultsLineComponent', () => {
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed() {
+        afterClosed(): unknown {
           return of(nameLine);
         }
       };
@@ -96,6 +109,10 @@ describe('ResultsLineComponent', () => {
     refresh$: {
       next: jest.fn()
     },
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
+    groupsConditions: [],
+    groups: [],
   };
 
   const mockResultsIndexService = {
@@ -120,7 +137,8 @@ describe('ResultsLineComponent', () => {
         { provide: ResultsDataService, useValue: mockResultsDataService },
         { provide: ResultsIndexService, useValue: mockResultsIndexService },
         DefaultConfigService,
-        { provide: NotificationService, useValue: mockNotificationService }
+        { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, useValue: {} },
       ]
     }).inject(ResultsLineComponent);
     component.line = line;
@@ -157,6 +175,11 @@ describe('ResultsLineComponent', () => {
       expect(component.options).toEqual(defaultConfigService.defaultResults.options);
       expect(component.showFilters).toEqual(line.showFilters);
     });
+
+    it('should init groups', () => {
+      expect(mockResultsDataService.groupsConditions).toBe(lineGroup);
+      expect(mockResultsDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   it('should unsubscribe on destroy', () => {
@@ -382,4 +405,22 @@ describe('ResultsLineComponent', () => {
       expect(component.line.showFilters).toEqual(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    const dialogResult = [{fake: 'return'}];
+    beforeEach(() => {
+      mockMatDialog.open.mockReturnValueOnce({
+        afterClosed: () => of(dialogResult)
+      });
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockResultsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(component.line.groups).toEqual(mockResultsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/dashboard/components/lines/sessions-line.component.spec.ts b/src/app/dashboard/components/lines/sessions-line.component.spec.ts
index becd9c4b6..f8dcab7ab 100644
--- a/src/app/dashboard/components/lines/sessions-line.component.spec.ts
+++ b/src/app/dashboard/components/lines/sessions-line.component.spec.ts
@@ -1,4 +1,5 @@
-import { SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { FilterStringOperator, SessionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { SessionsDataService } from '@app/sessions/services/sessions-data.service';
@@ -7,7 +8,8 @@ import { SessionRaw } from '@app/sessions/types';
 import { TaskOptions } from '@app/tasks/types';
 import { TableColumn } from '@app/types/column.type';
 import { ColumnKey, CustomColumn } from '@app/types/data';
-import { FiltersOr } from '@app/types/filters';
+import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { DefaultConfigService } from '@services/default-config.service';
@@ -68,6 +70,16 @@ describe('SessionsLineComponent', () => {
     },
   };
 
+  const lineGroup: GroupConditions<SessionRawEnumField, TaskOptionEnumField> = {
+    name: 'Group 1',
+    conditions: [[{
+      field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+      for: 'root',
+      operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+      value: 'name'
+    }]],
+  };
+
   const line: TableLine<SessionRaw, TaskOptions> = {
     name: 'Tasks',
     type: 'Sessions',
@@ -76,6 +88,7 @@ describe('SessionsLineComponent', () => {
     interval: 20,
     options: options,
     showFilters: false,
+    groups: lineGroup as unknown as GroupConditions<FiltersEnums, FiltersOptionsEnums>[],
   };
 
   const nameLine = {
@@ -100,6 +113,10 @@ describe('SessionsLineComponent', () => {
     refresh$: {
       next: jest.fn()
     },
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
+    groupsConditions: [],
+    groups: [],
   };
 
   const mockSessionsIndexService = {
@@ -125,6 +142,7 @@ describe('SessionsLineComponent', () => {
         { provide: SessionsIndexService, useValue: mockSessionsIndexService },
         DefaultConfigService,
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, usevalue: {} },
       ]
     }).inject(SessionsLineComponent);
     component.line = line;
@@ -161,6 +179,11 @@ describe('SessionsLineComponent', () => {
       expect(component.options).toEqual(defaultConfigService.defaultSessions.options);
       expect(component.showFilters).toEqual(line.showFilters);
     });
+
+    it('should init groups', () => {
+      expect(mockSessionsDataService.groupsConditions).toBe(lineGroup);
+      expect(mockSessionsDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   it('should unsubscribe on destroy', () => {
@@ -451,4 +474,22 @@ describe('SessionsLineComponent', () => {
       expect(component.line.showFilters).toEqual(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    const dialogResult = [{fake: 'return'}];
+    beforeEach(() => {
+      mockMatDialog.open.mockReturnValueOnce({
+        afterClosed: () => of(dialogResult)
+      });
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockSessionsDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(component.line.groups).toEqual(mockSessionsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/dashboard/components/lines/tasks-line.component.spec.ts b/src/app/dashboard/components/lines/tasks-line.component.spec.ts
index 764c83d12..77c8ee2ad 100644
--- a/src/app/dashboard/components/lines/tasks-line.component.spec.ts
+++ b/src/app/dashboard/components/lines/tasks-line.component.spec.ts
@@ -1,4 +1,5 @@
-import { TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { FilterStringOperator, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import TasksDataService from '@app/tasks/services/tasks-data.service';
@@ -6,7 +7,8 @@ import { TasksIndexService } from '@app/tasks/services/tasks-index.service';
 import { TaskOptions, TaskSummary } from '@app/tasks/types';
 import { TableColumn } from '@app/types/column.type';
 import { ColumnKey, CustomColumn } from '@app/types/data';
-import { FiltersOr } from '@app/types/filters';
+import { FiltersEnums, FiltersOptionsEnums, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { AutoRefreshService } from '@services/auto-refresh.service';
 import { DefaultConfigService } from '@services/default-config.service';
@@ -67,6 +69,16 @@ describe('TasksLineComponent', () => {
     },
   };
 
+  const lineGroup: GroupConditions<TaskSummaryEnumField, TaskOptionEnumField> = {
+    name: 'Group 1',
+    conditions: [[{
+      field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+      for: 'root',
+      operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+      value: 'name'
+    }]],
+  };
+
   const line: TableLine<TaskSummary, TaskOptions> = {
     name: 'Tasks',
     type: 'Tasks',
@@ -75,6 +87,7 @@ describe('TasksLineComponent', () => {
     interval: 20,
     options: options,
     showFilters: false,
+    groups: lineGroup as unknown as GroupConditions<FiltersEnums, FiltersOptionsEnums>[],
   };
 
   const nameLine = {
@@ -106,6 +119,10 @@ describe('TasksLineComponent', () => {
       next: jest.fn()
     },
     cancelTasks: jest.fn(),
+    initGroups: jest.fn(),
+    manageGroupDialogResult: jest.fn(),
+    groupsConditions: [],
+    groups: [],
   };
 
   const mockTasksIndexService = {
@@ -132,6 +149,7 @@ describe('TasksLineComponent', () => {
         { provide: TasksIndexService, useValue: mockTasksIndexService },
         DefaultConfigService,
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, usevalue: {} },
       ]
     }).inject(TasksLineComponent);
     component.line = line;
@@ -175,6 +193,11 @@ describe('TasksLineComponent', () => {
       component.ngOnInit();
       expect(component.showFilters).toEqual(defaultConfigService.defaultTasks.showFilters);
     });
+
+    it('should init groups', () => {
+      expect(mockTasksDataService.groupsConditions).toBe(lineGroup);
+      expect(mockTasksDataService.initGroups).toHaveBeenCalled();
+    });
   });
 
   it('should unsubscribe on destroy', () => {
@@ -468,4 +491,22 @@ describe('TasksLineComponent', () => {
       expect(component.line.showFilters).toEqual(newShowFilters);
     });
   });
+
+  describe('openGroupsSettings', () => {
+    const dialogResult = [{fake: 'return'}];
+    beforeEach(() => {
+      mockMatDialog.open.mockReturnValueOnce({
+        afterClosed: () => of(dialogResult)
+      });
+      component.openGroupsSettings();
+    });
+
+    it('should manage the group dialogResult', () => {
+      expect(mockTasksDataService.manageGroupDialogResult).toHaveBeenCalledWith(dialogResult);
+    });
+
+    it('should save the groups', () => {
+      expect(component.line.groups).toEqual(mockTasksDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/types/components/dashboard-line-table.ts b/src/app/types/components/dashboard-line-table.ts
index 36090fd41..dd56f6d11 100644
--- a/src/app/types/components/dashboard-line-table.ts
+++ b/src/app/types/components/dashboard-line-table.ts
@@ -230,6 +230,7 @@ export abstract class DashboardLineTableComponent<T extends DataRaw, F extends F
     const subscription = dialogRef.afterClosed().subscribe((result) => {
       if (result) {
         this.tableDataService.manageGroupDialogResult(result);
+        this.line.groups = this.tableDataService.groupsConditions;
       }
     });
 

From 830da2da94293ccd04937da435a30b5b1bffb57b Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Fri, 14 Feb 2025 17:11:03 +0100
Subject: [PATCH 34/47] test: data table services

---
 .../applications-data.service.spec.ts         | 284 +++++++++++++++++-
 .../services/applications-data.service.ts     |   8 +-
 .../services/partitions-data.service.spec.ts  | 264 +++++++++++++++-
 .../services/partitions-data.service.ts       |   8 +-
 .../services/results-data.service.spec.ts     | 257 +++++++++++++++-
 .../results/services/results-data.service.ts  |   8 +-
 .../services/sessions-data.service.spec.ts    | 267 +++++++++++++++-
 .../tasks/services/tasks-data.service.spec.ts | 239 ++++++++++++++-
 src/app/tasks/services/tasks-data.service.ts  |   8 +-
 src/app/types/services/table-data.service.ts  |   6 +-
 10 files changed, 1311 insertions(+), 38 deletions(-)

diff --git a/src/app/applications/services/applications-data.service.spec.ts b/src/app/applications/services/applications-data.service.spec.ts
index c066f6010..4665c5823 100644
--- a/src/app/applications/services/applications-data.service.spec.ts
+++ b/src/app/applications/services/applications-data.service.spec.ts
@@ -1,10 +1,13 @@
 import { ApplicationRawEnumField, FilterStringOperator, ListApplicationsResponse, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { TestBed } from '@angular/core/testing';
 import { FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
+import { ManageGroupsTableDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { of, throwError } from 'rxjs';
 import ApplicationsDataService from './applications-data.service';
@@ -40,7 +43,58 @@ describe('ApplicationDataService', () => {
     }
   };
 
-  const initialFilters: FiltersOr<ApplicationRawEnumField> = [];
+  const initialFilters: FiltersOr<ApplicationRawEnumField> = [
+    [
+      {
+        field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+        value: 'name',
+      },
+    ],
+    [
+      {
+        field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_SERVICE,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL,
+        value: 'service'
+      }
+    ]
+  ];
+
+  const mockInvertFilterService = {
+    invert: jest.fn((e) => e),
+  };
+
+  const groupConditions: GroupConditions<ApplicationRawEnumField>[] = [
+    {
+      name: 'Group 1',
+      conditions: [
+        [
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+        ],
+        [
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+        ],
+      ]
+    }
+  ];
 
   beforeEach(() => {
     service = TestBed.configureTestingModule({
@@ -50,10 +104,13 @@ describe('ApplicationDataService', () => {
         { provide: ApplicationsGrpcService, useValue: mockApplicationsGrpcService },
         { provide: NotificationService, useValue: mockNotificationService },
         { provide: CacheService, useValue: mockCacheService },
+        { provide: InvertFilterService, useValue: mockInvertFilterService },
       ]
     }).inject(ApplicationsDataService);
     service.options = initialOptions;
     service.filters = initialFilters;
+    service.groupsConditions.push(...groupConditions);
+    service.initGroups();
   });
 
   it('should create', () => {
@@ -97,12 +154,16 @@ describe('ApplicationDataService', () => {
     it('should set the total cached data', () => {
       expect(service.total()).toEqual(cachedApplications.total);
     });
+
+    it('should add groups according to group conditions', () => {
+      expect(service.groups.length).toEqual(groupConditions.length);
+    });
   });
 
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockApplicationsGrpcService.list$).toHaveBeenCalledWith(service.options, service.filters);
+      expect(mockApplicationsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
     });
 
     it('should update the total', () => {
@@ -120,7 +181,10 @@ describe('ApplicationDataService', () => {
           } as ApplicationRaw,
           queryTasksParams: {
             '0-options-5-0': 'application1',
-            '0-options-6-0': 'version1'
+            '0-options-6-0': 'version1',
+            '1-options-5-0': 'application1',
+            '1-options-6-0': 'version1',
+            '1-options-8-1': 'service',
           },
           filters: [[
             { for: 'options', field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_APPLICATION_NAME, operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL, value: 'application1' },
@@ -134,7 +198,10 @@ describe('ApplicationDataService', () => {
           } as ApplicationRaw,
           queryTasksParams: {
             '0-options-5-0': 'application2',
-            '0-options-6-0': 'version2'
+            '0-options-6-0': 'version2',
+            '1-options-5-0': 'application2',
+            '1-options-6-0': 'version2',
+            '1-options-8-1': 'service',
           },
           filters: [[
             { for: 'options', field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_APPLICATION_NAME, operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL, value: 'application2' },
@@ -148,7 +215,10 @@ describe('ApplicationDataService', () => {
           } as ApplicationRaw,
           queryTasksParams: {
             '0-options-5-0': 'application3',
-            '0-options-6-0': 'version3'
+            '0-options-6-0': 'version3',
+            '1-options-5-0': 'application3',
+            '1-options-6-0': 'version3',
+            '1-options-8-1': 'service',
           },
           filters: [[
             { for: 'options', field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_APPLICATION_NAME, operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL, value: 'application3' },
@@ -185,6 +255,200 @@ describe('ApplicationDataService', () => {
     });
   });
 
+  describe('PrepareOptions', () => {
+    it('should clone the options', () => {
+      expect(service.prepareOptions()).toEqual(initialOptions);
+    });
+  });
+
+  describe('PrepareFilters', () => {
+    it('should merge filters and group conditions', () => {
+      (expect(service.preparefilters())).toEqual([
+        [
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'name',
+          },
+        ],
+        [
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'name',
+          },
+        ],
+        [
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_SERVICE,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL,
+            value: 'service'
+          },
+        ],
+        [
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_SERVICE,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_NOT_EQUAL,
+            value: 'service'
+          },
+        ],
+      ]);
+    });
+
+    it('should return group conditions if there is no filters', () => {
+      service.filters = [];
+      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+    });
+  });
+
+  describe('groups fetching data', () => {
+    describe('defined conditions', () => {
+      it('should list data if there is a group condition', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(mockApplicationsGrpcService.list$).toHaveBeenCalledWith(
+            {
+              pageSize: 100,
+              pageIndex: group.page,
+              sort: initialOptions.sort
+            },
+            groupConditions[0].conditions
+          );
+        });
+        group.refresh$.next();
+      });
+  
+      it('should update the group total', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(applications.total);
+        });
+        group.refresh$.next();
+      });
+    });
+
+    describe('empty conditions', () => {
+      it('should set emptyCondition to true', () => {
+        service.groupsConditions[0].conditions = [];
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.emptyCondition).toBeTruthy();
+        });
+        group.refresh$.next();
+      });
+
+      it('should set total to 0', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(0);
+        });
+        group.refresh$.next();
+      });
+    });
+  });
+
+  describe('manageGroupDialogResult', () => {
+    const toDeleteCondition: GroupConditions<ApplicationRawEnumField> = {
+      name: 'ToBeDeleted',
+      conditions: []
+    };
+
+    const dialogResult: ManageGroupsTableDialogResult<ApplicationRawEnumField> = {
+      editedGroups: {
+        'Group 1': {
+          name: 'Renamed Group',
+          conditions: [],
+        },
+      },
+      addedGroups: [
+        {
+          name: 'New Group',
+          conditions: [],
+        },
+      ],
+      deletedGroups: [
+        'ToBeDeleted',
+      ],
+    };
+
+    beforeEach(() => {
+      service['removeGroup']('New Group');
+      service['addGroup'](toDeleteCondition);
+      service.manageGroupDialogResult(dialogResult);
+    });
+
+    it('should edit the correct group condition', () => {
+      expect(service.groupsConditions[0]).toEqual(dialogResult.editedGroups['Group 1']);
+    });
+
+    it('should edit the correct group', () => {
+      expect(service.groups[0].name()).toEqual(dialogResult.editedGroups['Group 1'].name);
+    });
+
+    it('should add a group condition', () => {
+      expect(service.groupsConditions[1]).toEqual(dialogResult.addedGroups[0]);
+    });
+
+    it('should add a group', () => {
+      expect(service.groups[1].name()).toEqual(dialogResult.addedGroups[0].name);
+    });
+
+    it('should remove a group condition', () => {
+      expect(service.groupsConditions.findIndex((group) => group.name === 'ToBeDeleted')).toEqual(-1);
+    });
+
+    it('should remove a group', () => {
+      expect(service.groups.findIndex((group) => group.name() === 'ToBeDeleted')).toEqual(-1);
+    });
+  });
+
+  it('should refresh the correct group', () => {
+    const group = service.groups[0];
+    const spy = jest.spyOn(group.refresh$, 'next');
+    service.refreshGroup(group.name());
+    expect(spy).toHaveBeenCalled();
+  });
+
   it('should display a success message', () => {
     const message = 'A success message !';
     service.success(message);
@@ -345,4 +609,14 @@ describe('ApplicationDataService', () => {
       ]);
     });
   });
+
+  describe('on destroy', () => {
+    beforeEach(() => {
+      service.ngOnDestroy();
+    });
+
+    it('should unsubscribe', () => {
+      expect(service['dataSubscription'].closed).toBeTruthy();
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/applications/services/applications-data.service.ts b/src/app/applications/services/applications-data.service.ts
index c6526a69f..9a0e00698 100644
--- a/src/app/applications/services/applications-data.service.ts
+++ b/src/app/applications/services/applications-data.service.ts
@@ -1,5 +1,5 @@
 import { ApplicationRawEnumField, FilterStringOperator, ListApplicationsResponse, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { Injectable, inject } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { TaskSummaryFilters } from '@app/tasks/types';
 import { Scope } from '@app/types/config';
 import { ApplicationData } from '@app/types/data';
@@ -9,11 +9,15 @@ import { ApplicationRaw } from '../types';
 import { ApplicationsGrpcService } from './applications-grpc.service';
 
 @Injectable()
-export default class ApplicationsDataService extends AbstractTableDataService<ApplicationRaw, ApplicationRawEnumField> {
+export default class ApplicationsDataService extends AbstractTableDataService<ApplicationRaw, ApplicationRawEnumField> implements OnDestroy {
   readonly grpcService = inject(ApplicationsGrpcService);
 
   scope: Scope = 'applications';
 
+  ngOnDestroy(): void {
+    this.onDestroy();
+  }
+
   computeGrpcData(entries: ListApplicationsResponse): ApplicationRaw[] | undefined {
     return entries.applications;
   }
diff --git a/src/app/partitions/services/partitions-data.service.spec.ts b/src/app/partitions/services/partitions-data.service.spec.ts
index eeb4dfb70..d6bc2129d 100644
--- a/src/app/partitions/services/partitions-data.service.spec.ts
+++ b/src/app/partitions/services/partitions-data.service.spec.ts
@@ -1,10 +1,13 @@
 import { FilterArrayOperator, FilterNumberOperator, FilterStringOperator, ListPartitionsResponse, PartitionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { TestBed } from '@angular/core/testing';
 import { FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
+import { ManageGroupsTableDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { of, throwError } from 'rxjs';
 import PartitionsDataService from './partitions-data.service';
@@ -40,7 +43,58 @@ describe('PartitionsDataService', () => {
     }
   };
 
-  const initialFilters: FiltersOr<PartitionRawEnumField> = [];
+  const initialFilters: FiltersOr<PartitionRawEnumField> = [
+    [
+      {
+        field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+        value: 'id',
+      },
+    ],
+    [
+      {
+        field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_PRIORITY,
+        for: 'root',
+        operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_EQUAL,
+        value: 'test'
+      }
+    ]
+  ];
+
+  const mockInvertFilterService = {
+    invert: jest.fn((e) => e),
+  };
+
+  const groupConditions: GroupConditions<PartitionRawEnumField>[] = [
+    {
+      name: 'Group 1',
+      conditions: [
+        [
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+        ],
+        [
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+        ],
+      ]
+    }
+  ];
 
   beforeEach(() => {
     service = TestBed.configureTestingModule({
@@ -50,10 +104,13 @@ describe('PartitionsDataService', () => {
         { provide: PartitionsGrpcService, useValue: mockPartitionsGrpcService },
         { provide: NotificationService, useValue: mockNotificationService },
         { provide: CacheService, useValue: mockCacheService },
+        { provide: InvertFilterService, useValue: mockInvertFilterService },
       ]
     }).inject(PartitionsDataService);
     service.options = initialOptions;
     service.filters = initialFilters;
+    service.groupsConditions.push(...groupConditions);
+    service.initGroups();
   });
 
   it('should create', () => {
@@ -106,7 +163,7 @@ describe('PartitionsDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockPartitionsGrpcService.list$).toHaveBeenCalledWith(service.options, service.filters);
+      expect(mockPartitionsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
     });
     
     it('should update the total', () => {
@@ -123,6 +180,9 @@ describe('PartitionsDataService', () => {
           } as PartitionRaw,
           queryTasksParams: {
             '0-options-4-0': 'partition1',
+            '0-options-4-2': 'id',
+            '1-options-3-0': 'test',
+            '1-options-4-0': 'partition1',
           },
           filters: [[
             { for: 'options', field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_PARTITION_ID, operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL, value: 'partition1' },
@@ -134,6 +194,9 @@ describe('PartitionsDataService', () => {
           } as PartitionRaw,
           queryTasksParams: {
             '0-options-4-0': 'partition2',
+            '0-options-4-2': 'id',
+            '1-options-3-0': 'test',
+            '1-options-4-0': 'partition2',
           },
           filters: [[
             { for: 'options', field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_PARTITION_ID, operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL, value: 'partition2' },
@@ -145,6 +208,9 @@ describe('PartitionsDataService', () => {
           } as PartitionRaw,
           queryTasksParams: {
             '0-options-4-0': 'partition3',
+            '0-options-4-2': 'id',
+            '1-options-3-0': 'test',
+            '1-options-4-0': 'partition3',
           },
           filters: [[
             { for: 'options', field: TaskOptionEnumField.TASK_OPTION_ENUM_FIELD_PARTITION_ID, operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL, value: 'partition3' },
@@ -280,4 +346,198 @@ describe('PartitionsDataService', () => {
       ]);
     });
   });
+
+  describe('PrepareOptions', () => {
+    it('should clone the options', () => {
+      expect(service.prepareOptions()).toEqual(initialOptions);
+    });
+  });
+  
+  describe('PrepareFilters', () => {
+    it('should merge filters and group conditions', () => {
+      (expect(service.preparefilters())).toEqual([
+        [
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+            value: 'id',
+          },
+        ],
+        [
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+            value: 'id',
+          },
+        ],
+        [
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_PRIORITY,
+            for: 'root',
+            operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_EQUAL,
+            value: 'test'
+          }
+        ],
+        [
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_PRIORITY,
+            for: 'root',
+            operator: FilterNumberOperator.FILTER_NUMBER_OPERATOR_EQUAL,
+            value: 'test'
+          }
+        ],
+      ]);
+    });
+  
+    it('should return group conditions if there is no filters', () => {
+      service.filters = [];
+      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+    });
+  });
+  
+  describe('groups fetching data', () => {
+    describe('defined conditions', () => {
+      it('should list data if there is a group condition', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(mockPartitionsGrpcService.list$).toHaveBeenCalledWith(
+            {
+              pageSize: 100,
+              pageIndex: group.page,
+              sort: initialOptions.sort
+            },
+            groupConditions[0].conditions
+          );
+        });
+        group.refresh$.next();
+      });
+    
+      it('should update the group total', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(partitions.total);
+        });
+        group.refresh$.next();
+      });
+    });
+  
+    describe('empty conditions', () => {
+      it('should set emptyCondition to true', () => {
+        service.groupsConditions[0].conditions = [];
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.emptyCondition).toBeTruthy();
+        });
+        group.refresh$.next();
+      });
+  
+      it('should set total to 0', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(0);
+        });
+        group.refresh$.next();
+      });
+    });
+  });
+  
+  describe('manageGroupDialogResult', () => {
+    const toDeleteCondition: GroupConditions<PartitionRawEnumField> = {
+      name: 'ToBeDeleted',
+      conditions: []
+    };
+  
+    const dialogResult: ManageGroupsTableDialogResult<PartitionRawEnumField> = {
+      editedGroups: {
+        'Group 1': {
+          name: 'Renamed Group',
+          conditions: [],
+        },
+      },
+      addedGroups: [
+        {
+          name: 'New Group',
+          conditions: [],
+        },
+      ],
+      deletedGroups: [
+        'ToBeDeleted',
+      ],
+    };
+  
+    beforeEach(() => {
+      service['removeGroup']('New Group');
+      service['addGroup'](toDeleteCondition);
+      service.manageGroupDialogResult(dialogResult);
+    });
+  
+    it('should edit the correct group condition', () => {
+      expect(service.groupsConditions[0]).toEqual(dialogResult.editedGroups['Group 1']);
+    });
+  
+    it('should edit the correct group', () => {
+      expect(service.groups[0].name()).toEqual(dialogResult.editedGroups['Group 1'].name);
+    });
+  
+    it('should add a group condition', () => {
+      expect(service.groupsConditions[1]).toEqual(dialogResult.addedGroups[0]);
+    });
+  
+    it('should add a group', () => {
+      expect(service.groups[1].name()).toEqual(dialogResult.addedGroups[0].name);
+    });
+  
+    it('should remove a group condition', () => {
+      expect(service.groupsConditions.findIndex((group) => group.name === 'ToBeDeleted')).toEqual(-1);
+    });
+  
+    it('should remove a group', () => {
+      expect(service.groups.findIndex((group) => group.name() === 'ToBeDeleted')).toEqual(-1);
+    });
+  });
+  
+  it('should refresh the correct group', () => {
+    const group = service.groups[0];
+    const spy = jest.spyOn(group.refresh$, 'next');
+    service.refreshGroup(group.name());
+    expect(spy).toHaveBeenCalled();
+  });
 });
\ No newline at end of file
diff --git a/src/app/partitions/services/partitions-data.service.ts b/src/app/partitions/services/partitions-data.service.ts
index ba80373dd..7a1604674 100644
--- a/src/app/partitions/services/partitions-data.service.ts
+++ b/src/app/partitions/services/partitions-data.service.ts
@@ -1,5 +1,5 @@
 import { FilterStringOperator, ListPartitionsResponse, PartitionRawEnumField, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { Injectable, inject } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { TaskSummaryFilters } from '@app/tasks/types';
 import { Scope } from '@app/types/config';
 import { PartitionData } from '@app/types/data';
@@ -8,11 +8,15 @@ import { PartitionRaw } from '../types';
 import { PartitionsGrpcService } from './partitions-grpc.service';
 
 @Injectable()
-export default class PartitionsDataService extends AbstractTableDataService<PartitionRaw, PartitionRawEnumField> {
+export default class PartitionsDataService extends AbstractTableDataService<PartitionRaw, PartitionRawEnumField> implements OnDestroy {
   readonly grpcService = inject(PartitionsGrpcService);
 
   scope: Scope = 'partitions';
 
+  ngOnDestroy(): void {
+    this.onDestroy();
+  }
+
   computeGrpcData(entries: ListPartitionsResponse): PartitionRaw[] | undefined {
     return entries.partitions;
   }
diff --git a/src/app/results/services/results-data.service.spec.ts b/src/app/results/services/results-data.service.spec.ts
index a1765d7b8..c3b19c870 100644
--- a/src/app/results/services/results-data.service.spec.ts
+++ b/src/app/results/services/results-data.service.spec.ts
@@ -1,10 +1,13 @@
-import { ResultRawEnumField, ListResultsResponse } from '@aneoconsultingfr/armonik.api.angular';
+import { ResultRawEnumField, ListResultsResponse, FilterStringOperator } from '@aneoconsultingfr/armonik.api.angular';
 import { TestBed } from '@angular/core/testing';
 import { FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
+import { ManageGroupsTableDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { of, throwError } from 'rxjs';
 import ResultsDataService from './results-data.service';
@@ -40,7 +43,58 @@ describe('ResultsDataService', () => {
     }
   };
 
-  const initialFilters: FiltersOr<ResultRawEnumField> = [];
+  const initialFilters: FiltersOr<ResultRawEnumField> = [
+    [
+      {
+        field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_NAME,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+        value: 'name'
+      }
+    ],
+    [
+      {
+        field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_NAME,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+        value: 'result'
+      }
+    ]
+  ];
+
+  const mockInvertFilterService = {
+    invert: jest.fn((e) => e),
+  };
+  
+  const groupConditions: GroupConditions<ResultRawEnumField>[] = [
+    {
+      name: 'Group 1',
+      conditions: [
+        [
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_RESULT_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_RESULT_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+        ],
+        [
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+        ],
+      ]
+    }
+  ];
 
   beforeEach(() => {
     service = TestBed.configureTestingModule({
@@ -50,10 +104,13 @@ describe('ResultsDataService', () => {
         { provide: ResultsGrpcService, useValue: mockResultsGrpcService },
         { provide: NotificationService, useValue: mockNotificationService },
         { provide: CacheService, useValue: mockCacheService },
+        { provide: InvertFilterService, useValue: mockInvertFilterService },
       ]
     }).inject(ResultsDataService);
     service.options = initialOptions;
     service.filters = initialFilters;
+    service.groupsConditions.push(...groupConditions);
+    service.initGroups();
   });
 
   it('should create', () => {
@@ -84,7 +141,7 @@ describe('ResultsDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockResultsGrpcService.list$).toHaveBeenCalledWith(service.options, service.filters);
+      expect(mockResultsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
     });
 
     it('should update the total', () => {
@@ -164,4 +221,198 @@ describe('ResultsDataService', () => {
   it('should load correctly', () => {
     expect(service.loading()).toBeFalsy();
   });
+
+  describe('PrepareOptions', () => {
+    it('should clone the options', () => {
+      expect(service.prepareOptions()).toEqual(initialOptions);
+    });
+  });
+    
+  describe('PrepareFilters', () => {
+    it('should merge filters and group conditions', () => {
+      (expect(service.preparefilters())).toEqual([
+        [
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_RESULT_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_RESULT_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+            value: 'name'
+          }
+        ],
+        [
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_CONTAINS,
+            value: 'name'
+          }
+        ],
+        [
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_RESULT_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_RESULT_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'result'
+          }
+        ],
+        [
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_NAME,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'result'
+          }
+        ],
+      ]);
+    });
+    
+    it('should return group conditions if there is no filters', () => {
+      service.filters = [];
+      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+    });
+  });
+    
+  describe('groups fetching data', () => {
+    describe('defined conditions', () => {
+      it('should list data if there is a group condition', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(mockResultsGrpcService.list$).toHaveBeenCalledWith(
+            {
+              pageSize: 100,
+              pageIndex: group.page,
+              sort: initialOptions.sort
+            },
+            groupConditions[0].conditions
+          );
+        });
+        group.refresh$.next();
+      });
+      
+      it('should update the group total', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(results.total);
+        });
+        group.refresh$.next();
+      });
+    });
+    
+    describe('empty conditions', () => {
+      it('should set emptyCondition to true', () => {
+        service.groupsConditions[0].conditions = [];
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.emptyCondition).toBeTruthy();
+        });
+        group.refresh$.next();
+      });
+    
+      it('should set total to 0', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(0);
+        });
+        group.refresh$.next();
+      });
+    });
+  });
+    
+  describe('manageGroupDialogResult', () => {
+    const toDeleteCondition: GroupConditions<ResultRawEnumField> = {
+      name: 'ToBeDeleted',
+      conditions: []
+    };
+    
+    const dialogResult: ManageGroupsTableDialogResult<ResultRawEnumField> = {
+      editedGroups: {
+        'Group 1': {
+          name: 'Renamed Group',
+          conditions: [],
+        },
+      },
+      addedGroups: [
+        {
+          name: 'New Group',
+          conditions: [],
+        },
+      ],
+      deletedGroups: [
+        'ToBeDeleted',
+      ],
+    };
+    
+    beforeEach(() => {
+      service['removeGroup']('New Group');
+      service['addGroup'](toDeleteCondition);
+      service.manageGroupDialogResult(dialogResult);
+    });
+    
+    it('should edit the correct group condition', () => {
+      expect(service.groupsConditions[0]).toEqual(dialogResult.editedGroups['Group 1']);
+    });
+    
+    it('should edit the correct group', () => {
+      expect(service.groups[0].name()).toEqual(dialogResult.editedGroups['Group 1'].name);
+    });
+    
+    it('should add a group condition', () => {
+      expect(service.groupsConditions[1]).toEqual(dialogResult.addedGroups[0]);
+    });
+    
+    it('should add a group', () => {
+      expect(service.groups[1].name()).toEqual(dialogResult.addedGroups[0].name);
+    });
+    
+    it('should remove a group condition', () => {
+      expect(service.groupsConditions.findIndex((group) => group.name === 'ToBeDeleted')).toEqual(-1);
+    });
+    
+    it('should remove a group', () => {
+      expect(service.groups.findIndex((group) => group.name() === 'ToBeDeleted')).toEqual(-1);
+    });
+  });
+    
+  it('should refresh the correct group', () => {
+    const group = service.groups[0];
+    const spy = jest.spyOn(group.refresh$, 'next');
+    service.refreshGroup(group.name());
+    expect(spy).toHaveBeenCalled();
+  });
 });
\ No newline at end of file
diff --git a/src/app/results/services/results-data.service.ts b/src/app/results/services/results-data.service.ts
index 94036ec65..2fe806659 100644
--- a/src/app/results/services/results-data.service.ts
+++ b/src/app/results/services/results-data.service.ts
@@ -1,5 +1,5 @@
 import { ListResultsResponse, ResultRawEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { Injectable, inject } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { Scope } from '@app/types/config';
 import { ResultData } from '@app/types/data';
 import { AbstractTableDataService } from '@app/types/services/table-data.service';
@@ -7,11 +7,15 @@ import { ResultRaw } from '../types';
 import { ResultsGrpcService } from './results-grpc.service';
 
 @Injectable()
-export default class ResultsDataService extends AbstractTableDataService<ResultRaw, ResultRawEnumField> {
+export default class ResultsDataService extends AbstractTableDataService<ResultRaw, ResultRawEnumField> implements OnDestroy {
   readonly grpcService = inject(ResultsGrpcService);
 
   scope: Scope = 'results';
 
+  ngOnDestroy(): void {
+    this.onDestroy();
+  }
+
   computeGrpcData(entries: ListResultsResponse): ResultRaw[] | undefined {
     return entries.results;
   }
diff --git a/src/app/sessions/services/sessions-data.service.spec.ts b/src/app/sessions/services/sessions-data.service.spec.ts
index 1e3e707c6..2896ad492 100644
--- a/src/app/sessions/services/sessions-data.service.spec.ts
+++ b/src/app/sessions/services/sessions-data.service.spec.ts
@@ -1,11 +1,14 @@
-import { FilterArrayOperator, FilterDateOperator, FilterNumberOperator, FilterStringOperator, ListSessionsResponse, SessionRawEnumField, SessionTaskOptionEnumField, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { FilterArrayOperator, FilterDateOperator, FilterNumberOperator, FilterStatusOperator, FilterStringOperator, ListSessionsResponse, SessionRawEnumField, SessionStatus, SessionTaskOptionEnumField, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { TestBed } from '@angular/core/testing';
 import { TaskOptions } from '@app/tasks/types';
 import { Filter, FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
+import { ManageGroupsTableDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { of, throwError } from 'rxjs';
 import { SessionsGrpcService } from './sessions-grpc.service';
@@ -62,7 +65,58 @@ describe('SessionsDataService', () => {
     }
   };
 
-  const initialFilters: FiltersOr<SessionRawEnumField, TaskOptionEnumField> = [];
+  const initialFilters: FiltersOr<SessionRawEnumField, TaskOptionEnumField> = [
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+        value: 'sessionId',
+      },
+    ],
+    [
+      {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_STATUS,
+        for: 'root',
+        operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL,
+        value: SessionStatus.SESSION_STATUS_PAUSED
+      },
+    ],
+  ];
+
+  const mockInvertFilterService = {
+    invert: jest.fn((e) => e),
+  };
+  
+  const groupConditions: GroupConditions<SessionRawEnumField, TaskOptionEnumField>[] = [
+    {
+      name: 'Group 1',
+      conditions: [
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+        ],
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+        ],
+      ]
+    }
+  ];
 
   beforeEach(() => {
     service = TestBed.configureTestingModule({
@@ -72,10 +126,13 @@ describe('SessionsDataService', () => {
         { provide: SessionsGrpcService, useValue: mockSessionsGrpcService },
         { provide: NotificationService, useValue: mockNotificationService },
         { provide: CacheService, useValue: mockCacheService },
+        { provide: InvertFilterService, useValue: mockInvertFilterService },
       ]
     }).inject(SessionsDataService);
     service.options = initialOptions;
     service.filters = initialFilters;
+    service.groupsConditions.push(...groupConditions);
+    service.initGroups();
   });
 
   it('should create', () => {
@@ -126,7 +183,7 @@ describe('SessionsDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(service.options, service.filters);
+      expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
     });
     
     it('should update the total', () => {
@@ -400,19 +457,13 @@ describe('SessionsDataService', () => {
       jest.useFakeTimers().setSystemTime(new Date('1970-01-01'));
       const date = new Date();
       date.setDate(date.getDate() - 3);
-      const appliedFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
-        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
-        for: 'root',
-        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
-        value: Math.floor(date.getTime()/1000)
-      };
       service.options = { pageIndex: 0, pageSize: 0, sort: { active: 'duration', direction: 'asc'}};
       service.isDurationDisplayed = true;
       service.filters = [[arrayFilter, stringFilter], [dateFilter]];
       service.refresh$.next();
       expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(
-        { pageIndex: 0, pageSize: 0, sort: { active: 'createdAt', direction: 'asc'}},
-        [[arrayFilter, stringFilter, appliedFilter], [dateFilter]]
+        service.prepareOptions(),
+        service.preparefilters(),
       );
     });
   });
@@ -500,4 +551,198 @@ describe('SessionsDataService', () => {
       expect(mockNotificationService.error).toHaveBeenCalledWith('Unable to delete session');
     });
   });
+
+  describe('PrepareOptions', () => {
+    it('should clone the options', () => {
+      expect(service.prepareOptions()).toEqual(initialOptions);
+    });
+  });
+    
+  describe('PrepareFilters', () => {
+    it('should merge filters and group conditions', () => {
+      (expect(service.preparefilters())).toEqual([
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'sessionId',
+          },
+        ],
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'sessionId',
+          },
+        ],
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_STATUS,
+            for: 'root',
+            operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL,
+            value: SessionStatus.SESSION_STATUS_PAUSED
+          },
+        ],
+        [
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_STATUS,
+            for: 'root',
+            operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL,
+            value: SessionStatus.SESSION_STATUS_PAUSED
+          },
+        ],
+      ]);
+    });
+    
+    it('should return group conditions if there is no filters', () => {
+      service.filters = [];
+      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+    });
+  });
+    
+  describe('groups fetching data', () => {
+    describe('defined conditions', () => {
+      it('should list data if there is a group condition', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(
+            {
+              pageSize: 100,
+              pageIndex: group.page,
+              sort: initialOptions.sort
+            },
+            groupConditions[0].conditions
+          );
+        });
+        group.refresh$.next();
+      });
+      
+      it('should update the group total', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(sessions.total);
+        });
+        group.refresh$.next();
+      });
+    });
+    
+    describe('empty conditions', () => {
+      it('should set emptyCondition to true', () => {
+        service.groupsConditions[0].conditions = [];
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.emptyCondition).toBeTruthy();
+        });
+        group.refresh$.next();
+      });
+    
+      it('should set total to 0', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(0);
+        });
+        group.refresh$.next();
+      });
+    });
+  });
+    
+  describe('manageGroupDialogResult', () => {
+    const toDeleteCondition: GroupConditions<SessionRawEnumField, TaskOptionEnumField> = {
+      name: 'ToBeDeleted',
+      conditions: []
+    };
+    
+    const dialogResult: ManageGroupsTableDialogResult<SessionRawEnumField, TaskOptionEnumField> = {
+      editedGroups: {
+        'Group 1': {
+          name: 'Renamed Group',
+          conditions: [],
+        },
+      },
+      addedGroups: [
+        {
+          name: 'New Group',
+          conditions: [],
+        },
+      ],
+      deletedGroups: [
+        'ToBeDeleted',
+      ],
+    };
+    
+    beforeEach(() => {
+      service['removeGroup']('New Group');
+      service['addGroup'](toDeleteCondition);
+      service.manageGroupDialogResult(dialogResult);
+    });
+    
+    it('should edit the correct group condition', () => {
+      expect(service.groupsConditions[0]).toEqual(dialogResult.editedGroups['Group 1']);
+    });
+    
+    it('should edit the correct group', () => {
+      expect(service.groups[0].name()).toEqual(dialogResult.editedGroups['Group 1'].name);
+    });
+    
+    it('should add a group condition', () => {
+      expect(service.groupsConditions[1]).toEqual(dialogResult.addedGroups[0]);
+    });
+    
+    it('should add a group', () => {
+      expect(service.groups[1].name()).toEqual(dialogResult.addedGroups[0].name);
+    });
+    
+    it('should remove a group condition', () => {
+      expect(service.groupsConditions.findIndex((group) => group.name === 'ToBeDeleted')).toEqual(-1);
+    });
+    
+    it('should remove a group', () => {
+      expect(service.groups.findIndex((group) => group.name() === 'ToBeDeleted')).toEqual(-1);
+    });
+  });
+    
+  it('should refresh the correct group', () => {
+    const group = service.groups[0];
+    const spy = jest.spyOn(group.refresh$, 'next');
+    service.refreshGroup(group.name());
+    expect(spy).toHaveBeenCalled();
+  });
 });
\ No newline at end of file
diff --git a/src/app/tasks/services/tasks-data.service.spec.ts b/src/app/tasks/services/tasks-data.service.spec.ts
index 3bfbb9869..b9344a9d3 100644
--- a/src/app/tasks/services/tasks-data.service.spec.ts
+++ b/src/app/tasks/services/tasks-data.service.spec.ts
@@ -1,10 +1,13 @@
-import { TaskSummaryEnumField, FilterStringOperator, ListTasksResponse, TaskOptionEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { TaskSummaryEnumField, FilterStringOperator, ListTasksResponse, TaskOptionEnumField, FilterStatusOperator, TaskStatus } from '@aneoconsultingfr/armonik.api.angular';
 import { TestBed } from '@angular/core/testing';
 import { FiltersOr } from '@app/types/filters';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
+import { ManageGroupsTableDialogResult } from '@components/table/group/manage-groups-dialog/manage-groups-dialog.component';
 import { GrpcStatusEvent } from '@ngx-grpc/common';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
+import { InvertFilterService } from '@services/invert-filter.service';
 import { NotificationService } from '@services/notification.service';
 import { of, throwError } from 'rxjs';
 import TasksDataService from './tasks-data.service';
@@ -41,7 +44,56 @@ describe('TasksDataService', () => {
     }
   };
 
-  const initialFilters: FiltersOr<TaskSummaryEnumField, TaskOptionEnumField> = [];
+  const initialFilters: FiltersOr<TaskSummaryEnumField, TaskOptionEnumField> = [
+    [
+      {
+        field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+        for: 'root',
+        operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+        value: 'id'
+      },
+      {
+        field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_STATUS,
+        for: 'root',
+        operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL,
+        value: TaskStatus.TASK_STATUS_COMPLETED,
+      }
+    ]
+  ];
+
+  const mockInvertFilterService = {
+    invert: jest.fn((e) => e),
+  };
+  
+  const groupConditions: GroupConditions<TaskSummaryEnumField, TaskOptionEnumField>[] = [
+    {
+      name: 'Group 1',
+      conditions: [
+        [
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+        ],
+        [
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+        ],
+      ]
+    }
+  ];
 
   beforeEach(() => {
     service = TestBed.configureTestingModule({
@@ -51,10 +103,13 @@ describe('TasksDataService', () => {
         { provide: TasksGrpcService, useValue: mockTasksGrpcService },
         { provide: NotificationService, useValue: mockNotificationService },
         { provide: CacheService, useValue: mockCacheService },
+        { provide: InvertFilterService, useValue: mockInvertFilterService },
       ]
     }).inject(TasksDataService);
     service.options = initialOptions;
     service.filters = initialFilters;
+    service.groupsConditions.push(...groupConditions);
+    service.initGroups();
   });
 
   it('should create', () => {
@@ -91,7 +146,7 @@ describe('TasksDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockTasksGrpcService.list$).toHaveBeenCalledWith(service.options, service.filters);
+      expect(mockTasksGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
     });
 
     it('should update the total', () => {
@@ -107,7 +162,7 @@ describe('TasksDataService', () => {
             id: 'task1'
           },
           resultsQueryParams: {
-            '1-root-3-0': 'task1'
+            '0-root-3-0': 'task1'
           }
         },
         {
@@ -115,7 +170,7 @@ describe('TasksDataService', () => {
             id: 'task2'
           },
           resultsQueryParams: {
-            '1-root-3-0': 'task2'
+            '0-root-3-0': 'task2'
           }
         },
         {
@@ -123,7 +178,7 @@ describe('TasksDataService', () => {
             id: 'task3'
           },
           resultsQueryParams: {
-            '1-root-3-0': 'task3'
+            '0-root-3-0': 'task3'
           }
         }
       ]);
@@ -296,4 +351,176 @@ describe('TasksDataService', () => {
     service.cancelTask(task);
     expect(mockTasksGrpcService.cancel$).toHaveBeenCalledWith([task]);
   });
+
+  describe('PrepareOptions', () => {
+    it('should clone the options', () => {
+      expect(service.prepareOptions()).toEqual(initialOptions);
+    });
+  });
+    
+  describe('PrepareFilters', () => {
+    it('should merge filters and group conditions', () => {
+      (expect(service.preparefilters())).toEqual([
+        [
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 't'
+          },
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_ENDS_WITH,
+            value: 'p',
+          },
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'id'
+          },
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_STATUS,
+            for: 'root',
+            operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL,
+            value: TaskStatus.TASK_STATUS_COMPLETED,
+          }
+        ],
+        [
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_STARTS_WITH,
+            value: 'test'
+          },
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
+            for: 'root',
+            operator: FilterStringOperator.FILTER_STRING_OPERATOR_EQUAL,
+            value: 'id'
+          },
+          {
+            field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_STATUS,
+            for: 'root',
+            operator: FilterStatusOperator.FILTER_STATUS_OPERATOR_EQUAL,
+            value: TaskStatus.TASK_STATUS_COMPLETED,
+          }
+        ],
+      ]);
+    });
+    
+    it('should return group conditions if there is no filters', () => {
+      service.filters = [];
+      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+    });
+  });
+    
+  describe('groups fetching data', () => {
+    describe('defined conditions', () => {
+      it('should list data if there is a group condition', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(mockTasksGrpcService.list$).toHaveBeenCalledWith(
+            {
+              pageSize: 100,
+              pageIndex: group.page,
+              sort: initialOptions.sort
+            },
+            groupConditions[0].conditions
+          );
+        });
+        group.refresh$.next();
+      });
+      
+      it('should update the group total', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(tasks.total);
+        });
+        group.refresh$.next();
+      });
+    });
+    
+    describe('empty conditions', () => {
+      it('should set emptyCondition to true', () => {
+        service.groupsConditions[0].conditions = [];
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.emptyCondition).toBeTruthy();
+        });
+        group.refresh$.next();
+      });
+    
+      it('should set total to 0', () => {
+        const group = service.groups[0];
+        group.data.subscribe(() => {
+          expect(group.total).toEqual(0);
+        });
+        group.refresh$.next();
+      });
+    });
+  });
+    
+  describe('manageGroupDialogResult', () => {
+    const toDeleteCondition: GroupConditions<TaskSummaryEnumField, TaskOptionEnumField> = {
+      name: 'ToBeDeleted',
+      conditions: []
+    };
+    
+    const dialogResult: ManageGroupsTableDialogResult<TaskSummaryEnumField, TaskOptionEnumField> = {
+      editedGroups: {
+        'Group 1': {
+          name: 'Renamed Group',
+          conditions: [],
+        },
+      },
+      addedGroups: [
+        {
+          name: 'New Group',
+          conditions: [],
+        },
+      ],
+      deletedGroups: [
+        'ToBeDeleted',
+      ],
+    };
+    
+    beforeEach(() => {
+      service['removeGroup']('New Group');
+      service['addGroup'](toDeleteCondition);
+      service.manageGroupDialogResult(dialogResult);
+    });
+    
+    it('should edit the correct group condition', () => {
+      expect(service.groupsConditions[0]).toEqual(dialogResult.editedGroups['Group 1']);
+    });
+    
+    it('should edit the correct group', () => {
+      expect(service.groups[0].name()).toEqual(dialogResult.editedGroups['Group 1'].name);
+    });
+    
+    it('should add a group condition', () => {
+      expect(service.groupsConditions[1]).toEqual(dialogResult.addedGroups[0]);
+    });
+    
+    it('should add a group', () => {
+      expect(service.groups[1].name()).toEqual(dialogResult.addedGroups[0].name);
+    });
+    
+    it('should remove a group condition', () => {
+      expect(service.groupsConditions.findIndex((group) => group.name === 'ToBeDeleted')).toEqual(-1);
+    });
+    
+    it('should remove a group', () => {
+      expect(service.groups.findIndex((group) => group.name() === 'ToBeDeleted')).toEqual(-1);
+    });
+  });
+    
+  it('should refresh the correct group', () => {
+    const group = service.groups[0];
+    const spy = jest.spyOn(group.refresh$, 'next');
+    service.refreshGroup(group.name());
+    expect(spy).toHaveBeenCalled();
+  });
 });
\ No newline at end of file
diff --git a/src/app/tasks/services/tasks-data.service.ts b/src/app/tasks/services/tasks-data.service.ts
index 2fe9a98fe..bf460d3b0 100644
--- a/src/app/tasks/services/tasks-data.service.ts
+++ b/src/app/tasks/services/tasks-data.service.ts
@@ -1,5 +1,5 @@
 import { FilterStringOperator, ListTasksResponse, ResultRawEnumField, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
-import { Injectable, inject } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { Scope } from '@app/types/config';
 import { TaskData } from '@app/types/data';
 import { Filter } from '@app/types/filters';
@@ -9,11 +9,15 @@ import { TaskOptions, TaskSummary } from '../types';
 import { TasksGrpcService } from './tasks-grpc.service';
 
 @Injectable()
-export default class TasksDataService extends AbstractTableDataService<TaskSummary, TaskSummaryEnumField, TaskOptions, TaskOptionEnumField> {
+export default class TasksDataService extends AbstractTableDataService<TaskSummary, TaskSummaryEnumField, TaskOptions, TaskOptionEnumField> implements OnDestroy {
   readonly grpcService = inject(TasksGrpcService);
 
   scope: Scope = 'tasks';
 
+  ngOnDestroy(): void {
+    this.onDestroy();
+  }
+
   computeGrpcData(entries: ListTasksResponse): TaskSummary[] | undefined {
     return entries.tasks;
   }
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index e0f436547..1aa79125e 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -187,11 +187,11 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
         this.groups[groupIndex].name.set(dialogResult.editedGroups[key].name);
       }
     });
+    
+    dialogResult.deletedGroups.forEach((groupName) => (this.removeGroup(groupName)));
 
     dialogResult.addedGroups.forEach((group) => (this.addGroup(group)));
 
-    dialogResult.deletedGroups.forEach((groupName) => (this.removeGroup(groupName)));
-
     this.refresh$.next();
   }
 
@@ -212,7 +212,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   }
 
   private removeGroup(groupName: string) {
-    const conditionsIndex =  this.groupsConditions.findIndex((group) => group.name === groupName);
+    const conditionsIndex = this.groupsConditions.findIndex((group) => group.name === groupName);
     if (conditionsIndex !== -1) {
       this.groupsConditions.splice(conditionsIndex, 1);
     }

From 11f4e8ffbadc3ad4c202ccb8661c07881f2b039e Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 09:33:00 +0100
Subject: [PATCH 35/47] tests: table components

---
 .../components/table.component.spec.ts        | 62 +++++++++++++++--
 .../components/table.component.spec.ts        | 60 ++++++++++++++--
 .../components/table.component.spec.ts        | 69 +++++++++++++++++--
 .../components/table.component.spec.ts        | 62 +++++++++++++++--
 .../tasks/components/table.component.spec.ts  | 69 +++++++++++++++++--
 5 files changed, 297 insertions(+), 25 deletions(-)

diff --git a/src/app/applications/components/table.component.spec.ts b/src/app/applications/components/table.component.spec.ts
index f03f3a63c..ec10b3515 100644
--- a/src/app/applications/components/table.component.spec.ts
+++ b/src/app/applications/components/table.component.spec.ts
@@ -1,17 +1,20 @@
 import { TaskStatus } from '@aneoconsultingfr/armonik.api.angular';
 import { Clipboard } from '@angular/cdk/clipboard';
+import { ViewContainerRef, signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { ManageGroupsDialogResult, TasksStatusesGroup } from '@app/dashboard/types';
 import { TableColumn } from '@app/types/column.type';
 import { ApplicationData, ColumnKey } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { IconsService } from '@services/icons.service';
 import { NotificationService } from '@services/notification.service';
 import { TasksByStatusService } from '@services/tasks-by-status.service';
-import { of } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { ApplicationsTableComponent } from './table.component';
 import ApplicationsDataService from '../services/applications-data.service';
+import { ApplicationsFiltersService } from '../services/applications-filters.service';
 import { ApplicationRaw } from '../types';
 
 describe('TasksTableComponent', () => {
@@ -82,10 +85,11 @@ describe('TasksTableComponent', () => {
     ]
   };
 
+  const afterClosedMocked = jest.fn((): Observable<unknown> => of(mockDialogReturn));
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed: jest.fn(() => of(mockDialogReturn))
+        afterClosed: afterClosedMocked,
       };
     })
   };
@@ -108,6 +112,13 @@ describe('TasksTableComponent', () => {
     refresh$: {
       next: jest.fn()
     },
+    refreshGroup: jest.fn(),
+    groupsConditions: [],
+    manageGroupDialogResult: jest.fn(),
+  };
+
+  const mockApplicationsFilterService = {
+    saveGroups: jest.fn(),
   };
 
   beforeEach(() => {
@@ -120,7 +131,9 @@ describe('TasksTableComponent', () => {
         { provide: MatDialog, useValue: mockMatDialog },
         { provide: TasksByStatusService, useValue: mockTasksByStatusService },
         IconsService,
-        { provide: Router, useValue: mockRouter }
+        { provide: Router, useValue: mockRouter },
+        { provide: ViewContainerRef, useValue: {} },
+        { provide: ApplicationsFiltersService, useValue: mockApplicationsFilterService },
       ]
     }).inject(ApplicationsTableComponent);
 
@@ -207,9 +220,16 @@ describe('TasksTableComponent', () => {
     });
   });
 
-  it('should track an application by its name and version', () => {
-    const application = {raw: { name: 'application', version: '0.1.2'}} as ApplicationData;
-    expect(component.trackBy(0, application)).toEqual(`${application.raw.name}-${application.raw.version}`);
+  describe('track By', () => {
+    it('should track an application by its name and version', () => {
+      const application = {raw: { name: 'application', version: '0.1.2'}} as ApplicationData;
+      expect(component.trackBy(0, application)).toEqual(`${application.raw.name}-${application.raw.version}`);
+    });
+    
+    it('should track group by its name', () => {
+      const group = { name: signal('some-name') } as unknown as Group<ApplicationRaw>;
+      expect(component.trackBy(0, group)).toEqual(group.name());
+    });
   });
 
   it('should get data', () => {
@@ -235,4 +255,34 @@ describe('TasksTableComponent', () => {
   it('should get displayedColumns', () => {
     expect(component.columns).toEqual(displayedColumns);
   });
+
+  describe('UpdateGroupPage', () => {
+    const groupName = 'group 1';
+    
+    beforeEach(() => {
+      component.updateGroupPage(groupName);
+    });
+    
+    it('should refresh the selected group', () => {
+      expect(mockApplicationsDataService.refreshGroup).toHaveBeenCalledWith(groupName);
+    });
+  });
+
+  describe('openGroupSettings', () => {
+    const groupName = 'Group 1';
+    const result = [{name: 'Renamed Group', conditions: []}];
+    
+    beforeEach(() => {
+      afterClosedMocked.mockReturnValueOnce(of(result));
+      component.openGroupSettings(groupName);
+    });
+    
+    it('should manage the group dialog result', () => {
+      expect(mockApplicationsDataService.manageGroupDialogResult).toHaveBeenCalledWith(result);
+    });
+
+    it('should update the groups in the local storage', () => {
+      expect(mockApplicationsFilterService.saveGroups).toHaveBeenCalledWith(mockApplicationsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/partitions/components/table.component.spec.ts b/src/app/partitions/components/table.component.spec.ts
index 61f6edbcf..ac2fc2569 100644
--- a/src/app/partitions/components/table.component.spec.ts
+++ b/src/app/partitions/components/table.component.spec.ts
@@ -1,15 +1,18 @@
 import { TaskStatus } from '@aneoconsultingfr/armonik.api.angular';
 import { Clipboard } from '@angular/cdk/clipboard';
+import { ViewContainerRef, signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { ManageGroupsDialogResult, TasksStatusesGroup } from '@app/dashboard/types';
 import { TableColumn } from '@app/types/column.type';
 import { ColumnKey, PartitionData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { NotificationService } from '@services/notification.service';
 import { TasksByStatusService } from '@services/tasks-by-status.service';
-import { of } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { PartitionsTableComponent } from './table.component';
 import PartitionsDataService from '../services/partitions-data.service';
+import { PartitionsFiltersService } from '../services/partitions-filters.service';
 import { PartitionRaw } from '../types';
 
 describe('PartitionsTableComponent', () => {
@@ -69,10 +72,11 @@ describe('PartitionsTableComponent', () => {
     ]
   };
 
+  const afterClosedMocked = jest.fn((): Observable<unknown> => of(mockDialogReturn));
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed: jest.fn(() => of(mockDialogReturn))
+        afterClosed: afterClosedMocked
       };
     })
   };
@@ -91,6 +95,13 @@ describe('PartitionsTableComponent', () => {
     refresh$: {
       next: jest.fn()
     },
+    refreshGroup: jest.fn(),
+    groupsConditions: [],
+    manageGroupDialogResult: jest.fn(),
+  };
+
+  const mockPartitionsFilters = {
+    saveGroups: jest.fn(),
   };
 
   const mockNotificationService = {
@@ -108,6 +119,8 @@ describe('PartitionsTableComponent', () => {
         { provide: MatDialog, useValue: mockMatDialog },
         { provide: TasksByStatusService, useValue: mockTasksByStatusService },
         { provide: NotificationService, useValue: mockNotificationService },
+        { provide: ViewContainerRef, useValue: {} },
+        { provide: PartitionsFiltersService, useValue: mockPartitionsFilters },
       ]
     }).inject(PartitionsTableComponent);
 
@@ -164,9 +177,16 @@ describe('PartitionsTableComponent', () => {
     });
   });
 
-  it('should track a partition by its id', () => {
-    const partition = {raw: { id: 'partition' }} as PartitionData;
-    expect(component.trackBy(0, partition)).toEqual(partition.raw.id);
+  describe('track By', () => {
+    it('should track a partition by its id', () => {
+      const partition = {raw: { id: 'partition' }} as PartitionData;
+      expect(component.trackBy(0, partition)).toEqual(partition.raw.id);
+    });
+    
+    it('should track group by its name', () => {
+      const group = { name: signal('some-name') } as unknown as Group<PartitionRaw>;
+      expect(component.trackBy(0, group)).toEqual(group.name());
+    });
   });
 
   it('should get data', () => {
@@ -192,4 +212,34 @@ describe('PartitionsTableComponent', () => {
   it('should get displayedColumns', () => {
     expect(component.columns).toEqual(displayedColumns);
   });
+
+  describe('UpdateGroupPage', () => {
+    const groupName = 'group 1';
+    
+    beforeEach(() => {
+      component.updateGroupPage(groupName);
+    });
+    
+    it('should refresh the selected group', () => {
+      expect(mockPartitionsDataService.refreshGroup).toHaveBeenCalledWith(groupName);
+    });
+  });
+
+  describe('openGroupSettings', () => {
+    const groupName = 'Group 1';
+    const result = [{name: 'Renamed Group', conditions: []}];
+    
+    beforeEach(() => {
+      afterClosedMocked.mockReturnValueOnce(of(result));
+      component.openGroupSettings(groupName);
+    });
+    
+    it('should manage the group dialog result', () => {
+      expect(mockPartitionsDataService.manageGroupDialogResult).toHaveBeenCalledWith(result);
+    });
+
+    it('should update the groups in the local storage', () => {
+      expect(mockPartitionsFilters.saveGroups).toHaveBeenCalledWith(mockPartitionsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/results/components/table.component.spec.ts b/src/app/results/components/table.component.spec.ts
index 6a01d8d67..023883d15 100644
--- a/src/app/results/components/table.component.spec.ts
+++ b/src/app/results/components/table.component.spec.ts
@@ -1,10 +1,15 @@
 import { Clipboard } from '@angular/cdk/clipboard';
+import { ViewContainerRef, signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
+import { MatDialog } from '@angular/material/dialog';
 import { TableColumn } from '@app/types/column.type';
 import { ColumnKey, ResultData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { NotificationService } from '@services/notification.service';
+import { Observable, of } from 'rxjs';
 import { ResultsTableComponent } from './table.component';
 import ResultsDataService from '../services/results-data.service';
+import { ResultsFiltersService } from '../services/results-filters.service';
 import { ResultsStatusesService } from '../services/results-statuses.service';
 import { ResultRaw } from '../types';
 
@@ -57,6 +62,22 @@ describe('ResultsTableComponent', () => {
     refresh$: {
       next: jest.fn()
     },
+    refreshGroup: jest.fn(),
+    groupsConditions: [],
+    manageGroupDialogResult: jest.fn(),
+  };
+
+  const afterClosedMocked = jest.fn((): Observable<unknown> => of());
+  const mockMatDialog = {
+    open: jest.fn(() => {
+      return {
+        afterClosed: afterClosedMocked,
+      };
+    })
+  };
+
+  const mockResultsFilterService = {
+    saveGroups: jest.fn(),
   };
 
   beforeEach(() => {
@@ -66,7 +87,10 @@ describe('ResultsTableComponent', () => {
         ResultsStatusesService,
         { provide: NotificationService, useValue: mockNotificationService },
         { provide: Clipboard, useValue: mockClipBoard },
-        { provide: ResultsDataService, useValue: mockResultsDataService }
+        { provide: ResultsDataService, useValue: mockResultsDataService },
+        { provide: MatDialog, useValue: mockMatDialog },
+        { provide: ViewContainerRef, useValue: {} },
+        { provide: ResultsFiltersService, useValue: mockResultsFilterService },
       ]
     }).inject(ResultsTableComponent);
 
@@ -107,9 +131,16 @@ describe('ResultsTableComponent', () => {
     });
   });
 
-  it('should track a result by its id', () => {
-    const result = {raw: { resultId: 'result' }} as ResultData;
-    expect(component.trackBy(0, result)).toEqual(result.raw.resultId);
+  describe('track By', () => {
+    it('should track a result by its id', () => {
+      const result = {raw: { resultId: 'result' }} as ResultData;
+      expect(component.trackBy(0, result)).toEqual(result.raw.resultId);
+    });
+    
+    it('should track group by its name', () => {
+      const group = { name: signal('some-name') } as unknown as Group<ResultRaw>;
+      expect(component.trackBy(0, group)).toEqual(group.name());
+    });
   });
 
   it('should get data', () => {
@@ -135,4 +166,34 @@ describe('ResultsTableComponent', () => {
   it('should get displayedColumns', () => {
     expect(component.columns).toEqual(displayedColumns);
   });
+
+  describe('UpdateGroupPage', () => {
+    const groupName = 'group 1';
+    
+    beforeEach(() => {
+      component.updateGroupPage(groupName);
+    });
+    
+    it('should refresh the selected group', () => {
+      expect(mockResultsDataService.refreshGroup).toHaveBeenCalledWith(groupName);
+    });
+  });
+
+  describe('openGroupSettings', () => {
+    const groupName = 'Group 1';
+    const result = [{name: 'Renamed Group', conditions: []}];
+    
+    beforeEach(() => {
+      afterClosedMocked.mockReturnValueOnce(of(result));
+      component.openGroupSettings(groupName);
+    });
+    
+    it('should manage the group dialog result', () => {
+      expect(mockResultsDataService.manageGroupDialogResult).toHaveBeenCalledWith(result);
+    });
+
+    it('should update the groups in the local storage', () => {
+      expect(mockResultsFilterService.saveGroups).toHaveBeenCalledWith(mockResultsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/sessions/components/table.component.spec.ts b/src/app/sessions/components/table.component.spec.ts
index 97ccc900f..1a5566f0e 100644
--- a/src/app/sessions/components/table.component.spec.ts
+++ b/src/app/sessions/components/table.component.spec.ts
@@ -1,5 +1,6 @@
 import { SessionStatus, TaskStatus } from '@aneoconsultingfr/armonik.api.angular';
 import { Clipboard } from '@angular/cdk/clipboard';
+import { ViewContainerRef, signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
@@ -7,14 +8,16 @@ import { ManageGroupsDialogResult, TasksStatusesGroup } from '@app/dashboard/typ
 import { TaskOptions } from '@app/tasks/types';
 import { TableColumn } from '@app/types/column.type';
 import { ColumnKey, SessionData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { ActionTable } from '@app/types/table';
 import { CacheService } from '@services/cache.service';
 import { FiltersService } from '@services/filters.service';
 import { NotificationService } from '@services/notification.service';
 import { TasksByStatusService } from '@services/tasks-by-status.service';
-import { of } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { SessionsTableComponent } from './table.component';
 import { SessionsDataService } from '../services/sessions-data.service';
+import { SessionsFiltersService } from '../services/sessions-filters.service';
 import { SessionsStatusesService } from '../services/sessions-statuses.service';
 import { SessionRaw } from '../types';
 
@@ -68,6 +71,13 @@ describe('SessionsTableComponent', () => {
     onPurge: jest.fn(),
     onClose: jest.fn(),
     onDelete: jest.fn(),
+    refreshGroup: jest.fn(),
+    groupsConditions: [],
+    manageGroupDialogResult: jest.fn(),
+  };
+
+  const mockSessionsFilterService = {
+    saveGroups: jest.fn(),
   };
 
   const mockNotificationService = {
@@ -112,10 +122,11 @@ describe('SessionsTableComponent', () => {
     ]
   };
 
+  const afterClosedMocked = jest.fn((): Observable<unknown> => of(mockDialogReturn));
   const mockMatDialog = {
     open: jest.fn(() => {
       return {
-        afterClosed: jest.fn(() => of(mockDialogReturn))
+        afterClosed: afterClosedMocked,
       };
     })
   };
@@ -142,7 +153,9 @@ describe('SessionsTableComponent', () => {
         { provide: Clipboard, useValue: mockClipBoard },
         { provide: TasksByStatusService, useValue: mockTasksByStatusService},
         { provide: MatDialog, useValue: mockMatDialog },
-        { provide: Router, useValue: mockRouter }
+        { provide: Router, useValue: mockRouter },
+        { provide: ViewContainerRef, useValue: {} },
+        { provide: SessionsFiltersService, useValue: mockSessionsFilterService },
       ]
     }).inject(SessionsTableComponent);
 
@@ -332,9 +345,16 @@ describe('SessionsTableComponent', () => {
     });
   });
 
-  it('should track a session by its id', () => {
-    const session = {raw: { sessionId: 'session' }} as SessionData;
-    expect(component.trackBy(0, session)).toEqual(session.raw.sessionId);
+  describe('track By', () => {
+    it('should track a session by its id', () => {
+      const session = {raw: { sessionId: 'session' }} as SessionData;
+      expect(component.trackBy(0, session)).toEqual(session.raw.sessionId);
+    });
+    
+    it('should track group by its name', () => {
+      const group = { name: signal('some-name') } as unknown as Group<SessionRaw, TaskOptions>;
+      expect(component.trackBy(0, group)).toEqual(group.name());
+    });
   });
 
   it('should get data', () => {
@@ -360,4 +380,34 @@ describe('SessionsTableComponent', () => {
   it('should get displayedColumns', () => {
     expect(component.columns).toEqual(displayedColumns);
   });
+
+  describe('UpdateGroupPage', () => {
+    const groupName = 'group 1';
+    
+    beforeEach(() => {
+      component.updateGroupPage(groupName);
+    });
+    
+    it('should refresh the selected group', () => {
+      expect(mockSessionsDataService.refreshGroup).toHaveBeenCalledWith(groupName);
+    });
+  });
+
+  describe('openGroupSettings', () => {
+    const groupName = 'Group 1';
+    const result = [{name: 'Renamed Group', conditions: []}];
+    
+    beforeEach(() => {
+      afterClosedMocked.mockReturnValueOnce(of(result));
+      component.openGroupSettings(groupName);
+    });
+    
+    it('should manage the group dialog result', () => {
+      expect(mockSessionsDataService.manageGroupDialogResult).toHaveBeenCalledWith(result);
+    });
+
+    it('should update the groups in the local storage', () => {
+      expect(mockSessionsFilterService.saveGroups).toHaveBeenCalledWith(mockSessionsDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/tasks/components/table.component.spec.ts b/src/app/tasks/components/table.component.spec.ts
index 55072bc2c..644ec506d 100644
--- a/src/app/tasks/components/table.component.spec.ts
+++ b/src/app/tasks/components/table.component.spec.ts
@@ -1,11 +1,16 @@
 import { TaskStatus } from '@aneoconsultingfr/armonik.api.angular';
 import { Clipboard } from '@angular/cdk/clipboard';
+import { ViewContainerRef, signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
+import { MatDialog } from '@angular/material/dialog';
 import { TableColumn } from '@app/types/column.type';
 import { ArmonikData, ColumnKey, TaskData } from '@app/types/data';
+import { Group } from '@app/types/groups';
 import { NotificationService } from '@services/notification.service';
+import { Observable, of } from 'rxjs';
 import { TasksTableComponent } from './table.component';
 import TasksDataService from '../services/tasks-data.service';
+import { TasksFiltersService } from '../services/tasks-filters.service';
 import { TasksStatusesService } from '../services/tasks-statuses.service';
 import { TaskOptions, TaskSummary } from '../types';
 
@@ -59,6 +64,22 @@ describe('TasksTableComponent', () => {
       next: jest.fn()
     },
     cancelTask: jest.fn(),
+    refreshGroup: jest.fn(),
+    groupsConditions: [],
+    manageGroupDialogResult: jest.fn(),
+  };
+
+  const afterClosedMocked = jest.fn((): Observable<unknown> => of());
+  const mockMatDialog = {
+    open: jest.fn(() => {
+      return {
+        afterClosed: afterClosedMocked,
+      };
+    })
+  };
+
+  const mockTasksFiltersService = {
+    saveGroups: jest.fn(),
   };
 
   beforeEach(() => {
@@ -68,7 +89,10 @@ describe('TasksTableComponent', () => {
         TasksStatusesService,
         { provide: NotificationService, useValue: mockNotificationService },
         { provide: Clipboard, useValue: mockClipBoard },
-        { provide: TasksDataService, useValue: mockTasksDataService }
+        { provide: TasksDataService, useValue: mockTasksDataService },
+        { provide: MatDialog, useValue: mockMatDialog },
+        { provide: ViewContainerRef, useValue: {} },
+        { provide: TasksFiltersService, useValue: mockTasksFiltersService },
       ]
     }).inject(TasksTableComponent);
 
@@ -268,9 +292,16 @@ describe('TasksTableComponent', () => {
     });
   });
 
-  it('should track a task by its id', () => {
-    const task = { raw: { id: 'task' } } as TaskData;
-    expect(component.trackBy(0, task)).toEqual(task.raw.id);
+  describe('track By', () => {
+    it('should track a task by its id', () => {
+      const task = { raw: { id: 'task' } } as TaskData;
+      expect(component.trackBy(0, task)).toEqual(task.raw.id);
+    });
+    
+    it('should track group by its name', () => {
+      const group = { name: signal('some-name') } as unknown as Group<TaskSummary, TaskOptions>;
+      expect(component.trackBy(0, group)).toEqual(group.name());
+    });
   });
 
   it('should get data', () => {
@@ -296,4 +327,34 @@ describe('TasksTableComponent', () => {
   it('should get displayedColumns', () => {
     expect(component.columns).toEqual(displayedColumns);
   });
+  
+  describe('UpdateGroupPage', () => {
+    const groupName = 'group 1';
+    
+    beforeEach(() => {
+      component.updateGroupPage(groupName);
+    });
+    
+    it('should refresh the selected group', () => {
+      expect(mockTasksDataService.refreshGroup).toHaveBeenCalledWith(groupName);
+    });
+  });
+
+  describe('openGroupSettings', () => {
+    const groupName = 'Group 1';
+    const result = [{name: 'Renamed Group', conditions: []}];
+    
+    beforeEach(() => {
+      afterClosedMocked.mockReturnValueOnce(of(result));
+      component.openGroupSettings(groupName);
+    });
+    
+    it('should manage the group dialog result', () => {
+      expect(mockTasksDataService.manageGroupDialogResult).toHaveBeenCalledWith(result);
+    });
+
+    it('should update the groups in the local storage', () => {
+      expect(mockTasksFiltersService.saveGroups).toHaveBeenCalledWith(mockTasksDataService.groupsConditions);
+    });
+  });
 });
\ No newline at end of file

From fa756b164c57799c13b0f6bc7ed5eb1d87fecc00 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 09:40:04 +0100
Subject: [PATCH 36/47] tests: view tasks by status

---
 src/app/components/view-tasks-by-status.component.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/view-tasks-by-status.component.spec.ts b/src/app/components/view-tasks-by-status.component.spec.ts
index 46e0faa28..ed1a9766a 100644
--- a/src/app/components/view-tasks-by-status.component.spec.ts
+++ b/src/app/components/view-tasks-by-status.component.spec.ts
@@ -77,7 +77,7 @@ describe('ViewTasksByStatusComponent', () => {
   });
 
   it('should handle statuses on init', () => {
-    expect(component.statusesGroups).toEqual([
+    expect(component.groups).toEqual([
       {
         ...initialStatusesGroups[0],
         queryParams: {
@@ -111,6 +111,6 @@ describe('ViewTasksByStatusComponent', () => {
       { status: TaskStatus.TASK_STATUS_ERROR, count: errorStatusCount },
       { status: TaskStatus.TASK_STATUS_TIMEOUT, count: timeoutStatusCount },
     ];
-    expect(component.statusesGroups.map(group => group.statusCount)).toEqual([completedStatusCount, errorStatusCount + timeoutStatusCount]);
+    expect(component.groups.map(group => group.statusCount)).toEqual([completedStatusCount, errorStatusCount + timeoutStatusCount]);
   });
 });
\ No newline at end of file

From ee215adf5b9abd22cbc1ceb4df4e0ef930ce5033 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 09:41:01 +0100
Subject: [PATCH 37/47] tests: dashboard index

---
 src/app/dashboard/index.component.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/dashboard/index.component.spec.ts b/src/app/dashboard/index.component.spec.ts
index b200705f6..76329ff29 100644
--- a/src/app/dashboard/index.component.spec.ts
+++ b/src/app/dashboard/index.component.spec.ts
@@ -105,6 +105,7 @@ describe('IndexComponent', () => {
         interval: 5,
         hideGroupsHeader: false,
         filters: [],
+        groups: [],
         taskStatusesGroups: [
           {
             name: 'Finished',

From fe23c8c1bc4d0c3826566516fd2b2ae2b66a31f7 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 09:44:51 +0100
Subject: [PATCH 38/47] chore: renamed preparefilters to prepareFilters

---
 .../services/applications-data.service.spec.ts            | 6 +++---
 .../partitions/services/partitions-data.service.spec.ts   | 6 +++---
 src/app/results/services/results-data.service.spec.ts     | 6 +++---
 src/app/sessions/services/sessions-data.service.spec.ts   | 8 ++++----
 src/app/sessions/services/sessions-data.service.ts        | 4 ++--
 src/app/tasks/services/tasks-data.service.spec.ts         | 6 +++---
 src/app/types/services/table-data.service.ts              | 4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/app/applications/services/applications-data.service.spec.ts b/src/app/applications/services/applications-data.service.spec.ts
index 4665c5823..591f324ee 100644
--- a/src/app/applications/services/applications-data.service.spec.ts
+++ b/src/app/applications/services/applications-data.service.spec.ts
@@ -163,7 +163,7 @@ describe('ApplicationDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockApplicationsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
+      expect(mockApplicationsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.prepareFilters());
     });
 
     it('should update the total', () => {
@@ -263,7 +263,7 @@ describe('ApplicationDataService', () => {
 
   describe('PrepareFilters', () => {
     it('should merge filters and group conditions', () => {
-      (expect(service.preparefilters())).toEqual([
+      (expect(service.prepareFilters())).toEqual([
         [
           {
             field: ApplicationRawEnumField.APPLICATION_RAW_ENUM_FIELD_NAME,
@@ -337,7 +337,7 @@ describe('ApplicationDataService', () => {
 
     it('should return group conditions if there is no filters', () => {
       service.filters = [];
-      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+      expect(service.prepareFilters()).toEqual(groupConditions[0].conditions);
     });
   });
 
diff --git a/src/app/partitions/services/partitions-data.service.spec.ts b/src/app/partitions/services/partitions-data.service.spec.ts
index d6bc2129d..4a8dfd289 100644
--- a/src/app/partitions/services/partitions-data.service.spec.ts
+++ b/src/app/partitions/services/partitions-data.service.spec.ts
@@ -163,7 +163,7 @@ describe('PartitionsDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockPartitionsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
+      expect(mockPartitionsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.prepareFilters());
     });
     
     it('should update the total', () => {
@@ -355,7 +355,7 @@ describe('PartitionsDataService', () => {
   
   describe('PrepareFilters', () => {
     it('should merge filters and group conditions', () => {
-      (expect(service.preparefilters())).toEqual([
+      (expect(service.prepareFilters())).toEqual([
         [
           {
             field: PartitionRawEnumField.PARTITION_RAW_ENUM_FIELD_ID,
@@ -429,7 +429,7 @@ describe('PartitionsDataService', () => {
   
     it('should return group conditions if there is no filters', () => {
       service.filters = [];
-      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+      expect(service.prepareFilters()).toEqual(groupConditions[0].conditions);
     });
   });
   
diff --git a/src/app/results/services/results-data.service.spec.ts b/src/app/results/services/results-data.service.spec.ts
index c3b19c870..6e76518d7 100644
--- a/src/app/results/services/results-data.service.spec.ts
+++ b/src/app/results/services/results-data.service.spec.ts
@@ -141,7 +141,7 @@ describe('ResultsDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockResultsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
+      expect(mockResultsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.prepareFilters());
     });
 
     it('should update the total', () => {
@@ -230,7 +230,7 @@ describe('ResultsDataService', () => {
     
   describe('PrepareFilters', () => {
     it('should merge filters and group conditions', () => {
-      (expect(service.preparefilters())).toEqual([
+      (expect(service.prepareFilters())).toEqual([
         [
           {
             field: ResultRawEnumField.RESULT_RAW_ENUM_FIELD_RESULT_ID,
@@ -304,7 +304,7 @@ describe('ResultsDataService', () => {
     
     it('should return group conditions if there is no filters', () => {
       service.filters = [];
-      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+      expect(service.prepareFilters()).toEqual(groupConditions[0].conditions);
     });
   });
     
diff --git a/src/app/sessions/services/sessions-data.service.spec.ts b/src/app/sessions/services/sessions-data.service.spec.ts
index 2896ad492..2fc9555d8 100644
--- a/src/app/sessions/services/sessions-data.service.spec.ts
+++ b/src/app/sessions/services/sessions-data.service.spec.ts
@@ -183,7 +183,7 @@ describe('SessionsDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
+      expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.prepareFilters());
     });
     
     it('should update the total', () => {
@@ -463,7 +463,7 @@ describe('SessionsDataService', () => {
       service.refresh$.next();
       expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(
         service.prepareOptions(),
-        service.preparefilters(),
+        service.prepareFilters(),
       );
     });
   });
@@ -560,7 +560,7 @@ describe('SessionsDataService', () => {
     
   describe('PrepareFilters', () => {
     it('should merge filters and group conditions', () => {
-      (expect(service.preparefilters())).toEqual([
+      (expect(service.prepareFilters())).toEqual([
         [
           {
             field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_SESSION_ID,
@@ -634,7 +634,7 @@ describe('SessionsDataService', () => {
     
     it('should return group conditions if there is no filters', () => {
       service.filters = [];
-      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+      expect(service.prepareFilters()).toEqual(groupConditions[0].conditions);
     });
   });
     
diff --git a/src/app/sessions/services/sessions-data.service.ts b/src/app/sessions/services/sessions-data.service.ts
index cb6e23084..e1a82cb50 100644
--- a/src/app/sessions/services/sessions-data.service.ts
+++ b/src/app/sessions/services/sessions-data.service.ts
@@ -56,8 +56,8 @@ export class SessionsDataService extends AbstractTableDataService<SessionRaw, Se
     return options;
   }
 
-  override preparefilters(): FiltersOr<SessionRawEnumField, TaskOptionEnumField> {
-    const filtersOr = super.preparefilters();
+  override prepareFilters(): FiltersOr<SessionRawEnumField, TaskOptionEnumField> {
+    const filtersOr = super.prepareFilters();
     if(this.isDurationDisplayed && this.options.sort.active === 'duration') {
       const date = new Date();
       date.setDate(date.getDate() - 3);
diff --git a/src/app/tasks/services/tasks-data.service.spec.ts b/src/app/tasks/services/tasks-data.service.spec.ts
index b9344a9d3..5ad203a9d 100644
--- a/src/app/tasks/services/tasks-data.service.spec.ts
+++ b/src/app/tasks/services/tasks-data.service.spec.ts
@@ -146,7 +146,7 @@ describe('TasksDataService', () => {
   describe('Fetching data', () => {
     it('should list the data', () => {
       service.refresh$.next();
-      expect(mockTasksGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.preparefilters());
+      expect(mockTasksGrpcService.list$).toHaveBeenCalledWith(service.prepareOptions(), service.prepareFilters());
     });
 
     it('should update the total', () => {
@@ -360,7 +360,7 @@ describe('TasksDataService', () => {
     
   describe('PrepareFilters', () => {
     it('should merge filters and group conditions', () => {
-      (expect(service.preparefilters())).toEqual([
+      (expect(service.prepareFilters())).toEqual([
         [
           {
             field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_TASK_ID,
@@ -412,7 +412,7 @@ describe('TasksDataService', () => {
     
     it('should return group conditions if there is no filters', () => {
       service.filters = [];
-      expect(service.preparefilters()).toEqual(groupConditions[0].conditions);
+      expect(service.prepareFilters()).toEqual(groupConditions[0].conditions);
     });
   });
     
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index 1aa79125e..e930dc794 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -70,7 +70,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
         this.loading.set(true);
 
         const options = this.prepareOptions();
-        const filters = this.preparefilters();
+        const filters = this.prepareFilters();
 
         return this.grpcService.list$(options, filters)
           .pipe(
@@ -103,7 +103,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
   /**
    * Clone the filter object, and add the inverted conditions of every groupConditions to it.
    */
-  preparefilters(): FiltersOr<F, FO> {
+  prepareFilters(): FiltersOr<F, FO> {
     let filtersOr = structuredClone(this.filters);
     this.groupsConditions.forEach((groupConditions) => {
       const inverted = this.invertFiltersService.invert(groupConditions.conditions);

From 0889a6ff8b7dd49d44d6ddb08392e37e0f679cf6 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 09:51:57 +0100
Subject: [PATCH 39/47] tests: sessions data service

---
 .../services/sessions-data.service.spec.ts    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/app/sessions/services/sessions-data.service.spec.ts b/src/app/sessions/services/sessions-data.service.spec.ts
index 2fc9555d8..7ce3dc9d3 100644
--- a/src/app/sessions/services/sessions-data.service.spec.ts
+++ b/src/app/sessions/services/sessions-data.service.spec.ts
@@ -457,13 +457,19 @@ describe('SessionsDataService', () => {
       jest.useFakeTimers().setSystemTime(new Date('1970-01-01'));
       const date = new Date();
       date.setDate(date.getDate() - 3);
+      const appliedFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: Math.floor(date.getTime()/1000)
+      };
       service.options = { pageIndex: 0, pageSize: 0, sort: { active: 'duration', direction: 'asc'}};
       service.isDurationDisplayed = true;
+      service.groupsConditions = [];
       service.filters = [[arrayFilter, stringFilter], [dateFilter]];
       service.refresh$.next();
       expect(mockSessionsGrpcService.list$).toHaveBeenCalledWith(
-        service.prepareOptions(),
-        service.prepareFilters(),
+        service.prepareOptions(),[[arrayFilter, stringFilter, appliedFilter], [dateFilter]]
       );
     });
   });
@@ -636,6 +642,23 @@ describe('SessionsDataService', () => {
       service.filters = [];
       expect(service.prepareFilters()).toEqual(groupConditions[0].conditions);
     });
+
+    it('should return the applied filter if the duration is displayed and there is no filters', () => {
+      service.groupsConditions = [];
+      service.filters = [];
+      service.isDurationDisplayed = true;
+      jest.useFakeTimers().setSystemTime(new Date('1970-01-01'));
+      const date = new Date();
+      date.setDate(date.getDate() - 3);
+      const appliedFilter: Filter<SessionRawEnumField, TaskOptionEnumField> = {
+        field: SessionRawEnumField.SESSION_RAW_ENUM_FIELD_CREATED_AT,
+        for: 'root',
+        operator: FilterDateOperator.FILTER_DATE_OPERATOR_AFTER_OR_EQUAL,
+        value: Math.floor(date.getTime()/1000)
+      };
+
+      expect(service.prepareFilters()).toEqual([[appliedFilter]]);
+    });
   });
     
   describe('groups fetching data', () => {

From 612f556c98b6dfa62763632f15f3ed7d4bc4a6e9 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 10:26:50 +0100
Subject: [PATCH 40/47] tests: table service

---
 src/app/services/table.service.spec.ts | 146 ++++++++++++-------------
 src/app/services/table.service.ts      |   6 +-
 2 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/src/app/services/table.service.spec.ts b/src/app/services/table.service.spec.ts
index eb976841a..b7251786f 100644
--- a/src/app/services/table.service.spec.ts
+++ b/src/app/services/table.service.spec.ts
@@ -1,8 +1,9 @@
-import { TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
+import { SessionRawEnumField, TaskOptionEnumField, TaskSummaryEnumField } from '@aneoconsultingfr/armonik.api.angular';
 import { TestBed } from '@angular/core/testing';
 import { TaskFilterDefinition } from '@app/tasks/types';
 import { DataRaw, FieldKey } from '@app/types/data';
 import { FilterDefinition } from '@app/types/filter-definition';
+import { GroupConditions } from '@app/types/groups';
 import { ListOptions } from '@app/types/options';
 import { StorageService } from './storage.service';
 import { TableStorageService } from './table-storage.service';
@@ -15,9 +16,11 @@ describe('TableService', () => {
     getQueryParamsOptions: jest.fn(),
     getQueryParamsFilters: jest.fn()
   };
+
+  const restoreReturn = 'example';
   const tableStorageMock = {
     save: jest.fn(),
-    restore: jest.fn(),
+    restore: jest.fn((value: string): unknown => `${value}-${restoreReturn}`),
     remove: jest.fn()
   };
 
@@ -43,8 +46,8 @@ describe('TableService', () => {
 
   describe('restoreIntervalValue', () => {
 
-    beforeAll(() => {
-      tableStorageMock.restore.mockImplementation((key: string) => {
+    beforeEach(() => {
+      tableStorageMock.restore.mockImplementationOnce((key: string) => {
         const intervalRecord: Record<string, unknown> = {
           'applications-interval': 10,
           'sessions-interval': 'Oops',
@@ -56,7 +59,6 @@ describe('TableService', () => {
 
     it('Should return the interval value of the specified scope', () => {
       expect(service.restoreIntervalValue('applications-interval')).toEqual(10);
-      expect(service.restoreIntervalValue('tasks-interval')).toEqual(0);
     });
 
     it('Should return null if the interval value has no interval', () => {
@@ -94,8 +96,8 @@ describe('TableService', () => {
       }
     } as ListOptions<DataRaw>;
 
-    beforeAll(() => {
-      tableStorageMock.restore.mockImplementation((key: string) => {
+    beforeEach(() => {
+      tableStorageMock.restore.mockImplementationOnce((key: string) => {
         const optionsRecord: Record<string, unknown> = {
           'applications-options': {
             pageIndex: 0,
@@ -121,11 +123,16 @@ describe('TableService', () => {
     it('Should return queryParamsOptions values', () => {
       tableURLMock.getQueryParamsOptions.mockImplementation((key: string) => {
         switch(key) {
-        case 'pageIndex': return '20';
-        case 'pageSize': return '50';
-        case 'sortField': return 3 as FieldKey<DataRaw>;
-        case 'sortDirection': return 'desc';
-        default: return null;
+        case 'pageIndex': 
+          return 20;
+        case 'pageSize':
+          return 50;
+        case 'sortField':
+          return 3 as FieldKey<DataRaw>;
+        case 'sortDirection':
+          return 'desc';
+        default:
+          return null;
         }
       });
       expect(service.restoreOptions('applications-options', defaultOptions)).toEqual({
@@ -168,26 +175,20 @@ describe('TableService', () => {
         }
       });
     });
+  });
 
-
-    it('should call TableStorageService.save when saving filter', () => {
-      service.saveFilters('applications-filters', [[{
-        field: 1,
-        operator: 0,
-        value: 'someData',
-        for: 'root'
-      }]]);
-      expect(tableStorageMock.save).toHaveBeenCalledWith('applications-filters', [[{
-        field: 1,
-        operator: 0,
-        value: 'someData',
-        for: 'root'
-      }]]);
-    });
+  it('should call TableStorageService.save when saving filter', () => {
+    const filters = [[{
+      field: 1,
+      operator: 0,
+      value: 'someData',
+      for: 'root'
+    }]];
+    service.saveFilters('applications-filters', filters);
+    expect(tableStorageMock.save).toHaveBeenCalledWith('applications-filters', filters);
   });
 
   describe('restoreFilter', () => {
-    
     const validFilterDefs: TaskFilterDefinition[] = [{
       for: 'root',
       field: TaskSummaryEnumField.TASK_SUMMARY_ENUM_FIELD_SESSION_ID,
@@ -199,63 +200,28 @@ describe('TableService', () => {
       type: 'string'
     }];
 
-    beforeAll(() => {
-      tableURLMock.getQueryParamsFilters.mockImplementation((filterDef: FilterDefinition<number, number>[]) => {
-        return filterDef === validFilterDefs ? [[
-          {
-            field: 1,
-            operator: 0,
-            value: 'someData',
-            for: 'root'
-          }, 
-        ]] : [];
-      });
-      tableStorageMock.restore.mockImplementation((key: string) => {
-        return key === 'applications-filters' ? [[
-          {
-            field: 1,
-            operator: 0,
-            value: 'someData',
-            for: 'root'
-          }, 
-          {
-            field: 16,
-            operator: 0,
-            value: 'anotherKindOfData',
-            for: 'root'
-          }
-        ]] : null;
-      });
-    });
-
-    it('should return queryParamsFilter', () => {
-      expect(service.restoreFilters('applications-filters', validFilterDefs)).toEqual([[{
+    const queryParamsFilter = [[
+      {
         field: 1,
         operator: 0,
         value: 'someData',
         for: 'root'
-      }]]);
+      }, 
+    ]];
+
+    beforeEach(() => {
+      tableStorageMock.restore.mockClear();
+      tableURLMock.getQueryParamsFilters.mockImplementationOnce((filterDef: FilterDefinition<number, number>[]) => {
+        return filterDef === validFilterDefs ? queryParamsFilter : [];
+      });
     });
 
-    it('should return stored filters if there is no QueryParams', () => {
-      expect(service.restoreFilters('applications-filters', invalidFilterDefs)).toEqual([[
-        {
-          field: 1,
-          operator: 0,
-          value: 'someData',
-          for: 'root'
-        }, 
-        {
-          field: 16,
-          operator: 0,
-          value: 'anotherKindOfData',
-          for: 'root'
-        }
-      ]]);
+    it('should return queryParamsFilter', () => {
+      expect(service.restoreFilters('applications-filters', validFilterDefs)).toEqual(queryParamsFilter);
     });
 
-    it('Should return null if there is no queryParams nor stored filters', () => {
-      expect(service.restoreFilters('partitions-filters', invalidFilterDefs)).toBeNull();
+    it('should return stored filters if there is no QueryParams', () => {
+      expect(service.restoreFilters('applications-filters', invalidFilterDefs)).toEqual('applications-filters-example');
     });
   });
 
@@ -302,4 +268,30 @@ describe('TableService', () => {
     service.restoreShowFilters('applications-show-filters');
     expect(tableStorageMock.restore).toHaveBeenCalledWith('applications-show-filters');
   });
+
+  describe('Groups', () => {
+    const key = 'sessions-groups';
+
+    it('should save groups', () => {
+      const groups: GroupConditions<SessionRawEnumField, TaskOptionEnumField>[] = [];
+      service.saveGroups<SessionRawEnumField, TaskOptionEnumField>(key, groups);
+      expect(tableStorageMock.save).toHaveBeenCalledWith(key, groups);
+    });
+
+    describe('restoreGroups', () => {
+      it('should restore groups', () => {
+        expect(service.restoreGroups(key)).toEqual(`${key}-${restoreReturn}`);
+      });
+
+      it('should return an empty array if no groups are stored', () => {
+        tableStorageMock.restore.mockImplementationOnce(() => null);
+        expect(service.restoreGroups(key)).toEqual([]);
+      });
+    });
+
+    it('should reset groups', () => {
+      service.resetGroups(key);
+      expect(tableStorageMock.remove).toHaveBeenCalledWith(key);
+    });
+  });
 });
\ No newline at end of file
diff --git a/src/app/services/table.service.ts b/src/app/services/table.service.ts
index d01e54d3e..6329c1c23 100644
--- a/src/app/services/table.service.ts
+++ b/src/app/services/table.service.ts
@@ -85,16 +85,18 @@ export class TableService {
    * Restore filters from the URL and then from the storage
    */
   restoreFilters<T extends number, U extends number | null>(key: `${Scope}-filters`, filtersDefinitions: FilterDefinition<T, U>[]): FiltersOr<T, U> | null {
-
     const queryParams = this.tableURLService.getQueryParamsFilters<T, U>(filtersDefinitions);
 
-    if (queryParams.length) {
+    if (queryParams.length !== 0) {
       return queryParams;
     }
 
+    console.log('getting storage', key);
 
     const storageData = this.tableStorageService.restore<FiltersOr<T, U>>(key) as FiltersOr<T, U> | null;
 
+    console.log(storageData);
+
     return storageData;
   }
 

From 90844e7d07c93ae460def0e42ff8965e7a68de7c Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 10:34:29 +0100
Subject: [PATCH 41/47] tests: components

---
 src/app/components/table-actions-toolbar.component.spec.ts  | 6 ++++++
 .../table-dashboard-actions-toolbar.component.spec.ts       | 6 ++++++
 .../table-index-actions-toolbar.component.spec.ts           | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/app/components/table-actions-toolbar.component.spec.ts b/src/app/components/table-actions-toolbar.component.spec.ts
index 840498263..5086c9b49 100644
--- a/src/app/components/table-actions-toolbar.component.spec.ts
+++ b/src/app/components/table-actions-toolbar.component.spec.ts
@@ -66,4 +66,10 @@ describe('TableActionsToolbarComponent', () => {
     component.onLockColumnsChange();
     expect(spyOnEventEmitter).toHaveBeenCalled();
   });
+
+  it('should emit on "Open groups settings"', () => {
+    const spy = jest.spyOn(component.groupSettings, 'emit');
+    component.openGroupsSettings();
+    expect(spy).toHaveBeenCalled();
+  });
 });
\ No newline at end of file
diff --git a/src/app/components/table-dashboard-actions-toolbar.component.spec.ts b/src/app/components/table-dashboard-actions-toolbar.component.spec.ts
index 316736488..51feeef26 100644
--- a/src/app/components/table-dashboard-actions-toolbar.component.spec.ts
+++ b/src/app/components/table-dashboard-actions-toolbar.component.spec.ts
@@ -93,4 +93,10 @@ describe('TableDashboardActionsToolbarComponent', () => {
     component.onDeleteLine();
     expect(spy).toHaveBeenCalled();
   });
+
+  it('should emit on "Open groups settings"', () => {
+    const spy = jest.spyOn(component.groupSettings, 'emit');
+    component.openGroupsSettings();
+    expect(spy).toHaveBeenCalled();
+  });
 });
\ No newline at end of file
diff --git a/src/app/components/table-index-actions-toolbar.component.spec.ts b/src/app/components/table-index-actions-toolbar.component.spec.ts
index 08266d022..42ad7f1c5 100644
--- a/src/app/components/table-index-actions-toolbar.component.spec.ts
+++ b/src/app/components/table-index-actions-toolbar.component.spec.ts
@@ -87,4 +87,10 @@ describe('TableDashboardActionsToolbarComponent', () => {
     component.onAddToDashboard();
     expect(spy).toHaveBeenCalled();
   });
+
+  it('should emit on "Open groups settings"', () => {
+    const spy = jest.spyOn(component.groupSettings, 'emit');
+    component.openGroupsSettings();
+    expect(spy).toHaveBeenCalled();
+  });
 });
\ No newline at end of file

From adb2f3965590a9ed4194f0bde86e15b1f10e9b8f Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 10:46:56 +0100
Subject: [PATCH 42/47] chore: layout changes on group tasks by status

---
 .../components/table/group/group-row/group.component.css  | 5 -----
 .../components/table/group/group-row/group.component.html | 5 +----
 .../group-tasks-by-status.component.css                   | 8 ++++++++
 .../group-tasks-by-status.component.html                  | 5 ++++-
 .../group-tasks-by-status.component.ts                    | 3 +++
 5 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css

diff --git a/src/app/components/table/group/group-row/group.component.css b/src/app/components/table/group/group-row/group.component.css
index fb5b4ac89..1df703f2c 100644
--- a/src/app/components/table/group/group-row/group.component.css
+++ b/src/app/components/table/group/group-row/group.component.css
@@ -13,11 +13,6 @@
   min-width: 20rem;
 }
 
-.tasks-statuses {
-  display: flex;
-  align-items: center;
-}
-
 .general-actions {
   display: flex;
   align-items: center;
diff --git a/src/app/components/table/group/group-row/group.component.html b/src/app/components/table/group/group-row/group.component.html
index 4af0fe412..3d328371f 100644
--- a/src/app/components/table/group/group-row/group.component.html
+++ b/src/app/components/table/group/group-row/group.component.html
@@ -10,10 +10,7 @@
     </p>
   </article>
   @if (statusesGroups) {
-    <article class="tasks-statuses">
-      <p>Tasks statuses: </p>
-      <app-group-tasks-by-status [groupData]="group.data|async" [statusesGroups]="statusesGroups" />
-    </article>
+    <app-group-tasks-by-status [groupData]="group.data|async" [statusesGroups]="statusesGroups" />
   }
   <article class="general-actions">
     @if (group.emptyCondition) {
diff --git a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css
new file mode 100644
index 000000000..9c0e174cb
--- /dev/null
+++ b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.css
@@ -0,0 +1,8 @@
+article {
+  display: flex;
+  align-items: center;
+}
+
+p {
+  margin: 0;
+}
\ No newline at end of file
diff --git a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.html b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.html
index 96e18c463..4d0a13cc7 100644
--- a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.html
+++ b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.html
@@ -1,3 +1,6 @@
 @if (queryParamsLength !== 0 && filters.length !== 0) {
-  <app-count-tasks-by-status [refresh]="refresh" [queryParams]="queryParams" [filters]="filters" [statusesGroups]="statusesGroups" />
+  <article>
+    <p>Tasks statuses: </p>
+    <app-count-tasks-by-status [refresh]="refresh" [queryParams]="queryParams" [filters]="filters" [statusesGroups]="statusesGroups" />
+  </article>
 }
\ No newline at end of file
diff --git a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
index aa9cbd0d8..dd33f8ae8 100644
--- a/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
+++ b/src/app/components/table/group/grouped-tasks-by-status/group-tasks-by-status.component.ts
@@ -11,6 +11,7 @@ import { Subject } from 'rxjs';
 @Component({
   selector: 'app-group-tasks-by-status',
   templateUrl: 'group-tasks-by-status.component.html',
+  styleUrl: 'group-tasks-by-status.component.css',
   standalone: true,
   imports: [
     CountTasksByStatusComponent,
@@ -35,6 +36,8 @@ export class GroupTasksByStatusComponent<T extends DataRaw, O extends TaskOption
         keys.forEach((key) => (this.queryParams[`${index}${key.slice(1)}`] = data.queryTasksParams[key]));
       });
       this.queryParamsLength = Object.keys(this.queryParams).length;
+
+      this.refresh.next();
     }
   }
 

From 0f8883822fe589c475209f3724e63eb88f23b9cf Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 10:57:36 +0100
Subject: [PATCH 43/47] chore: update code for a better readability

---
 src/app/services/invert-filter.service.ts    | 6 +++---
 src/app/types/services/table-data.service.ts | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/app/services/invert-filter.service.ts b/src/app/services/invert-filter.service.ts
index 8c78c8c43..c37119151 100644
--- a/src/app/services/invert-filter.service.ts
+++ b/src/app/services/invert-filter.service.ts
@@ -21,9 +21,9 @@ export class InvertFilterService<F extends FiltersEnums, FO extends FiltersOptio
       if (invertedFilters.length === 0) {
         invertedFilters.push(...filterAnd.map((filter) => [this.invertFilter(filter)]));
       } else {
-        const result = invertedFilters.map((invertedAnd) => filterAnd.map((filter) => [...invertedAnd, this.invertFilter(filter)]));
-        invertedFilters = [];
-        result.forEach((r) => invertedFilters.push(...r));
+        invertedFilters = invertedFilters
+          .map((invertedAnd) => filterAnd.map((filter) => [...invertedAnd, this.invertFilter(filter)]))
+          .reduce((acc, current) => [...acc, ...current]);
       }
     });
     return invertedFilters;
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index e930dc794..b1309702d 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -110,11 +110,9 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
       if (!this.isNotEmptyFilter(filtersOr)) {
         filtersOr.push(...inverted);
       } else {
-        const result: FiltersOr<F, FO> = [];
-        filtersOr.forEach((filterAnd) => {
-          inverted.map((invertedAnd) => [...invertedAnd, ...filterAnd]).forEach((r) => result.push(r));
-        });
-        filtersOr = result;
+        filtersOr = filtersOr
+          .map((filterAnd) => inverted.map((invertedAnd) => [...invertedAnd, ...filterAnd]))
+          .reduce((acc, cur) => [...acc, ...cur]);
       }
     });
     return filtersOr;

From 5e8f86ac8d09a9d7b6609645de4ed78935737975 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 11:00:09 +0100
Subject: [PATCH 44/47] chore: address sonarQube issues

---
 src/app/components/table/table.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index 0ac52dac4..b95128a93 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -97,7 +97,7 @@ export class TableComponent<T extends DataRaw, S extends Status, O extends TaskO
   }
 
   get columnsKeys(): ColumnKey<T, O>[] {
-    return this._columnsKeys as ColumnKey<T, O>[];
+    return this._columnsKeys;
   }
 
   get isAllSelected(): boolean {

From 4b08fcf005d1b00532e6ec220e81a47c27d36a3e Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Mon, 17 Feb 2025 11:00:53 +0100
Subject: [PATCH 45/47] chore: added initial values to reduce

---
 src/app/services/invert-filter.service.ts    | 2 +-
 src/app/types/services/table-data.service.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/invert-filter.service.ts b/src/app/services/invert-filter.service.ts
index c37119151..ee5879e5a 100644
--- a/src/app/services/invert-filter.service.ts
+++ b/src/app/services/invert-filter.service.ts
@@ -23,7 +23,7 @@ export class InvertFilterService<F extends FiltersEnums, FO extends FiltersOptio
       } else {
         invertedFilters = invertedFilters
           .map((invertedAnd) => filterAnd.map((filter) => [...invertedAnd, this.invertFilter(filter)]))
-          .reduce((acc, current) => [...acc, ...current]);
+          .reduce((acc, current) => [...acc, ...current], []);
       }
     });
     return invertedFilters;
diff --git a/src/app/types/services/table-data.service.ts b/src/app/types/services/table-data.service.ts
index b1309702d..fcdbe5580 100644
--- a/src/app/types/services/table-data.service.ts
+++ b/src/app/types/services/table-data.service.ts
@@ -112,7 +112,7 @@ export abstract class AbstractTableDataService<T extends DataRaw, F extends Filt
       } else {
         filtersOr = filtersOr
           .map((filterAnd) => inverted.map((invertedAnd) => [...invertedAnd, ...filterAnd]))
-          .reduce((acc, cur) => [...acc, ...cur]);
+          .reduce((acc, cur) => [...acc, ...cur], []);
       }
     });
     return filtersOr;

From 7db6a1b799439c50a3f31dd35618234a4bd1f922 Mon Sep 17 00:00:00 2001
From: Faustin <fdewas@aneo.fr>
Date: Wed, 5 Mar 2025 17:11:20 +0100
Subject: [PATCH 46/47] feat: number of groups displayed as a badge

---
 src/app/applications/index.component.html                     | 1 +
 src/app/components/table-actions-toolbar.component.html       | 2 +-
 src/app/components/table-actions-toolbar.component.ts         | 4 ++++
 .../components/table-dashboard-actions-toolbar.component.html | 1 +
 .../components/table-dashboard-actions-toolbar.component.ts   | 1 +
 src/app/components/table-index-actions-toolbar.component.html | 1 +
 src/app/components/table-index-actions-toolbar.component.ts   | 1 +
 src/app/partitions/index.component.html                       | 1 +
 src/app/results/index.component.html                          | 1 +
 src/app/sessions/index.component.html                         | 1 +
 src/app/tasks/index.component.html                            | 1 +
 11 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/applications/index.component.html b/src/app/applications/index.component.html
index 3d1fd39e5..17091f8c1 100644
--- a/src/app/applications/index.component.html
+++ b/src/app/applications/index.component.html
@@ -13,6 +13,7 @@
       [displayedColumns]="displayedColumnsKeys"
       [availableColumns]="availableColumns"
       [lockColumns]="lockColumns"
+      [groupsLength]="tableDataService.groupsConditions.length"
       (refresh)="refresh()"
       (intervalValueChange)="onIntervalValueChange($event)"
       (displayedColumnsChange)="onColumnsChange($event)"
diff --git a/src/app/components/table-actions-toolbar.component.html b/src/app/components/table-actions-toolbar.component.html
index aee9c9c7d..0c5eed372 100644
--- a/src/app/components/table-actions-toolbar.component.html
+++ b/src/app/components/table-actions-toolbar.component.html
@@ -10,7 +10,7 @@
     <app-actions-toolbar-group>
       <ng-content select="[extra-buttons-right]"></ng-content>
 
-      <button mat-button (click)="openGroupsSettings()">
+      <button mat-button (click)="openGroupsSettings()" [matBadge]="groupsLength !== 0 ? groupsLength : undefined">
         <mat-icon [fontIcon]="getIcon('table-group')" />
         <span i18n>Manage Groups</span>
       </button>
diff --git a/src/app/components/table-actions-toolbar.component.ts b/src/app/components/table-actions-toolbar.component.ts
index 213cfd82d..82147868a 100644
--- a/src/app/components/table-actions-toolbar.component.ts
+++ b/src/app/components/table-actions-toolbar.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
+import { MatBadgeModule } from '@angular/material/badge';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -13,6 +14,7 @@ import { AutoRefreshButtonComponent } from './auto-refresh-button.component';
 import { ColumnsButtonComponent } from './columns-button.component';
 import { SpinnerComponent } from './spinner.component';
 
+
 @Component({
   selector: 'app-table-actions-toolbar',
   templateUrl: './table-actions-toolbar.component.html',
@@ -31,6 +33,7 @@ import { SpinnerComponent } from './spinner.component';
     MatMenuModule,
     MatIconModule,
     MatTooltipModule,
+    MatBadgeModule
   ]
 })
 export class TableActionsToolbarComponent<T extends DataRaw, O extends TaskOptions | null = null> {
@@ -43,6 +46,7 @@ export class TableActionsToolbarComponent<T extends DataRaw, O extends TaskOptio
   @Input({ required: true }) displayedColumns: ColumnKey<T, O>[] = [];
   @Input({ required: true }) availableColumns: ColumnKey<T, O>[] = [];
   @Input({ required: true }) lockColumns = false;
+  @Input({ required: false }) groupsLength: number = 0;
 
   @Output() refresh: EventEmitter<void> = new EventEmitter<void>();
   @Output() intervalValueChange: EventEmitter<number> = new EventEmitter<number>();
diff --git a/src/app/components/table-dashboard-actions-toolbar.component.html b/src/app/components/table-dashboard-actions-toolbar.component.html
index d60b39e01..bf53d79f7 100644
--- a/src/app/components/table-dashboard-actions-toolbar.component.html
+++ b/src/app/components/table-dashboard-actions-toolbar.component.html
@@ -6,6 +6,7 @@
 [displayedColumns]="displayedColumns"
 [availableColumns]="availableColumns"
 [lockColumns]="lockColumns"
+[groupsLength]="groupsLength"
 (refresh)="onRefresh()"
 (intervalValueChange)="onIntervalValueChange($event)"
 (displayedColumnsChange)="onColumnsChange($event)"
diff --git a/src/app/components/table-dashboard-actions-toolbar.component.ts b/src/app/components/table-dashboard-actions-toolbar.component.ts
index 67e966b1e..703d0b94d 100644
--- a/src/app/components/table-dashboard-actions-toolbar.component.ts
+++ b/src/app/components/table-dashboard-actions-toolbar.component.ts
@@ -26,6 +26,7 @@ export class TableDashboardActionsToolbarComponent<T extends DataRaw, O extends
   @Input({ required: true }) displayedColumns: ColumnKey<T, O>[];
   @Input({ required: true }) availableColumns: ColumnKey<T, O>[];
   @Input({ required: true }) lockColumns = false;
+  @Input({ required: false }) groupsLength: number;
 
   @Output() refresh: EventEmitter<void> = new EventEmitter<void>();
   @Output() intervalValueChange: EventEmitter<number> = new EventEmitter<number>();
diff --git a/src/app/components/table-index-actions-toolbar.component.html b/src/app/components/table-index-actions-toolbar.component.html
index a7ec5cd95..7e6821ee6 100644
--- a/src/app/components/table-index-actions-toolbar.component.html
+++ b/src/app/components/table-index-actions-toolbar.component.html
@@ -6,6 +6,7 @@
 [displayedColumns]="displayedColumns"
 [availableColumns]="availableColumns"
 [lockColumns]="lockColumns"
+[groupsLength]="groupsLength"
 (refresh)="onRefresh()"
 (intervalValueChange)="onIntervalValueChange($event)"
 (displayedColumnsChange)="onColumnsChange($event)"
diff --git a/src/app/components/table-index-actions-toolbar.component.ts b/src/app/components/table-index-actions-toolbar.component.ts
index 6da3e9a69..ca0ca12aa 100644
--- a/src/app/components/table-index-actions-toolbar.component.ts
+++ b/src/app/components/table-index-actions-toolbar.component.ts
@@ -27,6 +27,7 @@ export class TableIndexActionsToolbarComponent<T extends DataRaw, O extends Task
   @Input({ required: true }) displayedColumns: ColumnKey<T, O>[];
   @Input({ required: true }) availableColumns: ColumnKey<T, O>[];
   @Input({ required: true }) lockColumns = false;
+  @Input({ required: false }) groupsLength: number;
 
   @Output() refresh: EventEmitter<void> = new EventEmitter<void>();
   @Output() intervalValueChange: EventEmitter<number> = new EventEmitter<number>();
diff --git a/src/app/partitions/index.component.html b/src/app/partitions/index.component.html
index fc1baebeb..b6b63bde9 100644
--- a/src/app/partitions/index.component.html
+++ b/src/app/partitions/index.component.html
@@ -13,6 +13,7 @@
       [displayedColumns]="displayedColumnsKeys"
       [availableColumns]="availableColumns"
       [lockColumns]="lockColumns"
+      [groupsLength]="tableDataService.groupsConditions.length"
       (refresh)="refresh()"
       (intervalValueChange)="onIntervalValueChange($event)"
       (displayedColumnsChange)="onColumnsChange($event)"
diff --git a/src/app/results/index.component.html b/src/app/results/index.component.html
index a03a0be0f..39724c9de 100644
--- a/src/app/results/index.component.html
+++ b/src/app/results/index.component.html
@@ -13,6 +13,7 @@
       [displayedColumns]="displayedColumnsKeys"
       [availableColumns]="availableColumns"
       [lockColumns]="lockColumns"
+      [groupsLength]="tableDataService.groupsConditions.length"
       (refresh)="refresh()"
       (intervalValueChange)="onIntervalValueChange($event)"
       (displayedColumnsChange)="onColumnsChange($event)"
diff --git a/src/app/sessions/index.component.html b/src/app/sessions/index.component.html
index 3da2d3791..2ebc00385 100644
--- a/src/app/sessions/index.component.html
+++ b/src/app/sessions/index.component.html
@@ -13,6 +13,7 @@
       [displayedColumns]="displayedColumnsKeys"
       [availableColumns]="availableColumns"
       [lockColumns]="lockColumns"
+      [groupsLength]="tableDataService.groupsConditions.length"
       (refresh)="refresh()"
       (intervalValueChange)="onIntervalValueChange($event)"
       (displayedColumnsChange)="onColumnsChange($event)"
diff --git a/src/app/tasks/index.component.html b/src/app/tasks/index.component.html
index 9f8b4e7fa..c8605f5fe 100644
--- a/src/app/tasks/index.component.html
+++ b/src/app/tasks/index.component.html
@@ -13,6 +13,7 @@
       [displayedColumns]="displayedColumnsKeys"
       [availableColumns]="availableColumns"
       [lockColumns]="lockColumns"
+      [groupsLength]="tableDataService.groupsConditions.length"
       (refresh)="refresh()"
       (intervalValueChange)="onIntervalValueChange($event)"
       (displayedColumnsChange)="onColumnsChange($event)"

From 58a1e87b717454ef73ec207569a89c247ba0f3b3 Mon Sep 17 00:00:00 2001
From: faustin <fdewas@aneo.fr>
Date: Thu, 19 Jun 2025 16:22:06 +0200
Subject: [PATCH 47/47] fix: groups now overflow

---
 src/app/components/table/group/group-row/group.component.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/components/table/group/group-row/group.component.css b/src/app/components/table/group/group-row/group.component.css
index 1df703f2c..adc1d6779 100644
--- a/src/app/components/table/group/group-row/group.component.css
+++ b/src/app/components/table/group/group-row/group.component.css
@@ -55,4 +55,8 @@ mat-chip p, mat-chip mat-icon {
 
 p {
   margin: 0;
+}
+
+.table-container {
+  overflow: auto;
 }
\ No newline at end of file