Merge pull request #978 from aneoconsulting/fix/table-with-less-data

fix: table with less data
aneoconsulting · Mar 20, 2024 · 84c2db2 · 84c2db2 · github-actions · Mar 20, 2024
2 parents f679951 + 88f0ee4
commit 84c2db2
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 88 deletions.
diff --git a/src/app/applications/components/table.component.ts b/src/app/applications/components/table.component.ts
@@ -131,21 +131,27 @@ export class ApplicationsTableComponent implements OnInit, AfterViewInit {
   }
 
   @Input({ required: true }) set data(entries: ApplicationRaw[]) {
-    entries.forEach((entry, index) => {
-      const application = this._data[index];
-      if (application && application.raw.name === entry.name && application.raw.version === entry.version) {
-        this._data[index].value$?.next(entry);
-      } else {
-        const lineData: ApplicationData = {
-          raw: entry,
-          queryTasksParams: this.createTasksByStatusQueryParams(entry.name, entry.version),
-          filters: this.countTasksByStatusFilters(entry.name, entry.version),
-          value$: new Subject<ApplicationRaw>()
-        };
-        this._data.splice(index, 1, lineData);
-      }
-    });
-    this.dataSource.data = this._data;
+    if (entries.length !== 0) {
+      this._data = this.data.filter(d => entries.find(entry => entry.name === d.raw.namespace && entry.version === d.raw.version));
+      entries.forEach((entry, index) => {
+        const application = this._data[index];
+        if (application && application.raw.name === entry.name && application.raw.version === entry.version) {
+          this._data[index].value$?.next(entry);
+        } else {
+          const lineData: ApplicationData = {
+            raw: entry,
+            queryTasksParams: this.createTasksByStatusQueryParams(entry.name, entry.version),
+            filters: this.countTasksByStatusFilters(entry.name, entry.version),
+            value$: new Subject<ApplicationRaw>()
+          };
+          this._data.splice(index, 1, lineData);
+        }
+      });
+      this.dataSource.data = this._data;
+    } else {
+      this._data = [];
+      this.dataSource.data = this._data;
+    }
   }
 
   @Output() optionsChange = new EventEmitter<never>();

diff --git a/src/app/partitions/components/table.component.ts b/src/app/partitions/components/table.component.ts
@@ -83,21 +83,27 @@ export class PartitionsTableComponent implements OnInit, AfterViewInit {
   }
 
   @Input({ required: true }) set data(entries: PartitionRaw[]) {
-    entries.forEach((entry, index) => {
-      const partition = this._data[index];
-      if (partition && partition.raw.id === entry.id) {
-        this._data[index].value$?.next(entry);
-      } else {
-        const lineData: PartitionData = {
-          raw: entry,
-          queryTasksParams: this.createTasksByStatusQueryParams(entry.id),
-          filters: this.countTasksByStatusFilters(entry.id),
-          value$: new Subject<PartitionRaw>()
-        };
-        this._data.splice(index, 1, lineData);
-      }
-    });
-    this.dataSource.data = this._data;
+    if (entries.length !== 0) {
+      this._data = this.data.filter(d => entries.find(entry => entry.id === d.raw.id));
+      entries.forEach((entry, index) => {
+        const partition = this._data[index];
+        if (partition && partition.raw.id === entry.id) {
+          this._data[index].value$?.next(entry);
+        } else {
+          const lineData: PartitionData = {
+            raw: entry,
+            queryTasksParams: this.createTasksByStatusQueryParams(entry.id),
+            filters: this.countTasksByStatusFilters(entry.id),
+            value$: new Subject<PartitionRaw>()
+          };
+          this._data.splice(index, 1, lineData);
+        }
+      });
+      this.dataSource.data = this._data;
+    } else {
+      this._data = [];
+      this.dataSource.data = this._data;
+    }
   }
 
   @Output() optionsChange = new EventEmitter<never>();

diff --git a/src/app/results/components/table.component.ts b/src/app/results/components/table.component.ts
@@ -71,19 +71,25 @@ export class ResultsTableComponent implements AfterViewInit {
   private _data: ResultData[] = [];
 
   @Input({required: true}) set data(entries: ResultRaw[]) {
-    entries.forEach((entry, index) => {
-      const result = this._data[index];
-      if (result && result.raw.resultId === entry.resultId) {
-        this._data[index].value$?.next(entry);
-      } else {
-        const lineData: ResultData = {
-          raw: entry,
-          value$: new Subject<ResultRaw>(),
-        };
-        this._data.splice(index, 1, lineData);
-      }
-    });
-    this.dataSource.data = this._data;
+    if (entries.length !== 0) {
+      this._data = this.data.filter(d => entries.find(entry => entry.resultId === d.raw.resultId));
+      entries.forEach((entry, index) => {
+        const result = this._data[index];
+        if (result && result.raw.resultId === entry.resultId) {
+          this._data[index].value$?.next(entry);
+        } else {
+          const lineData: ResultData = {
+            raw: entry,
+            value$: new Subject<ResultRaw>(),
+          };
+          this._data.splice(index, 1, lineData);
+        }
+      });
+      this.dataSource.data = this._data;
+    } else {
+      this._data = [];
+      this.dataSource.data = this._data;
+    }
   }
 
   get data(): ResultData[] {

diff --git a/src/app/sessions/components/table.component.ts b/src/app/sessions/components/table.component.ts
@@ -187,38 +187,34 @@ export class ApplicationsTableComponent implements OnInit, AfterViewInit {
     });
 
     this.data$.subscribe(entries => {
-      entries.forEach((entry, index) => {
-        const session = this._data[index];
-        if (session && session.raw.sessionId === entry.sessionId) {
-          session.raw = entry;
-          this._data.splice(index, 1, session);
-          this._data[index].value$.next(entry);
-        } else {
-          const queryParams = new Map<ColumnKey<SessionRaw>, Params>();
-          queryParams.set('sessionId', { '0-root-1-0': entry.sessionId }); 
-          const session: SessionData = {
-            raw: entry,
-            queryParams,
-            queryTasksParams: this.createTasksByStatusQueryParams(entry.sessionId),
-            resultsQueryParams: {...this.createResultsQueryParams(entry.sessionId)},
-            filters: this.countTasksByStatusFilters(entry.sessionId),
-            value$: new Subject<SessionRaw>(),
-          };
-          this._data.splice(index, 1, session);
-        }
-      });
-      this.dataSource.data = this._data;
-    });
-  }
-
-  hasDifference(first: SessionRaw, second: SessionRaw): boolean{
-    const keys = Object.keys(first);
-    for(const key of keys) {
-      if (JSON.stringify(first[key as keyof SessionRaw]) !== JSON.stringify(second[key as keyof SessionRaw])) {
-        return true;
+      if (entries.length !== 0) {
+        this._data = this.data.filter(d => entries.find(entry => entry.sessionId === d.raw.sessionId));
+        entries.forEach((entry, index) => {
+          const session = this._data[index];
+          if (session && session.raw.sessionId === entry.sessionId) {
+            session.raw = entry;
+            this._data.splice(index, 1, session);
+            this._data[index].value$.next(entry);
+          } else {
+            const queryParams = new Map<ColumnKey<SessionRaw>, Params>();
+            queryParams.set('sessionId', { '0-root-1-0': entry.sessionId }); 
+            const session: SessionData = {
+              raw: entry,
+              queryParams,
+              queryTasksParams: this.createTasksByStatusQueryParams(entry.sessionId),
+              resultsQueryParams: {...this.createResultsQueryParams(entry.sessionId)},
+              filters: this.countTasksByStatusFilters(entry.sessionId),
+              value$: new Subject<SessionRaw>(),
+            };
+            this._data.splice(index, 1, session);
+          }
+        });
+        this.dataSource.data = this._data;
+      } else {
+        this._data = [];
+        this.dataSource.data = this._data;
       }
-    }
-    return false;
+    });
   }
 
   getIcon(name: string): string {

diff --git a/src/app/tasks/components/table.component.ts b/src/app/tasks/components/table.component.ts
@@ -98,20 +98,26 @@ export class TasksTableComponent implements AfterViewInit {
   }
 
   @Input({required: true}) set data(entries: TaskSummary[]) {
-    entries.forEach((entry, index) => {
-      const task = this._data[index];
-      if (task && task.raw.id === entry.id) {
-        this._data[index].value$?.next(entry);
-      } else {
-        const lineData: TaskData = {
-          raw: entry,
-          resultsQueryParams: this.createResultsQueryParams(entry.id),
-          value$: new Subject<TaskSummary>(),
-        };
-        this._data.splice(index, 1, lineData);
-      }
-    });
-    this.dataSource.data = this._data;
+    if (entries.length !== 0) {
+      this._data = this.data.filter(d => entries.find(entry => entry.id === d.raw.id));
+      entries.forEach((entry, index) => {
+        const task = this._data[index];
+        if (task && task.raw.id === entry.id) {
+          this._data[index].value$?.next(entry);
+        } else {
+          const lineData: TaskData = {
+            raw: entry,
+            resultsQueryParams: this.createResultsQueryParams(entry.id),
+            value$: new Subject<TaskSummary>(),
+          };
+          this._data.splice(index, 1, lineData);
+        }
+      });
+      this.dataSource.data = this._data;
+    } else {
+      this._data = [];
+      this.dataSource.data = this._data;
+    }
   }
 
   get columnKeys() {
File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
All files	88.54	70.77	80.22	89.4
applications	100	100	100	100
index.component.ts	100	100	100	100
applications/components	80.37	62.5	66.66	84.84
table.component.ts	80.37	62.5	66.66	84.84	126–153, 248, 262
applications/services	87.5	77.77	76.19	88.23
applications-filters.service.ts	79.16	100	62.5	81.81	75–81
applications-grpc.service.ts	92	71.42	100	91.66	76–82
applications-index.service.ts	91.3	66.66	80	90.9	70–74
components	96.05	92.42	91.59	96.35
actions-toolbar-group.component.ts	100	100	100	100
actions-toolbar.component.ts	100	100	100	100
auto-refresh-button.component.html	100	100	100	100
auto-refresh-button.component.ts	100	60	100	100	36, 59
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	94.59	90	89.47	100	50
count-tasks-by-status.component.ts	100	50	100	100	56
page-header.component.html	100	100	100	100
page-header.component.ts	80	100	0	80	33
page-section-header.component.ts	80	100	0	80	31
page-section.component.ts	100	100	100	100
refresh-button.component.ts	100	100	100	100
share-url.component.ts	92.85	100	75	92.3	37
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.ts	75	100	0	75	37–38
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
view-tasks-by-status-dialog.component.html	100	100	100	100
view-tasks-by-status-dialog.component.ts	100	100	100	100
view-tasks-by-status.component.ts	73.52	0	60	72.72	59, 88–106
components/filters	94.21	87.4	93.58	94.24
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	92.94	87.5	97.29	92.36	104, 114, 124, 136–139, 147, 192–194, 201, 334
filters-dialog-input.component.html	100	100	100	100
filters-dialog-input.component.ts	82	78.78	71.42	83.33	57, 85–86, 142–151
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/navigation	99.11	97.05	95.83	99.07
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	97.29	100	90	96.96	57
edit-external-service-dialog.component.html	100	100	100	100
edit-external-service-dialog.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	98.18	93.33	88.88	98.14	113
theme-selector.component.html	100	100	100	100
theme-selector.component.ts	100	100	100	100
components/table	80.2	68.75	65.38	80
table-actions.component.html	100	100	100	100
table-actions.component.ts	87.5	100	0	87.5	29
table-cell.component.html	100	100	100	100
table-cell.component.ts	90.74	84.61	89.47	90.74	91, 105, 115–119
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	41.66	100	0	41.66	26–40
table-inspect-object.component.html	100	100	100	100
table-inspect-object.component.ts	60	0	0	60	31–50
dashboard	89.01	35.71	93.33	88.88
index.component.html	100	100	100	100
index.component.ts	88.88	35.71	93.33	88.76	166–180, 193, 231
dashboard/components	99.2	100	98.57	99.19
add-line-dialog.component.ts	100	100	100	100
add-statuses-group-dialog.component.ts	100	100	100	100
edit-name-line-dialog.component.ts	100	100	100	100
edit-status-group-dialog.component.ts	100	100	100	100
form-name-line.component.html	100	100	100	100
form-name-line.component.ts	95.65	100	83.33	95.65	86
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
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	97.91	100	100	97.72	138
dashboard/components/lines	98.01	88.88	95.74	97.96
applications-line.component.html	100	100	100	100
applications-line.component.ts	97.43	90.9	96.29	97.36	138–140
task-by-status-line.component.html	100	100	100	100
task-by-status-line.component.ts	98.79	85.71	95	98.76	210
dashboard/services	100	100	100	100
dashboard-index.service.ts	100	100	100	100
dashboard-storage.service.ts	100	100	100	100
directives	50	100	0	50
no-wrap.directive.ts	50	100	0	50	5–6
healthcheck	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
healthcheck/services	100	100	100	100
healthcheck-grpc.service.ts	100	100	100	100
healthcheck-index.service.ts	100	100	100	100
partitions/components	79.78	50	68.18	82.95
table.component.html	100	100	100	100
table.component.ts	79.56	50	68.18	82.75	78–105, 179, 211
partitions/services	21.73	0	0	18.18
partitions-index.service.ts	21.73	0	0	18.18	11–120
pipes	25	0	0	18.18
duration.pipe.ts	16.66	0	0	11.76	7–27
empty-cell.pipe.ts	50	0	0	40	6–10
results/components	74.24	0	50	78.68
table.component.html	100	100	100	100
table.component.ts	73.84	0	50	78.33	74–96, 111
results/services	34.48	0	8.33	29.62
results-index.service.ts	21.73	0	0	18.18	10–117
results-statuses.service.ts	83.33	100	50	80	16
services	93.48	77.53	86.79	93.53
auto-refresh.service.ts	100	100	100	100
default-config.service.ts	100	50	100	100	193
environment.service.ts	80	100	50	75	19
filters.service.ts	50	0	37.5	52	77–93
grpc-build-request.service.ts	64.28	8.33	16.66	64.28	26, 39, 49, 59, 69
icons.service.ts	100	100	100	100
navigation.service.ts	100	80	100	100	116
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	98.03	100	100	97.95	95
table-storage.service.ts	50	0	0	42.85	11–31
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	97.56	94.11	100	97.43	119
versions-grpc.service.ts	100	100	100	100
versions.service.ts	100	70	100	100	14, 25, 32
sessions/components	81.57	65.62	61.53	87.68
table.component.html	100	100	100	100
table.component.ts	81.45	65.62	61.53	87.59	92, 153–159, 195–197, 214–215, 288–298, 320
sessions/services	46.37	21.42	25.92	45.31
sessions-filters.service.ts	66.66	50	60	70	168–186
sessions-index.service.ts	17.85	0	0	14.81	11–218
sessions-statuses.service.ts	62.5	100	25	57.14	18–26
tasks/components	76.86	44.11	55.88	82.25
table.component.html	100	100	100	100
table.component.ts	76.69	44.11	55.88	82.11	106, 118–124, 173–185, 214–236, 249
tasks/services	60.95	26	60	60.6
tasks-filters.service.ts	69.69	83.33	60	73.33	207–220
tasks-grpc.service.ts	21.21	0	0	18.75	13–155
tasks-index.service.ts	87.09	80	80	86.66	229, 295–300
tasks-statuses.service.ts	87.5	0	75	85.71	41
tokens	100	100	100	100
filters.token.ts	100	100	100	100
types	100	100	100	100
filter-definition.ts	100	100	100	100