fix: address issues from filters and conditions refactor

.github/workflows/test.yml

@@ -127,7 +127,6 @@ jobs:
         with:
           config-file: cypress.config.ts
           install-command: npm install --omit peer
-
       - name: docker logs
         if: ${{ failure() }}
         run: |

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

@@ -13,7 +13,7 @@ describe("Dataset attachments", () => {
 
   describe("Attachment tests", () => {
     it("should go to dataset details and add an attachment using the dropzone", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
       cy.visit("/datasets");
 
       cy.get(".dataset-table mat-table mat-header-row").should("exist");

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

@@ -25,12 +25,7 @@ describe("Dataset datafiles", () => {
       notebookAll: "http://localhost:4200/notebook/all",
     };
     it("Should be able to download/notebook with selected/all", () => {
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "small",
-      );
+      cy.createDataset({ type: "raw", dataFileSize: "small" });
 
       cy.visit("/datasets");
 
@@ -81,12 +76,7 @@ describe("Dataset datafiles", () => {
     });
 
     it("Should not be able to download selected/all file that is exceeding size limit", () => {
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "large",
-      );
+      cy.createDataset({ type: "raw", dataFileSize: "large" });
 
       cy.visit("/datasets");
 

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

@@ -13,7 +13,7 @@ describe("Datasets Detail View Default", () => {
     });
 
     cy.login(Cypress.env("username"), Cypress.env("password"));
-    cy.createDataset("raw");
+    cy.createDataset({ type: "raw" });
     cy.visit("/datasets");
     cy.wait("@getFrontendConfig");
   });

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

@@ -17,7 +17,7 @@ describe("Datasets Detail View Dynamic", () => {
     });
 
     cy.login(Cypress.env("username"), Cypress.env("password"));
-    cy.createDataset("raw");
+    cy.createDataset({ type: "raw" });
     cy.visit("/datasets");
     cy.wait("@getFrontendConfig");
   });

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

@@ -5,7 +5,7 @@ describe("Datasets general", () => {
     cy.login(Cypress.env("username"), Cypress.env("password"));
   });
 
-  after(() => {
+  afterEach(() => {
     cy.removeDatasets();
   });
 
@@ -14,7 +14,7 @@ describe("Datasets general", () => {
       const username = Cypress.env("username");
       const password = Cypress.env("password");
 
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -60,17 +60,17 @@ describe("Datasets general", () => {
 
       cy.get("mat-row").contains("Cypress Dataset").click();
     });
-    afterEach(() => {
-      cy.removeDatasets();
-    });
   });
 
   describe("Proposal connection and link from dataset details", () => {
     it("should be able to see and click proposal connection link from dataset details page", () => {
       const proposalId = Math.floor(100000 + Math.random() * 900000).toString();
       cy.createProposal({ ...testData.proposal, proposalId });
-      cy.createDataset("raw", undefined, proposalId);
-
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        proposalId,
+      });
       cy.visit("/datasets");
 
       cy.get(".dataset-table mat-table mat-header-row").should("exist");
@@ -99,25 +99,18 @@ describe("Datasets general", () => {
 
       cy.deleteProposal(proposalId);
     });
-    afterEach(() => {
-      cy.removeDatasets();
-    });
   });
 
   describe("Dataset page filter and scientific condition UI test", () => {
     beforeEach(() => {
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "small",
-        {
-          scientificMetadata: {
-            extra_entry_end_time: { type: "number", value: 2, unit: "" },
-          },
-          isPublished: true,
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        scientificMetadata: {
+          extra_entry_end_time: { type: "number", value: 2, unit: "" },
         },
-      );
+        isPublished: true,
+      });
     });
 
     it("should not be able to add duplicated conditions ", () => {
@@ -214,36 +207,31 @@ describe("Datasets general", () => {
       cy.get("mat-slide-toggle").click();
 
       // remove the condition
-      cy.get("button").contains("Remove").click();
+      cy.get('[data-cy="remove-condition-button"]').click();
 
       cy.get('[data-cy="scientific-condition-filter-list"]')
         .find(".condition-panel")
         .should("have.length", 0);
     });
-    afterEach(() => {
-      cy.removeDatasets();
-    });
   });
 
   describe("Units options in condition panel units dropdown", () => {
     beforeEach(() => {
       cy.login(Cypress.env("username"), Cypress.env("password"));
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "small",
-        {
-          scientificMetadata: {
-            outgassing_values_after_1h: {
-              type: "quantity",
-              value: 2,
-              unit: "mbar l/s/cm^2",
-            },
+      cy.createDataset({
+        type: "raw",
+        datasetName: testData.rawDataset.datasetName,
+        dataFileSize: "small",
+
+        scientificMetadata: {
+          outgassing_values_after_1h: {
+            type: "quantity",
+            value: 2,
+            unit: "mbar l/s/cm^2",
           },
-          isPublished: true,
         },
-      ).then(() => {
+        isPublished: true,
+      }).then(() => {
         cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
           const testConfig = {
             ...baseConfig,
@@ -297,7 +285,7 @@ describe("Datasets general", () => {
 
       cy.get(".condition-panel").first().click();
 
-      cy.get("button").contains("Remove").click();
+      cy.get('[data-cy="remove-condition-button"]').click();
     });
   });
 
@@ -334,18 +322,14 @@ describe("Datasets general", () => {
   describe("Pre-configured conditions test", () => {
     beforeEach(() => {
       cy.login(Cypress.env("username"), Cypress.env("password"));
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "small",
-        {
-          scientificMetadata: {
-            extra_entry_end_time: { type: "number", value: 2, unit: "" },
-          },
-          isPublished: true,
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        scientificMetadata: {
+          extra_entry_end_time: { type: "number", value: 2, unit: "" },
         },
-      ).then(() => {
+        isPublished: true,
+      }).then(() => {
         cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
           const relationsToTest = [
             { relation: "GREATER_THAN", rhs: 1 },
@@ -406,7 +390,4 @@ describe("Datasets general", () => {
       });
     });
   });
-  afterEach(() => {
-    cy.removeDatasets();
-  });
 });

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

@@ -14,7 +14,7 @@ describe("Datasets", () => {
     it("should be able to edit dataset details", () => {
       const newName = "Test changing dataset name";
       const newDescription = "Test changing dataset description";
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -53,7 +53,7 @@ describe("Datasets", () => {
         .should("contain.text", newDescription);
     });
     it("should go to dataset details and add a keyword", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 

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

@@ -22,7 +22,7 @@ describe("Datasets", () => {
 
   describe("Add metadata item", () => {
     it("should go to dataset details and add a metadata entry", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -89,7 +89,7 @@ describe("Datasets", () => {
     });
 
     it("should not be able to create a metadata with duplicate name", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -159,7 +159,7 @@ describe("Datasets", () => {
     });
 
     it("should not be able to edit the existing metadata with a duplicate name", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -238,7 +238,7 @@ describe("Datasets", () => {
     });
 
     it("should show warning icon in the edit and view table if the metadata unit is invalid or cannot be converted", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -333,7 +333,7 @@ describe("Datasets", () => {
     });
 
     it("added metadata entry should be visible from the Scientific Metadata(JSON) table", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -410,7 +410,11 @@ describe("Datasets", () => {
         human_name: "Date test",
         type: "date",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 
@@ -488,7 +492,11 @@ describe("Datasets", () => {
         human_name: "Link test",
         type: "link",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 
@@ -566,7 +574,11 @@ describe("Datasets", () => {
         human_name: "Number range test",
         type: "number_range",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 
@@ -647,7 +659,11 @@ describe("Datasets", () => {
         valueSI: "0.01,0.02",
         unitSI: "m",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 

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

@@ -2,7 +2,7 @@ describe("Datasets", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));
 
-    cy.createDataset("raw");
+    cy.createDataset({ type: "raw" });
 
     cy.intercept("PATCH", "/api/v3/datasets/**/*").as("change");
     cy.intercept("GET", "*").as("fetch");

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

@@ -9,7 +9,7 @@ describe("Datasets", () => {
 
   describe("Add item to cart and publish", () => {
     it("should add dataset to cart", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 

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

@@ -12,7 +12,7 @@ describe("Datasets", () => {
 
   describe("Reduce dataset", () => {
     it("should go to dataset details reduce tab and step through the workflow", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 

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

@@ -9,7 +9,7 @@ describe("Datasets", () => {
 
   describe("Add item to cart and publish", () => {
     it("should add dataset to cart, share it with another user and remove the share", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");