Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
cfaf31a
chore(deps): bump ajv from 8.18.0 to 8.20.0
dependabot[bot] Apr 27, 2026
e80f053
Merge branch 'master' into dependabot/npm_and_yarn/ajv-8.20.0
nitrosx Apr 28, 2026
098ff53
chore(deps): bump ajv from 8.18.0 to 8.20.0 (#2355)
github-actions[bot] Apr 28, 2026
9668bd1
chore(deps-dev): bump baseline-browser-mapping from 2.10.21 to 2.10.23
dependabot[bot] Apr 28, 2026
7bc0931
chore(deps-dev): bump baseline-browser-mapping from 2.10.21 to 2.10.2…
github-actions[bot] Apr 28, 2026
31a37cf
chore(deps): bump filesize from 11.0.16 to 11.0.17
dependabot[bot] Apr 28, 2026
baed81f
chore(deps): bump filesize from 11.0.16 to 11.0.17 (#2356)
github-actions[bot] Apr 28, 2026
6bd2d3a
chore(deps-dev): bump the angular group with 3 updates
dependabot[bot] May 4, 2026
917dc34
chore(deps-dev): bump the angular group with 3 updates (#2359)
github-actions[bot] May 4, 2026
8091ea3
chore(deps-dev): bump cypress from 15.14.1 to 15.14.2
dependabot[bot] May 4, 2026
42bdf2a
chore(deps-dev): bump cypress from 15.14.1 to 15.14.2 (#2362)
github-actions[bot] May 4, 2026
47ea86c
chore(deps-dev): bump baseline-browser-mapping from 2.10.23 to 2.10.27
dependabot[bot] May 4, 2026
621f7c7
chore(deps-dev): bump baseline-browser-mapping from 2.10.23 to 2.10.2…
github-actions[bot] May 4, 2026
62093e8
chore(deps-dev): bump ip-address from 10.1.0 to 10.2.0
dependabot[bot] May 7, 2026
2aa090c
chore(deps-dev): bump ip-address from 10.1.0 to 10.2.0 (#2364)
github-actions[bot] May 7, 2026
b3cc425
chore(deps-dev): bump simple-git from 3.33.0 to 3.36.0
dependabot[bot] May 7, 2026
a9dcf53
chore(deps-dev): bump simple-git from 3.33.0 to 3.36.0 (#2365)
github-actions[bot] May 7, 2026
2e9baeb
chore(deps-dev): bump the eslint group across 1 directory with 2 updates
dependabot[bot] May 7, 2026
15cda8a
chore(deps-dev): bump the eslint group across 1 directory with 2 upda…
github-actions[bot] May 7, 2026
4ea9c23
fix(shared-table): track merge subscription for cleanup on destroy
alubbock May 8, 2026
0acb4c6
test(shared-table): regression test for merge subscription tracking
alubbock May 8, 2026
11a3c31
test(shared-table): fix matcher name and use push spy in ngAfterViewI…
alubbock May 8, 2026
dfc7c3f
fix(shared-table): call unsubscribe() instead of referencing it (#2367)
alubbock May 8, 2026
94d1302
merge: resolve conflict, retain both regression tests
alubbock May 8, 2026
048baab
fix(shared-table): track sort/paginator merge subscription for cleanu…
alubbock May 8, 2026
1b5ff68
chore(deps): bump fast-uri from 3.1.0 to 3.1.2
dependabot[bot] May 9, 2026
21bd821
chore(deps): bump fast-uri from 3.1.0 to 3.1.2 (#2370)
github-actions[bot] May 9, 2026
e2e4015
chore(deps-dev): bump @babel/plugin-transform-modules-systemjs
dependabot[bot] May 9, 2026
2899e7a
chore(deps-dev): bump @babel/plugin-transform-modules-systemjs from 7…
github-actions[bot] May 9, 2026
e56419f
chore(deps-dev): bump the eslint group with 2 updates
dependabot[bot] May 12, 2026
97d0037
chore(deps-dev): bump the eslint group with 2 updates (#2373)
github-actions[bot] May 12, 2026
bba0bd7
chore(deps-dev): bump @types/node in the types group across 1 directory
dependabot[bot] May 12, 2026
d3c7b73
chore(deps-dev): bump @types/node from 25.6.0 to 25.7.0 in the types …
github-actions[bot] May 12, 2026
3542f0b
chore(deps-dev): bump baseline-browser-mapping from 2.10.27 to 2.10.29
dependabot[bot] May 12, 2026
1ef8ea1
chore(deps-dev): bump baseline-browser-mapping from 2.10.27 to 2.10.2…
github-actions[bot] May 12, 2026
5a5dd56
docs: update MAX IV About page content
emigun May 13, 2026
e18d834
docs: update MAX IV About page content (#2377)
emigun May 13, 2026
4a75b2d
chore(deps-dev): bump systeminformation from 5.31.1 to 5.31.6
dependabot[bot] May 13, 2026
dee01a4
chore(deps-dev): bump systeminformation from 5.31.1 to 5.31.6 (#2378)
github-actions[bot] May 13, 2026
14281a6
chore(deps-dev): bump @types/node in the types group
dependabot[bot] May 19, 2026
708aa1d
chore(deps-dev): bump @types/node from 25.7.0 to 25.9.0 in the types …
github-actions[bot] May 19, 2026
16a19e3
chore(deps-dev): bump the eslint group across 1 directory with 2 updates
dependabot[bot] May 19, 2026
f5d385a
chore(deps-dev): bump the eslint group across 1 directory with 2 upda…
github-actions[bot] May 19, 2026
e63d31c
chore(deps-dev): bump baseline-browser-mapping from 2.10.29 to 2.10.31
dependabot[bot] May 19, 2026
45a73a3
chore(deps-dev): bump baseline-browser-mapping from 2.10.29 to 2.10.3…
github-actions[bot] May 19, 2026
52c8396
chore(deps-dev): bump cypress from 15.14.2 to 15.15.0
dependabot[bot] May 19, 2026
867b260
chore(deps-dev): bump cypress from 15.14.2 to 15.15.0 (#2385)
github-actions[bot] May 19, 2026
ac1e1a2
chore(deps): bump the angular group across 1 directory with 13 updates
dependabot[bot] May 19, 2026
b1f1ea2
chore(deps): bump the angular group across 1 directory with 13 update…
github-actions[bot] May 19, 2026
4f4cef0
fix: format-number pipe should not convert 0 to 0e+0 (#2387)
Junjiequan May 20, 2026
bf3e740
fix: include sampleName in e2e test sample (#2394)
Junjiequan May 29, 2026
59fbd32
fix: format-number pipe should format booleans
emigun May 26, 2026
e0a01d5
fix: format-number pipe should format booleans (#2393)
emigun May 29, 2026
ac93ea3
chore(deps-dev): bump @types/node in the types group across 1 directory
dependabot[bot] May 29, 2026
defba4d
chore(deps-dev): bump @types/node from 25.9.0 to 25.9.1 in the types …
github-actions[bot] May 29, 2026
b7ffc38
chore(deps): bump tmp from 0.2.5 to 0.2.7
dependabot[bot] May 29, 2026
244b524
chore(deps): bump tmp from 0.2.5 to 0.2.7 (#2395)
github-actions[bot] May 29, 2026
72b8269
chore(deps-dev): bump baseline-browser-mapping from 2.10.31 to 2.10.32
dependabot[bot] May 29, 2026
e65203a
chore(deps-dev): bump baseline-browser-mapping from 2.10.31 to 2.10.3…
github-actions[bot] May 29, 2026
7b0659d
chore(deps-dev): bump the eslint group across 1 directory with 3 updates
dependabot[bot] May 29, 2026
288f5a1
chore(deps-dev): bump the eslint group across 1 directory with 3 upda…
github-actions[bot] May 29, 2026
bdcbc89
feat: recursive variable resolution for action items
abdellah257 May 12, 2026
4739d73
feat: configurable link actions (#2321)
abdellah257 Jun 1, 2026
2cd5d9f
fix(UI): hide disabled dataset filters (#2363)
abdimo101 Jun 2, 2026
df01bea
feat: session expired interceptor with login redirection
abdellah257 May 7, 2026
66ac733
feat: session expired interceptor with login redirection (#2379)
abdellah257 Jun 2, 2026
2ddf075
chore(deps-dev): bump the eslint group with 2 updates
dependabot[bot] Jun 3, 2026
a69ac02
chore(deps-dev): bump the eslint group with 2 updates (#2401)
github-actions[bot] Jun 3, 2026
031b047
chore(deps-dev): bump baseline-browser-mapping from 2.10.32 to 2.10.33
dependabot[bot] Jun 3, 2026
5dd5c45
chore(deps-dev): bump baseline-browser-mapping from 2.10.32 to 2.10.3…
github-actions[bot] Jun 3, 2026
f7e5faf
chore(deps-dev): bump cypress from 15.15.0 to 15.16.0
dependabot[bot] Jun 3, 2026
203107b
chore(deps-dev): bump cypress from 15.15.0 to 15.16.0 (#2403)
github-actions[bot] Jun 3, 2026
1d63817
chore(deps): bump the angular group across 1 directory with 13 updates
dependabot[bot] Jun 3, 2026
820eff8
chore(deps): bump the angular group across 1 directory with 13 update…
github-actions[bot] Jun 3, 2026
65c2a3c
fix(breadcrumb): fall back to router navigation when mode is empty (#…
Junjiequan Jun 4, 2026
cc292b4
chore(deps-dev): bump the eslint group with 2 updates
dependabot[bot] Jun 8, 2026
4d73e10
chore(deps-dev): bump the eslint group with 2 updates (#2406)
github-actions[bot] Jun 8, 2026
2a824fa
chore(deps-dev): bump jasmine from 6.2.0 to 6.3.0
dependabot[bot] Jun 8, 2026
bde883d
chore(deps-dev): bump jasmine from 6.2.0 to 6.3.0 (#2409)
github-actions[bot] Jun 8, 2026
cac929d
chore(deps-dev): bump baseline-browser-mapping from 2.10.33 to 2.10.34
dependabot[bot] Jun 8, 2026
5db6e56
chore(deps-dev): bump baseline-browser-mapping from 2.10.33 to 2.10.3…
github-actions[bot] Jun 8, 2026
71901d6
chore(deps-dev): bump @types/node in the types group across 1 directory
dependabot[bot] Jun 8, 2026
030b12b
chore(deps-dev): bump @types/node from 25.9.1 to 25.9.2 in the types …
github-actions[bot] Jun 8, 2026
06e91c0
fix: add loading spinner for dynamic table paginator (#2399)
Junjiequan Jun 9, 2026
8383d42
fix: remove horizontal overflow on the table page (#2412)
Junjiequan Jun 10, 2026
9bc2bb7
fix: account for non visible columns when dropping
emigun Apr 9, 2026
121641c
fix: account for non visible columns when dropping (#2372)
emigun Jun 12, 2026
c7436a3
chore(deps-dev): bump form-data from 4.0.5 to 4.0.6
dependabot[bot] Jun 15, 2026
3922937
chore(deps-dev): bump form-data from 4.0.5 to 4.0.6 (#2421)
github-actions[bot] Jun 15, 2026
796a157
chore(deps-dev): bump js-yaml from 4.1.1 to 4.2.0
dependabot[bot] Jun 15, 2026
0a763b3
chore(deps-dev): bump js-yaml from 4.1.1 to 4.2.0 (#2420)
github-actions[bot] Jun 15, 2026
875521c
chore(deps-dev): bump prettier from 3.8.3 to 3.8.4
dependabot[bot] Jun 15, 2026
bb19f2e
chore(deps-dev): bump prettier from 3.8.3 to 3.8.4 (#2424)
github-actions[bot] Jun 15, 2026
fbd0645
chore(deps-dev): bump @types/node in the types group across 1 directory
dependabot[bot] Jun 15, 2026
5afe2aa
chore(deps-dev): bump @types/node from 25.9.2 to 25.9.3 in the types …
github-actions[bot] Jun 15, 2026
ceb2d24
chore(deps-dev): bump baseline-browser-mapping from 2.10.34 to 2.10.37
dependabot[bot] Jun 15, 2026
e227f9e
chore(deps-dev): bump baseline-browser-mapping from 2.10.34 to 2.10.3…
github-actions[bot] Jun 15, 2026
65e599a
chore(deps-dev): bump cypress from 15.16.0 to 15.17.0
dependabot[bot] Jun 15, 2026
75ee26c
chore(deps-dev): bump cypress from 15.16.0 to 15.17.0 (#2426)
github-actions[bot] Jun 15, 2026
aff5614
fix(proposal-metadata-view): separate table-widget and view-type conf…
Junjiequan Jun 16, 2026
f95f7f9
feat: search metadata keys using Enter with hint in condition dialog …
abdimo101 Jun 17, 2026
5a34d4d
feat: add configurable dialog action (#2350)
minottic Jun 17, 2026
0ad8d5d
fix: unsubscribe subscription in search-parameters-dialog component (…
Junjiequan Jun 17, 2026
820f741
fix: reset search text in add condition dialog and persist search tex…
abdimo101 Jun 18, 2026
133c6ef
feat: add metadata as colum from tree-view
emigun Apr 21, 2026
4504648
feat: add metadata as colum from tree-view (#2366)
emigun Jun 18, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 42 additions & 7 deletions cypress/e2e/datasets/datasets-general.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ describe("Datasets general", () => {
.find(".condition-panel")
.should("have.length", 0);
});
// skipping for now but will be relevant when we can fetch human-readable names from metadataKeys endpoint in the future
it.skip("should search by human name", () => {

it("should search by human name", () => {
cy.visit("/datasets");

cy.get('[data-cy="scientific-condition-filter-list"]').within(() => {
Expand Down Expand Up @@ -363,6 +363,32 @@ describe("Datasets general", () => {

cy.get('[data-cy="remove-condition-button"]').click();
});

it("should search a metadata key when pressing Enter", () => {
cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
const testConfig = {
...baseConfig,
autoApplyFilters: true,
};
cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
});

cy.visit("/datasets");
cy.wait("@getConfig", { timeout: 20000 });
cy.finishedLoading();

cy.get('[data-cy="scientific-condition-filter-list"]').within(() => {
cy.get('[data-cy="add-condition-button"]').click();
});

cy.get('input[name="lhs"]').type("extra_entry_end_time{enter}");

cy.get("mat-dialog-container").find('button[type="submit"]').click();

cy.get(".condition-panel").first().click();

cy.get('[data-cy="remove-condition-button"]').click();
});
});

describe("Units options in condition panel units dropdown", () => {
Expand Down Expand Up @@ -473,9 +499,16 @@ describe("Datasets general", () => {
});

it("should automatically apply pre-configured filters from config", () => {
cy.contains("Type").should("exist");
cy.get('[data-cy="shared-filter-form"]').should("contain", "Type");
cy.get('[data-cy="shared-filter-form"]').should(
"not.contain",
"Location",
);
});

cy.contains("Location").should("not.exist");
it("should hide disabled filters in the list", () => {
cy.get('[data-cy="shared-filter-form"]').should("not.contain", "Keyword");
cy.get('[data-cy="shared-filter-form"]').should("contain", "Type");
});
});

Expand Down Expand Up @@ -777,7 +810,7 @@ describe("Datasets general", () => {
cy.get('[data-cy="remove-condition-button"]').click();
});
});

describe("Auto apply filters", () => {
beforeEach(() => {
cy.clearLocalStorage();
Expand Down Expand Up @@ -853,7 +886,7 @@ describe("Datasets general", () => {
.type("{enter}");
});
});

describe("Sorting datasets by a column from config", () => {
beforeEach(() => {
cy.createDataset({
Expand Down Expand Up @@ -895,7 +928,9 @@ describe("Datasets general", () => {
});

it("should sort datasets by datasetName in asc order from config", () => {
cy.get(".dataset-table mat-row").first().should("contain", "A DatasetName");
cy.get(".dataset-table mat-row")
.first()
.should("contain", "A DatasetName");
});
});
});
13 changes: 8 additions & 5 deletions cypress/e2e/proposals/proposals-general.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ describe("Proposals general", () => {
const proposalLabelsConfig = testConfig.proposalViewCustomLabels;
beforeEach(() => {
cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
const mergedConfig = mergeConfig(baseConfig, proposalLabelsConfig);
const mergedConfig = mergeConfig(baseConfig, {
...proposalLabelsConfig,
jsonMetadataEnabled: false,
});
cy.intercept("GET", "**/admin/config", mergedConfig).as(
"getFrontendConfig",
);
Expand Down Expand Up @@ -156,9 +159,10 @@ describe("Proposals general", () => {

cy.get('[data-cy="proposal-metadata-card"]').should("exist");

cy.get('[data-cy="proposal-metadata-card"] [role="tab"]')
.contains("Edit")
.click();
cy.contains(
'[data-cy="proposal-metadata-card"] [role="tab"]',
"Edit",
).click();

cy.get('[data-cy="add-new-row"]').click();

Expand Down Expand Up @@ -487,7 +491,6 @@ describe("Proposals general", () => {
cy.get('[role="menu"] button').contains("Default setting").click();

cy.get("body").type("{esc}");

cy.get("dynamic-mat-table table-menu button").click();
cy.get('[role="menu"] button').contains("Save table setting").click();

Expand Down
5 changes: 3 additions & 2 deletions cypress/fixtures/testData.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const testData = {
},
},
sample: {
sampleName: "Cypress Sample",
ownerGroup: "ess",
accessGroups: ["string"],
instrumentGroup: "string",
Expand Down Expand Up @@ -366,7 +367,7 @@ export const defaultDatasetsColumnsList = [
"Size",
"Creation Time",
"Image",
"Proposal Id"
"Proposal Id",
];

export const personalizedDatasetsColumnsList = [
Expand All @@ -377,5 +378,5 @@ export const personalizedDatasetsColumnsList = [
"Creation Time",
"Proposal Id",
"Start Time",
"End Time"
"End Time",
];
Loading
Loading