Data picker

e2e/support/helpers/e2e-collection-helpers.js

@@ -1,4 +1,10 @@
-import { entityPickerModal, getFullName, popover } from "e2e/support/helpers";
+import {
+  entityPickerModal,
+  entityPickerModalLevel,
+  entityPickerModalTab,
+  getFullName,
+  popover,
+} from "e2e/support/helpers";
 
 /**
  * Clicks the "+" icon on the collection page and selects one of the menu options
@@ -86,12 +92,12 @@ export const moveOpenedCollectionTo = newParent => {
 
 export function pickEntity({ path, select, tab }) {
   if (tab) {
-    cy.findByRole("tab", { name: tab }).click();
+    entityPickerModalTab(tab).click();
   }
   if (path) {
     cy.findByTestId("nested-item-picker").within(() => {
       for (const [index, name] of path.entries()) {
-        cy.findByTestId(`item-picker-level-${index}`).findByText(name).click();
+        entityPickerModalLevel(index).findByText(name).click();
       }
     });
   }

e2e/support/helpers/e2e-notebook-helpers.ts

@@ -1,6 +1,10 @@
 import type { CyHttpMessages } from "cypress/types/net-stubbing";
 
-import { popover } from "e2e/support/helpers/e2e-ui-elements-helpers";
+import {
+  entityPickerModal,
+  entityPickerModalTab,
+  popover,
+} from "e2e/support/helpers/e2e-ui-elements-helpers";
 import type { NotebookStepType } from "metabase/query_builder/components/notebook/types";
 
 /**
@@ -143,7 +147,11 @@ export function joinTable(
   lhsColumnName?: string,
   rhsColumnName?: string,
 ) {
-  popover().findByText(tableName).click();
+  entityPickerModal().within(() => {
+    entityPickerModalTab("Tables").click();
+    cy.findByText(tableName).click();
+  });
+
   if (lhsColumnName && rhsColumnName) {
     popover().findByText(lhsColumnName).click();
     popover().findByText(rhsColumnName).click();
@@ -166,25 +174,22 @@ export function selectSavedQuestionsToJoin(
   secondQuestionName: string,
 ) {
   cy.intercept("GET", "/api/database/*/schemas").as("loadSchemas");
-  cy.findAllByTestId("data-bucket-list-item")
-    .contains("Saved Questions")
-    .click();
+  entityPickerModal().within(() => {
+    entityPickerModalTab("Models").should("exist");
+    entityPickerModalTab("Tables").should("exist");
+    entityPickerModalTab("Saved questions").click();
+    cy.findByText(firstQuestionName).click();
+  });
 
-  cy.findByTestId("select-list")
-    .findAllByRole("menuitem")
-    .contains(firstQuestionName)
-    .click();
   cy.wait("@loadSchemas");
 
   // join to question b
   cy.icon("join_left_outer").click();
 
-  popover().within(() => {
-    cy.findByText("Sample Database").should("be.visible").click();
-    cy.findByText("Raw Data").should("be.visible").click();
-    cy.findAllByTestId("data-bucket-list-item")
-      .contains("Saved Questions")
-      .click();
+  entityPickerModal().within(() => {
+    entityPickerModalTab("Models").should("exist");
+    entityPickerModalTab("Tables").should("exist");
+    entityPickerModalTab("Saved questions").click();
     cy.findByText(secondQuestionName).click();
   });
 }

e2e/support/helpers/e2e-ui-elements-helpers.js

@@ -32,6 +32,18 @@ export function entityPickerModal() {
   return cy.findByTestId("entity-picker-modal");
 }
 
+export function entityPickerModalLevel(level) {
+  return cy.findByTestId(`item-picker-level-${level}`);
+}
+
+export function entityPickerModalItem(level, name) {
+  return entityPickerModalLevel(level).findByText(name).parents("button");
+}
+
+export function entityPickerModalTab(name) {
+  return cy.findAllByRole("tab").filter(`:contains(${name})`);
+}
+
 export function collectionOnTheGoModal() {
   return cy.findByTestId("create-collection-on-the-go");
 }

e2e/test/scenarios/admin/datamodel/editor.cy.spec.js

@@ -6,15 +6,17 @@ import {
 import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
 import {
   describeEE,
+  entityPickerModal,
+  entityPickerModalTab,
+  moveDnDKitElement,
   openOrdersTable,
   openProductsTable,
   openReviewsTable,
+  openTable,
   popover,
   restore,
-  startNewQuestion,
   setTokenFeatures,
-  openTable,
-  moveDnDKitElement,
+  startNewQuestion,
 } from "e2e/support/helpers";
 
 const { ORDERS, ORDERS_ID, PRODUCTS_ID, REVIEWS, REVIEWS_ID, PEOPLE_ID } =
@@ -54,8 +56,8 @@ describe("scenarios > admin > datamodel > editor", () => {
       cy.findByText("Updated Table display_name").should("be.visible");
 
       startNewQuestion();
-      popover().within(() => {
-        cy.findByText("Raw Data").click();
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Tables").click();
         cy.findByText("People").should("be.visible");
         cy.findByText("New orders").should("be.visible");
       });
@@ -101,8 +103,8 @@ describe("scenarios > admin > datamodel > editor", () => {
       cy.findByText("5 Hidden Tables").should("be.visible");
 
       startNewQuestion();
-      popover().within(() => {
-        cy.findByText("Raw Data").click();
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Tables").click();
         cy.findByText("People").should("be.visible");
         cy.findByText("Orders").should("not.exist");
       });
@@ -115,8 +117,8 @@ describe("scenarios > admin > datamodel > editor", () => {
       cy.findByText("4 Hidden Tables").should("be.visible");
 
       startNewQuestion();
-      popover().within(() => {
-        cy.findByText("Raw Data").click();
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Tables").click();
         cy.findByText("People").should("be.visible");
         cy.findByText("Orders").should("be.visible");
       });
@@ -227,7 +229,8 @@ describe("scenarios > admin > datamodel > editor", () => {
 
       openTable({ database: SAMPLE_DB_ID, table: ORDERS_ID, mode: "notebook" });
       cy.icon("join_left_outer").click();
-      popover().within(() => {
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Tables").click();
         cy.findByText("Products").click();
       });
       // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
@@ -409,7 +412,8 @@ describe("scenarios > admin > datamodel > editor", () => {
 
       openTable({ database: SAMPLE_DB_ID, table: ORDERS_ID, mode: "notebook" });
       cy.icon("join_left_outer").click();
-      popover().within(() => {
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Tables").click();
         cy.findByText("Products").click();
       });
       // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
@@ -438,8 +442,8 @@ describe("scenarios > admin > datamodel > editor", () => {
 
       cy.signInAsNormalUser();
       startNewQuestion();
-      popover().within(() => {
-        cy.findByText("Raw Data").click();
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Tables").click();
         cy.findByText("People").should("be.visible");
         cy.findByText("New orders").should("be.visible");
       });
@@ -507,7 +511,8 @@ describe("scenarios > admin > datamodel > editor", () => {
       cy.signInAsNormalUser();
       openTable({ database: SAMPLE_DB_ID, table: ORDERS_ID, mode: "notebook" });
       cy.icon("join_left_outer").click();
-      popover().within(() => {
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Tables").click();
         cy.findByText("Products").click();
       });
       // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage

e2e/test/scenarios/admin/datamodel/hide_tables.cy.spec.js

@@ -1,6 +1,11 @@
 import { SAMPLE_DB_ID, SAMPLE_DB_SCHEMA_ID } from "e2e/support/cypress_data";
 import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
-import { restore, startNewQuestion } from "e2e/support/helpers";
+import {
+  entityPickerModal,
+  entityPickerModalTab,
+  restore,
+  startNewQuestion,
+} from "e2e/support/helpers";
 
 const { ORDERS_ID } = SAMPLE_DATABASE;
 
@@ -31,12 +36,11 @@ describe("scenarios > admin > datamodel > hidden tables (metabase#9759)", () =>
 
     // It shouldn't show in a new question data picker
     startNewQuestion();
-    // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-    cy.contains("Raw Data").click();
-    // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-    cy.contains("Products");
-    // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-    cy.contains("Orders").should("not.exist");
+    entityPickerModal().within(() => {
+      entityPickerModalTab("Tables").click();
+      cy.contains("Products").should("exist");
+      cy.contains("Orders").should("not.exist");
+    });
   });
 });
 

e2e/test/scenarios/binning/binning-reproductions.cy.spec.js

@@ -1,6 +1,7 @@
 import { SAMPLE_DB_ID } from "e2e/support/cypress_data";
 import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
 import {
+  entityPickerModal,
   restore,
   popover,
   visualize,
@@ -14,6 +15,7 @@ import {
   rightSidebar,
   chartPathWithFillColor,
   cartesianChartCircle,
+  entityPickerModalTab,
 } from "e2e/support/helpers";
 
 const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;
@@ -31,10 +33,10 @@ describe("binning related reproductions", () => {
     });
 
     startNewQuestion();
-    // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-    cy.findByText("Saved Questions").click();
-    // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-    cy.findByText("16327").click();
+    entityPickerModal().within(() => {
+      entityPickerModalTab("Saved questions").click();
+      cy.findByText("16327").click();
+    });
 
     // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
     cy.findByText("Pick the metric you want to see").click();
@@ -103,8 +105,8 @@ describe("binning related reproductions", () => {
     );
 
     startNewQuestion();
-    popover().within(() => {
-      cy.findByText("Saved Questions").click();
+    entityPickerModal().within(() => {
+      entityPickerModalTab("Saved questions").click();
       cy.findByText("17975").click();
     });
 
@@ -143,10 +145,8 @@ describe("binning related reproductions", () => {
 
     cy.icon("join_left_outer").click();
 
-    popover().within(() => {
-      cy.findByTextEnsureVisible("Sample Database").click();
-      cy.findByTextEnsureVisible("Raw Data").click();
-      cy.findByTextEnsureVisible("Saved Questions").click();
+    entityPickerModal().within(() => {
+      entityPickerModalTab("Saved questions").click();
       cy.findByText("18646").click();
     });
 
@@ -191,8 +191,8 @@ describe("binning related reproductions", () => {
     // it is essential for this repro to find question following these exact steps
     // (for example, visiting `/collection/root` would yield different result)
     startNewQuestion();
-    popover().within(() => {
-      cy.findByText("Saved Questions").click();
+    entityPickerModal().within(() => {
+      entityPickerModalTab("Saved questions").click();
       cy.findByText("11439").click();
     });
 
@@ -380,8 +380,10 @@ describe("binning related reproductions", () => {
 
 function openSummarizeOptions(questionType) {
   startNewQuestion();
-  cy.findByText("Saved Questions").click();
-  cy.findByText("16379").click();
+  entityPickerModal().within(() => {
+    entityPickerModalTab("Saved questions").click();
+    cy.findByText("16379").click();
+  });
 
   if (questionType === "Simple mode") {
     visualize();

e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js

@@ -1,5 +1,6 @@
 import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
 import {
+  entityPickerModal,
   restore,
   visualize,
   changeBinningForDimension,
@@ -8,6 +9,7 @@ import {
   echartsContainer,
   cartesianChartCircle,
   chartPathWithFillColor,
+  entityPickerModalTab,
 } from "e2e/support/helpers";
 
 const { ORDERS_ID, ORDERS, PEOPLE_ID, PEOPLE, PRODUCTS_ID, PRODUCTS } =
@@ -65,10 +67,11 @@ describe("scenarios > binning > from a saved QB question with explicit joins", (
   context("via simple mode", () => {
     beforeEach(() => {
       startNewQuestion();
-      // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-      cy.findByText("Saved Questions").click();
-      // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-      cy.findByText("QB Binning").click();
+
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Saved questions").click();
+        cy.findByText("QB Binning").click();
+      });
 
       visualize();
       summarize();
@@ -130,10 +133,11 @@ describe("scenarios > binning > from a saved QB question with explicit joins", (
   context("via notebook mode", () => {
     beforeEach(() => {
       startNewQuestion();
-      // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-      cy.findByText("Saved Questions").click();
-      // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-      cy.findByText("QB Binning").click();
+
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Saved questions").click();
+        cy.findByText("QB Binning").click();
+      });
 
       // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
       cy.findByText("Pick the metric you want to see").click();
@@ -202,10 +206,12 @@ describe("scenarios > binning > from a saved QB question with explicit joins", (
   context("via column popover", () => {
     beforeEach(() => {
       startNewQuestion();
-      // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-      cy.findByText("Saved Questions").click();
-      // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-      cy.findByText("QB Binning").click();
+
+      entityPickerModal().within(() => {
+        entityPickerModalTab("Saved questions").click();
+        cy.findByText("QB Binning").click();
+      });
+
       visualize();
     });
 

e2e/test/scenarios/collections/collections.cy.spec.js

@@ -72,7 +72,7 @@ describe("scenarios > collection defaults", () => {
       pickEntity({
         path: ["Our analytics", `Collection ${COLLECTIONS_COUNT}`],
         select: true,
-        tab: /Collections/,
+        tab: "Collections",
       });
 
       cy.findByTestId("new-collection-modal").button("Create").click();