Merge pull request #1203 from aneoconsulting/fix/column-sort-not-saving

fix: column sort not saving in storage
aneoconsulting · Aug 12, 2024 · 66f542f · 66f542f · github-actions · Aug 12, 2024
2 parents 31d3a63 + a72f0ea
commit 66f542f
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 24 deletions.
diff --git a/src/app/applications/components/table.component.spec.ts b/src/app/applications/components/table.component.spec.ts
@@ -61,7 +61,8 @@ describe('TasksTableComponent', () => {
     isSimpleColumn: jest.fn(),
     isNotSortableColumn: jest.fn(),
     columnToLabel: jest.fn(),
-    saveColumns: jest.fn()
+    saveColumns: jest.fn(),
+    saveOptions: jest.fn(),
   };
 
   const mockNotificationService = {
@@ -295,10 +296,17 @@ describe('TasksTableComponent', () => {
     });
   });
 
-  it('should refresh data on options changes', () => {
-    const spy = jest.spyOn(component.refresh$, 'next');
-    component.onOptionsChange();
-    expect(spy).toHaveBeenCalled();
+  describe('options changes', () => {
+    it('should refresh data', () => {
+      const spy = jest.spyOn(component.refresh$, 'next');
+      component.onOptionsChange();
+      expect(spy).toHaveBeenCalled();
+    });
+
+    it('should save options', () => {
+      component.onOptionsChange();
+      expect(mockApplicationsIndexService.saveOptions).toHaveBeenCalled();
+    });
   });
 
   test('onDrop should call ApplicationsIndexService', () => {

diff --git a/src/app/partitions/components/table.component.spec.ts b/src/app/partitions/components/table.component.spec.ts
@@ -53,7 +53,8 @@ describe('TasksTableComponent', () => {
     isSimpleColumn: jest.fn(),
     isNotSortableColumn: jest.fn(),
     columnToLabel: jest.fn(),
-    saveColumns: jest.fn()
+    saveColumns: jest.fn(),
+    saveOptions: jest.fn(),
   };
 
   const mockNotificationService = {
@@ -266,10 +267,17 @@ describe('TasksTableComponent', () => {
     });
   });
 
-  it('should refresh data on options changes', () => {
-    const spy = jest.spyOn(component.refresh$, 'next');
-    component.onOptionsChange();
-    expect(spy).toHaveBeenCalled();
+  describe('options changes', () => {
+    it('should refresh data', () => {
+      const spy = jest.spyOn(component.refresh$, 'next');
+      component.onOptionsChange();
+      expect(spy).toHaveBeenCalled();
+    });
+
+    it('should save options', () => {
+      component.onOptionsChange();
+      expect(mockPartitionsIndexService.saveOptions).toHaveBeenCalled();
+    });
   });
 
   test('onDrop should call PartitionsIndexService', () => {

diff --git a/src/app/results/components/table.component.spec.ts b/src/app/results/components/table.component.spec.ts
@@ -55,7 +55,8 @@ describe('TasksTableComponent', () => {
     isSimpleColumn: jest.fn(),
     isNotSortableColumn: jest.fn(),
     columnToLabel: jest.fn(),
-    saveColumns: jest.fn()
+    saveColumns: jest.fn(),
+    saveOptions: jest.fn(),
   };
 
   const mockNotificationService = {
@@ -196,10 +197,17 @@ describe('TasksTableComponent', () => {
     });
   });
 
-  it('should refresh data on options changes', () => {
-    const spy = jest.spyOn(component.refresh$, 'next');
-    component.onOptionsChange();
-    expect(spy).toHaveBeenCalled();
+  describe('options changes', () => {
+    it('should refresh data', () => {
+      const spy = jest.spyOn(component.refresh$, 'next');
+      component.onOptionsChange();
+      expect(spy).toHaveBeenCalled();
+    });
+
+    it('should save options', () => {
+      component.onOptionsChange();
+      expect(mockResultsIndexService.saveOptions).toHaveBeenCalled();
+    });
   });
 
   test('onDrop should call ResultsIndexService', () => {

diff --git a/src/app/sessions/components/table.component.spec.ts b/src/app/sessions/components/table.component.spec.ts
@@ -687,11 +687,18 @@ describe('SessionsTableComponent', () => {
       expect(component.data()).toEqual([]);
     });
   });
+
+  describe('options changes', () => {
+    it('should refresh data', () => {
+      const spy = jest.spyOn(component.refresh$, 'next');
+      component.onOptionsChange();
+      expect(spy).toHaveBeenCalled();
+    });
 
-  it('should refresh data on options changes', () => {
-    const spy = jest.spyOn(component.refresh$, 'next');
-    component.onOptionsChange();
-    expect(spy).toHaveBeenCalled();
+    it('should save options', () => {
+      component.onOptionsChange();
+      expect(mockSessionsIndexService.saveOptions).toHaveBeenCalled();
+    });
   });
 
   describe('on Pause', () => {

diff --git a/src/app/tasks/components/table.component.spec.ts b/src/app/tasks/components/table.component.spec.ts
@@ -57,7 +57,8 @@ describe('TasksTableComponent', () => {
     isSimpleColumn: jest.fn(),
     isNotSortableColumn: jest.fn(),
     columnToLabel: jest.fn(),
-    saveColumns: jest.fn()
+    saveColumns: jest.fn(),
+    saveOptions: jest.fn(),
   };
 
   const mockNotificationService = {
@@ -213,11 +214,18 @@ describe('TasksTableComponent', () => {
       expect(component.data()).toEqual([]);
     });
   });
+
+  describe('options changes', () => {
+    it('should refresh data', () => {
+      const spy = jest.spyOn(component.refresh$, 'next');
+      component.onOptionsChange();
+      expect(spy).toHaveBeenCalled();
+    });
 
-  it('should refresh data on options changes', () => {
-    const spy = jest.spyOn(component.refresh$, 'next');
-    component.onOptionsChange();
-    expect(spy).toHaveBeenCalled();
+    it('should save options', () => {
+      component.onOptionsChange();
+      expect(mockTasksIndexService.saveOptions).toHaveBeenCalled();
+    });
   });
 
   it('should check if the task is retried', () => {

diff --git a/src/app/types/components/table.ts b/src/app/types/components/table.ts
@@ -143,6 +143,7 @@ export abstract class AbstractTableComponent<T extends DataRaw, F extends Filter
   }
 
   onOptionsChange() {
+    this.indexService.saveOptions(this.options);
     this.refresh$.next();
   }
File	% Stmts	% Branch	% Funcs	% Lines
All files	99.97	100	99.91	100
applications	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
applications/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
applications/services	100	100	100	100
applications-filters.service.ts	100	100	100	100
applications-grpc.service.ts	100	100	100	100
applications-index.service.ts	100	100	100	100
components	100	100	100	100
actions-toolbar-group.component.ts	100	100	100	100
actions-toolbar.component.ts	100	100	100	100
auto-complete.component.html	100	100	100	100
auto-complete.component.ts	100	100	100	100
auto-refresh-button.component.html	100	100	100	100
auto-refresh-button.component.ts	100	100	100	100
auto-refresh-dialog.component.html	100	100	100	100
auto-refresh-dialog.component.ts	100	100	100	100
columns-button.component.ts	100	100	100	100
columns-modify-dialog.component.html	100	100	100	100
columns-modify-dialog.component.ts	100	100	100	100
count-tasks-by-status.component.ts	100	100	100	100
icon-picker-dialog.component.html	100	100	100	100
icon-picker-dialog.component.ts	100	100	100	100
inspect-list.component.html	100	100	100	100
inspect-list.component.ts	100	100	100	100
inspection-header.component.html	100	100	100	100
inspection-header.component.ts	100	100	100	100
inspection-toolbar.component.html	100	100	100	100
inspection-toolbar.component.ts	100	100	100	100
manage-custom-dialog.component.html	100	100	100	100
manage-custom-dialog.component.ts	100	100	100	100
page-header.component.html	100	100	100	100
page-header.component.ts	100	100	100	100
page-section-header.component.ts	100	100	100	100
page-section.component.ts	100	100	100	100
refresh-button.component.ts	100	100	100	100
share-url.component.ts	100	100	100	100
show-action-area.component.html	100	100	100	100
show-action-area.component.ts	100	100	100	100
show-actions.component.html	100	100	100	100
show-actions.component.ts	100	100	100	100
show-card-content.component.html	100	100	100	100
show-card-content.component.ts	100	100	100	100
show-card.component.html	100	100	100	100
show-card.component.ts	100	100	100	100
show-page.component.html	100	100	100	100
show-page.component.ts	100	100	100	100
spinner.component.ts	100	100	100	100
table-actions-toolbar.component.html	100	100	100	100
table-actions-toolbar.component.ts	100	100	100	100
table-container.component.ts	100	100	100	100
table-dashboard-actions-toolbar.component.html	100	100	100	100
table-dashboard-actions-toolbar.component.ts	100	100	100	100
table-index-actions-toolbar.component.html	100	100	100	100
table-index-actions-toolbar.component.ts	100	100	100	100
view-tasks-by-status.component.ts	100	100	100	100
components/filters	100	100	100	100
filters-chips.component.html	100	100	100	100
filters-chips.component.ts	100	100	100	100
filters-dialog-and.component.html	100	100	100	100
filters-dialog-and.component.ts	100	100	100	100
filters-dialog-filter-field.component.html	100	100	100	100
filters-dialog-filter-field.component.ts	100	100	100	100
filters-dialog-input.component.html	100	100	100	100
filters-dialog-input.component.ts	100	100	100	100
filters-dialog-or.component.html	100	100	100	100
filters-dialog-or.component.ts	100	100	100	100
filters-dialog.component.html	100	100	100	100
filters-dialog.component.ts	100	100	100	100
filters-toolbar.component.html	100	100	100	100
filters-toolbar.component.ts	100	100	100	100
components/inspection	100	100	100	100
field-content.component.html	100	100	100	100
field-content.component.ts	100	100	100	100
inspection-card.component.html	100	100	100	100
inspection-card.component.ts	100	100	100	100
inspection-list-grid.component.html	100	100	100	100
inspection-list-grid.component.ts	100	100	100	100
inspection-object.component.html	100	100	100	100
inspection-object.component.ts	100	100	100	100
inspection.component.html	100	100	100	100
inspection.component.ts	100	100	100	100
components/navigation	100	100	100	100
add-external-service-dialog.component.html	100	100	100	100
add-external-service-dialog.component.ts	100	100	100	100
change-language-button.component.html	100	100	100	100
change-language-button.component.ts	100	100	100	100
edit-external-service-dialog.component.html	100	100	100	100
edit-external-service-dialog.component.ts	100	100	100	100
external-services.component.html	100	100	100	100
external-services.component.ts	100	100	100	100
form-external-service.component.html	100	100	100	100
form-external-service.component.ts	100	100	100	100
manage-external-services-dialog.component.html	100	100	100	100
manage-external-services-dialog.component.ts	100	100	100	100
navigation.component.html	100	100	100	100
navigation.component.ts	100	100	100	100
theme-selector.component.html	100	100	100	100
theme-selector.component.ts	100	100	100	100
components/statuses	100	100	100	100
add-statuses-group-dialog.component.ts	100	100	100	100
edit-status-group-dialog.component.ts	100	100	100	100
form-statuses-group.component.html	100	100	100	100
form-statuses-group.component.ts	100	100	100	100
manage-groups-dialog.component.html	100	100	100	100
manage-groups-dialog.component.ts	100	100	100	100
components/table	100	100	100	100
table-actions.component.html	100	100	100	100
table-actions.component.ts	100	100	100	100
table-cell.component.html	100	100	100	100
table-cell.component.ts	100	100	100	100
table-column-header.component.html	100	100	100	100
table-column-header.component.ts	100	100	100	100
table-empty-data.component.ts	100	100	100	100
table-inspect-object-dialog.component.html	100	100	100	100
table-inspect-object-dialog.component.ts	100	100	100	100
table-inspect-object.component.html	100	100	100	100
table-inspect-object.component.ts	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
dashboard	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
dashboard/components	100	100	100	100
add-line-dialog.component.html	100	100	100	100
add-line-dialog.component.ts	100	100	100	100
edit-name-line-dialog.component.html	100	100	100	100
edit-name-line-dialog.component.ts	100	100	100	100
reorganize-lines-dialog.component.html	100	100	100	100
reorganize-lines-dialog.component.ts	100	100	100	100
split-lines-dialog.component.ts	100	100	100	100
statuses-group-card.component.html	100	100	100	100
statuses-group-card.component.ts	100	100	100	100
dashboard/components/lines	100	100	100	100
applications-line.component.html	100	100	100	100
applications-line.component.ts	100	100	100	100
partitions-line.component.html	100	100	100	100
partitions-line.component.ts	100	100	100	100
results-line.component.html	100	100	100	100
results-line.component.ts	100	100	100	100
sessions-line.component.html	100	100	100	100
sessions-line.component.ts	100	100	100	100
task-by-status-line.component.html	100	100	100	100
task-by-status-line.component.ts	100	100	100	100
tasks-line.component.html	100	100	100	100
tasks-line.component.ts	100	100	100	100
dashboard/services	100	100	100	100
dashboard-index.service.ts	100	100	100	100
dashboard-storage.service.ts	100	100	100	100
healthcheck	100	100	100	100
healthcheck.component.html	100	100	100	100
healthcheck.component.ts	100	100	100	100
healthcheck/services	100	100	100	100
healthcheck-grpc.service.ts	100	100	100	100
partitions	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.html	100	100	100	100
show.component.ts	100	100	100	100
partitions/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
partitions/services	100	100	100	100
partitions-filters.service.ts	100	100	100	100
partitions-grpc.service.ts	100	100	100	100
partitions-index.service.ts	100	100	100	100
partitions-inspection.service.ts	100	100	100	100
pipes	100	100	100	100
duration.pipe.ts	100	100	100	100
empty-cell.pipe.ts	100	100	100	100
pretty.pipe.ts	100	100	100	100
profile	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
types.ts	100	100	100	100
results	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.html	100	100	100	100
show.component.ts	100	100	100	100
results/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
results/services	100	100	100	100
results-filters.service.ts	100	100	100	100
results-grpc.service.ts	100	100	100	100
results-index.service.ts	100	100	100	100
results-inspection.service.ts	100	100	100	100
results-statuses.service.ts	100	100	100	100
services	100	100	100	100
auto-refresh.service.ts	100	100	100	100
cache.service.ts	100	100	100	100
default-config.service.ts	100	100	100	100
environment.service.ts	100	100	100	100
filters.service.ts	100	100	100	100
grpc-build-request.service.ts	100	100	100	100
grpc-sort-field.service.ts	100	100	100	100
icons.service.ts	100	100	100	100
navigation.service.ts	100	100	100	100
notification.service.ts	100	100	100	100
query-params.service.ts	100	100	100	100
share-url.service.ts	100	100	100	100
storage.service.ts	100	100	100	100
table-storage.service.ts	100	100	100	100
table-url.service.ts	100	100	100	100
table.service.ts	100	100	100	100
tasks-by-status.service.ts	100	100	100	100
user-grpc.service.ts	100	100	100	100
user.service.ts	100	100	100	100
utils.service.ts	100	100	100	100
versions-grpc.service.ts	100	100	100	100
versions.service.ts	100	100	100	100
sessions	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.html	100	100	100	100
show.component.ts	100	100	100	100
sessions/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
sessions/services	100	100	100	100
sessions-filters.service.ts	100	100	100	100
sessions-grpc.service.ts	100	100	100	100
sessions-index.service.ts	100	100	100	100
sessions-inspection.service.ts	100	100	100	100
sessions-statuses.service.ts	100	100	100	100
tasks	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.html	100	100	100	100
show.component.ts	100	100	100	100
tasks/components	100	100	100	100
manage-view-in-logs-dialog.component.html	100	100	100	100
manage-view-in-logs-dialog.component.ts	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
tasks/services	100	100	100	100
tasks-filters.service.ts	100	100	100	100
tasks-grpc.service.ts	100	100	100	100
tasks-index.service.ts	100	100	100	100
tasks-inspection.service.ts	100	100	100	100
tasks-statuses.service.ts	100	100	100	100
tokens	100	100	100	100
filters.token.ts	100	100	100	100
types	100	100	100	100
navigation.ts	100	100	100	100
types/components	99.71	100	99.13	100
dashboard-line-table.ts	100	100	100	100
index.ts	99.15	100	97.29	100
show.ts	100	100	100	100
table.ts	100	100	100	100
types/services	100	100	100	100
grpcService.ts	100	100	100	100
inspectionService.ts	100	100	100	100