Release 17-02-2025

CI/e2e/frontend.config.e2e.json

@@ -65,7 +65,7 @@
       "files": "all",
       "mat_icon": "download",
       "type": "form",
-      "url": "https://www.scicat.info/download/all",
+      "url": "http://localhost:4200/download/all",
       "target": "_blank",
       "enabled": "#SizeLimit",
       "authorization": ["#datasetAccess", "#datasetPublic"]
@@ -77,7 +77,7 @@
       "files": "selected",
       "mat_icon": "download",
       "type": "form",
-      "url": "https://www.scicat.info/download/selected",
+      "url": "http://localhost:4200/download/selected",
       "target": "_blank",
       "enabled": "#Selected && #SizeLimit",
       "authorization": ["#datasetAccess", "#datasetPublic"]
@@ -89,7 +89,7 @@
       "files": "all",
       "icon": "/assets/icons/jupyter_logo.png",
       "type": "form",
-      "url": "https://www.scicat.info/notebook/all",
+      "url": "http://localhost:4200/notebook/all",
       "target": "_blank",
       "authorization": ["#datasetAccess", "#datasetPublic"]
     },
@@ -100,7 +100,7 @@
       "files": "selected",
       "icon": "/assets/icons/jupyter_logo.png",
       "type": "form",
-      "url": "https://www.scicat.info/notebook/selected",
+      "url": "http://localhost:4200/notebook/selected",
       "target": "_blank",
       "enabled": "#Selected",
       "authorization": ["#datasetAccess", "#datasetPublic"]

angular.json

@@ -58,8 +58,8 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumWarning": "8kb",
+                  "maximumError": "8kb"
                 }
               ],
               "fileReplacements": [

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

@@ -1,8 +1,14 @@
 describe("Dataset datafiles", () => {
   beforeEach(() => {
+    cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+      cy.intercept("GET", "**/admin/config", baseConfig).as(
+        "getFrontendConfig",
+      );
+    });
     cy.login(Cypress.env("username"), Cypress.env("password"));
     cy.intercept("PATCH", "/api/v3/datasets/**/*").as("change");
     cy.intercept("GET", "*").as("fetch");
+    cy.visit("/");
   });
 
   after(() => {
@@ -11,10 +17,10 @@ describe("Dataset datafiles", () => {
 
   describe("Datafiles action test", () => {
     const actionUrl = {
-      downloadSelected: "https://www.scicat.info/download/selected",
-      downloadAll: "https://www.scicat.info/download/all",
-      notebookSelected: "https://www.scicat.info/notebook/selected",
-      notebookAll: "https://www.scicat.info/notebook/all",
+      downloadSelected: "http://localhost:4200/download/selected",
+      downloadAll: "http://localhost:4200/download/all",
+      notebookSelected: "http://localhost:4200/notebook/selected",
+      notebookAll: "http://localhost:4200/notebook/all",
     };
     it("Should be able to download/notebook with selected/all", () => {
       cy.createDataset("raw", undefined, "small");

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

@@ -0,0 +1,58 @@
+import { testConfig } from "../../fixtures/testData";
+import { mergeConfig } from "../../support/utils";
+
+describe("Datasets Detail View Default", () => {
+  const defaultComponentConfig = testConfig.defaultDetailViewComponent;
+
+  beforeEach(() => {
+    cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+      const mergedConfig = mergeConfig(baseConfig, defaultComponentConfig);
+      cy.intercept("GET", "**/admin/config", mergedConfig).as(
+        "getFrontendConfig",
+      );
+    });
+
+    cy.login(Cypress.env("username"), Cypress.env("password"));
+    cy.createDataset("raw");
+    cy.visit("/datasets");
+    cy.wait("@getFrontendConfig");
+  });
+
+  after(() => {
+    cy.removeDatasets();
+  });
+
+  it("should load datasets with fallback labels when no custom labels are available", () => {
+    const fallbackLabelsToCheck = ["Creator Information", "Orcid"];
+    const customizedLabelsToCheck = [
+      "Test Dataset name",
+      "Test General Information",
+      "Test Description",
+    ];
+
+    cy.get(".dataset-table mat-table mat-header-row").should("exist");
+
+    cy.finishedLoading();
+
+    cy.get('[data-cy="text-search"] input[type="search"]')
+      .clear()
+      .type("Cypress");
+
+    cy.isLoading();
+
+    cy.get("mat-row").contains("Cypress Dataset").click();
+
+    cy.isLoading();
+
+    cy.wrap([...fallbackLabelsToCheck, ...customizedLabelsToCheck]).each(
+      (value) => {
+        cy.get("mat-card").should(($matCards) => {
+          const matchFound = [...$matCards].some((card) =>
+            card.innerText.includes(value),
+          );
+          expect(matchFound).to.be.true;
+        });
+      },
+    );
+  });
+});

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

@@ -0,0 +1,143 @@
+import { testConfig } from "../../fixtures/testData";
+import { mergeConfig } from "../../support/utils";
+
+describe("Datasets Detail View Dynamic", () => {
+  const dynamicComponentConfig = testConfig.dynamicDetialViewComponent;
+  const customizedLabelSets =
+    dynamicComponentConfig.labelsLocalization.datasetCustom;
+  const customizedComponents =
+    dynamicComponentConfig.datasetDetailComponent.customization;
+
+  beforeEach(() => {
+    cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+      const mergedConfig = mergeConfig(baseConfig, dynamicComponentConfig);
+      cy.intercept("GET", "**/admin/config", mergedConfig).as(
+        "getFrontendConfig",
+      );
+    });
+
+    cy.login(Cypress.env("username"), Cypress.env("password"));
+    cy.createDataset("raw");
+    cy.visit("/datasets");
+    cy.wait("@getFrontendConfig");
+  });
+
+  after(() => {
+    cy.removeDatasets();
+  });
+
+  it("should load datasets with customized labels", () => {
+    cy.get(".dataset-table mat-table mat-header-row").should("exist");
+
+    cy.finishedLoading();
+
+    cy.get('[data-cy="text-search"] input[type="search"]')
+      .clear()
+      .type("Cypress");
+
+    cy.isLoading();
+
+    cy.get("mat-row").contains("Cypress Dataset").click();
+
+    cy.isLoading();
+    cy.wrap(Object.values(customizedLabelSets)).each((value) => {
+      cy.get("body")
+        .find('[data-cy="section-label"], [data-cy="field-label"]')
+        .should("contain", value);
+    });
+  });
+
+  it("should order sections based on customized settings", () => {
+    cy.get(".dataset-table mat-table mat-header-row").should("exist");
+
+    cy.finishedLoading();
+
+    cy.get('[data-cy="text-search"] input[type="search"]')
+      .clear()
+      .type("Cypress");
+
+    cy.isLoading();
+
+    cy.get("mat-row").contains("Cypress Dataset").click();
+
+    cy.isLoading();
+    const sortedLabels = customizedComponents
+      .sort((a, b) => a.order - b.order)
+      .map((section) => section.label);
+
+    cy.wrap(sortedLabels).each((label, index) => {
+      cy.get('[data-cy="section-label"]')
+        .eq(index)
+        .should("contain", customizedLabelSets[label]);
+    });
+  });
+
+  it("should order fields based on customized settings", () => {
+    cy.get(".dataset-table mat-table mat-header-row").should("exist");
+
+    cy.finishedLoading();
+
+    cy.get('[data-cy="text-search"] input[type="search"]')
+      .clear()
+      .type("Cypress");
+
+    cy.isLoading();
+
+    cy.get("mat-row").contains("Cypress Dataset").click();
+
+    cy.isLoading();
+    const componentLabel = "Section Label Regular";
+    const sectionToTest = customizedComponents.find(
+      (section) => section.label === componentLabel,
+    );
+    cy.wrap(sectionToTest).should("not.be.undefined");
+
+    cy.wrap(sectionToTest.fields)
+      .then((fields) => fields.sort((a, b) => a.order - b.order))
+      .each((field, index) => {
+        cy.get('[data-cy="field-label"]')
+          .eq(index)
+          .should("contain", customizedLabelSets[field.source]);
+      });
+  });
+
+  it("should render attachments section with customized settings", () => {
+    cy.get(".dataset-table mat-table mat-header-row").should("exist");
+
+    cy.finishedLoading();
+
+    cy.get('[data-cy="text-search"] input[type="search"]')
+      .clear()
+      .type("Cypress");
+
+    cy.isLoading();
+
+    cy.get("mat-row").contains("Cypress Dataset").click();
+
+    cy.isLoading();
+    const componentLabel = "Section Label Attachments";
+    const sectionToTest = customizedComponents.find(
+      (section) => section.label === componentLabel,
+    );
+    const actualImageCount = 5;
+    const expectedImageCount = sectionToTest.options.limit;
+    const expectedSize = sectionToTest.options.size;
+
+    cy.get(".mat-mdc-tab-link").contains("Attachments").click();
+
+    cy.uploadDatasetAttachments(actualImageCount);
+
+    cy.isLoading();
+
+    cy.get(".mat-mdc-tab-link").contains("Details").click();
+
+    cy.get('[data-cy="section-label"]')
+      .contains(customizedLabelSets["Section Label Attachments"])
+      .parent()
+      .find("img")
+      .should("have.length", expectedImageCount)
+      .each(($img) => {
+        cy.wrap($img).should("have.attr", "class").and("contain", expectedSize);
+      });
+  });
+});

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

@@ -94,7 +94,7 @@ describe("Datasets general", () => {
     });
   });
 
-  describe.only("Dataset page filter and scientific condition UI test", () => {
+  describe("Dataset page filter and scientific condition UI test", () => {
     it("should not be able to add duplicated conditions ", () => {
       cy.visit("/datasets");
 

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

@@ -304,13 +304,13 @@ describe("Datasets", () => {
       cy.get(".unit-input")
         .contains(`${metadataValidJson.unitSI}`)
         .within(() => {
-          cy.get(".unit-input--warning").should("not.exist");
+          cy.get(".general-warning").should("not.exist");
         });
 
       cy.get(".unit-input")
         .contains(`${metadataInvalidUnitValue}`)
         .within(() => {
-          cy.get(".unit-input--warning").should("exist");
+          cy.get(".general-warning").should("exist");
         });
     });