From 1b7c99c07f995763a3b57c1e583b7c7ff02f7cfd Mon Sep 17 00:00:00 2001 From: Max Novelli Date: Wed, 20 Aug 2025 16:22:13 +0200 Subject: [PATCH 1/5] Remove custom code for run number column in dataset list --- .../dataset-table/dataset-table.component.ts | 14 +++++++------- .../table/dynamic-mat-table.component.ts | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts index 23efb288d..4bb6e5d38 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.ts @@ -404,13 +404,13 @@ export class DatasetTableComponent implements OnInit, OnDestroy { type: column.type as any, }; - if (column.name === "runNumber" && column.type !== "custom") { - // NOTE: This is for the saved columns in the database or the old config. - convertedColumn.customRender = (c, row) => - lodashGet(row, "scientificMetadata.runNumber.value"); - convertedColumn.toExport = (row) => - lodashGet(row, "scientificMetadata.runNumber.value"); - } + // if (column.name === "runNumber" && column.type !== "custom") { + // // NOTE: This is for the saved columns in the database or the old config. + // convertedColumn.customRender = (c, row) => + // lodashGet(row, "scientificMetadata.runNumber.value"); + // convertedColumn.toExport = (row) => + // lodashGet(row, "scientificMetadata.runNumber.value"); + // } // NOTE: This is how we render the custom columns if new config is used. if (column.type === "custom") { convertedColumn.customRender = (c, row) => diff --git a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts index e9c30d689..66417b63c 100644 --- a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts +++ b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts @@ -512,10 +512,16 @@ export class DynamicMatTableComponent } columnName(row: any, column: TableField) { + console.log("------"); + console.log(row); + console.log(column); if (column.customRender) { + console.log("Custom"); + console.log(column.customRender(column, row)); return column.customRender(column, row); } - + console.log("standard"); + console.log(row[column.name]); return row[column.name]; } From 86c60803fd36201625bedcb245994d57618e022d Mon Sep 17 00:00:00 2001 From: Max Novelli Date: Mon, 8 Sep 2025 15:44:28 +0200 Subject: [PATCH 2/5] fixed linting --- .../dataset-table/dataset-table.component.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts index 4bb6e5d38..b63eb8846 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.ts @@ -9,7 +9,14 @@ import { } from "@angular/core"; import { TableColumn } from "state-management/models"; import { MatCheckboxChange } from "@angular/material/checkbox"; -import { BehaviorSubject, Subscription, forkJoin, lastValueFrom, map, take } from "rxjs"; +import { + BehaviorSubject, + Subscription, + forkJoin, + lastValueFrom, + map, + take, +} from "rxjs"; import { Store } from "@ngrx/store"; import { clearSelectionAction, @@ -156,7 +163,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy { private fileSize: FileSizePipe, private titleCase: TitleCasePipe, private tableConfigService: TableConfigService, - private translateService: TranslateService, + private translateService: TranslateService, ) { this.translateService.use("dataset"); } @@ -217,9 +224,9 @@ export class DatasetTableComponent implements OnInit, OnDestroy { map((translated) => ({ ...i, header: translated, - }) - )) - ) + })), + ), + ), ); translated$.subscribe((result) => { From 7c8f1243a6358fc9cd280d793b88b3125a829028 Mon Sep 17 00:00:00 2001 From: Max Novelli Date: Tue, 30 Sep 2025 08:45:12 +0200 Subject: [PATCH 3/5] Removed unnecessary comments and logs --- src/app/datasets/dataset-table/dataset-table.component.ts | 7 ------- .../table/dynamic-mat-table.component.ts | 7 ------- 2 files changed, 14 deletions(-) diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts index 02068d78a..7d068aa80 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.ts @@ -394,13 +394,6 @@ export class DatasetTableComponent implements OnInit, OnDestroy { tooltip: column.tooltip, }; - // if (column.name === "runNumber" && column.type !== "custom") { - // // NOTE: This is for the saved columns in the database or the old config. - // convertedColumn.customRender = (c, row) => - // lodashGet(row, "scientificMetadata.runNumber.value"); - // convertedColumn.toExport = (row) => - // lodashGet(row, "scientificMetadata.runNumber.value"); - // } // NOTE: This is how we render the custom columns if new config is used. if (column.type === "custom") { convertedColumn.customRender = (c, row) => diff --git a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts index 6114d163e..2ec50d6de 100644 --- a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts +++ b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts @@ -550,16 +550,9 @@ export class DynamicMatTableComponent } columnName(row: any, column: TableField) { - console.log("------"); - console.log(row); - console.log(column); if (column.customRender) { - console.log("Custom"); - console.log(column.customRender(column, row)); return column.customRender(column, row); } - console.log("standard"); - console.log(row[column.name]); return row[column.name]; } From cfc6778a8354dc3775e6d2a1eddce36ac5a40049 Mon Sep 17 00:00:00 2001 From: Max Novelli Date: Tue, 30 Sep 2025 09:13:23 +0200 Subject: [PATCH 4/5] removed all refernces to scientific metadata runNumber --- src/app/datasets/dataset-table/dataset-table.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts index 7d068aa80..0ddcc7de2 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.ts @@ -279,9 +279,6 @@ export class DatasetTableComponent implements OnInit, OnDestroy { const { active, direction } = sender as Sort; let column = active; - if (column === "runNumber") { - column = "scientificMetadata.runNumber.value"; - } this.store.dispatch(sortByColumnAction({ column, direction })); } @@ -375,7 +372,6 @@ export class DatasetTableComponent implements OnInit, OnDestroy { onSortChange(event: SortChangeEvent): void { const { active, direction } = event; let column = active.split("_")[1]; - if (column === "runNumber") column = "scientificMetadata.runNumber.value"; this.store.dispatch(sortByColumnAction({ column, direction })); } From e4e2fba0b9c35aab1a6b6afae825ed32f802059d Mon Sep 17 00:00:00 2001 From: Max Novelli Date: Tue, 30 Sep 2025 10:11:25 +0200 Subject: [PATCH 5/5] Fixed linting --- .../dataset-table/dataset-table.component.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts index 0ddcc7de2..a1c1b2545 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.ts @@ -9,14 +9,7 @@ import { } from "@angular/core"; import { TableColumn } from "state-management/models"; import { MatCheckboxChange } from "@angular/material/checkbox"; -import { - BehaviorSubject, - Subscription, - forkJoin, - lastValueFrom, - map, - take, -} from "rxjs"; +import { BehaviorSubject, Subscription, lastValueFrom, take } from "rxjs"; import { Store } from "@ngrx/store"; import { clearSelectionAction, @@ -278,7 +271,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy { if (event === TableEventType.SortChanged) { const { active, direction } = sender as Sort; - let column = active; + const column = active; this.store.dispatch(sortByColumnAction({ column, direction })); } @@ -371,7 +364,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy { onSortChange(event: SortChangeEvent): void { const { active, direction } = event; - let column = active.split("_")[1]; + const column = active.split("_")[1]; this.store.dispatch(sortByColumnAction({ column, direction })); }