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(); diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.ts b/src/app/datasets/datasets-filter/datasets-filter.component.ts index 5ba238175..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() { @@ -469,7 +473,13 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy { .open(SearchParametersDialogComponent, { data: { usedFields: usedFields, - parameterKeys: availableKeys, + parameterKeys: availableKeys.map( + (key) => + this.humanNameMap[key] || + this.titleCase.transform( + this.replaceUnderscore.transform(key), + ), + ), }, restoreFocus: false, })