Skip to content

Commit 360d4aa

Browse files
author
Abdi Abdulle
committed
Merge branch 'metadata_name_hoverContent' of github.com:SciCatProject/frontend into metadata_name_hoverContent
2 parents e99b03d + fc6ace8 commit 360d4aa

File tree

49 files changed

+1549
-554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1549
-554
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @SciCatProject/reviewers

.github/workflows/release-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v5
2121

2222
- name: Set up Node.js
23-
uses: actions/setup-node@v5
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version: ${{ env.NODE_VERSION }}
2626

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v5
1818

1919
- name: Set up Node.js
20-
uses: actions/setup-node@v5
20+
uses: actions/setup-node@v6
2121
with:
2222
node-version: 18.x
2323

@@ -42,7 +42,7 @@ jobs:
4242
uses: actions/checkout@v5
4343

4444
- name: Set up Node.js
45-
uses: actions/setup-node@v5
45+
uses: actions/setup-node@v6
4646
with:
4747
node-version: ${{ env.NODE_VERSION }}
4848

@@ -65,7 +65,7 @@ jobs:
6565
uses: actions/checkout@v5
6666

6767
- name: Set up Node.js
68-
uses: actions/setup-node@v5
68+
uses: actions/setup-node@v6
6969
with:
7070
node-version: ${{ env.NODE_VERSION }}
7171

@@ -102,7 +102,7 @@ jobs:
102102
uses: actions/checkout@v5
103103

104104
- name: Set up Node.js
105-
uses: actions/setup-node@v5
105+
uses: actions/setup-node@v6
106106
with:
107107
node-version: ${{ env.NODE_VERSION }}
108108

cypress/e2e/datasets/datasets-detail-dynamic.cy.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import { mergeConfig } from "../../support/utils";
33

44
describe("Datasets Detail View Dynamic", () => {
55
const dynamicComponentConfig = testConfig.dynamicDetialViewComponent;
6-
const customizedLabelSets =
7-
dynamicComponentConfig.labelsLocalization.dataset;
6+
const customizedLabelSets = dynamicComponentConfig.labelsLocalization.dataset;
87
const customizedComponents =
98
dynamicComponentConfig.datasetDetailComponent.customization;
109

@@ -136,4 +135,15 @@ describe("Datasets Detail View Dynamic", () => {
136135
cy.wrap($img).should("have.attr", "class").and("contain", expectedSize);
137136
});
138137
});
138+
139+
it("should render tabs correctly on reload", () => {
140+
cy.get("mat-row").contains("Cypress Dataset").click();
141+
142+
cy.reload();
143+
144+
cy.get(".mat-mdc-tab-link").contains("Details").should("exist");
145+
cy.get(".mat-mdc-tab-link").contains("Attachments").should("exist");
146+
cy.get(".mat-mdc-tab-link").contains("Logbook").should("exist");
147+
cy.get(".mat-mdc-tab-link").contains("Datafiles").should("exist");
148+
});
139149
});

cypress/e2e/datasets/datasets-general.cy.js

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,4 +456,52 @@ describe("Datasets general", () => {
456456
});
457457
});
458458
});
459+
460+
describe("Scientific notation in condition panel test", () => {
461+
beforeEach(() => {
462+
cy.login(Cypress.env("username"), Cypress.env("password"));
463+
cy.createDataset({
464+
type: "raw",
465+
dataFileSize: "small",
466+
scientificMetadata: {
467+
extra_entry_end_time: { type: "number", value: 310000, unit: "" },
468+
},
469+
isPublished: true,
470+
});
471+
472+
cy.visit("/datasets");
473+
});
474+
it("should be able to add condition with scientific notation value", () => {
475+
476+
cy.get('[data-cy="scientific-condition-filter-list"]').within(() => {
477+
cy.get('[data-cy="add-condition-button"]').click();
478+
});
479+
480+
cy.get('input[name="lhs"]').type("extra_entry_end_time");
481+
482+
cy.get("mat-dialog-container").find('button[type="submit"]').click();
483+
484+
cy.get(".condition-panel").first().click();
485+
486+
cy.get(".condition-panel")
487+
.first()
488+
.within(() => {
489+
cy.get("mat-select").click();
490+
});
491+
492+
cy.get("mat-option").contains("=").click();
493+
494+
cy.get(".condition-panel")
495+
.first()
496+
.within(() => {
497+
cy.get("input[matInput]").eq(0).clear().type("3.1e4");
498+
});
499+
500+
cy.get('[data-cy="search-button"]').click();
501+
502+
cy.get(".dataset-table mat-table").should("exist");
503+
504+
cy.get('[data-cy="remove-condition-button"]').click();
505+
});
506+
})
459507
});

0 commit comments

Comments
 (0)