DHFPROD-7876: Default views for first-time user experience

AkshayBajajML · MarkLogic Builder · commit 21ac8b20d93c · 2022-03-08T07:36:41.000-08:00
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/mappingWithCustomHeader.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/mappingWithCustomHeader.spec.tsx
@@ -225,6 +225,8 @@ describe("Create and verify load steps, map step and flows with a custom header"
     cy.waitUntil(() => runPage.getFlowName(flowName).should("be.visible"));
     cy.verifyStepRunResult("success", "Mapping", mapStep);
     runPage.explorerLink().click();
+    browsePage.getTableView().click();
+    browsePage.waitForSpinnerToDisappear();
     browsePage.getFirstTableViewInstanceIcon().should("be.visible").click({force: true});
     detailPage.getDocumentSource().should("contain", "backup-ABC123");
     detailPage.getDocumentTimestamp().should("not.exist");
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
@@ -162,6 +162,7 @@ describe("Mapping", () => {
     runPage.newFlowModal().should("be.visible");
     runPage.setFlowName("relationFlow");
     loadPage.confirmationOptions("Save").click();
+    cy.wait(1000);
     runPage.addStep("relationFlow");
     runPage.addStepToFlow("mapRelation");
     runPage.verifyStepInFlow("Map", "mapRelation", "relationFlow");
@@ -172,6 +173,7 @@ describe("Mapping", () => {
 
     // Navigate to Explore
     runPage.explorerLink().click();
+    browsePage.getTableView().click();
     browsePage.waitForSpinnerToDisappear();
     cy.waitForAsyncRequest();
     browsePage.waitForHCTableToLoad();
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/run/runFlow.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/run/runFlow.spec.tsx
@@ -115,6 +115,7 @@ describe("Run Tile tests", () => {
     runPage.explorerLink().click();
     browsePage.waitForSpinnerToDisappear();
     cy.waitForAsyncRequest();
+    browsePage.getTableView().click();
     browsePage.waitForHCTableToLoad();
 
     cy.wait(3000);
@@ -147,6 +148,7 @@ describe("Run Tile tests", () => {
     runPage.explorerLink().click();
     browsePage.waitForSpinnerToDisappear();
     cy.waitForAsyncRequest();
+    browsePage.getTableView().click();
     browsePage.waitForHCTableToLoad();
 
     //Revalidate below with DHFPROD-8455
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
@@ -28,14 +28,12 @@ describe("Test '/Explore' left sidebar", () => {
   beforeEach(() => {
     //Restoring Local Storage to Preserve Session
     Cypress.Cookies.preserveOnce("HubCentralSession");
-    cy.restoreLocalStorage().then(() => {
-      cy.log(`**Go to Explore section**`);
-      cy.visit("/tiles/explore");
-    });
+    cy.restoreLocalStorage();
 
   });
 
   it("Validate that the left sidebar opens up and closes correctly when un/selecting a base entity", () => {
+    cy.visit("/tiles/explore");
     cy.wait(8000);
     entitiesSidebar.showMoreEntities().click({force: true});
     cy.log("**Base entity tooltip is visible**");
@@ -100,6 +98,8 @@ describe("Test '/Explore' left sidebar", () => {
   it("Validate facets on table view and applying them over a base entities", () => {
     // cy.log("**Opening table view**");
     // browsePage.getTableView().click();
+    browsePage.waitForSpinnerToDisappear();
+
     cy.log(`**Selecting 'Customer' base entity**`);
     cy.wait(2000);
     //TODO: Need to click on Show more because a 6th entity it's being created in another test and not being deleted after
@@ -116,6 +116,7 @@ describe("Test '/Explore' left sidebar", () => {
     browsePage.getAppliedFacets("Adams Cole").should("exist");
 
     cy.log("**Checking table rows amount shown**");
+    browsePage.getTableView().click();
     browsePage.getHCTableRows().should("have.length", 2);
 
     cy.log("**Testing date facet**");
@@ -128,6 +129,7 @@ describe("Test '/Explore' left sidebar", () => {
   it("Base Entity Filtering from side panel", () => {
     cy.log("Navigate to Graph View and verify all entities displayed");
     cy.wait(5000);
+    browsePage.getClearAllFacetsButton().click();
     browsePage.clickGraphView().click();
     cy.wait(5000);
     graphExplore.getPositionsOfNodes(ExploreGraphNodes.CUSTOMER_102).then((nodePositions: any) => {
@@ -144,6 +146,7 @@ describe("Test '/Explore' left sidebar", () => {
     entitiesSidebar.selectBaseEntityOption("Order");
     entitiesSidebar.getBaseEntityOption("Order").should("be.visible");
     cy.wait(1000);
+    browsePage.getFinalDatabaseButton().click();
     graphExplore.getPositionsOfNodes(ExploreGraphNodes.CUSTOMER_102).then((nodePositions: any) => {
       let custCoordinates: any = nodePositions[ExploreGraphNodes.CUSTOMER_102];
       expect(custCoordinates).to.equal(undefined);
@@ -210,9 +213,12 @@ describe("Test '/Explore' left sidebar", () => {
     entitiesSidebar.getRelatedEntity("Customer").should("be.visible");
     entitiesSidebar.getRelatedEntity("Customer").trigger("mouseover");
     entitiesSidebar.getDisabledEntityTooltip().should("be.visible");
+    browsePage.getClearAllFacetsButton().trigger("mouseover", {force: true});
 
     cy.log("verify related entity panel is enabled when Customer is deselected as a base entity");
     entitiesSidebar.removeLastSelectedBaseEntity();
+    cy.wait(500);
+    entitiesSidebar.removeLastSelectedBaseEntity();
     entitiesSidebar.getRelatedEntity("Customer").should("be.visible");
     entitiesSidebar.getRelatedEntity("Customer").trigger("mouseover");
     entitiesSidebar.getDisabledEntityTooltip().should("not.exist");
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreExport.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreExport.spec.tsx
@@ -26,6 +26,7 @@ describe("Test table export icon", () => {
   it("Validate that the export icon appear only when an entity is selected", () => {
     cy.log("**Go to Explore section**");
     toolbar.getExploreToolbarIcon().click();
+    browsePage.getTableView().click();
 
     cy.log("**Export button should not exist in snippet, graph and table view**");
     browsePage.clickFacetView();
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreTableValidations.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreTableValidations.spec.tsx
@@ -29,6 +29,7 @@ describe("Validate table and column selector in explore", () => {
   });
   it("Navigate to Explore", () => {
     cy.waitUntil(() => toolbar.getExploreToolbarIcon()).click();
+    browsePage.getTableView().click();
     browsePage.waitForSpinnerToDisappear();
     browsePage.waitForHCTableToLoad();
   });
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreXMLValidations.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/exploreXMLValidations.spec.tsx
@@ -34,6 +34,8 @@ describe("xml scenario for snippet view on browse documents page", () => {
   });
   it("select Customer XML entity instances and verify entity, docs, hub/entity properties", () => {
     toolbar.getExploreToolbarIcon().should("be.visible").click();
+    browsePage.getTableView().click();
+    browsePage.waitForSpinnerToDisappear();
     browsePage.clickFacetView();
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Customer");
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphExportPNG.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphExportPNG.spec.tsx
@@ -25,12 +25,11 @@ describe("Test graph export to png", () => {
   it("Validate that the export png icon appear only in graph view and can export", () => {
     cy.log("**Go to Explore section**");
     toolbar.getExploreToolbarIcon().click();
-
+    browsePage.getTableView().click();
+    graphExplore.getExportPNGIcon().should("not.exist");
     cy.log("**Export button should not exist in snippet and table view**");
     browsePage.clickFacetView();
     graphExplore.getExportPNGIcon().should("not.exist");
-    browsePage.clickTableView();
-    graphExplore.getExportPNGIcon().should("not.exist");
 
     cy.log("**Select Graph view and check that the export button exist and show the tooltip**");
     browsePage.clickGraphView();
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphSidePanel.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/graphSidePanel.spec.tsx
@@ -1,6 +1,5 @@
 import {Application} from "../../support/application.config";
 import {toolbar} from "../../support/components/common";
-import browsePage from "../../support/pages/browse";
 import graphExplore from "../../support/pages/graphExplore";
 import LoginPage from "../../support/pages/login";
 import {ExploreGraphNodes} from "../../support/types/explore-graph-nodes";
@@ -29,8 +28,7 @@ describe("Test '/Explore' graph right panel", () => {
     cy.log("**Go to Explore section?**");
     toolbar.getExploreToolbarIcon().click();
 
-    cy.log("**Select Graph view**");
-    browsePage.clickGraphView();
+    cy.log("**Verify Graph view is default view**");
     graphExplore.getGraphVisCanvas().should("be.visible");
     //cy.wait(2000);
     graphExplore.stopStabilization();
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/jsonOtherValidations.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/jsonOtherValidations.spec.tsx
@@ -33,6 +33,7 @@ describe("Verify numeric/date facet can be applied", () => {
   });
   it("Apply numeric facet values multiple times, clears the previous values and applies the new one", () => {
     cy.waitUntil(() => toolbar.getExploreToolbarIcon()).click();
+    browsePage.getTableView().click();
     browsePage.waitForSpinnerToDisappear();
     browsePage.waitForHCTableToLoad();
     entitiesSidebar.openBaseEntityDropdown();
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/jsonTableViewValidations.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/jsonTableViewValidations.spec.tsx
@@ -26,6 +26,7 @@ describe("json scenario for table on browse documents page", () => {
     cy.loginAsDeveloper().withRequest();
     cy.waitForAsyncRequest();
     cy.waitUntil(() => toolbar.getExploreToolbarIcon()).click();
+    browsePage.getTableView().click();
     browsePage.waitForSpinnerToDisappear();
     browsePage.waitForHCTableToLoad();
   });
@@ -225,13 +226,13 @@ describe("json scenario for table on browse documents page", () => {
     // TODO DHFPROD-7711 skip since fails for Ant Design components
     // browsePage.clickClearFacetSearchSelection("adamscole@nutralab.com");
     browsePage.clickTableView();
+    browsePage.getClearAllFacetsButton().click({force: true});
     // TODO DHFPROD-7711 skip since fails for Ant Design components
     // browsePage.getClearFacetSearchSelection("Adams Cole").should("exist");
     // browsePage.getTotalDocuments().should("be.equal", 2);
   });
 
   it("verify hub properties grey facets are not being removed when entity properties are selected", () => {
-    browsePage.getClearAllFacetsButton().click();
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Customer");
     entitiesSidebar.getBaseEntityOption("Customer").should("be.visible");
@@ -241,10 +242,8 @@ describe("json scenario for table on browse documents page", () => {
     browsePage.getGreySelectedFacets("Adams Cole").should("exist");
     browsePage.getFacetApplyButton().click();
     entitiesSidebar.backToMainSidebar().click();
-    browsePage.getFacetItemCheckbox("collection", "mapCustomersJSON").scrollIntoView().click({force: true});
+    cy.wait(1000);
     browsePage.getFacetItemCheckbox("flow", "CurateCustomerJSON").click({force: true});
-    browsePage.getFacetItemCheckbox("collection", "mapCustomersJSON").should("exist");
-    browsePage.getFacetItemCheckbox("collection", "mapCustomersJSON").should("be.checked");
     browsePage.getFacetItemCheckbox("flow", "CurateCustomerJSON").should("exist");
     browsePage.getFacetItemCheckbox("flow", "CurateCustomerJSON").should("be.checked");
 
@@ -256,34 +255,31 @@ describe("json scenario for table on browse documents page", () => {
     browsePage.getFacetItemCheckbox("source-type", "CustomerSourceType").should("exist");
     browsePage.getFacetItemCheckbox("source-type", "CustomerSourceType").should("be.checked");
 
-    browsePage.getGreySelectedFacets("mapCustomersJSON").should("exist");
     browsePage.getGreySelectedFacets("CurateCustomerJSON").should("exist");
     browsePage.getGreySelectedFacets("CustomerSourceName").should("exist");
     browsePage.getGreySelectedFacets("CustomerSourceType").should("exist");
 
     browsePage.clickClearFacetSearchSelection("Adams Cole");
     browsePage.getGreySelectedFacets("Adams Cole").should("not.exist");
     entitiesSidebar.openBaseEntityFacets(BaseEntityTypes.CUSTOMER);
-    browsePage.getFacetItemCheckbox("name", "Bowman Hale").click();
-    browsePage.getGreySelectedFacets("mapCustomersJSON").should("exist");
+    browsePage.getFacetItemCheckbox("name", "Adams Cole").click();
     browsePage.getGreySelectedFacets("CurateCustomerJSON").should("exist");
     browsePage.getGreySelectedFacets("CustomerSourceName").should("exist");
     browsePage.getGreySelectedFacets("CustomerSourceType").should("exist");
-    browsePage.getGreySelectedFacets("Bowman Hale").should("exist");
+    browsePage.getGreySelectedFacets("Adams Cole").should("exist");
     browsePage.getFacetApplyButton().click();
-    browsePage.getSelectedFacet("mapCustomersJSON").should("exist");
     browsePage.getSelectedFacet("CurateCustomerJSON").should("exist");
-    browsePage.getSelectedFacet("Bowman Hale").should("exist");
+    browsePage.getSelectedFacet("Adams Cole").should("exist");
     entitiesSidebar.backToMainSidebar().click();
-    entitiesSidebar.openBaseEntityDropdown();
-    entitiesSidebar.selectBaseEntityOption("All Entities");
-    entitiesSidebar.getBaseEntityOption("All Entities").should("be.visible");
-    browsePage.getClearAllFacetsButton().click();
+    cy.wait(5000);
     browsePage.waitForSpinnerToDisappear();
-  });
+    // });
 
-  it("apply multiple facets, select and discard new facet, verify original facets checked", () => {
-    entitiesSidebar.showMoreEntities().click();
+    // it("apply multiple facets, select and discard new facet, verify original facets checked", () => {
+    cy.log("*apply multiple facets, select and discard new facet, verify original facets checked*");
+    browsePage.getClearAllFacetsButton().click();
+    cy.wait(3000);
+    entitiesSidebar.toggleEntitiesView();
     entitiesSidebar.openBaseEntityFacets(BaseEntityTypes.CUSTOMER);
     browsePage.getShowMoreLink("name").click();
     browsePage.getFacetItemCheckbox("name", "Jacqueline Knowles").click();
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/verifyDataInDatabases.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/explore/verifyDataInDatabases.spec.tsx
@@ -35,8 +35,8 @@ describe("Verify All Data for final/staging databases and non-entity detail page
 
   it("Switch on zero state page and select query parameters for final database", () => {
     cy.waitUntil(() => toolbar.getExploreToolbarIcon()).click();
-    entitiesSidebar.toggleAllDataView();
     cy.wait(3000);
+    entitiesSidebar.toggleAllDataView();
     browsePage.search("Adams");
     //verify the query data for final database on explore page
     browsePage.waitForSpinnerToDisappear();
@@ -79,6 +79,8 @@ describe("Verify All Data for final/staging databases and non-entity detail page
     entitiesSidebar.selectBaseEntityOption("Customer");
     browsePage.waitForSpinnerToDisappear();
     cy.waitForAsyncRequest();
+    browsePage.getTableView().click();
+    browsePage.waitForSpinnerToDisappear();
     browsePage.getTotalDocuments().should("be.equal", 11);
     entitiesSidebar.toggleAllDataView();
     browsePage.waitForSpinnerToDisappear();
@@ -121,6 +123,8 @@ describe("Verify All Data for final/staging databases and non-entity detail page
     //Verify if the pagination gets reset upon cliking on database buttons
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("All Entities");
+    browsePage.getTableView().click();
+    browsePage.waitForSpinnerToDisappear();
     browsePage.getTotalDocuments().then(val => {
       browsePage.scrollToBottom();
       browsePage.getPaginationPageSizeOptions().select("10 / page", {force: true});
@@ -146,6 +150,8 @@ describe("Verify All Data for final/staging databases and non-entity detail page
   it("Switch to final database and verify the number of documents for the search string is 1", () => {
 
     toolbar.getExploreToolbarIcon().click();
+    browsePage.getTableView().click();
+    browsePage.waitForSpinnerToDisappear();
     browsePage.getFinalDatabaseButton().click();
     browsePage.waitForSpinnerToDisappear();
     browsePage.search("Powers");
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/mastering/e2eMasteringflow.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/mastering/e2eMasteringflow.spec.tsx
@@ -192,6 +192,7 @@ describe("Validate E2E Mastering Flow", () => {
     runPage.explorerLink().click();
     browsePage.waitForSpinnerToDisappear();
     cy.waitForAsyncRequest();
+    browsePage.getTableView().click();
     browsePage.waitForHCTableToLoad();
     browsePage.getTotalDocuments().should("eq", 14);
     browsePage.getHubPropertiesExpanded();
@@ -394,6 +395,7 @@ describe("Validate E2E Mastering Flow", () => {
     runPage.explorerLink().click();
     browsePage.waitForSpinnerToDisappear();
     cy.waitForAsyncRequest();
+    browsePage.getTableView().click();
     browsePage.waitForHCTableToLoad();
     browsePage.getTotalDocuments().should("eq", 2);
     browsePage.getHubPropertiesExpanded();
diff --git a/marklogic-data-hub-central/ui/src/api/queries.tsx b/marklogic-data-hub-central/ui/src/api/queries.tsx
@@ -130,4 +130,7 @@ export const expandGroupNode = async (payload: any, limit?: number) => {
 
 export const searchResultsQuery = async (searchPayload: any) => {
   return await axios.post(`/api/entitySearch?database=${searchPayload.database}`, searchPayload.data);
-};
+};
+export const getEntities = async () => {
+  return await axios.get(`/api/models`);
+};
diff --git a/marklogic-data-hub-central/ui/src/components/base-entities-facet/base-entities-facet.tsx b/marklogic-data-hub-central/ui/src/components/base-entities-facet/base-entities-facet.tsx
@@ -33,8 +33,8 @@ const BaseEntitiesFacet: React.FC<Props> = (props) => {
     setSearchOptions,
   } = useContext(SearchContext);
 
-  const [entityNames, setEntityNames] = useState<string[]>(searchOptions.entityTypeIds.length === 0 ? ["All Entities"] : searchOptions.entityTypeIds);
-  const [displayList, setDisplayList] = useState<any[]>(entitiesSorting(currentBaseEntities));
+  const [entityNames, setEntityNames] = useState<string[]>(searchOptions.entityTypeIds.length === 0 ? ["All Entities"] : entitiesSorting(searchOptions.entityTypeIds));
+  const [displayList, setDisplayList] = useState<any[]>(baseEntitiesSorting(currentBaseEntities));
   const [showMore, setShowMore] = useState<boolean>(false);
 
 
@@ -54,10 +54,10 @@ const BaseEntitiesFacet: React.FC<Props> = (props) => {
   }, [allBaseEntities, searchOptions.entityTypeIds]);
 
   useEffect(() => {
-    setDisplayList(currentBaseEntities);
+    setDisplayList(baseEntitiesSorting(currentBaseEntities));
   }, [currentBaseEntities]);
 
-  const childrenOptions = allBaseEntities.map(element => ({value: element.name, label: element.name, isDisabled: false})).filter(obj => obj.value && obj.label);
+  const childrenOptions = baseEntitiesSorting(allBaseEntities).map(element => ({value: element.name, label: element.name, isDisabled: false})).filter(obj => obj.value && obj.label);
   childrenOptions.unshift({
     value: "-",
     label: "-",
@@ -74,7 +74,7 @@ const BaseEntitiesFacet: React.FC<Props> = (props) => {
     const selectedItems = selection.map(element => element.value);
     if (selectedItems.length === 0 || selectedItems[selectedItems.length - 1] === "All Entities") {
       setEntityNames(["All Entities"]);
-      setCurrentBaseEntities(allBaseEntities);
+      setCurrentBaseEntities(baseEntitiesSorting(allBaseEntities));
       setSearchOptions({
         ...searchOptions,
         entityTypeIds: allBaseEntities.map(entities => entities.name),
@@ -86,7 +86,7 @@ const BaseEntitiesFacet: React.FC<Props> = (props) => {
       const clearSelection = selectedItems.filter(entity => entity !== "All Entities").map((entity => entity));
       const filteredEntities = allBaseEntities.filter(entity => clearSelection.includes(entity.name));
       setEntityNames(clearSelection);
-      setCurrentBaseEntities(filteredEntities);
+      setCurrentBaseEntities(baseEntitiesSorting(filteredEntities));
       setSearchOptions({
         ...searchOptions,
         entityTypeIds: clearSelection,
diff --git a/marklogic-data-hub-central/ui/src/components/sidebar/sidebar.tsx b/marklogic-data-hub-central/ui/src/components/sidebar/sidebar.tsx
diff --git a/marklogic-data-hub-central/ui/src/pages/Browse.tsx b/marklogic-data-hub-central/ui/src/pages/Browse.tsx
diff --git a/marklogic-data-hub-central/ui/src/services/user-preferences.tsx b/marklogic-data-hub-central/ui/src/services/user-preferences.tsx
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/impl/entity-lib.sjs b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/impl/entity-lib.sjs
