From 6899e00ec9332aa4d71501a6dd9b5738b5d13a0b Mon Sep 17 00:00:00 2001 From: martintrajanovski Date: Thu, 5 Jun 2025 11:22:59 +0200 Subject: [PATCH 1/2] fix: use titlecase for better dataset table headers representation --- .../datasets/dataset-table/dataset-table.component.spec.ts | 2 ++ src/app/datasets/dataset-table/dataset-table.component.ts | 6 ++++++ src/app/datasets/datasets.module.ts | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/app/datasets/dataset-table/dataset-table.component.spec.ts b/src/app/datasets/dataset-table/dataset-table.component.spec.ts index 9ba1e6c04..1740b716f 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.spec.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.spec.ts @@ -48,6 +48,7 @@ import { ActivatedRoute } from "@angular/router"; import { JsonHeadPipe } from "shared/pipes/json-head.pipe"; import { DatePipe } from "@angular/common"; import { FileSizePipe } from "shared/pipes/filesize.pipe"; +import { TitleCasePipe } from "shared/pipes/title-case.pipe"; const getConfig = () => ({}); @@ -78,6 +79,7 @@ describe("DatasetTableComponent", () => { JsonHeadPipe, DatePipe, FileSizePipe, + TitleCasePipe, ], declarations: [DatasetTableComponent], }); diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts index 6d7a7081c..ddd2919a3 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.ts @@ -58,6 +58,7 @@ import { ActivatedRoute } from "@angular/router"; import { JsonHeadPipe } from "shared/pipes/json-head.pipe"; import { DatePipe } from "@angular/common"; import { FileSizePipe } from "shared/pipes/filesize.pipe"; +import { TitleCasePipe } from "shared/pipes/title-case.pipe"; import { actionMenu } from "shared/modules/dynamic-material-table/utilizes/default-table-settings"; import { TableConfigService } from "shared/services/table-config.service"; export interface SortChangeEvent { @@ -145,6 +146,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy { private jsonHeadPipe: JsonHeadPipe, private datePipe: DatePipe, private fileSize: FileSizePipe, + private titleCase: TitleCasePipe, private tableConfigService: TableConfigService, ) {} @@ -353,6 +355,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy { } convertSavedColumns(columns: TableColumn[]): TableField[] { + console.log(columns); return columns .filter((column) => column.name !== "select") .map((column) => { @@ -461,6 +464,9 @@ export class DatasetTableComponent implements OnInit, OnDestroy { convertedColumn.renderImage = true; } + convertedColumn.header = + column.header || this.titleCase.transform(column.name); + return convertedColumn; }); } diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts index b350c0fcb..c705e4ed5 100644 --- a/src/app/datasets/datasets.module.ts +++ b/src/app/datasets/datasets.module.ts @@ -86,6 +86,8 @@ import { DatasetDetailDynamicComponent } from "./dataset-detail/dataset-detail-d import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-wrapper.component"; import { JsonHeadPipe } from "shared/pipes/json-head.pipe"; import { ThumbnailPipe } from "shared/pipes/thumbnail.pipe"; +import { TitleCasePipe } from "shared/pipes/title-case.pipe"; + @NgModule({ imports: [ CommonModule, @@ -183,6 +185,7 @@ import { ThumbnailPipe } from "shared/pipes/thumbnail.pipe"; ADAuthService, SharedScicatFrontendModule, FileSizePipe, + TitleCasePipe, ], exports: [ DashboardComponent, From a7fc68c1e37478b76b06f20a9af6321f295cff30 Mon Sep 17 00:00:00 2001 From: martintrajanovski Date: Thu, 5 Jun 2025 11:27:40 +0200 Subject: [PATCH 2/2] remove console.log --- src/app/datasets/dataset-table/dataset-table.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts index ddd2919a3..498888262 100644 --- a/src/app/datasets/dataset-table/dataset-table.component.ts +++ b/src/app/datasets/dataset-table/dataset-table.component.ts @@ -355,7 +355,6 @@ export class DatasetTableComponent implements OnInit, OnDestroy { } convertSavedColumns(columns: TableColumn[]): TableField[] { - console.log(columns); return columns .filter((column) => column.name !== "select") .map((column) => {