Merge remote-tracking branch 'origin/master' into psi-deployment-gamma-release

Author: sofyalaski

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

@@ -402,6 +402,22 @@ describe("Datasets general", () => {
     });
   });
 
+  describe("Dataset filter end date auto-set", () => {
+    it("should set end date to today if only start date is provided", () => {
+      cy.createDataset({
+        type: "raw",
+        creationTime: "2025-10-08T15:00:00.000Z",
+      });
+      cy.visit("/datasets");
+
+      cy.get('[data-cy="creation-time-begin"]').type("2025-10-07");
+
+      cy.get('[data-cy="filter-search-button"]').click();
+
+      cy.get(".dataset-table mat-row").contains("Cypress Dataset").should("exist");
+    });
+  });
+
   describe("Scientific notation in condition panel test", () => {
     beforeEach(() => {
       cy.login(Cypress.env("username"), Cypress.env("password"));

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

@@ -577,4 +577,25 @@ describe("Proposals general", () => {
       });
     });
   });
+
+  describe("Proposals filter end date auto-set", () => {
+    it("should auto-set end date when start date is set and end date is empty", () => {
+      const newProposal = {
+        ...testData.proposal,
+        proposalId: Math.floor(100000 + Math.random() * 900000).toString(),
+        startTime: "2025-10-08T15:00:00.000Z",
+      };
+
+      cy.createProposal(newProposal);
+
+      cy.visit("/proposals");
+
+      cy.get('[data-cy="creation-time-begin"]').type("2025-10-08");
+
+      cy.get('[data-cy="apply-button-filter"]').click();
+
+      cy.get("mat-table mat-row").should("contain", newProposal.proposalId);
+
+    });
+  });
 });

cypress/fixtures/testData.js

@@ -314,7 +314,29 @@ export const testConfig = {
           enabled: true,
         },
       ],
-      filters: [],
+      filters: [
+        {
+          key: "instrumentIds",
+          label: "Instrument",
+          type: "checkbox",
+          description: "Filter by instrument name",
+          enabled: true,
+        },
+        {
+          key: "pi_lastname",
+          label: "PI Last Name",
+          type: "checkbox",
+          description: "Filter by dataset start time",
+          enabled: true,
+        },
+        {
+          key: "startTime",
+          label: "Start Time",
+          type: "dateRange",
+          description: "Filter by dataset start time",
+          enabled: true,
+        },
+      ],
       conditions: [],
     },
   },