From ade30c1d1eb3eaaa96ac59a4d002ea17b6014ea9 Mon Sep 17 00:00:00 2001 From: Abdi Abdulle Date: Wed, 8 Oct 2025 13:47:00 +0200 Subject: [PATCH 1/4] keys are now human readable when adding conditions --- src/app/datasets/datasets-filter/datasets-filter.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.ts b/src/app/datasets/datasets-filter/datasets-filter.component.ts index 5ba238175..947a6853d 100644 --- a/src/app/datasets/datasets-filter/datasets-filter.component.ts +++ b/src/app/datasets/datasets-filter/datasets-filter.component.ts @@ -469,7 +469,7 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy { .open(SearchParametersDialogComponent, { data: { usedFields: usedFields, - parameterKeys: availableKeys, + parameterKeys: availableKeys.map((key) => this.humanNameMap[key] || key), }, restoreFocus: false, }) From 594d0eda20f179faf42da1254b06f2a2ae6a33fb Mon Sep 17 00:00:00 2001 From: Abdi Abdulle Date: Wed, 8 Oct 2025 14:21:00 +0200 Subject: [PATCH 2/4] eslint fix --- src/app/datasets/datasets-filter/datasets-filter.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.ts b/src/app/datasets/datasets-filter/datasets-filter.component.ts index 947a6853d..2df75218d 100644 --- a/src/app/datasets/datasets-filter/datasets-filter.component.ts +++ b/src/app/datasets/datasets-filter/datasets-filter.component.ts @@ -469,7 +469,9 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy { .open(SearchParametersDialogComponent, { data: { usedFields: usedFields, - parameterKeys: availableKeys.map((key) => this.humanNameMap[key] || key), + parameterKeys: availableKeys.map( + (key) => this.humanNameMap[key] || key, + ), }, restoreFocus: false, }) From fdd2946aef5f6055772ba8956ee5763ecb69895b Mon Sep 17 00:00:00 2001 From: Abdi Abdulle Date: Wed, 15 Oct 2025 14:25:30 +0200 Subject: [PATCH 3/4] added transformation if human name is not available --- .../datasets-filter/datasets-filter.component.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.ts b/src/app/datasets/datasets-filter/datasets-filter.component.ts index 2df75218d..af1005893 100644 --- a/src/app/datasets/datasets-filter/datasets-filter.component.ts +++ b/src/app/datasets/datasets-filter/datasets-filter.component.ts @@ -55,6 +55,8 @@ import { ActivatedRoute, Router } from "@angular/router"; import { MultiSelectFilterValue } from "shared/modules/filters/multiselect-filter.component"; import { INumericRange } from "shared/modules/numeric-range/form/model/numeric-range-field.model"; import { UnitsOptionsService } from "shared/services/units-options.service"; +import { TitleCasePipe } from "@angular/common"; +import { ReplaceUnderscorePipe } from "shared/pipes/replace-underscore.pipe"; @Component({ selector: "datasets-filter", @@ -98,6 +100,8 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private router: Router, private unitsOptionsService: UnitsOptionsService, + private titleCase: TitleCasePipe, + private replaceUnderscore: ReplaceUnderscorePipe, ) {} ngOnInit() { @@ -470,7 +474,11 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy { data: { usedFields: usedFields, parameterKeys: availableKeys.map( - (key) => this.humanNameMap[key] || key, + (key) => + this.humanNameMap[key] || + this.titleCase.transform( + this.replaceUnderscore.transform(key), + ), ), }, restoreFocus: false, From e0b7fe5fe6b5299cc14f189f5722ca69f050f20e Mon Sep 17 00:00:00 2001 From: Abdi Abdulle Date: Wed, 15 Oct 2025 14:47:46 +0200 Subject: [PATCH 4/4] fixed cypress tests --- cypress/e2e/datasets/datasets-general.cy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/datasets/datasets-general.cy.js b/cypress/e2e/datasets/datasets-general.cy.js index 93cc83a39..e371263b3 100644 --- a/cypress/e2e/datasets/datasets-general.cy.js +++ b/cypress/e2e/datasets/datasets-general.cy.js @@ -101,7 +101,7 @@ describe("Datasets general", () => { }); }); - describe("Dataset page filter and scientific condition UI test", () => { + describe.only("Dataset page filter and scientific condition UI test", () => { beforeEach(() => { cy.createDataset({ type: "raw", @@ -128,7 +128,7 @@ describe("Datasets general", () => { cy.get('[data-cy="add-condition-button"]').click(); }); - cy.get('input[name="lhs"]').type("extra_entry_end_time"); + cy.get('input[name="lhs"]').type("Extra Entry End Time"); cy.get("mat-dialog-container").find('button[type="submit"]').click(); @@ -152,7 +152,7 @@ describe("Datasets general", () => { cy.get('[data-cy="add-condition-button"]').click(); }); - cy.get('input[name="lhs"]').type("extra_entry_end_time"); + cy.get('input[name="lhs"]').type("Extra Entry End Time"); cy.get("mat-dialog-container").find('button[type="submit"]').click(); @@ -177,7 +177,7 @@ describe("Datasets general", () => { cy.get('[data-cy="add-condition-button"]').click(); }); - cy.get('input[name="lhs"]').type("extra_entry_end_time"); + cy.get('input[name="lhs"]').type("Extra Entry End Time"); cy.get("mat-dialog-container").find('button[type="submit"]').click();