fix remainder of cypress tests and enable v2 ui to be toggle-able

Author: chriscollins3456

datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx

@@ -246,7 +246,7 @@ export const NavSidebar = () => {
             {
                 type: NavBarMenuItemTypes.Item,
                 title: 'Sign out',
-                icon: <SignOut />,
+                icon: <SignOut data-testid="log-out-menu-item" />,
                 key: 'signOut',
                 onClick: logout,
                 href: '/logOut',

metadata-service/configuration/src/main/resources/application.yaml

@@ -483,9 +483,9 @@ featureFlags:
   businessAttributeEntityEnabled: ${BUSINESS_ATTRIBUTE_ENTITY_ENABLED:false} # Enables business attribute entity which can be associated with field of dataset
   dataContractsEnabled: ${DATA_CONTRACTS_ENABLED:true} # Enables the Data Contracts feature (Tab) in the UI
   alternateMCPValidation: ${ALTERNATE_MCP_VALIDATION:false} # Enables alternate MCP validation flow
-  themeV2Enabled: ${THEME_V2_ENABLED:false} # Allows theme v2 to be turned on. One of themeV2Default and themeV2Toggleable must be false for this to have any effect.
+  themeV2Enabled: ${THEME_V2_ENABLED:true} # Allows theme v2 to be turned on. One of themeV2Default and themeV2Toggleable must be false for this to have any effect.
   themeV2Default: ${THEME_V2_DEFAULT:false} # Sets the default theme for users. The default is the only available theme if theme is not toggleable.
-  themeV2Toggleable: ${THEME_V2_TOGGLEABLE:false} # Acryl only! Allows theme v2 to be toggled on / off by users.
+  themeV2Toggleable: ${THEME_V2_TOGGLEABLE:true} # Acryl only! Allows theme v2 to be toggled on / off by users.
   schemaFieldCLLEnabled: ${SCHEMA_FIELD_CLL_ENABLED:false} # Enables links to schema field-level lineage on lineage explorer and columns tab
   schemaFieldLineageIgnoreStatus: ${SCHEMA_FIELD_LINEAGE_IGNORE_STATUS:true} # If turned on, schema field lineage will always fetch ghost entities
   showSeparateSiblings: ${SHOW_SEPARATE_SIBLINGS:false} # If turned on, all siblings will be separated with no way to get to a "combined" sibling view

smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js

@@ -1,22 +1,5 @@
 const domainName = "CypressNestedDomain";
 
-// Delete Unecessary Existing Domains
-const deleteExisitingDomain = () => {
-  cy.get('a[href*="urn:li"] span[class^="ant-typography"]')
-    .should("be.visible")
-    .its("length")
-    .then((length) => {
-      for (let i = 0; i < length - 1; i++) {
-        cy.get('a[href*="urn:li"] span[class^="ant-typography"]')
-          .should("be.visible")
-          .first()
-          .click({ force: true });
-        deleteFromDomainDropdown();
-      }
-    });
-  cy.waitTextVisible("Marketing");
-};
-
 const createDomain = () => {
   cy.get(".anticon-plus").first().click();
   cy.waitTextVisible("Create New Domain");
@@ -44,6 +27,7 @@ const moveDomaintoParent = () => {
   cy.clickOptionWithText(domainName);
   cy.waitTextVisible(domainName);
   cy.openThreeDotDropdown();
+  cy.waitTextVisible("Filters");
   cy.clickOptionWithTestId("entity-menu-move-button");
   cy.clickOptionWithTestId("move-domain-modal-move-button");
 };
@@ -99,15 +83,12 @@ const clearAndDelete = () => {
 
 describe("Verify nested domains test functionalities", () => {
   beforeEach(() => {
+    cy.setIsThemeV2Enabled(false);
     cy.loginWithCredentials();
     cy.goToDomainList();
   });
 
   it("Verify Create a new domain", () => {
-    deleteExisitingDomain();
-    cy.get('a[href*="urn:li"] span[class^="ant-typography"]').should(
-      "be.visible",
-    );
     createDomain();
     cy.waitTextVisible("Domains");
   });
@@ -136,6 +117,7 @@ describe("Verify nested domains test functionalities", () => {
   it("Verify Right side panel functionalities", () => {
     cy.clickOptionWithText(domainName);
     cy.waitTextVisible("Filters");
+    cy.get('[data-node-key="Documentation"]').click();
     cy.clickOptionWithText("Add Documentation");
     clearAndType("Test documentation");
     cy.clickOptionWithTestId("description-editor-save-button");
@@ -202,34 +184,6 @@ describe("Verify nested domains test functionalities", () => {
     clearAndDelete();
   });
 
-  it("Verify Right side panel functionalities", () => {
-    cy.clickOptionWithText(domainName);
-    cy.waitTextVisible("Filters");
-    cy.clickOptionWithText("Add Documentation");
-    clearAndType("Test documentation");
-    cy.clickOptionWithTestId("description-editor-save-button");
-    cy.ensureTextNotPresent("Add Documentation");
-    cy.waitTextVisible("Test documentation");
-    cy.clickFirstOptionWithSpecificTestId("add-link-button", 1);
-    cy.waitTextVisible("URL");
-    cy.enterTextInTestId("add-link-modal-url", "www.test.com");
-    cy.enterTextInTestId("add-link-modal-label", "Test Label");
-    cy.clickOptionWithTestId("add-link-modal-add-button");
-    cy.waitTextVisible("Test Label");
-    cy.clickOptionWithTestId("add-owners-button");
-    cy.waitTextVisible("Find a user or group");
-    cy.clickTextOptionWithClass(".rc-virtual-list-holder-inner", "DataHub");
-    cy.clickOptionWithText("Find a user or group");
-    cy.clickOptionWithId("#addOwnerButton");
-    cy.waitTextVisible("DataHub");
-    cy.goToDomainList();
-    cy.waitTextVisible("Test documentation");
-    cy.waitTextVisible("DataHub");
-    cy.clickOptionWithText(domainName);
-    cy.clickOptionWithText("Documentation");
-    clearAndDelete();
-  });
-
   it("Verify Edit Domain Name", () => {
     cy.clickFirstOptionWithText(domainName);
     cy.clickOptionWithText("Filters");

smoke-test/tests/cypress/cypress/e2e/lineage/download_lineage_results.js

@@ -72,7 +72,7 @@ describe("download lineage results to .csv file", () => {
 
     // Verify 1st 2nd and 3+ degree of dependencies(Verify multi page download)
     cy.get('[data-testid="facet-degree-3+"]').click().wait(5000);
-    cy.contains(/1 - 10 of 1[3-4]/);
+    cy.contains(/1 - 10 of 1[3-6]/);
     downloadCsvFile("third_plus_degree_results.csv");
     const third_degree_csv = cy.readFile(
       "cypress/downloads/third_plus_degree_results.csv",

smoke-test/tests/cypress/cypress/e2e/search/search.js

@@ -85,7 +85,7 @@ describe("search", () => {
     // has the term in non-editable metadata
     cy.contains("cypress_logging_events");
 
-    cy.contains("of 2 results");
+    cy.contains(/Showing 1 - [2-4] of [2-4]/);
   });
 
   it("can search by AND-ing two concepts using advanced search", () => {

smoke-test/tests/cypress/cypress/e2e/search/searchFilters.js

@@ -56,12 +56,12 @@ describe("search", () => {
       "include",
       "filter_tags___false___EQUAL___0=urn%3Ali%3Atag%3ACypress",
     );
-    cy.get("[data-testid=update-filters").should("not.exist");
+    cy.get("[data-testid=update-filters").should("not.be.visible");
 
     // select datasets filter
     cy.get("[data-testid=filter-dropdown-Type").click({ force: true });
     cy.get("[data-testid=filter-option-Datasets").click({ force: true });
-    cy.get("[data-testid=update-filters").click({ force: true });
+    cy.get("[data-testid=update-filters").eq(1).click({ force: true });
     cy.url().should(
       "include",
       "filter__entityType%E2%90%9EtypeNames___false___EQUAL___1=DATASET",

smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_managing_groups.js

@@ -39,6 +39,7 @@ describe("create and manage group", () => {
   it("create a group", () => {
     cy.visit("/settings/identities/groups");
     cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.clickOptionWithText("Create group");
     cy.waitTextVisible("Create new group");
     cy.get("#name").type(group_name);
@@ -54,6 +55,7 @@ describe("create and manage group", () => {
   it("add test user to a group", () => {
     cy.visit("/settings/identities/users");
     cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.get(".ant-tabs-tab-btn").contains("Groups").click();
     cy.clickOptionWithText(group_name);
     cy.clickTextOptionWithClass(".ant-typography", group_name);
@@ -78,6 +80,7 @@ describe("create and manage group", () => {
   it("update group info", () => {
     cy.visit("/settings/identities/groups");
     cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.clickOptionWithText(group_name);
     cy.clickOptionWithSpecificClass(".ant-typography", 0);
     cy.clickOptionWithTestId("EditOutlinedIcon");
@@ -96,6 +99,7 @@ describe("create and manage group", () => {
   it("user verify to edit the discription", () => {
     cy.visit("/settings/identities/groups");
     cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.contains(`Test group EDITED ${test_id}`).should("be.visible").click();
     cy.get('[data-testid="EditOutlinedIcon"]').eq(1).click();
     cy.contains("Test group description").should("be.visible").type(" EDITED");
@@ -109,6 +113,7 @@ describe("create and manage group", () => {
   it("user verify to add the owner", () => {
     cy.visit("/settings/identities/groups");
     cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.contains(`Test group EDITED ${test_id}`).should("be.visible").click();
     cy.get(".anticon.anticon-plus").click();
     cy.get('[aria-label="Close"]').should("be.visible");
@@ -127,6 +132,7 @@ describe("create and manage group", () => {
   it("test User verify group participation", () => {
     cy.visit("/settings/identities/groups");
     cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.hideOnboardingTour();
     cy.clickOptionWithText(`Test group EDITED ${test_id}`);
     cy.get(".ant-tabs-tab").contains("Members").click();
@@ -136,6 +142,7 @@ describe("create and manage group", () => {
   it("remove group", () => {
     cy.visit("/settings/identities/groups");
     cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.get(
       `[href="/group/urn:li:corpGroup:${test_id}"]`,
     ).openThreeDotDropdown();

smoke-test/tests/cypress/cypress/e2e/viewV2/v2_manage_views.js

@@ -7,7 +7,8 @@ describe("manage views", () => {
 
     cy.login();
     cy.goToViewsSettings();
-    cy.waitTextVisible("Platform");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
     cy.clickOptionWithText("Create new View");
     cy.get(".ant-input-affix-wrapper > input[type='text']")
       .first()

smoke-test/tests/cypress/cypress/e2e/views/view_select.js

@@ -41,11 +41,11 @@ describe("view select", () => {
     cy.log("Ensure the View filter has been applied correctly.");
     cy.contains("SampleCypressHdfsDataset");
     cy.contains("cypress_logging_events");
-    cy.contains("of 2 results");
+    cy.contains(/Showing 1 - [2-4] of [2-4]/);
 
     cy.log("Clear the selected view");
     cy.clearView(viewName);
-    cy.ensureTextNotPresent("of 2 results");
+    cy.ensureTextNotPresent(/Showing 1 - [2-4] of [2-4]/);
 
     cy.log("Now edit the view");
     openViewEditDropDownAndClickId("view-dropdown-edit");