DHFPROD-9646: Fixing clicking on explore graph logic for e2e.

Aniela Amy · MarkLogic Builder · commit c1f6537d28e8 · 2022-11-04T09:44:57.000-07:00
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/relatedEntityMapping.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/relatedEntityMapping.spec.tsx
@@ -61,7 +61,7 @@ describe("Mapping", () => {
     propertyModal.getTypeFromDropdown("Related Entity").click();
     propertyModal.getCascadedTypeFromDropdown("Person").click();
     propertyModal.openForeignKeyDropdown();
-    propertyModal.getForeignKey("id").click();
+    propertyModal.getForeignKey("id").click({force: true});
     propertyModal.getSubmitButton().click();
     cy.waitForAsyncRequest();
     cy.wait(1000);
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/entitiesSidepanel.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/entitiesSidepanel.spec.tsx
@@ -142,7 +142,6 @@ describe("Test '/Explore' left sidebar", () => {
     cy.wait(5000);
     browsePage.getClearAllFacetsButton().click({force: true});
     browsePage.clickGraphView();
-    cy.wait(5000);
     graphExplore.getPositionsOfNodes(ExploreGraphNodes.CUSTOMER_102).then((nodePositions: any) => {
       let custCoordinates: any = nodePositions[ExploreGraphNodes.CUSTOMER_102];
       expect(custCoordinates).to.not.equal(undefined);
@@ -220,7 +219,6 @@ describe("Test '/Explore' left sidebar", () => {
 
     cy.log("**verify both Customer and Order nodes are still present in graph**");
     browsePage.clickGraphView();
-    cy.wait(1000);
     graphExplore.getPositionsOfNodes(ExploreGraphNodes.CUSTOMER_102).then((nodePositions: any) => {
       let custCoordinates: any = nodePositions[ExploreGraphNodes.CUSTOMER_102];
       expect(custCoordinates).to.not.equal(undefined);
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreGraphFacetConsistentNavigation.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreGraphFacetConsistentNavigation.spec.tsx
@@ -32,7 +32,6 @@ describe("Test navigation with facets from graph side panel to details twice", (
     browsePage.getGraphLoader().should("be.visible");
     cy.log("**Select Graph view**");
     browsePage.clickGraphView();
-    browsePage.waitForSpinnerToDisappear();
     graphExplore.getGraphVisCanvas().should("be.visible");
     graphExplore.stopStabilization();
 
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphCenterNode.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphCenterNode.spec.tsx
@@ -29,7 +29,7 @@ describe("Center node on graph", () => {
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
     graphExplore.getGraphVisCanvas().should("be.visible");
-    cy.wait(7000);
+    cy.wait(2000);
 
     graphExplore.focusNode(ExploreGraphNodes.CUSTOMER_102);
     graphExplore.getPositionsOfNodes(ExploreGraphNodes.CUSTOMER_102).then((nodePositions: any) => {
@@ -62,4 +62,4 @@ describe("Center node on graph", () => {
       expect(centeredNodeY).to.be.lessThan(500);
     });
   });
-});
+});
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphConceptsSettings.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphConceptsSettings.spec.tsx
@@ -62,7 +62,6 @@ describe("Entity Type Settings Modal", () => {
     cy.wait(3000);
     cy.log("**Select Graph view and open explore settings modal**");
     browsePage.clickGraphView();
-    browsePage.waitForSpinnerToDisappear();
     explorePage.clickExploreSettingsMenuIcon();
     browsePage.getEntityTypeDisplaySettingsButton().scrollIntoView().click({force: true});
     dataModelDisplaySettingsModal.getModalBody().should("be.visible");
@@ -111,7 +110,6 @@ describe("Entity Type Settings Modal", () => {
     cy.wait(3000);
     cy.log("**Select Graph view and open explore settings modal**");
     browsePage.clickGraphView();
-    browsePage.waitForSpinnerToDisappear();
     explorePage.clickExploreSettingsMenuIcon();
     browsePage.getEntityTypeDisplaySettingsButton().scrollIntoView().click({force: true});
     dataModelDisplaySettingsModal.getModalBody().should("be.visible");
@@ -152,4 +150,4 @@ describe("Entity Type Settings Modal", () => {
     dataModelDisplaySettingsModal.getModalCloseButton().click();
     dataModelDisplaySettingsModal.getModalBody().should("not.exist");
   });
-});
+});
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphEntitiesSettings.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphEntitiesSettings.spec.tsx
@@ -100,8 +100,6 @@ describe("Entity Type Settings Modal", () => {
   it("Open settings modal, check default values, select new ones cancel and check that the defaults values are keep", {defaultCommandTimeout: 120000}, () => {
     cy.log("**Select Graph view and open explore settings modal**");
     browsePage.clickGraphView();
-    browsePage.waitForSpinnerToDisappear();
-    cy.waitForAsyncRequest();
     explorePage.clickExploreSettingsMenuIcon();
     browsePage.getEntityTypeDisplaySettingsButton().scrollIntoView().click({force: true});
     dataModelDisplaySettingsModal.getModalBody().should("be.visible");
@@ -164,7 +162,6 @@ describe("Entity Type Settings Modal", () => {
     cy.wait(1000);
     cy.log("**Select Graph view and open explore settings modal**");
     browsePage.clickGraphView();
-    browsePage.waitForSpinnerToDisappear();
     cy.wait(2000);
     explorePage.clickExploreSettingsMenuIcon();
     browsePage.getEntityTypeDisplaySettingsButton().scrollIntoView().click({force: true});
@@ -284,7 +281,6 @@ describe("Entity Type Settings Modal", () => {
     cy.wait(1000);
     cy.log("**Select Graph view**");
     browsePage.clickGraphView();
-    browsePage.waitForSpinnerToDisappear();
     cy.wait(2000);
 
     cy.log("**Go to specific entity panel and check icon, title and background color**");
@@ -377,4 +373,4 @@ describe("Entity Type Settings Modal", () => {
     graphExploreSidePanel.getSidePanel().scrollIntoView().should("be.visible");
     graphExploreSidePanel.getSidePanelHeading().should("contain.text", defaultEntityTypeData.propertiesValues.email);
   });
-});
+});
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphFocusDefocusCluster.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphFocusDefocusCluster.spec.tsx
@@ -31,7 +31,7 @@ describe("Focus Defocus clusters", () => {
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
     graphExplore.getGraphVisCanvas().should("be.visible");
-    cy.wait(5000);
+    cy.wait(2000);
 
     cy.log("**Picking up customer node and validate it is available in canvas**");
     graphExplore.focusNode(ExploreGraphNodes.CUSTOMER_102);
@@ -97,4 +97,4 @@ describe("Focus Defocus clusters", () => {
       expect(customerCoordinates).to.not.equal(undefined);
     });
   });
-});
+});
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphGroupNodes.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphGroupNodes.spec.tsx
@@ -31,7 +31,6 @@ describe("Group Nodes", () => {
     //Graph view
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
-    cy.waitForAsyncRequest();
     graphExplore.getGraphVisCanvas().should("be.visible");
     graphExplore.stopStabilization();
 
@@ -210,4 +209,4 @@ describe("Group Nodes", () => {
     });
 
   });
-});
+});
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphLeafNodes.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphLeafNodes.spec.tsx
@@ -32,7 +32,6 @@ describe("Leaf Nodes", () => {
     //Graph view
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
-    cy.waitForAsyncRequest();
     graphExplore.getGraphVisCanvas().should("be.visible");
     graphExplore.stopStabilization();
 
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/verifyConceptsInExplore.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/verifyConceptsInExplore.spec.tsx
@@ -38,7 +38,6 @@ describe("Concepts", () => {
     //Graph view
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
-    cy.waitForAsyncRequest();
     graphExplore.getGraphVisCanvas().should("be.visible");
     cy.log("**Verify results number change**");
     cy.log("**Turn off concepts on graph**");
@@ -51,7 +50,6 @@ describe("Concepts", () => {
     //Graph view
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
-    cy.waitForAsyncRequest();
     graphExplore.getGraphVisCanvas().should("be.visible");
 
     graphView.getPhysicsAnimationToggle().scrollIntoView().should("have.value", "true");
@@ -122,7 +120,7 @@ describe("Concepts", () => {
     //Graph view
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
-    cy.waitForAsyncRequest();
+    graphExplore.getGraphVisCanvas().should("be.visible");
     graphExplore.stopStabilization();
     graphExplore.getGraphVisCanvas().should("be.visible");
 
@@ -265,7 +263,6 @@ describe("Concepts", () => {
     //Graph view
     cy.log("**Go to graph view**");
     browsePage.clickGraphView();
-    cy.waitForAsyncRequest();
     graphExplore.getGraphVisCanvas().should("be.visible");
     graphExplore.stopStabilization();
 
@@ -274,4 +271,4 @@ describe("Concepts", () => {
     graphView.getPhysicsAnimationTooltip().should("be.visible");
   });
 
-});
+});
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/persistence/persistence.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/persistence/persistence.spec.tsx
@@ -10,7 +10,6 @@ import {Application} from "../../support/application.config";
 import {ConfirmationType} from "../../support/types/modeling-types";
 import LoginPage from "../../support/pages/login";
 import curatePage from "../../support/pages/curate";
-import explore from "../../support/pages/browse";
 import {generateUniqueName} from "../../support/helper";
 import graphView from "../../support/components/explore/graph-view";
 import graphVis from "../../support/components/model/graph-vis";
@@ -21,6 +20,7 @@ import modelPage from "../../support/pages/model";
 import multiSlider from "../../support/components/common/multi-slider";
 import propertyTable from "../../support/components/model/property-table";
 import tables from "../../support/components/common/tables";
+import browsePage from "../../support/pages/browse";
 
 describe("Validate persistence across Hub Central", () => {
   let entityNamesAsc: string[] = [];
@@ -59,16 +59,16 @@ describe("Validate persistence across Hub Central", () => {
   });
   it(" Explore tile: the graph view switches settings should be preserved", () => {
     toolbar.getExploreToolbarIcon().click();
-    explore.getGraphView().click();
+    browsePage.clickGraphView();
 
     cy.log("**Switch off all the toggles**");
-    graphView.getConceptToggle().scrollIntoView().trigger("mouseover").click({force: true});
-    graphView.getConceptToggle().should("have.value", "false");
-
-    graphView.getPhysicsAnimationToggle().scrollIntoView().trigger("mouseover").click({force: true});
+    graphView.getPhysicsAnimationToggle().scrollIntoView().click({force: true});
     graphView.getPhysicsAnimationToggle().should("have.value", "false");
 
-    graphView.getRelationshipLabelsToggle().scrollIntoView().trigger("mouseover").click({force: true});
+    graphView.getConceptToggle().scrollIntoView().click({force: true});
+    graphView.getConceptToggle().should("have.value", "false");
+
+    graphView.getRelationshipLabelsToggle().scrollIntoView().click({force: true});
     graphView.getRelationshipLabelsToggle().should("have.value", "false");
 
     cy.log("**Switch Tile and come back, toggle value should be the same**");
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/support/pages/browse.tsx b/marklogic-data-hub-central/ui/e2e/cypress/support/pages/browse.tsx
@@ -373,7 +373,9 @@ class BrowsePage {
 
   // common
   clickGraphView() {
-    return this.getGraphView().click();
+    this.getGraphView().click();
+    this.waitForSpinnerToDisappear();
+    cy.waitForAsyncRequest();
   }
 
   // common
