RELEASE 2025-10-07 (#2049)

## Description
Short description of the pull request


## Motivation
Background on use case, changes needed


## Fixes:
Please provide a list of the fixes implemented in this PR

* Items added


## Changes:
Please provide a list of the changes implemented by this PR

* changes made


## Tests included
- [ ] Included for each change/fix?
- [ ] Passing? (Merge will not be approved unless this is checked) 

## Documentation
- [ ] swagger documentation updated \[required\]
- [ ] official documentation updated \[nice-to-have\]

### official documentation info
If you have updated the official documentation, please provide PR # and
URL of the pages where the updates are included

## Backend version
- [ ] Does it require a specific version of the backend
- which version of the backend is required:

Author: Junjiequan

.github/workflows/test.yml

@@ -129,6 +129,7 @@ jobs:
         uses: cypress-io/github-action@v6
         with:
           config-file: cypress.config.ts
+          browser: chrome
           install-command: npm install --omit peer
       - name: docker logs
         if: ${{ failure() }}

CI/e2e/frontend.config.e2e.json

@@ -244,7 +244,7 @@
       "metadataJsonView": "Metadata JsonView",
       "datasetName": "Dataset Name"
     },
-    "proposalDefault": {
+    "proposal": {
       "General Information": "Proposal Information",
       "Title": "Proposal Title",
       "Abstract": "Abstract",

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

@@ -231,37 +231,36 @@ describe("Datasets general", () => {
           },
         },
         isPublished: true,
-      }).then(() => {
-        cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
-          const testConfig = {
-            ...baseConfig,
-            defaultDatasetsListSettings: {
-              ...baseConfig.defaultDatasetsListSettings,
-              conditions: [
-                {
-                  condition: {
-                    lhs: "outgassing_values_after_1h",
-                    relation: "GREATER_THAN",
-                    rhs: 1,
-                    unit: "",
-                    unitsOptions: [
-                      "mbar l/s/cm^2",
-                      "Pa m^3/s/m^2",
-                      "bar m^3/s/m^2",
-                    ],
-                  },
-                  enabled: false,
+      });
+      cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+        const testConfig = {
+          ...baseConfig,
+          defaultDatasetsListSettings: {
+            ...baseConfig.defaultDatasetsListSettings,
+            conditions: [
+              {
+                condition: {
+                  lhs: "outgassing_values_after_1h",
+                  relation: "GREATER_THAN",
+                  rhs: 1,
+                  unit: "",
+                  unitsOptions: [
+                    "mbar l/s/cm^2",
+                    "Pa m^3/s/m^2",
+                    "bar m^3/s/m^2",
+                  ],
                 },
-              ],
-            },
-          };
-
-          cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
-          cy.visit("/datasets");
-          cy.wait("@getConfig", { timeout: 20000 });
-          cy.finishedLoading();
-        });
+                enabled: false,
+              },
+            ],
+          },
+        };
+
+        cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
       });
+      cy.visit("/datasets");
+      cy.wait("@getConfig", { timeout: 20000 });
+      cy.finishedLoading();
     });
 
     it("should display limited options in units dropdown", () => {
@@ -298,22 +297,35 @@ describe("Datasets general", () => {
           ...baseConfig,
           defaultDatasetsListSettings: {
             ...baseConfig.defaultDatasetsListSettings,
-            filters: [{ TypeFilter: true }, { TextFilter: true }],
+            filters: [
+              {
+                key: "type",
+                label: "Type",
+                type: "multiSelect",
+                description: "Filter by dataset type",
+                enabled: true,
+              },
+              {
+                key: "keywords",
+                label: "Keyword",
+                type: "multiSelect",
+                description: "Filter by keywords in the dataset",
+                enabled: false,
+              },
+            ],
           },
         };
 
         cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
         cy.visit("/datasets");
-        cy.wait("@getConfig", { timeout: 10000 });
+        cy.wait("@getConfig");
         cy.finishedLoading();
       });
     });
 
     it("should automatically apply pre-configured filters from config", () => {
       cy.contains("Type").should("exist");
 
-      cy.get('[data-cy="text-search"]').should("exist");
-
       cy.contains("Location").should("not.exist");
       cy.contains("Keyword").should("not.exist");
     });
@@ -329,38 +341,37 @@ describe("Datasets general", () => {
           extra_entry_end_time: { type: "number", value: 2, unit: "" },
         },
         isPublished: true,
-      }).then(() => {
-        cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
-          const relationsToTest = [
-            { relation: "GREATER_THAN", rhs: 1 },
-            { relation: "LESS_THAN", rhs: 3 },
-            { relation: "EQUAL_TO_NUMERIC", rhs: 2 },
-            { relation: "GREATER_THAN_OR_EQUAL", rhs: 2 },
-            { relation: "LESS_THAN_OR_EQUAL", rhs: 2 },
-            { relation: "RANGE", rhs: [1, 3] },
-          ];
-          const testConfig = {
-            ...baseConfig,
-            defaultDatasetsListSettings: {
-              ...baseConfig.defaultDatasetsListSettings,
-              conditions: relationsToTest.map(({ relation, rhs }) => ({
-                condition: {
-                  lhs: "extra_entry_end_time",
-                  relation,
-                  rhs,
-                  unit: "",
-                },
-                enabled: true,
-              })),
-            },
-          };
-
-          cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
-          cy.visit("/datasets");
-          cy.wait("@getConfig", { timeout: 20000 });
-          cy.finishedLoading();
-        });
       });
+
+      cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+        const relationsToTest = [
+          { relation: "GREATER_THAN", rhs: 1 },
+          { relation: "LESS_THAN", rhs: 3 },
+          { relation: "EQUAL_TO_NUMERIC", rhs: 2 },
+          { relation: "GREATER_THAN_OR_EQUAL", rhs: 2 },
+          { relation: "LESS_THAN_OR_EQUAL", rhs: 2 },
+          { relation: "RANGE", rhs: [1, 3] },
+        ];
+        const testConfig = {
+          ...baseConfig,
+          defaultDatasetsListSettings: {
+            ...baseConfig.defaultDatasetsListSettings,
+            conditions: relationsToTest.map(({ relation, rhs }) => ({
+              condition: {
+                lhs: "extra_entry_end_time",
+                relation,
+                rhs,
+                unit: "",
+              },
+              enabled: true,
+            })),
+          },
+        };
+
+        cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
+      });
+      cy.visit("/datasets");
+      cy.wait("@getConfig");
     });
 
     it("should check if pre-configured conditions are applied", () => {

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

@@ -403,7 +403,7 @@ describe("Datasets", () => {
   describe("Different metadata types", () => {
     it("should be able to add a metadata entry with type 'date'", () => {
       const newMetadataName = "Cypress dataset date metadata";
-      const metaDataInvalidValue = "20";
+      const metaDataInvalidValue = "20ab";
       const metadata = {
         value: "2025-03-05 10:48",
         name: "date_metadata",

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

@@ -132,7 +132,7 @@ describe("Instruments general", () => {
         .first()
         .should("not.contain", newInstrument.name);
 
-      cy.get(".mat-sort-header-container").contains("Name").click();
+      cy.get(".mat-sort-header-container").eq(1).click();
 
       cy.get("mat-table mat-row").first().should("contain", newInstrument.name);
 

cypress/e2e/mainPage/main-page.cy.js

@@ -67,9 +67,6 @@ describe("Main Page", () => {
 
   describe("Main page configuration as authenticated user", () => {
     it("should visit main page correctly configured", () => {
-      const username = Cypress.env("username");
-      const password = Cypress.env("password");
-
       cy.visit("/");
       cy.finishedLoading();
 
@@ -94,7 +91,7 @@ describe("Main Page", () => {
         "button.mat-mdc-menu-item:nth-child(2) > span:nth-child(2) > span:nth-child(1)",
       ).should("contain", "Files");
 
-      cy.get("div.main-menu").click();
+      cy.get("body").type("{esc}");
 
       cy.get('[data-cy="login-button"]').should("not.exist");
       cy.get(".user-button").should("exist");

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

@@ -463,31 +463,12 @@ describe("Proposals general", () => {
       cy.get("dynamic-mat-table")
         .scrollTo("right", { ensureScrollable: false })
         .get("mat-header-row")
-        .should("contain", "First Name");
-
-      cy.get("dynamic-mat-table")
-        .scrollTo("right", { ensureScrollable: false })
-        .get("mat-header-row")
-        .should("contain", "Last Name");
+        .should("contain", "PI Last Name");
 
       cy.get("dynamic-mat-table table-menu button").click();
 
       cy.get('[role="menu"] button').contains("Column setting").click();
-      cy.get('[role="menu"]')
-        .contains("First Name")
-        .parent()
-        .find("input[type=checkbox]")
-        .uncheck();
-      cy.get('[role="menu"]')
-        .contains("Last Name")
-        .parent()
-        .find("input[type=checkbox]")
-        .uncheck();
-      cy.get('[role="menu"]')
-        .contains("PI First Name")
-        .parent()
-        .find("input[type=checkbox]")
-        .uncheck();
+
       cy.get('[role="menu"]')
         .contains("PI Last Name")
         .parent()
@@ -508,12 +489,7 @@ describe("Proposals general", () => {
       cy.get("dynamic-mat-table")
         .scrollTo("right", { ensureScrollable: false })
         .get("mat-header-row")
-        .should("not.contain", "First Name");
-
-      cy.get("dynamic-mat-table")
-        .scrollTo("right", { ensureScrollable: false })
-        .get("mat-header-row")
-        .should("not.contain", "Last Name");
+        .should("not.contain", "PI Last Name");
 
       cy.get("dynamic-mat-table table-menu button").click();
       cy.get('[role="menu"] button').contains("Default setting").click();
@@ -530,12 +506,7 @@ describe("Proposals general", () => {
       cy.get("dynamic-mat-table")
         .scrollTo("right", { ensureScrollable: false })
         .get("mat-header-row")
-        .should("contain", "First Name");
-
-      cy.get("dynamic-mat-table")
-        .scrollTo("right", { ensureScrollable: false })
-        .get("mat-header-row")
-        .should("contain", "Last Name");
+        .should("contain", "PI Last Name");
     });
 
     it("should be able to download table data as a json", () => {

cypress/e2e/published-data/published-data.cy.js

@@ -140,7 +140,10 @@ describe("Datasets general", () => {
 
       cy.isLoading();
 
-      cy.get(".dataset-table mat-row input[type='checkbox']").last().click();
+      cy.get(".dataset-table mat-row input[type='checkbox']")
+        .last()
+        .and("not.be.disabled")
+        .click();
 
       cy.get("#addToBatchButton").click();
 

cypress/fixtures/testData.js

@@ -271,12 +271,51 @@ export const testConfig = {
   },
   proposalViewCustomLabels: {
     labelsLocalization: {
-      proposalDefault: {
+      proposal: {
         "General Information": "Test Proposal Information",
         Title: "Test Proposal Title",
         Abstract: "Test Abstract",
+        proposalId: "Proposal ID",
         "Proposal Id": "Test Proposal Id",
+        firstname: "First Name",
+        lastname: "Last Name",
+        pi_firstname: "PI First Name",
+        pi_lastname: "PI Last Name",
       },
     },
+    defaultProposalsListSettings: {
+      columns: [
+        {
+          name: "proposalId",
+          width: 140,
+          enabled: true,
+        },
+        {
+          name: "title",
+          width: 300,
+          enabled: true,
+        },
+        {
+          name: "startTime",
+          format: "yyyy-MM-dd",
+          type: "date",
+          width: 200,
+          enabled: true,
+        },
+        {
+          name: "abstract",
+          width: 140,
+          type: "hoverContent",
+          enabled: true,
+        },
+        {
+          name: "pi_lastname",
+          width: 300,
+          enabled: true,
+        },
+      ],
+      filters: [],
+      conditions: [],
+    },
   },
 };