Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Data Studio (#65281)

Alexander Polyankin96eac2d9dac3
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 22dfca0373e..dae0b12bb74 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -237,6 +237,7 @@
:api #{metabase.bookmarks.api}
:uses #{api
app-db
+ collections
config
premium-features
queries
@@ -1530,6 +1531,7 @@
api
app-db
audit-app
+ config
driver
lib
lib-be
@@ -1554,6 +1556,7 @@
lib
models
parameters
+ premium-features
query-processor
request
sync
@@ -1613,7 +1616,6 @@
warehouses
enterprise/advanced-permissions}}
-
xrays
{:team "Querying"
:api #{metabase.xrays.api
@@ -1840,6 +1842,22 @@
:api #{}
:uses #{premium-features}}
+ enterprise/data-studio
+ {:team "Gadget"
+ :api #{metabase-enterprise.data-studio.api}
+ :uses #{api
+ collections
+ database-routing
+ driver
+ events
+ lib
+ lib-be
+ queries
+ request
+ sync
+ util
+ warehouse-schema}}
+
enterprise/database-replication
{:team "Cloud"
:api #{metabase-enterprise.database-replication.api
@@ -1975,6 +1993,13 @@
:uses #{premium-features
settings}}
+ enterprise/library
+ {:team "UX West"
+ :api #{metabase-enterprise.library.api}
+ :uses #{api
+ collections
+ premium-features}}
+
enterprise/llm
{:team "Metabot"
:api #{metabase-enterprise.llm.api
diff --git a/.eslintrc.js b/.eslintrc.js
index 7eec4cfb4f8..060aaac0b11 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -241,6 +241,7 @@ module.exports = {
plugins: ["@typescript-eslint"],
rules: {
"prefer-rest-params": "off",
+ "react/prop-types": "off", // TypeScript handles prop validation
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-explicit-any": "off",
diff --git a/.loki/reference/chrome_laptop_App_Palette_Search.png b/.loki/reference/chrome_laptop_App_Palette_Search.png
index 854b551cd0a..cc07949a0bd 100644
Binary files a/.loki/reference/chrome_laptop_App_Palette_Search.png and b/.loki/reference/chrome_laptop_App_Palette_Search.png differ
diff --git a/e2e/support/helpers/api/createLibrary.ts b/e2e/support/helpers/api/createLibrary.ts
new file mode 100644
index 00000000000..523aa777cbe
--- /dev/null
+++ b/e2e/support/helpers/api/createLibrary.ts
@@ -0,0 +1,15 @@
+import type { Collection } from "metabase-types/api";
+
+type LibraryResponse = Collection & {
+ effective_children?: Collection[];
+};
+
+export const createLibrary = (): Cypress.Chainable<
+ Cypress.Response<LibraryResponse>
+> => {
+ cy.log("Initialize library");
+
+ return cy
+ .request("POST", "/api/ee/library")
+ .then(() => cy.request<LibraryResponse>("GET", "/api/ee/library"));
+};
diff --git a/e2e/support/helpers/api/createSnippetFolder.ts b/e2e/support/helpers/api/createSnippetFolder.ts
new file mode 100644
index 00000000000..30f5997e09c
--- /dev/null
+++ b/e2e/support/helpers/api/createSnippetFolder.ts
@@ -0,0 +1,20 @@
+import type { Collection } from "metabase-types/api";
+
+export type SnippetFolderDetails = {
+ name: string;
+ description?: string | null;
+ parent_id?: number | null;
+};
+
+export function createSnippetFolder({
+ name,
+ description = null,
+ parent_id = null,
+}: SnippetFolderDetails): Cypress.Chainable<Cypress.Response<Collection>> {
+ return cy.request("POST", "/api/collection", {
+ name,
+ description,
+ parent_id,
+ namespace: "snippets",
+ });
+}
diff --git a/e2e/support/helpers/api/createTransform.ts b/e2e/support/helpers/api/createTransform.ts
index 933f865663d..25e87c2e60d 100644
--- a/e2e/support/helpers/api/createTransform.ts
+++ b/e2e/support/helpers/api/createTransform.ts
@@ -41,7 +41,7 @@ export function createTransform(
cy.wrap(body.id).as(idAlias);
}
if (visitTransform) {
- cy.visit(`/admin/transforms/${body.id}`);
+ cy.visit(`/data-studio/transforms/${body.id}`);
}
});
}
diff --git a/e2e/support/helpers/api/createTransformJob.ts b/e2e/support/helpers/api/createTransformJob.ts
index 77e011caa95..cccc978abd9 100644
--- a/e2e/support/helpers/api/createTransformJob.ts
+++ b/e2e/support/helpers/api/createTransformJob.ts
@@ -40,7 +40,7 @@ export function createTransformJob(
cy.wrap(body.id).as(idAlias);
}
if (visitTransformJob) {
- cy.visit(`/admin/transforms/jobs/${body.id}`);
+ cy.visit(`/data-studio/transforms/jobs/${body.id}`);
}
});
}
diff --git a/e2e/support/helpers/api/index.ts b/e2e/support/helpers/api/index.ts
index 0624a12c28d..27b2fba12e5 100644
--- a/e2e/support/helpers/api/index.ts
+++ b/e2e/support/helpers/api/index.ts
@@ -7,6 +7,7 @@ export { createApiKey } from "./createApiKey";
export { createCollection } from "./createCollection";
export { createComment } from "./createComment";
export { createDashboard } from "./createDashboard";
+export { createLibrary } from "./createLibrary";
export type { DashboardDetails } from "./createDashboard";
export { createDashboardWithQuestions } from "./createDashboardWithQuestions";
export { createDashboardWithTabs } from "./createDashboardWithTabs";
@@ -26,6 +27,7 @@ export { createQuestionAndAddToDashboard } from "./createQuestionAndAddToDashboa
export { createQuestionAndDashboard } from "./createQuestionAndDashboard";
export { createReaction } from "./createReaction";
export { createSnippet } from "./createSnippet";
+export { createSnippetFolder } from "./createSnippetFolder";
export { createTimeline } from "./createTimeline";
export { createTimelineEvent } from "./createTimelineEvent";
export { createTimelineWithEvents } from "./createTimelineWithEvents";
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.ts
new file mode 100644
index 00000000000..a88a4fe862f
--- /dev/null
+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts
@@ -0,0 +1,110 @@
+import { codeMirrorHelpers } from "./e2e-codemirror-helpers";
+
+const modelingSidebar = () => cy.findByTestId("modeling-sidebar");
+const collectionsSection = () => cy.findByTestId("collections-section");
+const snippetsSection = () => cy.findByTestId("snippets-section");
+const glossarySection = () => cy.findByTestId("glossary-section");
+const newSnippetPage = () => cy.findByTestId("new-snippet-page");
+const editSnippetPage = () => cy.findByTestId("edit-snippet-page");
+const metricOverviewPage = () => cy.findByTestId("metric-overview-page");
+const metricQueryEditor = () => cy.findByTestId("metric-query-editor");
+const modelOverviewPage = () => cy.findByTestId("model-overview-page");
+const modelQueryEditor = () => cy.findByTestId("model-query-editor");
+const modelFieldsPage = () => cy.findByTestId("model-fields-page");
+const collectionPage = () => cy.findByTestId("collection-page");
+const modelingEmptyPage = () =>
+ cy.findByText("Pick a collection or create a new model or metric");
+
+export const DataStudio = {
+ header: () => cy.findByTestId("data-studio-header"),
+ transformsButton: () => DataStudio.header().findByText("Transforms"),
+ jobsButton: () => DataStudio.header().findByText("Jobs"),
+ runsButton: () => DataStudio.header().findByText("Runs"),
+ exitButton: () => DataStudio.header().findByText("Exit data studio"),
+ Transforms: {
+ header: () => cy.findByTestId("transforms-header"),
+ content: () => cy.findByTestId("transforms-content"),
+ sidebar: () => cy.findByTestId("transforms-sidebar"),
+ saveChangesButton: () => DataStudio.Transforms.queryEditor().button("Save"),
+ queryEditor: () => cy.findByTestId("transform-query-editor"),
+ runTab: () => DataStudio.Transforms.header().findByText("Run"),
+ targetTab: () => DataStudio.Transforms.header().findByText("Target"),
+ dependenciesTab: () =>
+ DataStudio.Transforms.header().findByText("Dependencies"),
+ },
+ Jobs: {
+ header: () => cy.findByTestId("jobs-header"),
+ content: () => cy.findByTestId("transforms-content"),
+ sidebar: () => cy.findByTestId("jobs-sidebar"),
+ },
+ PythonLibrary: {
+ header: () => cy.findByTestId("python-library-header"),
+ },
+ ModelingSidebar: {
+ root: modelingSidebar,
+ collectionsSection,
+ collectionsTree: () => collectionsSection().findByRole("tree"),
+ snippetsSection,
+ snippetsTree: () => snippetsSection().findByRole("tree"),
+ snippetsTreeItem: (name: string) =>
+ snippetsSection()
+ .findByRole("tree")
+ .findByText(name)
+ .closest("[role='menuitem']"),
+ glossarySection,
+ glossaryLink: () => glossarySection().findByText("Glossary"),
+ createCardMenuButton: () =>
+ collectionsSection().findByLabelText("Create model or metric"),
+ createSnippetButton: () =>
+ snippetsSection().findByLabelText("Create snippet"),
+ snippetCollectionOptionsButton: () =>
+ snippetsSection().findByLabelText("Snippet collection options"),
+ },
+ Snippets: {
+ newPage: newSnippetPage,
+ editPage: editSnippetPage,
+ nameInput: () => newSnippetPage().findByPlaceholderText("New SQL snippet"),
+ descriptionInput: () => cy.findByPlaceholderText("No description"),
+ saveButton: () => cy.findByRole("button", { name: "Save" }),
+ cancelButton: () => cy.findByRole("button", { name: "Cancel" }),
+ editor: codeMirrorHelpers("snippet-editor", {}),
+ },
+ Metrics: {
+ overviewPage: metricOverviewPage,
+ queryEditor: metricQueryEditor,
+ nameInput: () => metricQueryEditor().findByPlaceholderText("New metric"),
+ saveButton: () =>
+ metricQueryEditor().findByRole("button", { name: "Save" }),
+ cancelButton: () =>
+ metricQueryEditor().findByRole("button", { name: "Cancel" }),
+ header: () => cy.findByTestId("metric-header"),
+ moreMenu: () => DataStudio.Metrics.header().icon("ellipsis"),
+ overviewTab: () => DataStudio.Metrics.header().findByText("Overview"),
+ definitionTab: () => DataStudio.Metrics.header().findByText("Definition"),
+ dependenciesTab: () =>
+ DataStudio.Metrics.header().findByText("Dependencies"),
+ },
+ Models: {
+ overviewPage: modelOverviewPage,
+ queryEditor: modelQueryEditor,
+ fieldsPage: modelFieldsPage,
+ nameInput: () => modelQueryEditor().findByPlaceholderText("New model"),
+ saveButton: () => modelQueryEditor().findByRole("button", { name: "Save" }),
+ cancelButton: () =>
+ modelQueryEditor().findByRole("button", { name: "Cancel" }),
+ header: () => cy.findByTestId("model-header"),
+ moreMenu: () => DataStudio.Models.header().icon("ellipsis"),
+ overviewTab: () => DataStudio.Models.header().findByText("Overview"),
+ definitionTab: () => DataStudio.Models.header().findByText("Definition"),
+ fieldsTab: () => DataStudio.Models.header().findByText("Fields"),
+ dependenciesTab: () =>
+ DataStudio.Models.header().findByText("Dependencies"),
+ },
+ Modeling: {
+ emptyPage: modelingEmptyPage,
+ collectionPage: collectionPage,
+ collectionTitle: () => collectionPage().findByRole("heading"),
+ metricItem: (name: string) => cy.findByTestId("metric-name").contains(name),
+ modelItem: (name: string) => cy.findByTestId("dataset-name").contains(name),
+ },
+};
diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.ts
index 21316628be1..c9e751e93b3 100644
--- a/e2e/support/helpers/e2e-datamodel-helpers.ts
+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts
@@ -7,6 +7,7 @@ import type {
export const DataModel = {
visit,
+ visitDataStudio,
get: getDataModel,
TablePicker: {
get: getTablePicker,
@@ -32,6 +33,7 @@ export const DataModel = {
getFieldDescriptionInput: getTableSectionFieldDescriptionInput,
getSortableField: getTableSectionSortableField,
getSortableFields: getTableSectionSortableFields,
+ getVisibilityTypeInput: getTableSectionVisibilityTypeInput,
clickField: clickTableSectionField,
},
FieldSection: {
@@ -64,19 +66,24 @@ export const DataModel = {
},
};
+const DEFAULT_BASE_PATH = "/admin/datamodel";
+
function visit({
databaseId,
schemaId,
tableId,
fieldId,
skipWaiting = false,
+ basePath,
}: {
databaseId?: DatabaseId;
fieldId?: FieldId;
schemaId?: SchemaId;
tableId?: TableId;
skipWaiting?: boolean;
+ basePath?: string;
} = {}) {
+ const normalizedBasePath = getNormalizedBasePath(basePath);
cy.intercept("GET", "/api/database").as("datamodel/visit/databases");
cy.intercept("GET", "/api/database/*").as("datamodel/visit/database");
cy.intercept("GET", "/api/table/*/query_metadata*").as(
@@ -94,7 +101,7 @@ function visit({
fieldId != null
) {
cy.visit(
- `/admin/datamodel/database/${databaseId}/schema/${schemaId}/table/${tableId}/field/${fieldId}`,
+ `${normalizedBasePath}/database/${databaseId}/schema/${schemaId}/table/${tableId}/field/${fieldId}`,
);
if (!skipWaiting) {
@@ -112,7 +119,7 @@ function visit({
if (databaseId != null && schemaId != null && tableId != null) {
cy.visit(
- `/admin/datamodel/database/${databaseId}/schema/${schemaId}/table/${tableId}`,
+ `${normalizedBasePath}/database/${databaseId}/schema/${schemaId}/table/${tableId}`,
);
if (!skipWaiting) {
@@ -128,7 +135,7 @@ function visit({
}
if (databaseId != null && schemaId != null) {
- cy.visit(`/admin/datamodel/database/${databaseId}/schema/${schemaId}`);
+ cy.visit(`${normalizedBasePath}/database/${databaseId}/schema/${schemaId}`);
if (!skipWaiting) {
cy.wait([
@@ -141,7 +148,7 @@ function visit({
}
if (databaseId != null) {
- cy.visit(`/admin/datamodel/database/${databaseId}`);
+ cy.visit(`${normalizedBasePath}/database/${databaseId}`);
if (!skipWaiting) {
cy.wait([
@@ -154,10 +161,25 @@ function visit({
return;
}
- cy.visit("/admin/datamodel");
+ cy.visit(normalizedBasePath);
cy.wait(["@datamodel/visit/databases"]);
}
+function visitDataStudio(options?: Parameters<typeof visit>[0]) {
+ visit({ ...options, basePath: "/data-studio/data" });
+}
+
+function getNormalizedBasePath(path?: string) {
+ const resolvedPath = path ?? DEFAULT_BASE_PATH;
+ if (resolvedPath.length === 0) {
+ return DEFAULT_BASE_PATH;
+ }
+
+ return resolvedPath.endsWith("/")
+ ? resolvedPath.slice(0, resolvedPath.length - 1)
+ : resolvedPath;
+}
+
function getDataModel() {
return cy.findByTestId("data-model");
}
@@ -238,7 +260,7 @@ function getTableSortOrderInput() {
}
function getTableSyncOptionsButton() {
- return getTableSection().button(/Sync options/);
+ return getTableSection().button(/Sync/);
}
function getTableSectionField(name: string) {
@@ -253,6 +275,10 @@ function getTableSectionSortableFields() {
return getTableSection().findAllByRole("listitem");
}
+function getTableSectionVisibilityTypeInput() {
+ return getTableSection().findByLabelText("Visibility type");
+}
+
function getTableSectionFieldNameInput(name: string) {
return getTableSectionField(name).findByPlaceholderText(
"Give this field a name",
diff --git a/e2e/support/helpers/e2e-dependency-graph-helpers.ts b/e2e/support/helpers/e2e-dependency-graph-helpers.ts
new file mode 100644
index 00000000000..fee6bf9d85e
--- /dev/null
+++ b/e2e/support/helpers/e2e-dependency-graph-helpers.ts
@@ -0,0 +1,7 @@
+export const DependencyGraph = {
+ graph: () => cy.findByTestId("dependency-graph"),
+ entryButton: () => cy.findByTestId("graph-entry-button"),
+ entrySearchInput: () => cy.findByTestId("graph-entry-search-input"),
+ selectionButton: () => cy.findByTestId("graph-selection-button"),
+ dependencyPanel: () => cy.findByTestId("graph-dependency-panel"),
+};
diff --git a/e2e/support/helpers/e2e-misc-helpers.js b/e2e/support/helpers/e2e-misc-helpers.js
index ff0499b4738..1d6dccb8b89 100644
--- a/e2e/support/helpers/e2e-misc-helpers.js
+++ b/e2e/support/helpers/e2e-misc-helpers.js
@@ -32,6 +32,10 @@ export function runButtonOverlay() {
return cy.findByTestId("run-button-overlay");
}
+export function runButtonInOverlay() {
+ return runButtonOverlay().findByTestId("run-button");
+}
+
/**
* Intercepts a request and returns resolve function that allows
* the request to continue
diff --git a/e2e/support/helpers/e2e-notebook-helpers.ts b/e2e/support/helpers/e2e-notebook-helpers.ts
index a9e0a3e384a..2379d39ca47 100644
--- a/e2e/support/helpers/e2e-notebook-helpers.ts
+++ b/e2e/support/helpers/e2e-notebook-helpers.ts
@@ -3,8 +3,9 @@ import type { CyHttpMessages } from "cypress/types/net-stubbing";
import {
entityPickerModal,
entityPickerModalTab,
+ miniPicker,
+ miniPickerBrowseAll,
popover,
- shouldDisplayTabs,
} from "e2e/support/helpers/e2e-ui-elements-helpers";
import type { NotebookStepType } from "metabase/querying/notebook/types";
import type { IconName } from "metabase/ui";
@@ -177,8 +178,8 @@ export function joinTable(
lhsColumnName?: string,
rhsColumnName?: string,
) {
- entityPickerModal().within(() => {
- entityPickerModalTab("Tables").click();
+ miniPicker().within(() => {
+ cy.realType(tableName);
cy.findByText(tableName).click();
});
@@ -204,22 +205,17 @@ export function selectSavedQuestionsToJoin(
secondQuestionName: string,
) {
cy.intercept("GET", "/api/table/*/query_metadata").as("joinedTableMetadata");
- entityPickerModal().within(() => {
- shouldDisplayTabs(["Tables", "Collections"]);
- entityPickerModalTab("Collections").click();
- cy.findByText(firstQuestionName).click();
- });
+ miniPickerBrowseAll().click();
+ entityPickerModal().findByText(firstQuestionName).click();
cy.wait("@joinedTableMetadata");
// join to question b
cy.icon("join_left_outer").click();
- entityPickerModal().within(() => {
- shouldDisplayTabs(["Tables", "Collections"]);
- entityPickerModalTab("Collections").click();
- cy.findByText(secondQuestionName).click();
- });
+ miniPickerBrowseAll().click();
+ entityPickerModalTab("Data").click();
+ entityPickerModal().findByText(secondQuestionName).click();
}
export function selectFilterOperator(operatorName: string) {
diff --git a/e2e/support/helpers/e2e-transform-helpers.ts b/e2e/support/helpers/e2e-transform-helpers.ts
index 44ea8c425f7..db02a8faa9f 100644
--- a/e2e/support/helpers/e2e-transform-helpers.ts
+++ b/e2e/support/helpers/e2e-transform-helpers.ts
@@ -11,7 +11,7 @@ import { createTransform } from "./api";
import { getTableId } from "./e2e-qa-databases-helpers";
export function visitTransform(transformId: TransformId) {
- cy.visit(`/admin/transforms/${transformId}`);
+ cy.visit(`/data-studio/transforms/${transformId}`);
}
const WAIT_TIMEOUT = 10000;
@@ -160,3 +160,44 @@ export function createPythonTransform({
{ wrapId: true, visitTransform },
);
}
+
+/**
+ * Creates an MBQL transform and runs it to create a table.
+ * @return: information about the created transform
+ */
+export function createAndRunMbqlTransform({
+ sourceTable,
+ targetTable,
+ targetSchema,
+ tagIds,
+ databaseId,
+ name,
+}: {
+ sourceTable: string;
+ targetTable: string;
+ targetSchema: string | null;
+ tagIds?: TransformTagId[];
+ name?: string;
+ databaseId?: number;
+}): Cypress.Chainable<{
+ transformId: TransformId;
+}> {
+ return createMbqlTransform({
+ sourceTable,
+ targetTable,
+ targetSchema,
+ tagIds,
+ databaseId,
+ name: name ?? "Test transform",
+ visitTransform: false,
+ }).then(({ body: transform }) => {
+ // Run the transform
+ cy.request("POST", `/api/ee/transform/${transform.id}/run`);
+ // Wait for it to complete successfully
+ waitForSucceededTransformRuns();
+
+ return cy.wrap({
+ transformId: transform.id,
+ });
+ });
+}
diff --git a/e2e/support/helpers/e2e-ui-elements-helpers.js b/e2e/support/helpers/e2e-ui-elements-helpers.js
index d7064a6295d..0293631813a 100644
--- a/e2e/support/helpers/e2e-ui-elements-helpers.js
+++ b/e2e/support/helpers/e2e-ui-elements-helpers.js
@@ -45,6 +45,18 @@ export function selectDropdown() {
return popover().findByRole("listbox");
}
+export function miniPicker() {
+ return cy.findByTestId("mini-picker");
+}
+
+export function miniPickerBrowseAll() {
+ return miniPicker().findByText("Browse all");
+}
+
+export function miniPickerHeader() {
+ return cy.findByTestId("mini-picker-header");
+}
+
export function entityPickerModal() {
return cy.findByTestId("entity-picker-modal");
}
@@ -121,7 +133,7 @@ export function assertNavigationSidebarItemSelected(name, value = "true") {
export function assertNavigationSidebarBookmarkSelected(name, value = "true") {
navigationSidebar()
- .findByRole("tab", { name: "Bookmarks" })
+ .findByRole("section", { name: "Bookmarks" })
.findByRole("listitem", { name })
.should("have.attr", "aria-selected", value);
}
@@ -407,6 +419,10 @@ export const undoToastList = () => {
return cy.findAllByTestId("toast-undo");
};
+export const undoToastListContainer = () => {
+ return cy.findByTestId("undo-list");
+};
+
export function dashboardCards() {
return cy.get("[data-element-id=dashboard-cards-container]");
}
diff --git a/e2e/support/helpers/e2e-ui-select.ts b/e2e/support/helpers/e2e-ui-select.ts
new file mode 100644
index 00000000000..a9abe9cff20
--- /dev/null
+++ b/e2e/support/helpers/e2e-ui-select.ts
@@ -0,0 +1,9 @@
+export function selectHasValue(label: string, value: string) {
+ return cy.findByRole("textbox", { name: label }).should("have.value", value);
+}
+
+export function selectIsDisabled(label: string) {
+ return cy
+ .findByRole("textbox", { name: label })
+ .should("have.attr", "disabled");
+}
diff --git a/e2e/support/helpers/index.ts b/e2e/support/helpers/index.ts
index fb1b31a47c9..1e2f8861161 100644
--- a/e2e/support/helpers/index.ts
+++ b/e2e/support/helpers/index.ts
@@ -15,6 +15,8 @@ export * from "./e2e-dashboard-helpers";
export * from "./e2e-dashboard-visualizer-helpers";
export * from "./e2e-database-metadata-helpers";
export * from "./e2e-datamodel-helpers";
+export * from "./e2e-data-studio-helpers";
+export * from "./e2e-dependency-graph-helpers";
export * from "./e2e-detail-view-helpers";
export * from "./e2e-dimension-list-helpers";
export * from "./e2e-document-helpers";
@@ -52,6 +54,7 @@ export * from "./e2e-token-helpers";
export * from "./e2e-transform-helpers";
export * from "./e2e-ui-elements-helpers";
export * from "./e2e-ui-elements-overflow-helpers";
+export * from "./e2e-ui-select";
export * from "./e2e-upload-helpers";
export * from "./e2e-users-helpers";
export * from "./e2e-visual-tests-helpers";
diff --git a/e2e/support/test-library-data.ts b/e2e/support/test-library-data.ts
new file mode 100644
index 00000000000..5a6408b31dc
--- /dev/null
+++ b/e2e/support/test-library-data.ts
@@ -0,0 +1,70 @@
+const { H } = cy;
+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
+import type { StructuredQuestionDetails } from "e2e/support/helpers/api";
+import type { Collection } from "metabase-types/api";
+
+const { ORDERS_ID } = SAMPLE_DATABASE;
+
+type StructuredQuestionDetailsWithName = StructuredQuestionDetails & {
+ name: string;
+};
+
+type LibraryResponse = Collection & {
+ effective_children?: Collection[];
+};
+
+export const TRUSTED_ORDERS_MODEL: StructuredQuestionDetailsWithName = {
+ name: "Trusted Orders Model",
+ query: {
+ "source-table": ORDERS_ID,
+ },
+};
+
+export const TRUSTED_ORDERS_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Trusted Orders Metric",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ },
+};
+
+export function createLibraryWithItems() {
+ return H.createLibrary().then(
+ (response: Cypress.Response<LibraryResponse>) => {
+ const body = response.body;
+ const modelsCollection = body.effective_children?.find(
+ (child) => child.name === "Data",
+ );
+ const metricsCollection = body.effective_children?.find(
+ (child) => child.name === "Metrics",
+ );
+
+ return H.createQuestion(TRUSTED_ORDERS_MODEL, {
+ wrapId: true,
+ idAlias: "trustedOrdersModelId",
+ }).then(() =>
+ cy.get("@trustedOrdersModelId").then((modelId) =>
+ cy
+ .request("PUT", `/api/card/${modelId}`, {
+ type: "model",
+ collection_id: modelsCollection?.id,
+ })
+ .then(() =>
+ H.createQuestion(TRUSTED_ORDERS_METRIC, {
+ wrapId: true,
+ idAlias: "trustedOrdersMetricId",
+ }),
+ )
+ .then(() =>
+ cy.get("@trustedOrdersMetricId").then((metricId) =>
+ cy.request("PUT", `/api/card/${metricId}`, {
+ type: "metric",
+ collection_id: metricsCollection?.id,
+ }),
+ ),
+ ),
+ ),
+ );
+ },
+ );
+}
diff --git a/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js b/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js
index 2ea840ca102..0a10893afd7 100644
--- a/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js
@@ -5,10 +5,7 @@ import {
WRITABLE_DB_ID,
} from "e2e/support/cypress_data";
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
-import {
- ORDERS_DASHBOARD_ID,
- ORDERS_MODEL_ID,
-} from "e2e/support/cypress_sample_instance_data";
+import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";
import {
createMockActionParameter,
createMockParameter,
@@ -278,44 +275,76 @@ describe("issue 51020", () => {
}
describe("when primary key is called 'id'", () => {
+ function createTemporaryTable() {
+ H.queryWritableDB(
+ "CREATE TABLE IF NOT EXISTS foo (id INT PRIMARY KEY, name VARCHAR)",
+ );
+ H.queryWritableDB(
+ "INSERT INTO foo (id, name) VALUES (1, 'Foo'), (2, 'Bar')",
+ );
+ }
+
+ function dropTemporaryTable() {
+ H.queryWritableDB("ALTER TABLE IF EXISTS foo DROP CONSTRAINT foo_pkey");
+ H.queryWritableDB("DROP TABLE IF EXISTS foo");
+ }
+
beforeEach(() => {
- H.restore();
+ H.restore("postgres-writable");
cy.signInAsAdmin();
- H.setActionsEnabledForDB(SAMPLE_DB_ID);
+ dropTemporaryTable();
+ createTemporaryTable();
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: "foo" });
- H.visitModel(ORDERS_MODEL_ID);
+ H.getTableId({ name: "foo" }).then((tableId) => {
+ H.createQuestion(
+ {
+ name: "Model 51020",
+ type: "model",
+ database: WRITABLE_DB_ID,
+ query: {
+ "source-table": tableId,
+ },
+ },
+ {
+ visitQuestion: true,
+ },
+ );
+ });
setupBasicActionsInModel();
setupDashboard({
- modelName: "Orders Model",
- questionName: "Orders Model",
+ modelName: "Model 51020",
+ questionName: "Model 51020",
columnName: "ID",
});
});
+ afterEach(() => {
+ dropTemporaryTable();
+ });
+
it("should pass primary key attribute to execute action endpoint when it's populated with click behavior or URL (metabase#51020)", () => {
cy.log(
"check when primary key parameter is populated with click behavior",
);
H.getDashboardCard(0).findAllByText("1").eq(0).click();
H.getDashboardCard(1).findByText("Click Me").click();
- H.modal().findByLabelText("Discount").type("987");
+ H.modal().findByLabelText("Name").type(" Baz");
H.modal().button("Update").click();
H.modal().should("not.exist");
H.undoToast().findByText("Successfully updated").should("be.visible");
- H.getDashboardCard(0).should("contain.text", "987");
+ H.getDashboardCard(0).should("contain.text", "Foo Baz");
cy.log("check when primary key parameter is populated with URL");
cy.reload();
H.getDashboardCard(1).findByText("Click Me").click();
- H.modal()
- .findByLabelText("Discount")
- .type("{backspace}{backspace}{backspace}654");
+ H.modal().findByLabelText("Name").type(" Baz");
H.modal().button("Update").click();
H.modal().should("not.exist");
H.undoToast().findByText("Successfully updated").should("be.visible");
- H.getDashboardCard(0).should("contain.text", "654");
+ H.getDashboardCard(0).should("contain.text", "Foo Baz Baz");
});
});
@@ -350,12 +379,9 @@ describe("issue 51020", () => {
cy.findByTestId("new-model-options")
.findByText("Use the notebook editor")
.click();
- H.entityPickerModalTab("Collections").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- cy.findByPlaceholderText("Search this collection or everywhere…").type(
- "foo",
- );
- cy.findByText("Everywhere").click();
+ cy.findByPlaceholderText("Search…").type("foo");
cy.findByText("Foo").click();
});
cy.findByTestId("run-button").click();
@@ -370,7 +396,8 @@ describe("issue 51020", () => {
setupBasicActionsInModel();
H.newButton("Question").click();
- H.entityPickerModalTab("Collections").click();
+ H.miniPickerBrowseAll().click();
+ H.entityPickerModalTab("Data").click();
H.entityPickerModalItem(1, "Model 51020").click();
H.saveQuestion("Question 51020", undefined, {
tab: "Browse",
diff --git a/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js b/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js
index 35cc5a09667..bdc48ce8a36 100644
--- a/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js
@@ -108,8 +108,7 @@ describe("issue 41765", { tags: "@external" }, () => {
H.appBar().findByText("New").click();
H.popover().findByText("Question").click();
- H.entityPickerModal().within(() => {
- cy.findByText("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText(WRITABLE_DB_DISPLAY_NAME).click();
cy.findByText(TEST_TABLE_DISPLAY_NAME).click();
});
diff --git a/e2e/test/scenarios/admin/database-routing/database-routing-admin.cy.spec.ts b/e2e/test/scenarios/admin/database-routing/database-routing-admin.cy.spec.ts
index d516b1c8beb..d159235a80c 100644
--- a/e2e/test/scenarios/admin/database-routing/database-routing-admin.cy.spec.ts
+++ b/e2e/test/scenarios/admin/database-routing/database-routing-admin.cy.spec.ts
@@ -261,8 +261,11 @@ describe("admin > database > database routing", () => {
cy.log("should not see database in data picker");
cy.visit("/question/notebook");
+ H.miniPicker()
+ .findByText(BASE_POSTGRES_DESTINATION_DB_INFO.name)
+ .should("not.exist");
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
cy.findByText(BASE_POSTGRES_DESTINATION_DB_INFO.name).should(
"not.exist",
);
diff --git a/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts b/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts
index dd01b9b0fdd..608d34359be 100644
--- a/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts
+++ b/e2e/test/scenarios/admin/datamodel/datamodel.cy.spec.ts
@@ -522,8 +522,8 @@ describe("scenarios > admin > datamodel", () => {
verifyAndCloseToast("Hid Orders");
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("People").should("be.visible");
cy.findByText("Orders").should("not.exist");
});
@@ -540,8 +540,8 @@ describe("scenarios > admin > datamodel", () => {
verifyAndCloseToast("Unhid Orders");
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("People").should("be.visible");
cy.findByText("Orders").should("be.visible");
});
@@ -741,8 +741,8 @@ describe("scenarios > admin > datamodel", () => {
// It shouldn't show in a new question data picker
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.contains("Products").should("exist");
cy.contains("Orders").should("not.exist");
});
@@ -938,8 +938,8 @@ describe("scenarios > admin > datamodel", () => {
TableSection.getNameInput().should("have.value", "New orders");
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("People").should("be.visible");
cy.findByText("New orders").should("be.visible");
});
@@ -964,8 +964,8 @@ describe("scenarios > admin > datamodel", () => {
cy.signInAsNormalUser();
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("People").should("be.visible");
cy.findByText("New orders").should("be.visible");
});
@@ -1879,8 +1879,8 @@ describe("scenarios > admin > datamodel", () => {
mode: "notebook",
});
cy.icon("join_left_outer").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
cy.findByLabelText("Left column").should("contain.text", "User ID");
@@ -1936,8 +1936,8 @@ describe("scenarios > admin > datamodel", () => {
mode: "notebook",
});
cy.icon("join_left_outer").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
cy.findByLabelText("Left column").should("contain.text", "User ID");
@@ -3009,6 +3009,7 @@ describe("scenarios > admin > datamodel", () => {
FieldSection.getNameInput().should("have.value", "A");
FieldSection.get()
.findByTestId("name-prefix")
+ .scrollIntoView()
.should("be.visible")
.and("have.text", "Json:");
verifyTablePreview({
@@ -3454,7 +3455,7 @@ describe("scenarios > admin > datamodel", () => {
cy.log("discard field values");
H.modal().button("Discard cached field values").click();
verifyAndCloseToast("Failed to discard values");
- cy.realPress("Escape");
+ H.modal().findByLabelText("Close").click();
cy.log("field name");
TableSection.getFieldNameInput("Quantity").type("a").blur();
@@ -3503,7 +3504,9 @@ describe("scenarios > admin > datamodel", () => {
verifyAndCloseToast("Failed to update display values of Quantity");
cy.log("JSON unfolding");
- TablePicker.getDatabase("Writable Postgres12").click();
+ // navigating away would cause onChange to be triggered in InputBlurChange and TextareaBlurChange
+ // components, so new undos will appear - this makes this test flaky, so we navigate with page reload instead
+ H.DataModel.visit({ databaseId: WRITABLE_DB_ID });
TablePicker.getTable("Many Data Types").click();
TableSection.clickField("Json");
FieldSection.getUnfoldJsonInput().click();
@@ -3511,6 +3514,7 @@ describe("scenarios > admin > datamodel", () => {
verifyAndCloseToast("Failed to disable JSON unfolding for Json");
cy.log("formatting");
+ TablePicker.getDatabase("Sample Database").click();
TablePicker.getTable("Orders").click();
TableSection.clickField("Quantity");
FieldSection.getPrefixInput().type("5").blur();
@@ -3903,7 +3907,7 @@ function verifyToastAndUndo(message: string) {
H.undoToast().should("contain.text", message);
H.undoToast().button("Undo").click();
H.undoToast().should("contain.text", "Change undone");
- H.undoToast().icon("close").click();
+ H.undoToast().icon("close").click({ force: true });
}
function verifyTablesVisible(tables: string[]) {
diff --git a/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts b/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts
index 9d60c24ea55..cb1adef06fc 100644
--- a/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts
@@ -441,8 +441,8 @@ describe("issue 55619", () => {
cy.findByLabelText("Create a new model").click();
cy.findByText("Use the notebook editor").click();
});
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.runButtonOverlay().click();
diff --git a/e2e/test/scenarios/binning/binning-reproductions.cy.spec.js b/e2e/test/scenarios/binning/binning-reproductions.cy.spec.js
index 9d23a03488f..6db51c7ba51 100644
--- a/e2e/test/scenarios/binning/binning-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/binning/binning-reproductions.cy.spec.js
@@ -17,8 +17,8 @@ describe("binning related reproductions", () => {
});
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("16327").click();
});
@@ -89,8 +89,8 @@ describe("binning related reproductions", () => {
);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("17975").click();
});
@@ -131,8 +131,8 @@ describe("binning related reproductions", () => {
cy.icon("join_left_outer").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("18646").click();
});
@@ -177,8 +177,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)
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("11439").click();
});
@@ -370,8 +370,8 @@ describe("binning related reproductions", () => {
function openSummarizeOptions(questionType) {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("16379").click();
});
diff --git a/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js b/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js
index 1328079c432..bf64dae6d71 100644
--- a/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js
+++ b/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js
@@ -57,8 +57,8 @@ describe("scenarios > binning > from a saved QB question with explicit joins", (
beforeEach(() => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("QB Binning").click();
});
@@ -124,8 +124,8 @@ describe("scenarios > binning > from a saved QB question with explicit joins", (
beforeEach(() => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("QB Binning").click();
});
@@ -197,8 +197,8 @@ describe("scenarios > binning > from a saved QB question with explicit joins", (
beforeEach(() => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("QB Binning").click();
});
diff --git a/e2e/test/scenarios/collections/collections-reproductions.cy.spec.js b/e2e/test/scenarios/collections/collections-reproductions.cy.spec.js
index ed3e1b97820..cefe5436542 100644
--- a/e2e/test/scenarios/collections/collections-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/collections/collections-reproductions.cy.spec.js
@@ -99,12 +99,21 @@ describe("issue 24660", () => {
it("should properly show contents of different collections with the same name (metabase#24660)", () => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
cy.findAllByText(collectionName).first().click();
cy.findByText(questions[ORDERS_QUESTION_ID]).should("exist");
cy.findByText(questions[ORDERS_COUNT_QUESTION_ID]).should("not.exist");
+ cy.realType("{esc}");
+ });
+
+ cy.findByPlaceholderText("Search for tables and more...").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findAllByText(collectionName).first().click();
+ cy.findByText(questions[ORDERS_QUESTION_ID]).should("exist");
+ cy.findByText(questions[ORDERS_COUNT_QUESTION_ID]).should("not.exist");
});
});
});
diff --git a/e2e/test/scenarios/collections/trash.cy.spec.js b/e2e/test/scenarios/collections/trash.cy.spec.js
index a95b947e3cb..45e50e5766a 100644
--- a/e2e/test/scenarios/collections/trash.cy.spec.js
+++ b/e2e/test/scenarios/collections/trash.cy.spec.js
@@ -77,8 +77,12 @@ describe("scenarios > collections > trash", () => {
});
H.popover().findByText("Question").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").should("exist");
+ cy.findByText("Trash").should("not.exist");
+ });
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
cy.findByText("Our analytics").should("exist");
cy.findByText("Trash").should("not.exist");
cy.button("Close").click();
@@ -994,7 +998,7 @@ function assertTrashSelectedInNavigationSidebar() {
}
function ensureBookmarkVisible(bookmark) {
- cy.findByRole("tab", { name: /bookmarks/i })
+ cy.findByRole("section", { name: "Bookmarks" })
.findByText(bookmark)
.should("be.visible");
}
diff --git a/e2e/test/scenarios/custom-column/cc-cast-functions.cy.spec.ts b/e2e/test/scenarios/custom-column/cc-cast-functions.cy.spec.ts
index e2dfa11dba8..8b103c917a1 100644
--- a/e2e/test/scenarios/custom-column/cc-cast-functions.cy.spec.ts
+++ b/e2e/test/scenarios/custom-column/cc-cast-functions.cy.spec.ts
@@ -394,8 +394,7 @@ describe("exercise today() function", () => {
function startNewQuestion() {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("Products").click();
});
diff --git a/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.js b/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.js
index 45f140eb07c..9f50e73a248 100644
--- a/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.js
@@ -109,8 +109,7 @@ describe("issue 13751", { tags: "@external" }, () => {
cy.signInAsAdmin();
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText(PG_DB_NAME).should("be.visible").click();
cy.findByTextEnsureVisible("People").click();
});
@@ -816,16 +815,10 @@ describe("issue 25189", { tags: "@skip" }, () => {
it("should display all summarize options if the only numeric field is a custom column (metabase#27745)", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
- cy.findByPlaceholderText("Search this collection or everywhere…").type(
- "colors",
- );
- cy.findByText("Everywhere").click();
+ H.miniPicker().within(() => {
+ cy.realType("colors");
cy.wait("@search");
- cy.findByTestId("result-item")
- .contains(/colors/i)
- .click();
+ cy.contains(/colors/i).click();
});
cy.findByLabelText("Custom column").click();
H.enterCustomColumnDetails({
@@ -1295,8 +1288,10 @@ describe("issue 49305", () => {
// This bug does not reproduce if the base question is created via H.createQuestion or H.visitQuestionAdhoc, so create it manually in the UI.
cy.visit("/");
H.newButton("Question").click();
- H.entityPickerModalTab("Tables").click();
- H.entityPickerModalItem(2, "Products").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("Products").click();
+ });
H.getNotebookStep("data").button("Custom column").click();
H.enterCustomColumnDetails({
formula: 'concat("49305 ", [Title])',
@@ -2311,7 +2306,7 @@ describe("Issue 38498", { tags: "@external" }, () => {
cy.signInAsAdmin();
H.startNewQuestion();
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("Orders").click();
});
@@ -2341,8 +2336,8 @@ describe("issue 52451", () => {
});
H.popover().button("Done").click();
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Reviews").click();
});
H.popover().findByText("Expr").click();
@@ -2382,13 +2377,13 @@ describe("issue 56602", () => {
H.createQuestion(productsModelDetails);
H.createQuestion(ordersModelDetails);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.realType(productsModelDetails.name);
cy.findByText(productsModelDetails.name).click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.realType(ordersModelDetails.name);
cy.findByText(ordersModelDetails.name).click();
});
H.addCustomColumn();
diff --git a/e2e/test/scenarios/custom-column/custom-column.cy.spec.js b/e2e/test/scenarios/custom-column/custom-column.cy.spec.js
index ab750018712..7c51548c6cd 100644
--- a/e2e/test/scenarios/custom-column/custom-column.cy.spec.js
+++ b/e2e/test/scenarios/custom-column/custom-column.cy.spec.js
@@ -65,9 +65,9 @@ describe("scenarios > question > custom column", () => {
H.createQuestion({ name, query: { "source-table": ORDERS_ID } });
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
- cy.findByText(name).click();
+ H.entityPickerModalLevel(1).findByText(name).click();
});
cy.button("Custom column").click();
H.enterCustomColumnDetails({ formula: "[cre", blur: false });
@@ -268,8 +268,9 @@ describe("scenarios > question > custom column", () => {
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
cy.findByText("Join data").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalLevel(0).findByText("Databases").click();
cy.findByText("Products").click();
});
@@ -1080,8 +1081,7 @@ describe(
it("should understand date functions", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("Orders").click();
});
@@ -1738,8 +1738,7 @@ describe("scenarios > question > custom column > splitPart", () => {
cy.signInAsAdmin();
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("People").click();
});
@@ -1797,8 +1796,7 @@ describe("exercise today() function", () => {
it("should show today's date", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("Products").click();
});
diff --git a/e2e/test/scenarios/dashboard-filters-2/dashboard-filters-misc.cy.spec.ts b/e2e/test/scenarios/dashboard-filters-2/dashboard-filters-misc.cy.spec.ts
index 3d64f04a209..ef2004aeab4 100644
--- a/e2e/test/scenarios/dashboard-filters-2/dashboard-filters-misc.cy.spec.ts
+++ b/e2e/test/scenarios/dashboard-filters-2/dashboard-filters-misc.cy.spec.ts
@@ -33,9 +33,9 @@ describe("scenarios > dashboard > filters > query stages + temporal unit paramet
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- H.entityPickerModalItem(2, "Orders").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("Orders").click();
});
H.getNotebookStep("filter")
diff --git a/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js
index 05dc061d19f..97642301ea6 100644
--- a/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/dashboard-questions.cy.spec.js
@@ -26,8 +26,10 @@ describe("Dashboard > Dashboard Questions", () => {
cy.visit(`/dashboard/${S.ORDERS_DASHBOARD_ID}`);
H.newButton("Question").click();
- H.entityPickerModalTab("Collections").click();
- H.entityPickerModal().findByText("Orders Model").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("Orders Model").click();
+ });
H.getNotebookStep("filter")
.findByText("Add filters to narrow your answer")
.click();
@@ -375,8 +377,8 @@ describe("Dashboard > Dashboard Questions", () => {
cy.findByLabelText("Navigation bar").findByText("New").click();
H.popover().findByText("Question").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
cy.findByTestId("qb-header").findByText("Save").click();
@@ -421,7 +423,8 @@ describe("Dashboard > Dashboard Questions", () => {
});
H.startNewQuestion();
- H.entityPickerModalTab("Collections").click();
+ H.miniPickerBrowseAll().click();
+ H.entityPickerModalItem(0, "Our analytics").click();
H.entityPickerModal().findByText("Orders in a dashboard").click();
H.entityPickerModal()
.findByText("Total Orders Dashboard Question")
@@ -684,11 +687,9 @@ describe("Dashboard > Dashboard Questions", () => {
H.visitDashboard(dashboardId);
H.openDashboardMenu("Move to trash");
H.modal().button("Move to trash").click();
-
cy.findByText(/gone wrong/, { timeout: 0 }).should("not.exist");
-
cy.findByTestId("archive-banner").findByText(/is in the trash/);
- cy.findByTestId("sidebar-toggle").click();
+ H.openNavigationSidebar();
// restore it
H.navigationSidebar().findByText("Trash").click();
@@ -1056,8 +1057,8 @@ describe("Dashboard > Dashboard Questions", () => {
H.visitDashboard(S.ORDERS_DASHBOARD_ID);
H.newButton("Question").click();
- H.entityPickerModalTab("Tables").click();
- H.entityPickerModal().findByText("Products").click();
+ H.miniPicker().findByText("Sample Database").click();
+ H.miniPicker().findByText("Products").click();
H.queryBuilderHeader().button("Save").click();
// should not show dashboard you can't write to
diff --git a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
index ee445e26a09..c980bd3ec26 100644
--- a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
@@ -54,7 +54,6 @@ describe("scenarios > dashboard", () => {
"pressing escape should only close the entity picker modal, not the new dashboard modal",
);
H.modal().findByTestId("collection-picker-button").click();
- H.entityPickerModal().findByText("Select a collection");
cy.realPress("Escape");
H.modal().findByText("New dashboard").should("be.visible");
@@ -88,12 +87,9 @@ describe("scenarios > dashboard", () => {
cy.findByTestId("dashboard-empty-state").button("Add a chart").click();
cy.findByTestId("new-button-bar").findByText("New Question").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
- cy.findByPlaceholderText("Search this collection or everywhere…").type(
- "Pro",
- );
- cy.findByText("Everywhere").click();
+ cy.findByPlaceholderText("Search…").type("Pro");
cy.findByText("Products").click();
});
diff --git a/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
new file mode 100644
index 00000000000..e32a1689df7
--- /dev/null
+++ b/e2e/test/scenarios/data-studio/data-model/data-studio-bulk-table.cy.spec.ts
@@ -0,0 +1,252 @@
+import { WRITABLE_DB_ID } from "e2e/support/cypress_data";
+
+const { H } = cy;
+const { TablePicker } = H.DataModel;
+
+interface TablesActionRequest {
+ database_ids: number[];
+ schema_ids: number[];
+ table_ids: number[];
+}
+
+interface TablesActionsResponse {
+ status: string;
+ message: string;
+}
+
+interface Table {
+ display_name: string;
+ id: number;
+}
+
+interface PublishModelResponse {
+ models: {
+ id: number;
+ }[];
+}
+
+describe("bulk table operations", () => {
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+ cy.intercept("POST", "/api/ee/data-studio/table/sync-schema").as(
+ "syncSchema",
+ );
+ cy.intercept("POST", "/api/ee/data-studio/table/rescan-values").as(
+ "rescanValues",
+ );
+ cy.intercept("POST", "/api/ee/data-studio/table/discard-values").as(
+ "discardValues",
+ );
+ cy.intercept(
+ "GET",
+ `/api/database/${WRITABLE_DB_ID}/schema/public?include_hidden=true&include_editable_data_model=true`,
+ ).as("getSchema");
+ cy.intercept("POST", "/api/ee/data-studio/table/publish-model").as(
+ "publishModel",
+ );
+ });
+
+ it("syncing multiple tables", { tags: ["@external"] }, () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ cy.wait("@getSchema").then(({ response }) => {
+ const tables = response?.body ?? [];
+ const accountTableId = getTableId(tables, "Accounts");
+ const feedbackTableId = getTableId(tables, "Feedback");
+
+ cy.wrap([accountTableId, feedbackTableId]).as("tableIds");
+ });
+
+ TablePicker.getTable("Accounts").find('input[type="checkbox"]').check();
+ TablePicker.getTable("Feedback").find('input[type="checkbox"]').check();
+ cy.findByRole("heading", { name: /2 tables selected/ });
+
+ cy.findByRole("button", { name: /Sync settings/ }).click();
+ cy.findByRole("button", { name: /Sync table schemas/ }).click();
+ cy.findByRole("button", { name: /Sync triggered!/ }).should("be.visible");
+ cy.get<number[]>("@tableIds").then((tableIds) => {
+ cy.wait<TablesActionRequest, TablesActionsResponse>("@syncSchema").then(
+ ({ request, response }) => {
+ expect(request.body.table_ids).to.deep.eq(tableIds);
+ expect(response?.body.status).to.eq("ok");
+ },
+ );
+ });
+
+ cy.findByRole("button", { name: /Re-scan tables/ }).click();
+ cy.findByRole("button", { name: /Scan triggered!/ }).should("be.visible");
+
+ cy.get<number[]>("@tableIds").then((tableIds) => {
+ cy.wait<TablesActionRequest, TablesActionsResponse>("@rescanValues").then(
+ ({ request, response }) => {
+ expect(request.body.table_ids).to.deep.eq(tableIds);
+ expect(response?.body.status).to.eq("ok");
+ },
+ );
+ });
+
+ cy.findByRole("button", { name: /Discard cached field values/ }).click();
+ cy.findByRole("button", { name: /Discard triggered!/ }).should(
+ "be.visible",
+ );
+ cy.get<number[]>("@tableIds").then((tableIds) => {
+ cy.wait<TablesActionRequest, TablesActionsResponse>(
+ "@discardValues",
+ ).then(({ request, response }) => {
+ expect(request.body.table_ids).to.deep.eq(tableIds);
+ expect(response?.body.status).to.eq("ok");
+ });
+ });
+ });
+
+ it("allows publishing multiple tables", { tags: ["@external"] }, () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ cy.signInAsAdmin();
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getTable("Accounts").find('input[type="checkbox"]').check();
+ TablePicker.getTable("Feedback").find('input[type="checkbox"]').check();
+ cy.findByRole("button", { name: /Publish/ }).click();
+ cy.findByLabelText("Don’t show this to me again").check();
+ cy.findByRole("button", { name: /Got it/ }).click();
+
+ H.pickEntity({
+ tab: "Collections",
+ path: ["Our analytics"],
+ });
+ cy.findByRole("button", { name: /Publish here/ }).click();
+
+ cy.wait<PublishModelResponse>("@publishModel").then(({ response }) => {
+ expect(response?.body.created_count).to.eq(2);
+ });
+
+ H.undoToast().within(() => {
+ cy.findByText("Published").should("be.visible");
+ cy.findByRole("button", { name: /See it/ }).click();
+ });
+
+ cy.findByTestId("collection-caption").within(() => {
+ cy.findByText("Our analytics").should("be.visible");
+ });
+ });
+
+ it("allows to edit attributes for tables", { tags: ["@external"] }, () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ cy.signInAsAdmin();
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getTable("Accounts").find('input[type="checkbox"]').check();
+ TablePicker.getTable("Feedback").find('input[type="checkbox"]').check();
+
+ H.selectHasValue("Owner", "").click();
+ H.selectDropdown().contains("Bobby Tables").click();
+
+ H.selectHasValue("Visibility type", "").click();
+ H.selectDropdown().contains("Gold").click();
+
+ H.selectHasValue("Entity type", "").click();
+ H.selectDropdown().contains("Person").click();
+
+ H.selectHasValue("Source", "").click();
+ H.selectDropdown().contains("Ingested").click();
+ H.undoToastList().should("have.length", 4);
+ TablePicker.getTable("Accounts")
+ .findByTestId("table-owner")
+ .should("have.text", "Bobby Tables");
+ TablePicker.getTable("Feedback")
+ .findByTestId("table-owner")
+ .should("have.text", "Bobby Tables");
+ });
+
+ it("allows to edit attributes for db", { tags: ["@external"] }, () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ cy.signInAsAdmin();
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("Writable Postgres12")
+ .find('input[type="checkbox"]')
+ .check();
+
+ H.selectHasValue("Owner", "").click();
+ H.selectDropdown().contains("Bobby Tables").click();
+
+ H.selectHasValue("Visibility type", "").click();
+ H.selectDropdown().contains("Gold").click();
+
+ H.selectHasValue("Entity type", "").click();
+ H.selectDropdown().contains("Person").click();
+
+ H.selectHasValue("Source", "").click();
+ H.selectDropdown().contains("Ingested").click();
+
+ cy.findByRole("button", { name: /Publish/ }).click();
+ cy.findByRole("button", { name: /Got it/ }).click();
+ H.pickEntity({
+ tab: "Collections",
+ path: ["Our analytics"],
+ });
+ cy.findByRole("button", { name: /Publish here/ }).click();
+
+ TablePicker.getDatabase("Writable Postgres12").click();
+
+ cy.findAllByTestId("tree-item")
+ .filter('[data-type="table"]')
+ .each((table) => {
+ cy.wrap(table)
+ .findByTestId("table-owner")
+ .should("have.text", "Bobby Tables");
+ cy.wrap(table)
+ .findByTestId("table-published")
+ .findByLabelText("Published")
+ .should("be.visible");
+ });
+ });
+
+ it("allows to edit attributes for schema", { tags: ["@external"] }, () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "many_schemas" });
+ cy.signInAsAdmin();
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: "Animals" });
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getSchema("Schema A").find('input[type="checkbox"]').check();
+ TablePicker.getSchema("Schema B").find('input[type="checkbox"]').check();
+
+ cy.findByRole("heading", { name: /Multiple tables selected/ }).click();
+
+ H.selectHasValue("Owner", "").click();
+ H.selectDropdown().contains("Bobby Tables").click();
+
+ H.selectHasValue("Visibility type", "").click();
+ H.selectDropdown().contains("Gold").click();
+
+ H.selectHasValue("Entity type", "").click();
+ H.selectDropdown().contains("Person").click();
+
+ H.selectHasValue("Source", "").click();
+ H.selectDropdown().contains("Ingested").click();
+
+ TablePicker.getSchema("Schema A").click();
+ TablePicker.getSchema("Schema B").click();
+
+ cy.findByTestId("loading-placeholder").should("not.exist");
+ cy.findAllByTestId("tree-item")
+ .filter('[data-type="table"]')
+ .each((table) => {
+ cy.wrap(table)
+ .findByTestId("table-owner")
+ .should("have.text", "Bobby Tables");
+ });
+ });
+});
+
+function getTableId(tables: Table[], tableName: string) {
+ return tables.find((table: Table) => table.display_name === tableName)?.id;
+}
diff --git a/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
new file mode 100644
index 00000000000..844f98b9cac
--- /dev/null
+++ b/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
@@ -0,0 +1,200 @@
+import { WRITABLE_DB_ID } from "e2e/support/cypress_data";
+
+const { H } = cy;
+const { TablePicker } = H.DataModel;
+
+interface MetadataResponse {
+ updated_at: string;
+ data_layer: string;
+ view_count: number;
+}
+
+interface PublishModelResponse {
+ models: {
+ id: number;
+ }[];
+}
+
+describe("Table editing", () => {
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+ cy.intercept("GET", "/api/database?*").as("databases");
+ cy.intercept("GET", "/api/database/*/schemas?*").as("schemas");
+ cy.intercept("GET", "/api/table/*/query_metadata*").as("metadata");
+ cy.intercept("GET", "/api/database/*/schema/*").as("schema");
+ cy.intercept("POST", "/api/dataset*").as("dataset");
+ cy.intercept("GET", "/api/field/*/values").as("fieldValues");
+ cy.intercept("PUT", "/api/field/*", cy.spy().as("updateFieldSpy")).as(
+ "updateField",
+ );
+ cy.intercept("PUT", "/api/table/*/fields/order").as("updateFieldOrder");
+ cy.intercept("POST", "/api/field/*/values").as("updateFieldValues");
+ cy.intercept("POST", "/api/field/*/dimension").as("updateFieldDimension");
+ cy.intercept("PUT", "/api/table").as("updateTables");
+ cy.intercept("PUT", "/api/table/*").as("updateTable");
+ cy.intercept("POST", "/api/ee/data-studio/table/publish-model").as(
+ "publishModel",
+ );
+ });
+
+ it("should display metadata information", { tags: ["@external"] }, () => {
+ H.restore("mysql-8");
+ H.activateToken("bleeding-edge");
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("QA MySQL8").click();
+ TablePicker.getTable("Orders").click();
+
+ cy.wait<MetadataResponse>("@metadata").then(({ response }) => {
+ const updatedAt = response?.body.updated_at ?? "";
+ const expectedDate = new Date(updatedAt).toLocaleString();
+ const viewCount = response?.body.view_count ?? 0;
+
+ cy.findByLabelText("Name on disk").should("have.text", "ORDERS");
+ cy.findByLabelText("Last updated at").should("have.text", expectedDate);
+ cy.findByLabelText("View count").should("have.text", viewCount);
+ cy.findByLabelText("Est. row count").should("not.exist");
+ cy.findByLabelText("Dependencies").should("have.text", "0");
+ cy.findByLabelText("Dependents").should("have.text", "0");
+
+ cy.findByRole("link", { name: "Dependency graph" }).click();
+ cy.findByRole("heading", { name: "Dependency graph" }).should(
+ "be.visible",
+ );
+ });
+ });
+
+ it(
+ "should publish single table to a collection",
+ { tags: ["@external"] },
+ () => {
+ H.restore("mysql-8");
+ H.activateToken("bleeding-edge");
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("QA MySQL8").click();
+ TablePicker.getTable("Orders").click();
+
+ // Shows publish model information modal
+ cy.findByRole("button", { name: /Publish/ }).click();
+ cy.findByRole("button", { name: /Got it/ }).click();
+ H.modal().within(() => {
+ cy.findByRole("button", { name: /Cancel/ }).click();
+ });
+
+ // Don't show this again, info should not be shown later
+ cy.findByRole("button", { name: /Publish/ }).click();
+ cy.findByLabelText("Don’t show this to me again").check();
+ cy.findByRole("button", { name: /Got it/ }).click();
+ H.modal().within(() => {
+ cy.findByRole("button", { name: /Cancel/ }).click();
+ });
+
+ cy.findByRole("button", { name: /Publish/ }).click();
+ H.pickEntity({
+ tab: "Collections",
+ path: ["Our analytics"],
+ });
+ cy.findByRole("button", { name: /Publish here/ }).click();
+
+ cy.wait<PublishModelResponse>("@publishModel").then(() => {
+ H.undoToast().within(() => {
+ cy.findByText("Published").should("be.visible");
+ cy.findByRole("button", { name: /See it/ }).click();
+ });
+ cy.findByTestId("head-crumbs-container").within(() => {
+ cy.findByText("Our analytics").should("be.visible");
+ cy.findByText("Model based on ORDERS").should("be.visible");
+ });
+ });
+
+ // Should not show info modal again
+ cy.go("back");
+
+ cy.findByRole("button", { name: /Publish/ }).click();
+ H.modal().within(() => {
+ cy.findByText("Pick the collection to publish this table in").should(
+ "be.visible",
+ );
+ });
+ },
+ );
+
+ it("should allow to edit attributes", { tags: ["@external"] }, () => {
+ H.restore("postgres-12");
+ H.activateToken("bleeding-edge");
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("QA Postgres12").click();
+ TablePicker.getTable("Orders").click();
+
+ H.selectHasValue("Owner", "No one").click();
+ H.selectDropdown().contains("Bobby Tables").click();
+ H.undoToastListContainer()
+ .findByText("Table owner updated")
+ .should("be.visible");
+
+ H.selectHasValue("Visibility type", "Bronze").click();
+ H.selectDropdown().contains("Gold").click();
+ H.undoToastListContainer()
+ .findByText("Table layer updated")
+ .should("be.visible");
+
+ H.selectHasValue("Entity type", "Transaction").click();
+ H.selectDropdown().contains("Person").click();
+ H.undoToastListContainer()
+ .findByText("Entity type updated")
+ .should("be.visible");
+
+ H.selectHasValue("Source", "Unknown").click();
+ H.selectDropdown().contains("Ingested").click();
+ H.undoToastListContainer()
+ .findByText("Table data source updated")
+ .should("be.visible");
+
+ // navigate away and back
+ TablePicker.getTable("Products").click();
+ TablePicker.getTable("Orders").click();
+
+ H.selectHasValue("Owner", "Bobby Tables");
+ H.selectHasValue("Visibility type", "Gold");
+ H.selectHasValue("Entity type", "Person");
+ H.selectHasValue("Source", "Ingested");
+ });
+
+ it(
+ "transform-created table should have link and disabled source edit",
+ { tags: ["@external"] },
+ () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "many_schemas" });
+
+ const SOURCE_TABLE = "Animals";
+ const TARGET_TABLE = "transform_table";
+ const TARGET_SCHEMA = "Schema A";
+ const TRANSFORM_TABLE_DISPLAY_NAME = "Transform Table";
+ const TRANSFORM_NAME = "Test transform for animals";
+
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
+
+ // Create and run a transform to create a table
+ H.createAndRunMbqlTransform({
+ sourceTable: SOURCE_TABLE,
+ targetTable: TARGET_TABLE,
+ targetSchema: TARGET_SCHEMA,
+ name: TRANSFORM_NAME,
+ }).then(() => {
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getSchema(TARGET_SCHEMA).click();
+ TablePicker.getTable(TRANSFORM_TABLE_DISPLAY_NAME).click();
+
+ cy.findByRole("link", { name: new RegExp(TRANSFORM_NAME) }).should(
+ "be.visible",
+ );
+
+ H.selectIsDisabled("Source");
+ });
+ },
+ );
+});
diff --git a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
new file mode 100644
index 00000000000..b3b0b6659ce
--- /dev/null
+++ b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts
@@ -0,0 +1,4182 @@
+import {
+ SAMPLE_DB_ID,
+ SAMPLE_DB_SCHEMA_ID,
+ USER_GROUPS,
+ WRITABLE_DB_ID,
+} from "e2e/support/cypress_data";
+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
+import { ORDERS_QUESTION_ID } from "e2e/support/cypress_sample_instance_data";
+import { DataModel } from "e2e/support/helpers";
+import type { TableId } from "metabase-types/api";
+
+const { H } = cy;
+const { TablePicker, TableSection, FieldSection, PreviewSection } = H.DataModel;
+
+const { ALL_USERS_GROUP } = USER_GROUPS;
+const {
+ FEEDBACK,
+ FEEDBACK_ID,
+ ORDERS,
+ ORDERS_ID,
+ PEOPLE_ID,
+ PRODUCTS,
+ PRODUCTS_ID,
+ REVIEWS,
+ REVIEWS_ID,
+} = SAMPLE_DATABASE;
+const MYSQL_DB_ID = SAMPLE_DB_ID + 1;
+const MYSQL_DB_SCHEMA_ID = `${MYSQL_DB_ID}:`;
+
+const CUSTOM_MAPPING_ERROR =
+ "You need unrestricted data access on this table to map custom display values.";
+
+describe("scenarios > data studio > datamodel", () => {
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+
+ cy.intercept("GET", "/api/database?*").as("databases");
+ cy.intercept("GET", "/api/database/*/schemas?*").as("schemas");
+ cy.intercept("GET", "/api/table/*/query_metadata*").as("metadata");
+ cy.intercept("GET", "/api/database/*/schema/*").as("schema");
+ cy.intercept("POST", "/api/dataset*").as("dataset");
+ cy.intercept("GET", "/api/field/*/values").as("fieldValues");
+ cy.intercept("GET", "/api/table?*").as("listTables");
+ cy.intercept("PUT", "/api/field/*", cy.spy().as("updateFieldSpy")).as(
+ "updateField",
+ );
+ cy.intercept("PUT", "/api/table/*/fields/order").as("updateFieldOrder");
+ cy.intercept("POST", "/api/field/*/values").as("updateFieldValues");
+ cy.intercept("POST", "/api/field/*/dimension").as("updateFieldDimension");
+ cy.intercept("PUT", "/api/table").as("updateTables");
+ cy.intercept("PUT", "/api/table/*").as("updateTable");
+ });
+
+ describe("Data loading", () => {
+ it("should show 404 if database does not exist (metabase#14652)", () => {
+ H.DataModel.visitDataStudio({ databaseId: 54321, skipWaiting: true });
+ cy.wait("@databases");
+ cy.wait(100); // wait with assertions for React effects to kick in
+
+ TablePicker.getDatabases().should("have.length", 1);
+ TablePicker.getTables().should("have.length", 0);
+ H.DataModel.get().findByText("Not found.").should("be.visible");
+ cy.location("pathname").should("eq", "/data-studio/data/database/54321");
+ });
+
+ it("should show 404 if table does not exist", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: 12345,
+ skipWaiting: true,
+ });
+ cy.wait("@databases");
+ cy.wait(100); // wait with assertions for React effects to kick in
+
+ TablePicker.getDatabases().should("have.length", 1);
+ TablePicker.getTables().should("have.length", 8);
+ H.DataModel.get().findByText("Not found.").should("be.visible");
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/12345`,
+ );
+ });
+
+ it("should show 404 if field does not exist", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: 12345,
+ skipWaiting: true,
+ });
+ cy.wait("@databases");
+ cy.wait(100); // wait with assertions for React effects to kick in
+
+ TablePicker.getDatabases().should("have.length", 1);
+ TablePicker.getTables().should("have.length", 8);
+ H.DataModel.get().findByText("Not found.").should("be.visible");
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/field/12345`,
+ );
+ });
+
+ it(
+ "should not show 404 error if database is not selected",
+ { tags: ["@external"] },
+ () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+
+ cy.log("database not selected");
+ H.DataModel.visitDataStudio();
+ H.DataModel.get()
+ .findByText(/Not found/)
+ .should("not.exist");
+
+ cy.log("database selected");
+ TablePicker.getDatabase("Writable Postgres12").click();
+ H.DataModel.get()
+ .findByText(/Not found/)
+ .should("not.exist");
+
+ cy.log("schema selected");
+ TablePicker.getSchema("Domestic").click();
+ H.DataModel.get()
+ .findByText(/Not found/)
+ .should("not.exist");
+
+ cy.log("table selected");
+ TablePicker.getTable("Animals").click();
+ H.DataModel.get()
+ .findByText(/Not found/)
+ .should("not.exist");
+ },
+ );
+ });
+
+ describe("Table picker", () => {
+ describe("No databases", () => {
+ beforeEach(() => {
+ cy.request("DELETE", `/api/database/${SAMPLE_DB_ID}`);
+ });
+
+ it("should allow to navigate databases, schemas, and tables", () => {
+ H.DataModel.visitDataStudio();
+
+ cy.get("main")
+ .findByText("No connected databases")
+ .should("be.visible");
+
+ cy.findByRole("link", { name: "Connect a database" })
+ .should("be.visible")
+ .click();
+
+ cy.location("pathname").should("eq", "/admin/databases/create");
+ cy.findByRole("heading", { name: "Add a database" }).should(
+ "be.visible",
+ );
+ });
+ });
+
+ describe("1 database, no schemas", () => {
+ it("should allow to navigate tables", { tags: ["@external"] }, () => {
+ H.restore("mysql-8");
+ H.activateToken("bleeding-edge");
+ cy.signInAsAdmin();
+
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getDatabase("QA MySQL8").click();
+ TablePicker.getTables().should("have.length", 4);
+ TablePicker.getSchemas().should("have.length", 0);
+
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${MYSQL_DB_ID}/schema/${MYSQL_DB_SCHEMA_ID}`,
+ );
+
+ TablePicker.getTable("Products").click();
+ TableSection.getNameInput().should("have.value", "Products");
+
+ cy.location("pathname").should((pathname) => {
+ return pathname.startsWith(
+ `/data-studio/data/database/${MYSQL_DB_ID}/schema/${MYSQL_DB_SCHEMA_ID}/table/`,
+ );
+ });
+ });
+
+ it("should allow searching for tables", { tags: ["@external"] }, () => {
+ H.restore("mysql-8");
+ H.activateToken("bleeding-edge");
+ cy.signInAsAdmin();
+
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getSearchInput().type("rEvIeWs");
+ TablePicker.getTables().should("have.length", 2);
+
+ TablePicker.getTables().eq(0).click();
+ TableSection.getNameInput().should("have.value", "Reviews");
+
+ cy.location("pathname").should((pathname) => {
+ return pathname.startsWith(
+ `/data-studio/data/database/${MYSQL_DB_ID}/schema/${MYSQL_DB_SCHEMA_ID}/table/`,
+ );
+ });
+ });
+
+ it("should restore previously selected table when expanding the tree", () => {
+ H.restore("mysql-8");
+ H.activateToken("bleeding-edge");
+ cy.signInAsAdmin();
+
+ H.DataModel.visitDataStudio({
+ databaseId: MYSQL_DB_ID,
+ schemaId: MYSQL_DB_SCHEMA_ID,
+ });
+
+ TablePicker.getDatabase("QA MySQL8").click();
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${MYSQL_DB_ID}/schema/${MYSQL_DB_SCHEMA_ID}`,
+ );
+
+ TablePicker.getDatabase("QA MySQL8").click();
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${MYSQL_DB_ID}/schema/${MYSQL_DB_SCHEMA_ID}`,
+ );
+
+ cy.log("ensure navigation to another db works");
+ TablePicker.getDatabase("Sample Database").click();
+ TablePicker.getTables().should("have.length", 12);
+ });
+ });
+
+ describe("1 database, 1 schema", () => {
+ it("should allow to navigate databases, schemas, and tables", () => {
+ H.DataModel.visitDataStudio();
+
+ cy.log("should auto-open the only schema in the only database");
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}`,
+ );
+
+ TablePicker.getDatabases().should("have.length", 1);
+ TablePicker.getDatabase("Sample Database").should("be.visible");
+ TablePicker.getSchemas().should("have.length", 0);
+ TablePicker.getTables().should("have.length", 8);
+ TableSection.get().should("not.exist");
+ TablePicker.getTable("Orders").should("be.visible").click();
+
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}`,
+ );
+ TableSection.get().should("be.visible");
+
+ TablePicker.getTable("Products").should("be.visible").click();
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${PRODUCTS_ID}`,
+ );
+ TableSection.get().should("be.visible");
+ });
+
+ it("should allow to search for tables", () => {
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getSearchInput().type("or");
+ TablePicker.getTables().should("have.length", 1);
+ TablePicker.getTable("Orders").should("be.visible").click();
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}`,
+ );
+ TableSection.getNameInput().should("have.value", "Orders");
+
+ cy.log("no results");
+ TablePicker.getSearchInput().clear().type("xyz");
+ TablePicker.get().findByText("No tables found").should("be.visible");
+
+ cy.log("go back to browsing");
+ TablePicker.getSearchInput().clear();
+ TablePicker.getTables().should("have.length", 8);
+ });
+ });
+
+ describe(
+ "mutliple databases, with single and multiple schemas",
+ { tags: "@external" },
+ () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ cy.signInAsAdmin();
+
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+ });
+
+ it("should allow to navigate databases, schemas, and tables", () => {
+ H.DataModel.visitDataStudio();
+
+ cy.location("pathname").should("eq", "/data-studio/data");
+ TablePicker.getDatabases().should("have.length", 2);
+ TablePicker.getSchemas().should("have.length", 0);
+ TablePicker.getTables().should("have.length", 0);
+ TablePicker.getDatabase("Sample Database").should("be.visible");
+
+ cy.log("open database");
+ TablePicker.getDatabase("Writable Postgres12")
+ .should("be.visible")
+ .click();
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${WRITABLE_DB_ID}`,
+ );
+ TablePicker.getDatabases().should("have.length", 2);
+ TablePicker.getSchemas().should("have.length", 2);
+ TablePicker.getTables().should("have.length", 0);
+ TablePicker.getSchema("Wild").should("be.visible");
+ TablePicker.getSchema("Domestic").should("be.visible");
+
+ cy.log("open schema");
+ TablePicker.getSchema("Domestic").click();
+ cy.location("pathname").should(
+ "eq",
+ `/data-studio/data/database/${WRITABLE_DB_ID}/schema/${WRITABLE_DB_ID}:Domestic`,
+ );
+ TablePicker.getDatabases().should("have.length", 2);
+ TablePicker.getSchemas().should("have.length", 2);
+ TablePicker.getTables().should("have.length", 1);
+ TablePicker.getTable("Animals").should("be.visible");
+
+ cy.log("open table");
+ TablePicker.getTable("Animals").click();
+ cy.location("pathname").should((pathname) => {
+ return pathname.startsWith(
+ `/data-studio/data/database/${WRITABLE_DB_ID}/schema/${WRITABLE_DB_ID}:Domestic/table/`,
+ );
+ });
+ TableSection.getNameInput().should("have.value", "Animals");
+
+ cy.log("open another schema");
+ TablePicker.getSchema("Wild").click();
+ cy.log(
+ "should not update URL to point to schema as we have a table open",
+ );
+ cy.location("pathname").should((pathname) => {
+ return pathname.startsWith(
+ `/data-studio/data/database/${WRITABLE_DB_ID}/schema/${WRITABLE_DB_ID}:Domestic/table/`,
+ );
+ });
+
+ TablePicker.getDatabases().should("have.length", 2);
+ TablePicker.getSchemas().should("have.length", 2);
+ TablePicker.getTables().should("have.length", 3);
+ TablePicker.getTable("Birds").should("be.visible");
+
+ cy.log("open another table");
+ TablePicker.getTable("Birds").click();
+ cy.location("pathname").should((pathname) => {
+ return pathname.startsWith(
+ `/data-studio/data/database/${WRITABLE_DB_ID}/schema/${WRITABLE_DB_ID}:Domestic/table/`,
+ );
+ });
+ TableSection.getNameInput().should("have.value", "Birds");
+
+ cy.log("close schema");
+ TablePicker.getSchema("Wild").click();
+ TablePicker.getSchema("Wild").click();
+ TablePicker.getDatabases().should("have.length", 2);
+ TablePicker.getSchemas().should("have.length", 2);
+ TablePicker.getTables().should("have.length", 1);
+ TablePicker.getTable("Birds").should("not.exist");
+
+ cy.log("close database");
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getDatabases().should("have.length", 2);
+ TablePicker.getSchemas().should("have.length", 0);
+ TablePicker.getTables().should("have.length", 0);
+
+ cy.log("we still have a table opened");
+ cy.location("pathname").should((pathname) => {
+ return pathname.startsWith(
+ `/data-studio/data/database/${WRITABLE_DB_ID}/schema/${WRITABLE_DB_ID}:Domestic/table/`,
+ );
+ });
+
+ cy.log("databases, schemas, and tables should be links");
+ TablePicker.getDatabase("Sample Database").click();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getDatabase("Writable Postgres12")
+ .should("have.prop", "tagName", "A")
+ .and(
+ "have.attr",
+ "href",
+ `/data-studio/data/database/${WRITABLE_DB_ID}`,
+ );
+ TablePicker.getSchema("Domestic")
+ .should("have.prop", "tagName", "A")
+ .and(
+ "have.attr",
+ "href",
+ `/data-studio/data/database/${WRITABLE_DB_ID}/schema/${WRITABLE_DB_ID}:Domestic`,
+ );
+ TablePicker.getTable("Orders")
+ .should("have.prop", "tagName", "A")
+ .and(
+ "have.attr",
+ "href",
+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}`,
+ );
+ });
+
+ it("should allow to search for tables", () => {
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getSearchInput().type("an");
+ TablePicker.getTables().should("have.length", 3);
+ TablePicker.getTable("Animals").should("have.length", 2);
+ TablePicker.getTable("Analytic Events").should("be.visible");
+
+ TablePicker.getSearchInput().clear().type("ani");
+ TablePicker.getTables().should("have.length", 2);
+ TablePicker.getTable("Animals").eq(1).should("be.visible").click();
+
+ cy.location("pathname").should((pathname) => {
+ return pathname.startsWith(
+ `/data-studio/data/database/${WRITABLE_DB_ID}/schema/${WRITABLE_DB_ID}:Wild/table/`,
+ );
+ });
+ TableSection.getNameInput().should("have.value", "Animals");
+
+ cy.log("go back to browsing");
+ TablePicker.getSearchInput().clear();
+ TablePicker.getTables().should("have.length", 2);
+ });
+
+ it("should restore previously selected table when expanding the tree", () => {
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getSchema("Domestic").click();
+ TablePicker.getTable("Animals").click();
+ TablePicker.getSchema("Wild").click();
+ TablePicker.getTable("Birds").click();
+ TablePicker.getTable("Birds").should(
+ "have.attr",
+ "aria-selected",
+ "true",
+ );
+ TablePicker.getTable("Birds").find('input[type="checkbox"]').check();
+ TablePicker.getTable("Birds").should(
+ "not.have.attr",
+ "aria-selected",
+ "true",
+ );
+
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getDatabase("Writable Postgres12").click();
+
+ TableSection.getNameInput().should("have.value", "Birds");
+ });
+ },
+ );
+
+ describe("Search", () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+ });
+
+ it("should support prefix-based search", () => {
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getSearchInput().type("an");
+ TablePicker.getTables().should("have.length", 3);
+ TablePicker.getTable("Analytic Events").should("be.visible");
+ TablePicker.getTable("Animals").should("be.visible");
+ });
+
+ it("should support wildcard search with *", () => {
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getSearchInput().type("irds");
+ TablePicker.get().findByText("No tables found").should("be.visible");
+
+ TablePicker.getSearchInput().clear().type("*irds");
+ TablePicker.getTables().should("have.length", 1);
+ TablePicker.getTable("Birds").should("be.visible");
+ });
+
+ it("should allow using shift key to select multiple tables", () => {
+ H.DataModel.visitDataStudio();
+ TablePicker.getSearchInput().type("a");
+
+ TablePicker.getTables().should("have.length", 4);
+ TablePicker.getTable("Accounts").find('input[type="checkbox"]').click();
+ TablePicker.getTable("Animals")
+ .eq(0)
+ .find('input[type="checkbox"]')
+ .click({ shiftKey: true });
+
+ cy.findByRole("heading", { name: /3 tables selected/i }).should(
+ "be.visible",
+ );
+ });
+
+ it("should remove the active highlight once tables are selected", () => {
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getSearchInput().type("an");
+ TablePicker.getTable("Animals").eq(0).should("be.visible").click();
+ TablePicker.getTable("Animals")
+ .eq(0)
+ .should("have.attr", "aria-selected", "true");
+
+ TablePicker.getTable("Animals")
+ .eq(0)
+ .find('input[type="checkbox"]')
+ .check();
+ TablePicker.getTable("Animals").eq(1).should("be.visible").click();
+
+ TablePicker.getTable("Animals")
+ .eq(0)
+ .should("not.have.attr", "aria-selected", "true");
+ TablePicker.getTable("Animals")
+ .eq(1)
+ .should("not.have.attr", "aria-selected", "true");
+ });
+
+ it("should select/deselect tables with clicking checkboxes", () => {
+ H.DataModel.visitDataStudio();
+ TablePicker.getSearchInput().type("a");
+ TablePicker.getTables().should("have.length", 4);
+ TablePicker.getTable("Accounts")
+ .find('input[type="checkbox"]')
+ .as("accountsCheckbox");
+ TablePicker.getTable("Analytic Events")
+ .find('input[type="checkbox"]')
+ .as("analyticEventsCheckbox");
+ cy.get("@accountsCheckbox").check();
+ cy.get("@analyticEventsCheckbox").check();
+ cy.findByRole("heading", { name: /2 tables selected/i }).should(
+ "be.visible",
+ );
+ cy.get("@accountsCheckbox").uncheck();
+ cy.findByRole("heading", { name: /2 table selected/i }).should(
+ "not.exist",
+ );
+ });
+ });
+
+ describe("Extra info about tables", () => {
+ const databaseName = "Writable Postgres12";
+ const domesticSchema = "Domestic";
+ const wildSchema = "Wild";
+ const domesticAnimalsTable = "Animals";
+ const wildBirdsTable = "Birds";
+
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+ });
+
+ it("should show the table owner", () => {
+ cy.request("GET", "/api/user/current")
+ .its("body")
+ .then(({ id, common_name }) => {
+ cy.wrap(common_name).as("tableOwnerName");
+ return updateTableAttributes({
+ databaseId: WRITABLE_DB_ID,
+ displayName: domesticAnimalsTable,
+ attributes: { owner_user_id: id },
+ });
+ })
+ .as("ownerTableId");
+
+ openWritableDomesticSchema(databaseName, domesticSchema);
+
+ cy.get<string>("@tableOwnerName").then((ownerName) => {
+ TablePicker.getTable(domesticAnimalsTable)
+ .findByTestId("table-owner")
+ .should("contain", ownerName);
+ });
+ });
+
+ it("should display the estimated row count", () => {
+ const EXPECTED_ROWS = 3210;
+
+ cy.intercept(
+ "GET",
+ `/api/database/${WRITABLE_DB_ID}/schema/${domesticSchema}*`,
+ (req) => {
+ req.continue((res) => {
+ if (Array.isArray(res.body)) {
+ res.body = res.body.map((table) => {
+ if (
+ table.display_name === domesticAnimalsTable ||
+ table.name === domesticAnimalsTable
+ ) {
+ return {
+ ...table,
+ estimated_row_count: EXPECTED_ROWS,
+ };
+ }
+ return table;
+ });
+ }
+ });
+ },
+ );
+
+ openWritableDomesticSchema(databaseName, domesticSchema);
+
+ TablePicker.getTable(domesticAnimalsTable)
+ .findByTestId("table-expected-rows")
+ .should("contain", "3,210");
+ });
+
+ it("should indicate published tables", () => {
+ getTableId({ databaseId: WRITABLE_DB_ID, name: domesticAnimalsTable })
+ .then((tableId) => {
+ return publishTables([tableId]);
+ })
+ .as("publishedTableId");
+
+ openWritableDomesticSchema(databaseName, domesticSchema);
+
+ TablePicker.getTable(domesticAnimalsTable)
+ .findByTestId("table-published")
+ .findByLabelText("Published")
+ .should("be.visible");
+
+ TablePicker.getSchema(wildSchema).click();
+
+ TablePicker.getTable(wildBirdsTable)
+ .icon("verified_round")
+ .should("not.exist");
+ });
+ });
+
+ describe("Filtering", () => {
+ it("should filter tables by visibility type", () => {
+ updateTableAttributes({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Orders",
+ attributes: { data_layer: "gold" },
+ }).as("goldTableId");
+
+ updateTableAttributes({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Products",
+ attributes: { data_layer: "silver" },
+ }).as("silverTableId");
+
+ H.DataModel.visitDataStudio();
+
+ openFilterPopover();
+ selectFilterOption("Visibility type", "Gold");
+ applyFilters();
+
+ cy.get<TableId>("@goldTableId").then(expectTableVisible);
+ cy.get<TableId>("@silverTableId").then(expectTableNotVisible);
+ });
+
+ it("should filter tables owned by no one", () => {
+ cy.request("GET", "/api/user/current")
+ .its("body")
+ .then(({ id }) => {
+ return updateTableAttributes({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Orders",
+ attributes: { owner_user_id: id },
+ }).as("ownedTableId");
+ });
+
+ getTableId({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Products",
+ }).as("unownedTableId");
+
+ H.DataModel.visitDataStudio();
+
+ openFilterPopover();
+ selectFilterOption("Owner", "No one");
+ applyFilters();
+
+ cy.get<TableId>("@unownedTableId").then(expectTableVisible);
+ cy.get<TableId>("@ownedTableId").then(expectTableNotVisible);
+ });
+
+ it("should filter tables by owner user", () => {
+ cy.request("GET", "/api/user/current")
+ .its("body")
+ .then(({ id, common_name }) => {
+ cy.wrap(common_name).as("ownerName");
+ return updateTableAttributes({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Orders",
+ attributes: { owner_user_id: id },
+ }).as("ownedTableId");
+ });
+
+ getTableId({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Products",
+ }).as("unownedTableId");
+
+ H.DataModel.visitDataStudio();
+
+ openFilterPopover();
+ cy.get<string>("@ownerName").then((ownerName) => {
+ selectOwnerByName(ownerName);
+ });
+ applyFilters();
+
+ cy.get<TableId>("@ownedTableId").then(expectTableVisible);
+ cy.get<TableId>("@unownedTableId").then(expectTableNotVisible);
+ });
+
+ it("should filter tables by owner email", () => {
+ const OWNER_EMAIL = "[email protected]";
+
+ updateTableAttributes({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Orders",
+ attributes: { owner_email: OWNER_EMAIL, owner_user_id: null },
+ }).as("emailOwnedTableId");
+
+ getTableId({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Products",
+ }).as("otherTableId");
+
+ H.DataModel.visitDataStudio();
+
+ openFilterPopover();
+ selectOwnerByEmail(OWNER_EMAIL);
+ applyFilters();
+
+ cy.get<TableId>("@emailOwnedTableId").then(expectTableVisible);
+ cy.get<TableId>("@otherTableId").then(expectTableNotVisible);
+ });
+
+ it("should filter tables by source", () => {
+ updateTableAttributes({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Orders",
+ attributes: { data_source: "upload" },
+ }).as("uploadedTableId");
+
+ updateTableAttributes({
+ databaseId: SAMPLE_DB_ID,
+ displayName: "Products",
+ attributes: { data_source: "ingested" },
+ }).as("ingestedTableId");
+
+ H.DataModel.visitDataStudio();
+
+ openFilterPopover();
+ selectFilterOption("Source", "Uploaded data");
+ applyFilters();
+
+ cy.get<TableId>("@uploadedTableId").then(expectTableVisible);
+ cy.get<TableId>("@ingestedTableId").then(expectTableNotVisible);
+ });
+
+ it("should filter unused tables only", () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+ const usedTableName = "Animals";
+ const unusedTableName = "Birds";
+
+ getTableId({
+ databaseId: WRITABLE_DB_ID,
+ displayName: usedTableName,
+ }).then((tableId) => {
+ cy.wrap(tableId).as("usedTableId");
+ return H.createQuestion({
+ database: WRITABLE_DB_ID,
+ name: "filter used question",
+ query: { "source-table": tableId },
+ });
+ });
+
+ getTableId({
+ databaseId: WRITABLE_DB_ID,
+ name: unusedTableName,
+ }).as("unusedTableId");
+
+ H.DataModel.visitDataStudio();
+
+ openFilterPopover();
+ toggleUnusedFilter(true);
+ applyFilters();
+
+ cy.get<TableId>("@unusedTableId").then(expectTableVisible);
+ cy.get<TableId>("@usedTableId").then(expectTableNotVisible);
+ });
+ });
+
+ it("select/deselect functionality", { tags: ["@external"] }, () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+
+ H.DataModel.visitDataStudio();
+
+ const databaseName = "Writable Postgres12";
+ const sampleDatabaseName = "Sample Database";
+ const domesticSchema = "Domestic";
+ const wildSchema = "Wild";
+ const domesticTables = ["Animals"];
+ const wildTables = ["Animals", "Birds"];
+ const tablesInDatabase = [
+ ...domesticTables.map((table) => ({
+ schema: domesticSchema,
+ table,
+ })),
+ ...wildTables.map((table) => ({
+ schema: wildSchema,
+ table,
+ })),
+ ];
+
+ const getDatabaseCheckbox = () =>
+ TablePicker.getDatabase(databaseName).find('input[type="checkbox"]');
+ const getSchemaCheckbox = (schemaName: string) =>
+ TablePicker.getSchema(schemaName).find('input[type="checkbox"]');
+ const getWpTableCheckbox = (schemaName: string, tableName: string) =>
+ getTableCheckbox(
+ WRITABLE_DB_ID,
+ `${WRITABLE_DB_ID}:${schemaName}`,
+ tableName,
+ );
+ const getSampleTableCheckbox = (tableName: string) =>
+ getTableCheckbox(SAMPLE_DB_ID, SAMPLE_DB_SCHEMA_ID, tableName);
+
+ function getTableCheckbox(
+ databaseId: number,
+ schemaFragment: string,
+ tableName: string,
+ ) {
+ return TablePicker.getTables()
+ .filter((_, element) => {
+ const href = element.getAttribute("href") ?? "";
+ const text = element.textContent ?? "";
+
+ return (
+ href.includes(`/database/${databaseId}/`) &&
+ href.includes(`/schema/${schemaFragment}`) &&
+ text.toLowerCase().includes(tableName.toLowerCase())
+ );
+ })
+ .find('input[type="checkbox"]');
+ }
+
+ TablePicker.getDatabase(databaseName).click();
+ TablePicker.getSchema(domesticSchema).click();
+ TablePicker.getSchema(wildSchema).click();
+ TablePicker.getTables().should("have.length", 3);
+
+ cy.log("selecting a db selects all schemas and tables in it");
+ getDatabaseCheckbox().check();
+ for (const schemaName of [domesticSchema, wildSchema]) {
+ getSchemaCheckbox(schemaName).should("be.checked");
+ }
+ for (const tableName of domesticTables) {
+ getWpTableCheckbox(domesticSchema, tableName).should("be.checked");
+ }
+ for (const tableName of wildTables) {
+ getWpTableCheckbox(wildSchema, tableName).should("be.checked");
+ }
+ getDatabaseCheckbox().uncheck();
+ for (const schemaName of [domesticSchema, wildSchema]) {
+ getSchemaCheckbox(schemaName).should("not.be.checked");
+ }
+ for (const { schema, table } of tablesInDatabase) {
+ getWpTableCheckbox(schema, table).should("not.be.checked");
+ }
+
+ cy.log("selecting a schema selects all tables in it");
+ getSchemaCheckbox(domesticSchema).check();
+ for (const tableName of domesticTables) {
+ getWpTableCheckbox(domesticSchema, tableName).should("be.checked");
+ }
+ getSchemaCheckbox(domesticSchema).uncheck();
+ for (const tableName of domesticTables) {
+ getWpTableCheckbox(domesticSchema, tableName).should("not.be.checked");
+ }
+
+ cy.log("selecting all tables in a schema selects the schema");
+ getSchemaCheckbox(wildSchema).should("not.be.checked");
+ getWpTableCheckbox(wildSchema, "Animals").check();
+ getSchemaCheckbox(wildSchema).should("not.be.checked");
+ getWpTableCheckbox(wildSchema, "Birds").check();
+ getSchemaCheckbox(wildSchema).should("be.checked");
+ getSchemaCheckbox(wildSchema).uncheck();
+ for (const tableName of wildTables) {
+ getWpTableCheckbox(wildSchema, tableName).should("not.be.checked");
+ }
+
+ cy.log("selecting all schemas in a db selects the db");
+ getSchemaCheckbox(domesticSchema).check();
+ getSchemaCheckbox(wildSchema).check();
+ getDatabaseCheckbox().should("be.checked");
+ getSchemaCheckbox(domesticSchema).uncheck();
+ getSchemaCheckbox(wildSchema).uncheck();
+ getDatabaseCheckbox().should("not.be.checked");
+
+ cy.log("selecting all tables in a db selects the db");
+ cy.then(() => {
+ tablesInDatabase.forEach(({ schema, table }, index) => {
+ getWpTableCheckbox(schema, table).check();
+ if (index < tablesInDatabase.length - 1) {
+ getDatabaseCheckbox().should("not.be.checked");
+ }
+ });
+ });
+ getDatabaseCheckbox().should("be.checked");
+ getDatabaseCheckbox().uncheck();
+ for (const { schema, table } of tablesInDatabase) {
+ getWpTableCheckbox(schema, table).should("not.be.checked");
+ }
+
+ cy.log("deselecting a table updates parent state");
+ getDatabaseCheckbox().check();
+ getWpTableCheckbox(wildSchema, "Birds").uncheck();
+ getSchemaCheckbox(wildSchema).should("not.be.checked");
+ // partially selected now, so clicking twice to make it unchecked
+ getDatabaseCheckbox().should("not.be.checked");
+
+ getDatabaseCheckbox().uncheck();
+ getDatabaseCheckbox().uncheck();
+ for (const { schema, table } of tablesInDatabase) {
+ getWpTableCheckbox(schema, table).should("not.be.checked");
+ }
+
+ cy.log("deselecting a schema clears its tables");
+ getSchemaCheckbox(domesticSchema).check();
+ cy.findByPlaceholderText("Give this table a name")
+ .should("have.value", domesticTables[0])
+ .should("be.visible");
+ getSchemaCheckbox(domesticSchema).uncheck();
+
+ cy.log("schema toggle handles partially selected state");
+ getSchemaCheckbox(wildSchema).check();
+ cy.findByRole("heading", { name: /2 tables selected/i }).should(
+ "be.visible",
+ );
+ getWpTableCheckbox(wildSchema, "Birds").uncheck();
+ cy.findByPlaceholderText("Give this table a name")
+ .should("have.value", domesticTables[0])
+ .should("be.visible");
+
+ cy.log("first click selects all tables");
+ getSchemaCheckbox(wildSchema).click();
+ cy.findByRole("heading", { name: /2 tables selected/i }).should(
+ "be.visible",
+ );
+ cy.log("second click deselects all tables");
+ getSchemaCheckbox(wildSchema).click();
+ cy.findAllByRole("heading", { name: /table[s]? selected/i }).should(
+ "have.length",
+ 0,
+ );
+ for (const tableName of wildTables) {
+ getWpTableCheckbox(wildSchema, tableName).should("not.be.checked");
+ }
+
+ cy.log("shift + click selects a range of tables");
+ TablePicker.getDatabase(databaseName).click();
+ TablePicker.getDatabase(sampleDatabaseName).click();
+
+ getSampleTableCheckbox("Orders").should("not.be.checked");
+ getSampleTableCheckbox("People").should("not.be.checked");
+ getSampleTableCheckbox("Products").should("not.be.checked");
+
+ getSampleTableCheckbox("Orders").click();
+ getSampleTableCheckbox("Products").click({ shiftKey: true });
+
+ getSampleTableCheckbox("Orders").should("be.checked");
+ getSampleTableCheckbox("People").should("be.checked");
+ getSampleTableCheckbox("Products").should("be.checked");
+ getSampleTableCheckbox("Feedback").should("not.be.checked");
+ });
+ });
+
+ describe("Table section", () => {
+ it("should show all tables in sample database and fields in orders table", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TablePicker.getTables().should("have.length", 8);
+
+ TableSection.clickField("ID");
+ FieldSection.getDataType()
+ .should("be.visible")
+ .and("have.text", "BIGINT");
+ FieldSection.getSemanticTypeInput().should("have.value", "Entity Key");
+
+ TableSection.clickField("User ID");
+ FieldSection.getDataType()
+ .should("be.visible")
+ .and("have.text", "INTEGER");
+ FieldSection.getSemanticTypeInput().should("have.value", "Foreign Key");
+ FieldSection.getSemanticTypeFkTarget().should(
+ "have.value",
+ "People → ID",
+ );
+
+ TableSection.clickField("Tax");
+ FieldSection.getDataType()
+ .should("be.visible")
+ .and("have.text", "DOUBLE PRECISION");
+ FieldSection.getSemanticTypeInput().should(
+ "have.value",
+ "No semantic type",
+ );
+
+ TableSection.clickField("Discount");
+ FieldSection.getDataType()
+ .should("be.visible")
+ .and("have.text", "DOUBLE PRECISION");
+ FieldSection.getSemanticTypeInput().should("have.value", "Discount");
+
+ TableSection.clickField("Created At");
+ FieldSection.getDataType()
+ .should("be.visible")
+ .and("have.text", "TIMESTAMP");
+ FieldSection.getSemanticTypeInput().should(
+ "have.value",
+ "Creation timestamp",
+ );
+ });
+
+ it("should be able to preview the table in the query builder", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+ TableSection.getQueryBuilderLink().click();
+ H.queryBuilderHeader().findByText("Orders").should("be.visible");
+ });
+
+ it("should be able to see details of a table", () => {
+ H.DataModel.visitDataStudio({ databaseId: SAMPLE_DB_ID });
+
+ verifyTableSectionEmptyState();
+
+ TablePicker.getTable("Orders").click();
+ verifyFieldSectionEmptyState();
+ TableSection.getNameInput().should("have.value", "Orders");
+ TableSection.getDescriptionInput().should(
+ "have.value",
+ "Confirmed Sample Company orders for a product, from a user.",
+ );
+ });
+
+ it(
+ "should be able to select and update a table in a database without schemas",
+ { tags: ["@external"] },
+ () => {
+ H.restore("mysql-8");
+ H.activateToken("bleeding-edge");
+
+ H.DataModel.visitDataStudio({
+ databaseId: MYSQL_DB_ID,
+ schemaId: MYSQL_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getNameInput().clear().type("New orders").blur();
+ cy.wait("@updateTable");
+ verifyAndCloseToast("Table name updated");
+ TableSection.getNameInput().should("have.value", "New orders");
+ },
+ );
+
+ it(
+ "should show empty state when table has no fields",
+ { tags: ["@external"] },
+ () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.queryWritableDB(
+ 'alter table "Domestic"."Animals" drop column Name, drop column Score',
+ );
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getSchema("Domestic").click();
+ TablePicker.getTable("Animals").click();
+
+ TableSection.get()
+ .findByText("This table has no fields")
+ .should("exist");
+ TableSection.getSortButton().should("not.exist");
+ },
+ );
+
+ describe("Name and description", () => {
+ it("should allow changing the table name", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getNameInput().clear().type("New orders").blur();
+ cy.wait("@updateTable");
+ verifyAndCloseToast("Table name updated");
+ TableSection.getNameInput().should("have.value", "New orders");
+
+ H.startNewQuestion();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("People").should("be.visible");
+ cy.findByText("New orders").should("be.visible");
+ });
+ });
+
+ it("should allow changing the table description", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getDescriptionInput()
+ .clear()
+ .type("New description")
+ .blur();
+ cy.wait("@updateTable");
+ verifyAndCloseToast("Table description updated");
+ TableSection.getDescriptionInput().should(
+ "have.value",
+ "New description",
+ );
+
+ cy.visit(`/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}`);
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Orders").should("be.visible");
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("New description").should("be.visible");
+ });
+
+ // Skipped because data studio is not available with data model permissions only.
+ // Unskip once the new datamodel page is available in that case.
+ it.skip("should allow changing the table name with data model permissions only", () => {
+ H.activateToken("pro-self-hosted");
+ setDataModelPermissions({ tableIds: [ORDERS_ID] });
+
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getNameInput().clear().type("New orders").blur();
+ cy.wait("@updateTable");
+ verifyAndCloseToast("Table name updated");
+ TableSection.getNameInput().should("have.value", "New orders");
+ cy.signOut();
+
+ cy.signInAsNormalUser();
+ H.startNewQuestion();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("People").should("be.visible");
+ cy.findByText("New orders").should("be.visible");
+ });
+ });
+
+ it("should allow clearing the table description", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getDescriptionInput().clear().blur();
+ cy.wait("@updateTable");
+ verifyAndCloseToast("Table description updated");
+ TableSection.getDescriptionInput().should("have.value", "");
+
+ cy.visit(`/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}`);
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Orders").should("be.visible");
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("No description yet").should("be.visible");
+ });
+ });
+
+ describe("Field name and description", () => {
+ it("should allow changing the field name", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getFieldNameInput("Tax").clear().type("New tax").blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Name of Tax updated");
+ TableSection.getFieldNameInput("New tax").should("be.visible");
+
+ cy.log("verify preview");
+ TableSection.clickField("New tax");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "New tax",
+ values: ["2.07", "6.1", "2.9", "6.01", "7.03"],
+ });
+ verifyObjectDetailPreview({ rowNumber: 4, row: ["New tax", "2.07"] });
+
+ cy.log("verify viz");
+ H.openOrdersTable();
+ H.tableHeaderColumn("New tax").should("be.visible");
+ H.tableHeaderColumn("Tax", { scrollIntoView: false }).should(
+ "not.exist",
+ );
+ });
+
+ // Skipped because data studio is not available with data model permissions only.
+ // Unskip once the new datamodel page is available in that case.
+ it.skip("should allow changing the field name with data model permissions only", () => {
+ H.activateToken("pro-self-hosted");
+ setDataModelPermissions({ tableIds: [ORDERS_ID] });
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getFieldNameInput("Tax").clear().type("New tax").blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Name of Tax updated");
+ TableSection.getFieldNameInput("New tax").should("be.visible");
+ TableSection.getField("New tax").should("be.visible");
+
+ cy.log("verify preview");
+ TableSection.clickField("New tax");
+ FieldSection.getPreviewButton().click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findByText("Sorry, you don’t have permission to see that.")
+ .should("be.visible");
+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findByText("Sorry, you don’t have permission to see that.")
+ .should("be.visible");
+
+ cy.log("verify viz as normal user");
+ cy.signInAsNormalUser();
+ H.openOrdersTable();
+ H.tableHeaderColumn("New tax").should("be.visible");
+ H.tableHeaderColumn("Tax", { scrollIntoView: false }).should(
+ "not.exist",
+ );
+ });
+
+ it("should allow changing the field description", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getFieldDescriptionInput("Total")
+ .clear()
+ .type("New description")
+ .blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Description of Total updated");
+ TableSection.getFieldDescriptionInput("Total").should(
+ "have.value",
+ "New description",
+ );
+
+ cy.log("verify preview");
+ TableSection.clickField("Total");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Total",
+ description: "New description",
+ values: ["39.72", "117.03", "49.21", "115.23", "134.91"],
+ });
+
+ cy.visit(
+ `/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}/fields/${ORDERS.TOTAL}`,
+ );
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Total").should("be.visible");
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("New description").should("be.visible");
+ });
+
+ it("should allow clearing the field description", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.getFieldDescriptionInput("Total").clear().blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Description of Total updated");
+ TableSection.getFieldDescriptionInput("Total").should("have.value", "");
+
+ cy.log("verify preview");
+ TableSection.clickField("Total");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Total",
+ values: ["39.72", "117.03", "49.21", "115.23", "134.91"],
+ });
+ PreviewSection.get().findByTestId("header-cell").realHover();
+ H.hovercard().should("not.contain.text", "The total billed amount.");
+
+ cy.visit(
+ `/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}/fields/${ORDERS.TOTAL}`,
+ );
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Total").should("be.visible");
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("No description yet").should("be.visible");
+ });
+ });
+
+ describe("Sorting", () => {
+ it("should allow sorting fields as in the database", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ });
+
+ TableSection.getSortButton().click();
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("database")
+ .should("be.checked");
+
+ H.openProductsTable();
+ H.assertTableData({
+ columns: [
+ "ID",
+ "Ean",
+ "Title",
+ "Category",
+ "Vendor",
+ "Price",
+ "Rating",
+ "Created At",
+ ],
+ });
+ });
+
+ it("should allow sorting fields alphabetically", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ });
+
+ TableSection.getSortButton().click();
+ TableSection.getSortOrderInput()
+ .findByLabelText("Alphabetical order")
+ .click();
+ cy.wait("@updateTable");
+ verifyAndCloseToast("Field order updated");
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("alphabetical")
+ .should("be.checked");
+
+ H.openProductsTable();
+ H.assertTableData({
+ columns: [
+ "Category",
+ "Created At",
+ "Ean",
+ "ID",
+ "Price",
+ "Rating",
+ "Title",
+ "Vendor",
+ ],
+ });
+ });
+
+ it("should allow sorting fields smartly", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ });
+
+ TableSection.getSortButton().click();
+ TableSection.getSortOrderInput().findByLabelText("Auto order").click();
+ cy.wait("@updateTable");
+ verifyAndCloseToast("Field order updated");
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("smart")
+ .should("be.checked");
+
+ H.openProductsTable();
+ H.assertTableData({
+ columns: [
+ "ID",
+ "Created At",
+ "Category",
+ "Ean",
+ "Price",
+ "Rating",
+ "Title",
+ "Vendor",
+ ],
+ });
+ });
+
+ it("should allow sorting fields in the custom order", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ });
+
+ TableSection.getSortButton().click();
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("database")
+ .should("be.checked");
+
+ H.moveDnDKitElement(TableSection.getSortableField("ID"), {
+ vertical: 50,
+ });
+ cy.wait("@updateFieldOrder");
+ verifyAndCloseToast("Field order updated");
+
+ cy.log(
+ "should not show loading state after an update (metabase#56482)",
+ );
+ cy.findByTestId("loading-indicator", { timeout: 0 }).should(
+ "not.exist",
+ );
+
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("custom")
+ .should("be.checked");
+
+ H.openProductsTable();
+ H.assertTableData({
+ columns: [
+ "Ean",
+ "ID",
+ "Title",
+ "Category",
+ "Vendor",
+ "Price",
+ "Rating",
+ "Created At",
+ ],
+ });
+ });
+
+ it("should allow switching to predefined order after drag & drop (metabase#56482)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ });
+
+ TableSection.getSortButton().click();
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("database")
+ .should("be.checked");
+
+ H.moveDnDKitElement(TableSection.getSortableField("ID"), {
+ vertical: 50,
+ });
+ cy.wait("@updateFieldOrder");
+ verifyAndCloseToast("Field order updated");
+
+ cy.log(
+ "should not show loading state after an update (metabase#56482)",
+ );
+ cy.findByTestId("loading-indicator", { timeout: 0 }).should(
+ "not.exist",
+ );
+
+ TableSection.getSortableFields().should(($items) => {
+ expect($items[0].textContent).to.equal("Ean");
+ expect($items[1].textContent).to.equal("ID");
+ });
+
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("custom")
+ .should("be.checked");
+
+ cy.log(
+ "should allow switching to predefined order afterwards (metabase#56482)",
+ );
+ TableSection.getSortOrderInput()
+ .findByLabelText("Database order")
+ .click();
+ cy.wait("@updateTable");
+
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("database")
+ .should("be.checked");
+ TableSection.getSortableFields().should(($items) => {
+ expect($items[0].textContent).to.equal("ID");
+ expect($items[1].textContent).to.equal("Ean");
+ });
+
+ cy.log("should allow drag & drop afterwards (metabase#56482)"); // extra sanity check
+ H.moveDnDKitElement(TableSection.getSortableField("ID"), {
+ vertical: 50,
+ });
+ cy.wait("@updateFieldOrder");
+
+ cy.log(
+ "should not show loading state after an update (metabase#56482)",
+ );
+ cy.findByTestId("loading-indicator", { timeout: 0 }).should(
+ "not.exist",
+ );
+
+ TableSection.getSortableFields().should(($items) => {
+ expect($items[0].textContent).to.equal("Ean");
+ expect($items[1].textContent).to.equal("ID");
+ });
+ });
+ });
+
+ describe("Sync options", () => {
+ it("should allow to sync table schema, re-scan table, and discard cached field values", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ });
+ TableSection.getSyncOptionsButton().click();
+
+ cy.log("sync table schema");
+ H.modal().within(() => {
+ cy.button("Sync table schema").click();
+ cy.button("Sync table schema").should("not.exist");
+ cy.button("Sync triggered!").should("be.visible");
+ cy.button("Sync triggered!").should("not.exist");
+ cy.button("Sync table schema").should("be.visible");
+ });
+
+ cy.log("re-scan table");
+ H.modal().within(() => {
+ cy.button("Re-scan table").click();
+ cy.button("Re-scan table").should("not.exist");
+ cy.button("Scan triggered!").should("be.visible");
+ cy.button("Scan triggered!").should("not.exist");
+ cy.button("Re-scan table").should("be.visible");
+ });
+
+ cy.log("discard cached field values");
+ H.modal().within(() => {
+ cy.button("Discard cached field values").click();
+ cy.button("Discard cached field values").should("not.exist");
+ cy.button("Discard triggered!").should("be.visible");
+ cy.button("Discard triggered!").should("not.exist");
+ cy.button("Discard cached field values").should("be.visible");
+ });
+
+ cy.realPress("Escape");
+ H.modal().should("not.exist");
+ });
+ });
+ });
+
+ describe("Field section", () => {
+ beforeEach(() => {
+ H.resetSnowplow();
+ H.enableTracking();
+ });
+
+ afterEach(() => {
+ H.expectNoBadSnowplowEvents();
+ });
+
+ describe("Name and description", () => {
+ it("should allow changing the field name", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TAX,
+ });
+
+ FieldSection.getNameInput().clear().type("New tax").blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Name of Tax updated");
+ TableSection.getFieldNameInput("New tax").should("exist");
+
+ cy.log("verify preview");
+ TableSection.clickField("New tax");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "New tax",
+ values: ["2.07", "6.1", "2.9", "6.01", "7.03"],
+ });
+ verifyObjectDetailPreview({ rowNumber: 4, row: ["New tax", "2.07"] });
+
+ cy.log("verify viz");
+ H.openOrdersTable();
+ H.tableHeaderColumn("New tax").should("be.visible");
+ H.tableHeaderColumn("Tax", { scrollIntoView: false }).should(
+ "not.exist",
+ );
+ });
+
+ // Skipped because data studio is not available with data model permissions only.
+ // Unskip once the new datamodel page is available in that case.
+ it.skip("should allow changing the field name with data model permissions only", () => {
+ H.activateToken("pro-self-hosted");
+ setDataModelPermissions({ tableIds: [ORDERS_ID] });
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TOTAL,
+ });
+
+ FieldSection.getNameInput().clear().type("New total").blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Name of Total updated");
+ FieldSection.getNameInput().should("have.value", "New total");
+ TableSection.getFieldNameInput("New total")
+ .scrollIntoView()
+ .should("be.visible");
+
+ cy.log("verify preview");
+ TableSection.clickField("New total");
+ FieldSection.getPreviewButton().click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findByText("Sorry, you don’t have permission to see that.")
+ .should("be.visible");
+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findByText("Sorry, you don’t have permission to see that.")
+ .should("be.visible");
+
+ cy.log("verify viz as normal user");
+ cy.signInAsNormalUser();
+ H.openOrdersTable();
+ H.tableHeaderColumn("New total").should("be.visible");
+ H.tableHeaderColumn("Total", { scrollIntoView: false }).should(
+ "not.exist",
+ );
+ });
+
+ it("should allow changing the field description", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TOTAL,
+ });
+
+ FieldSection.getDescriptionInput()
+ .clear()
+ .type("New description")
+ .blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Description of Total updated");
+ TableSection.getFieldDescriptionInput("Total").should(
+ "have.value",
+ "New description",
+ );
+
+ cy.log("verify preview");
+ TableSection.clickField("Total");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Total",
+ description: "New description",
+ values: ["39.72", "117.03", "49.21", "115.23", "134.91"],
+ });
+
+ cy.visit(
+ `/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}/fields/${ORDERS.TOTAL}`,
+ );
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Total").should("be.visible");
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("New description").should("be.visible");
+ });
+
+ it("should allow clearing the field description", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TOTAL,
+ });
+
+ FieldSection.getDescriptionInput().clear().blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Description of Total updated");
+ TableSection.getFieldDescriptionInput("Total").should("have.value", "");
+
+ cy.log("verify preview");
+ TableSection.clickField("Total");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Total",
+ values: ["39.72", "117.03", "49.21", "115.23", "134.91"],
+ });
+ PreviewSection.get().findByTestId("header-cell").realHover();
+ H.hovercard().should("not.contain.text", "The total billed amount.");
+
+ cy.visit(
+ `/reference/databases/${SAMPLE_DB_ID}/tables/${ORDERS_ID}/fields/${ORDERS.TOTAL}`,
+ );
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Total").should("be.visible");
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("No description yet").should("be.visible");
+ });
+
+ it("should remap FK display value from field section", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ FieldSection.getNameInput()
+ .clear()
+ .type("Remapped Product ID")
+ .realPress("Tab");
+ cy.wait("@updateField");
+ verifyAndCloseToast("Name of Product ID updated");
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Remapped Product ID",
+ values: ["14", "123", "105", "94", "132"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 2,
+ row: ["Remapped Product ID", "14"],
+ });
+
+ cy.log("verify viz");
+ H.openOrdersTable({ limit: 5 });
+ H.tableHeaderColumn("Remapped Product ID").should("be.visible");
+ });
+ });
+
+ describe("Field values", () => {
+ it("should allow to sync table schema, re-scan table, and discard cached field values", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ fieldId: PRODUCTS.CATEGORY,
+ });
+ FieldSection.getFieldValuesButton().click();
+
+ cy.log("re-scan field");
+ H.modal().within(() => {
+ cy.button("Re-scan field").click();
+ cy.button("Re-scan field").should("not.exist");
+ cy.button("Scan triggered!").should("be.visible");
+ cy.button("Scan triggered!").should("not.exist");
+ cy.button("Re-scan field").should("be.visible");
+ });
+
+ cy.log("discard cached field values");
+ H.modal().within(() => {
+ cy.button("Discard cached field values").click();
+ cy.button("Discard cached field values").should("not.exist");
+ cy.button("Discard triggered!").should("be.visible");
+ cy.button("Discard triggered!").should("not.exist");
+ cy.button("Discard cached field values").should("be.visible");
+ });
+
+ cy.realPress("Escape");
+ H.modal().should("not.exist");
+ });
+
+ it("should not automatically re-fetch field values when they are discarded unless 'Custom mapping' is used (metabase#62626)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ fieldId: PRODUCTS.CATEGORY,
+ });
+
+ FieldSection.getFieldValuesButton().click();
+ H.modal().within(() => {
+ cy.button("Discard cached field values").click();
+ cy.button("Discard triggered!").should("be.visible");
+ cy.button("Discard triggered!").should("not.exist");
+ });
+
+ cy.get("@fieldValues.all").should("have.length", 0);
+ });
+ });
+
+ describe("Data", () => {
+ describe("Coercion strategy", () => {
+ it("should allow you to cast a field to a data type", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: FEEDBACK_ID,
+ fieldId: FEEDBACK.RATING,
+ });
+
+ cy.log(
+ "Ensure that Coercion strategy has been humanized (metabase#44723)",
+ );
+ FieldSection.getCoercionToggle().parent().scrollIntoView().click();
+ H.popover().should("not.contain.text", "Coercion");
+ H.popover().findByText("UNIX seconds → Datetime").click();
+ cy.wait("@updateField");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "type_casting",
+ triggered_from: "admin",
+ });
+ verifyAndCloseToast("Casting enabled for Rating");
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Rating",
+ values: [
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ ],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 4,
+ row: ["Rating", "December 31, 1969, 4:00 PM"],
+ });
+
+ cy.log("verify viz");
+ H.openTable({ database: SAMPLE_DB_ID, table: FEEDBACK_ID });
+ cy.findAllByTestId("cell-data")
+ .contains("December 31, 1969, 4:00 PM")
+ .should("have.length.greaterThan", 0);
+ });
+
+ it("should allow to enable, change, and disable coercion strategy", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: FEEDBACK_ID,
+ fieldId: FEEDBACK.RATING,
+ });
+
+ cy.log("show error when strategy not chosen after toggling");
+ FieldSection.getCoercionToggle()
+ .parent()
+ .click({ scrollBehavior: "center" });
+ clickAway();
+ FieldSection.get()
+ .findByText("To enable casting, please select a data type")
+ .should("be.visible");
+
+ cy.log("enable casting");
+ FieldSection.getCoercionInput().click({ scrollBehavior: "center" });
+ H.popover().findByText("UNIX nanoseconds → Datetime").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Casting enabled for Rating");
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ // ideally we should change the formatting to show smaller values and assert those
+ // but we can't set formatting on a coerced field (metabase#60483)
+ verifyTablePreview({
+ column: "Rating",
+ values: [
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ "December 31, 1969, 4:00 PM",
+ ],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 4,
+ row: ["Rating", "December 31, 1969, 4:00 PM"],
+ });
+
+ cy.log("change casting");
+ FieldSection.getCoercionInput().click({ scrollBehavior: "center" });
+ H.popover().findByText("UNIX seconds → Datetime").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Casting updated for Rating");
+
+ cy.log("disable casting");
+ FieldSection.getCoercionToggle()
+ .parent()
+ .click({ scrollBehavior: "center" });
+ cy.wait("@updateField");
+ verifyAndCloseToast("Casting disabled for Rating");
+
+ cy.log("enable casting");
+ FieldSection.getCoercionToggle()
+ .parent()
+ .click({ scrollBehavior: "center" });
+ H.popover().findByText("UNIX seconds → Datetime").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Casting enabled for Rating");
+
+ H.openTable({ database: SAMPLE_DB_ID, table: FEEDBACK_ID });
+ cy.findAllByTestId("cell-data")
+ .contains("December 31, 1969, 4:00 PM")
+ .should("have.length.greaterThan", 0);
+ });
+ });
+ });
+
+ describe("Metadata", () => {
+ describe("Semantic type", () => {
+ it("should allow to change the type to 'No semantic type' (metabase#59052)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+ cy.wait(["@metadata", "@metadata"]);
+
+ FieldSection.getSemanticTypeInput()
+ .should("have.value", "Foreign Key")
+ // it should allow to just type to search (metabase#59052)
+ .type("no sema{downarrow}{enter}");
+ cy.wait("@updateField");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "semantic_type_change",
+ triggered_from: "admin",
+ });
+ H.undoToast().should(
+ "contain.text",
+ "Semantic type of Product ID updated",
+ );
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findAllByTestId("cell-data")
+ .should("have.length", 6)
+ .eq(1)
+ // FKs get blueish background
+ .should("have.css", "background-color", "rgba(0, 0, 0, 0)");
+
+ cy.reload();
+ cy.wait("@metadata");
+
+ FieldSection.getSemanticTypeInput().should(
+ "have.value",
+ "No semantic type",
+ );
+ });
+
+ it("should allow to change the type to 'Foreign Key' and choose the target field (metabase#59052)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+
+ FieldSection.getSemanticTypeInput()
+ .should("have.value", "Quantity")
+ .click();
+ H.popover().findByText("Foreign Key").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Semantic type of Quantity updated");
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findAllByTestId("cell-data")
+ .should("have.length", 6)
+ .eq(1)
+ // FKs get blueish background
+ .should("not.have.css", "background-color", "rgba(0, 0, 0, 0)");
+
+ FieldSection.getSemanticTypeFkTarget()
+ .should("have.value", "")
+ // it should allow to just type to search (metabase#59052)
+ .type("products{downarrow}{enter}");
+ cy.wait("@updateField");
+ H.undoToast().should(
+ "contain.text",
+ "Semantic type of Quantity updated",
+ );
+
+ cy.log("verify preview");
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findAllByTestId("cell-data")
+ .should("have.length", 6)
+ .eq(1)
+ // FKs get blueish background
+ .should("not.have.css", "background-color", "rgba(0, 0, 0, 0)");
+
+ cy.reload();
+ cy.wait(["@metadata", "@metadata"]);
+
+ FieldSection.getSemanticTypeFkTarget()
+ .should("be.visible")
+ .and("have.value", "Products → ID");
+ });
+
+ it("should allow to change the foreign key target", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.USER_ID,
+ });
+
+ FieldSection.getSemanticTypeFkTarget()
+ .should("have.value", "People → ID")
+ .click();
+ H.popover().within(() => {
+ cy.findByText("Reviews → ID").should("exist");
+ cy.findByText("Products → ID").click();
+ });
+ cy.wait("@updateField");
+ H.undoToast().should(
+ "contain.text",
+ "Semantic type of User ID updated",
+ );
+ FieldSection.getSemanticTypeFkTarget().should(
+ "have.value",
+ "Products → ID",
+ );
+
+ H.openTable({
+ database: SAMPLE_DB_ID,
+ table: ORDERS_ID,
+ mode: "notebook",
+ });
+ cy.icon("join_left_outer").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("Products").click();
+ });
+ cy.findByLabelText("Left column").should("contain.text", "User ID");
+ });
+
+ // Skipped because data studio is not available with data model permissions only.
+ // Unskip once the new datamodel page is available in that case.
+ it.skip("should allow to change the field foreign key target with no permissions to Reviews table", () => {
+ H.activateToken("pro-self-hosted");
+ setDataModelPermissions({
+ tableIds: [ORDERS_ID, PRODUCTS_ID, PEOPLE_ID],
+ });
+
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.USER_ID,
+ });
+ FieldSection.getSemanticTypeFkTarget()
+ .should("have.value", "People → ID")
+ .click();
+ H.popover().within(() => {
+ cy.findByText("Reviews → ID").should("not.exist");
+ cy.findByText("Products → ID").click();
+ });
+ cy.wait("@updateField");
+ H.undoToast().should(
+ "contain.text",
+ "Semantic type of User ID updated",
+ );
+ FieldSection.getSemanticTypeFkTarget().should(
+ "have.value",
+ "Products → ID",
+ );
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findByText("Sorry, you don’t have permission to see that.")
+ .should("be.visible");
+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();
+ cy.wait("@dataset");
+ PreviewSection.get()
+ .findByText("Sorry, you don’t have permission to see that.")
+ .should("be.visible");
+
+ cy.log("verify viz as normal user");
+ cy.signInAsNormalUser();
+ H.openTable({
+ database: SAMPLE_DB_ID,
+ table: ORDERS_ID,
+ mode: "notebook",
+ });
+ cy.icon("join_left_outer").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("Products").click();
+ });
+ cy.findByLabelText("Left column").should("contain.text", "User ID");
+ });
+
+ // Skipped because data studio is not available with data model permissions only.
+ // Unskip once the new datamodel page is available in that case.
+ it.skip("should not allow setting foreign key target for inaccessible tables", () => {
+ H.activateToken("pro-self-hosted");
+ setDataModelPermissions({ tableIds: [REVIEWS_ID] });
+
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: REVIEWS_ID,
+ fieldId: REVIEWS.PRODUCT_ID,
+ });
+ FieldSection.getDisplayValuesInput().click();
+
+ H.popover().within(() => {
+ cy.findByRole("option", { name: /Use original value/ })
+ .should("be.visible")
+ .and("not.have.attr", "data-combobox-disabled");
+ cy.findByRole("option", { name: /Use foreign key/ })
+ .should("be.visible")
+ .and("have.attr", "data-combobox-disabled", "true");
+ });
+ });
+
+ it("should allow to change the type to 'Currency' and choose the currency (metabase#59052)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TAX,
+ });
+
+ FieldSection.getSemanticTypeInput()
+ .should("have.value", "No semantic type")
+ .click();
+ H.popover().findByText("Currency").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Semantic type of Tax updated");
+
+ cy.log("verify preview");
+ TableSection.clickField("Tax");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Tax ($)",
+ values: ["2.07", "6.10", "2.90", "6.01", "7.03"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 4,
+ row: ["Tax ($)", "2.07"],
+ });
+
+ cy.log("change currency");
+ FieldSection.getSemanticTypeCurrencyInput()
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.value", "US Dollar")
+ // it should allow to just type to search (metabase#59052)
+ .type("canadian{downarrow}{enter}");
+ cy.wait("@updateField");
+ verifyAndCloseToast("Semantic type of Tax updated");
+
+ cy.log("verify preview");
+ verifyTablePreview({
+ column: "Tax (CA$)",
+ values: ["2.07", "6.10", "2.90", "6.01", "7.03"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 4,
+ row: ["Tax (CA$)", "2.07"],
+ });
+
+ cy.log("verify viz");
+ H.openOrdersTable();
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Tax (CA$)").should("be.visible");
+ });
+
+ it("should correctly filter out options in Foreign Key picker (metabase#56839)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+ cy.wait(["@metadata", "@metadata"]);
+
+ FieldSection.getSemanticTypeFkTarget().focus().clear();
+ H.popover()
+ .should("contain.text", "Orders → ID")
+ .and("contain.text", "People → ID")
+ .and("contain.text", "Products → ID")
+ .and("contain.text", "Reviews → ID");
+
+ cy.log("should case-insensitive match field display name");
+ FieldSection.getSemanticTypeFkTarget().focus().type("id");
+ H.popover()
+ .should("contain.text", "Orders → ID")
+ .and("contain.text", "People → ID")
+ .and("contain.text", "Products → ID")
+ .and("contain.text", "Reviews → ID");
+
+ cy.log("should case-insensitive match field description");
+ FieldSection.getSemanticTypeFkTarget().focus().clear().type("EXT");
+ H.popover()
+ .should("not.contain.text", "Orders → ID")
+ .and("not.contain.text", "People → ID")
+ .and("contain.text", "Products → ID")
+ .and("contain.text", "Reviews → ID");
+ });
+
+ it("should not let you change the type to 'Number' (metabase#16781)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+ cy.wait(["@metadata", "@metadata"]);
+
+ FieldSection.getSemanticTypeInput().click();
+ H.popover()
+ .should("contain.text", "Foreign Key")
+ .and("not.contain.text", "Number");
+ });
+
+ it("should not overflow the screen on smaller viewports (metabase#56442)", () => {
+ const viewportHeight = 400;
+
+ cy.viewport(1280, viewportHeight);
+ H.DataModel.visitDataStudio({ databaseId: SAMPLE_DB_ID });
+ TablePicker.getTable("Reviews").scrollIntoView().click();
+ TableSection.clickField("ID");
+ FieldSection.getSemanticTypeInput().click();
+
+ H.popover().scrollTo("top");
+ H.popover()
+ .findByText("Entity Key")
+ .should(($element) => {
+ const rect = $element[0].getBoundingClientRect();
+ expect(rect.top).greaterThan(0);
+ });
+
+ H.popover().scrollTo("bottom");
+ H.popover()
+ .findByText("No semantic type")
+ .should(($element) => {
+ const rect = $element[0].getBoundingClientRect();
+ expect(rect.bottom).lessThan(viewportHeight);
+ });
+ });
+
+ it(
+ "should show an error with links to other fields with 'Entity name' semantic type",
+ { tags: "@external" },
+ () => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "many_data_types" });
+ cy.signInAsAdmin();
+ H.resyncDatabase({
+ dbId: WRITABLE_DB_ID,
+ tableName: "many_data_types",
+ });
+
+ H.DataModel.visitDataStudio({ databaseId: WRITABLE_DB_ID });
+ TablePicker.getTable("Many Data Types").click();
+ TableSection.clickField("Json → D");
+ FieldSection.getSemanticTypeInput().click();
+ H.popover().findByText("Entity Name").click();
+
+ TableSection.clickField("Text");
+ FieldSection.getSemanticTypeInput().click();
+ H.popover().findByText("Entity Name").click();
+
+ FieldSection.get().should(
+ "contain.text",
+ "There are other fields with this semantic type: Json: Json → D",
+ );
+ FieldSection.get()
+ .findByRole("link", { name: "Json: Json → D" })
+ .should("be.visible")
+ .click({
+ force: true, // scrollIntoView does not work
+ });
+
+ FieldSection.getNameInput().should("have.value", "Json → D");
+
+ FieldSection.get().should(
+ "contain.text",
+ "There are other fields with this semantic type: Text",
+ );
+ FieldSection.get()
+ .findByRole("link", { name: "Text" })
+ .scrollIntoView()
+ .should("be.visible")
+ .click({
+ force: true, // scrollIntoView does not work
+ });
+
+ FieldSection.getNameInput().should("have.value", "Text");
+ },
+ );
+ });
+ });
+
+ describe("Behavior", () => {
+ describe("Visibility", () => {
+ it("should let you change field visibility to 'Everywhere'", () => {
+ cy.request("PUT", `/api/field/${ORDERS.TAX}`, {
+ visibility_type: "sensitive",
+ });
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TAX,
+ });
+
+ FieldSection.getVisibilityInput()
+ .should("have.value", "Do not include")
+ .click();
+ H.popover().findByText("Everywhere").click();
+ cy.wait("@updateField");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "visibility_change",
+ triggered_from: "admin",
+ });
+ verifyAndCloseToast("Visibility of Tax updated");
+ FieldSection.getVisibilityInput().should("have.value", "Everywhere");
+
+ cy.log("verify preview");
+ TableSection.clickField("Tax");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Tax",
+ values: ["2.07", "6.1", "2.9", "6.01", "7.03"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 4,
+ row: ["Tax", "2.07"],
+ });
+
+ cy.log("table viz");
+ H.openOrdersTable();
+ H.tableHeaderColumn("Total").should("be.visible");
+ H.tableHeaderColumn("Tax").should("be.visible");
+
+ cy.log("object detail viz");
+ cy.findByTestId("table-body")
+ .findAllByTestId("cell-data")
+ .eq(0)
+ .click();
+ H.modal().findByText("Tax").should("be.visible");
+ H.modal().findByText("2.07").should("be.visible");
+ });
+
+ it("should let you change field visibility to 'Do not include'", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TAX,
+ });
+
+ FieldSection.getVisibilityInput()
+ .should("have.value", "Everywhere")
+ .click();
+ H.popover().findByText("Do not include").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Visibility of Tax updated");
+ FieldSection.getVisibilityInput().should(
+ "have.value",
+ "Do not include",
+ );
+
+ cy.log("verify preview");
+ TableSection.clickField("Tax");
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get()
+ .findByText("This field is hidden")
+ .should("exist");
+ cy.get("@dataset.all").should("have.length", 0);
+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();
+ cy.wait("@dataset");
+ PreviewSection.get().findByText("Tax").should("not.exist");
+
+ cy.log("table viz");
+ H.openOrdersTable();
+ H.tableHeaderColumn("Total").should("be.visible");
+ H.tableHeaderColumn("Tax", { scrollIntoView: false }).should(
+ "not.exist",
+ );
+
+ cy.log("object detail viz");
+ cy.findByTestId("table-body")
+ .findAllByTestId("cell-data")
+ .eq(0)
+ .click();
+ H.modal().findByText("Tax").should("not.exist");
+ H.modal().findByText("2.07").should("not.exist");
+ });
+
+ it("should let you change field visibility to 'Do not include' even if Preview is opened (metabase#61806)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TAX,
+ });
+
+ TableSection.clickField("Tax");
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get().within(() => {
+ cy.findByText("Filtering").click();
+
+ cy.findByTestId("number-filter-picker").should("be.visible");
+ });
+
+ FieldSection.getVisibilityInput()
+ .should("have.value", "Everywhere")
+ .click();
+ H.popover().findByText("Do not include").click();
+ cy.wait("@updateField");
+
+ PreviewSection.get()
+ .findByText("This field is hidden")
+ .should("exist");
+ });
+
+ it("should let you change field visibility to 'Only in detail views'", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.TAX,
+ });
+
+ FieldSection.getVisibilityInput()
+ .should("have.value", "Everywhere")
+ .click();
+ H.popover().findByText("Only in detail views").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Visibility of Tax updated");
+ FieldSection.getVisibilityInput().should(
+ "have.value",
+ "Only in detail views",
+ );
+
+ cy.log("verify preview");
+ TableSection.clickField("Tax");
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get()
+ .findByText("This field is hidden")
+ .should("exist");
+ cy.get("@dataset.all").should("have.length", 0);
+ verifyObjectDetailPreview({
+ rowNumber: 4,
+ row: ["Tax", "2.07"],
+ });
+
+ cy.log("table viz");
+ H.openOrdersTable();
+ H.tableHeaderColumn("Total").should("be.visible");
+ H.tableHeaderColumn("Tax", { scrollIntoView: false }).should(
+ "not.exist",
+ );
+
+ cy.log("object detail viz");
+ cy.findByTestId("table-body")
+ .findAllByTestId("cell-data")
+ .eq(0)
+ .click();
+ H.modal().findByText("Tax").should("be.visible");
+ H.modal().findByText("2.07").should("be.visible");
+ });
+
+ it(
+ "should be able to select and update a field in a database without schemas",
+ { tags: ["@external"] },
+ () => {
+ H.restore("mysql-8");
+ H.activateToken("bleeding-edge");
+ H.DataModel.visitDataStudio({
+ databaseId: MYSQL_DB_ID,
+ schemaId: MYSQL_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ });
+
+ TableSection.clickField("Tax");
+ FieldSection.getVisibilityInput().click();
+ H.popover().findByText("Do not include").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Visibility of Tax updated");
+ FieldSection.getVisibilityInput().should(
+ "have.value",
+ "Do not include",
+ );
+ },
+ );
+ });
+
+ describe("Filtering", () => {
+ it("should let you change filtering to 'Search box'", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+
+ FieldSection.getFilteringInput()
+ .should("have.value", "A list of all values")
+ .click();
+ H.popover().findByText("Search box").click();
+ cy.wait("@updateField");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "filtering_change",
+ triggered_from: "admin",
+ });
+ verifyAndCloseToast("Filtering of Quantity updated");
+
+ cy.log("verify preview");
+ TableSection.clickField("Quantity");
+ FieldSection.getPreviewButton().click();
+ PreviewSection.getPreviewTypeInput().findByText("Filtering").click();
+ PreviewSection.get().within(() => {
+ cy.findByPlaceholderText("Enter a number").should("be.visible");
+ cy.button(/Add filter/).should("not.exist");
+ });
+
+ cy.reload();
+ FieldSection.getFilteringInput()
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.value", "Search box");
+ });
+
+ it("should let you change filtering to 'Plain input box'", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+
+ FieldSection.getFilteringInput()
+ .should("have.value", "A list of all values")
+ .click();
+ H.popover().findByText("Plain input box").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Filtering of Quantity updated");
+
+ cy.log("verify preview");
+ TableSection.clickField("Quantity");
+ FieldSection.getPreviewButton().click();
+ PreviewSection.getPreviewTypeInput().findByText("Filtering").click();
+ PreviewSection.get().within(() => {
+ cy.findByPlaceholderText("Min").should("be.visible");
+ cy.findByPlaceholderText("Max").should("be.visible");
+ cy.button(/Add filter/).should("not.exist");
+ });
+
+ cy.reload();
+ FieldSection.getFilteringInput()
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.value", "Plain input box");
+ });
+
+ it("should let you change filtering to 'A list of all values'", () => {
+ cy.request("PUT", `/api/field/${ORDERS.QUANTITY}`, {
+ has_field_values: "none",
+ });
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+
+ FieldSection.getFilteringInput()
+ .should("have.value", "Plain input box")
+ .click();
+ H.popover().findByText("A list of all values").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Filtering of Quantity updated");
+
+ cy.log("verify preview");
+ TableSection.clickField("Quantity");
+ FieldSection.getPreviewButton().click();
+ PreviewSection.getPreviewTypeInput().findByText("Filtering").click();
+ PreviewSection.get().within(() => {
+ cy.findByPlaceholderText("Search the list").should("be.visible");
+ cy.button(/Add filter/).should("not.exist");
+ });
+
+ cy.reload();
+ FieldSection.getFilteringInput()
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.value", "A list of all values");
+ });
+ });
+
+ describe("Display values", () => {
+ it("should show tooltips explaining why remapping options are disabled", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: PRODUCTS_ID,
+ fieldId: PRODUCTS.TITLE,
+ });
+
+ FieldSection.getDisplayValuesInput().click();
+
+ cy.log("foreign key mapping");
+ H.popover().within(() => {
+ cy.findByRole("option", { name: /Use foreign key/ }).should(
+ "have.attr",
+ "data-combobox-disabled",
+ "true",
+ );
+ cy.findByRole("option", { name: /Use foreign key/ })
+ .icon("info")
+ .realHover();
+ });
+ H.tooltip().should(
+ "contain.text",
+ 'You can only use foreign key mapping for fields with the semantic type set to "Foreign Key"',
+ );
+
+ cy.log("custom mapping");
+ H.popover().within(() => {
+ cy.findByRole("option", { name: /Custom mapping/ }).should(
+ "have.attr",
+ "data-combobox-disabled",
+ "true",
+ );
+ cy.findByRole("option", { name: /Custom mapping/ })
+ .icon("info")
+ .realHover();
+ });
+ H.tooltip().should(
+ "contain.text",
+ 'You can only use custom mapping for numerical fields with filtering set to "A list of all values"',
+ );
+
+ cy.log("clicking disabled option does not change the value");
+ cy.findByRole("option", { name: /Custom mapping/ }).click({
+ force: true, // try to click it despite pointer-events: none
+ });
+ FieldSection.getDisplayValuesInput().should(
+ "have.value",
+ "Use original value",
+ );
+ });
+
+ it("should let you change to 'Use foreign key' and change the target for field with fk", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Product ID",
+ values: ["14", "123", "105", "94", "132"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 2,
+ row: ["Product ID", "14"],
+ });
+
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Use foreign key").click();
+ H.popover().findByText("Title").click();
+ cy.wait("@updateFieldDimension");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "display_values",
+ triggered_from: "admin",
+ });
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Product ID updated",
+ );
+
+ cy.log("verify preview");
+ verifyObjectDetailPreview({
+ rowNumber: 2,
+ row: ["Product ID", "Awesome Concrete Shoes"],
+ });
+ verifyTablePreview({
+ column: "Product ID",
+ values: [
+ "Awesome Concrete Shoes",
+ "Mediocre Wooden Bench",
+ "Fantastic Wool Shirt",
+ "Awesome Bronze Plate",
+ "Sleek Steel Table",
+ ],
+ });
+
+ cy.reload();
+ FieldSection.getDisplayValuesInput()
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.value", "Use foreign key");
+ FieldSection.getDisplayValuesFkTargetInput()
+ .should("be.visible")
+ .and("have.value", "Title");
+ });
+
+ // Skipped because data studio is not available with data model permissions only.
+ // Unskip once the new datamodel page is available in that case.
+ it.skip("should allow to change foreign key target for accessible tables", () => {
+ H.activateToken("pro-self-hosted");
+ setDataModelPermissions({
+ tableIds: [ORDERS_ID, REVIEWS_ID, PRODUCTS_ID],
+ });
+
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: REVIEWS_ID,
+ fieldId: REVIEWS.PRODUCT_ID,
+ });
+
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Use foreign key").click();
+ H.popover().findByText("Title").click();
+ cy.wait("@updateFieldDimension");
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Product ID updated",
+ );
+
+ cy.signInAsNormalUser();
+ H.openReviewsTable({ limit: 1 });
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Rustic Paper Wallet").should("be.visible");
+ });
+
+ it("should allow 'Custom mapping' null values", () => {
+ const remappedNullValue = "nothin";
+
+ cy.signInAsAdmin();
+ H.addSqliteDatabase();
+
+ cy.get<number>("@sqliteID").then((databaseId) => {
+ H.withDatabase(
+ databaseId,
+ ({ NUMBER_WITH_NULLS: { NUM }, NUMBER_WITH_NULLS_ID }) => {
+ cy.request("GET", `/api/database/${databaseId}/schemas`).then(
+ ({ body }) => {
+ const [schemaName] = body;
+
+ H.DataModel.visitDataStudio({
+ databaseId,
+ schemaId: `${databaseId}:${schemaName}`,
+ tableId: NUMBER_WITH_NULLS_ID,
+ fieldId: NUM,
+ });
+ },
+ );
+
+ cy.log("Change `null` to custom mapping");
+ FieldSection.getDisplayValuesInput().scrollIntoView().click();
+ H.popover().findByText("Custom mapping").click();
+ cy.wait("@updateFieldValues");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "display_values",
+ triggered_from: "admin",
+ });
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Num updated",
+ );
+ H.undoToast().icon("close").click({
+ force: true, // it's behind a modal
+ });
+
+ H.modal()
+ .should("be.visible")
+ .within(() => {
+ cy.findAllByPlaceholderText("Enter value")
+ .filter("[value='null']")
+ .clear()
+ .type(remappedNullValue);
+ cy.button("Save").click();
+ });
+ cy.wait("@updateFieldValues");
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Num updated",
+ );
+
+ cy.log("Make sure custom mapping appears in QB");
+ H.openTable({
+ database: databaseId,
+ table: NUMBER_WITH_NULLS_ID,
+ });
+ cy.findAllByRole("gridcell", {
+ name: remappedNullValue,
+ }).should("be.visible");
+ },
+ );
+ });
+ });
+
+ it("should correctly show remapped column value", () => {
+ H.DataModel.visitDataStudio({ databaseId: SAMPLE_DB_ID });
+
+ // edit "Product ID" column in "Orders" table
+ TablePicker.getTable("Orders").click();
+ TableSection.clickField("Product ID");
+
+ // remap its original value to use foreign key
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Use foreign key").click();
+ H.popover().findByText("Title").click();
+ cy.wait("@updateFieldDimension");
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Product ID updated",
+ );
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyObjectDetailPreview({
+ rowNumber: 2,
+ row: ["Product ID", "Awesome Concrete Shoes"],
+ });
+ verifyTablePreview({
+ column: "Product ID",
+ values: [
+ "Awesome Concrete Shoes",
+ "Mediocre Wooden Bench",
+ "Fantastic Wool Shirt",
+ "Awesome Bronze Plate",
+ "Sleek Steel Table",
+ ],
+ });
+
+ FieldSection.get()
+ .findByText(
+ "You might want to update the field name to make sure it still makes sense based on your remapping choices.",
+ )
+ .scrollIntoView()
+ .should("be.visible");
+
+ cy.log("Name of the product should be displayed instead of its ID");
+ H.openOrdersTable();
+ cy.findByRole("gridcell", { name: "Awesome Concrete Shoes" }).should(
+ "be.visible",
+ );
+ });
+
+ it("should correctly apply and display custom remapping for numeric values", () => {
+ // this test also indirectly reproduces metabase#12771
+ const customMap = {
+ 1: "Awful",
+ 2: "Unpleasant",
+ 3: "Meh",
+ 4: "Enjoyable",
+ 5: "Perfecto",
+ };
+
+ H.DataModel.visitDataStudio({ databaseId: SAMPLE_DB_ID });
+ // edit "Rating" values in "Reviews" table
+ TablePicker.getTable("Reviews").click();
+ TableSection.clickField("Rating");
+
+ // apply custom remapping for "Rating" values 1-5
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Custom mapping").click();
+ cy.wait("@updateFieldValues");
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Rating updated",
+ );
+ H.undoToast().icon("close").click({
+ force: true, // it's behind a modal
+ });
+ H.modal().within(() => {
+ cy.findByText(
+ "You might want to update the field name to make sure it still makes sense based on your remapping choices.",
+ ).should("be.visible");
+
+ Object.entries(customMap).forEach(([key, value]) => {
+ cy.findByDisplayValue(key).click().clear().type(value);
+ });
+
+ cy.button("Save").click();
+ });
+ cy.wait("@updateFieldValues");
+ cy.wait("@updateFieldDimension");
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Rating updated",
+ );
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Rating",
+ values: [
+ "Perfecto",
+ "Enjoyable",
+ "Perfecto",
+ "Enjoyable",
+ "Perfecto",
+ ],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 3,
+ row: ["Rating", "Perfecto"],
+ });
+
+ cy.log("Numeric ratings should be remapped to custom strings");
+ H.openReviewsTable();
+ Object.values(customMap).forEach((rating) => {
+ cy.findAllByText(rating)
+ .eq(0)
+ .scrollIntoView()
+ .should("be.visible");
+ });
+ });
+
+ // Skipped because data studio is not available with data model permissions only.
+ // Unskip once the new datamodel page is available in that case.
+ it.skip("should show a proper error message when using custom mapping", () => {
+ H.activateToken("pro-self-hosted");
+ setDataModelPermissions({ tableIds: [REVIEWS_ID] });
+
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: REVIEWS_ID,
+ fieldId: REVIEWS.RATING,
+ });
+ FieldSection.getDisplayValuesInput().click();
+
+ H.popover().within(() => {
+ cy.findByRole("option", { name: /Use original value/ })
+ .should("be.visible")
+ .and("not.have.attr", "data-combobox-disabled");
+ cy.findByRole("option", { name: /Custom mapping/ })
+ .should("be.visible")
+ .and("have.attr", "data-combobox-disabled", "true");
+ });
+
+ cy.signInAsAdmin();
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: REVIEWS_ID,
+ fieldId: REVIEWS.RATING,
+ });
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Custom mapping").click();
+ cy.wait("@updateFieldDimension");
+ H.undoToast().should(
+ "contain.text",
+ "Display values of Rating updated",
+ );
+
+ cy.signIn("none");
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: REVIEWS_ID,
+ fieldId: REVIEWS.RATING,
+ });
+
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText(CUSTOM_MAPPING_ERROR).should("exist");
+ });
+
+ it("should allow 'Custom mapping' option only for 'Search box' filtering type (metabase#16322)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: REVIEWS_ID,
+ fieldId: REVIEWS.RATING,
+ });
+
+ FieldSection.getFilteringInput().click();
+ H.popover().findByText("Search box").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Filtering of Rating updated");
+
+ FieldSection.getDisplayValuesInput().click();
+ H.popover()
+ .findByRole("option", { name: /Custom mapping/ })
+ .should("have.attr", "data-combobox-disabled", "true");
+ H.popover()
+ .findByRole("option", { name: /Custom mapping/ })
+ .icon("info")
+ .realHover();
+ H.tooltip()
+ .should("be.visible")
+ .and(
+ "have.text",
+ 'You can only use custom mapping for numerical fields with filtering set to "A list of all values"',
+ );
+
+ cy.log("close popover by clicking on element inside panel");
+ FieldSection.get().findByText("Field settings").click();
+
+ cy.log("open popover");
+ FieldSection.getFilteringInput().click();
+ H.popover().findByText("A list of all values").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Filtering of Rating updated");
+
+ FieldSection.getDisplayValuesInput().click();
+ H.popover()
+ .findByRole("option", { name: /Custom mapping/ })
+ .should("not.have.attr", "data-combobox-disabled");
+ });
+
+ it("should allow to map FK to date fields (metabase#7108)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.USER_ID,
+ });
+
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Use foreign key").click();
+ cy.wait("@updateFieldDimension");
+ verifyAndCloseToast("Display values of User ID updated");
+
+ FieldSection.getDisplayValuesFkTargetInput().click();
+
+ H.popover().within(() => {
+ cy.findByText("Birth Date").scrollIntoView().should("be.visible");
+ cy.findByText("Created At")
+ .scrollIntoView()
+ .should("be.visible")
+ .click();
+ });
+ cy.wait("@updateFieldDimension");
+ H.undoToast().should(
+ "contain.text",
+ "Display values of User ID updated",
+ );
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "User ID",
+ values: [
+ "2023-10-07T01:34:35.462-07:00",
+ "2023-10-07T01:34:35.462-07:00",
+ "2023-10-07T01:34:35.462-07:00",
+ "2023-10-07T01:34:35.462-07:00",
+ "2023-10-07T01:34:35.462-07:00",
+ ],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 1,
+ row: ["User ID", "2023-10-07T01:34:35.462-07:00"],
+ });
+
+ H.visitQuestion(ORDERS_QUESTION_ID);
+ cy.findAllByTestId("cell-data")
+ .eq(10) // 1st data row, 2nd column (User ID)
+ .should("have.text", "2023-10-07T01:34:35.462-07:00");
+ });
+ });
+
+ describe("Unfold JSON", { tags: "@external" }, () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "many_data_types" });
+ cy.signInAsAdmin();
+ H.resyncDatabase({
+ dbId: WRITABLE_DB_ID,
+ tableName: "many_data_types",
+ });
+ cy.intercept(
+ "POST",
+ `/api/database/${WRITABLE_DB_ID}/sync_schema`,
+ ).as("sync_schema");
+ });
+
+ it("should let you enable/disable 'Unfold JSON' for JSON columns", () => {
+ H.DataModel.visitDataStudio({ databaseId: WRITABLE_DB_ID });
+ TablePicker.getTable("Many Data Types").click();
+
+ cy.log("json is unfolded initially and shows prefix");
+ TableSection.getField("Json → A").should("exist");
+ TableSection.getField("Json → A")
+ .findByTestId("name-prefix")
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.text", "Json:");
+
+ cy.log("shows prefix in field section");
+ TableSection.clickField("Json → A");
+ FieldSection.get()
+ .findByTestId("name-prefix")
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.text", "Json:");
+ FieldSection.getRawName().should("exist").and("have.text", "json.a");
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Json → A",
+ values: ["10", "10"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 1,
+ row: ["Json → A", "10"],
+ });
+
+ cy.log("show prefix in table section when sorting");
+ TableSection.getSortButton().click();
+ TableSection.getField("Json → A")
+ .findByTestId("name-prefix")
+ .should("be.visible")
+ .and("have.text", "Json:");
+ TableSection.get().button("Done").click();
+ TableSection.clickField("Json");
+
+ FieldSection.getUnfoldJsonInput().should("have.value", "Yes").click();
+ H.popover().findByText("No").click();
+ cy.wait("@updateField");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "json_unfolding",
+ triggered_from: "admin",
+ });
+ H.undoToast().should(
+ "contain.text",
+ "JSON unfolding disabled for Json",
+ );
+
+ // Check setting has persisted
+ cy.reload();
+ FieldSection.getUnfoldJsonInput().should("have.value", "No");
+
+ // Sync database
+ cy.visit(`/admin/databases/${WRITABLE_DB_ID}`);
+ cy.button("Sync database schema").click();
+ cy.wait("@sync_schema");
+ cy.button(/Sync triggered!/).should("be.visible");
+
+ // Check json field is not unfolded
+ H.DataModel.visitDataStudio({ databaseId: WRITABLE_DB_ID });
+ TablePicker.getTable("Many Data Types").click();
+ TableSection.getField("Json → A").should("not.exist");
+ });
+
+ it("should let you change the name of JSON-unfolded columns (metabase#55563)", () => {
+ H.DataModel.visitDataStudio({ databaseId: WRITABLE_DB_ID });
+ TablePicker.getTable("Many Data Types").click();
+ TableSection.clickField("Json → A");
+
+ TableSection.getFieldNameInput("Json → A").clear().type("A").blur();
+ FieldSection.getPreviewButton().click();
+
+ FieldSection.getNameInput().should("have.value", "A");
+ FieldSection.get()
+ .findByTestId("name-prefix")
+ .scrollIntoView()
+ .should("be.visible")
+ .and("have.text", "Json:");
+ verifyTablePreview({
+ column: "A",
+ values: ["10", "10"],
+ });
+ });
+
+ it("should smartly truncate prefix name", () => {
+ const shortPrefix = "Short prefix";
+ const longPrefix = "Legendarily long column prefix";
+ H.DataModel.visitDataStudio({ databaseId: WRITABLE_DB_ID });
+ TablePicker.getTable("Many Data Types").click();
+ TableSection.clickField("Json → A");
+
+ cy.log("should not truncante short prefixes");
+ TableSection.getFieldNameInput("Json")
+ .clear()
+ .type(shortPrefix)
+ .blur();
+
+ cy.log("in field section");
+ FieldSection.get()
+ .findByTestId("name-prefix")
+ .should("have.text", `${shortPrefix}:`)
+ .then((element) => {
+ H.assertIsNotEllipsified(element[0]);
+ });
+ FieldSection.get().findByTestId("name-prefix").realHover();
+ H.tooltip().should("not.exist");
+
+ cy.log("in table section");
+ TableSection.getField("Json → D")
+ .findByTestId("name-prefix")
+ .should("have.text", `${shortPrefix}:`)
+ .then((element) => {
+ H.assertIsNotEllipsified(element[0]);
+ });
+ TableSection.getField("Json → D")
+ .findByTestId("name-prefix")
+ .realHover();
+ H.tooltip().should("not.exist");
+
+ cy.log("should truncante long prefixes");
+ TableSection.getFieldNameInput(shortPrefix)
+ .clear()
+ .type(longPrefix)
+ .blur();
+
+ cy.log("in field section");
+ FieldSection.get()
+ .findByTestId("name-prefix")
+ .should("have.text", `${longPrefix}:`)
+ .then((element) => {
+ H.assertIsEllipsified(element[0]);
+ });
+ FieldSection.get()
+ .findByTestId("name-prefix")
+ .realHover({ scrollBehavior: "center" });
+ H.tooltip().should("be.visible").and("have.text", longPrefix);
+
+ // hide tooltip
+ FieldSection.getDescriptionInput().realHover();
+ H.tooltip().should("not.exist");
+
+ cy.log("in table section");
+ TableSection.getField("Json → D")
+ .scrollIntoView({ offset: { left: 0, top: -400 } })
+ .findByTestId("name-prefix")
+ .should("have.text", `${longPrefix}:`)
+ .realHover({ scrollBehavior: "center" });
+ H.tooltip().should("be.visible").and("have.text", longPrefix);
+ });
+ });
+ });
+
+ describe("Formatting", () => {
+ it("should let you to change field formatting", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+
+ FieldSection.getStyleInput().click();
+ H.popover().findByText("Percent").click();
+ cy.wait("@updateField");
+ H.expectUnstructuredSnowplowEvent({
+ event: "metadata_edited",
+ event_detail: "formatting",
+ triggered_from: "admin",
+ });
+ verifyAndCloseToast("Formatting of Quantity updated");
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Quantity",
+ values: ["200%", "300%", "200%", "600%", "500%"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 8,
+ row: ["Quantity", "200%"],
+ });
+ });
+
+ it("should only show currency formatting options for currency fields", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.DISCOUNT,
+ });
+ cy.wait("@metadata");
+
+ cy.findByTestId("column-settings")
+ .scrollIntoView()
+ .within(() => {
+ cy.findByText("Unit of currency").should("be.visible");
+ cy.findByText("Currency label style").should("be.visible");
+ });
+
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+ cy.wait("@metadata");
+
+ cy.findByTestId("column-settings")
+ .scrollIntoView()
+ .within(() => {
+ // shouldnt show currency settings by default for quantity field
+ cy.findByText("Unit of currency").should("not.be.visible");
+ cy.findByText("Currency label style").should("not.be.visible");
+
+ cy.get("#number_style").click();
+ });
+
+ // if you change the style to currency, currency settings should appear
+ H.popover().findByText("Currency").click();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Formatting of Quantity updated");
+
+ cy.findByTestId("column-settings").within(() => {
+ cy.findByText("Unit of currency").should("be.visible");
+ cy.findByText("Currency label style").should("be.visible");
+ });
+ });
+
+ it("should save and obey field prefix formatting settings", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+ cy.wait("@metadata");
+
+ FieldSection.getPrefixInput().scrollIntoView().type("about ").blur();
+ cy.wait("@updateField");
+ verifyAndCloseToast("Formatting of Quantity updated");
+
+ cy.log("verify preview");
+ FieldSection.getPreviewButton().click();
+ verifyTablePreview({
+ column: "Quantity",
+ values: ["about 2", "about 3", "about 2", "about 6", "about 5"],
+ });
+ verifyObjectDetailPreview({
+ rowNumber: 8,
+ row: ["Quantity", "about 2"],
+ });
+
+ cy.log("verify viz");
+ H.visitQuestionAdhoc({
+ dataset_query: {
+ database: SAMPLE_DB_ID,
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["sum", ["field", ORDERS.QUANTITY, null]]],
+ },
+ type: "query",
+ },
+ });
+ cy.findByTestId("visualization-root")
+ .findByText("about 69,540")
+ .should("be.visible");
+ });
+
+ it("should not call PUT field endpoint when prefix or suffix has not been changed (SEM-359)", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+ cy.wait("@metadata");
+
+ FieldSection.getPrefixInput().focus().blur();
+ cy.get("@updateFieldSpy").should("not.have.been.called");
+ H.undoToast().should("not.exist");
+
+ FieldSection.getSuffixInput().focus().blur();
+ cy.get("@updateFieldSpy").should("not.have.been.called");
+ H.undoToast().should("not.exist");
+ });
+ });
+ });
+
+ describe("Preview section", () => {
+ describe("Esc key", () => {
+ it("should allow closing the preview with Esc key", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ PreviewSection.get().should("not.exist");
+
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get().scrollIntoView().should("be.visible");
+
+ cy.realPress("Escape");
+ PreviewSection.get().should("not.exist");
+ });
+
+ it("should not close the preview when hitting Esc key while modal is open", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get().scrollIntoView().should("be.visible");
+
+ TableSection.getSyncOptionsButton().click();
+ H.modal().should("be.visible");
+
+ cy.realPress("Escape");
+ H.modal().should("not.exist");
+ PreviewSection.get().should("be.visible");
+
+ FieldSection.getFieldValuesButton().click();
+ H.modal().should("be.visible");
+
+ cy.realPress("Escape");
+ H.modal().should("not.exist");
+ PreviewSection.get().should("be.visible");
+ });
+
+ it("should not close the preview when hitting Esc key while popover is open", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get().scrollIntoView().should("be.visible");
+
+ FieldSection.getSemanticTypeInput().click();
+ H.popover().should("be.visible");
+
+ cy.realPress("Escape");
+ H.popover({ skipVisibilityCheck: true }).should("not.be.visible");
+ PreviewSection.get().scrollIntoView().should("be.visible");
+ });
+
+ it("should not close the preview when hitting Esc key while command palette is open", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get().scrollIntoView().should("be.visible");
+
+ H.openCommandPalette();
+ H.commandPalette().should("be.visible");
+
+ cy.realPress("Escape");
+ H.commandPalette().should("not.exist");
+ PreviewSection.get().should("be.visible");
+ });
+ });
+
+ describe("Empty states", { tags: "@external" }, () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "multi_schema" });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+ H.queryWritableDB('delete from "Domestic"."Animals"');
+ });
+
+ it("should show empty state when there is no data", () => {
+ H.DataModel.visitDataStudio();
+
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getSchema("Domestic").click();
+ TablePicker.getTable("Animals").click();
+ TableSection.clickField("Name");
+ FieldSection.getPreviewButton().click();
+
+ PreviewSection.get()
+ .scrollIntoView()
+ .findByText("No data to show")
+ .should("be.visible");
+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();
+ PreviewSection.get().findByText("No data to show").should("be.visible");
+ });
+ });
+
+ it("should not auto-focus inputs in filtering preview", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ FieldSection.getPreviewButton().click();
+ PreviewSection.getPreviewTypeInput().findByText("Filtering").click();
+
+ PreviewSection.get()
+ .findByPlaceholderText("Enter an ID")
+ .should("be.visible")
+ .and("not.be.focused");
+
+ FieldSection.getFilteringInput().click();
+ H.popover().findByText("A list of all values").click();
+
+ PreviewSection.get()
+ .findByPlaceholderText("Search the list")
+ .should("be.visible")
+ .and("not.be.focused");
+
+ TableSection.clickField("Tax");
+
+ PreviewSection.get()
+ .findByPlaceholderText("Min")
+ .should("be.visible")
+ .and("not.be.focused");
+
+ FieldSection.getFilteringInput().click();
+ H.popover().findByText("Search box").click();
+
+ PreviewSection.get()
+ .findByPlaceholderText("Enter a number")
+ .should("be.visible")
+ .and("not.be.focused");
+ });
+
+ it("should not crash when viewing filtering preview of a hidden table", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.PRODUCT_ID,
+ });
+
+ DataModel.TableSection.getVisibilityTypeInput().click();
+ H.popover().findByText("Copper").click();
+ cy.wait("@updateTable");
+
+ FieldSection.getPreviewButton().click();
+ PreviewSection.getPreviewTypeInput().findByText("Filtering").click();
+ PreviewSection.get()
+ .findByPlaceholderText("Enter an ID")
+ .should("be.visible");
+ H.main().findByText("Something’s gone wrong").should("not.exist");
+ });
+ });
+
+ describe("Error handling", { tags: "@external" }, () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "many_data_types" });
+ cy.signInAsAdmin();
+ H.resyncDatabase({
+ dbId: WRITABLE_DB_ID,
+ tableName: "many_data_types",
+ });
+
+ const error = { statusCode: 500 };
+ cy.intercept("POST", "/api/dataset*", error);
+ cy.intercept("PUT", "/api/field/*", error);
+ cy.intercept("PUT", "/api/table/*/fields/order", error);
+ cy.intercept("POST", "/api/field/*/values", error);
+ cy.intercept("POST", "/api/field/*/dimension", error);
+ cy.intercept("PUT", "/api/table/*", error);
+ cy.intercept("POST", "/api/ee/data-studio/table/sync-schema", error);
+ cy.intercept("POST", "/api/ee/data-studio/table/rescan-values", error);
+ cy.intercept("POST", "/api/ee/data-studio/table/discard-values", error);
+ });
+
+ it("shows toast errors and preview errors", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+
+ cy.log("table section");
+
+ cy.log("name");
+ TableSection.getNameInput().type("a").blur();
+ verifyAndCloseToast("Failed to update table name");
+
+ cy.log("description");
+ TableSection.getDescriptionInput().type("a").blur();
+ verifyAndCloseToast("Failed to update table description");
+
+ cy.log("predefined field order");
+ TableSection.getSortButton().click();
+ TableSection.getSortOrderInput()
+ .findByLabelText("Alphabetical order")
+ .click();
+ verifyAndCloseToast("Failed to update field order");
+
+ cy.log("custom field order");
+ H.moveDnDKitElement(TableSection.getSortableField("ID"), {
+ vertical: 50,
+ });
+ verifyAndCloseToast("Failed to update field order");
+ TableSection.get().button("Done").click();
+
+ cy.log("sync");
+ TableSection.getSyncOptionsButton().click();
+ H.modal().button("Sync table schema").click();
+ verifyAndCloseToast("Failed to start sync");
+
+ cy.log("scan");
+ H.modal().button("Re-scan table").click();
+ verifyAndCloseToast("Failed to start scan");
+
+ cy.log("discard field values");
+ H.modal().button("Discard cached field values").click();
+ verifyAndCloseToast("Failed to discard values");
+ cy.realPress("Escape");
+
+ cy.log("field name");
+ TableSection.getFieldNameInput("Quantity").type("a").blur();
+ verifyAndCloseToast("Failed to update name of Quantity");
+
+ cy.log("field description");
+ TableSection.getFieldDescriptionInput("Quantity").type("a").blur();
+ verifyAndCloseToast("Failed to update description of Quantity");
+
+ cy.log("field section");
+
+ cy.log("name");
+ FieldSection.getNameInput().type("a").blur();
+ verifyAndCloseToast("Failed to update name of Quantity");
+
+ cy.log("description");
+ FieldSection.getDescriptionInput().type("a").blur();
+ verifyAndCloseToast("Failed to update description of Quantity");
+
+ cy.log("coercion strategy");
+ FieldSection.getCoercionToggle().parent().scrollIntoView().click();
+ H.popover()
+ .findByText("UNIX seconds → Datetime")
+ .scrollIntoView()
+ .click();
+ verifyAndCloseToast("Failed to enable casting for Quantity");
+
+ cy.log("semantic type");
+ FieldSection.getSemanticTypeInput().click();
+ H.popover().findByText("Score").click();
+ verifyAndCloseToast("Failed to update semantic type of Quantity");
+
+ cy.log("visibility");
+ FieldSection.getVisibilityInput().click();
+ H.popover().findByText("Only in detail views").click();
+ verifyAndCloseToast("Failed to update visibility of Quantity");
+
+ cy.log("filtering");
+ FieldSection.getFilteringInput().click();
+ H.popover().findByText("Search box").click();
+ verifyAndCloseToast("Failed to update filtering of Quantity");
+
+ cy.log("display values");
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Custom mapping").click();
+ verifyAndCloseToast("Failed to update display values of Quantity");
+
+ cy.log("JSON unfolding");
+ // navigating away would cause onChange to be triggered in InputBlurChange and TextareaBlurChange
+ // components, so new undos will appear - this makes this test flaky, so we navigate with page reload instead
+ H.DataModel.visit({ databaseId: WRITABLE_DB_ID });
+ TablePicker.getTable("Many Data Types").click();
+ TableSection.clickField("Json");
+ FieldSection.getUnfoldJsonInput().click();
+ H.popover().findByText("No").click();
+ verifyAndCloseToast("Failed to disable JSON unfolding for Json");
+
+ cy.log("formatting");
+ TablePicker.getDatabase("Sample Database").click();
+ TablePicker.getTable("Orders").click();
+ TableSection.clickField("Quantity");
+ FieldSection.getPrefixInput().type("5").blur();
+ verifyAndCloseToast("Failed to update formatting of Quantity");
+
+ cy.log("preview section");
+
+ cy.log("table preview");
+ FieldSection.getPreviewButton().click();
+ PreviewSection.get()
+ .scrollIntoView()
+ .findByText("Something went wrong")
+ .should("be.visible");
+
+ cy.log("object detail preview");
+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();
+ PreviewSection.get()
+ .findByText("Something went wrong")
+ .should("be.visible");
+ });
+ });
+
+ describe("Undos", { tags: "@external" }, () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.activateToken("bleeding-edge");
+ H.resetTestTable({ type: "postgres", table: "many_data_types" });
+ cy.signInAsAdmin();
+ H.resyncDatabase({
+ dbId: WRITABLE_DB_ID,
+ tableName: "many_data_types",
+ });
+ });
+
+ it("allows to undo every action", () => {
+ H.DataModel.visitDataStudio({
+ databaseId: SAMPLE_DB_ID,
+ schemaId: SAMPLE_DB_SCHEMA_ID,
+ tableId: ORDERS_ID,
+ fieldId: ORDERS.QUANTITY,
+ });
+
+ cy.log("table section");
+
+ cy.log("name");
+ TableSection.getNameInput().type("a").blur();
+ verifyToastAndUndo("Table name updated");
+ TableSection.getNameInput().should("have.value", "Orders");
+
+ cy.log("description");
+ TableSection.getDescriptionInput().type("a").blur();
+ verifyToastAndUndo("Table description updated");
+ TableSection.getDescriptionInput().should(
+ "have.value",
+ "Confirmed Sample Company orders for a product, from a user.",
+ );
+
+ cy.log("predefined field order");
+ TableSection.getSortButton().click();
+ TableSection.getSortOrderInput()
+ .findByLabelText("Alphabetical order")
+ .click();
+ verifyToastAndUndo("Field order updated");
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("database")
+ .should("be.checked");
+
+ cy.log("custom field order");
+ H.moveDnDKitElement(TableSection.getSortableField("ID"), {
+ vertical: 50,
+ });
+ verifyToastAndUndo("Field order updated");
+ TableSection.getSortOrderInput()
+ .findByDisplayValue("database")
+ .should("be.checked");
+ TableSection.get().button("Done").click();
+
+ cy.log("field name");
+ TableSection.getFieldNameInput("Quantity").type("a").blur();
+ verifyToastAndUndo("Name of Quantity updated");
+ TableSection.getFieldNameInput("Quantity").should(
+ "have.value",
+ "Quantity",
+ );
+
+ cy.log("field description");
+ TableSection.getFieldDescriptionInput("Quantity").type("a").blur();
+ verifyToastAndUndo("Description of Quantity updated");
+ TableSection.getFieldDescriptionInput("Quantity").should(
+ "have.value",
+ "Number of products bought.",
+ );
+
+ cy.log("field section");
+
+ cy.log("name");
+ FieldSection.getNameInput().type("a").blur();
+ verifyToastAndUndo("Name of Quantity updated");
+ FieldSection.getNameInput().should("have.value", "Quantity");
+
+ cy.log("description");
+ FieldSection.getDescriptionInput().type("a").blur();
+ verifyToastAndUndo("Description of Quantity updated");
+ FieldSection.getDescriptionInput().should(
+ "have.value",
+ "Number of products bought.",
+ );
+
+ cy.log("coercion strategy");
+ FieldSection.getCoercionToggle().parent().scrollIntoView().click();
+ H.popover()
+ .findByText("UNIX seconds → Datetime")
+ .scrollIntoView()
+ .click();
+ verifyToastAndUndo("Casting enabled for Quantity");
+ FieldSection.getCoercionToggle().should("not.be.checked");
+
+ cy.log("semantic type");
+ FieldSection.getSemanticTypeInput().click();
+ H.popover().findByText("Score").click();
+ verifyToastAndUndo("Semantic type of Quantity updated");
+ FieldSection.getSemanticTypeInput().should("have.value", "Quantity");
+
+ cy.log("visibility");
+ FieldSection.getVisibilityInput().click();
+ H.popover().findByText("Only in detail views").click();
+ verifyToastAndUndo("Visibility of Quantity updated");
+ FieldSection.getVisibilityInput().should("have.value", "Everywhere");
+
+ cy.log("filtering");
+ FieldSection.getFilteringInput().click();
+ H.popover().findByText("Search box").click();
+ verifyToastAndUndo("Filtering of Quantity updated");
+ FieldSection.getFilteringInput().should(
+ "have.value",
+ "A list of all values",
+ );
+
+ cy.log("display values");
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Custom mapping").click();
+ H.modal().should("be.visible");
+ H.modal().button("Close").click();
+ verifyToastAndUndo("Display values of Quantity updated");
+ FieldSection.getDisplayValuesInput().should(
+ "have.value",
+ "Use original value",
+ );
+
+ cy.log("custom mapping");
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Custom mapping").click();
+ verifyAndCloseToast("Display values of Quantity updated");
+ H.modal().within(() => {
+ cy.findByDisplayValue("0")
+ .clear()
+ .type("XYZ", { scrollBehavior: "center" })
+ .blur();
+ cy.button("Save").click();
+ });
+ verifyToastAndUndo("Display values of Quantity updated");
+ FieldSection.get().button("Edit mapping").click();
+ H.modal().within(() => {
+ cy.findByDisplayValue("0").should("be.visible");
+ cy.findByDisplayValue("XYZ").should("not.exist");
+ cy.button("Close").click();
+ });
+
+ cy.log("foreign key");
+ TableSection.clickField("User ID");
+ FieldSection.getDisplayValuesInput().click();
+ H.popover().findByText("Use foreign key").click();
+ verifyToastAndUndo("Display values of User ID updated");
+ FieldSection.getDisplayValuesInput().should(
+ "have.value",
+ "Use original value",
+ );
+
+ cy.log("JSON unfolding");
+ TablePicker.getDatabase("Writable Postgres12").click();
+ TablePicker.getTable("Many Data Types").click();
+ TableSection.clickField("Json");
+ FieldSection.getUnfoldJsonInput().click();
+ H.popover().findByText("No").click();
+ verifyToastAndUndo("JSON unfolding disabled for Json");
+ FieldSection.getUnfoldJsonInput().should("have.value", "Yes");
+
+ cy.log("formatting");
+ TablePicker.getTable("Orders").click();
+ TableSection.clickField("Quantity");
+
+ cy.log("prefix (ChartSettingInput)");
+ FieldSection.getPrefixInput().type("5").blur();
+ verifyToastAndUndo("Formatting of Quantity updated");
+ FieldSection.getPrefixInput().should("have.value", "");
+
+ cy.log("multiply by number (ChartSettingInputNumeric)");
+ FieldSection.getMultiplyByNumberInput().type("5").blur();
+ verifyToastAndUndo("Formatting of Quantity updated");
+ FieldSection.getMultiplyByNumberInput().should("have.value", "");
+
+ cy.log("mini bar chart (ChartSettingToggle)");
+ FieldSection.getMiniBarChartToggle()
+ .parent()
+ .click({ scrollBehavior: "center" });
+ verifyToastAndUndo("Formatting of Quantity updated");
+ FieldSection.getMiniBarChartToggle().should("not.be.checked");
+ });
+ });
+});
+
+function clickAway() {
+ cy.get("body").click(0, 0);
+}
+
+const setDataModelPermissions = ({
+ tableIds = [],
+}: {
+ tableIds: TableId[];
+}) => {
+ const permissions = Object.fromEntries(tableIds.map((id) => [id, "all"]));
+
+ // @ts-expect-error invalid cy.updatePermissionsGraph typing
+ cy.updatePermissionsGraph({
+ [ALL_USERS_GROUP]: {
+ [SAMPLE_DB_ID]: {
+ "data-model": {
+ schemas: {
+ PUBLIC: permissions,
+ },
+ },
+ },
+ },
+ });
+};
+
+type TableSummary = {
+ id: TableId;
+ db_id: number;
+ display_name: string;
+ name: string;
+ estimated_row_count?: number | null;
+};
+
+type TableLookup = {
+ databaseId: number;
+ displayName?: string;
+ name?: string;
+};
+
+function openFilterPopover() {
+ cy.findByRole("button", { name: "Filter" }).click();
+ H.popover();
+}
+
+function applyFilters() {
+ cy.findByRole("button", { name: "Apply" }).click();
+ cy.wait("@listTables");
+}
+
+function selectFilterOption(fieldLabel: string, optionLabel: string) {
+ cy.findByRole("textbox", { name: fieldLabel }).click();
+ H.popover().contains(optionLabel).click();
+}
+
+function selectOwnerByName(ownerLabel: string) {
+ cy.findByRole("textbox", { name: "Owner" }).click();
+ H.popover().contains(ownerLabel).click();
+}
+
+function selectOwnerByEmail(email: string) {
+ cy.findByRole("textbox", { name: "Owner" }).clear().type(email);
+ H.popover().contains(email).click();
+}
+
+function toggleUnusedFilter(checked: boolean) {
+ if (checked) {
+ cy.findByLabelText("Table isn’t referenced by anything").check();
+ } else {
+ cy.findByLabelText("Table isn’t referenced by anything").uncheck();
+ }
+}
+
+function expectTableVisible(tableId: TableId) {
+ findSearchResultByTableId(tableId).should("exist");
+}
+
+function expectTableNotVisible(tableId: TableId) {
+ findSearchResultByTableId(tableId).should("not.exist");
+}
+
+function findSearchResultByTableId(tableId: TableId) {
+ return cy.findAllByTestId("tree-item").filter((_, element) => {
+ const href = element.getAttribute("href") ?? "";
+ const pattern = new RegExp(`/table/${tableId}(?:/|$)`);
+ return pattern.test(href);
+ });
+}
+
+function openWritableDomesticSchema(databaseName: string, schemaName: string) {
+ H.DataModel.visitDataStudio();
+ TablePicker.getDatabase(databaseName).click();
+ TablePicker.getSchema(schemaName).click();
+}
+
+function getTableId({
+ databaseId,
+ displayName,
+ name,
+}: TableLookup): Cypress.Chainable<TableId> {
+ if (!displayName && !name) {
+ throw new Error("displayName or name must be provided");
+ }
+
+ return cy.request<TableSummary[]>("/api/table").then(({ body }) => {
+ const table = body.find((candidate) => {
+ if (candidate.db_id !== databaseId) {
+ return false;
+ }
+
+ if (displayName && candidate.display_name === displayName) {
+ return true;
+ }
+
+ if (name && candidate.name === name) {
+ return true;
+ }
+
+ return false;
+ });
+
+ if (!table) {
+ throw new Error(
+ `Table not found for database ${databaseId} (${displayName ?? name})`,
+ );
+ }
+
+ return table.id;
+ });
+}
+
+function updateTableAttributes({
+ databaseId,
+ displayName,
+ name,
+ attributes,
+}: TableLookup & {
+ attributes: Record<string, unknown>;
+}): Cypress.Chainable<TableId> {
+ return getTableId({ databaseId, displayName, name }).then((tableId) => {
+ return cy
+ .request("POST", "/api/ee/data-studio/table/edit", {
+ table_ids: [tableId],
+ ...attributes,
+ })
+ .then(() => tableId);
+ });
+}
+
+function publishTables(tableIds: TableId[]) {
+ return cy.request("POST", "/api/ee/data-studio/table/publish-model", {
+ table_ids: tableIds,
+ target_collection_id: null,
+ });
+}
+
+function verifyAndCloseToast(message: string) {
+ H.undoToast().should("contain.text", message);
+ H.undoToast().icon("close").click({ force: true });
+}
+
+function verifyToastAndUndo(message: string) {
+ H.undoToast().should("contain.text", message);
+ H.undoToast().button("Undo").click();
+ H.undoToast().should("contain.text", "Change undone");
+ H.undoToast().icon("close").click();
+}
+
+function verifyTableSectionEmptyState() {
+ H.DataModel.TableSection.get().should("not.exist");
+}
+
+function verifyFieldSectionEmptyState() {
+ H.DataModel.FieldSection.get().should("not.exist");
+}
+
+function verifyTablePreview({
+ column,
+ description,
+ values,
+}: {
+ column: string;
+ description?: string;
+ values: string[];
+}) {
+ PreviewSection.getPreviewTypeInput().findByText("Table").click();
+ cy.wait("@dataset");
+
+ PreviewSection.get().within(() => {
+ H.assertTableData({
+ columns: [column],
+ firstRows: values.map((value) => [value]),
+ });
+
+ if (description != null) {
+ cy.findByTestId("header-cell").realHover();
+ }
+ });
+
+ if (description != null) {
+ H.hovercard().should("contain.text", description);
+ }
+}
+
+function verifyObjectDetailPreview({
+ rowNumber,
+ row,
+}: {
+ rowNumber: number;
+ row: [string, string];
+}) {
+ const [label, value] = row;
+
+ PreviewSection.getPreviewTypeInput().findByText("Detail").click();
+ cy.wait("@dataset");
+
+ cy.findAllByTestId("column-name").then(($els) => {
+ const foundRowIndex = $els
+ .toArray()
+ .findIndex((el) => el.textContent?.trim() === label);
+
+ expect(rowNumber).to.eq(foundRowIndex);
+
+ cy.findAllByTestId("value")
+ .should("have.length.gte", foundRowIndex)
+ .eq(foundRowIndex)
+ .should("contain", value);
+ });
+}
diff --git a/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts
new file mode 100644
index 00000000000..203f9c45f41
--- /dev/null
+++ b/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts
@@ -0,0 +1,55 @@
+const { H } = cy;
+
+describe("scenarios > data studio > modeling > library", () => {
+ beforeEach(() => {
+ H.restore();
+ H.resetSnowplow();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+ });
+
+ it("should create library via UI and verify collections", () => {
+ cy.intercept("POST", "/api/ee/library").as("createLibrary");
+ cy.intercept("GET", "/api/collection/tree*").as("getCollectionTree");
+
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Click Library sidebar section to open modal");
+ H.DataStudio.ModelingSidebar.root()
+ .findByText("Library")
+ .should("be.visible")
+ .click();
+
+ cy.log("Create library via modal");
+ H.modal().within(() => {
+ cy.findByText("Create your Library").should("be.visible");
+ cy.button("Create my Library").click();
+ });
+
+ cy.wait("@createLibrary");
+ cy.wait("@getCollectionTree");
+
+ cy.log("Verify library collections appear in sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree().within(() => {
+ cy.findByText("Data").should("be.visible");
+ cy.findByText("Metrics").should("be.visible");
+ });
+
+ cy.log("Verify empty state shows on library root");
+ H.DataStudio.Modeling.collectionPage().within(() => {
+ cy.findByText("No models or metrics yet").should("be.visible");
+ cy.findByText(
+ "Models and metrics in this collection will appear here.",
+ ).should("be.visible");
+ });
+
+ cy.log("Select Data collection and verify it's empty");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+
+ cy.log("Verify no models yet message");
+ H.DataStudio.Modeling.collectionPage().within(() => {
+ cy.findByText("No models yet").should("be.visible");
+ });
+ });
+});
diff --git a/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
new file mode 100644
index 00000000000..b02d777ed1c
--- /dev/null
+++ b/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
@@ -0,0 +1,413 @@
+const { H } = cy;
+import { createLibraryWithItems } from "e2e/support/test-library-data";
+
+describe("scenarios > data studio > modeling > metrics", () => {
+ beforeEach(() => {
+ H.restore();
+ H.resetSnowplow();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+
+ cy.intercept("POST", "/api/card").as("createCard");
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
+ cy.intercept("POST", "/api/collection").as("createCollection");
+ cy.intercept("PUT", "/api/collection/*").as("updateCollection");
+
+ createLibraryWithItems();
+ });
+
+ describe("empty state", () => {
+ it("should show empty state when no collections are selected", () => {
+ visitModelingPage();
+ H.DataStudio.Modeling.emptyPage().should("be.visible");
+ H.DataStudio.Modeling.emptyPage()
+ .parent()
+ .findByText("Build your semantic layer with models and metrics.")
+ .should("be.visible");
+ });
+ });
+
+ it("should create a new metric with proper validation and save to collection", () => {
+ visitModelingPage();
+
+ cy.log("Create a new metric");
+ H.DataStudio.ModelingSidebar.createCardMenuButton().click();
+ H.popover().findByText("Metric").click();
+
+ H.DataStudio.Metrics.queryEditor().should("be.visible");
+ H.DataStudio.Metrics.saveButton().should("be.disabled");
+
+ H.miniPickerBrowseAll().click();
+ H.entityPickerModal().within(() => {
+ cy.findByText("Databases").click();
+ cy.findByText("Orders").click();
+ });
+
+ H.getNotebookStep("summarize")
+ .findByText("Pick a column to group by")
+ .click();
+
+ H.popover().findByText("Created At").click();
+
+ H.DataStudio.Metrics.saveButton().should("be.enabled").click();
+
+ H.modal().within(() => {
+ cy.findByText("Save your metric").should("be.visible");
+ cy.findByLabelText("Name").type("Total Revenue");
+ cy.findByLabelText("Description").type(
+ "Sum of all order totals across the store",
+ );
+ cy.findByText("Where do you want to save this?").should("be.visible");
+ cy.button("Save").click();
+ });
+
+ cy.wait("@createCard");
+
+ cy.log("Verify metric overview page");
+ cy.url().should("match", /\/data-studio\/modeling\/metrics\/\d+$/);
+
+ H.DataStudio.Metrics.overviewPage().within(() => {
+ cy.findByText("Total Revenue").should("be.visible");
+ cy.findByText("Sum of all order totals across the store").should(
+ "be.visible",
+ );
+ cy.findByText("Sample Database").should("be.visible");
+ cy.findByText("PUBLIC").should("be.visible");
+ cy.findByText("Orders").should("be.visible");
+ cy.findByText("Creator and last editor").should("be.visible");
+ cy.findAllByText(/by Bobby Tables/).should("be.visible");
+ });
+
+ cy.log("Ensure chart is visible");
+ H.echartsContainer().findByText("Count").should("be.visible");
+
+ cy.log("Verify metric definition page");
+ H.DataStudio.Metrics.definitionTab().click();
+
+ cy.log("Verify notebook state");
+ H.DataStudio.Metrics.queryEditor().should("be.visible");
+ H.getNotebookStep("data").findByText("Orders").should("be.visible");
+ H.getNotebookStep("summarize")
+ .findByText("Created At: Month")
+ .should("be.visible");
+
+ H.runButtonInOverlay().click();
+ cy.log("Ensure chart is visible");
+ H.echartsContainer().findByText("Count").should("be.visible");
+
+ cy.log("Verify metric dependencies page");
+ H.DataStudio.Metrics.dependenciesTab().click();
+ H.DependencyGraph.graph().within(() => {
+ cy.findByText("Orders").should("be.visible");
+ cy.findByText("Total Revenue").should("be.visible");
+ });
+ });
+
+ it("should edit metric definition and save changes", function () {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Metrics collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+
+ cy.log("Click on the metric from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ cy.log("Verify metric overview page displays correct data");
+ H.DataStudio.Metrics.overviewPage()
+ .findByDisplayValue("Trusted Orders Metric")
+ .should("be.visible");
+
+ cy.log("Update the metric name");
+ H.DataStudio.Metrics.overviewPage()
+ .findByDisplayValue("Trusted Orders Metric")
+ .clear()
+ .type("Updated Orders Metric{enter}");
+
+ cy.wait("@updateCard");
+
+ cy.log("Verify updated name appears in overview");
+ H.DataStudio.Metrics.overviewPage()
+ .findByDisplayValue("Updated Orders Metric")
+ .should("be.visible");
+
+ cy.log("Verify updated name appears in collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ H.DataStudio.Modeling.metricItem("Updated Orders Metric").should(
+ "be.visible",
+ );
+ });
+
+ it("should cancel editing and revert changes", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Metrics collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+
+ cy.log("Click on the metric from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ cy.log("Navigate to definition tab");
+ H.DataStudio.Metrics.definitionTab().click();
+
+ cy.log("Change aggregation");
+ H.getNotebookStep("summarize").findByText("Count").click();
+ H.popover().findByText("Sum of ...").click();
+ H.popover().findByText("Total").click();
+
+ cy.log("Verify save button is enabled, then cancel");
+ H.DataStudio.Metrics.saveButton().should("be.enabled");
+ H.DataStudio.Metrics.cancelButton().click();
+
+ cy.log("Verify changes were reverted");
+ H.getNotebookStep("summarize").findByText("Count").should("be.visible");
+ });
+
+ it("should show unsaved changes warning when navigating away", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Metrics collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+
+ cy.log("Click on the metric from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ cy.log("Navigate to definition tab");
+ H.DataStudio.Metrics.definitionTab().click();
+
+ cy.log("Change aggregation from Count to Sum");
+ H.DataStudio.Metrics.queryEditor().should("be.visible");
+ H.getNotebookStep("summarize").findByText("Count").click();
+ H.popover().findByText("Sum of ...").click();
+ H.popover().findByText("Total").click();
+
+ cy.log("Try to navigate away");
+ H.DataStudio.ModelingSidebar.glossaryLink().click();
+
+ cy.log("Verify unsaved changes modal appears");
+ H.modal().within(() => {
+ cy.findByText("Discard your changes?").should("be.visible");
+ cy.button("Cancel").click();
+ });
+
+ cy.log("Verify we're still on the definition tab");
+ H.DataStudio.Metrics.queryEditor().should("be.visible");
+ });
+
+ it("should archive and restore a metric", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Metrics collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+
+ cy.log("Wait for collection page to load");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+
+ cy.log("Click on the metric from the collection view");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ cy.log("Verify metric is loaded before archiving");
+ H.DataStudio.Metrics.overviewPage()
+ .findByDisplayValue("Trusted Orders Metric")
+ .should("be.visible");
+
+ cy.log("Archive the metric");
+ H.DataStudio.Metrics.moreMenu().click();
+ H.popover().findByText("Move to trash").click();
+
+ cy.log("Confirm archiving in modal");
+ H.modal().button("Move to trash").click();
+
+ cy.wait("@updateCard");
+
+ cy.log("Verify redirected to modeling page");
+ cy.url().should("include", "/data-studio/modeling");
+
+ cy.log("Verify metric is removed from collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ H.DataStudio.Modeling.collectionPage()
+ .findByText("No metrics yet")
+ .should("be.visible");
+
+ cy.log("Navigate to trash");
+ cy.visit("/trash");
+
+ cy.log("Verify metric appears in trash");
+ cy.findByRole("table")
+ .findByText("Trusted Orders Metric")
+ .should("be.visible");
+
+ cy.log("Restore the metric");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+ cy.findByTestId("archive-banner").should("be.visible");
+ cy.findByTestId("archive-banner").findByText("Restore").click();
+ cy.wait("@updateCard");
+
+ cy.log("Verify metric is restored in collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table")
+ .findByText("Trusted Orders Metric")
+ .should("be.visible");
+ });
+
+ it("should view metric in question view via more menu", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Metrics collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+
+ cy.log("Click on the metric from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ cy.log("Verify metric is loaded");
+ H.DataStudio.Metrics.overviewPage()
+ .findByDisplayValue("Trusted Orders Metric")
+ .should("be.visible");
+
+ cy.log("Verify View link opens in new tab");
+ H.DataStudio.Metrics.moreMenu().click();
+ H.popover()
+ .findByText("View")
+ .closest("a")
+ .should("have.attr", "target", "_blank")
+ .should("have.attr", "href")
+ .and("match", /\/metric\/\d+/);
+ });
+
+ it.skip("should duplicate metric via more menu", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Metrics collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+
+ cy.log("Click on the metric from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ cy.log("Verify metric is loaded");
+ H.DataStudio.Metrics.overviewPage()
+ .findByDisplayValue("Trusted Orders Metric")
+ .should("be.visible");
+
+ cy.log("Open more menu and click Duplicate");
+ H.DataStudio.Metrics.moreMenu().click();
+ H.popover().findByText("Duplicate").click();
+
+ cy.log("Save duplicate metric");
+ H.modal()
+ .findByText('Duplicate "Trusted Orders Metric"')
+ .should("be.visible");
+ H.modal()
+ .findByLabelText("Name")
+ .should("have.value", "Trusted Orders Metric - Duplicate");
+ H.modal().findByTestId("dashboard-and-collection-picker-button").click();
+
+ H.entityPickerModalTab("Collections").click();
+ H.entityPickerModal().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("Library").click();
+ cy.findByText("Metrics").click();
+ cy.button("Select this collection").click();
+ });
+
+ H.modal().button("Duplicate").click();
+
+ cy.wait("@createCard");
+
+ cy.log("Verify duplicate metric is created");
+ H.DataStudio.Metrics.overviewPage()
+ .findByText("Trusted Orders Metric - Duplicate")
+ .should("be.visible");
+
+ cy.log("Verify both metrics appear in collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").within(() => {
+ cy.findByText("Trusted Orders Metric").should("be.visible");
+ cy.findByText("Trusted Orders Metric - Duplicate").should("be.visible");
+ });
+ });
+
+ it("should move metric to different collection via more menu", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Metrics collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+
+ cy.log("Click on the metric from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ cy.log("Verify metric is loaded");
+ H.DataStudio.Metrics.overviewPage()
+ .findByDisplayValue("Trusted Orders Metric")
+ .should("be.visible");
+
+ cy.log("Open more menu and click Move");
+ H.DataStudio.Metrics.moreMenu().click();
+ H.popover().findByText("Move").click();
+
+ cy.log("Select First collection as destination");
+ H.entityPickerModal().findByText("First collection").click();
+ H.entityPickerModal().button("Move").click();
+
+ cy.wait("@updateCard");
+
+ cy.log("Verify metric is in First collection");
+ cy.findByTestId("move-card-toast").findByText("First collection").click();
+
+ cy.log("Verify metric is no longer in Metrics collection");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree()
+ .findByText("Metrics")
+ .click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ H.DataStudio.Modeling.collectionPage()
+ .findByText("No metrics yet")
+ .should("be.visible");
+ });
+});
+
+function visitModelingPage() {
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.root().should("be.visible");
+}
diff --git a/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts
new file mode 100644
index 00000000000..6013e255890
--- /dev/null
+++ b/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts
@@ -0,0 +1,280 @@
+const { H } = cy;
+import { createLibraryWithItems } from "e2e/support/test-library-data";
+
+describe("scenarios > data studio > modeling > models", () => {
+ beforeEach(() => {
+ H.restore();
+ H.resetSnowplow();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+
+ cy.intercept("POST", "/api/card").as("createCard");
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
+ cy.intercept("POST", "/api/collection").as("createCollection");
+ cy.intercept("PUT", "/api/collection/*").as("updateCollection");
+ cy.intercept("POST", "/api/dataset").as("dataset");
+
+ createLibraryWithItems();
+ });
+
+ it("should edit model name and description", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Models collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+
+ cy.log("Click on the model from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Model").click();
+
+ cy.log("Verify model overview page displays correct data");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .should("be.visible");
+
+ cy.log("Update the model name");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .clear()
+ .type("Updated Orders Model{enter}");
+
+ cy.wait("@updateCard");
+
+ cy.log("Verify updated name appears in overview");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Updated Orders Model")
+ .should("be.visible");
+
+ cy.log("Verify updated name appears in collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ H.DataStudio.Modeling.modelItem("Updated Orders Model").should(
+ "be.visible",
+ );
+ });
+
+ it("should navigate between tabs", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Models collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+
+ cy.log("Click on the model from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Model").click();
+
+ cy.log("Verify Overview tab displays model name");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .should("be.visible");
+
+ cy.log("Navigate to Definition tab");
+ H.DataStudio.Models.definitionTab().click();
+ H.DataStudio.Models.queryEditor().findByText("Orders").should("be.visible");
+
+ cy.log("Navigate to Fields tab");
+ H.DataStudio.Models.fieldsTab().click();
+ H.DataStudio.Models.fieldsPage().within(() => {
+ cy.findByText("ID").should("be.visible");
+ cy.findByText("User ID").should("be.visible");
+ cy.findByText("Product ID").should("be.visible");
+ });
+
+ cy.log("Navigate to Dependencies tab");
+ H.DataStudio.Models.dependenciesTab().click();
+ H.DependencyGraph.graph().within(() => {
+ cy.findByText("Orders").should("be.visible");
+ cy.findByText("Trusted Orders Model").should("be.visible");
+ });
+
+ cy.log("Navigate back to Overview tab");
+ H.DataStudio.Models.overviewTab().click();
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .should("be.visible");
+ });
+
+ it("should archive and restore a model", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Models collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+
+ cy.log("Wait for collection page to load");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+
+ cy.log("Click on the model from the collection view");
+ cy.findByRole("table").findByText("Trusted Orders Model").click();
+
+ cy.log("Verify model is loaded before archiving");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .should("be.visible");
+
+ cy.log("Archive the model");
+ H.DataStudio.Models.moreMenu().click();
+ H.popover().findByText("Move to trash").click();
+
+ cy.log("Confirm archiving in modal");
+ H.modal().button("Move to trash").click();
+
+ cy.wait("@updateCard");
+
+ cy.log("Verify redirected to modeling page");
+ cy.url().should("include", "/data-studio/modeling");
+
+ cy.log("Verify model is removed from collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ H.DataStudio.Modeling.collectionPage()
+ .findByText("No models yet")
+ .should("be.visible");
+
+ cy.log("Navigate to trash");
+ cy.visit("/trash");
+
+ cy.log("Verify model appears in trash");
+ cy.findByRole("table")
+ .findByText("Trusted Orders Model")
+ .should("be.visible");
+
+ cy.log("Restore the model");
+ cy.findByRole("table").findByText("Trusted Orders Model").click();
+ cy.findByTestId("archive-banner").should("be.visible");
+ cy.findByTestId("archive-banner").findByText("Restore").click();
+ cy.wait("@updateCard");
+
+ cy.log("Verify model is restored in collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table")
+ .findByText("Trusted Orders Model")
+ .should("be.visible");
+ });
+
+ it("should view model in question view via more menu", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Models collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+
+ cy.log("Click on the model from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Model").click();
+
+ cy.log("Verify model is loaded");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .should("be.visible");
+
+ cy.log("Verify View link opens in new tab");
+ H.DataStudio.Models.moreMenu().click();
+ H.popover()
+ .findByText("View")
+ .closest("a")
+ .should("have.attr", "target", "_blank")
+ .should("have.attr", "href")
+ .and("match", /\/model\/\d+/);
+ });
+
+ it.skip("should duplicate model via more menu", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Models collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+
+ cy.log("Click on the model from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Model").click();
+
+ cy.log("Verify model is loaded");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .should("be.visible");
+
+ cy.log("Open more menu and click Duplicate");
+ H.DataStudio.Models.moreMenu().click();
+ H.popover().findByText("Duplicate").click();
+
+ cy.log("Save duplicate model");
+ H.modal()
+ .findByText('Duplicate "Trusted Orders Model"')
+ .should("be.visible");
+ H.modal()
+ .findByLabelText("Name")
+ .should("have.value", "Trusted Orders Model - Duplicate");
+ H.modal().findByTestId("dashboard-and-collection-picker-button").click();
+
+ H.entityPickerModalTab("Collections").click();
+ H.entityPickerModal().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("Library").click();
+ cy.findByText("Data").click();
+ cy.button("Select this collection").click();
+ });
+
+ H.modal().button("Duplicate").click();
+
+ cy.wait("@createCard");
+
+ cy.log("Verify duplicate model is created");
+ H.DataStudio.Models.overviewPage()
+ .findByText("Trusted Orders Model - Duplicate")
+ .should("be.visible");
+
+ cy.log("Verify both models appear in collection view");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").within(() => {
+ cy.findByText("Trusted Orders Model").should("be.visible");
+ cy.findByText("Trusted Orders Model - Duplicate").should("be.visible");
+ });
+ });
+
+ it("should move model to different collection via more menu", () => {
+ cy.log("Navigate to Data Studio Modeling");
+ cy.visit("/data-studio/modeling");
+
+ cy.log("Select Models collection from sidebar");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+
+ cy.log("Click on the model from the collection view");
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ cy.findByRole("table").findByText("Trusted Orders Model").click();
+
+ cy.log("Verify model is loaded");
+ H.DataStudio.Models.overviewPage()
+ .findByDisplayValue("Trusted Orders Model")
+ .should("be.visible");
+
+ cy.log("Open more menu and click Move");
+ H.DataStudio.Models.moreMenu().click();
+ H.popover().findByText("Move").click();
+
+ cy.log("Select First collection as destination");
+ H.entityPickerModal().findByText("First collection").click();
+ H.entityPickerModal().button("Move").click();
+
+ cy.wait("@updateCard");
+
+ cy.log("Verify model is in First collection");
+ cy.findByTestId("move-card-toast").findByText("First collection").click();
+
+ cy.log("Verify model is no longer in Models collection");
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
+ H.DataStudio.Modeling.collectionPage().should("be.visible");
+ H.DataStudio.Modeling.collectionPage()
+ .findByText("No models yet")
+ .should("be.visible");
+ });
+});
diff --git a/e2e/test/scenarios/data-studio/snippets.cy.spec.ts b/e2e/test/scenarios/data-studio/snippets.cy.spec.ts
new file mode 100644
index 00000000000..a3d100fa12d
--- /dev/null
+++ b/e2e/test/scenarios/data-studio/snippets.cy.spec.ts
@@ -0,0 +1,301 @@
+const { H } = cy;
+
+describe("scenarios > data studio > snippets", () => {
+ beforeEach(() => {
+ H.restore();
+ H.resetSnowplow();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+
+ cy.intercept("POST", "/api/native-query-snippet").as("createSnippet");
+ cy.intercept("PUT", "/api/native-query-snippet/*").as("updateSnippet");
+ });
+
+ describe("creation", () => {
+ it("should create a new snippet with proper validation", () => {
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.createSnippetButton().click();
+ H.popover().findByText("New snippet").click();
+
+ H.DataStudio.Snippets.newPage().should("be.visible");
+ H.DataStudio.Snippets.saveButton().should("be.disabled");
+
+ H.DataStudio.Snippets.editor.type("SELECT * FROM orders");
+ H.DataStudio.Snippets.saveButton().should("be.disabled");
+
+ H.DataStudio.Snippets.nameInput().type("Test snippet");
+ H.DataStudio.Snippets.saveButton().should("be.enabled");
+
+ H.DataStudio.Snippets.descriptionInput().type(
+ "This is a test snippet description",
+ );
+ H.DataStudio.Snippets.saveButton().click();
+
+ H.modal().within(() => {
+ cy.findByText("Select a folder for your snippet").should("be.visible");
+ cy.button("Select").click();
+ });
+
+ cy.wait("@createSnippet");
+
+ H.DataStudio.Snippets.editPage().should("be.visible");
+
+ H.DataStudio.Snippets.editPage().within(() => {
+ cy.findByText(/by Bobby Tables/).should("be.visible");
+ });
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test snippet")
+ .should("be.visible")
+ .closest("[role='menuitem']")
+ .should("have.attr", "data-selected", "true");
+ });
+ });
+
+ describe("editing", () => {
+ it("should be able to edit snippet content", () => {
+ H.createSnippet({
+ name: "Test snippet",
+ content: "SELECT * FROM orders",
+ });
+
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("SQL snippets")
+ .click();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test snippet")
+ .click();
+
+ H.DataStudio.Snippets.editPage().should("be.visible");
+
+ H.DataStudio.Snippets.editor.type(" WHERE id = 1");
+
+ H.DataStudio.Snippets.saveButton().should("be.enabled").click();
+ cy.wait("@updateSnippet");
+
+ cy.reload();
+ H.DataStudio.Snippets.editor
+ .get()
+ .should("contain.text", "SELECT * FROM orders WHERE id = 1");
+ });
+
+ it("should be able to cancel editing", () => {
+ H.createSnippet({
+ name: "Test snippet",
+ content: "SELECT * FROM orders",
+ });
+
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("SQL snippets")
+ .click();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test snippet")
+ .click();
+
+ H.DataStudio.Snippets.editor.type(" WHERE id = 1");
+
+ H.DataStudio.Snippets.cancelButton().click();
+ H.DataStudio.Snippets.editor
+ .get()
+ .should("not.contain.text", "SELECT * FROM orders WHERE id = 1");
+ H.DataStudio.Snippets.editor
+ .get()
+ .should("contain.text", "SELECT * FROM orders");
+ });
+
+ it("should show unsaved changes warning when navigating away", () => {
+ H.createSnippet({
+ name: "Test snippet",
+ content: "SELECT * FROM orders",
+ });
+
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("SQL snippets")
+ .click();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test snippet")
+ .click();
+
+ H.DataStudio.Snippets.editor.type(" WHERE id = 1");
+
+ H.DataStudio.ModelingSidebar.glossaryLink().click();
+
+ H.modal().within(() => {
+ cy.findByText("Discard your changes?").should("be.visible");
+ cy.button("Cancel").click();
+ });
+
+ H.DataStudio.Snippets.editPage().should("be.visible");
+ });
+ });
+
+ describe("description", () => {
+ it("should support markdown in description", () => {
+ H.createSnippet({
+ name: "Test snippet",
+ content: "SELECT * FROM orders",
+ description: "**Bold text** and *italic text*",
+ });
+
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("SQL snippets")
+ .click();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test snippet")
+ .click();
+ H.DataStudio.Snippets.editPage().within(() => {
+ cy.findByText("Bold text").should("have.css", "font-weight", "700");
+ cy.findByText("italic text").should("have.css", "font-style", "italic");
+ });
+ });
+ });
+
+ describe("deletion", () => {
+ it("should be able to delete a snippet", () => {
+ H.createSnippet({
+ name: "Test snippet",
+ content: "SELECT * FROM orders",
+ });
+
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("SQL snippets")
+ .click();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test snippet")
+ .click();
+
+ cy.findByTestId("snippet-header").findByRole("button").click();
+ H.popover().findByText("Delete").click();
+
+ H.modal().within(() => {
+ cy.findByText("Delete snippet?").should("be.visible");
+ cy.button("Delete").click();
+ cy.wait("@updateSnippet");
+ });
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test snippet")
+ .should("not.exist");
+ });
+ });
+
+ describe("snippet folders", () => {
+ beforeEach(() => {
+ cy.intercept("POST", "/api/collection").as("createCollection");
+ cy.intercept("PUT", "/api/collection/*").as("updateCollection");
+ cy.intercept("DELETE", "/api/collection/*").as("deleteCollection");
+ });
+
+ it("should be able to create a folder and snippet inside it", () => {
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.createSnippetButton().click();
+ H.popover().findByText("New folder").click();
+
+ H.modal().within(() => {
+ cy.findByLabelText("Give your folder a name").type("Test Folder");
+ cy.findByLabelText("Add a description").type(
+ "Folder for test snippets",
+ );
+ cy.button("Create").click();
+ cy.wait("@createCollection");
+ });
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .click()
+ .findByText("Test Folder")
+ .should("be.visible");
+
+ H.DataStudio.ModelingSidebar.createSnippetButton().click();
+ H.popover().findByText("New snippet").click();
+
+ H.DataStudio.Snippets.nameInput().type("Folder snippet");
+ H.DataStudio.Snippets.editor.type("SELECT 1");
+ H.DataStudio.Snippets.saveButton().click();
+
+ H.modal().within(() => {
+ cy.findByText("Test Folder").click();
+ cy.button("Select").click();
+ });
+
+ cy.wait("@createSnippet");
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Folder snippet")
+ .should("be.visible");
+ });
+
+ it("should be able to edit folder details", () => {
+ H.createSnippetFolder({
+ name: "Test Folder",
+ });
+
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.snippetsTreeItem("SQL snippets").click();
+
+ H.DataStudio.ModelingSidebar.snippetsTreeItem("Test Folder")
+ .findByLabelText("Collection options")
+ .click();
+
+ H.popover().findByText("Edit folder details").click();
+
+ H.modal().within(() => {
+ cy.findByLabelText("Give your folder a name")
+ .clear()
+ .type("Updated Folder");
+ cy.button("Update").click();
+ cy.wait("@updateCollection");
+ });
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Updated Folder")
+ .should("be.visible");
+ });
+
+ it("should be able to delete a folder", () => {
+ H.createSnippetFolder({
+ name: "Test Folder",
+ });
+
+ visitModelingPage();
+
+ H.DataStudio.ModelingSidebar.snippetsTreeItem("SQL snippets").click();
+
+ H.DataStudio.ModelingSidebar.snippetsTreeItem("Test Folder")
+ .findByLabelText("Collection options")
+ .click();
+
+ H.popover().findByText("Archive").click();
+
+ cy.wait("@updateCollection");
+
+ H.DataStudio.ModelingSidebar.snippetsTreeItem("SQL snippets").click();
+
+ H.DataStudio.ModelingSidebar.snippetsTree()
+ .findByText("Test Folder")
+ .should("not.exist");
+ });
+ });
+});
+
+function visitModelingPage() {
+ cy.visit("/data-studio/modeling");
+ H.DataStudio.ModelingSidebar.root().should("be.visible");
+}
diff --git a/e2e/test/scenarios/admin/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
similarity index 73%
rename from e2e/test/scenarios/admin/transforms.cy.spec.ts
rename to e2e/test/scenarios/data-studio/transforms.cy.spec.ts
index 4336c79d7f4..faf742701b5 100644
--- a/e2e/test/scenarios/admin/transforms.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
@@ -36,9 +36,6 @@ describe("scenarios > admin > transforms", () => {
cy.intercept("DELETE", "/api/ee/transform/*/table").as(
"deleteTransformTable",
);
- cy.intercept("GET", "/api/ee/transform/*/dependencies").as(
- "transformDependencies",
- );
cy.intercept("POST", "/api/ee/transform-tag").as("createTag");
cy.intercept("PUT", "/api/ee/transform-tag/*").as("updateTag");
cy.intercept("DELETE", "/api/ee/transform-tag/*").as("deleteTag");
@@ -52,34 +49,35 @@ describe("scenarios > admin > transforms", () => {
it("should be able to create and run an mbql transform", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.expectUnstructuredSnowplowEvent({
event: "transform_create",
event_detail: "query",
- triggered_from: "transform-page-create-menu",
});
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
cy.findByText(DB_NAME).click();
+ cy.findByText(TARGET_SCHEMA).click();
cy.findByText(SOURCE_TABLE).click();
});
getQueryEditor().button("Save").click();
H.modal().within(() => {
- cy.findByLabelText("Name").type("MBQL transform");
+ cy.findByLabelText("Name").clear().type("MBQL transform");
cy.findByLabelText("Table name").type(TARGET_TABLE);
cy.button("Save").click();
cy.wait("@createTransform");
});
cy.log("run the transform and make sure its table can be queried");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
H.expectUnstructuredSnowplowEvent({
event: "transform_trigger_manual_run",
- triggered_from: "transform-page",
});
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText("Transform Table").should("be.visible");
H.assertQueryBuilderRowCount(3);
@@ -91,36 +89,34 @@ describe("scenarios > admin > transforms", () => {
it("should be able to create and run a SQL transform", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("SQL query").click();
-
H.expectUnstructuredSnowplowEvent({
event: "transform_create",
event_detail: "native",
- triggered_from: "transform-page-create-menu",
});
H.popover().findByText(DB_NAME).click();
H.NativeEditor.type(`SELECT * FROM "${TARGET_SCHEMA}"."${SOURCE_TABLE}"`);
getQueryEditor().button("Save").click();
H.modal().within(() => {
- cy.findByLabelText("Name").type("SQL transform");
+ cy.findByLabelText("Name").clear().type("SQL transform");
cy.findByLabelText("Table name").type(TARGET_TABLE);
cy.button("Save").click();
cy.wait("@createTransform");
});
-
H.expectUnstructuredSnowplowEvent({
event: "transform_created",
});
cy.log("run the transform and make sure its table can be queried");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
H.expectUnstructuredSnowplowEvent({
event: "transform_trigger_manual_run",
- triggered_from: "transform-page",
});
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText(DB_NAME).should("be.visible");
H.assertQueryBuilderRowCount(3);
@@ -133,7 +129,7 @@ describe("scenarios > admin > transforms", () => {
});
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("SQL query").click();
H.popover().findByText(DB_NAME).click();
@@ -196,13 +192,11 @@ describe("scenarios > admin > transforms", () => {
setPythonRunnerSettings();
cy.log("create a new transform");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Python script").click();
-
H.expectUnstructuredSnowplowEvent({
event: "transform_create",
event_detail: "python",
- triggered_from: "transform-page-create-menu",
});
cy.findByTestId("python-data-picker")
@@ -292,14 +286,17 @@ describe("scenarios > admin > transforms", () => {
});
cy.log("run the transform and make sure its table can be queried");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
H.expectUnstructuredSnowplowEvent({
event: "transform_trigger_manual_run",
- triggered_from: "transform-page",
});
+ H.DataStudio.Transforms.content().should(
+ "contain",
+ "Executing Python transform",
+ );
- getRunSection().should("contain", "Executing Python transform");
-
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText(DB_NAME).should("be.visible");
H.assertQueryBuilderRowCount(1);
@@ -331,12 +328,11 @@ describe("scenarios > admin > transforms", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
- H.popover().findByText("A copy of a saved question").click();
+ getTransformsSidebar().button("Create a transform").click();
+ H.popover().findByText("Copy of a saved question").click();
H.expectUnstructuredSnowplowEvent({
event: "transform_create",
event_detail: "saved-question",
- triggered_from: "transform-page-create-menu",
});
H.entityPickerModal().within(() => {
@@ -345,7 +341,7 @@ describe("scenarios > admin > transforms", () => {
});
getQueryEditor().button("Save").click();
H.modal().within(() => {
- cy.findByLabelText("Name").type(`${type} transform`);
+ cy.findByLabelText("Name").clear().type(`${type} transform`);
cy.findByLabelText("Table name").type(`${type}_transform`);
cy.button("Save").click();
cy.wait("@createTransform");
@@ -356,12 +352,13 @@ describe("scenarios > admin > transforms", () => {
});
cy.log("run the transform and make sure its table can be queried");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
H.expectUnstructuredSnowplowEvent({
event: "transform_trigger_manual_run",
- triggered_from: "transform-page",
});
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText(DB_NAME).should("be.visible");
H.assertQueryBuilderRowCount(3);
@@ -381,9 +378,7 @@ LIMIT
5`;
createMbqlTransform({ visitTransform: true });
- getTransformPage().findByText("Edit query").click();
-
- getQueryEditor().icon("sql").click();
+ getQueryEditor().findByLabelText("View SQL").click();
H.sidebar().should("be.visible");
H.NativeEditor.value().should("eq", EXPECTED_QUERY);
@@ -391,16 +386,17 @@ LIMIT
H.sidebar().should("be.visible");
H.NativeEditor.value().should("eq", EXPECTED_QUERY);
- getQueryEditor().button("Save changes").click();
- getTransformPage().should("be.visible");
+ getQueryEditor().button("Save").click();
+ getTransformsContent().should("be.visible");
cy.log("run the transform and make sure its table can be queried");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
H.expectUnstructuredSnowplowEvent({
event: "transform_trigger_manual_run",
- triggered_from: "transform-page",
});
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText(DB_NAME).should("be.visible");
H.assertQueryBuilderRowCount(3);
@@ -409,17 +405,18 @@ LIMIT
it("should not allow to overwrite an existing table when creating a transform", () => {
cy.log("open the new transform page");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
cy.log("set the query");
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
cy.findByText(DB_NAME).click();
+ cy.findByText(TARGET_SCHEMA).click();
cy.findByText(SOURCE_TABLE).click();
});
getQueryEditor().button("Save").click();
H.modal().within(() => {
- cy.findByLabelText("Name").type("MBQL transform");
+ cy.findByLabelText("Name").clear().type("MBQL transform");
cy.findByLabelText("Table name").type(SOURCE_TABLE);
cy.button("Save").click();
cy.wait("@createTransform");
@@ -431,16 +428,17 @@ LIMIT
it("should be able to create a new schema when saving a transform", () => {
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
cy.findByText(DB_NAME).click();
+ cy.findByText(TARGET_SCHEMA).click();
cy.findByText(SOURCE_TABLE).click();
});
getQueryEditor().button("Save").click();
H.modal().within(() => {
- cy.findByLabelText("Name").type("MBQL transform");
+ cy.findByLabelText("Name").clear().type("MBQL transform");
cy.findByLabelText("Table name").type(TARGET_TABLE);
cy.findByLabelText("Schema").clear().type(CUSTOM_SCHEMA);
});
@@ -448,32 +446,32 @@ LIMIT
H.modal().within(() => {
cy.button("Save").click();
cy.wait("@createTransform");
- cy.wait("@transformDependencies");
});
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink()
.should("have.text", CUSTOM_SCHEMA)
.should("have.attr", "aria-disabled", "true")
.realHover();
-
H.tooltip()
.should("be.visible")
.should(
"have.text",
"This schema will be created when the transform runs",
);
-
- getTableLink()
+ getTableLink({ isActive: false })
.should("have.text", TARGET_TABLE)
.should("have.attr", "aria-disabled", "true");
cy.log("run the transform and verify the table");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink()
.should("have.text", CUSTOM_SCHEMA)
.should("have.attr", "aria-disabled", "false")
.realHover();
-
getTableLink().click();
H.queryBuilderHeader().findByText(CUSTOM_SCHEMA).should("be.visible");
H.assertQueryBuilderRowCount(3);
@@ -481,51 +479,59 @@ LIMIT
it("should be able to create a new table in an existing when saving a transform", () => {
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
-
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
cy.findByText(DB_NAME).click();
+ cy.findByText(TARGET_SCHEMA).click();
cy.findByText(SOURCE_TABLE).click();
});
getQueryEditor().button("Save").click();
H.modal().within(() => {
- cy.findByLabelText("Name").type("MBQL transform");
+ cy.findByLabelText("Name").clear().type("MBQL transform");
cy.findByLabelText("Table name").type(TARGET_TABLE);
cy.button("Save").click();
cy.wait("@createTransform");
});
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink()
.should("have.text", TARGET_SCHEMA)
.should("have.attr", "aria-disabled", "false");
-
- getTableLink()
+ getTableLink({ isActive: false })
.should("have.text", TARGET_TABLE)
.should("have.attr", "aria-disabled", "true");
cy.log("run the transform and verify the table");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink().should("have.attr", "aria-disabled", "false");
getTableLink().should("have.attr", "aria-disabled", "false").click();
-
H.assertQueryBuilderRowCount(3);
});
it("should not be possible to create an mbql transform from a table from an unsupported database", () => {
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
+ H.miniPicker().within(() => {
+ // no sample db in mini picker
+ cy.findByText(/Writable Postgres/).should("be.visible");
+ cy.findByText("Sample Database").should("not.exist");
+ });
+
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
+ H.entityPickerModalItem(0, "Databases").click();
cy.findAllByTestId("picker-item")
.contains("Sample Database")
.should("have.attr", "data-disabled", "true");
-
cy.findAllByTestId("picker-item")
- .contains("Orders")
- .should("have.attr", "data-disabled", "true");
+ .contains(/Writable Postgres/)
+ .should("not.have.attr", "data-disabled");
});
});
@@ -533,7 +539,7 @@ LIMIT
H.getTableId({ name: "Animals", databaseId: WRITABLE_DB_ID }).then(
(tableId) =>
H.createQuestion({
- name: "Metric",
+ name: "Animal Metric",
type: "metric",
query: {
"source-table": tableId,
@@ -543,22 +549,27 @@ LIMIT
);
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText(/metric/i).should("not.exist");
+ });
+
+ H.miniPickerHeader().click(); // go back
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- cy.findByText("Collections").click();
cy.findAllByTestId("picker-item")
- .contains("Metric")
+ .contains("Animal Metric")
.should("have.attr", "data-disabled", "true");
});
});
it("should not be possible to create a sql transform from a table from an unsupported database", () => {
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("SQL query").click();
-
H.popover()
.findByRole("option", { name: "Sample Database" })
.should("have.attr", "aria-disabled", "true")
@@ -588,8 +599,8 @@ LIMIT
cy.log("create a new transform");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
- H.popover().findByText("A copy of a saved question").click();
+ getTransformsSidebar().button("Create a transform").click();
+ H.popover().findByText("Copy of a saved question").click();
H.entityPickerModal().within(() => {
H.entityPickerModalTab(label);
cy.findAllByTestId("picker-item")
@@ -605,12 +616,13 @@ LIMIT
it("should not auto-pivot query results for MBQL transforms", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
cy.log("build a query with 1 aggregation and 2 breakouts");
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
cy.findByText(DB_NAME).click();
+ cy.findByText(TARGET_SCHEMA).click();
cy.findByText(SOURCE_TABLE).click();
});
H.getNotebookStep("summarize")
@@ -637,147 +649,25 @@ LIMIT
});
});
- describe("filtering", () => {
- it("should be able to filter transforms", () => {
- createMbqlTransform({ visitTransform: true });
- runJobAndWaitForSuccess();
-
- createSqlTransform({
- sourceQuery: `SELECT * FROM "${TARGET_SCHEMA}"."${SOURCE_TABLE}"`,
- targetTable: TARGET_TABLE_2,
- visitTransform: true,
- });
- getTagsInput().click();
- H.popover().findByText("hourly").click();
- H.undoToast().findByText("Transform tags updated").should("be.visible");
-
- visitTransformListPage();
-
- function testLastRunDateFilter() {
- cy.log("no filters");
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("be.visible");
- });
-
- cy.log("last run at - add a filter");
- getLastRunDateFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("Relative date range…").click();
- cy.findByText("Current").click();
- cy.findByText("Week").click();
- });
-
- getLastRunDateFilterWidget().should("contain", "This week");
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("not.exist");
- });
-
- cy.log("last run at filter - remove filter");
- getLastRunDateFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("be.visible");
- });
- }
-
- function testLastRunStatusFilter() {
- cy.log("no filters");
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("be.visible");
- });
-
- cy.log("last run status - add a filter");
- getLastRunStatusFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("Success").click();
- cy.findByText("Add filter").click();
- });
-
- getLastRunStatusFilterWidget().should("contain", "Success");
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("not.exist");
- });
-
- cy.log("last run status filter - remove filter");
- getLastRunStatusFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("be.visible");
- });
- }
-
- function testTagFilter() {
- cy.log("no filters");
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("be.visible");
- });
-
- cy.log("tags - add a filter");
- getTagFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("hourly").click();
- cy.findByText("daily").click();
- cy.button("Add filter").click();
- });
-
- getTagFilterWidget().should("contain", "2 tags");
- getContentTable().within(() => {
- cy.findByText("SQL transform").should("be.visible");
- cy.findByText("MBQL transform").should("not.exist");
- });
-
- cy.log("last run status filter - remove filter");
- getTagFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
- cy.findByText("MBQL transform").should("be.visible");
- cy.findByText("SQL transform").should("be.visible");
- });
- }
-
- testLastRunDateFilter();
- testLastRunStatusFilter();
- testTagFilter();
- });
- });
-
- describe("name and description", () => {
- it("should be able to edit the name and description after creation", () => {
+ describe("name", () => {
+ it("should be able to edit the name after creation", () => {
createMbqlTransform({ visitTransform: true });
-
- getTransformPage()
+ getTransformsContent()
.findByPlaceholderText("Name")
.clear()
.type("New name")
.blur();
H.undoToast().findByText("Transform name updated").should("be.visible");
- getTransformPage()
+ getTransformsContent()
.findByPlaceholderText("Name")
.should("have.value", "New name");
-
- getTransformPage()
- .findByPlaceholderText("No description yet")
- .clear()
- .type("New description")
- .blur();
- H.undoToastList()
- .should("have.length", 2)
- .last()
- .findByText("Transform description updated")
- .should("be.visible");
- getTransformPage()
- .findByPlaceholderText("No description yet")
- .should("have.value", "New description");
});
});
describe("tags", () => {
it("should be able to add and remove tags", () => {
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.runTab().click();
getTagsInput().click();
H.popover().findByText("hourly").click();
@@ -797,6 +687,7 @@ LIMIT
it("should be able to create tags inline", () => {
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.runTab().click();
getTagsInput().type("New tag");
H.popover().findByText("New tag").click();
cy.wait("@createTag");
@@ -805,7 +696,7 @@ LIMIT
it("should be able to update tags inline", () => {
createMbqlTransform({ visitTransform: true });
-
+ H.DataStudio.Transforms.runTab().click();
getTagsInput().click();
H.popover()
.findByText("hourly")
@@ -824,7 +715,7 @@ LIMIT
it("should be able to delete tags inline", () => {
createMbqlTransform({ visitTransform: true });
-
+ H.DataStudio.Transforms.runTab().click();
getTagsInput().click();
H.popover()
.findByText("hourly")
@@ -852,15 +743,16 @@ LIMIT
});
cy.log("Add new tag to transform A");
+ H.DataStudio.Transforms.runTab().click();
getTagsInput().type("New tag");
H.popover().findByText("New tag").click();
cy.wait("@createTag");
cy.log("Navigate to transform B");
- getNavSidebar().findByText("Transforms").click();
- getTransformListPage().findByText("Transform B").click();
+ getTransformsSidebar().findByText("Transform B").click();
cy.log("Remove the new tag from transform B");
+ H.DataStudio.Transforms.runTab().click();
getTagsInput().click();
H.popover()
.findByText("New tag")
@@ -873,10 +765,10 @@ LIMIT
});
cy.log("Navigate to transform A");
- cy.findByTestId("admin-layout-sidebar").findByText("Transforms").click();
- getTransformListPage().findByText("Transform A").click();
+ getTransformsSidebar().findByText("Transform A").click();
cy.log("The tag should be gone");
+ H.DataStudio.Transforms.runTab().click();
getTagsInput()
.parent()
// Select the tag pill
@@ -891,7 +783,8 @@ LIMIT
createMbqlTransform({ visitTransform: true });
cy.log("modify the transform before running");
- getTransformPage().button("Change target").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").should("have.value", TARGET_TABLE);
cy.findByLabelText("Schema").should("have.value", TARGET_SCHEMA);
@@ -903,26 +796,25 @@ LIMIT
cy.button("Change target").click();
cy.wait("@updateTransform");
});
-
getSchemaLink()
.should("have.text", TARGET_SCHEMA_2)
.should("have.attr", "aria-disabled", "false");
-
- getTableLink()
+ getTableLink({ isActive: false })
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "true");
cy.log("run the transform and verify the table");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink()
.should("have.text", TARGET_SCHEMA_2)
.should("have.attr", "aria-disabled", "false");
-
getTableLink()
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "false")
.click();
-
H.queryBuilderHeader().findByText(TARGET_SCHEMA_2).should("be.visible");
H.assertQueryBuilderRowCount(3);
});
@@ -932,7 +824,8 @@ LIMIT
createMbqlTransform({ visitTransform: true });
cy.log("modify the transform before running");
- getTransformPage().button("Change target").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").should("have.value", TARGET_TABLE);
cy.findByLabelText("Schema").should("have.value", TARGET_SCHEMA);
@@ -944,26 +837,25 @@ LIMIT
cy.button("Change target").click();
cy.wait("@updateTransform");
});
-
getSchemaLink()
.should("have.text", CUSTOM_SCHEMA)
.should("have.attr", "aria-disabled", "true");
-
- getTableLink()
+ getTableLink({ isActive: false })
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "true");
cy.log("run the transform and verify the table");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink()
.should("have.text", CUSTOM_SCHEMA)
.should("have.attr", "aria-disabled", "false");
-
getTableLink()
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "false")
.click();
-
H.queryBuilderHeader().findByText(CUSTOM_SCHEMA).should("be.visible");
H.assertQueryBuilderRowCount(3);
});
@@ -971,10 +863,12 @@ LIMIT
it("should be able to change the target after running a transform and keep the old target", () => {
cy.log("create and run a transform");
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
cy.log("modify the transform after running");
- getTransformPage().button("Change target").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").should("have.value", TARGET_TABLE);
cy.findByLabelText("Schema").should("have.value", TARGET_SCHEMA);
@@ -983,21 +877,21 @@ LIMIT
cy.button("Change target").click();
cy.wait("@updateTransform");
});
-
getSchemaLink()
.should("have.text", TARGET_SCHEMA)
.should("have.attr", "aria-disabled", "false");
-
- getTableLink()
+ getTableLink({ isActive: false })
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "true");
cy.log("run the transform and verify the new table");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink()
.should("have.text", TARGET_SCHEMA)
.should("have.attr", "aria-disabled", "false");
-
getTableLink()
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "false")
@@ -1015,10 +909,12 @@ LIMIT
it("should be able to change the target after running a transform and delete the old target", () => {
cy.log("create and run a transform");
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
cy.log("modify the transform after running");
- getTransformPage().button("Change target").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").should("have.value", TARGET_TABLE);
cy.findByLabelText("Schema").should("have.value", TARGET_SCHEMA);
@@ -1028,22 +924,21 @@ LIMIT
cy.wait("@deleteTransformTable");
cy.wait("@updateTransform");
});
-
getSchemaLink()
.should("have.text", TARGET_SCHEMA)
.should("have.attr", "aria-disabled", "false");
-
- getTableLink()
+ getTableLink({ isActive: false })
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "true");
cy.log("run the transform and verify the new table");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink()
.should("have.text", TARGET_SCHEMA)
.should("have.attr", "aria-disabled", "false");
-
getTableLink()
.should("have.text", TARGET_TABLE_2)
.should("have.attr", "aria-disabled", "false")
@@ -1061,10 +956,12 @@ LIMIT
it("should be able to delete the target and restore the same target back", () => {
cy.log("create and run a transform");
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
cy.log("delete the old target without creating the new one");
- getTransformPage().button("Change target").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").clear().type(TARGET_TABLE_2);
cy.findByLabelText("Delete transform_table").click();
@@ -1074,7 +971,7 @@ LIMIT
});
cy.log("change the target back to the original one");
- getTransformPage().button("Change target").click();
+ getTransformsContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").clear().type(TARGET_TABLE);
cy.button("Change target").click();
@@ -1082,9 +979,11 @@ LIMIT
});
cy.log("run the transform to re-create the original target");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
cy.log("verify the target is available");
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText("Transform Table").should("be.visible");
H.assertQueryBuilderRowCount(3);
@@ -1094,7 +993,8 @@ LIMIT
createMbqlTransform({ visitTransform: true });
cy.log("change the target to an existing table");
- getTransformPage().button("Change target").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").clear().type(SOURCE_TABLE);
cy.button("Change target").click();
@@ -1110,13 +1010,16 @@ LIMIT
it("should be able to edit table metadata after table creation", () => {
cy.log("before table creation");
createMbqlTransform({ visitTransform: true });
- getTransformPage()
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent()
.findByText("Edit this table’s metadata")
.should("not.exist");
cy.log("after table creation");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
- getTransformPage().findByText("Edit this table’s metadata").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().findByText("Edit this table’s metadata").click();
H.DataModel.TableSection.clickField("Name");
H.DataModel.FieldSection.getNameInput().clear().type("New name").blur();
cy.wait("@updateField");
@@ -1131,6 +1034,7 @@ LIMIT
it("should be able to see the target schema", () => {
cy.log("before table creation");
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink().should("have.text", TARGET_SCHEMA);
getSchemaLink().click();
H.main().within(() => {
@@ -1140,7 +1044,9 @@ LIMIT
cy.log("after table creation");
cy.go("back");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getSchemaLink().click();
H.main().within(() => {
cy.findByText("Animals").should("be.visible");
@@ -1151,6 +1057,7 @@ LIMIT
it("should be able to see the target database", () => {
cy.log("before table creation");
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.targetTab().click();
getDatabaseLink().should("have.text", DB_NAME);
getDatabaseLink().click();
H.main().within(() => {
@@ -1160,7 +1067,9 @@ LIMIT
cy.log("after table creation");
cy.go("back");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getDatabaseLink().click();
H.main().within(() => {
cy.findByText(TARGET_SCHEMA).should("be.visible");
@@ -1170,199 +1079,11 @@ LIMIT
});
describe("queries", () => {
- it("should render a readOnly preview of the MBQL query", () => {
- cy.log("create a new transform that has all the steps");
- H.getTableId({ name: "Animals" }).then((tableId) => {
- H.getFieldId({ tableId, name: "score" }).then((ANIMAL_SCORE) => {
- H.getFieldId({ tableId, name: "name" }).then((ANIMAL_NAME) => {
- H.createTransform(
- {
- name: "MBQL transform",
- source: {
- type: "query",
- query: {
- database: WRITABLE_DB_ID,
- type: "query",
- query: {
- "source-table": tableId,
- filter: [">", ["field", ANIMAL_SCORE, {}], 10],
- aggregation: [
- ["count"],
- [
- "aggregation-options",
- ["+", ["count"], 1],
- { name: "Foobar", "display-name": "Foobar" },
- ],
- ],
- expressions: {
- ScorePlusOne: ["+", ["field", ANIMAL_SCORE, {}], 1],
- },
- breakout: [
- [
- "field",
- ANIMAL_SCORE,
- {
- binning: { strategy: "num-bins", "num-bins": 10 },
- },
- ],
- ],
- joins: [
- {
- "source-table": tableId,
- condition: [
- "=",
- ["field", ANIMAL_SCORE, {}],
- ["field", ANIMAL_SCORE, {}],
- ],
- alias: "animal_score",
- },
- ],
- limit: 10,
- "order-by": [["asc", ["field", ANIMAL_NAME, {}]]],
- },
- },
- },
- target: {
- type: "table",
- database: WRITABLE_DB_ID,
- name: TARGET_TABLE,
- schema: TARGET_SCHEMA,
- },
- tag_ids: [],
- },
- { visitTransform: true },
- );
- });
- });
- });
-
- cy.log("Data step should be read-only");
- H.getNotebookStep("data")
- .findByRole("button")
- .should("contain", "Animals")
- .should("be.disabled");
-
- cy.log("Join step should be read-only");
- H.getNotebookStep("join")
- .findAllByText("Animals")
- .should("have.length", 4)
- .eq(1)
- .should("have.css", "pointer-events", "none");
-
- cy.findByLabelText("Change join type").should("be.disabled");
-
- H.getNotebookStep("join")
- .findAllByText("Score")
- .should("have.length", 2)
- .first()
- .click();
- assertNoModals();
-
- H.getNotebookStep("join")
- .findAllByText("Score")
- .should("have.length", 2)
- .eq(1)
- .click();
- assertNoModals();
-
- cy.log("Expression step should be read-only, but render editor");
- H.getNotebookStep("expression").findByText("ScorePlusOne").click();
- H.CustomExpressionEditor.value().should("equal", "[Score] + 1");
- H.CustomExpressionEditor.nameInput()
- .should("have.value", "ScorePlusOne")
- .should("have.attr", "readonly");
- H.popover().button("Done").click();
-
- cy.log("Expression step should be read-only, but render popover");
- H.getNotebookStep("filter")
- .findByText("Score is greater than 10")
- .click();
- H.popover().within(() => {
- cy.findByText("Score").should("be.visible");
- cy.findByText("Greater than").should("be.visible");
- cy.findByPlaceholderText("Enter a number")
- .should("be.visible")
- .should("have.value", 10);
- });
- H.main().click();
-
- cy.log("Summarize step should be read-only");
- H.getNotebookStep("summarize").findByText("Count").click();
- H.CustomExpressionEditor.value().should("equal", "Count()");
- H.CustomExpressionEditor.nameInput()
- .should("have.value", "Count")
- .should("have.attr", "readonly");
- H.popover().button("Done").click();
-
- H.getNotebookStep("summarize").findByText("Foobar").click();
- H.CustomExpressionEditor.value().should("equal", "Count() + 1");
- H.CustomExpressionEditor.nameInput()
- .should("have.value", "Foobar")
- .should("have.attr", "readonly");
- H.popover().button("Done").click();
-
- H.getNotebookStep("summarize").findByText("Score: 10 bins").click();
- assertNoModals();
-
- cy.log("Sort step should be read-only");
- H.getNotebookStep("sort").findByText("Name").click();
- assertNoModals();
-
- cy.log("Limit step should be read-only");
- H.getNotebookStep("limit")
- .findByPlaceholderText("Enter a limit")
- .should("have.value", 10)
- .should("have.attr", "readonly");
-
- function assertNoModals() {
- H.entityPickerModal().should("not.exist");
- H.popover({ skipVisibilityCheck: true }).should("not.exist");
- }
- });
-
- it("should hide empty sections in read-only mode", () => {
- H.getTableId({ name: "Animals" }).then((tableId) => {
- H.createTransform(
- {
- name: "MBQL transform",
- source: {
- type: "query",
- query: {
- database: WRITABLE_DB_ID,
- type: "query",
- query: {
- "source-table": tableId,
- aggregation: [["count"]],
- },
- },
- },
- target: {
- type: "table",
- database: WRITABLE_DB_ID,
- name: TARGET_TABLE,
- schema: TARGET_SCHEMA,
- },
- tag_ids: [],
- },
- { visitTransform: true },
- );
-
- H.getNotebookStep("summarize")
- .scrollIntoView()
- .should("be.visible")
- .within(() => {
- cy.findByText("by").should("not.exist");
- cy.findByTestId("breakout-step").should("not.exist");
- });
- });
- });
-
it("should be able to update a MBQL query", () => {
cy.log("create a new transform");
createMbqlTransform({ visitTransform: true });
cy.log("update the query");
- getTransformPage().findByRole("link", { name: "Edit query" }).click();
H.getNotebookStep("data").button("Filter").click();
H.popover().within(() => {
cy.findByText("Name").click();
@@ -1370,11 +1091,14 @@ LIMIT
cy.button("Add filter").click();
});
- getQueryEditor().button("Save changes").click();
+ getQueryEditor().button("Save").click();
cy.wait("@updateTransform");
cy.log("run the transform and make sure the query has changed");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText(DB_NAME).should("be.visible");
H.assertQueryBuilderRowCount(1);
@@ -1388,13 +1112,14 @@ LIMIT
});
cy.log("update the query");
- getTransformPage().findByRole("link", { name: "Edit query" }).click();
H.NativeEditor.type(" WHERE name = 'Duck'");
- getQueryEditor().button("Save changes").click();
+ getQueryEditor().button("Save").click();
cy.wait("@updateTransform");
cy.log("run the transform and make sure the query has changed");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText(DB_NAME).should("be.visible");
H.assertQueryBuilderRowCount(1);
@@ -1419,14 +1144,14 @@ LIMIT
);
cy.log("update the query");
- getTransformPage().findByRole("link", { name: "Edit script" }).click();
H.PythonEditor.type("{backspace}{backspace}{backspace} + 10 }])");
-
- getQueryEditor().button("Save changes").click();
+ getQueryEditor().button("Save").click();
cy.wait("@updateTransform");
cy.log("run the transform and make sure the query has changed");
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader().findByText(DB_NAME).should("be.visible");
H.assertQueryBuilderRowCount(1);
@@ -1440,6 +1165,7 @@ LIMIT
targetTable: TARGET_TABLE,
visitTransform: true,
});
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
cy.log("create and run another transform");
@@ -1448,6 +1174,7 @@ LIMIT
targetTable: TARGET_TABLE_2,
visitTransform: true,
});
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
cy.log("assert that the list is filtered by the current transform");
@@ -1465,6 +1192,7 @@ LIMIT
sourceQuery: "SELECT * FROM abc",
visitTransform: true,
});
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForFailure();
getRunErrorInfoButton().click();
H.modal().should("contain.text", 'relation "abc" does not exist');
@@ -1477,7 +1205,8 @@ LIMIT
createMbqlTransform({ visitTransform: true });
cy.log("delete the transform");
- getTransformPage().button("Delete transform").click();
+ H.DataStudio.Transforms.header().icon("ellipsis").click();
+ H.popover().findByText("Delete").click();
H.modal().within(() => {
cy.findByLabelText("Delete the transform only").should("not.exist");
cy.findByLabelText("Delete the transform and the table").should(
@@ -1486,23 +1215,27 @@ LIMIT
cy.button("Delete transform").click();
cy.wait("@deleteTransform");
});
- getTransformListPage().should("be.visible");
- getTransformListPage().findByText("MBQL transform").should("not.exist");
+ getTransformsSidebar().should("be.visible");
+ getTransformsSidebar().findByText("MBQL transform").should("not.exist");
});
it("should be able to delete a transform and keep the table", () => {
cy.log("create a transform and the table");
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
+ getTableLink().should("have.attr", "aria-disabled", "false");
cy.log("delete the transform but keep the table");
- getTransformPage().button("Delete transform").click();
+ H.DataStudio.Transforms.header().icon("ellipsis").click();
+ H.popover().findByText("Delete").click();
H.modal().within(() => {
cy.findByLabelText("Delete the transform only").should("be.checked");
cy.button("Delete transform only").click();
cy.wait("@deleteTransform");
});
- getTransformListPage().should("be.visible");
+ getTransformsSidebar().should("be.visible");
cy.log("make sure the table still exists");
visitTableQuestion();
@@ -1512,17 +1245,21 @@ LIMIT
it("should be able to delete a transform and delete the table", () => {
cy.log("create a transform and the table");
createMbqlTransform({ visitTransform: true });
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
+ getTableLink().should("have.attr", "aria-disabled", "false");
cy.log("delete the transform and the table");
- getTransformPage().button("Delete transform").click();
+ H.DataStudio.Transforms.header().icon("ellipsis").click();
+ H.popover().findByText("Delete").click();
H.modal().within(() => {
cy.findByLabelText("Delete the transform and the table").click();
cy.button("Delete transform and table").click();
cy.wait("@deleteTransformTable");
cy.wait("@deleteTransform");
});
- getTransformListPage().should("be.visible");
+ getTransformsSidebar().should("be.visible");
cy.log("make sure the table is deleted");
visitTableQuestion();
@@ -1559,6 +1296,7 @@ LIMIT
it("should be possible to cancel a transform from the transform page", () => {
createSlowTransform();
+ H.DataStudio.Transforms.runTab().click();
getRunButton().click();
getRunButton().should("have.text", "Running now…");
getRunStatus().should("have.text", "Run in progress…");
@@ -1577,11 +1315,12 @@ LIMIT
it("should be possible to cancel a transform from the runs page", () => {
createSlowTransform();
+ H.DataStudio.Transforms.runTab().click();
getRunButton().click();
getRunButton().should("have.text", "Running now…");
getRunStatus().should("have.text", "Run in progress…");
- getNavSidebar().findByText("Runs").click();
+ H.DataStudio.runsButton().click();
getContentTable().within(() => {
cy.findByText("In progress").should("be.visible");
cy.findByLabelText("Cancel run").click();
@@ -1597,6 +1336,7 @@ LIMIT
it("should show a message when the run finished before it cancels", () => {
createSlowTransform(1);
+ H.DataStudio.Transforms.runTab().click();
getRunButton().click();
getRunButton().should("have.text", "Running now…");
getRunStatus().should("have.text", "Run in progress…");
@@ -1614,7 +1354,7 @@ LIMIT
"contain",
"Last ran a few seconds ago successfully.",
);
- getRunSection().should(
+ H.DataStudio.Transforms.content().should(
"contain",
"This run succeeded before it had a chance to cancel.",
);
@@ -1622,7 +1362,6 @@ LIMIT
it("should be possible to cancel a SQL transform from the preview (metabase#64474)", () => {
createSlowTransform(500);
- getTransformPage().findByText("Edit query").click();
getQueryEditor().within(() => {
cy.findAllByTestId("run-button").eq(0).click();
@@ -1635,19 +1374,25 @@ LIMIT
});
describe("dependencies", () => {
- it("should render a table of dependencies", () => {
+ it("should render the dependency graph", () => {
createMbqlTransform({
name: "Transform A",
targetTable: "table_a",
visitTransform: true,
- }).then(runTransformAndWaitForSuccess);
+ }).then(() => {
+ H.DataStudio.Transforms.runTab().click();
+ runTransformAndWaitForSuccess();
+ });
createMbqlTransform({
name: "Transform B",
sourceTable: "table_a",
targetTable: "table_b",
visitTransform: true,
- }).then(runTransformAndWaitForSuccess);
+ }).then(() => {
+ H.DataStudio.Transforms.runTab().click();
+ runTransformAndWaitForSuccess();
+ });
createMbqlTransform({
name: "Transform C",
@@ -1656,19 +1401,16 @@ LIMIT
visitTransform: true,
});
- H.main().findByText("Dependencies").scrollIntoView().should("be.visible");
- getContentTable().within(() => {
- // 1 transform plus the header row
- cy.findAllByRole("row").should("have.length", 2);
-
- // Check the existence and also their order
- cy.findAllByRole("row").eq(1).should("contain", "Transform B");
- });
+ H.DataStudio.Transforms.dependenciesTab().click();
+ H.DataStudio.Transforms.content()
+ .should("contain", "Transform B")
+ .and("contain", "Transform A");
});
- it("should no dependencies table if the transform has no dependencies", () => {
+ it("should show if the transform has no dependencies", () => {
createMbqlTransform({ name: "Transform A", visitTransform: true });
- H.main().findByText("Dependencies").should("not.exist");
+ H.DataStudio.Transforms.dependenciesTab().click();
+ H.DataStudio.Transforms.content().should("contain", "Nothing uses this");
});
});
@@ -1725,7 +1467,7 @@ LIMIT
);
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Python script").click();
H.PythonEditor.clear().type(
@@ -1737,7 +1479,7 @@ LIMIT
`,
);
- getQueryEditor().findByText("Import common library").click();
+ getQueryEditor().findByLabelText("Import common library").click();
H.PythonEditor.value().should("contain", "import common");
cy.findByTestId("python-data-picker")
@@ -1763,7 +1505,9 @@ LIMIT
cy.button("Save").click();
});
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader()
.findByText("Python Transform")
@@ -1783,7 +1527,9 @@ LIMIT
return a + b + 40
`,
);
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
+ H.DataStudio.Transforms.targetTab().click();
getTableLink().click();
H.queryBuilderHeader()
.findByText("Python Transform")
@@ -1794,11 +1540,11 @@ LIMIT
);
function visitCommonLibrary(path = "common.py") {
- cy.visit(`/admin/transforms/library/${path}`);
+ cy.visit(`/data-studio/transforms/library/${path}`);
}
function getLibraryEditorHeader() {
- return cy.findByTestId("library-editor-header");
+ return cy.findByTestId("python-library-header");
}
});
});
@@ -1831,7 +1577,8 @@ describe("scenarios > admin > transforms > databases without :schemas", () => {
targetSchema: null,
});
- getTransformPage().button("Change target").click();
+ H.DataStudio.Transforms.targetTab().click();
+ getTransformsContent().button("Change target").click();
H.modal().findByLabelText("Schema").should("not.exist");
});
@@ -1839,10 +1586,10 @@ describe("scenarios > admin > transforms > databases without :schemas", () => {
it("should be not be possible to create a new schema when the database does not support schemas", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformListPage().button("Create a transform").click();
+ getTransformsSidebar().button("Create a transform").click();
H.popover().findByText("Query builder").click();
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
cy.findByText(DB_NAME).click();
cy.findByText("Orders").click();
});
@@ -1867,7 +1614,7 @@ describe("scenarios > admin > transforms > jobs", () => {
describe("creation", () => {
it("should be able to create a job with default properties", () => {
visitJobListPage();
- getJobListPage().findByRole("link", { name: "Create a job" }).click();
+ getJobsSidebar().button("Create a job").click();
getJobPage().button("Save").click();
cy.wait("@createJob");
@@ -1875,7 +1622,6 @@ describe("scenarios > admin > transforms > jobs", () => {
getJobPage().within(() => {
cy.findByPlaceholderText("Name").should("have.value", "New job");
- cy.findByPlaceholderText("No description yet").should("have.value", "");
getScheduleFrequencyInput().should("have.value", "daily");
getScheduleTimeInput().should("have.value", "12:00");
});
@@ -1883,13 +1629,10 @@ describe("scenarios > admin > transforms > jobs", () => {
it("should be able to create a job with custom property values", () => {
visitJobListPage();
- getJobListPage().findByRole("link", { name: "Create a job" }).click();
+ getJobsSidebar().button("Create a job").click();
getJobPage().within(() => {
cy.findByPlaceholderText("Name").clear().type("Job");
- cy.findByPlaceholderText("No description yet")
- .clear()
- .type("Description");
getScheduleFrequencyInput().click();
});
H.popover().findByText("custom").click();
@@ -1904,10 +1647,6 @@ describe("scenarios > admin > transforms > jobs", () => {
getJobPage().within(() => {
cy.findByPlaceholderText("Name").should("have.value", "Job");
- cy.findByPlaceholderText("No description yet").should(
- "have.value",
- "Description",
- );
getCronInput().should("have.value", "0 * * * ?");
cy.findByText(/This job will run every hour/).should("be.visible");
cy.findByText("daily").should("be.visible");
@@ -1915,8 +1654,8 @@ describe("scenarios > admin > transforms > jobs", () => {
});
});
- describe("name and description", () => {
- it("should be able to edit the name and description after creation", () => {
+ describe("name", () => {
+ it("should be able to edit the name after creation", () => {
H.createTransformJob({ name: "New job" }, { visitTransformJob: true });
getJobPage()
@@ -1928,20 +1667,6 @@ describe("scenarios > admin > transforms > jobs", () => {
getJobPage()
.findByPlaceholderText("Name")
.should("have.value", "New name");
-
- getJobPage()
- .findByPlaceholderText("No description yet")
- .clear()
- .type("New description")
- .blur();
- H.undoToastList()
- .should("have.length", 2)
- .last()
- .findByText("Job description updated")
- .should("be.visible");
- getJobPage()
- .findByPlaceholderText("No description yet")
- .should("have.value", "New description");
});
});
@@ -1988,7 +1713,7 @@ describe("scenarios > admin > transforms > jobs", () => {
"Monthly job": "monthly",
};
Object.entries(jobNameToFrequency).forEach(([jobName, frequency]) => {
- getJobListPage().findByText(jobName).click();
+ getJobsSidebar().findByText(jobName).click();
getJobPage().within(() => {
getScheduleFrequencyInput().should("have.value", frequency);
});
@@ -2036,14 +1761,13 @@ describe("scenarios > admin > transforms > jobs", () => {
runJobAndWaitForSuccess();
H.expectUnstructuredSnowplowEvent({
event: "transform_job_trigger_manual_run",
- triggered_from: "job-page",
});
getJobPage()
.findByText("Last ran a few seconds ago successfully.")
.should("be.visible");
- getNavSidebar().findByText("Runs").click();
+ H.DataStudio.runsButton().click();
getContentTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("Success").should("be.visible");
@@ -2080,13 +1804,14 @@ describe("scenarios > admin > transforms > jobs", () => {
});
cy.log("delete the job");
- getJobPage().button("Delete this job").click();
+ H.DataStudio.Jobs.header().icon("ellipsis").click();
+ H.popover().findByText("Delete").click();
H.modal().within(() => {
cy.button("Delete job").click();
cy.wait("@deleteJob");
});
- getJobListPage().should("be.visible");
- getJobListPage().findByText("New job").should("not.exist");
+ getJobsSidebar().should("be.visible");
+ getJobsSidebar().findByText("New job").should("not.exist");
});
});
@@ -2097,17 +1822,14 @@ describe("scenarios > admin > transforms > jobs", () => {
cy.log("make sure that default jobs are created");
visitJobListPage();
- getContentTable().within(() => {
+ H.DataStudio.Jobs.sidebar().within(() => {
jobNames.forEach((jobName) =>
cy.findByText(jobName).should("be.visible"),
);
- tagNames.forEach((tagName) =>
- cy.findByText(tagName).should("be.visible"),
- );
});
cy.log("make sure that default tags are available for selection");
- getJobListPage().findByRole("link", { name: "Create a job" }).click();
+ getJobsSidebar().button("Create a job").click();
getTagsInput().click();
H.popover().within(() => {
tagNames.forEach((tagName) =>
@@ -2117,215 +1839,37 @@ describe("scenarios > admin > transforms > jobs", () => {
});
});
- describe("filtering", () => {
- it("should be able to filter jobs ", () => {
- cy.log("run hourly job so know that was recently run");
- visitJobListPage();
- getContentTable().findByText("Hourly job").click();
- runJobAndWaitForSuccess();
- visitJobListPage();
-
- function testLastRunDateFilter() {
- cy.log("no filters");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
-
- cy.log("last run at - add a filter");
- getLastRunDateFilterWidget().click();
- H.popover().findByText("Previous month").click();
-
- getLastRunDateFilterWidget().should("contain", "Previous month");
- getContentTable().should("not.exist");
-
- cy.log("last run at filter - remove filter");
- getLastRunDateFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
- }
-
- function testLastRunStatusFilter() {
- cy.log("no filters");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
-
- cy.log("last run status - add a filter");
- getLastRunStatusFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("In progress").click();
- cy.findByText("Success").click();
- cy.button("Add filter").click();
- });
-
- getLastRunStatusFilterWidget().should("contain", "2 statuses");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("not.exist");
- cy.findByText("Weekly job").should("not.exist");
- cy.findByText("Monthly job").should("not.exist");
- });
-
- cy.log("last run at filter - remove filter");
- getLastRunStatusFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
- }
-
- function testNextRunDateFilter() {
- cy.log("no filters");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
-
- cy.log("next run - add a filter");
- getNextRunDateFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("Fixed date range…").click();
- cy.findByLabelText("Start date").clear().type("12/10/2024");
- cy.findByLabelText("End date").clear().type("01/05/2025");
- cy.button("Apply").click();
+ describe("dependencies", () => {
+ it("should render the transforms table", () => {
+ H.createTransformTag({ name: "tag1" }).then(({ body: tag }) => {
+ createMbqlTransform({
+ targetTable: TARGET_TABLE,
+ tagIds: [tag.id],
});
-
- getNextRunDateFilterWidget().should(
- "contain",
- "December 10, 2024 - January 5, 2025",
+ H.createTransformJob(
+ {
+ tag_ids: [tag.id],
+ },
+ { visitTransformJob: true },
);
- getContentTable().should("not.exist");
-
- cy.log("next run filter - remove filter");
- getNextRunDateFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
- }
-
- function testTagFilter() {
- cy.log("no filters");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
-
- cy.log("tag filter - add a filter");
- getTagFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("hourly").click();
- cy.button("Add filter").click();
- });
- getTagFilterWidget().findByText("hourly").should("be.visible");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("not.exist");
- cy.findByText("Weekly job").should("not.exist");
- cy.findByText("Monthly job").should("not.exist");
- });
-
- cy.log("tag filter - update a filter");
- getTagFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("hourly").click();
- cy.findByText("weekly").click();
- cy.button("Update filter").click();
- });
-
- getTagFilterWidget().findByText("weekly").should("be.visible");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("not.exist");
- cy.findByText("Daily job").should("not.exist");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("not.exist");
- });
-
- cy.log("tag filter - multiple options");
- getTagFilterWidget().click();
- H.popover().within(() => {
- cy.findByText("monthly").click();
- cy.button("Update filter").click();
- });
- getTagFilterWidget().findByText("2 tags").should("be.visible");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("not.exist");
- cy.findByText("Daily job").should("not.exist");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
-
- cy.log("tag filter - remove filter");
- getTagFilterWidget().button("Remove filter").click();
- getTagFilterWidget().findByText("2 tags").should("not.exist");
- getContentTable().within(() => {
- cy.findByText("Hourly job").should("be.visible");
- cy.findByText("Daily job").should("be.visible");
- cy.findByText("Weekly job").should("be.visible");
- cy.findByText("Monthly job").should("be.visible");
- });
- }
-
- testLastRunDateFilter();
- testLastRunStatusFilter();
- testNextRunDateFilter();
- testTagFilter();
- });
- });
-
- describe("dependencies", () => {
- it("should render a table of dependencies", () => {
- createMbqlTransform({
- name: "Transform A",
- targetTable: "table_a",
- visitTransform: true,
- }).then(runTransformAndWaitForSuccess);
-
- createMbqlTransform({
- name: "Transform B",
- sourceTable: "table_a",
- targetTable: "table_b",
- visitTransform: true,
- }).then(runTransformAndWaitForSuccess);
-
- createMbqlTransform({
- name: "Transform C",
- sourceTable: "table_b",
- targetTable: "table_c",
- visitTransform: true,
});
- H.main().findByText("Dependencies").scrollIntoView().should("be.visible");
+ H.DataStudio.Jobs.content()
+ .findByText("Transforms")
+ .scrollIntoView()
+ .should("be.visible");
getContentTable().within(() => {
// 1 transform plus the header row
cy.findAllByRole("row").should("have.length", 2);
// Check the existence and also their order
- cy.findAllByRole("row").eq(1).should("contain", "Transform B");
+ cy.findAllByRole("row").eq(1).should("contain", "MBQL transform");
});
});
- it("should no dependencies table if the transform has no dependencies", () => {
- createMbqlTransform({ name: "Transform A", visitTransform: true });
- H.main().findByText("Dependencies").should("not.exist");
+ it("should not render the transforms table if the job has no transforms", () => {
+ H.createTransformJob({}, { visitTransformJob: true });
+ H.DataStudio.Jobs.content().findByText("Transforms").should("not.exist");
});
});
});
@@ -2348,6 +1892,7 @@ describe("scenarios > admin > transforms > runs", () => {
tagIds: [tag1.id],
visitTransform: true,
});
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
createSqlTransform({
sourceQuery: "SELECT * FROM abc",
@@ -2355,6 +1900,7 @@ describe("scenarios > admin > transforms > runs", () => {
tagIds: [tag2.id],
visitTransform: true,
});
+ H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForFailure();
});
});
@@ -2669,7 +2215,7 @@ describe("scenarios > admin > transforms > runs", () => {
}
createInitialData();
- getNavSidebar().findByText("Runs").click();
+ H.DataStudio.runsButton().click();
testTransformFilter();
testStatusFilter();
testTagFilter();
@@ -2679,20 +2225,20 @@ describe("scenarios > admin > transforms > runs", () => {
});
});
-function getTransformListPage() {
- return cy.findByTestId("transform-list-page");
+function getTransformsSidebar() {
+ return cy.findByTestId("transforms-sidebar");
}
-function getTransformPage() {
- return cy.findByTestId("transform-page");
+function getTransformsContent() {
+ return cy.findByTestId("transforms-content");
}
-function getJobListPage() {
- return cy.findByTestId("job-list-page");
+function getJobsSidebar() {
+ return cy.findByTestId("jobs-sidebar");
}
function getJobPage() {
- return cy.findByTestId("job-view");
+ return cy.findByTestId("jobs-editor");
}
function getQueryEditor() {
@@ -2711,10 +2257,6 @@ function getRunStatus() {
return cy.findByTestId("run-status");
}
-function getRunSection() {
- return cy.findByTestId("run-section");
-}
-
function getRunListLink() {
return cy.findByRole("link", { name: "See all runs" });
}
@@ -2723,8 +2265,10 @@ function getRunErrorInfoButton() {
return cy.findByLabelText("See error");
}
-function getTableLink() {
- return cy.findByTestId("table-link");
+function getTableLink({ isActive = true }: { isActive?: boolean } = {}) {
+ return cy
+ .findByTestId("table-link")
+ .should("have.attr", "aria-disabled", String(!isActive));
}
function getDatabaseLink() {
@@ -2767,26 +2311,10 @@ function getContentTable() {
return cy.findByTestId("admin-content-table");
}
-function getNavSidebar() {
- return cy.findByTestId("transform-sidebar");
-}
-
function getTransformFilterWidget() {
return cy.findByRole("group", { name: "Transform" });
}
-function getLastRunDateFilterWidget() {
- return cy.findByRole("group", { name: "Last run at" });
-}
-
-function getLastRunStatusFilterWidget() {
- return cy.findByRole("group", { name: "Last run status" });
-}
-
-function getNextRunDateFilterWidget() {
- return cy.findByRole("group", { name: "Next run at" });
-}
-
function getStatusFilterWidget() {
return cy.findByRole("group", { name: "Status" });
}
@@ -2808,21 +2336,20 @@ function getEndAtFilterWidget() {
}
function visitTransformListPage() {
- return cy.visit("/admin/transforms");
+ return cy.visit("/data-studio/transforms");
}
function visitJobListPage() {
- return cy.visit("/admin/transforms/jobs");
+ return cy.visit("/data-studio/transforms/jobs");
}
function visitRunListPage() {
- return cy.visit("/admin/transforms/runs");
+ return cy.visit("/data-studio/transforms/runs");
}
function runTransformAndWaitForSuccess() {
getRunButton().click();
getRunButton().should("have.text", "Ran successfully");
- return getTableLink().should("have.attr", "href");
}
function runTransformAndWaitForFailure() {
diff --git a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
index d09f4d02203..3336e2cd1ab 100644
--- a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
@@ -190,11 +190,10 @@ describe("scenarios > dependencies > dependency checks", () => {
cy.log("make breaking changes");
cy.get<number>("@transformId").then(H.visitTransform);
- cy.findByTestId("transform-page").findByText("Edit query").click();
H.NativeEditor.clear().type('SELECT name FROM "Schema A"."Animals"');
cy.log("cancel breaking changes");
- cy.findByTestId("transform-query-editor").button("Save changes").click();
+ H.DataStudio.Transforms.saveChangesButton().click();
H.modal().within(() => {
cy.findByText("Question with fields").should("be.visible");
cy.findByText("Question without fields").should("not.exist");
@@ -204,7 +203,7 @@ describe("scenarios > dependencies > dependency checks", () => {
cy.get("@updateTransform.all").should("have.length", 0);
cy.log("confirm breaking changes");
- cy.findByTestId("transform-query-editor").button("Save changes").click();
+ H.DataStudio.Transforms.saveChangesButton().click();
H.modal().within(() => {
cy.findByText("Question with fields").should("be.visible");
cy.findByText("Question without fields").should("not.exist");
@@ -217,11 +216,10 @@ describe("scenarios > dependencies > dependency checks", () => {
it("should not show a confirmation if there are no breaking changes when updating a SQL transform after it was run", () => {
createSqlTransformWithDependentMbqlQuestions();
cy.get<number>("@transformId").then(H.visitTransform);
- cy.findByTestId("transform-page").findByText("Edit query").click();
H.NativeEditor.clear().type(
'SELECT score, name FROM "Schema A"."Animals"',
);
- cy.findByTestId("transform-query-editor").button("Save changes").click();
+ H.DataStudio.Transforms.saveChangesButton().click();
cy.wait("@updateTransform");
});
@@ -230,12 +228,11 @@ describe("scenarios > dependencies > dependency checks", () => {
cy.log("make breaking changes");
cy.get<number>("@transformId").then(H.visitTransform);
- cy.findByTestId("transform-page").findByText("Edit query").click();
H.getNotebookStep("data").findByLabelText("Pick columns").click();
H.popover().findByLabelText("Score").click();
cy.log("cancel breaking changes");
- cy.findByTestId("transform-query-editor").button("Save changes").click();
+ H.DataStudio.Transforms.saveChangesButton().click();
H.modal().within(() => {
cy.findByText("Score transform").should("be.visible");
cy.findByText("Name transform").should("not.exist");
@@ -245,7 +242,7 @@ describe("scenarios > dependencies > dependency checks", () => {
cy.get("@updateTransform.all").should("have.length", 0);
cy.log("confirm breaking changes");
- cy.findByTestId("transform-query-editor").button("Save changes").click();
+ H.DataStudio.Transforms.saveChangesButton().click();
H.modal().within(() => {
cy.findByText("Score transform").should("be.visible");
cy.findByText("Name transform").should("not.exist");
@@ -257,10 +254,9 @@ describe("scenarios > dependencies > dependency checks", () => {
it("should not show a confirmation if there are no breaking changes when updating a MBQL transform before it was run", () => {
createMbqlTransformWithDependentSqlTransforms();
cy.get<number>("@transformId").then(H.visitTransform);
- cy.findByTestId("transform-page").findByText("Edit query").click();
H.getNotebookStep("data").button("Sort").click();
H.popover().findByText("Score").click();
- cy.findByTestId("transform-query-editor").button("Save changes").click();
+ H.DataStudio.Transforms.saveChangesButton().click();
cy.wait("@updateTransform");
});
});
diff --git a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts
index 08f989d0dd5..9709569aa99 100644
--- a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts
@@ -19,7 +19,7 @@ import type {
TransformId,
} from "metabase-types/api";
-const BASE_URL = "/admin/tools/dependencies";
+const BASE_URL = "/data-studio/dependencies";
const TABLE_NAME = "scoreboard_actions";
const TABLE_DISPLAY_NAME = "Scoreboard Actions";
const TABLE_ID_ALIAS = "tableId";
@@ -65,14 +65,14 @@ describe("scenarios > dependencies > dependency graph", () => {
isRecentItem: boolean;
}) {
cy.log(`verify that "${itemName}" can be found via search`);
- graphEntrySearchInput().clear().type(itemName);
+ H.DependencyGraph.entrySearchInput().clear().type(itemName);
H.popover().findByText(itemName).click();
- graphEntryButton().should("have.text", itemName);
- graphEntryButton().icon(itemIcon).should("be.visible");
- graphEntryButton().icon("close").click();
+ H.DependencyGraph.entryButton().should("have.text", itemName);
+ H.DependencyGraph.entryButton().icon(itemIcon).should("be.visible");
+ H.DependencyGraph.entryButton().icon("close").click();
if (isRecentItem) {
- graphEntrySearchInput().click();
+ H.DependencyGraph.entrySearchInput().click();
H.popover().findByText(itemName).should("be.visible");
}
}
@@ -89,17 +89,17 @@ describe("scenarios > dependencies > dependency graph", () => {
itemIcon: IconName;
}) {
cy.log(`verify that "${itemName}" can be selected in the picker`);
- graphEntrySearchInput().click();
+ H.DependencyGraph.entrySearchInput().click();
H.popover().findByText("Browse all").click();
H.entityPickerModal().within(() => {
H.entityPickerModalTab(tabName).click();
H.entityPickerModalItem(itemLevel, itemName).click();
});
- graphEntryButton().should("have.text", itemName);
- graphEntryButton().icon(itemIcon).should("be.visible");
+ H.DependencyGraph.entryButton().should("have.text", itemName);
+ H.DependencyGraph.entryButton().icon(itemIcon).should("be.visible");
cy.log(`verify that "${itemName}" is selected when the picker is opened`);
- graphEntryButton().click();
+ H.DependencyGraph.entryButton().click();
H.entityPickerModal().within(() => {
H.entityPickerModalItem(itemLevel, itemName).should(
"have.attr",
@@ -108,10 +108,10 @@ describe("scenarios > dependencies > dependency graph", () => {
);
cy.findByLabelText("Close").click();
});
- graphEntryButton().icon("close").click();
+ H.DependencyGraph.entryButton().icon("close").click();
cy.log(`verify that "${itemName}" can be found via search"`);
- graphEntrySearchInput().click();
+ H.DependencyGraph.entrySearchInput().click();
H.popover().findByText("Browse all").click();
H.entityPickerModal().within(() => {
H.entityPickerModalTab(tabName).click();
@@ -119,9 +119,9 @@ describe("scenarios > dependencies > dependency graph", () => {
cy.findByText(/result for/).should("exist");
cy.findByText(itemName).click();
});
- graphEntryButton().should("have.text", itemName);
- graphEntryButton().icon(itemIcon).should("be.visible");
- graphEntryButton().icon("close").click();
+ H.DependencyGraph.entryButton().should("have.text", itemName);
+ H.DependencyGraph.entryButton().icon(itemIcon).should("be.visible");
+ H.DependencyGraph.entryButton().icon("close").click();
}
it("should be able to use inline search for all supported entity types", () => {
@@ -153,7 +153,7 @@ describe("scenarios > dependencies > dependency graph", () => {
});
testEntitySearch({
itemName: TABLE_BASED_TRANSFORM_NAME,
- itemIcon: "refresh_downstream",
+ itemIcon: "transform",
isRecentItem: false,
});
});
@@ -168,7 +168,7 @@ describe("scenarios > dependencies > dependency graph", () => {
testEntityPicker({
tabName: "Tables",
itemName: "Products",
- itemLevel: 2,
+ itemLevel: 3,
itemIcon: "table",
});
testEntityPicker({
@@ -193,7 +193,7 @@ describe("scenarios > dependencies > dependency graph", () => {
tabName: "Transforms",
itemName: TABLE_BASED_TRANSFORM_NAME,
itemLevel: 0,
- itemIcon: "refresh_downstream",
+ itemIcon: "transform",
});
});
});
@@ -206,9 +206,9 @@ describe("scenarios > dependencies > dependency graph", () => {
});
});
- graphSelectionButton().click();
+ H.DependencyGraph.selectionButton().click();
H.popover().findByText(TABLE_DISPLAY_NAME).click();
- dependencyGraph().within(() => {
+ H.DependencyGraph.graph().within(() => {
cy.findByLabelText(TABLE_DISPLAY_NAME).should("be.visible");
cy.findByLabelText(TABLE_BASED_QUESTION_NAME).should("be.visible");
});
@@ -225,17 +225,21 @@ describe("scenarios > dependencies > dependency graph", () => {
groupTitle: string;
dependentItemTitle: string;
}) {
- dependencyGraph()
+ H.DependencyGraph.graph()
.findByLabelText(itemTitle)
.findByText(groupTitle)
.click();
- graphDependencyPanel()
+ H.DependencyGraph.dependencyPanel()
.findByLabelText(dependentItemTitle)
.findByText(dependentItemTitle)
.click();
- graphEntryButton().findByText(dependentItemTitle).should("be.visible");
+ H.DependencyGraph.entryButton()
+ .findByText(dependentItemTitle)
+ .should("be.visible");
cy.go("back");
- graphEntryButton().findByText(itemTitle).should("be.visible");
+ H.DependencyGraph.entryButton()
+ .findByText(itemTitle)
+ .should("be.visible");
}
it("should display dependencies for a table and navigate to them", () => {
@@ -443,16 +447,16 @@ describe("scenarios > dependencies > dependency graph", () => {
visibleItems: string[];
hiddenItems: string[];
}) {
- graphDependencyPanel().icon("filter").click();
+ H.DependencyGraph.dependencyPanel().icon("filter").click();
H.popover().findByText(filterName).click();
- graphDependencyPanel().within(() => {
+ H.DependencyGraph.dependencyPanel().within(() => {
visibleItems.forEach((item) =>
cy.findByText(item).should("be.visible"),
);
hiddenItems.forEach((item) => cy.findByText(item).should("not.exist"));
});
H.popover().findByText(filterName).click();
- graphDependencyPanel().icon("filter").click();
+ H.DependencyGraph.dependencyPanel().icon("filter").click();
}
it("should be able to filter questions", () => {
@@ -490,7 +494,7 @@ describe("scenarios > dependencies > dependency graph", () => {
});
visitGraphForEntity(tableId, "table");
});
- dependencyGraph()
+ H.DependencyGraph.graph()
.findByLabelText(TABLE_DISPLAY_NAME)
.findByText("6 questions")
.click();
@@ -534,26 +538,6 @@ function visitGraphForEntity(id: DependencyId, type: DependencyType) {
return cy.visit(BASE_URL, { qs: { id, type } });
}
-function dependencyGraph() {
- return cy.findByTestId("dependency-graph");
-}
-
-function graphEntryButton() {
- return cy.findByTestId("graph-entry-button");
-}
-
-function graphEntrySearchInput() {
- return cy.findByTestId("graph-entry-search-input");
-}
-
-function graphSelectionButton() {
- return cy.findByTestId("graph-selection-button");
-}
-
-function graphDependencyPanel() {
- return cy.findByTestId("graph-dependency-panel");
-}
-
function getScoreboardTableId() {
return cy.get<number>(`@${TABLE_ID_ALIAS}`);
}
diff --git a/e2e/test/scenarios/documents/documents.cy.spec.ts b/e2e/test/scenarios/documents/documents.cy.spec.ts
index e1990c7711d..e88c006e2ef 100644
--- a/e2e/test/scenarios/documents/documents.cy.spec.ts
+++ b/e2e/test/scenarios/documents/documents.cy.spec.ts
@@ -101,7 +101,7 @@ describe("documents", () => {
});
H.navigationSidebar()
- .findByRole("tab", { name: "Bookmarks" })
+ .findByRole("section", { name: "Bookmarks" })
.findByText("Test Document")
.click();
@@ -927,9 +927,9 @@ describe("documents", () => {
H.commandSuggestionItem(/New Question/).click();
cy.log("Create a simple query in the notebook editor");
- cy.findByTestId("entity-picker-modal").within(() => {
- H.entityPickerModalTab("Tables").click();
- H.entityPickerModalItem(2, "Orders").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("Orders").click();
});
cy.log("Save and use the new question");
@@ -1099,10 +1099,10 @@ describe("documents", () => {
H.commandSuggestionItem(/New Question/).click();
cy.log("Create a time series query with Orders table");
- cy.findByRole("dialog", { name: "Pick your starting data" }).should(
- "be.visible",
- );
- H.entityPickerModalItem(2, "Orders").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("Orders").click();
+ });
H.addSummaryField({ metric: "Sum of ...", field: "Total" });
H.addSummaryGroupingField({ field: "Created At" });
@@ -1217,7 +1217,7 @@ describe("documents", () => {
H.commandSuggestionItem(/New SQL query/).should("not.exist");
cy.log("Verify notebook modal opens automatically");
- cy.findByRole("dialog", { name: "Pick your starting data" }).should(
+ cy.findByRole("dialog", { name: "Create new question" }).should(
"be.visible",
);
});
diff --git a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
index 3806e8351d5..de1535301dc 100644
--- a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
+++ b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
@@ -37,7 +37,7 @@ describe("scenarios - embedding hub", () => {
"be.visible",
);
// Click on the first available table
- cy.get("[data-testid='picker-item']").first().click();
+ H.entityPickerModalItem(3, "Accounts").click();
});
cy.log("Should navigate to auto dashboard creation");
diff --git a/e2e/test/scenarios/filters-reproductions/filters-reproductions.cy.spec.js b/e2e/test/scenarios/filters-reproductions/filters-reproductions.cy.spec.js
index 2a2b93b05e8..9056df20e68 100644
--- a/e2e/test/scenarios/filters-reproductions/filters-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/filters-reproductions/filters-reproductions.cy.spec.js
@@ -153,8 +153,7 @@ describe("issue 20683", { tags: "@external" }, () => {
it("should filter postgres with the 'current quarter' filter (metabase#20683)", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("Orders").click();
});
@@ -710,9 +709,8 @@ describe("issue 29094", () => {
it("disallows adding a filter using non-boolean custom expression (metabase#29094)", () => {
H.startNewQuestion();
-
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -997,8 +995,7 @@ describe("issue 45252", { tags: "@external" }, () => {
H.startNewQuestion();
cy.log("filter picker - new filter");
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("Writable Postgres12").click();
cy.findByText("Many Data Types").click();
});
diff --git a/e2e/test/scenarios/joins/joins-custom-expressions.cy.spec.ts b/e2e/test/scenarios/joins/joins-custom-expressions.cy.spec.ts
index 131cb3a7513..1db2ce1d07d 100644
--- a/e2e/test/scenarios/joins/joins-custom-expressions.cy.spec.ts
+++ b/e2e/test/scenarios/joins/joins-custom-expressions.cy.spec.ts
@@ -115,8 +115,8 @@ describe("scenarios > joins > custom expressions", () => {
H.openOrdersTable({ mode: "notebook" });
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Reviews").click();
});
H.popover().within(() => {
@@ -151,8 +151,8 @@ describe("scenarios > joins > custom expressions", () => {
H.openNotebook();
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Orders Model").click();
});
H.popover().within(() => {
@@ -181,8 +181,8 @@ describe("scenarios > joins > custom expressions", () => {
H.openOrdersTable({ mode: "notebook" });
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Reviews").click();
});
H.popover().within(() => {
diff --git a/e2e/test/scenarios/joins/joins-reproductions.cy.spec.js b/e2e/test/scenarios/joins/joins-reproductions.cy.spec.js
index 01e93f5d434..77a01bba532 100644
--- a/e2e/test/scenarios/joins/joins-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/joins/joins-reproductions.cy.spec.js
@@ -181,15 +181,14 @@ describe("issue 15342", { tags: "@external" }, () => {
it("should correctly order joins for MySQL queries (metabase#15342)", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText(MYSQL_DB_NAME).click();
cy.findByText("People").click();
});
cy.icon("join_left_outer").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText(MYSQL_DB_NAME).click();
cy.findByText("Orders").click();
});
H.getNotebookStep("join").findByLabelText("Right column").click();
@@ -197,8 +196,8 @@ describe("issue 15342", { tags: "@external" }, () => {
// eslint-disable-next-line no-unsafe-element-filtering
cy.icon("join_left_outer").last().click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText(MYSQL_DB_NAME).click();
cy.findByText("Products").click();
});
H.getNotebookStep("join").icon("join_left_outer").click();
@@ -239,8 +238,8 @@ describe("issue 15578", () => {
H.openProductsTable({ mode: "notebook" });
cy.button("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(JOINED_QUESTION_NAME).click();
});
@@ -271,8 +270,8 @@ describe("issue 17710", () => {
H.openOrdersTable({ mode: "notebook" });
cy.button("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
@@ -321,8 +320,8 @@ describe("issue 17767", () => {
cy.findByText("Join data").click();
// Join "Previous results" with
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Reviews").click();
});
@@ -354,8 +353,8 @@ describe("issue 17968", () => {
// eslint-disable-next-line no-unsafe-element-filtering
cy.findAllByTestId("action-buttons").last().button("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
H.popover().findByText("Count").click();
@@ -481,8 +480,8 @@ describe("issue 18512", () => {
describe("issue 18589", () => {
function joinTable(table) {
cy.findByText("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText(table).click();
});
}
@@ -757,8 +756,8 @@ describe("issue 22859 - multiple levels of nesting", () => {
it("third level of nesting with joins should result in proper column aliasing (metabase#22859-2)", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("22859-Q2").click();
});
@@ -976,8 +975,8 @@ describe("issue 29795", () => {
cy.icon("join_left_outer").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(NATIVE_QUESTION).click();
});
@@ -1123,8 +1122,8 @@ describe("issue 39448", () => {
it("should load joined table metadata for suggested join conditions (metabase#39448)", () => {
H.openOrdersTable({ mode: "notebook" });
cy.findByTestId("action-buttons").button("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
H.getNotebookStep("join").within(() => {
@@ -1159,8 +1158,8 @@ describe("issue 27521", () => {
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -1186,8 +1185,8 @@ describe("issue 27521", () => {
cy.log("Create second question (Products + Q1)");
H.newButton("Question").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("People").click();
});
@@ -1196,8 +1195,8 @@ describe("issue 27521", () => {
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Q1").click();
});
@@ -1249,21 +1248,22 @@ describe("issue 42385", { tags: "@external" }, () => {
it("should remove invalid draft join clause when query database changes (metabase#42385)", () => {
H.openOrdersTable({ mode: "notebook" });
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Reviews").click();
});
H.getNotebookStep("data").findByTestId("data-step-cell").click();
- H.entityPickerModal().within(() => {
+ H.miniPickerHeader().click();
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("Reviews").click();
});
H.getNotebookStep("join").within(() => {
- cy.findByLabelText("Right table")
- .findByText("Pick data…")
- .should("be.visible");
+ cy.findByPlaceholderText("Search for tables and more...").should(
+ "be.visible",
+ );
cy.findByLabelText("Left column").should("not.exist");
cy.findByLabelText("Right column").should("not.exist");
});
@@ -1272,8 +1272,8 @@ describe("issue 42385", { tags: "@external" }, () => {
it("should remove invalid join clause in incomplete draft state when query database changes (metabase#42385)", () => {
H.openOrdersTable({ mode: "notebook" });
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
@@ -1282,10 +1282,11 @@ describe("issue 42385", { tags: "@external" }, () => {
.findByText("Products")
.click();
- H.entityPickerModal().findByText("Reviews").click();
+ H.miniPicker().findByText("Reviews").click();
H.getNotebookStep("data").findByTestId("data-step-cell").click();
- H.entityPickerModal().within(() => {
+ H.miniPickerHeader().click();
+ H.miniPicker().within(() => {
cy.findByText("QA Postgres12").click();
cy.findByText("Reviews").click();
});
@@ -1363,8 +1364,8 @@ describe("issue 46675", () => {
H.createQuestion(questionDetails, { visitQuestion: true });
H.openNotebook();
H.getNotebookStep("data").findByLabelText("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Reviews").click();
});
H.popover().findByText("ID").click();
@@ -1373,23 +1374,22 @@ describe("issue 46675", () => {
it("should reset the draft join state when the source table changes (metabase#46675)", () => {
cy.log("change the source table and verify that the state was reset");
H.getNotebookStep("data").findByText("Orders").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("Products").click();
});
H.getNotebookStep("join").within(() => {
cy.findByLabelText("Left table").should("have.text", "Products");
- cy.findByLabelText("Right table").should("have.text", "Pick data…");
- cy.findByLabelText("Left column").should("not.exist");
+ cy.findByPlaceholderText("Search for tables and more...").should(
+ "be.visible",
+ );
});
cy.log("complete the join and make sure the query can be executed");
H.getNotebookStep("join")
- .findByLabelText("Right table")
- .findByText("Pick data…")
+ .findByPlaceholderText("Search for tables and more...")
.click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.visualize();
@@ -1402,8 +1402,7 @@ describe("issue 46675", () => {
.findByLabelText("Right table")
.findByText("Reviews")
.click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("Orders").click();
});
H.getNotebookStep("join").within(() => {
diff --git a/e2e/test/scenarios/joins/joins.cy.spec.js b/e2e/test/scenarios/joins/joins.cy.spec.js
index 61b01d7b55f..0238a857c54 100644
--- a/e2e/test/scenarios/joins/joins.cy.spec.js
+++ b/e2e/test/scenarios/joins/joins.cy.spec.js
@@ -341,7 +341,7 @@ describe("scenarios > question > joined questions", () => {
);
H.getNotebookStep("data").findByTestId("data-step-cell").click();
- H.entityPickerModal().findByText("People").click();
+ H.miniPicker().findByText("People").click();
H.getNotebookStep("join").should("not.exist");
diff --git a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
index 8a340b598c7..561dbcc7e1b 100644
--- a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
+++ b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
@@ -7,7 +7,7 @@ const { H } = cy;
const SOURCE_TABLE = "Animals";
// Helper functions for metabot transform interactions
-const visitTransformListPage = () => cy.visit("/admin/transforms");
+const visitTransformListPage = () => cy.visit("/data-studio/transforms");
const suggestions = () => cy.findAllByTestId("metabot-chat-suggestion");
// eslint-disable-next-line no-unsafe-element-filtering
@@ -49,8 +49,12 @@ const assertSuggestionInSidebar = (values: {
const assertEditorDiffState = (opts: { exists: boolean }) => {
const should = opts.exists ? "exist" : "not.exist";
- cy.findByRole("button", { name: /apply|create/i }).should(should);
- cy.findByRole("button", { name: /reject/i }).should(should);
+ H.DataStudio.Transforms.content()
+ .findByRole("button", { name: /apply|create/i })
+ .should(should);
+ H.DataStudio.Transforms.content()
+ .findByRole("button", { name: /reject/i })
+ .should(should);
};
const assertAcceptRejectUI = (opts: { visible: boolean }) => {
@@ -59,391 +63,397 @@ const assertAcceptRejectUI = (opts: { visible: boolean }) => {
rejectSuggestionBtn().should(should);
};
-describe("scenarios > metabot > transforms codegen", () => {
- beforeEach(() => {
- H.restore("postgres-writable");
- H.resetTestTable({ type: "postgres", table: "many_schemas" });
- H.resetSnowplow();
- cy.signInAsAdmin();
- H.activateToken("bleeding-edge");
- H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
-
- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as("agentReq");
- cy.intercept("POST", "/api/ee/transform").as("createTransform");
- cy.intercept("PUT", "/api/ee/transform/*").as("updateTransform");
- });
-
- describe("Native SQL transform tests", () => {
- describe("create new transform", () => {
- it("should create SQL transform via metabot", () => {
- visitTransformListPage();
- H.openMetabotViaSearchButton(true);
-
- cy.log("Ask metabot for a new transform");
- H.mockMetabotResponse({
- body: createMockTransformSuggestionResponse(
- "I'll create a new transform that gets the number 1 for you.",
- createMockNativeTransformJSON(null, WRITABLE_DB_ID, "SELECT 1"),
- ),
- });
- H.sendMetabotMessage(
- "Create a new native SQL transform that gives me the number 1",
- );
- assertSuggestionInSidebar({ newSourcePartial: "SELECT 1" });
-
- cy.log("Should be able to visit and the see new transform");
- viewLastSuggestion();
- cy.url().should("include", "/admin/transforms/new/native");
- assertEditorDiffState({ exists: false }); // nothing to diff, so we shouldn't show the UI for it
- assertEditorContent("native", "SELECT 1");
-
- // User should ask metabot for a change
- cy.log("Ask metabot for an edit");
- H.mockMetabotResponse({
- body: createMockTransformSuggestionResponse(
- "Let me make that update for you.",
- createMockNativeTransformJSON(null, WRITABLE_DB_ID, "SELECT 2"),
- ),
- });
- H.sendMetabotMessage("Make this give me the number 2 instead");
- assertSuggestionInSidebar({
- oldSourcePartial: "SELECT 1",
- newSourcePartial: "SELECT 2",
- });
- assertAcceptRejectUI({ visible: true });
-
- // User can accept a change (editor should have new value)
- cy.log("Should be able to select an edit");
- acceptSuggestion();
- assertEditorContent("native", "SELECT 2");
- assertAcceptRejectUI({ visible: false });
-
- // User should make changes to the source
- cy.log("Should diff with user edits");
- makeManualEdit("native", "SELECT 3");
- H.mockMetabotResponse({
- body: createMockTransformSuggestionResponse(
- "Let me make that change for you.",
- createMockNativeTransformJSON(null, WRITABLE_DB_ID, "SELECT 4"),
- ),
- });
- H.sendMetabotMessage("Make this give me the number 4 instead");
- assertSuggestionInSidebar({
- oldSourcePartial: "SELECT 3",
- newSourcePartial: "SELECT 4",
- });
- assertAcceptRejectUI({ visible: true });
+describe(
+ "scenarios > metabot > transforms codegen",
+ { viewportWidth: 1600, viewportHeight: 1200 },
+ () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.resetTestTable({ type: "postgres", table: "many_schemas" });
+ H.resetSnowplow();
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });
+
+ cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as("agentReq");
+ cy.intercept("POST", "/api/ee/transform").as("createTransform");
+ cy.intercept("PUT", "/api/ee/transform/*").as("updateTransform");
+ });
- cy.log("Should be able to reject an edit");
- rejectSuggestion();
- assertEditorContent("native", "SELECT 3");
- assertAcceptRejectUI({ visible: false });
- });
+ describe("Native SQL transform tests", () => {
+ describe("create new transform", () => {
+ it("should create SQL transform via metabot", () => {
+ visitTransformListPage();
+ H.openMetabotViaSearchButton(true);
- it("should create Python transform via metabot", () => {
- visitTransformListPage();
- H.openMetabotViaSearchButton(true);
-
- cy.log("Ask metabot for a new transform");
- H.mockMetabotResponse({
- body: createMockTransformSuggestionResponse(
- "I'll create a new transform that gets the number 1 for you.",
- createMockPythonTransformJSON(
- null,
- WRITABLE_DB_ID,
- { metabase_table_df: 152 },
- "import pandas as pd\\n\\ndef transform(metabase_table_df):\\n return pd.DataFrame({'value': [1]})",
+ cy.log("Ask metabot for a new transform");
+ H.mockMetabotResponse({
+ body: createMockTransformSuggestionResponse(
+ "I'll create a new transform that gets the number 1 for you.",
+ createMockNativeTransformJSON(null, WRITABLE_DB_ID, "SELECT 1"),
),
- ),
- });
- H.sendMetabotMessage(
- "Create a new native python transform that gives me the number 1",
- );
- assertSuggestionInSidebar({
- newSourcePartial: "pd.DataFrame({'value': [1]})",
- });
+ });
+ H.sendMetabotMessage(
+ "Create a new native SQL transform that gives me the number 1",
+ );
+ assertSuggestionInSidebar({ newSourcePartial: "SELECT 1" });
- cy.log("Should be able to visit and the see new transform");
- viewLastSuggestion();
- cy.url().should("include", "/admin/transforms/new/python");
- assertEditorDiffState({ exists: false }); // nothing to diff, so we shouldn't show the UI for it
- assertEditorContent("python", "pd.DataFrame({'value': [1]})");
-
- // User should ask metabot for a change
- cy.log("Ask metabot for an edit");
- H.mockMetabotResponse({
- body: createMockTransformSuggestionResponse(
- "Let me make that update for you.",
- createMockPythonTransformJSON(
- null,
- WRITABLE_DB_ID,
- { metabase_table_df: 152 },
- "import pandas as pd\\n\\ndef transform(metabase_table_df):\\n return pd.DataFrame({'value': [2]})",
- ),
- ),
- });
- H.sendMetabotMessage("Make this give me the number 2 instead");
- assertSuggestionInSidebar({
- oldSourcePartial: "pd.DataFrame({'value': [1]})",
- newSourcePartial: "pd.DataFrame({'value': [2]})",
- });
- assertAcceptRejectUI({ visible: true });
-
- // User can accept a change (editor should have new value)
- cy.log("Should be able to select an edit");
- acceptSuggestion();
- assertEditorContent("python", "pd.DataFrame({'value': [2]})");
- assertAcceptRejectUI({ visible: false });
-
- // User should make changes to the source
- cy.log("Should diff with user edits");
- makeManualEdit(
- "python",
- dedent`
- import pandas as pd
+ cy.log("Should be able to visit and the see new transform");
+ viewLastSuggestion();
+ cy.url().should("include", "/data-studio/transforms/new/native");
+ assertEditorDiffState({ exists: false }); // nothing to diff, so we shouldn't show the UI for it
+ assertEditorContent("native", "SELECT 1");
- def transform(metabase_table_df):
- return pd.DataFrame({'value': [3]})`,
- );
- H.mockMetabotResponse({
- body: createMockTransformSuggestionResponse(
- "Let me make that change for you.",
- createMockPythonTransformJSON(
- null,
- WRITABLE_DB_ID,
- { metabase_table_df: 152 },
- "import pandas as pd\\n\\ndef transform(metabase_table_df):\\n return pd.DataFrame({'value': [4]})",
+ // User should ask metabot for a change
+ cy.log("Ask metabot for an edit");
+ H.mockMetabotResponse({
+ body: createMockTransformSuggestionResponse(
+ "Let me make that update for you.",
+ createMockNativeTransformJSON(null, WRITABLE_DB_ID, "SELECT 2"),
),
- ),
- });
- H.sendMetabotMessage("Make this give me the number 4 instead");
- assertSuggestionInSidebar({
- oldSourcePartial: "pd.DataFrame({'value': [3]})",
- newSourcePartial: "pd.DataFrame({'value': [4]})",
- });
- assertAcceptRejectUI({ visible: true });
+ });
+ H.sendMetabotMessage("Make this give me the number 2 instead");
+ assertSuggestionInSidebar({
+ oldSourcePartial: "SELECT 1",
+ newSourcePartial: "SELECT 2",
+ });
+ assertAcceptRejectUI({ visible: true });
- cy.log("Should be able to reject an edit");
- rejectSuggestion();
- assertEditorContent("python", "pd.DataFrame({'value': [3]})");
- assertAcceptRejectUI({ visible: false });
- });
+ // User can accept a change (editor should have new value)
+ cy.log("Should be able to select an edit");
+ acceptSuggestion();
+ assertEditorContent("native", "SELECT 2");
+ assertAcceptRejectUI({ visible: false });
- it("should create SQL transform with model reference via metabot and run successfully", () => {
- // Create a model first
- H.getTableId({ name: SOURCE_TABLE, databaseId: WRITABLE_DB_ID }).as(
- "tableId",
- );
-
- cy.get("@tableId").then((tableId) => {
- H.createQuestion({
- name: "Test Model",
- type: "model",
- query: {
- "source-table": tableId,
- limit: 5,
- },
- }).as("model");
+ // User should make changes to the source
+ cy.log("Should diff with user edits");
+ makeManualEdit("native", "SELECT 3");
+ H.mockMetabotResponse({
+ body: createMockTransformSuggestionResponse(
+ "Let me make that change for you.",
+ createMockNativeTransformJSON(null, WRITABLE_DB_ID, "SELECT 4"),
+ ),
+ });
+ H.sendMetabotMessage("Make this give me the number 4 instead");
+ assertSuggestionInSidebar({
+ oldSourcePartial: "SELECT 3",
+ newSourcePartial: "SELECT 4",
+ });
+ assertAcceptRejectUI({ visible: true });
+
+ cy.log("Should be able to reject an edit");
+ rejectSuggestion();
+ assertEditorContent("native", "SELECT 3");
+ assertAcceptRejectUI({ visible: false });
});
- cy.get("@model").then(({ body: model }) => {
+ it("should create Python transform via metabot", () => {
visitTransformListPage();
H.openMetabotViaSearchButton(true);
- cy.log("Ask metabot for a new transform that references the model");
- const modelTagName = `#${model.id}-test-model`;
- const queryWithModelRef = `SELECT * FROM {{${modelTagName}}}`;
-
+ cy.log("Ask metabot for a new transform");
H.mockMetabotResponse({
body: createMockTransformSuggestionResponse(
- "I'll create a transform that queries your model.",
- createMockNativeTransformJSON(
+ "I'll create a new transform that gets the number 1 for you.",
+ createMockPythonTransformJSON(
null,
WRITABLE_DB_ID,
- queryWithModelRef,
+ { metabase_table_df: 152 },
+ "import pandas as pd\\n\\ndef transform(metabase_table_df):\\n return pd.DataFrame({'value': [1]})",
),
),
});
H.sendMetabotMessage(
- "Create a transform that queries the Test Model",
+ "Create a new native python transform that gives me the number 1",
);
- assertSuggestionInSidebar({ newSourcePartial: "SELECT * FROM" });
+ assertSuggestionInSidebar({
+ newSourcePartial: "pd.DataFrame({'value': [1]})",
+ });
- cy.log("Should be able to visit the new transform");
+ cy.log("Should be able to visit and the see new transform");
viewLastSuggestion();
- cy.url().should("include", "/admin/transforms/new/native");
- assertEditorContent("native", "SELECT * FROM");
+ cy.url().should("include", "/data-studio/transforms/new/python");
+ assertEditorDiffState({ exists: false }); // nothing to diff, so we shouldn't show the UI for it
+ assertEditorContent("python", "pd.DataFrame({'value': [1]})");
- cy.log(
- "Should be able to run the transform successfully (verifies template tags were parsed)",
- );
- cy.findByTestId("native-query-editor-container").icon("play").click();
- cy.findByTestId("query-visualization-root").should("be.visible");
- });
- });
- });
-
- describe("update existing transform", () => {
- it("should update existing SQL transform via metabot", () => {
- H.createSqlTransform({
- sourceQuery: "SELECT 1",
- targetTable: "table_a",
- targetSchema: "Schema A",
- }).as("transformId");
-
- visitTransformListPage();
- H.openMetabotViaSearchButton(true);
-
- // Ask metabot for a change to existing transform
- cy.get("@transformId").then((transformId) => {
+ // User should ask metabot for a change
+ cy.log("Ask metabot for an edit");
H.mockMetabotResponse({
body: createMockTransformSuggestionResponse(
"Let me make that update for you.",
- createMockNativeTransformJSON(
- Number(transformId),
+ createMockPythonTransformJSON(
+ null,
WRITABLE_DB_ID,
- "SELECT 2",
+ { metabase_table_df: 152 },
+ "import pandas as pd\\n\\ndef transform(metabase_table_df):\\n return pd.DataFrame({'value': [2]})",
),
),
});
- });
- H.sendMetabotMessage(
- "Update my SQL transform to select 2 instead of 1.",
- );
- assertSuggestionInSidebar({
- oldSourcePartial: "SELECT 1",
- newSourcePartial: "SELECT 2",
- });
-
- cy.log("Should be able to visit and the see the updated transform");
- viewLastSuggestion();
- assertAcceptRejectUI({ visible: true });
-
- // User can accept a change (editor should have new value)
- cy.log("Should be able to select an edit");
- acceptSuggestion();
- assertEditorContent("native", "SELECT 2");
- assertAcceptRejectUI({ visible: false });
+ H.sendMetabotMessage("Make this give me the number 2 instead");
+ assertSuggestionInSidebar({
+ oldSourcePartial: "pd.DataFrame({'value': [1]})",
+ newSourcePartial: "pd.DataFrame({'value': [2]})",
+ });
+ assertAcceptRejectUI({ visible: true });
+
+ // User can accept a change (editor should have new value)
+ cy.log("Should be able to select an edit");
+ acceptSuggestion();
+ assertEditorContent("python", "pd.DataFrame({'value': [2]})");
+ assertAcceptRejectUI({ visible: false });
+
+ // User should make changes to the source
+ cy.log("Should diff with user edits");
+ makeManualEdit(
+ "python",
+ dedent`
+ import pandas as pd
- // User should make changes to the source
- cy.log("Should diff with user edits");
- makeManualEdit("native", "SELECT 3");
- cy.get("@transformId").then((transformId) => {
+ def transform(metabase_table_df):
+ return pd.DataFrame({'value': [3]})`,
+ );
H.mockMetabotResponse({
body: createMockTransformSuggestionResponse(
"Let me make that change for you.",
- createMockNativeTransformJSON(
- Number(transformId),
+ createMockPythonTransformJSON(
+ null,
WRITABLE_DB_ID,
- "SELECT 4",
+ { metabase_table_df: 152 },
+ "import pandas as pd\\n\\ndef transform(metabase_table_df):\\n return pd.DataFrame({'value': [4]})",
),
),
});
+ H.sendMetabotMessage("Make this give me the number 4 instead");
+ assertSuggestionInSidebar({
+ oldSourcePartial: "pd.DataFrame({'value': [3]})",
+ newSourcePartial: "pd.DataFrame({'value': [4]})",
+ });
+ assertAcceptRejectUI({ visible: true });
+
+ cy.log("Should be able to reject an edit");
+ rejectSuggestion();
+ assertEditorContent("python", "pd.DataFrame({'value': [3]})");
+ assertAcceptRejectUI({ visible: false });
});
- H.sendMetabotMessage("Make this give me the number 4 instead");
- assertSuggestionInSidebar({
- oldSourcePartial: "SELECT 3",
- newSourcePartial: "SELECT 4",
- });
- assertAcceptRejectUI({ visible: true });
- cy.log("Should be able to reject an edit");
- rejectSuggestion();
- assertEditorContent("native", "SELECT 3");
- assertAcceptRejectUI({ visible: false });
+ it("should create SQL transform with model reference via metabot and run successfully", () => {
+ // Create a model first
+ H.getTableId({ name: SOURCE_TABLE, databaseId: WRITABLE_DB_ID }).as(
+ "tableId",
+ );
+
+ cy.get("@tableId").then((tableId) => {
+ H.createQuestion({
+ name: "Test Model",
+ type: "model",
+ query: {
+ "source-table": tableId,
+ limit: 5,
+ },
+ }).as("model");
+ });
+
+ cy.get("@model").then(({ body: model }) => {
+ visitTransformListPage();
+ H.openMetabotViaSearchButton(true);
+
+ cy.log("Ask metabot for a new transform that references the model");
+ const modelTagName = `#${model.id}-test-model`;
+ const queryWithModelRef = `SELECT * FROM {{${modelTagName}}}`;
+
+ H.mockMetabotResponse({
+ body: createMockTransformSuggestionResponse(
+ "I'll create a transform that queries your model.",
+ createMockNativeTransformJSON(
+ null,
+ WRITABLE_DB_ID,
+ queryWithModelRef,
+ ),
+ ),
+ });
+ H.sendMetabotMessage(
+ "Create a transform that queries the Test Model",
+ );
+ assertSuggestionInSidebar({ newSourcePartial: "SELECT * FROM" });
+
+ cy.log("Should be able to visit the new transform");
+ viewLastSuggestion();
+ cy.url().should("include", "/data-studio/transforms/new/native");
+ assertEditorContent("native", "SELECT * FROM");
+
+ cy.log(
+ "Should be able to run the transform successfully (verifies template tags were parsed)",
+ );
+ cy.findByTestId("native-query-editor-container")
+ .icon("play")
+ .click();
+ cy.findByTestId("query-visualization-root").should("be.visible");
+ });
+ });
});
- it("should update existing Python transform via metabot", () => {
- H.getTableId({ name: SOURCE_TABLE, databaseId: WRITABLE_DB_ID }).then(
- (tableId) => {
- H.createPythonTransform({
- targetTable: "transform_table",
- targetSchema: "Schema A",
- body: dedent`
+ describe("update existing transform", () => {
+ it("should update existing SQL transform via metabot", () => {
+ H.createSqlTransform({
+ sourceQuery: "SELECT 1",
+ targetTable: "table_a",
+ targetSchema: "Schema A",
+ }).as("transformId");
+
+ visitTransformListPage();
+ H.openMetabotViaSearchButton(true);
+
+ // Ask metabot for a change to existing transform
+ cy.get("@transformId").then((transformId) => {
+ H.mockMetabotResponse({
+ body: createMockTransformSuggestionResponse(
+ "Let me make that update for you.",
+ createMockNativeTransformJSON(
+ Number(transformId),
+ WRITABLE_DB_ID,
+ "SELECT 2",
+ ),
+ ),
+ });
+ });
+ H.sendMetabotMessage(
+ "Update my SQL transform to select 2 instead of 1.",
+ );
+ assertSuggestionInSidebar({
+ oldSourcePartial: "SELECT 1",
+ newSourcePartial: "SELECT 2",
+ });
+
+ cy.log("Should be able to visit and the see the updated transform");
+ viewLastSuggestion();
+ assertAcceptRejectUI({ visible: true });
+
+ // User can accept a change (editor should have new value)
+ cy.log("Should be able to select an edit");
+ acceptSuggestion();
+ assertEditorContent("native", "SELECT 2");
+ assertAcceptRejectUI({ visible: false });
+
+ // User should make changes to the source
+ cy.log("Should diff with user edits");
+ makeManualEdit("native", "SELECT 3");
+ cy.get("@transformId").then((transformId) => {
+ H.mockMetabotResponse({
+ body: createMockTransformSuggestionResponse(
+ "Let me make that change for you.",
+ createMockNativeTransformJSON(
+ Number(transformId),
+ WRITABLE_DB_ID,
+ "SELECT 4",
+ ),
+ ),
+ });
+ });
+ H.sendMetabotMessage("Make this give me the number 4 instead");
+ assertSuggestionInSidebar({
+ oldSourcePartial: "SELECT 3",
+ newSourcePartial: "SELECT 4",
+ });
+ assertAcceptRejectUI({ visible: true });
+
+ cy.log("Should be able to reject an edit");
+ rejectSuggestion();
+ assertEditorContent("native", "SELECT 3");
+ assertAcceptRejectUI({ visible: false });
+ });
+
+ it("should update existing Python transform via metabot", () => {
+ H.getTableId({ name: SOURCE_TABLE, databaseId: WRITABLE_DB_ID }).then(
+ (tableId) => {
+ H.createPythonTransform({
+ targetTable: "transform_table",
+ targetSchema: "Schema A",
+ body: dedent`
import pandas as pd
def transform(foo):
return pd.DataFrame({'value': [1]})
`,
- sourceTables: { foo: tableId },
- }).then((transformId) => {
- visitTransformListPage();
- H.openMetabotViaSearchButton(true);
+ sourceTables: { foo: tableId },
+ }).then((transformId) => {
+ visitTransformListPage();
+ H.openMetabotViaSearchButton(true);
+
+ // Ask metabot for a change to existing transform
+ cy.get("@transformId").then((transformId) => {
+ H.mockMetabotResponse({
+ body: createMockTransformSuggestionResponse(
+ "Let me make that update for you.",
+ createMockPythonTransformJSON(
+ Number(transformId),
+ WRITABLE_DB_ID,
+ { foo: tableId },
+ "import pandas as pd\\n\\ndef transform(foo):\\n return pd.DataFrame({'value': [2]})",
+ ),
+ ),
+ });
+ });
+ H.sendMetabotMessage(
+ "Update my SQL transform to select 2 instead of 1.",
+ );
+ assertSuggestionInSidebar({
+ oldSourcePartial: "pd.DataFrame({'value': [1]})",
+ newSourcePartial: "pd.DataFrame({'value': [2]})",
+ });
+
+ cy.log(
+ "Should be able to visit and the see the updated transform",
+ );
+ viewLastSuggestion();
+ assertAcceptRejectUI({ visible: true });
+
+ // User can accept a change (editor should have new value)
+ cy.log("Should be able to select an edit");
+ acceptSuggestion();
+ assertEditorContent("python", "pd.DataFrame({'value': [2]})");
+ assertAcceptRejectUI({ visible: false });
+
+ // User should make changes to the source
+ cy.log("Should diff with user edits");
+ makeManualEdit(
+ "python",
+ dedent`
+ import pandas as pd
+
+ def transform(foo):
+ return pd.DataFrame({'value': [3]})`,
+ );
- // Ask metabot for a change to existing transform
- cy.get("@transformId").then((transformId) => {
H.mockMetabotResponse({
body: createMockTransformSuggestionResponse(
- "Let me make that update for you.",
+ "Let me make that change for you.",
createMockPythonTransformJSON(
Number(transformId),
WRITABLE_DB_ID,
- { foo: tableId },
- "import pandas as pd\\n\\ndef transform(foo):\\n return pd.DataFrame({'value': [2]})",
+ { metabase_table_df: 152 },
+ "import pandas as pd\\n\\ndef transform(foo):\\n return pd.DataFrame({'value': [4]})",
),
),
});
- });
- H.sendMetabotMessage(
- "Update my SQL transform to select 2 instead of 1.",
- );
- assertSuggestionInSidebar({
- oldSourcePartial: "pd.DataFrame({'value': [1]})",
- newSourcePartial: "pd.DataFrame({'value': [2]})",
- });
-
- cy.log(
- "Should be able to visit and the see the updated transform",
- );
- viewLastSuggestion();
- assertAcceptRejectUI({ visible: true });
-
- // User can accept a change (editor should have new value)
- cy.log("Should be able to select an edit");
- acceptSuggestion();
- assertEditorContent("python", "pd.DataFrame({'value': [2]})");
- assertAcceptRejectUI({ visible: false });
-
- // User should make changes to the source
- cy.log("Should diff with user edits");
- makeManualEdit(
- "python",
- dedent`
- import pandas as pd
+ H.sendMetabotMessage("Make this give me the number 4 instead");
+ assertSuggestionInSidebar({
+ oldSourcePartial: "pd.DataFrame({'value': [3]})",
+ newSourcePartial: "pd.DataFrame({'value': [4]})",
+ });
+ assertAcceptRejectUI({ visible: true });
- def transform(foo):
- return pd.DataFrame({'value': [3]})`,
- );
-
- H.mockMetabotResponse({
- body: createMockTransformSuggestionResponse(
- "Let me make that change for you.",
- createMockPythonTransformJSON(
- Number(transformId),
- WRITABLE_DB_ID,
- { metabase_table_df: 152 },
- "import pandas as pd\\n\\ndef transform(foo):\\n return pd.DataFrame({'value': [4]})",
- ),
- ),
- });
- H.sendMetabotMessage("Make this give me the number 4 instead");
- assertSuggestionInSidebar({
- oldSourcePartial: "pd.DataFrame({'value': [3]})",
- newSourcePartial: "pd.DataFrame({'value': [4]})",
+ cy.log("Should be able to reject an edit");
+ rejectSuggestion();
+ assertEditorContent("python", "pd.DataFrame({'value': [3]})");
+ assertAcceptRejectUI({ visible: false });
});
- assertAcceptRejectUI({ visible: true });
-
- cy.log("Should be able to reject an edit");
- rejectSuggestion();
- assertEditorContent("python", "pd.DataFrame({'value': [3]})");
- assertAcceptRejectUI({ visible: false });
- });
- },
- );
+ },
+ );
+ });
});
});
- });
-});
+ },
+);
const createMockNativeTransformJSON = (
id: number | null,
diff --git a/e2e/test/scenarios/metrics/browse.cy.spec.ts b/e2e/test/scenarios/metrics/browse.cy.spec.ts
index fe5e309b0f6..02176f6a0e2 100644
--- a/e2e/test/scenarios/metrics/browse.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/browse.cy.spec.ts
@@ -135,7 +135,10 @@ describe("scenarios > browse > metrics", () => {
cy.findByTestId("browse-metrics-header")
.findByLabelText("Create a new metric")
.click();
- cy.findByTestId("entity-picker-modal").findByText("People").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("People").click();
+ });
cy.findByTestId("edit-bar")
.should("contain", "New metric")
.button("Save")
diff --git a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
index d0f653eb39d..e6bef918618 100644
--- a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
+++ b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
@@ -119,8 +119,8 @@ describe("scenarios > metrics > editing", () => {
.findByLabelText("Create a new metric")
.click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
saveMetric({ name: "New metric" });
@@ -137,8 +137,8 @@ describe("scenarios > metrics > editing", () => {
it("should not crash when cancelling creation of a new metric (metabase#48024)", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
cancelMetricEditing();
@@ -159,8 +159,8 @@ describe("scenarios > metrics > editing", () => {
describe("data source", () => {
it("should create a metric based on a table", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
addStringCategoryFilter({
@@ -174,8 +174,8 @@ describe("scenarios > metrics > editing", () => {
it("should create a metric based on a saved question", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Orders").click();
});
addStringCategoryFilter({
@@ -190,8 +190,8 @@ describe("scenarios > metrics > editing", () => {
it("should create a metric based on a multi-stage saved question", () => {
H.createQuestion(ORDERS_MULTI_STAGE_QUESTION);
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(ORDERS_MULTI_STAGE_QUESTION.name).click();
});
addNumberBetweenFilter({
@@ -205,8 +205,8 @@ describe("scenarios > metrics > editing", () => {
it("should create a metric based on a model", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Orders Model").click();
});
addStringCategoryFilter({
@@ -221,8 +221,8 @@ describe("scenarios > metrics > editing", () => {
it("should create a metric based on a multi-stage model", () => {
H.createQuestion({ ...ORDERS_MULTI_STAGE_QUESTION, type: "model" });
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(ORDERS_MULTI_STAGE_QUESTION.name).click();
});
addNumberBetweenFilter({
@@ -236,8 +236,8 @@ describe("scenarios > metrics > editing", () => {
it("should not allow to create a multi-stage metric", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Orders Model").click();
});
getActionButton("Summarize").should("not.exist");
@@ -245,8 +245,8 @@ describe("scenarios > metrics > editing", () => {
it("should allow to run the query from the metric empty state", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
cy.intercept("POST", "/api/dataset").as("dataset");
@@ -259,13 +259,13 @@ describe("scenarios > metrics > editing", () => {
describe("joins", () => {
it("should join a table", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
startNewJoin();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
startNewFilter();
@@ -282,22 +282,31 @@ describe("scenarios > metrics > editing", () => {
it("should not be possible to join a metric", () => {
H.createQuestion(ORDERS_SCALAR_METRIC);
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
startNewJoin();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("Orders").should("be.visible");
+ cy.findByText(ORDERS_SCALAR_METRIC.name).should("not.exist");
+ cy.findByText("Our analytics").click(); // go back
+ });
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").should("be.visible");
- H.entityPickerModalTab("Metrics").should("not.exist");
+ H.entityPickerModalTab("Data").click();
+ cy.findByText("Orders").should("be.visible");
+ // FIXME: metabase#66210
+ // cy.findByText(ORDERS_SCALAR_METRIC.name).should("not.exist");
});
});
it("should be possible to join data on the first stage of a metric-based query", () => {
H.createQuestion(ORDERS_SCALAR_METRIC);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(ORDERS_SCALAR_METRIC.name).click();
});
H.getNotebookStep("data").within(() => {
@@ -310,8 +319,8 @@ describe("scenarios > metrics > editing", () => {
describe("custom columns", () => {
it("should be able to use custom columns in metric queries (metabase#42360)", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
startNewCustomColumn();
@@ -331,8 +340,8 @@ describe("scenarios > metrics > editing", () => {
it("should be able to use implicitly joinable columns in custom columns in metric queries (metabase#42360)", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
startNewCustomColumn();
@@ -354,8 +363,8 @@ describe("scenarios > metrics > editing", () => {
describe("breakouts", () => {
it("should create a timeseries metric", () => {
H.startNewMetric();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.getNotebookStep("summarize").findByText("Count").click();
@@ -377,8 +386,8 @@ describe("scenarios > metrics > editing", () => {
H.createQuestion(ORDERS_SCALAR_METRIC);
H.startNewMetric();
cy.intercept("POST", "/api/dataset/query_metadata").as("queryMetadata");
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(ORDERS_SCALAR_METRIC.name).click();
});
cy.wait("@queryMetadata");
@@ -427,8 +436,8 @@ describe("scenarios > metrics > editing", () => {
H.createQuestion(ORDERS_SCALAR_FILTER_METRIC);
H.createQuestion(PRODUCTS_SCALAR_METRIC);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
startNewAggregation();
@@ -449,8 +458,8 @@ describe("scenarios > metrics > editing", () => {
H.createQuestion(ORDERS_SCALAR_FILTER_METRIC);
H.createQuestion(PRODUCTS_SCALAR_METRIC);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
startNewAggregation();
@@ -467,8 +476,8 @@ describe("scenarios > metrics > editing", () => {
it("should show the description for metrics", () => {
H.createQuestion(ORDERS_SCALAR_FILTER_METRIC);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
startNewAggregation();
diff --git a/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts b/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
index 0ed96c5ba3f..b177f18f7cc 100644
--- a/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
@@ -213,8 +213,8 @@ describe("issue 30574", () => {
cy.log("create the first metric");
H.main().findByText("Create metric").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
cy.findByTestId("edit-bar").button("Save").click();
@@ -228,8 +228,8 @@ describe("issue 30574", () => {
H.openNavigationSidebar();
H.navigationSidebar().findByText("Metrics").click();
H.main().findByLabelText("Create a new metric").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.getNotebookStep("summarize").findByText("Count").click();
diff --git a/e2e/test/scenarios/models/create.cy.spec.js b/e2e/test/scenarios/models/create.cy.spec.js
index 3aa4c2fb7f5..e8228ad78c1 100644
--- a/e2e/test/scenarios/models/create.cy.spec.js
+++ b/e2e/test/scenarios/models/create.cy.spec.js
@@ -51,7 +51,8 @@ describe("scenarios > models > create", () => {
cy.findByTestId("new-model-options")
.findByText("Use the notebook editor")
.click();
- H.entityPickerModal().findByText("People").click();
+ H.miniPicker().findByText("Sample Database").click();
+ H.miniPicker().findByText("People").click();
cy.findByTestId("dataset-edit-bar").button("Save").click();
cy.findByTestId("save-question-modal")
.should("contain", "Save model")
diff --git a/e2e/test/scenarios/models/helpers/e2e-models-helpers.js b/e2e/test/scenarios/models/helpers/e2e-models-helpers.js
index ddb4effc64a..0ff734a75c8 100644
--- a/e2e/test/scenarios/models/helpers/e2e-models-helpers.js
+++ b/e2e/test/scenarios/models/helpers/e2e-models-helpers.js
@@ -1,8 +1,7 @@
import {
NativeEditor,
- entityPickerModal,
- entityPickerModalTab,
interceptIfNotPreviouslyDefined,
+ miniPicker,
modal,
openQuestionActions,
popover,
@@ -98,8 +97,8 @@ export function selectFromDropdown(option, clickOpts) {
export function startQuestionFromModel(modelName) {
cy.findByTestId("app-bar").findByText("New").click();
popover().findByText("Question").should("be.visible").click();
- entityPickerModal().within(() => {
- entityPickerModalTab("Collections").click();
+ miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(modelName).click();
});
}
diff --git a/e2e/test/scenarios/models/models.cy.spec.js b/e2e/test/scenarios/models/models.cy.spec.js
index 7a980a8d9ae..f43502e9281 100644
--- a/e2e/test/scenarios/models/models.cy.spec.js
+++ b/e2e/test/scenarios/models/models.cy.spec.js
@@ -362,9 +362,10 @@ describe("scenarios > models", () => {
it("transforms the data picker", () => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.entityPickerModalItem(0, "Our analytics").click();
cy.findByText("Orders").should("exist");
cy.findByText("Orders Model").should("exist");
cy.findByText("Orders, Count").should("exist");
@@ -373,11 +374,13 @@ describe("scenarios > models", () => {
);
cy.findByText("Products").should("exist");
- H.entityPickerModalTab("Tables").click();
- cy.findByText("Orders").should("exist");
- cy.findByText("People").should("exist");
- cy.findByText("Products").should("exist");
- cy.findByText("Reviews").should("exist");
+ H.entityPickerModalItem(0, "Databases").click();
+
+ H.entityPickerModalItem(1, "Orders").should("exist");
+ H.entityPickerModalItem(1, "People").should("exist");
+ H.entityPickerModalItem(1, "Products").should("exist");
+ H.entityPickerModalItem(1, "Reviews").should("exist");
+
cy.findByText("Orders, Count").should("not.exist");
cy.findByPlaceholderText("Search this database or everywhere…").type(
@@ -422,20 +425,23 @@ describe("scenarios > models", () => {
cy.intercept(`/api/database/${SAMPLE_DB_ID}/schema/PUBLIC`).as("schema");
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.entityPickerModalItem(0, "Our analytics").click();
cy.findByText("Orders").click();
});
cy.icon("join_left_outer").click();
+ H.miniPickerBrowseAll().click();
+ H.entityPickerModalTab("Data").click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.findByText("Orders").should("exist");
- cy.findByText("People").should("exist");
- cy.findByText("Products").should("exist");
- cy.findByText("Reviews").should("exist");
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalItem(1, "Orders").should("exist");
+ H.entityPickerModalItem(1, "People").should("exist");
+ H.entityPickerModalItem(1, "Products").should("exist");
+ H.entityPickerModalItem(1, "Reviews").should("exist");
- cy.findByText("Products").click();
+ H.entityPickerModalItem(1, "Products").click();
});
H.getNotebookStep("filter")
@@ -479,9 +485,8 @@ describe("scenarios > models", () => {
it("should not display models if nested queries are disabled", () => {
H.mockSessionProperty("enable-nested-queries", false);
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- cy.findAllByRole("tab").should("not.exist");
-
cy.findByText("Orders").should("exist");
cy.findByText("People").should("exist");
cy.findByText("Products").should("exist");
diff --git a/e2e/test/scenarios/models/reproductions.cy.spec.js b/e2e/test/scenarios/models/reproductions.cy.spec.js
index b2c02b883b7..625c296d2d3 100644
--- a/e2e/test/scenarios/models/reproductions.cy.spec.js
+++ b/e2e/test/scenarios/models/reproductions.cy.spec.js
@@ -94,8 +94,8 @@ describe("issue 19737", () => {
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
cy.findByText("Question").should("be.visible").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
cy.findByText(personalCollectionName).click();
cy.findByText(modelName);
});
@@ -119,8 +119,8 @@ describe("issue 19737", () => {
cy.findByText("Question").should("be.visible").click();
// Open question picker (this is crucial) so the collection list are loaded.
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
cy.findByText("First collection").click();
cy.findByText(modelName);
});
@@ -143,8 +143,8 @@ describe("issue 19737", () => {
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
cy.findByText("Question").should("be.visible").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
cy.findByText("First collection").should("not.exist");
H.entityPickerModalLevel(1).should("exist");
H.entityPickerModalLevel(2).should("not.exist");
@@ -152,54 +152,6 @@ describe("issue 19737", () => {
});
});
-// this is only testable in OSS because EE always has models from auditv2
-describe("issue 19776", { tags: "@OSS" }, () => {
- const modelName = "Orders Model";
- function openEllipsisMenuFor(item) {
- cy.findByText(item).closest("tr").find(".Icon-ellipsis").click();
- }
-
- beforeEach(() => {
- H.restore();
- cy.signInAsAdmin();
- });
-
- it("should reflect archived model in the data picker without refreshing (metabase#19776)", () => {
- cy.visit("/");
-
- cy.findByTestId("app-bar").button("New").click();
- H.popover().findByText("Question").click();
- H.entityPickerModalTab("Collections").click(); // now you see it
- H.entityPickerModal()
- .button(/Filter/)
- .click();
-
- H.popover().findByText("Models").should("exist");
-
- H.entityPickerModal().findByLabelText("Close").click();
-
- // navigate without a page load
- cy.findByTestId("sidebar-toggle").click();
- H.navigationSidebar().findByText("Our analytics").click();
-
- // archive the only model
- cy.findByTestId("collection-table").within(() => {
- openEllipsisMenuFor(modelName);
- });
- H.popover().contains("Move to trash").click();
- cy.findByTestId("undo-list").findByText("Trashed model");
-
- cy.findByTestId("app-bar").button("New").click();
- H.popover().findByText("Question").click();
- H.entityPickerModalTab("Collections").click(); // now you don't
- H.entityPickerModal()
- .button(/Filter/)
- .click();
-
- H.popover().findByText("Models").should("not.exist");
- });
-});
-
describe("issue 20042", () => {
beforeEach(() => {
cy.intercept("POST", `/api/card/${ORDERS_QUESTION_ID}/query`).as("query");
@@ -803,7 +755,6 @@ describe("issue 25537", () => {
beforeEach(() => {
H.restore();
cy.signInAsAdmin();
- cy.intercept("GET", "/api/collection/*/items?*").as("getCollectionContent");
});
it("should be able to pick a saved model when using a non-english locale (metabase#25537)", () => {
@@ -811,9 +762,8 @@ describe("issue 25537", () => {
H.createQuestion(questionDetails);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Sammlungen").click();
- cy.wait("@getCollectionContent");
+ H.miniPicker().within(() => {
+ cy.findByText("Unsere Analysen").click();
cy.findByText(questionDetails.name).should("exist");
});
});
@@ -842,8 +792,8 @@ describe("issue 26091", () => {
cy.visit("/");
startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.saveQuestion("New model", undefined, {
@@ -853,8 +803,8 @@ describe("issue 26091", () => {
turnIntoModel();
startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("New model").should("be.visible");
cy.findByText("Old model").should("be.visible");
cy.findByText("Orders Model").should("be.visible");
@@ -921,8 +871,8 @@ describe("issue 28971", () => {
it("should be able to filter a newly created model (metabase#28971)", () => {
H.startNewModel();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
cy.findByTestId("run-button").click();
diff --git a/e2e/test/scenarios/models/reproductions.cy.spec.ts b/e2e/test/scenarios/models/reproductions.cy.spec.ts
index 8b66d5ef2ab..a79a22947e6 100644
--- a/e2e/test/scenarios/models/reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/models/reproductions.cy.spec.ts
@@ -398,13 +398,13 @@ describe("issue 41785, issue 46756", () => {
it("does not break the question when removing column with the same mapping as another column (metabase#41785) (metabase#46756)", () => {
// it's important to create the model through UI to reproduce this issue
H.startNewModel();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
H.popover().findByText("ID").click();
@@ -465,8 +465,8 @@ describe("issue 40635", () => {
it("correctly displays question's and nested model's column names (metabase#40635)", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -475,8 +475,8 @@ describe("issue 40635", () => {
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
@@ -490,8 +490,8 @@ describe("issue 40635", () => {
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
@@ -672,8 +672,8 @@ describe("issue 25113", () => {
H.createQuestion(questionDetails, { visitQuestion: true });
H.openNotebook();
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("People Model").click();
});
H.popover().findByText("ID").click();
@@ -879,8 +879,8 @@ describe("issue 33844", () => {
cy.findByTestId("new-model-options")
.findByText("Use the notebook editor")
.click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
cy.findByTestId("run-button").click();
@@ -1070,11 +1070,11 @@ describe("issue 34517", () => {
cy.location("pathname").should("eq", "/model/query");
// wait for the model editor to be fully loaded
- H.entityPickerModal().should("exist");
+ H.miniPicker().should("exist");
cy.reload();
// wait for the model editor to be fully loaded
- H.entityPickerModal().should("exist");
+ H.miniPicker().should("exist");
cy.location("pathname").should("eq", "/model/query");
});
});
@@ -1188,7 +1188,6 @@ describe("issue 34514", () => {
H.restore();
cy.signInAsAdmin();
cy.intercept("POST", "/api/dataset").as("dataset");
- cy.intercept("GET", "/api/database/*/schema/*").as("fetchTables");
cy.intercept("GET", "/api/database/*").as("fetchDatabase");
// It's important to navigate via UI so that there are
@@ -1200,9 +1199,8 @@ describe("issue 34514", () => {
});
it("should not make network request with invalid query (metabase#34514)", () => {
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.wait("@fetchTables");
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -1215,9 +1213,8 @@ describe("issue 34514", () => {
});
it("should allow browser history navigation between tabs (metabase#34514, metabase#45787)", () => {
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.wait("@fetchTables");
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -1253,13 +1250,12 @@ describe("issue 34514", () => {
}
function assertBackToEmptyState() {
- H.entityPickerModal().should("be.visible");
- H.entityPickerModal().button("Close").click();
+ H.miniPicker().should("be.visible");
cy.findByTestId("editor-tabs-columns").should("be.disabled");
cy.button("Save").should("be.disabled");
H.getNotebookStep("data")
- .findByText("Pick your starting data")
+ .findByPlaceholderText("Search for tables and more...")
.should("be.visible");
H.tableInteractive().should("not.exist");
cy.findByTestId("query-visualization-root").within(() => {
@@ -1329,13 +1325,13 @@ describe("issue 47988", () => {
H.createQuestion(model1Details);
H.createQuestion(model2Details);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("M1").click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("M2").click();
});
H.visualize();
@@ -1696,8 +1692,8 @@ describe("issue 57359", () => {
H.openOrdersTable({ mode: "notebook" });
cy.wrap([1, 2]).each(() => {
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
});
@@ -1783,7 +1779,8 @@ describe("Issue 30712", () => {
H.startNewModel();
- H.entityPickerModal().findByText("Orders").click();
+ H.miniPicker().findByText("Sample Database").click();
+ H.miniPicker().findByText("Orders").click();
H.join();
H.joinTable("Products");
@@ -1961,13 +1958,13 @@ describe("issue 50915", () => {
cy.log("create a model via the UI");
cy.visit("/model/new");
H.main().findByText("Use the notebook editor").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("People").click();
});
cy.findByTestId("dataset-edit-bar").button("Save").click();
diff --git a/e2e/test/scenarios/onboarding/add-initial-data.cy.spec.ts b/e2e/test/scenarios/onboarding/add-initial-data.cy.spec.ts
index 4d894dba72a..6d78eed4e1a 100644
--- a/e2e/test/scenarios/onboarding/add-initial-data.cy.spec.ts
+++ b/e2e/test/scenarios/onboarding/add-initial-data.cy.spec.ts
@@ -139,7 +139,7 @@ describe("Add data modal", () => {
cy.findByText(/Getting Started/i).should("not.exist");
cy.log("Adding data from the 'Data' section should work");
- cy.findByRole("tab", { name: /^Data/i })
+ cy.findByRole("section", { name: "Data" })
.findByLabelText("Add data")
.click();
});
@@ -245,7 +245,7 @@ describe("Add data modal", () => {
cy.findByLabelText("Navigation bar").contains("Exit admin").click();
H.navigationSidebar()
- .findByRole("tab", { name: /^Data/i })
+ .findByRole("section", { name: "Data" })
.findByLabelText("Add data")
.should("be.visible")
.click();
@@ -379,7 +379,7 @@ describe("Add data modal", () => {
it("should be hidden for non-admins without upload permissions", () => {
cy.signInAsNormalUser();
cy.visit("/");
- cy.findByRole("tab", { name: /^Data/i }).within(() => {
+ cy.findByRole("section", { name: "Data" }).within(() => {
cy.findByLabelText("Add data").should("not.exist");
});
});
@@ -390,7 +390,7 @@ const addDataModal = () => cy.findByRole("dialog", { name: "Add data" });
const openAddDataModalFromSidebar = () =>
H.navigationSidebar()
- .findByRole("tab", { name: /^Data/i })
+ .findByRole("section", { name: "Data" })
.findByLabelText("Add data")
.should("be.visible")
.click();
diff --git a/e2e/test/scenarios/onboarding/command-palette.cy.spec.js b/e2e/test/scenarios/onboarding/command-palette.cy.spec.js
index c50fc2d93eb..69d0493b45e 100644
--- a/e2e/test/scenarios/onboarding/command-palette.cy.spec.js
+++ b/e2e/test/scenarios/onboarding/command-palette.cy.spec.js
@@ -645,11 +645,11 @@ describe("shortcuts", { tags: ["@actions"] }, () => {
cy.realPress("o");
H.openNavigationSidebar();
H.navigationSidebar()
- .findByRole("tab", { name: /bookmarks/i })
+ .findByRole("section", { name: "Bookmarks" })
.should("contain.text", "Test Dashboard");
cy.realPress("o");
H.navigationSidebar()
- .findByRole("tab", { name: /bookmarks/i })
+ .findByRole("section", { name: "Bookmarks" })
.should("not.exist");
cy.realPress("e");
diff --git a/e2e/test/scenarios/onboarding/home/browse.cy.spec.ts b/e2e/test/scenarios/onboarding/home/browse.cy.spec.ts
index 17ec3ea0b9f..0319f292afd 100644
--- a/e2e/test/scenarios/onboarding/home/browse.cy.spec.ts
+++ b/e2e/test/scenarios/onboarding/home/browse.cy.spec.ts
@@ -141,7 +141,7 @@ describe("scenarios > browse", () => {
.findByLabelText("Create a new metric")
.should("be.visible")
.click();
- cy.findByTestId("entity-picker-modal").should("be.visible");
+ H.miniPicker().should("be.visible");
H.expectNoBadSnowplowEvents();
H.expectUnstructuredSnowplowEvent({
diff --git a/e2e/test/scenarios/onboarding/reference/databases.cy.spec.js b/e2e/test/scenarios/onboarding/reference/databases.cy.spec.js
index 5d60ffab8f7..49c842d13d6 100644
--- a/e2e/test/scenarios/onboarding/reference/databases.cy.spec.js
+++ b/e2e/test/scenarios/onboarding/reference/databases.cy.spec.js
@@ -87,9 +87,10 @@ describe("scenarios > reference > databases", () => {
it("should sort databases in new UI based question data selection popover", () => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.findByTestId("item-picker-level-0").within(() => {
+ H.entityPickerModalItem(0, "Databases").click();
+ cy.findByTestId("item-picker-level-1").within(() => {
cy.get("[data-index='0']").should("contain.text", "a");
cy.get("[data-index='1']").should("contain.text", "b");
cy.get("[data-index='2']").should("contain.text", "c");
diff --git a/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.js b/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.js
index c7b6362194a..4d5e9ddfe09 100644
--- a/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.js
+++ b/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.js
@@ -153,7 +153,7 @@ describe("user > settings", () => {
});
});
- it("Should show correct translations when a user logs in with a locale that is different from the site locale", () => {
+ it("should show correct translations when a user logs in with a locale that is different from the site locale", () => {
cy.intercept("GET", "/api/user/current").as("getUser");
cy.request("PUT", `/api/user/${NORMAL_USER_ID}`, { locale: "fr" });
cy.signOut();
@@ -165,7 +165,7 @@ describe("user > settings", () => {
// should be redirected to new question page
cy.wait("@getUser");
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().findByText("Parcourir tout").click();
H.entityPickerModal().findByText("Orders Model").click();
cy.findByTestId("step-summarize-0-0")
.findByText("Summarize")
diff --git a/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.js b/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.js
index f9fe5092c60..e914dcd36d2 100644
--- a/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.js
+++ b/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.js
@@ -226,7 +226,7 @@ function addBookmarkTo(name) {
H.popover().findByTextEnsureVisible("Bookmark").click();
H.navigationSidebar()
- .findByRole("tab", { name: /^Bookmark/ })
+ .findByRole("section", { name: "Bookmarks" })
.should("contain", name);
}
@@ -236,7 +236,7 @@ function removeBookmarkFrom(name) {
H.popover().findByTextEnsureVisible("Remove from bookmarks").click();
H.navigationSidebar()
- .findByRole("tab", { name: /^Bookmark/ })
+ .findByRole("section", { name: "Bookmarks" })
.should("not.exist");
}
diff --git a/e2e/test/scenarios/organization/bookmarks-question.cy.spec.js b/e2e/test/scenarios/organization/bookmarks-question.cy.spec.js
index 764ebc3e4d4..f20ff8498c0 100644
--- a/e2e/test/scenarios/organization/bookmarks-question.cy.spec.js
+++ b/e2e/test/scenarios/organization/bookmarks-question.cy.spec.js
@@ -53,8 +53,9 @@ describe("scenarios > question > bookmarks", () => {
// when we assert on the next toast (when we turn the model back to the question).
H.undoToastList().icon("close").click();
+ H.openNavigationSidebar();
H.navigationSidebar().within(() => {
- cy.findByLabelText(/Bookmarks/)
+ cy.findByRole("section", { name: "Bookmarks" })
.icon("model")
.should("exist");
});
@@ -67,7 +68,7 @@ describe("scenarios > question > bookmarks", () => {
H.openNavigationSidebar();
cy.log("Should not find bookmark");
H.navigationSidebar().within(() => {
- cy.findByLabelText(/Bookmarks/)
+ cy.findByRole("section", { name: "Bookmarks" })
.icon("model")
.should("not.exist");
});
diff --git a/e2e/test/scenarios/organization/entity-picker.cy.spec.ts b/e2e/test/scenarios/organization/entity-picker.cy.spec.ts
index 7111c34063b..8e92021e96e 100644
--- a/e2e/test/scenarios/organization/entity-picker.cy.spec.ts
+++ b/e2e/test/scenarios/organization/entity-picker.cy.spec.ts
@@ -38,8 +38,9 @@ describe("scenarios > organization > entity picker", () => {
describe("tables", () => {
it("should select a table from local search results", () => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
enterSearchText({
text: "prod",
placeholder: "Search this database or everywhere…",
@@ -56,8 +57,9 @@ describe("scenarios > organization > entity picker", () => {
it("should select a table from global search results", () => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
enterSearchText({
text: "prod",
placeholder: "Search this database or everywhere…",
@@ -77,8 +79,9 @@ describe("scenarios > organization > entity picker", () => {
H.startNewQuestion();
cy.log("create a recent item");
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
cy.findByText("Products").click();
});
@@ -86,9 +89,11 @@ describe("scenarios > organization > entity picker", () => {
"should search globally for recents and locally for tables by default",
);
H.getNotebookStep("data").findByText("Products").click();
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
cy.log("local -> global transition without changing search text");
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalTab("Data").click();
enterSearchText({
text: "Orders",
placeholder: "Search this database or everywhere…",
@@ -103,7 +108,7 @@ describe("scenarios > organization > entity picker", () => {
});
cy.log("global -> local transition without changing search text");
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalTab("Data").click();
existingSearchTab().click();
localSearchTab("Sample Database").should("be.checked");
assertSearchResults({
@@ -135,8 +140,9 @@ describe("scenarios > organization > entity picker", () => {
it("should search for tables in the only database", () => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
enterSearchText({
text: "prod",
placeholder: "Search this database or everywhere…",
@@ -159,10 +165,11 @@ describe("scenarios > organization > entity picker", () => {
});
cy.signInAsNormalUser();
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
cy.log("real table name should give no results");
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
enterSearchText({
text: "Orders",
placeholder: "Search this database or everywhere…",
@@ -203,8 +210,9 @@ describe("scenarios > organization > entity picker", () => {
cy.log("first database - pre-selected");
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
enterSearchText({
text: "prod",
placeholder: "Search this database or everywhere…",
@@ -219,7 +227,7 @@ describe("scenarios > organization > entity picker", () => {
cy.log("second database");
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalTab("Data").click();
cy.findByText("Writable Postgres12").click();
enterSearchText({
text: "s",
@@ -236,7 +244,7 @@ describe("scenarios > organization > entity picker", () => {
cy.log("first database - manually selected");
H.startNewQuestion();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalTab("Data").click();
cy.findByText("Sample Database").click();
enterSearchText({
text: "prod",
@@ -263,8 +271,9 @@ describe("scenarios > organization > entity picker", () => {
cy.log("first schema");
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
cy.findByText("Writable Postgres12").click();
enterSearchText({
text: "s",
@@ -280,7 +289,8 @@ describe("scenarios > organization > entity picker", () => {
cy.log("second schema");
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalTab("Data").click();
+ cy.findByText("Writable Postgres12").click();
cy.findByText("Wild").click();
enterSearchText({
text: "s",
@@ -302,8 +312,9 @@ describe("scenarios > organization > entity picker", () => {
H.restore("mysql-8");
cy.signInAsAdmin();
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
cy.findByText("QA MySQL8").click();
enterSearchText({
text: "orders",
@@ -321,7 +332,7 @@ describe("scenarios > organization > entity picker", () => {
});
describe("cards", () => {
- const tabs = ["Collections"];
+ const tabs = ["Data"];
it("should select a card from local search results", () => {
cy.signInAsAdmin();
@@ -330,28 +341,25 @@ describe("scenarios > organization > entity picker", () => {
const testCases = [
{
- tab: "Collections",
cardName: "Root question 1",
sourceName: "Root question 1",
},
{
- tab: "Collections",
cardName: "Root model 2",
sourceName: "Root model 2",
},
{
- tab: "Collections",
cardName: "Root metric 1",
sourceName: "Orders",
},
];
- testCases.forEach(({ tab, cardName, sourceName }) => {
+ testCases.forEach(({ cardName, sourceName }) => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab(tab).click();
enterSearchText({
text: cardName,
- placeholder: "Search this collection or everywhere…",
+ placeholder: /Search/,
});
cy.findByText(cardName).click();
});
@@ -361,8 +369,9 @@ describe("scenarios > organization > entity picker", () => {
cy.log("scope search in a dashboard");
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.entityPickerModalTab("Data").click();
H.entityPickerModalItem(1, "Orders in a dashboard").click();
enterSearchText({
text: "Orders",
@@ -383,28 +392,28 @@ describe("scenarios > organization > entity picker", () => {
const testCases = [
{
- tab: "Collections",
cardName: "Regular question 1",
sourceName: "Regular question 1",
},
{
- tab: "Collections",
cardName: "Regular model 2",
sourceName: "Regular model 2",
},
{
- tab: "Collections",
cardName: "Regular metric 1",
sourceName: "Orders",
},
];
- testCases.forEach(({ tab, cardName, sourceName }) => {
+ testCases.forEach(({ cardName, sourceName }, i) => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab(tab).click();
+ if (i > 0) {
+ H.entityPickerModalTab("Data").click();
+ }
enterSearchText({
text: cardName,
- placeholder: "Search this collection or everywhere…",
+ placeholder: /Search/,
});
selectGlobalSearchTab();
cy.findByText(cardName).click();
@@ -415,8 +424,9 @@ describe("scenarios > organization > entity picker", () => {
cy.log("should find dashboard questions in global search");
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.entityPickerModalTab("Data").click();
enterSearchText({
text: "Dashboard question 1",
placeholder: "Search this collection or everywhere…",
@@ -435,6 +445,7 @@ describe("scenarios > organization > entity picker", () => {
createTestCards();
cy.signInAsNormalUser();
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
testCardSearchForNormalUser({ tabs });
});
@@ -449,6 +460,7 @@ describe("scenarios > organization > entity picker", () => {
cy.signIn("nocollection");
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
testCardSearchForInaccessibleRootCollection({
tabs,
isRootSelected: true,
@@ -459,7 +471,8 @@ describe("scenarios > organization > entity picker", () => {
cy.signInAsAdmin();
createTestCards();
H.startNewQuestion();
- testCardSearchForAllPersonalCollections({ tabs });
+ H.miniPickerBrowseAll().click();
+ testCardSearchForAllPersonalCollections();
});
});
});
@@ -545,7 +558,7 @@ describe("scenarios > organization > entity picker", () => {
cy.signInAsAdmin();
createTestCards();
selectQuestionFromDashboard();
- testCardSearchForAllPersonalCollections({ tabs });
+ testCardSearchForAllPersonalCollections();
});
});
@@ -1083,7 +1096,9 @@ describe("scenarios > organization > entity picker", () => {
);
H.newButton("Question").click();
- H.entityPickerModalLevel(2).findByText("People").click();
+ H.miniPickerBrowseAll().click();
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalLevel(3).findByText("People").click();
H.queryBuilderHeader().findByRole("button", { name: "Save" }).click();
H.modal()
@@ -1320,7 +1335,7 @@ function enterSearchText({
placeholder,
}: {
text: string;
- placeholder: string;
+ placeholder: string | RegExp;
}) {
cy.findByPlaceholderText(placeholder).clear().type(text);
}
@@ -1378,7 +1393,9 @@ function testCardSearchForNormalUser({ tabs }: { tabs: string[] }) {
tabs.forEach((tab) => {
cy.log("root collection - automatically selected");
H.entityPickerModal().within(() => {
- H.entityPickerModalTab(tab).click();
+ if (tabs.length > 1) {
+ H.entityPickerModalTab(tab).click();
+ }
enterSearchText({
text: "2",
placeholder: "Search this collection or everywhere…",
@@ -1478,7 +1495,6 @@ function testCardSearchForInaccessibleRootCollection({
if (isRootSelected) {
cy.log("inaccessible root collection - automatically selected");
H.entityPickerModal().within(() => {
- H.entityPickerModalTab(tab).click();
enterSearchText({
text: "1",
placeholder: "Search this collection or everywhere…",
@@ -1569,20 +1585,17 @@ function testCardSearchForInaccessibleRootCollection({
});
}
-function testCardSearchForAllPersonalCollections({ tabs }: { tabs: string[] }) {
- tabs.forEach((tab) => {
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab(tab).click();
- cy.findByText("All personal collections").click();
- enterSearchText({
- text: "root",
- placeholder: "Search…",
- });
- globalSearchTab().should("not.exist");
- localSearchTab("All personal collections").should("not.exist");
- assertSearchResults({
- foundItems: ["Root question 1", "Root model 1", "Root metric 1"],
- });
+function testCardSearchForAllPersonalCollections() {
+ H.entityPickerModal().within(() => {
+ cy.findByText("All personal collections").click();
+ enterSearchText({
+ text: "root",
+ placeholder: "Search…",
+ });
+ globalSearchTab().should("not.exist");
+ localSearchTab("All personal collections").should("not.exist");
+ assertSearchResults({
+ foundItems: ["Root question 1", "Root model 1", "Root metric 1"],
});
});
}
diff --git a/e2e/test/scenarios/organization/helpers/bookmark-helpers.ts b/e2e/test/scenarios/organization/helpers/bookmark-helpers.ts
index a50222d001b..00b747fde84 100644
--- a/e2e/test/scenarios/organization/helpers/bookmark-helpers.ts
+++ b/e2e/test/scenarios/organization/helpers/bookmark-helpers.ts
@@ -31,7 +31,7 @@ export const createSimpleQuestion = (name: string) =>
export const verifyBookmarksOrder = (expectedOrder: string[]) => {
navigationSidebar()
- .findByLabelText(/Bookmarks/)
+ .findByRole("section", { name: "Bookmarks" })
.within(() => {
cy.get("li")
.should("have.length", expectedOrder.length)
@@ -51,7 +51,7 @@ export const moveBookmark = (
) => {
moveDnDKitElement(
navigationSidebar()
- .findByLabelText(/Bookmarks/)
+ .findByRole("section", { name: "Bookmarks" })
.findByText(name),
{ vertical: verticalDistance },
);
diff --git a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.js b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.js
index 777ce2d0794..78173e1dcc4 100644
--- a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.js
+++ b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-api.cy.spec.js
@@ -962,8 +962,8 @@ describe("admin > permissions > sandboxes (tested via the API)", () => {
createJoinedQuestion("14766_joined");
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("14766_joined").click();
});
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
diff --git a/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js b/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js
index f134a6bfe9b..c679dd47814 100644
--- a/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js
+++ b/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js
@@ -129,9 +129,10 @@ describe("issue 9027", () => {
cy.signInAsAdmin();
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
- cy.findByText("Orders").should("exist");
+ H.entityPickerModalItem(0, "Our analytics").click();
+ H.entityPickerModalItem(1, "Orders").should("exist");
cy.button("Close").click();
});
@@ -159,8 +160,9 @@ describe("issue 9027", () => {
function goToSavedQuestionPickerAndAssertQuestion(questionName, exists = true) {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.entityPickerModalItem(0, "Our analytics").click();
cy.findByText(questionName).should(exists ? "exist" : "not.exist");
cy.button("Close").click();
});
@@ -589,8 +591,8 @@ describe("issue 17514", () => {
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
cy.findByText("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
@@ -955,6 +957,7 @@ describe("issue 19341", () => {
it("should correctly disable nested queries (metabase#19341)", () => {
// Test "Saved Questions" table is hidden in QB data selector
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
cy.findByTestId("loading-indicator").should("not.exist");
cy.findByText("Orders").should("exist");
@@ -981,6 +984,7 @@ describe("issue 19341", () => {
});
cy.icon("join_left_outer").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().findAllByRole("tab").should("not.exist");
// Test "Explore results" button is hidden for native questions
@@ -1007,8 +1011,9 @@ describe("issue 19742", () => {
cy.findByText("New").click();
H.popover().findByText("Question").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
cy.findByText("Orders").should("exist");
cy.button("Close").click();
});
@@ -1027,8 +1032,9 @@ describe("issue 19742", () => {
cy.findByText("New").click();
H.popover().findByText("Question").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
cy.findByText("Orders").should("not.exist");
cy.findByText("Products").should("exist");
@@ -1182,8 +1188,8 @@ describe("issue 20627", () => {
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
cy.findByText("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText(newTableName).click();
});
diff --git a/e2e/test/scenarios/question-reproductions/reproductions-2.cy.spec.js b/e2e/test/scenarios/question-reproductions/reproductions-2.cy.spec.js
index 556f2841b4c..ada1b9ab1b6 100644
--- a/e2e/test/scenarios/question-reproductions/reproductions-2.cy.spec.js
+++ b/e2e/test/scenarios/question-reproductions/reproductions-2.cy.spec.js
@@ -153,61 +153,6 @@ describe("issue 25016", () => {
});
});
-// this is only testable in OSS because EE always has models from auditv2
-describe("issue 25144", { tags: "@OSS" }, () => {
- beforeEach(() => {
- H.restore("setup");
- cy.signInAsAdmin();
- cy.intercept("POST", "/api/card").as("createCard");
- cy.intercept("PUT", "/api/card/*").as("updateCard");
- });
-
- it("should show Saved Questions tab after creating the first question (metabase#25144)", () => {
- cy.visit("/");
-
- H.newButton("Question").click();
-
- H.entityPickerModal().within(() => {
- cy.findByText("Collections").should("not.exist");
- H.entityPickerModalItem(2, "Orders").click();
- });
-
- H.saveQuestion("Orders question");
-
- H.newButton("Question").click();
-
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").should("be.visible").click();
- H.entityPickerModalItem(1, "Orders question").should("be.visible");
- });
- });
-
- it("should show Models tab after creation the first model (metabase#24878)", () => {
- cy.visit("/model/new");
- cy.findByTestId("new-model-options")
- .findByText(/use the notebook/i)
- .click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalItem(2, "Orders").click();
- });
-
- cy.findByTestId("dataset-edit-bar").button("Save").click();
-
- H.modal().within(() => {
- cy.findByLabelText("Name").clear().type("Orders model");
- cy.button("Save").click();
- });
- cy.wait("@createCard");
-
- H.newButton("Question").click();
-
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").should("be.visible").click();
- H.entityPickerModalItem(1, "Orders model").should("be.visible");
- });
- });
-});
-
describe("issue 27104", () => {
const questionDetails = {
dataset_query: {
@@ -528,48 +473,6 @@ describe("issue 30610", () => {
});
});
-describe("issue 36669", () => {
- beforeEach(() => {
- H.restore();
- cy.signInAsNormalUser();
- cy.intercept("GET", "/api/search*").as("search");
- });
-
- it("should be able to change question data source to raw data after selecting saved question (metabase#36669)", () => {
- const questionDetails = {
- name: "Orders 36669",
- query: {
- "source-table": ORDERS_ID,
- limit: 5,
- },
- };
-
- H.createQuestion(questionDetails).then(() => {
- H.startNewQuestion();
- });
-
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
- cy.findByPlaceholderText("Search this collection or everywhere…").type(
- "Orders 36669",
- );
- cy.wait("@search");
-
- cy.findByText("Everywhere").click();
- cy.findByRole("tabpanel").findByText("Orders 36669").click();
- });
-
- H.getNotebookStep("data").findByText("Orders 36669").click();
-
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
-
- cy.log("verify Tables are listed");
- cy.findByRole("tabpanel").should("contain", "Orders");
- });
- });
-});
-
describe("issue 35290", () => {
beforeEach(() => {
H.restore();
@@ -641,9 +544,8 @@ describe("issue 43216", () => {
cy.log("Create target question");
H.newButton("Question").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
- H.waitForLoaderToBeRemoved();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Source question").click();
});
H.saveQuestion("Target question");
@@ -690,8 +592,9 @@ function removeSourceColumns() {
function createAdHocQuestion(questionName) {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ cy.findByText("Our analytics").click();
cy.findByText(questionName).click();
});
cy.findByTestId("fields-picker").click();
diff --git a/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.js b/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.js
index 8bbc0dd1fee..e45edf25eed 100644
--- a/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.js
+++ b/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.js
@@ -263,7 +263,8 @@ describe("issue 38354", { tags: "@external" }, () => {
it("should be possible to change source database (metabase#38354)", () => {
H.openNotebook();
H.getNotebookStep("data").findByTestId("data-step-cell").click();
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
+ H.miniPickerHeader().click();
cy.findByText("QA Postgres12").click();
cy.findByText("Orders").click();
});
@@ -681,62 +682,6 @@ describe("issue 42244", () => {
});
});
-describe("issue 42957", () => {
- beforeEach(() => {
- H.restore();
- cy.signInAsAdmin();
- });
-
- it("does not show collections that contain models from different tabs (metabase#42957)", () => {
- H.createQuestion({
- name: "Model",
- type: "model",
- query: {
- "source-table": ORDERS_ID,
- },
- });
-
- H.createCollection({ name: "Collection without models" }).then(
- ({ body: collection }) => {
- cy.wrap(collection.id).as("collectionId");
- },
- );
-
- cy.get("@collectionId").then((collectionId) => {
- H.createQuestion({
- name: "Question",
- type: "question",
- query: {
- "source-table": ORDERS_ID,
- },
- collection_id: collectionId,
- });
- });
-
- H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
-
- // wait for data to load
- H.entityPickerModalLevel(1).should("contain", "Orders, Count");
-
- // open filter
- cy.findByRole("button", { name: /Filter/ }).click();
- });
-
- H.popover().findByLabelText("Saved questions").click();
-
- H.entityPickerModal().within(() => {
- // close filter
- cy.findByRole("button", { name: /Filter/ }).click();
- H.entityPickerModalLevel(1).should(
- "not.contain",
- "Collection without models",
- );
- });
- });
-});
-
describe("issue 40064", () => {
beforeEach(() => {
H.restore();
@@ -890,13 +835,13 @@ describe("issue 32020", () => {
H.startNewQuestion();
cy.log("create joined question manually");
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(question1Details.name).click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(question2Details.name).click();
});
H.popover().findByText("ID").click();
@@ -944,8 +889,8 @@ describe("issue 44071", () => {
it("should be able to save questions based on another questions without collection access (metabase#44071)", () => {
cy.visit("/");
H.newButton("Question").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
cy.findByText(/Personal Collection/).click();
cy.findByText(questionDetails.name).click();
});
@@ -1425,21 +1370,22 @@ describe("issue 19894", () => {
H.startNewQuestion();
- H.entityPickerModalTab("Collections").click();
- H.entityPickerModalItem(1, "Q1").click();
+ H.miniPicker().should("exist");
+ cy.realType("Q1");
+ H.miniPicker().findByText("Q1").click();
cy.button("Join data").click();
- H.entityPickerModalTab("Collections").click();
- H.entityPickerModalItem(1, "Q2").click();
+ cy.realType("Q2");
+ H.miniPicker().findByText("Q2").click();
H.popover().findByText("Category").click();
H.popover().findByText("Category").click();
cy.button("Join data").click();
- H.entityPickerModalTab("Collections").click();
- H.entityPickerModalItem(1, "Q3").click();
+ cy.realType("Q3");
+ H.miniPicker().findByText("Q3").click();
H.popover().findByText("Category").should("be.visible");
H.popover().findByText("Count").should("be.visible");
@@ -1600,18 +1546,24 @@ describe("issue 44974", { tags: "@external" }, () => {
},
};
- H.createQuestion(questionDetails, {
- // Visit question to put it in recents
- visitQuestion: true,
- });
+ H.createQuestion(questionDetails);
H.openOrdersTable({ mode: "notebook" });
H.join();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("Orders Model").should("be.visible");
+ cy.findByText(questionDetails.name).should("not.exist");
+ });
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Recents").should("not.exist");
- H.entityPickerModalTab("Collections").click();
+ cy.findAllByRole("tab").should("not.exist");
+ H.entityPickerModalItem(0, "Our analytics").click();
+ cy.findByText("Orders Model").should("be.visible");
cy.findByText(questionDetails.name).should("not.exist");
+ cy.button("Close").click();
});
});
});
@@ -2668,7 +2620,8 @@ describe("issue 23449", () => {
H.navigationSidebar().findByLabelText("Browse models").click();
cy.findByLabelText("Create a new model").click();
cy.findByRole("link", { name: /Use the notebook editor/ }).click();
- H.entityPickerModal().findByText("Reviews").click();
+ H.miniPicker().findByText("Sample Database").click();
+ H.miniPicker().findByText("Reviews").click();
cy.log("Remove Body column");
cy.findByLabelText("Pick columns").click();
@@ -2948,8 +2901,8 @@ describe("Issue 33835", { tags: "@external" }, () => {
H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: "orders" });
H.startNewQuestion();
- H.entityPickerModal().findByText("Writable Postgres12").click();
- H.entityPickerModal().findByText("Orders").click();
+ H.miniPicker().findByText("Writable Postgres12").click();
+ H.miniPicker().findByText("Orders").click();
H.getNotebookStep("summarize")
.findByText("Pick a function or metric")
diff --git a/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts b/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts
index 206a033d72d..4f3eec710e1 100644
--- a/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts
@@ -43,8 +43,8 @@ describe("issue 48754", () => {
cy.findByText("Category").click();
});
H.getNotebookStep("summarize").button("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Q1").click();
});
H.popover()
@@ -563,8 +563,8 @@ describe("issue 53404", () => {
H.visitQuestion(ORDERS_QUESTION_ID);
H.openNotebook();
H.getNotebookStep("data").button("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Orders").click();
});
H.popover().findByText("ID").click();
@@ -667,8 +667,8 @@ describe("issue 46845", () => {
cy.log("add a self-join");
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.popover().findByText("Product ID").click();
@@ -793,8 +793,8 @@ describe("issue 58829", () => {
cy.log("verify it can be joined");
H.openProductsTable({ mode: "notebook" });
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("M1").click();
});
H.popover().findByText("ID").click();
@@ -906,8 +906,8 @@ describe("issue 54920", () => {
cy.log("create a derived question and verify that it can be run");
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Base question").click();
});
H.getNotebookStep("filter")
@@ -948,8 +948,8 @@ describe("issue 55631", () => {
cy.signInAsAdmin();
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- cy.findByText("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
cy.intercept("POST", "/api/card").as("cardCreate");
@@ -1016,13 +1016,13 @@ describe("issue 39033", () => {
H.createNativeQuestion(question1Details);
H.createNativeQuestion(question2Details);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(question1Name).click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(question2Name).click();
});
H.popover().findByText("PRODUCT_ID").click();
@@ -1061,13 +1061,13 @@ describe("issue 56416", () => {
it("should be able to use a column from a joined question with a long name (metabase#56416)", () => {
cy.log("create the joined question");
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
H.getNotebookStep("summarize")
@@ -1090,13 +1090,13 @@ describe("issue 56416", () => {
cy.log("create the main question");
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText(joinedQuestionName).click();
});
H.popover().findByText("Product ID").click();
diff --git a/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts b/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts
index 1de46ce1b60..edb12bd4f35 100644
--- a/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts
+++ b/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts
@@ -295,8 +295,8 @@ describe("scenarios > question > multiple column breakouts", () => {
bucket2Name: string;
}) {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText(tableName).click();
});
H.getNotebookStep("summarize")
diff --git a/e2e/test/scenarios/question/nested.cy.spec.js b/e2e/test/scenarios/question/nested.cy.spec.js
index c18e4127dd7..0b2e87108bc 100644
--- a/e2e/test/scenarios/question/nested.cy.spec.js
+++ b/e2e/test/scenarios/question/nested.cy.spec.js
@@ -384,8 +384,8 @@ describe("scenarios > question > nested", () => {
cy.findByText("New").click();
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
cy.findByText("Question").should("be.visible").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("15725").click();
});
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
diff --git a/e2e/test/scenarios/question/new.cy.spec.js b/e2e/test/scenarios/question/new.cy.spec.js
index 0ccdb1a7e86..56ebc400d0c 100644
--- a/e2e/test/scenarios/question/new.cy.spec.js
+++ b/e2e/test/scenarios/question/new.cy.spec.js
@@ -27,8 +27,7 @@ describe("scenarios > question > new", () => {
}
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText("Sample3").should("be.visible");
});
});
@@ -39,12 +38,10 @@ describe("scenarios > question > new", () => {
);
H.startNewQuestion();
-
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.tabsShouldBe("Tables", ["Tables", "Collections"]);
-
- H.entityPickerModalTab("Search").should("not.exist");
- H.entityPickerModalTab("Collections").click();
+ cy.get("[role='tab']:contains('Search')").should("not.exist");
+ H.entityPickerModalItem(0, "Our analytics").click();
cy.findByPlaceholderText("Search this collection or everywhere…")
.type(" ")
@@ -57,6 +54,7 @@ describe("scenarios > question > new", () => {
// should not trigger search for an empty string
cy.get("@searchQuery").should("have.been.calledOnce");
+ cy.get("[role='tab']:contains('Search')").should("be.visible");
cy.findAllByTestId("result-item").should("not.exist");
cy.findByText("Everywhere").click();
cy.findAllByTestId("result-item").should("have.length.at.least", 4);
@@ -76,8 +74,7 @@ describe("scenarios > question > new", () => {
cy.findByPlaceholderText("Search this collection or everywhere…")
.clear()
.blur();
- H.entityPickerModalTab("Search").should("not.exist");
- H.tabsShouldBe("Collections", ["Tables", "Collections"]);
+ cy.get("[role='tab']:contains('Search')").should("not.exist");
cy.findByText("Orders, Count").click();
});
@@ -94,17 +91,19 @@ describe("scenarios > question > new", () => {
H.notebookButton().should("be.visible");
cy.findByTestId("data-step-cell").contains("Orders, Count").click();
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
// It is now possible to choose another saved question
- H.entityPickerModalTab("Collections").should(
+ H.entityPickerModalItem(0, "Our analytics").should(
"have.attr",
- "aria-selected",
+ "data-active",
"true",
);
cy.findByText("Orders").should("exist");
cy.findByText("Orders, Count").should("exist");
- H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(0, "Databases").click();
cy.findByText("Products").click();
});
cy.findByTestId("data-step-cell").contains("Products");
@@ -128,8 +127,8 @@ describe("scenarios > question > new", () => {
});
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
// Note: collection name's first letter is capitalized
cy.findByText(/foo:bar/i).click();
cy.findByText("Orders");
@@ -143,10 +142,9 @@ describe("scenarios > question > new", () => {
});
H.startNewQuestion();
-
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
- assertDataPickerEntitySelected(0, "Our analytics");
+ H.entityPickerModalItem(0, "Our analytics").click();
cy.findByText("First collection").should("exist");
cy.findByText("Second collection").should("not.exist");
cy.findByText("Third collection").should("not.exist");
@@ -169,15 +167,18 @@ describe("scenarios > question > new", () => {
cy.signOut();
cy.signIn("nocollection");
H.startNewQuestion();
- H.entityPickerModal().findByText("Orders").click();
+ H.miniPickerBrowseAll().click();
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalItem(1, "Orders").click();
H.visualize();
H.saveQuestion("Personal question");
cy.signOut();
cy.signInAsAdmin();
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.entityPickerModalItem(0, "Our analytics").click();
cy.findByText("All personal collections").click();
cy.findByText(H.getPersonalCollectionName(USERS.nocollection)).click();
cy.findByText("Personal question").click();
@@ -252,9 +253,10 @@ describe("scenarios > question > new", () => {
H.popover().findByText("Question").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.findByText("Orders").click();
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalItem(1, "Orders").click();
});
cy.log(
@@ -262,7 +264,8 @@ describe("scenarios > question > new", () => {
);
cy.findByRole("button", { name: /Orders/ }).click();
- H.shouldDisplayTabs(["Recents", "Tables", "Collections"]);
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModalTab("Recents").click();
cy.findByRole("dialog", { name: "Pick your starting data" })
.findByRole("button", { name: /Orders/ })
@@ -360,8 +363,8 @@ describe("scenarios > question > new", () => {
cy.findByLabelText("Navigation bar").findByText("New").click();
H.popover().findByText("Question").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
cy.findByText("Orders").click();
});
cy.findByTestId("qb-header").findByText("Save").click();
@@ -411,8 +414,9 @@ describe("scenarios > question > new", () => {
cy.findByLabelText("Navigation bar").findByText("New").click();
H.popover().findByText("Question").click();
+
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
cy.findByText("Orders").click();
});
cy.findByTestId("qb-header").findByText("Save").click();
@@ -510,8 +514,8 @@ describe("scenarios > question > new", () => {
});
it("should hide public collections when selecting a dashboard for a question in a personal collection", () => {
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -543,8 +547,8 @@ describe("scenarios > question > new", () => {
});
it("should show all collections when selecting a dashboard for a question in a public collection", () => {
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -579,8 +583,8 @@ describe("scenarios > question > new", () => {
describe("creating a new dashboard", () => {
beforeEach(() => {
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -605,6 +609,7 @@ describe("scenarios > question > new", () => {
});
it("when selecting a collection", () => {
+ // H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
H.entityPickerModalTab("Dashboards").click();
H.entityPickerModalItem(1, "Collection in root collection").click();
@@ -712,11 +717,10 @@ describe(
it("can create a question from the sample database", () => {
cy.visit("/question/new");
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").should("be.visible");
- H.entityPickerModalTab("Tables").click();
-
- H.entityPickerModalItem(2, "Products").click();
+ H.entityPickerModalLevel(0).findByText("Databases").click();
+ H.entityPickerModalItem(3, "Products").click();
});
// strange: we get different behavior when we go to question/new
@@ -730,8 +734,8 @@ describe(
it("can create a question from a saved question", () => {
cy.visit("/question/new");
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
H.entityPickerModalItem(1, "Orders").click();
});
@@ -754,20 +758,19 @@ describe(
cy.visit("/question/notebook");
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.tabsShouldBe("Tables", ["Tables", "Collections"]);
- H.entityPickerModalTab("Collections").should("be.visible");
- H.entityPickerModalTab("Tables").should("be.visible");
- H.entityPickerModalTab("Collections").click();
H.entityPickerModalItem(1, "Orders Model").click();
});
cy.wait("@recents");
cy.button(/Orders Model/).click();
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.tabsShouldBe("Collections", ["Recents", "Tables", "Collections"]);
+ H.tabsShouldBe("Collections", ["Recents", "Data"]);
H.entityPickerModalTab("Recents").click();
cy.findByTestId("result-item").should("contain.text", "Orders Model");
});
diff --git a/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts b/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts
index eb1b6ec61c4..bef6c453b74 100644
--- a/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts
+++ b/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts
@@ -25,63 +25,35 @@ describe("scenarios > notebook > data source", () => {
cy.visit("/");
cy.findByTestId("app-bar").findByText("New").click();
H.popover().findByTextEnsureVisible("Question").click();
- cy.findByTestId("data-step-cell").should(
- "have.text",
- "Pick your starting data",
+ cy.findByPlaceholderText("Search for tables and more...").should(
+ "exist",
);
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
cy.log("Should not have Recents tab");
- cy.findAllByRole("tab").should("have.length", 0);
-
- H.entityPickerModalLevel(0).should("not.exist");
- H.entityPickerModalLevel(1).should("not.exist");
- H.entityPickerModalLevel(2)
- .get("[data-index]")
+ cy.findAllByRole("tab").should("not.exist");
+
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalLevel(0)
+ .findByText("Sample Database")
+ .should("not.exist");
+ H.entityPickerModalLevel(3)
+ .find("[data-index]")
.should("have.length", 8);
- assertDataPickerEntityNotSelected(2, "Accounts");
- assertDataPickerEntityNotSelected(2, "Analytic Events");
- assertDataPickerEntityNotSelected(2, "Feedback");
- assertDataPickerEntityNotSelected(2, "Invoices");
- assertDataPickerEntityNotSelected(2, "Orders");
- assertDataPickerEntityNotSelected(2, "People");
- assertDataPickerEntityNotSelected(2, "Products");
- assertDataPickerEntityNotSelected(2, "Reviews");
+ assertDataPickerEntityNotSelected(3, "Accounts");
+ assertDataPickerEntityNotSelected(3, "Analytic Events");
+ assertDataPickerEntityNotSelected(3, "Feedback");
+ assertDataPickerEntityNotSelected(3, "Invoices");
+ assertDataPickerEntityNotSelected(3, "Orders");
+ assertDataPickerEntityNotSelected(3, "People");
+ assertDataPickerEntityNotSelected(3, "Products");
+ assertDataPickerEntityNotSelected(3, "Reviews");
});
},
);
- it("should not show saved questions if only models exist (metabase#25142)", () => {
- H.createQuestion({
- name: "GUI Model",
- query: { "source-table": REVIEWS_ID, limit: 1 },
- display: "table",
- type: "model",
- });
-
- H.startNewQuestion();
- H.entityPickerModal().within(() => {
- cy.findAllByRole("tab").should("have.length", 2);
- H.entityPickerModalTab("Tables").should("exist");
- H.entityPickerModalTab("Collections").should("exist");
- });
- });
-
- it("should not show models if only saved questions exist", () => {
- H.createQuestion({
- name: "GUI Question",
- query: { "source-table": REVIEWS_ID, limit: 1 },
- display: "table",
- });
-
- H.startNewQuestion();
-
- H.entityPickerModal().within(() => {
- H.shouldDisplayTabs(["Tables", "Collections"]);
- });
- });
-
- it("should include dashboard questions when computing which tabs to show (metabase#56887)", () => {
+ it("should include dashboard questions (metabase#56887)", () => {
const QUESTION_NAME = "Find me";
H.createDashboard({
@@ -101,10 +73,7 @@ describe("scenarios > notebook > data source", () => {
H.startNewQuestion();
- H.entityPickerModal().should("exist");
- H.tabsShouldBe("Tables", ["Tables", "Collections"]);
-
- H.entityPickerModalTab("Collections").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModalItem(1, "Test Dashboard").click();
H.entityPickerModalItem(2, QUESTION_NAME).should("exist");
});
@@ -120,13 +89,15 @@ describe("scenarios > notebook > data source", () => {
H.openReviewsTable();
H.openNotebook();
cy.findByTestId("data-step-cell").should("have.text", "Reviews").click();
+ H.miniPickerHeader().should("contain", "Sample Database");
+ H.miniPicker().findByText("Reviews");
+
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.tabsShouldBe("Tables", ["Tables", "Collections"]);
- // should not show databases step if there's only 1 database
- H.entityPickerModalLevel(0).should("not.exist");
// should not show schema step if there's only 1 schema
- H.entityPickerModalLevel(1).should("not.exist");
- assertDataPickerEntitySelected(2, "Reviews");
+ H.entityPickerModalLevel(2).should("not.exist");
+ assertDataPickerEntitySelected(3, "Reviews");
});
});
@@ -134,13 +105,15 @@ describe("scenarios > notebook > data source", () => {
H.visitQuestion(ORDERS_COUNT_QUESTION_ID);
H.openNotebook();
cy.findByTestId("data-step-cell").should("have.text", "Orders").click();
+ H.miniPickerHeader().should("contain", "Sample Database");
+ H.miniPicker().findByText("Orders");
+
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.tabsShouldBe("Tables", ["Tables", "Collections"]);
- // should not show databases step if there's only 1 database
- H.entityPickerModalLevel(0).should("not.exist");
// should not show schema step if there's only 1 schema
- H.entityPickerModalLevel(1).should("not.exist");
- assertDataPickerEntitySelected(2, "Orders");
+ H.entityPickerModalLevel(2).should("not.exist");
+ assertDataPickerEntitySelected(3, "Orders");
});
});
@@ -167,8 +140,7 @@ describe("scenarios > notebook > data source", () => {
});
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText(dbName).click();
cy.findByText(schemaName).click();
cy.findByText(tableName).click();
@@ -178,28 +150,23 @@ describe("scenarios > notebook > data source", () => {
H.openNotebook();
cy.findByTestId("data-step-cell").should("contain", tableName).click();
- H.entityPickerModal().within(() => {
- assertDataPickerEntitySelected(0, dbName);
- assertDataPickerEntitySelected(1, schemaName);
- assertDataPickerEntitySelected(2, tableName);
-
- H.entityPickerModalTab("Recents").click();
- cy.contains("button", "Animals")
- .should("exist")
- .and("contain.text", tableName)
- .and("have.attr", "aria-selected", "true");
+ H.miniPickerHeader().should("contain", schemaName);
+ H.miniPicker().findByText(tableName).should("exist");
- H.entityPickerModalTab("Tables").click();
- cy.findByText(dbName).click();
- cy.findByText(schemaName).click();
+ cy.realType("a"); // start typing to expose mini-picker "Browse all" option
+ H.miniPickerBrowseAll().click();
+ H.entityPickerModal().within(() => {
+ assertDataPickerEntitySelected(1, dbName);
+ assertDataPickerEntitySelected(2, schemaName);
+ assertDataPickerEntitySelected(3, tableName);
cy.findByText(tableName).click();
});
cy.log("select a table from the second schema");
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.findByText("Public").click();
+ H.miniPicker().within(() => {
+ cy.findByText(dbName).click();
+ cy.findByText("public").click();
cy.findByText("Many Data Types").click();
});
H.popover().findByText("Name").click();
@@ -207,8 +174,8 @@ describe("scenarios > notebook > data source", () => {
cy.log("select a table from the third schema");
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText(dbName).click();
cy.findByText("Domestic").click();
cy.findByText("Animals").click();
});
@@ -221,17 +188,9 @@ describe("scenarios > notebook > data source", () => {
cy.visit(`/model/${ORDERS_MODEL_ID}/query`);
cy.findByTestId("data-step-cell").should("have.text", "Orders").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").should(
- "have.attr",
- "aria-selected",
- "true",
- );
- // should not show databases step if there's only 1 database
- H.entityPickerModalLevel(0).should("not.exist");
- // should not show schema step if there's only 1 schema
- H.entityPickerModalLevel(1).should("not.exist");
- assertDataPickerEntitySelected(2, "Orders");
+ H.miniPicker().within(() => {
+ H.miniPickerHeader().should("contain", "Sample Database");
+ cy.findByText("Orders").should("exist");
});
});
});
@@ -257,14 +216,7 @@ describe("scenarios > notebook > data source", () => {
.should("have.text", modelDetails.name)
.click();
- H.entityPickerModal().within(() => {
- H.shouldDisplayTabs(["Tables", "Collections"]);
-
- assertDataPickerEntitySelected(0, "Our analytics");
- assertDataPickerEntitySelected(1, "First collection");
- assertDataPickerEntitySelected(2, "Second collection");
- assertDataPickerEntitySelected(3, checkNotNull(modelDetails.name));
-
+ H.miniPicker().within(() => {
cy.findByText(checkNotNull(modelDetails.name))
.should("exist")
.and("contain.text", checkNotNull(modelDetails.name));
@@ -276,12 +228,12 @@ describe("scenarios > notebook > data source", () => {
H.openNotebook();
openDataSelector();
+ H.miniPickerHeader().should("contain", "Our analytics");
+ H.miniPicker().findByText("Orders Model").should("exist");
+
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").should(
- "have.attr",
- "aria-selected",
- "true",
- );
assertDataPickerEntitySelected(0, "Our analytics");
assertDataPickerEntitySelected(1, "Orders Model");
@@ -291,12 +243,14 @@ describe("scenarios > notebook > data source", () => {
moveToCollection("First collection");
openDataSelector();
+
+ H.miniPickerHeader().should("contain", "First collection");
+ H.miniPicker().findByText("Orders Model").should("exist");
+
+ H.miniPickerHeader().click();
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").should(
- "have.attr",
- "aria-selected",
- "true",
- );
assertDataPickerEntitySelected(0, "Our analytics");
assertDataPickerEntitySelected(1, "First collection");
assertDataPickerEntitySelected(2, "Orders Model");
@@ -326,12 +280,12 @@ describe("scenarios > notebook > data source", () => {
H.visitQuestion("@nestedQuestionId");
H.openNotebook();
openDataSelector();
+ H.miniPickerHeader().should("contain", "Our analytics");
+ H.miniPicker().findByText(sourceQuestionName).should("exist");
+
+ H.miniPickerHeader().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").should(
- "have.attr",
- "aria-selected",
- "true",
- );
assertDataPickerEntitySelected(0, "Our analytics");
assertDataPickerEntitySelected(1, sourceQuestionName);
@@ -348,12 +302,12 @@ describe("scenarios > notebook > data source", () => {
H.openNotebook();
openDataSelector();
+ H.miniPickerHeader().should("contain", "First collection");
+ H.miniPicker().findByText(sourceQuestionName).should("exist");
+
+ H.miniPickerHeader().click().click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").should(
- "have.attr",
- "aria-selected",
- "true",
- );
assertDataPickerEntitySelected(0, "Our analytics");
assertDataPickerEntitySelected(1, "First collection");
assertDataPickerEntitySelected(2, sourceQuestionName);
@@ -362,28 +316,6 @@ describe("scenarios > notebook > data source", () => {
});
});
-describe("scenarios > notebook > data source", { tags: "@OSS" }, () => {
- beforeEach(() => {
- H.restore("setup");
- cy.signInAsAdmin();
- });
-
- it("should not show saved questions if only models exist (metabase#25142)", () => {
- H.createQuestion({
- name: "GUI Model",
- query: { "source-table": REVIEWS_ID, limit: 1 },
- display: "table",
- type: "model",
- });
- H.startNewQuestion();
- H.entityPickerModal().within(() => {
- cy.findAllByRole("tab").should("have.length", 2);
- H.entityPickerModalTab("Tables").should("be.visible");
- H.entityPickerModalTab("Collections").should("be.visible");
- });
- });
-});
-
describe("issue 34350", { tags: "@external" }, () => {
beforeEach(() => {
H.restore("postgres-12");
@@ -393,7 +325,8 @@ describe("issue 34350", { tags: "@external" }, () => {
it("works after changing question's source table to a one from a different database (metabase#34350)", () => {
H.openOrdersTable({ mode: "notebook" });
openDataSelector();
- H.entityPickerModal().within(() => {
+ H.miniPicker().within(() => {
+ H.miniPickerHeader().click();
cy.findByText("QA Postgres12").click();
cy.findByText("Orders").click();
});
@@ -428,15 +361,16 @@ describe("issue 28106", () => {
H.startNewQuestion();
cy.wait(["@getRootCollection", "@getTree"]);
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ cy.findByText("Databases").click();
cy.findByText("Writable Postgres12").click();
- H.entityPickerModalLevel(1)
+ H.entityPickerModalLevel(2)
.findByTestId("scroll-container")
.as("schemasList");
- H.entityPickerModalLevel(2).should("contain", "Animals");
+ H.entityPickerModalLevel(3).should("contain", "Animals");
cy.get("@schemasList").scrollTo("bottom");
@@ -459,8 +393,7 @@ describe("issue 28106", () => {
);
});
-// Needs to be OSS because EE will always have models due to instance analytics
-describe("issue 32252", { tags: "@OSS" }, () => {
+describe("issue 32252", () => {
beforeEach(() => {
H.restore("setup");
cy.signInAsAdmin();
@@ -486,28 +419,26 @@ describe("issue 32252", { tags: "@OSS" }, () => {
cy.visit("/");
H.newButton("Question").click();
- H.entityPickerModal().within(() => {
- cy.findByTestId("loading-indicator").should("not.exist");
- cy.findByText("Recents").should("not.exist");
- cy.findByText("Collections").should("be.visible");
- cy.button("Close").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("My collection").click();
+ cy.findByText("My question").should("exist");
});
cy.findByTestId("sidebar-toggle").click();
H.navigationSidebar().findByText("Our analytics").click();
- cy.button("Actions").click();
+ cy.findAllByRole("button", { name: "Actions" }).eq(0).click();
H.popover().findByText("Move to trash").click();
cy.findByTestId("toast-undo")
.findByText("Trashed collection")
.should("be.visible");
H.newButton("Question").click();
- H.entityPickerModal().within(() => {
- cy.findByTestId("loading-indicator").should("not.exist");
- cy.findByText("Recents").should("not.exist");
- cy.findByText("Collections").should("not.exist");
- cy.findByText("Orders").should("be.visible");
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("My collection").should("not.exist");
+ cy.findByText("My question").should("not.exist");
});
});
@@ -515,17 +446,18 @@ describe("issue 32252", { tags: "@OSS" }, () => {
cy.visit("/");
H.newButton("Question").click();
- H.entityPickerModal().within(() => {
- cy.findByTestId("loading-indicator").should("not.exist");
- cy.findByText("Recents").should("not.exist");
- cy.findByText("Collections").should("be.visible");
- cy.button("Close").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("My collection").click();
+ cy.findByText("My question").should("exist");
});
cy.findByTestId("sidebar-toggle").click();
H.navigationSidebar().findByText("Our analytics").click();
- cy.findByTestId("collection-entry-name").click();
+ cy.findAllByTestId("collection-entry-name")
+ .findByText("My collection")
+ .click();
cy.button("Actions").click();
H.popover().findByText("Move to trash").click();
cy.findByTestId("toast-undo")
@@ -533,11 +465,10 @@ describe("issue 32252", { tags: "@OSS" }, () => {
.should("be.visible");
H.newButton("Question").click();
- H.entityPickerModal().within(() => {
- cy.findByTestId("loading-indicator").should("not.exist");
- cy.findByText("Recents").should("not.exist");
- cy.findByText("Collections").should("not.exist");
- cy.findByText("Orders").should("be.visible");
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
+ cy.findByText("My collection").should("not.exist");
+ cy.findByText("My question").should("not.exist");
});
});
});
diff --git a/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts b/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts
index 6019c995ae1..b60e16486e8 100644
--- a/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts
+++ b/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts
@@ -52,10 +52,8 @@ describe("scenarios > notebook > link to data source", () => {
cy.log("Normal click on the data source still opens the entity picker");
H.getNotebookStep("data").findByText("Reviews").click();
- cy.findByTestId("entity-picker-modal").within(() => {
- cy.findByText("Pick your starting data").should("be.visible");
- cy.findByLabelText("Close").click();
- });
+ H.miniPicker().should("exist");
+ H.miniPicker().findByText("Reviews").click(); // close miniPicker
cy.log("Meta/Ctrl click on the fields picker behaves as a regular click");
H.getNotebookStep("data").findByTestId("fields-picker").click(clickConfig);
@@ -427,12 +425,11 @@ describe("scenarios > notebook > link to data source", () => {
"Even if user opens the notebook link directly, they should not see the source question. We open the entity picker instead",
);
cy.visit(`/question/${nestedQuestion.id}/notebook`);
- cy.findByTestId("entity-picker-modal").within(() => {
- cy.findByText("Pick your starting data").should("be.visible");
- cy.findByLabelText("Close").click();
- });
- H.getNotebookStep("data").should("contain", "Pick your starting data");
+ H.getNotebookStep("data")
+ .findByPlaceholderText("Search for tables and more...")
+ .should("exist");
+ H.miniPicker().should("be.visible");
cy.log(
"The same should be true for a user that additionally doesn't have write query permissions",
@@ -517,8 +514,8 @@ describe("scenarios > notebook > link to data source", () => {
H.openProductsTable({ mode: "notebook" });
cy.findByTestId("action-buttons").button("Join data").click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
diff --git a/e2e/test/scenarios/question/notebook-native-preview-sidebar.cy.spec.ts b/e2e/test/scenarios/question/notebook-native-preview-sidebar.cy.spec.ts
index 726c79b6789..5bdffeea675 100644
--- a/e2e/test/scenarios/question/notebook-native-preview-sidebar.cy.spec.ts
+++ b/e2e/test/scenarios/question/notebook-native-preview-sidebar.cy.spec.ts
@@ -28,9 +28,9 @@ describe("scenarios > question > notebook > native query preview sidebar", () =>
cy.findByTestId("app-bar").findByLabelText("New").click();
H.popover().findByTextEnsureVisible("Question").click();
- cy.findByTestId("data-step-cell").should(
- "have.text",
- "Pick your starting data",
+ H.miniPickerBrowseAll().click();
+ cy.findByPlaceholderText("Search for tables and more...").should(
+ "be.visible",
);
H.entityPickerModal().button("Close").click();
@@ -328,8 +328,7 @@ describe(
it("should work for both simple and nested questions based on previously converted GUI query", () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
cy.findByText(MONGO_DB_NAME).click();
cy.findByText("Products").click();
});
diff --git a/e2e/test/scenarios/question/notebook.cy.spec.js b/e2e/test/scenarios/question/notebook.cy.spec.js
index b1f0898740a..3eb1ae1bc72 100644
--- a/e2e/test/scenarios/question/notebook.cy.spec.js
+++ b/e2e/test/scenarios/question/notebook.cy.spec.js
@@ -234,9 +234,9 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
cy.signInAsAdmin();
cy.viewport(1280, 720);
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- H.entityPickerModalItem(2, "Orders").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
+ cy.findByText("Orders").click();
});
});
@@ -467,8 +467,8 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
H.openNotebook();
H.join();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Products model").click();
});
@@ -477,8 +477,8 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
it('should not show "median" aggregation option for databases that do not support "percentile-aggregations" driver feature', () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -580,12 +580,14 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
H.getNotebookStep("data")
.as("dataStep")
.within(() => {
- cy.findByText("Pick your starting data").should("exist");
+ cy.findByPlaceholderText("Search for tables and more...").should(
+ "exist",
+ );
cy.icon("play").should("not.be.visible");
});
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
@@ -900,7 +902,8 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
it("should not leave the UI in broken state after adding an aggregation (metabase#48358)", () => {
cy.visit("/");
H.newButton("Question").click();
- H.entityPickerModal().findByText("Products").click();
+ H.miniPicker().findByText("Sample Database").click();
+ H.miniPicker().findByText("Products").click();
H.addSummaryField({ metric: "Sum of ...", field: "Price" });
H.addSummaryGroupingField({ field: "Created At" });
H.addSummaryGroupingField({ field: "Category" });
@@ -976,7 +979,7 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
.findByText("Use the notebook editor")
.click();
- H.entityPickerModal().should("be.visible");
+ H.miniPicker().should("be.visible");
// Cypress can emulate the browser's back button with cy.go('back'), but
// this does not trigger a confirmation modal, so we need to perform a
@@ -997,7 +1000,8 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
it("shows all available columns and groups in the breakout picker (metabase#46832)", () => {
cy.visit("/");
H.newButton("Question").click();
- H.entityPickerModal().findByText("Orders").click();
+ H.miniPicker().findByText("Sample Database").click();
+ H.miniPicker().findByText("Orders").click();
H.join();
H.joinTable("Reviews", "Product ID", "Product ID");
H.addSummaryField({ metric: "Count of rows" });
@@ -1047,7 +1051,8 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
it("should allow using aggregation functions inside expressions in aggregation (metabase#52611)", () => {
cy.visit("/");
H.newButton("Question").click();
- H.entityPickerModal().findByText("Orders").click();
+ H.miniPicker().findByText("Sample Database").click();
+ H.miniPicker().findByText("Orders").click();
H.addSummaryField({ metric: "Custom Expression" });
H.enterCustomColumnDetails({
formula: "case(Sum([Total]) > 10, Sum([Total]), Sum([Subtotal]))",
diff --git a/e2e/test/scenarios/question/offset.cy.spec.ts b/e2e/test/scenarios/question/offset.cy.spec.ts
index 02e71a57a12..a71b3b41157 100644
--- a/e2e/test/scenarios/question/offset.cy.spec.ts
+++ b/e2e/test/scenarios/question/offset.cy.spec.ts
@@ -427,8 +427,8 @@ describe("scenarios > question > offset", () => {
const breakoutName = "Created At";
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
addCustomAggregation({
@@ -471,8 +471,8 @@ describe("scenarios > question > offset", () => {
];
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
addCustomAggregation({
diff --git a/e2e/test/scenarios/question/saved.cy.spec.js b/e2e/test/scenarios/question/saved.cy.spec.js
index 28395477956..4c98554e590 100644
--- a/e2e/test/scenarios/question/saved.cy.spec.js
+++ b/e2e/test/scenarios/question/saved.cy.spec.js
@@ -374,8 +374,8 @@ describe("scenarios > question > saved", () => {
.findByText("Use the notebook editor")
.click();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Sample Database").click();
cy.findByText("Products").click();
});
diff --git a/e2e/test/scenarios/sharing/downloads/downloads.cy.spec.js b/e2e/test/scenarios/sharing/downloads/downloads.cy.spec.js
index 6b537750173..e6d2b5688fe 100644
--- a/e2e/test/scenarios/sharing/downloads/downloads.cy.spec.js
+++ b/e2e/test/scenarios/sharing/downloads/downloads.cy.spec.js
@@ -52,8 +52,8 @@ describe("scenarios > question > download", () => {
testCases.forEach((fileType) => {
it(`downloads ${fileType} file`, () => {
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.findByText("Orders, Count").click();
});
diff --git a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
index 5e939ad14f2..4ad59cedad3 100644
--- a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
+++ b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
@@ -242,9 +242,10 @@ describe("#39152 sharing an unsaved question", () => {
it("should ask the user to save the question before creating a public link", () => {
H.startNewQuestion();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.findByText("People").click();
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalItem(1, "People").click();
});
H.visualize();
diff --git a/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.js
index 63e93391daf..ff72b63c1cc 100644
--- a/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.js
@@ -245,8 +245,8 @@ describe("scenarios > visualizations > drillthroughs > chart drill", () => {
});
// Build a new question off that grouping by City
H.startNewQuestion();
- H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Collections").click();
+ H.miniPicker().within(() => {
+ cy.findByText("Our analytics").click();
cy.contains("CA People").click();
});
diff --git a/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js
index 261c93182be..f1bcf5e1cad 100644
--- a/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-tabular/table.cy.spec.js
@@ -15,9 +15,10 @@ describe("scenarios > visualizations > table", () => {
function joinTable(table) {
cy.findByText("Join data").click();
+ H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
- H.entityPickerModalTab("Tables").click();
- cy.findByText(table).click();
+ H.entityPickerModalItem(0, "Databases").click();
+ H.entityPickerModalItem(1, table).click();
});
}
diff --git a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
index d5c57da6909..c0a8b676a79 100644
--- a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
+++ b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
@@ -18,6 +18,7 @@
[metabase-enterprise.comments.api]
[metabase-enterprise.content-translation.routes]
[metabase-enterprise.content-verification.api.routes]
+ [metabase-enterprise.data-studio.api]
[metabase-enterprise.database-replication.api :as database-replication.api]
[metabase-enterprise.database-routing.api]
[metabase-enterprise.dependencies.api]
@@ -25,6 +26,7 @@
[metabase-enterprise.email.api]
[metabase-enterprise.embedding-hub.api]
[metabase-enterprise.gsheets.api :as gsheets.api]
+ [metabase-enterprise.library.api]
[metabase-enterprise.llm.api]
[metabase-enterprise.metabot-v3.api]
[metabase-enterprise.metabot-v3.tools.api]
@@ -57,6 +59,7 @@
:ai-entity-analysis (deferred-tru "AI Entity Analysis")
:collection-cleanup (deferred-tru "Collection Cleanup")
:content-translation (deferred-tru "Content translation")
+ :data-studio (deferred-tru "Data Studio")
:dependencies (deferred-tru "Dependency Tracking")
:documents (deferred-tru "Documents")
:embedding (deferred-tru "Embedding")
@@ -107,6 +110,7 @@
"/content-translation" (premium-handler metabase-enterprise.content-translation.routes/routes :content-translation)
"/cloud-add-ons" metabase-enterprise.cloud-add-ons.api/routes
"/comment" (premium-handler metabase-enterprise.comments.api/routes :documents)
+ "/data-studio" (premium-handler metabase-enterprise.data-studio.api/routes :data-studio)
"/database-replication" (-> database-replication.api/routes ;; database-replication requires all these features.
(premium-handler :attached-dwh)
(premium-handler :etl-connections)
@@ -120,6 +124,7 @@
"/gsheets" (-> gsheets.api/routes ;; gsheets requires both features.
(premium-handler :attached-dwh)
(premium-handler :etl-connections))
+ "/library" (premium-handler metabase-enterprise.library.api/routes :data-studio)
"/logs" (premium-handler 'metabase-enterprise.advanced-config.api.logs :audit-app)
"/metabot-tools" metabase-enterprise.metabot-v3.tools.api/routes
"/metabot-v3" (premium-handler metabase-enterprise.metabot-v3.api/routes :metabot-v3)
diff --git a/enterprise/backend/src/metabase_enterprise/data_studio/api.clj b/enterprise/backend/src/metabase_enterprise/data_studio/api.clj
new file mode 100644
index 00000000000..b95c994f147
--- /dev/null
+++ b/enterprise/backend/src/metabase_enterprise/data_studio/api.clj
@@ -0,0 +1,10 @@
+(ns metabase-enterprise.data-studio.api
+ "`/api/ee/data-studio/` routes"
+ (:require
+ [metabase-enterprise.data-studio.api.table]
+ [metabase.api.util.handlers :as handlers]))
+
+(def ^{:arglists '([request respond raise])} routes
+ "`/api/ee/data-studio` routes."
+ (handlers/route-map-handler
+ {"/table" metabase-enterprise.data-studio.api.table/routes}))
diff --git a/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
new file mode 100644
index 00000000000..06acffd7da6
--- /dev/null
+++ b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
@@ -0,0 +1,212 @@
+(ns metabase-enterprise.data-studio.api.table
+ "/api/ee/data-studio/table endpoints for bulk table operations."
+ (:require
+ [clojure.string :as str]
+ [metabase.api.common :as api]
+ [metabase.api.macros :as api.macros]
+ [metabase.api.routes.common :refer [+auth]]
+ [metabase.collections.core :as collections]
+ [metabase.database-routing.core :as database-routing]
+ [metabase.driver.settings :as driver.settings]
+ [metabase.driver.util :as driver.u]
+ [metabase.events.core :as events]
+ [metabase.lib-be.core :as lib-be]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.queries.core :as queries]
+ [metabase.request.core :as request]
+ [metabase.sync.core :as sync]
+ [metabase.util :as u]
+ [metabase.util.jvm :as u.jvm]
+ [metabase.util.log :as log]
+ [metabase.util.malli :as mu]
+ [metabase.util.malli.registry :as mr]
+ [metabase.util.malli.schema :as ms]
+ [metabase.util.quick-task :as quick-task]
+ [metabase.warehouse-schema.models.table :as table]
+ [toucan2.core :as t2]
+ [toucan2.realize :as t2.realize]))
+
+(set! *warn-on-reflection* true)
+
+(mr/def ::table-selectors
+ [:map
+ ;; disjunctive filters (e.g. db_id IN $database_ids OR id IN $table_ids)
+ [:database_ids {:optional true} [:sequential ms/PositiveInt]]
+ [:schema_ids {:optional true} [:sequential :string]]
+ [:table_ids {:optional true} [:sequential ms/PositiveInt]]])
+
+(mu/defn ^:private table-selectors->filter
+ [{:keys [database_ids table_ids schema_ids]}]
+ (let [schema-expr (fn [s]
+ (let [[schema-db-id schema-name] (str/split s #"\:")]
+ [:and [:= :db_id (parse-long schema-db-id)] [:= :schema schema-name]]))]
+ (cond-> [:or false]
+ (seq database_ids) (conj [:in :db_id (sort database_ids)])
+ (seq table_ids) (conj [:in :id (sort table_ids)])
+ (seq schema_ids) (conj (into [:or] (map schema-expr) (sort schema_ids))))))
+
+(mr/def ::data-layers
+ (into [:enum {:decode/string keyword}] table/data-layers))
+
+(mr/def ::data-sources
+ (into [:enum {:decode/string keyword}] table/data-sources))
+
+(mr/def ::data-authorities
+ (into [:enum {:decode/string keyword}] table/writable-data-authority-types))
+
+(defn- sync-unhidden-tables
+ "Function to call on newly unhidden tables. Starts a thread to sync all tables. Groups tables by database to
+ efficiently sync tables from different databases."
+ [newly-unhidden]
+ (when (seq newly-unhidden)
+ (u.jvm/in-virtual-thread*
+ (fn []
+ (doseq [[db-id tables] (group-by :db_id newly-unhidden)]
+ (let [database (t2/select-one :model/Database db-id)]
+ ;; it's okay to allow testing H2 connections during sync. We only want to disallow you from testing them for the
+ ;; purposes of creating a new H2 database.
+ (if (binding [driver.settings/*allow-testing-h2-connections* true]
+ (driver.u/can-connect-with-details? (:engine database) (:details database)))
+ (doseq [table tables]
+ (log/info (u/format-color :green "Table '%s' is now visible. Resyncing." (:name table)))
+ (sync/sync-table! table))
+ (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync unhidden tables"
+ (:name database))))))))))
+
+(defn- maybe-sync-unhidden-tables!
+ [existing-tables {:keys [data_layer] :as body}]
+ ;; sync any tables that are changed from copper to something else
+ (sync-unhidden-tables (when (and (contains? body :data_layer) (not= :copper data_layer))
+ (filter #(= :copper (:data_layer %)) existing-tables))))
+
+(api.macros/defendpoint :post "/edit"
+ "Bulk updating tables."
+ [_route-params
+ _query-params
+ body
+ :- [:merge
+ ::table-selectors
+ [:map {:closed true}
+ [:data_authority {:optional true} [:maybe ::data-authorities]]
+ [:data_source {:optional true} [:maybe ::data-sources]]
+ [:data_layer {:optional true} [:maybe ::data-layers]]
+ [:entity_type {:optional true} [:maybe :string]]
+ [:owner_email {:optional true} [:maybe :string]]
+ [:owner_user_id {:optional true} [:maybe :int]]]]]
+ (api/check-superuser)
+ (let [where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))
+ set-ks [:data_authority
+ :data_source
+ :data_layer
+ :owner_email
+ :owner_user_id
+ :entity_type]
+ existing-tables (t2/select :model/Table {:where where})
+ table-ids (set (map :id existing-tables))
+ set-map (select-keys body set-ks)]
+ (when (seq set-map)
+ (t2/update! :model/Table [:in table-ids] set-map)
+ (maybe-sync-unhidden-tables! existing-tables set-map))
+ {}))
+
+(defn- table->published-model
+ [{:keys [id name db_id] :as _table} creator-id collection-id]
+ {:name (format "Model based on %s" name)
+ :description (format "Base model for table %s " name)
+ :dataset_query (let [mp (lib-be/application-database-metadata-provider db_id)]
+ (lib/query mp (lib.metadata/table mp id)))
+ :type :model
+ :display :table
+ :visualization_settings {}
+ :creator_id creator-id
+ :collection_id collection-id
+ :published_table_id id})
+
+(api.macros/defendpoint :post "/publish-model"
+ "Create a model for each of selected tables"
+ [_route-params
+ _query-params
+ {:keys [target_collection_id]
+ :as body}
+ :- [:merge
+ ::table-selectors
+ [:map
+ [:target_collection_id [:maybe [:or pos-int? [:= "library"]]]]]]]
+ (api/check-superuser)
+ (let [target-collection (cond
+ (= "library" target_collection_id) (api/check-403 (collections/remote-synced-collection))
+ (nil? target_collection_id) nil
+ :else (api/check-404 (t2/select-one :model/Collection target_collection_id)))
+ where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))
+ created-models (t2/with-transaction [_conn]
+ (into []
+ (comp
+ (map t2.realize/realize)
+ (partition-all 20)
+ (mapcat (fn [batch]
+ (mapv (fn [table]
+ (queries/create-card! (table->published-model table api/*current-user-id* (:id target-collection)) @api/*current-user*))
+ batch))))
+ (t2/reducible-select :model/Table :active true {:where where})))]
+ {:created_count (count created-models)
+ :models created-models
+ :target_collection target-collection}))
+
+(defn- sync-schema-async!
+ [table user-id]
+ (events/publish-event! :event/table-manual-sync {:object table :user-id user-id})
+ (quick-task/submit-task! #(database-routing/with-database-routing-off (sync/sync-table! table))))
+
+(api.macros/defendpoint :post "/sync-schema"
+ "Batch version of /table/:id/sync_schema. Takes an abstract table selection as /table/edit does.
+ - Currently checks policy before returning (so you might receive a 4xx on e.g. AuthZ policy failure)
+ - The sync itself is however, asyncronous. This call may return before all tables synced."
+ [_
+ _
+ body :- ::table-selectors]
+ (api/check-superuser)
+ (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})
+ db-ids (sort (set (map :db_id tables)))]
+ (doseq [database (t2/select :model/Database :id [:in db-ids])]
+ (try
+ (binding [driver.settings/*allow-testing-h2-connections* true]
+ (driver.u/can-connect-with-details? (:engine database) (:details database) :throw-exceptions))
+ nil
+ (catch Throwable e
+ (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync tables" (:name database)))
+ (throw (ex-info (ex-message e) {:status-code 422})))))
+ (doseq [table tables]
+ (sync-schema-async! table api/*current-user-id*))
+ {:status :ok}))
+
+(api.macros/defendpoint :post "/rescan-values"
+ "Batch version of /table/:id/rescan_values. Takes an abstract table selection as /table/edit does."
+ [_
+ _
+ body :- ::table-selectors]
+ (api/check-superuser)
+ (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})]
+ ;; same permission skip as the single-table api, see comment in /:id/rescan_values
+ (doseq [table tables]
+ (events/publish-event! :event/table-manual-scan {:object table :user-id api/*current-user-id*})
+ (request/as-admin
+ (quick-task/submit-task! #(sync/update-field-values-for-table! table))))
+ {:status :ok}))
+
+(api.macros/defendpoint :post "/discard-values"
+ "Batch version of /table/:id/discard_values. Takes an abstract table selection as /table/edit does."
+ [_
+ _
+ body :- ::table-selectors]
+ (api/check-superuser)
+ (let [tables (t2/select :model/Table {:where (table-selectors->filter body), :order-by [[:id]]})]
+ (let [field-ids-to-delete-q {:select [:id]
+ :from [(t2/table-name :model/Field)]
+ :where [:in :table_id (map :id tables)]}]
+ (t2/delete! (t2/table-name :model/FieldValues) :field_id [:in field-ids-to-delete-q]))
+ {:status :ok}))
+
+(def ^{:arglists '([request respond raise])} routes
+ "`/api/ee/data-studio/table` routes."
+ (api.macros/ns-handler *ns* +auth))
diff --git a/enterprise/backend/src/metabase_enterprise/documents/models/document.clj b/enterprise/backend/src/metabase_enterprise/documents/models/document.clj
index 9a0f4072fb8..a3d8a9079ad 100644
--- a/enterprise/backend/src/metabase_enterprise/documents/models/document.clj
+++ b/enterprise/backend/src/metabase_enterprise/documents/models/document.clj
@@ -3,6 +3,7 @@
[clojure.string :as str]
[metabase-enterprise.documents.prose-mirror :as prose-mirror]
[metabase.api.common :as api]
+ [metabase.collections.models.collection :as collection]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
[metabase.public-sharing.core :as public-sharing]
@@ -228,3 +229,11 @@
(:attrs %)))
:when (contains? model->serdes-model model)]
{[(model->serdes-model model) link-id] {"Document" id}}))))))
+
+(t2/define-before-insert :model/Document [model]
+ (collection/check-allowed-content :model/Document (:collection_id model))
+ model)
+
+(t2/define-before-update :model/Document [model]
+ (collection/check-allowed-content :model/Document (:collection_id (t2/changes model)))
+ model)
diff --git a/enterprise/backend/src/metabase_enterprise/library/api.clj b/enterprise/backend/src/metabase_enterprise/library/api.clj
new file mode 100644
index 00000000000..a436b7ffb48
--- /dev/null
+++ b/enterprise/backend/src/metabase_enterprise/library/api.clj
@@ -0,0 +1,84 @@
+(ns metabase-enterprise.library.api
+ (:require
+ [metabase.api.common :as api]
+ [metabase.api.macros :as api.macros]
+ [metabase.api.routes.common :refer [+auth]]
+ [metabase.collections.core :as collections]
+ [metabase.collections.models.collection :as collection]
+ [toucan2.core :as t2]))
+
+(set! *warn-on-reflection* true)
+
+(api.macros/defendpoint :post "/"
+ "Creates the Library if it doesn't exist. Returns the created collection.
+
+ Requires superuser permissions."
+ [_route
+ _query
+ _body]
+ (api/check-superuser)
+ (api/check-400 (not (collections/library-collection)) "Library already exists")
+ (collections/create-library-collection!))
+
+(defn- add-here-and-below [collection]
+ (let [descendent-ids (map :id (collection/descendants-flat collection))
+ below (t2/select-fn-set :type [:model/Card :type] :collection_id [:in descendent-ids])]
+ ;; This function is only used on the root Library which cannot have items directly in it
+ ;; So can assume :here is only collection, and all descendants are :below
+ (assoc collection :here #{:collection}
+ :below (cond-> below
+ (contains? below :model)
+ (-> (disj :model) (conj :dataset))
+
+ true sort))))
+
+(api.macros/defendpoint :get "/"
+ "Get the Library. If no library exists, it doesn't fail but returns an empty response."
+ [_route
+ _query
+ _body]
+ (if-let [library (collections/library-collection)]
+ (-> (api/read-check library)
+ (t2/hydrate
+ :can_write
+ :effective_children)
+ (add-here-and-below))
+ {:message "Library does not exist"}))
+
+(defn- select-collections
+ []
+ (t2/select :model/Collection
+ {:where [:and
+ [:in :type [collection/library-collection-type
+ collection/library-models-collection-type
+ collection/library-metrics-collection-type]]
+ (collection/visible-collection-filter-clause
+ :id
+ {:include-archived-items :exclude
+ :include-trash-collection? false
+ :permission-level :read
+ :archive-operation-id nil})]
+ :order-by [[:%lower.name :asc]]}))
+
+(api.macros/defendpoint :get "/tree"
+ "This matches /api/collection/tree but only returns the library collection."
+ [_route-params
+ _query]
+ (let [collections (-> (select-collections)
+ (t2/hydrate :can_write))
+ collection-type-ids (reduce (fn [acc {collection-id :collection_id, card-type :type, :as _card}]
+ (update acc (case (keyword card-type)
+ :model :dataset
+ :metric :metric
+ :card) conj collection-id))
+ {:dataset #{}
+ :metric #{}
+ :card #{}}
+ (t2/reducible-query {:select-distinct [:collection_id :type]
+ :from [:report_card]
+ :where [:= :archived false]}))]
+ (collection/collections->tree collection-type-ids collections)))
+
+(def ^{:arglists '([request respond raise])} routes
+ "`/api/ee/library` routes."
+ (api.macros/ns-handler *ns* +auth))
diff --git a/enterprise/backend/src/metabase_enterprise/library/core.clj b/enterprise/backend/src/metabase_enterprise/library/core.clj
new file mode 100644
index 00000000000..7cb97cbf1dc
--- /dev/null
+++ b/enterprise/backend/src/metabase_enterprise/library/core.clj
@@ -0,0 +1,11 @@
+(ns metabase-enterprise.library.core
+ (:require
+ [metabase-enterprise.library.validation]
+ [potemkin :as p]))
+
+(comment
+ metabase-enterprise.library.validation/keep-me)
+
+(p/import-vars
+ [metabase-enterprise.library.validation
+ check-allowed-content])
diff --git a/enterprise/backend/src/metabase_enterprise/library/validation.clj b/enterprise/backend/src/metabase_enterprise/library/validation.clj
new file mode 100644
index 00000000000..2f36f5c2669
--- /dev/null
+++ b/enterprise/backend/src/metabase_enterprise/library/validation.clj
@@ -0,0 +1,36 @@
+(ns metabase-enterprise.library.validation
+ (:require
+ [clojure.set :as set]
+ [metabase.collections.models.collection :as collection]
+ [metabase.premium-features.core :refer [defenterprise]]
+ [toucan2.core :as t2]))
+
+(defenterprise check-allowed-content
+ "Check if the collection's content matches the allowed content.
+ Throws an exception if it does not"
+ :feature :data-studio
+ [content-type collection-id]
+ (when collection-id
+ (when-let [collection-type (t2/select-one-fn :type [:model/Collection :type] :id collection-id)]
+ (when (and (= collection-type collection/library-collection-type) (not (contains? #{collection/library-models-collection-type
+ collection/library-metrics-collection-type}
+ content-type)))
+ (throw (ex-info "Cannot add anything to the Library collection" {})))
+ (when (and (= collection-type collection/library-models-collection-type) (not (= :model content-type)))
+ (throw (ex-info "Can only add models to the 'Models' collection" {})))
+ (when (and (= collection-type collection/library-metrics-collection-type) (not (= :metric content-type)))
+ (throw (ex-info "Can only add metrics to the 'Metrics' collection" {})))))
+ true)
+
+(defenterprise check-library-update
+ "Checks that a collection of type `:data-studio` only contains allowed content."
+ metabase-enterprise.library.validation
+ :feature :data-studio
+ [collection]
+ (when (and (contains? #{collection/library-collection-type
+ collection/library-models-collection-type
+ collection/library-metrics-collection-type} (:type collection))
+ (seq (set/intersection (set (keys (t2/changes collection)))
+ #{:name :description :archived :location :personal_owner_id :slug :namespace :type :authority_level :is_sample})))
+ (throw (ex-info "Cannot update properties on a Library collection" {})))
+ true)
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/index.clj b/enterprise/backend/src/metabase_enterprise/semantic_search/index.clj
index 77117c1fffd..1c7df60e2d2 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/index.clj
+++ b/enterprise/backend/src/metabase_enterprise/semantic_search/index.clj
@@ -472,7 +472,7 @@
(defn- search-filters
"Generate WHERE conditions based on search context filters."
- [{:keys [archived? verified models created-at created-by last-edited-at last-edited-by table-db-id ids display-type]}]
+ [{:keys [archived? verified models created-at created-by last-edited-at last-edited-by table-db-id ids display-type collection]}]
(let [conditions (filter some?
[(when (some? archived?)
[:= :archived archived?])
@@ -486,6 +486,8 @@
[:in :last_editor_id last-edited-by])
(when table-db-id
[:= :database_id table-db-id])
+ (when collection
+ [:= :collection_id collection])
(when (seq ids)
[:in :model_id (map str ids)])
(when (seq display-type)
@@ -754,6 +756,22 @@
docs)))))
+(defn- filter-by-collection-id
+ "Filter documents by collection and all descendant collections."
+ [docs collection-id]
+ (let [collection-ids (keep :collection_id docs)
+ collections-map (when (seq collection-ids)
+ (->> (t2/select [:collection :id :location]
+ :id [:in collection-ids])
+ (into {} (map (juxt :id identity)))))]
+ (filterv (fn [doc]
+ (let [doc-collection-id (:collection_id doc)]
+ (or (= doc-collection-id collection-id)
+ (when doc-collection-id
+ (when-let [collection (get collections-map doc-collection-id)]
+ (str/starts-with? (:location collection) (str "/" collection-id "/")))))))
+ docs)))
+
(defn- apply-collection-filter
"Apply personal collection filtering with logging."
[search-context docs]
@@ -771,6 +789,23 @@
(analytics/inc! :metabase-search/semantic-collection-filter-ms time-ms)
filtered-docs))))
+(defn- apply-collection-id-filter
+ "Apply collection ID filtering with logging."
+ [search-context docs]
+ (let [collection-id (:collection search-context)]
+ (if (nil? collection-id)
+ docs
+ (let [timer (u/start-timer)
+ filtered-docs (filter-by-collection-id docs collection-id)
+ time-ms (u/since-ms timer)]
+ (log/debug "Collection filter" {:collection-id collection-id
+ :before (count docs)
+ :after (count filtered-docs)
+ :dropped (- (count docs) (count filtered-docs))
+ :time_ms time-ms})
+ (analytics/inc! :metabase-search/semantic-collection-id-filter-ms time-ms)
+ filtered-docs))))
+
(defn- reducible-search-query
"Extracted so can be redefd in tests."
[db query]
@@ -803,6 +838,7 @@
filtered-results (->> raw-results
filter-read-permitted
(apply-collection-filter search-context)
+ (apply-collection-id-filter search-context)
(mapv search/collapse-id))
filter-time-ms (u/since-ms filter-timer)
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/execute.clj b/enterprise/backend/src/metabase_enterprise/transforms/execute.clj
index 5409450fa00..7f4206eee54 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/execute.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms/execute.clj
@@ -59,7 +59,7 @@
run-id driver transform-details
(fn [_cancel-chan] (driver/run-transform! driver transform-details opts))))
(transforms.instrumentation/with-stage-timing [run-id [:import :table-sync]]
- (transforms.util/sync-target! target database run-id)
+ (transforms.util/sync-target! target database)
;; This event must be published only after the sync is complete - the new table needs to be in AppDB.
(events/publish-event! :event/transform-run-complete {:object transform-details}))))
(catch Throwable t
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/util.clj b/enterprise/backend/src/metabase_enterprise/transforms/util.clj
index 7fac5543d90..2e17951c7c8 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/util.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms/util.clj
@@ -128,15 +128,10 @@
(defn sync-target!
"Sync target of a transform"
- ([transform-id run-id]
- (let [{:keys [source target]} (t2/select-one :model/Transform transform-id)
- db (get-in source [:query :database])
- database (t2/select-one :model/Database db)]
- (sync-target! target database run-id)))
- ([target database _run-id]
- ;; sync the new table (note that even a failed sync status means that the execution succeeded)
- (log/info "Syncing target" (pr-str target) "for transform")
- (activate-table-and-mark-computed! database target)))
+ [target database]
+ ;; sync the new table (note that even a failed sync status means that the execution succeeded)
+ (log/info "Syncing target" (pr-str target) "for transform")
+ (activate-table-and-mark-computed! database target))
(defn target-table-exists?
"Test if the target table of a transform already exists."
@@ -160,16 +155,20 @@
([database target {:keys [create?]}]
(when-let [table (or (target-table (:id database) target)
(when create?
- (sync/create-table! database (select-keys target [:schema :name]))))]
+ (sync/create-table! database (select-keys target [:schema :name :data_source :data_authority]))))]
(sync/sync-table! table)
table)))
(defn activate-table-and-mark-computed!
"Activate table for `target` in `database` in the app db."
[database target]
- (when-let [table (sync-table! database target {:create? true})]
- (when (or (not (:active table)) (not (= (:data_authority table) :computed)))
- (t2/update! :model/Table (:id table) {:active true, :data_authority :computed}))))
+ (when-let [table (sync-table! database (assoc target
+ :data_authority :computed
+ :data_source :metabase-transform)
+ {:create? true})]
+ (when-not (:active table)
+ (t2/update! :model/Table (:id table) {:active true}))
+ table))
(defn deactivate-table!
"Deactivate table for `target` in `database` in the app db."
diff --git a/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj b/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj
index 1ce5109613a..75a6338559f 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms_python/execute.clj
@@ -341,7 +341,7 @@
result (transforms.instrumentation/with-stage-timing [run-id [:computation :python-execution]]
(transforms.util/run-cancelable-transform! run-id driver transform-details run-fn :ex-message-fn ex-message-fn))]
(transforms.instrumentation/with-stage-timing [run-id [:import :table-sync]]
- (transforms.util/sync-target! target db run-id))
+ (transforms.util/sync-target! target db))
{:run_id run-id
:result result}))
(catch Throwable t
diff --git a/enterprise/backend/test/metabase_enterprise/api/session_test.clj b/enterprise/backend/test/metabase_enterprise/api/session_test.clj
index 032b0a101fa..f68ccf39653 100644
--- a/enterprise/backend/test/metabase_enterprise/api/session_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/api/session_test.clj
@@ -19,6 +19,7 @@
:dashboard-subscription-filters
:disable-password-login
:database-auth-providers
+ :data-studio
:development-mode
:documents
:email-allow-list
@@ -68,6 +69,7 @@
:dashboard_subscription_filters true
:disable_password_login true
:database_auth_providers true
+ :data_studio true
:development_mode true
:documents true
:email_allow_list true
diff --git a/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj b/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
new file mode 100644
index 00000000000..b98d0c116cb
--- /dev/null
+++ b/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
@@ -0,0 +1,396 @@
+(ns ^:mb/driver-tests metabase-enterprise.data-studio.api.table-test
+ "Tests for /api/ee/data-studio/table endpoints."
+ (:require
+ [clojure.test :refer :all]
+ [metabase-enterprise.data-studio.api.table :as api.table]
+ [metabase.sync.core :as sync]
+ [metabase.test :as mt]
+ [metabase.util :as u]
+ [toucan2.core :as t2])
+ (:import (java.util.concurrent CountDownLatch TimeUnit)))
+
+(set! *warn-on-reflection* true)
+
+(deftest publish-model-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "POST /api/ee/data-studio/table/publish-model"
+ (testing "creates models for selected tables"
+ (mt/with-model-cleanup [:model/Card]
+ (mt/with-temp [:model/Collection {collection-id :id} {}]
+ (let [response (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/publish-model"
+ {:table_ids [(mt/id :users) (mt/id :venues)]
+ :target_collection_id collection-id})]
+ (is (= 2 (:created_count response)))
+ (is (= 2 (count (:models response))))
+ (testing "models have correct attributes"
+ (doseq [model (:models response)]
+ (is (= "model" (:type model)))
+ (is (= collection-id (:collection_id model)))
+ (is (int? (:published_table_id model)))))
+ (testing "the query should works"
+ (is (some? (mt/process-query (-> response :models first :dataset_query)))))
+ (testing "models are persisted in database"
+ (is (= 2 (t2/count :model/Card :collection_id collection-id :type :model)))))))))))
+;: TODO (Ngoc 31/10/2025): test publish model to library mark the library as dirty
+
+(deftest published-as-model-test
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-model-cleanup [:model/Card]
+ (mt/with-temp [:model/Collection {collection-id :id} {}]
+ (let [{:keys [models]} (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/publish-model"
+ {:table_ids [(mt/id :venues)]
+ :target_collection_id collection-id})
+ [model] models
+ venues-schema (t2/select-one-fn :schema [:model/Table :schema] (mt/id :venues))
+ schema-url (format "database/%d/schema/%s" (mt/id) venues-schema)
+ list-tables-via-table-api (fn [] (->> (mt/user-http-request :crowberto :get 200 "table" :db-id (mt/id))
+ (filter #(= (mt/id) (:db_id %)))))
+ list-tables-via-schema-api #(mt/user-http-request :crowberto :get 200 schema-url)]
+ (testing "list tables"
+ (let [list-response (list-tables-via-table-api)
+ published-as-model (u/index-by :id :published_as_model list-response)]
+ (is (true? (published-as-model (mt/id :venues))))
+ (is (false? (published-as-model (mt/id :users))))))
+ (testing "list tables via schema"
+ (let [list-response (list-tables-via-schema-api)
+ published-as-model (u/index-by :id :published_as_model list-response)]
+ (is (true? (published-as-model (mt/id :venues))))
+ (is (false? (published-as-model (mt/id :users))))))
+ (testing "archived tables are not returned"
+ (t2/update! :model/Card (:id model) {:archived true, :archived_directly false})
+ (is (not-any? :published_as_model (list-tables-via-table-api)))))))))
+
+(deftest published-models-perm-test
+ (mt/with-premium-features #{:data-studio}
+ ;; what I think would be reasonable permissions behaviour:
+ ;; > if no permissions on model or its collection, model is filtered out
+ ;; what I have done:
+ ;; > if not super-user we never give you the published models
+ (mt/with-model-cleanup [:model/Card]
+ (mt/with-temp [:model/Collection {collection1 :id} {}
+ :model/Collection {collection2 :id} {}]
+ (let [publish-venues #(mt/user-http-request :crowberto :post 200 "ee/data-studio/table/publish-model"
+ {:table_ids [(mt/id :venues)]
+ :target_collection_id %})
+ {[{model1 :id}] :models} (publish-venues collection1)
+ {[{model2 :id}] :models} (publish-venues collection2)
+ query-meta-url #(format "table/%d/query_metadata" %)
+ list-published-models #(:published_models (mt/user-http-request %1 :get 200 (query-meta-url %2)))]
+ (testing "admin sees both models"
+ (is (= #{model1 model2} (set (map :id (list-published-models :crowberto (mt/id :venues)))))))
+ (testing "no published models"
+ (is (nil? (list-published-models :crowberto (mt/id :users)))))
+ (testing "non admin does not see published models"
+ (is (nil? (list-published-models :rasta (mt/id :venues))))
+ (is (nil? (list-published-models :rasta (mt/id :users))))))))))
+
+(deftest bulk-edit-visibility-sync-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "POST /api/ee/data-studio/table/edit visibility field synchronization"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {table-1-id :id} {:db_id db-id}
+ :model/Table {table-2-id :id} {:db_id db-id}]
+
+ (testing "updating data_layer syncs to visibility_type for all tables"
+ ;; Update two tables to gold, which should sync to nil visibility_type
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [table-1-id table-2-id]
+ :data_layer "gold"})
+ (is (= :gold (t2/select-one-fn :data_layer :model/Table :id table-1-id)))
+ (is (= nil (t2/select-one-fn :visibility_type :model/Table :id table-1-id)))
+ (is (= :gold (t2/select-one-fn :data_layer :model/Table :id table-2-id)))
+ (is (= nil (t2/select-one-fn :visibility_type :model/Table :id table-2-id))))
+
+ (testing "updating data_layer to copper syncs to hidden visibility_type"
+ ;; Update one table back to copper, which should sync to :hidden
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [table-1-id]
+ :data_layer "copper"})
+ (is (= :copper (t2/select-one-fn :data_layer :model/Table :id table-1-id)))
+ (is (= :hidden (t2/select-one-fn :visibility_type :model/Table :id table-1-id))))
+
+ (testing "cannot update both visibility_type and data_layer at once"
+ (mt/user-http-request :crowberto :post 400 "ee/data-studio/table/edit"
+ {:table_ids [table-1-id]
+ :visibility_type "hidden"
+ :data_layer "copper"}))))))
+
+(deftest requests-data-studio-feature-flag-test
+ (mt/with-premium-features #{}
+ (is (= "Data Studio is a paid feature not currently available to your instance. Please upgrade to use it. Learn more at metabase.com/upgrade/"
+ (:message (mt/user-http-request :crowberto :post 402 "ee/data-studio/table/edit"
+ {:table_ids [(mt/id :users)]
+ :data_layer "gold"}))))))
+
+(deftest ^:parallel non-admins-cant-trigger-bulk-sync-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "Non-admins should not be allowed to trigger sync"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "ee/data-studio/table/sync-schema" {:database_ids [(mt/id)]}))))))
+
+(deftest trigger-bulk-metadata-sync-for-table-test
+ (mt/with-premium-features #{:data-studio}
+ ;; lot more to test here but will wait for firmer ground
+ (testing "Can we trigger a metadata sync for a filtered set of tables"
+ (let [tables (atom [])
+ latch (CountDownLatch. 4)]
+ (mt/with-temp [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {_ :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t5 :id} {:db_id d2, :schema "FOO"}]
+ (with-redefs [sync/sync-table! (fn [table]
+ (swap! tables conj table)
+ (.countDown latch)
+ nil)]
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/sync-schema" {:database_ids [d1],
+ :schema_ids [(format "%d:FOO" d2)]
+ :table_ids [t4]}))
+ (testing "sync called?"
+ (is (true? (.await latch 4 TimeUnit/SECONDS)))
+ (is (= [t1 t2 t4 t5] (map :id @tables)))))))))
+
+(deftest ^:parallel non-admins-cant-trigger-bulk-rescan-values-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "Non-admins should not be allowed to trigger rescan values"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "ee/data-studio/table/rescan-values" {:database_ids [(mt/id)]}))))))
+
+(deftest trigger-rescan-values-for-tables-test
+ (mt/with-premium-features #{:data-studio}
+ ;; lot more to test here but will wait for firmer ground
+ (testing "Can we trigger a field values sync for a filtered set of tables"
+ (let [tables (atom [])
+ latch (CountDownLatch. 4)]
+ (mt/with-temp [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {_ :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t5 :id} {:db_id d2, :schema "FOO"}]
+ (with-redefs [sync/update-field-values-for-table! (fn [table]
+ (swap! tables conj table)
+ (.countDown latch)
+ nil)]
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/rescan-values" {:database_ids [d1],
+ :schema_ids [(format "%d:FOO" d2)]
+ :table_ids [t4]}))
+ (testing "rescanned?"
+ (is (true? (.await latch 4 TimeUnit/SECONDS)))
+ (is (= [t1 t2 t4 t5] (map :id @tables)))))))))
+
+(deftest ^:parallel non-admins-cant-trigger-bulk-discard-values-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "Non-admins should not be allowed to trigger discard values"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "ee/data-studio/table/discard-values" {:database_ids [(mt/id)]}))))))
+
+(deftest ^:parallel bulk-discard-values-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "POST /api/ee/data-studio/table/discard-values"
+ (mt/with-temp
+ [:model/Database {d1 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Database {d2 :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Table {t1 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t2 :id} {:db_id d1, :schema "PUBLIC"}
+ :model/Table {t3 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t4 :id} {:db_id d2, :schema "PUBLIC"}
+ :model/Table {t5 :id} {:db_id d2, :schema "FOO"}
+ :model/Field {f1 :id} {:table_id t1}
+ :model/FieldValues {v1 :id} {:field_id f1, :values ["T1"]}
+ :model/Field {f2 :id} {:table_id t2}
+ :model/FieldValues {v2 :id} {:field_id f2, :values ["T2"]}
+ :model/Field {f3 :id} {:table_id t3}
+ :model/FieldValues {v3 :id} {:field_id f3, :values ["T3"]}
+ :model/Field {f4 :id} {:table_id t4}
+ :model/FieldValues {v4 :id} {:field_id f4, :values ["T4-1"]}
+ :model/Field {f5 :id} {:table_id t4}
+ :model/FieldValues {v5 :id} {:field_id f5, :values ["T4-2"]}
+ :model/Field {f6 :id} {:table_id t5}
+ :model/FieldValues {v6 :id} {:field_id f6, :values ["T5-1"]}
+ :model/Field {f7 :id} {:table_id t5}
+ :model/FieldValues {v7 :id} {:field_id f7, :values ["T5-2"]}]
+ (let [url "ee/data-studio/table/discard-values"
+ remaining-field-values-q {:select [:fv.id]
+ :from [[(t2/table-name :model/FieldValues) :fv]
+ [(t2/table-name :model/Field) :f]]
+ :where [:and [:= :fv.field_id :f.id]
+ [:in :f.table_id [t1 t2 t3 t4 t5]]]
+ :order-by [[:fv.id :asc]]}
+ get-field-values #(mapv :id (t2/query remaining-field-values-q))]
+ (testing "Non-admin toucans should not be allowed to discard values"
+ (is (= "You don't have permissions to do that." (mt/user-http-request :rasta :post 403 url {:table_ids [t1]})))
+ (testing "FieldValues should still exist"
+ (is (= [v1 v2 v3 v4 v5 v6 v7] (get-field-values)))))
+ (testing "Admins should be able to successfully delete them"
+ (is (= {:status "ok"} (mt/user-http-request :crowberto :post 200 url {:database_ids [d1],
+ :schema_ids [(format "%d:FOO" d2)]
+ :table_ids [t4]})))
+ (testing "Selected FieldValues should be gone"
+ (is (= [v3] (get-field-values))))))))))
+
+(deftest ^:parallel table-selectors->filter-test
+ (testing "table-selectors->filter function generates correct WHERE clauses"
+ (let [selectors->table-ids (fn [selectors]
+ (let [where (#'api.table/table-selectors->filter selectors)]
+ (t2/select-pks-set :model/Table {:where where})))]
+ (mt/with-temp [:model/Database {db-1 :id} {}
+ :model/Database {db-2 :id} {}
+ :model/Table {table-1 :id} {:db_id db-1}
+ :model/Table {table-2 :id} {:db_id db-1, :schema "schema-a"}
+ :model/Table {table-3 :id} {:db_id db-2, :schema "schema-a"}
+ :model/Table {table-4 :id} {:db_id db-2, :schema "schema-b"}
+ :model/Table {table-5 :id} {:db_id db-2}]
+
+ (testing "filter by database_ids"
+ (is (= #{table-1 table-2}
+ (selectors->table-ids {:database_ids [db-1]}))))
+
+ (testing "filter by table_ids"
+ (is (= #{table-3 table-4}
+ (selectors->table-ids {:table_ids [table-3 table-4]}))))
+
+ (testing "filter by schema_ids"
+ (is (= #{table-2}
+ (selectors->table-ids {:schema_ids [(format "%d:schema-a" db-1)]}))))
+
+ (testing "filter by multiple schema_ids"
+ (is (= #{table-3 table-4}
+ (selectors->table-ids {:schema_ids [(format "%d:schema-a" db-2)
+ (format "%d:schema-b" db-2)]}))))
+
+ (testing "combine database_ids and table_ids (OR logic)"
+ (is (= #{table-1 table-2 table-3}
+ (selectors->table-ids {:database_ids [db-1]
+ :table_ids [table-3]}))))
+
+ (testing "combine all selectors (OR logic)"
+ (is (= #{table-1 table-2 table-4 table-5}
+ (selectors->table-ids {:database_ids [db-1]
+ :table_ids [table-5]
+ :schema_ids [(format "%d:schema-b" db-2)]}))))
+
+ (testing "empty selectors returns no tables"
+ (is (= nil (selectors->table-ids {}))))))))
+
+(deftest trigger-sync-on-data-layer-change-from-copper-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "Changing data_layer from copper to another value triggers sync"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {copper-1 :id} {:db_id db-id, :data_layer :copper}
+ :model/Table {copper-2 :id} {:db_id db-id, :data_layer :copper}
+ :model/Table {copper-3 :id} {:db_id db-id, :data_layer :copper}
+ :model/Table {copper-4 :id} {:db_id db-id, :data_layer :copper}
+ :model/Table {gold-1 :id} {:db_id db-id, :data_layer :gold}
+ :model/Table {gold-2 :id} {:db_id db-id, :data_layer :gold}]
+ (let [synced-ids (atom #{})]
+ (mt/with-dynamic-fn-redefs [api.table/sync-unhidden-tables (fn [tables] (reset! synced-ids (set (map :id tables))))]
+ (testing "Changing from copper to gold triggers sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [copper-1 copper-2]
+ :data_layer "gold"})
+ (is (= #{copper-1 copper-2} @synced-ids)))
+
+ (testing "Changing from copper to silver triggers sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [copper-3]
+ :data_layer "silver"})
+ (is (= #{copper-3} @synced-ids)))
+
+ (testing "Changing from copper to bronze triggers sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [copper-4]
+ :data_layer "bronze"})
+ (is (= #{copper-4} @synced-ids)))
+
+ (testing "Not changing from copper does not trigger sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [gold-1]
+ :data_layer "silver"})
+ (is (= #{} @synced-ids)))
+
+ (testing "Changing to copper does not trigger sync"
+ (reset! synced-ids #{})
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [gold-2]
+ :data_layer "copper"})
+ (is (= #{} @synced-ids)))))))))
+
+(deftest bulk-edit-test
+ (mt/with-premium-features #{:data-studio}
+ (testing "can edit a bunch of things at once"
+ (mt/with-temp [:model/Database {clojure :id} {}
+ :model/Database {jvm :id} {}
+ :model/Table {vars :id} {:db_id clojure}
+ :model/Table {namespaces :id} {:db_id clojure}
+ :model/Table {beans :id} {:db_id jvm}
+ :model/Table {classes :id} {:db_id jvm}
+ :model/Table {gc :id} {:db_id jvm, :schema "jre"}
+ :model/Table {jit :id} {:db_id jvm, :schema "jre"}]
+
+ (testing "only admin can edit"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "ee/data-studio/table/edit"
+ {:database_ids [clojure jvm]
+ :data_layer "copper"}))))
+
+ (testing "simple happy path updating with db ids"
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:database_ids [clojure jvm]
+ :data_layer "copper"
+ :data_authority "authoritative"
+ :data_source "ingested"})
+ (is (= #{:copper} (t2/select-fn-set :data_layer :model/Table :db_id [:in [clojure jvm]])))
+ (is (= #{:authoritative} (t2/select-fn-set :data_authority :model/Table :db_id [:in [clojure jvm]])))
+ (is (= #{:ingested} (t2/select-fn-set :data_source :model/Table :db_id [:in [clojure jvm]]))))
+
+ (testing "updating with all selectors"
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:database_ids [clojure]
+ :table_ids [classes]
+ :schema_ids [(format "%d:jre" jvm)]
+ :data_layer "silver"})
+ (is (= {vars :silver
+ namespaces :silver
+ beans :copper
+ classes :silver
+ gc :silver
+ jit :silver}
+ (t2/select-pk->fn :data_layer :model/Table :db_id [:in [clojure jvm]]))))
+
+ (testing "can update owner_email"
+ (is (= #{nil} (t2/select-fn-set :owner_email :model/Table :db_id [:in [clojure jvm]])))
+
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:database_ids [clojure]
+ :owner_email "[email protected]"})
+
+ (is (= {vars "[email protected]"
+ namespaces "[email protected]"
+ beans nil
+ classes nil
+ gc nil
+ jit nil}
+ (t2/select-pk->fn :owner_email :model/Table :db_id [:in [clojure jvm]]))))
+
+ (testing "can update owner_user_id"
+ (is (= #{nil} (t2/select-fn-set :owner_user_id :model/Table :db_id [:in [clojure jvm]])))
+
+ (mt/user-http-request :crowberto :post 200 "ee/data-studio/table/edit"
+ {:table_ids [beans classes]
+ :owner_user_id (mt/user->id :rasta)})
+
+ (is (= {vars nil
+ namespaces nil
+ beans (mt/user->id :rasta)
+ classes (mt/user->id :rasta)
+ gc nil
+ jit nil}
+ (t2/select-pk->fn :owner_user_id :model/Table :db_id [:in [clojure jvm]]))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/library/api_test.clj b/enterprise/backend/test/metabase_enterprise/library/api_test.clj
new file mode 100644
index 00000000000..78aec161195
--- /dev/null
+++ b/enterprise/backend/test/metabase_enterprise/library/api_test.clj
@@ -0,0 +1,37 @@
+(ns metabase-enterprise.library.api-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.collections.models.collection :as collection]
+ [metabase.collections.test-helpers :refer [without-library]]
+ [metabase.test :as mt]
+ [toucan2.core :as t2]))
+
+(deftest get-library-test
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-discard-model-updates! [:model/Collection]
+ (without-library
+ (testing "When there is no library, returns a message but still 200"
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/library")]
+ (is (= {:message "Library does not exist"} response))))
+ (let [_ (collection/create-library-collection!)
+ models-id (t2/select-one-pk :model/Collection :type collection/library-models-collection-type)
+ metrics-id (t2/select-one-pk :model/Collection :type collection/library-metrics-collection-type)
+ response (mt/user-http-request :crowberto :get 200 "ee/library")]
+ (testing "When library exists, but no content"
+ (is (= "Library" (:name response)))
+ (is (= ["collection"] (:here response)))
+ (is (= [] (:below response))))
+ (testing "With content in the library"
+ (mt/with-temp [:model/Card _ {:name "Card in Models"
+ :collection_id models-id
+ :type :model}
+ :model/Card _ {:name "Card in Metrics"
+ :collection_id metrics-id
+ :type :metric}
+ :model/Card _ {:name "Other Card in Metrics"
+ :collection_id metrics-id
+ :type :metric}]
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/library")]
+ (is (= "Library" (:name response)))
+ (is (= ["dataset" "metric"] (:below response)))
+ (is (= ["collection"] (:here response)))))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/library/validation_test.clj b/enterprise/backend/test/metabase_enterprise/library/validation_test.clj
new file mode 100644
index 00000000000..cc5e75409d7
--- /dev/null
+++ b/enterprise/backend/test/metabase_enterprise/library/validation_test.clj
@@ -0,0 +1,63 @@
+(ns metabase-enterprise.library.validation-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.collections.models.collection :as collection]
+ [metabase.test :as mt]
+ [toucan2.core :as t2]))
+
+(deftest allowed-content-doesnt-block-regular-collections
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-temp [:model/Collection regular-collection {:name "Regular Collection" :type nil}]
+ (testing "Regular collections can add anything"
+ (is (some? (t2/insert! :model/Collection (merge (mt/with-temp-defaults :model/Collection) {:location (str "/" (:id regular-collection) "/")}))))
+ (is (some? (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model, :collection_id (:id regular-collection)}))))
+ (is (some? (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :metric, :collection_id (:id regular-collection)}))))
+ (is (some? (t2/insert! :model/Dashboard (merge (mt/with-temp-defaults :model/Dashboard) {:collection_id (:id regular-collection)}))))))))
+
+(deftest library-completely-locked-down
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-temp [:model/Collection no-allowed-content {:name "Test No Content" :type collection/library-collection-type}]
+ (testing "Cannot add anything to library collections"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Cannot add anything to the Library collection"
+ (t2/insert! :model/Collection (merge (mt/with-temp-defaults :model/Collection) {:location (str "/" (:id no-allowed-content) "/")}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Cannot add anything to the Library collection"
+ (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model, :collection_id (:id no-allowed-content)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Cannot add anything to the Library collection"
+ (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :metric :collection_id (:id no-allowed-content)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Cannot add anything to the Library collection"
+ (t2/insert! :model/Dashboard (merge (mt/with-temp-defaults :model/Dashboard) {:collection_id (:id no-allowed-content)}))))))))
+
+(deftest check-allowed-content-model
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-temp [:model/Collection allow-models {:name "Test Base Library" :type collection/library-models-collection-type}]
+ (testing "Can only add allowed content types"
+ (is (some? (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model, :collection_id (:id allow-models)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add models to the 'Models' collection"
+ (t2/insert! :model/Collection (merge (mt/with-temp-defaults :model/Collection) {:location (str "/" (:id allow-models) "/")}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add models to the 'Models' collection"
+ (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :metric :collection_id (:id allow-models)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add models to the 'Models' collection"
+ (t2/insert! :model/Dashboard (merge (mt/with-temp-defaults :model/Dashboard) {:collection_id (:id allow-models)}))))))))
+
+(deftest check-allowed-content-metric
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-temp [:model/Collection allow-metrics {:name "Test Base Library" :type collection/library-metrics-collection-type}]
+ (testing "Can only add allowed content types"
+ (is (some? (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :metric, :collection_id (:id allow-metrics)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add metrics to the 'Metrics' collection"
+ (t2/insert! :model/Collection (merge (mt/with-temp-defaults :model/Collection) {:location (str "/" (:id allow-metrics) "/")}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add metrics to the 'Metrics' collection"
+ (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model :collection_id (:id allow-metrics)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add metrics to the 'Metrics' collection"
+ (t2/insert! :model/Dashboard (merge (mt/with-temp-defaults :model/Dashboard) {:collection_id (:id allow-metrics)}))))))))
+
+(deftest cannot-update-library-collections
+ (mt/with-premium-features #{:data-studio}
+ (mt/with-temp [:model/Collection library {:name "Test Library" :type collection/library-collection-type}
+ :model/Collection models {:name "Test Semantic Model Layer" :type collection/library-models-collection-type}
+ :model/Collection metrics {:name "Test Semantic Metrics Layer" :type collection/library-metrics-collection-type}]
+ (doseq [col [library models metrics]]
+ (testing (str "Checking type " (:type col))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo
+ #"Cannot update properties on a Library collection"
+ (t2/update! :model/Collection (:id col) {:name "New Name"}))))))))
diff --git a/enterprise/frontend/src/metabase-enterprise/api/index.ts b/enterprise/frontend/src/metabase-enterprise/api/index.ts
index a7dab8f8f6a..bad4aa11fb0 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/index.ts
@@ -9,11 +9,13 @@ export * from "./db-routing";
export * from "./dependencies";
export * from "./document";
export * from "./gdrive";
-export * from "./remote-sync";
+export * from "./library";
export * from "./metabot";
+export * from "./remote-sync";
export * from "./saml";
export * from "./scim";
export * from "./support-access-grants";
+export * from "./table";
export * from "./tags";
export * from "./transform";
export * from "./transform-job";
diff --git a/enterprise/frontend/src/metabase-enterprise/api/library.ts b/enterprise/frontend/src/metabase-enterprise/api/library.ts
new file mode 100644
index 00000000000..82d5a5212f8
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/api/library.ts
@@ -0,0 +1,26 @@
+import type { Collection, CollectionItem } from "metabase-types/api";
+
+import { EnterpriseApi } from "./api";
+import { listTag, tag } from "./tags";
+
+export const libraryApi = EnterpriseApi.injectEndpoints({
+ endpoints: (builder) => ({
+ createLibrary: builder.mutation<Collection, void>({
+ query: () => ({
+ method: "POST",
+ url: "/api/ee/library",
+ }),
+ invalidatesTags: [listTag("collection")],
+ }),
+ getLibraryCollection: builder.query<CollectionItem, void>({
+ query: () => ({
+ url: `/api/ee/library`,
+ method: "GET",
+ }),
+ providesTags: () => [tag("library-collection")],
+ }),
+ }),
+});
+
+export const { useCreateLibraryMutation, useGetLibraryCollectionQuery } =
+ libraryApi;
diff --git a/enterprise/frontend/src/metabase-enterprise/api/python-transform-library.ts b/enterprise/frontend/src/metabase-enterprise/api/python-transform-library.ts
index c367ec2f0e4..5cc914bb524 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/python-transform-library.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/python-transform-library.ts
@@ -25,6 +25,25 @@ export const pythonLibraryApi = EnterpriseApi.injectEndpoints({
}),
invalidatesTags: (_, error, { path }) =>
invalidateTags(error, [idTag("python-transform-library", path)]),
+ onQueryStarted: async (
+ { path, ...patch },
+ { dispatch, queryFulfilled },
+ ) => {
+ const patchResult = dispatch(
+ pythonLibraryApi.util.updateQueryData(
+ "getPythonLibrary",
+ { path },
+ (draft) => {
+ Object.assign(draft, patch);
+ },
+ ),
+ );
+ try {
+ await queryFulfilled;
+ } catch {
+ patchResult.undo();
+ }
+ },
}),
}),
});
diff --git a/enterprise/frontend/src/metabase-enterprise/api/table.ts b/enterprise/frontend/src/metabase-enterprise/api/table.ts
new file mode 100644
index 00000000000..49d7bf6daa1
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/api/table.ts
@@ -0,0 +1,81 @@
+import type {
+ DiscardTablesValuesRequest,
+ EditTablesRequest,
+ PublishModelsRequest,
+ PublishModelsResponse,
+ RescanTablesValuesRequest,
+ SyncTablesSchemaRequest as SyncTablesSchemasRequest,
+} from "metabase-types/api";
+
+import { EnterpriseApi } from "./api";
+import { invalidateTags, listTag, tag } from "./tags";
+
+export const tableApi = EnterpriseApi.injectEndpoints({
+ endpoints: (builder) => ({
+ editTables: builder.mutation<Record<string, never>, EditTablesRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/ee/data-studio/table/edit",
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [tag("table"), tag("database"), tag("card")]),
+ }),
+ rescanTablesFieldValues: builder.mutation<void, RescanTablesValuesRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: `/api/ee/data-studio/table/rescan-values`,
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [tag("field-values"), tag("parameter-values")]),
+ }),
+ syncTablesSchemas: builder.mutation<void, SyncTablesSchemasRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: `/api/ee/data-studio/table/sync-schema`,
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [
+ tag("table"),
+ listTag("field"),
+ listTag("field-values"),
+ listTag("parameter-values"),
+ tag("card"),
+ ]),
+ }),
+ discardTablesFieldValues: builder.mutation<
+ void,
+ DiscardTablesValuesRequest
+ >({
+ query: (body) => ({
+ method: "POST",
+ url: `/api/ee/data-studio/table/discard-values`,
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [tag("field-values"), tag("parameter-values")]),
+ }),
+ publishModels: builder.mutation<
+ PublishModelsResponse,
+ PublishModelsRequest
+ >({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/ee/data-studio/table/publish-model",
+ body,
+ }),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [tag("table"), tag("card"), tag("collection")]),
+ }),
+ }),
+});
+
+export const {
+ useEditTablesMutation,
+ useRescanTablesFieldValuesMutation,
+ useSyncTablesSchemasMutation,
+ useDiscardTablesFieldValuesMutation,
+ usePublishModelsMutation,
+} = tableApi;
diff --git a/enterprise/frontend/src/metabase-enterprise/api/tags.ts b/enterprise/frontend/src/metabase-enterprise/api/tags.ts
index cdb13fe922b..3ffa010caf9 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/tags.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/tags.ts
@@ -51,6 +51,7 @@ export const ENTERPRISE_TAG_TYPES = [
"python-transform-library",
"support-access-grant",
"support-access-grant-current",
+ "library-collection",
] as const;
export type EnterpriseTagType = (typeof ENTERPRISE_TAG_TYPES)[number];
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsx
index fa3a2a5e2ab..33f54945b88 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable react/prop-types */
-
import type { CollectionAuthorityLevelIcon as CollectionAuthorityLevelIconComponent } from "metabase/plugins/index";
import { Icon } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.module.css
new file mode 100644
index 00000000000..65a01cf5f86
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.module.css
@@ -0,0 +1,7 @@
+.header {
+ border-bottom: 1px solid var(--mb-color-border);
+}
+
+.body {
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx
new file mode 100644
index 00000000000..8a21543711a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx
@@ -0,0 +1,55 @@
+import type { ReactNode } from "react";
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import { PLUGIN_METABOT } from "metabase/plugins";
+import { Box, Button, Flex, Group, Stack, Title } from "metabase/ui";
+
+import S from "./SectionLayout.module.css";
+
+type SectionLayoutProps = {
+ title?: ReactNode;
+ tabs?: ReactNode;
+ children?: ReactNode;
+};
+
+export function SectionLayout({ title, tabs, children }: SectionLayoutProps) {
+ return (
+ <Stack h="100%" gap={0}>
+ <Flex
+ data-testid="data-studio-header"
+ className={S.header}
+ px="lg"
+ py="md"
+ justify="space-between"
+ align={tabs ? "start" : "center"}
+ aria-label={t`Navigation bar`}
+ >
+ <Stack gap="sm">
+ {title}
+ {tabs}
+ </Stack>
+ <Group>
+ <PLUGIN_METABOT.MetabotDataStudioButton />
+ <Button component={Link} to="/">
+ {t`Exit data studio`}
+ </Button>
+ </Group>
+ </Flex>
+ <Flex flex={1} mih={0} miw={0}>
+ <Box flex={1} miw={0}>
+ {children}
+ </Box>
+ <PLUGIN_METABOT.MetabotDataStudioSidebar />
+ </Flex>
+ </Stack>
+ );
+}
+
+type SectionTitleProps = {
+ title: string;
+};
+
+export function SectionTitle({ title }: SectionTitleProps) {
+ return <Title order={4}>{title}</Title>;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/index.ts
new file mode 100644
index 00000000000..b625f14a771
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/index.ts
@@ -0,0 +1 @@
+export * from "./SectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
new file mode 100644
index 00000000000..c43667b896b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
@@ -0,0 +1,24 @@
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import { usePageTitle } from "metabase/hooks/use-page-title";
+import * as Urls from "metabase/lib/urls";
+import { DataModelContext } from "metabase/metadata/pages/shared";
+
+import { SectionLayout, SectionTitle } from "../../components/SectionLayout";
+
+type DataSectionLayoutProps = {
+ children?: ReactNode;
+};
+
+export function DataSectionLayout({ children }: DataSectionLayoutProps) {
+ usePageTitle(t`Data`);
+
+ return (
+ <SectionLayout title={<SectionTitle title={t`Data`} />}>
+ <DataModelContext.Provider value={{ baseUrl: Urls.dataStudioData() }}>
+ {children}
+ </DataModelContext.Provider>
+ </SectionLayout>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/index.ts
new file mode 100644
index 00000000000..d3ecaeb5b4c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/index.ts
@@ -0,0 +1 @@
+export * from "./DataSectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
new file mode 100644
index 00000000000..26fda041233
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
@@ -0,0 +1,22 @@
+.nav {
+ border-right: 1px solid var(--mb-color-border);
+}
+
+.tab {
+ background-color: var(--mb-color-bg-secondary);
+
+ &:hover,
+ &.selected {
+ background-color: var(--mb-color-brand-light);
+ }
+}
+
+.tab,
+.toggle {
+ color: var(--mb-color-text-primary);
+
+ &:hover,
+ &.selected {
+ color: var(--mb-color-brand);
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
new file mode 100644
index 00000000000..575751ea024
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
@@ -0,0 +1,178 @@
+import cx from "classnames";
+import { type ReactNode, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import {
+ PLUGIN_DEPENDENCIES,
+ PLUGIN_FEATURE_LEVEL_PERMISSIONS,
+ PLUGIN_TRANSFORMS,
+} from "metabase/plugins";
+import { getLocation } from "metabase/selectors/routing";
+import {
+ Box,
+ FixedSizeIcon,
+ Flex,
+ type IconName,
+ Stack,
+ Tooltip,
+ UnstyledButton,
+} from "metabase/ui";
+import { DataStudioContext } from "metabase-enterprise/data-studio/common/contexts/DataStudioContext";
+
+import S from "./DataStudioLayout.module.css";
+
+type DataStudioLayoutProps = {
+ children?: ReactNode;
+};
+
+export function DataStudioLayout({ children }: DataStudioLayoutProps) {
+ const [isSidebarOpened, setIsSidebarOpened] = useState(false);
+ const [isSidebarAvailable, setIsSidebarAvailable] = useState(false);
+ const contextValue = useMemo(
+ () => ({
+ isSidebarOpened,
+ isSidebarAvailable,
+ setIsSidebarOpened,
+ setIsSidebarAvailable,
+ }),
+ [isSidebarOpened, isSidebarAvailable],
+ );
+
+ return (
+ <DataStudioContext.Provider value={contextValue}>
+ <Flex h="100%">
+ <DataStudioNav
+ isSidebarOpened={isSidebarOpened}
+ isSidebarAvailable={isSidebarAvailable}
+ onSidebarToggle={setIsSidebarOpened}
+ />
+ <Box h="100%" flex={1} miw={0}>
+ {children}
+ </Box>
+ </Flex>
+ </DataStudioContext.Provider>
+ );
+}
+
+type DataStudioNavProps = {
+ isSidebarOpened: boolean;
+ isSidebarAvailable: boolean;
+ onSidebarToggle: (isOpened: boolean) => void;
+};
+
+function DataStudioNav({
+ isSidebarOpened,
+ isSidebarAvailable,
+ onSidebarToggle,
+}: DataStudioNavProps) {
+ const { pathname } = useSelector(getLocation);
+ const canAccessDataModel = useSelector(
+ PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel,
+ );
+ const canAccessTransforms = useSelector(
+ PLUGIN_TRANSFORMS.canAccessTransforms,
+ );
+ const isDataTab = pathname.startsWith(Urls.dataStudioData());
+ const isTransformsTab = pathname.startsWith(Urls.transformList());
+ const isModelingTab = pathname.startsWith(Urls.dataStudioModeling());
+ const isDependenciesTab = pathname.startsWith(Urls.dependencyGraph());
+
+ return (
+ <Stack className={S.nav} h="100%" p="0.75rem" justify="space-between">
+ <Stack gap="0.75rem">
+ {canAccessDataModel && (
+ <DataStudioTab
+ label={t`Data`}
+ icon="database"
+ to={Urls.dataStudioData()}
+ isSelected={isDataTab}
+ />
+ )}
+ {canAccessTransforms && (
+ <DataStudioTab
+ label={t`Transforms`}
+ icon="transform"
+ to={Urls.transformList()}
+ isSelected={isTransformsTab}
+ />
+ )}
+ <DataStudioTab
+ label={t`Modeling`}
+ icon="model"
+ to={Urls.dataStudioModeling()}
+ isSelected={isModelingTab}
+ />
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <DataStudioTab
+ label={t`Dependency graph`}
+ icon="schema"
+ to={Urls.dependencyGraph()}
+ isSelected={isDependenciesTab}
+ />
+ )}
+ </Stack>
+ {isSidebarAvailable && (
+ <DataStudioSidebarToggle
+ isSidebarOpened={isSidebarOpened}
+ onSidebarToggle={onSidebarToggle}
+ />
+ )}
+ </Stack>
+ );
+}
+
+type DataStudioTabProps = {
+ label: string;
+ icon: IconName;
+ to: string;
+ isSelected: boolean;
+};
+
+const TOOLTIP_OPEN_DELAY = 1000;
+
+function DataStudioTab({ label, icon, to, isSelected }: DataStudioTabProps) {
+ return (
+ <Tooltip label={label} position="right" openDelay={TOOLTIP_OPEN_DELAY}>
+ <Box
+ className={cx(S.tab, { [S.selected]: isSelected })}
+ component={ForwardRefLink}
+ to={to}
+ p="0.75rem"
+ bdrs="md"
+ >
+ <FixedSizeIcon name={icon} display="block" />
+ </Box>
+ </Tooltip>
+ );
+}
+
+type DataStudioSidebarToggleProps = {
+ isSidebarOpened: boolean;
+ onSidebarToggle: (isOpened: boolean) => void;
+};
+
+function DataStudioSidebarToggle({
+ isSidebarOpened,
+ onSidebarToggle,
+}: DataStudioSidebarToggleProps) {
+ return (
+ <Tooltip
+ label={isSidebarOpened ? t`Close sidebar` : t`Open sidebar`}
+ openDelay={TOOLTIP_OPEN_DELAY}
+ >
+ <UnstyledButton
+ className={S.toggle}
+ p="0.75rem"
+ bdrs="md"
+ onClick={() => onSidebarToggle(!isSidebarOpened)}
+ >
+ <FixedSizeIcon
+ name={isSidebarOpened ? "sidebar_closed" : "sidebar_open"}
+ />
+ </UnstyledButton>
+ </Tooltip>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/index.ts
new file mode 100644
index 00000000000..3b287aa72c9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/index.ts
@@ -0,0 +1 @@
+export * from "./DataStudioLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx
new file mode 100644
index 00000000000..57ff629486b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx
@@ -0,0 +1,22 @@
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import { usePageTitle } from "metabase/hooks/use-page-title";
+
+import { SectionLayout, SectionTitle } from "../../components/SectionLayout";
+
+type DependenciesSectionLayoutProps = {
+ children?: ReactNode;
+};
+
+export function DependenciesSectionLayout({
+ children,
+}: DependenciesSectionLayoutProps) {
+ usePageTitle(t`Dependency graph`);
+
+ return (
+ <SectionLayout title={<SectionTitle title={t`Dependency graph`} />}>
+ {children}
+ </SectionLayout>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/index.ts
new file mode 100644
index 00000000000..32fad5d21af
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependenciesSectionLayout/index.ts
@@ -0,0 +1 @@
+export * from "./DependenciesSectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSectionLayout.tsx
new file mode 100644
index 00000000000..0af492d58dc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSectionLayout.tsx
@@ -0,0 +1,64 @@
+import type { Location } from "history";
+import { type ReactNode, useContext, useLayoutEffect } from "react";
+import { t } from "ttag";
+
+import { usePageTitle } from "metabase/hooks/use-page-title";
+import * as Urls from "metabase/lib/urls";
+import { Box, Flex } from "metabase/ui";
+import { DataStudioContext } from "metabase-enterprise/data-studio/common/contexts/DataStudioContext";
+
+import { SectionLayout, SectionTitle } from "../../components/SectionLayout";
+
+import { ModelingSidebar } from "./ModelingSidebar";
+
+type ModelingSectionLayoutParams = {
+ collectionId?: string;
+ snippetId?: string;
+};
+
+type ModelingSectionLayoutProps = {
+ params: ModelingSectionLayoutParams;
+ location: Location;
+ children?: ReactNode;
+};
+
+export function ModelingSectionLayout({
+ params,
+ location,
+ children,
+}: ModelingSectionLayoutProps) {
+ const collectionId = Urls.extractCollectionId(params?.collectionId);
+ const snippetId = Urls.extractEntityId(params?.snippetId);
+ const isGlossaryActive = location.pathname === Urls.dataStudioGlossary();
+
+ const { isSidebarOpened, setIsSidebarOpened, setIsSidebarAvailable } =
+ useContext(DataStudioContext);
+
+ usePageTitle(t`Modeling`);
+
+ useLayoutEffect(() => {
+ setIsSidebarOpened(true);
+ setIsSidebarAvailable(true);
+ return () => {
+ setIsSidebarOpened(false);
+ setIsSidebarAvailable(false);
+ };
+ }, [setIsSidebarOpened, setIsSidebarAvailable]);
+
+ return (
+ <SectionLayout title={<SectionTitle title={t`Modeling`} />}>
+ <Flex direction="row" w="100%" h="100%">
+ {isSidebarOpened && (
+ <ModelingSidebar
+ selectedCollectionId={collectionId}
+ selectedSnippetId={snippetId}
+ isGlossaryActive={isGlossaryActive}
+ />
+ )}
+ <Box flex={1} miw={0}>
+ {children}
+ </Box>
+ </Flex>
+ </SectionLayout>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/CreateLibraryModal/CreateLibraryModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/CreateLibraryModal/CreateLibraryModal.tsx
new file mode 100644
index 00000000000..c0ba57a8587
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/CreateLibraryModal/CreateLibraryModal.tsx
@@ -0,0 +1,100 @@
+import { t } from "ttag";
+
+import { Form, FormErrorMessage, FormProvider } from "metabase/forms";
+import {
+ Box,
+ Button,
+ Center,
+ FixedSizeIcon,
+ FocusTrap,
+ Group,
+ List,
+ Modal,
+ Text,
+ Title,
+} from "metabase/ui";
+import { useCreateLibraryMutation } from "metabase-enterprise/api";
+import type { Collection } from "metabase-types/api";
+
+type CreateLibraryModalProps = {
+ onCreate: (collection: Collection) => void;
+ onClose: () => void;
+};
+
+export function CreateLibraryModal({
+ onCreate,
+ onClose,
+}: CreateLibraryModalProps) {
+ const [createLibrary] = useCreateLibraryMutation();
+
+ const handleSubmit = async () => {
+ const collection = await createLibrary().unwrap();
+ onCreate(collection);
+ };
+
+ return (
+ <Modal
+ title={
+ <Group gap="sm">
+ <Center w="2rem" h="2rem" c="brand" bg="brand-light" bdrs="md">
+ <FixedSizeIcon name="repository" />
+ </Center>
+ <Title order={3}>{t`Create your Library`}</Title>
+ </Group>
+ }
+ opened
+ onClose={onClose}
+ >
+ <FormProvider initialValues={{}} onSubmit={handleSubmit}>
+ <Form>
+ <FocusTrap.InitialFocus />
+ <Text>
+ {t`The Library helps you create a source of truth for analytics by providing a centrally managed set of curated content. It separates authoritative, reusable components from ad-hoc analyses.`}
+ </Text>
+ <List mt="sm" spacing="sm">
+ <ListItem
+ title={t`Models`}
+ description={t`Cleaned, pre-transformed data sources ready for exploring`}
+ />
+ <ListItem
+ title={t`Metrics`}
+ description={t`Standardized calculations with known dimensions`}
+ />
+ <ListItem
+ title={t`Version control`}
+ description={t`Sync your library to Git for governance`}
+ />
+ <ListItem
+ title={t`High trust`}
+ description={t`Default to reliable sources your data team prescribes`}
+ />
+ </List>
+ <Group mt="xl" gap="sm">
+ <Box flex={1}>
+ <FormErrorMessage />
+ </Box>
+ <Button variant="subtle" onClick={onClose}>{t`Cancel`}</Button>
+ <Button variant="filled" type="submit">
+ {t`Create my Library`}
+ </Button>
+ </Group>
+ </Form>
+ </FormProvider>
+ </Modal>
+ );
+}
+
+type ListItemProps = {
+ title: string;
+ description: string;
+};
+
+function ListItem({ title, description }: ListItemProps) {
+ return (
+ <List.Item>
+ <strong>{title}</strong>
+ {": "}
+ {description}
+ </List.Item>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/CreateLibraryModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/CreateLibraryModal/index.ts
new file mode 100644
index 00000000000..de254680c4c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/CreateLibraryModal/index.ts
@@ -0,0 +1 @@
+export * from "./CreateLibraryModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx
new file mode 100644
index 00000000000..ce252513c4d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx
@@ -0,0 +1,89 @@
+import { useCallback, useMemo } from "react";
+import { push } from "react-router-redux";
+
+import { Tree } from "metabase/common/components/tree";
+import type { ITreeNodeItem } from "metabase/common/components/tree/types";
+import { getAllExpandableIds } from "metabase/common/components/tree/utils";
+import { buildCollectionTree } from "metabase/entities/collections";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { ModelingSidebarTreeNode } from "metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode";
+import { CreateCardMenu } from "metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu";
+import type { Collection, CollectionId } from "metabase-types/api";
+
+import { getWritableCollection } from "./utils";
+
+type LibraryCollectionTreeProps = {
+ rootCollection: Collection;
+ selectedCollectionId: CollectionId | undefined;
+ hasDataAccess: boolean;
+ hasNativeWrite: boolean;
+};
+
+export function LibraryCollectionTree({
+ rootCollection,
+ selectedCollectionId,
+ hasDataAccess,
+ hasNativeWrite,
+}: LibraryCollectionTreeProps) {
+ const collectionTree = useMemo(
+ () => buildCollectionTree([rootCollection]),
+ [rootCollection],
+ );
+
+ const modelCollection = useMemo(
+ () => getWritableCollection(rootCollection, "library-models"),
+ [rootCollection],
+ );
+
+ const metricCollection = useMemo(
+ () => getWritableCollection(rootCollection, "library-metrics"),
+ [rootCollection],
+ );
+
+ const initialExpandedIds = useMemo(
+ () => getAllExpandableIds(collectionTree),
+ [collectionTree],
+ );
+
+ const dispatch = useDispatch();
+
+ const handleCollectionSelect = useCallback(
+ (item: ITreeNodeItem) => {
+ dispatch(push(Urls.dataStudioCollection(item.id)));
+ },
+ [dispatch],
+ );
+
+ return (
+ <Tree
+ data={collectionTree}
+ selectedId={selectedCollectionId}
+ initialExpandedIds={initialExpandedIds}
+ TreeNode={ModelingSidebarTreeNode}
+ rightSection={(item: ITreeNodeItem) => {
+ if (item.id !== rootCollection.id) {
+ return null;
+ }
+
+ const canCreateModel = hasDataAccess && modelCollection != null;
+ const canCreateMetric = hasDataAccess && metricCollection != null;
+ if (!canCreateModel && !canCreateMetric) {
+ return null;
+ }
+
+ return (
+ <CreateCardMenu
+ modelCollectionId={modelCollection?.id}
+ metricCollectionId={metricCollection?.id}
+ canCreateModel={canCreateModel}
+ canCreateMetric={canCreateMetric}
+ canCreateNativeQuery={hasNativeWrite}
+ />
+ );
+ }}
+ role="tree"
+ onSelect={handleCollectionSelect}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/index.ts
new file mode 100644
index 00000000000..9bc5cd07304
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/index.ts
@@ -0,0 +1 @@
+export * from "./LibraryCollectionTree";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/utils.ts
new file mode 100644
index 00000000000..bb11a7d2843
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/utils.ts
@@ -0,0 +1,11 @@
+import type { Collection, CollectionType } from "metabase-types/api";
+
+export function getWritableCollection(
+ rootCollection: Collection,
+ type: CollectionType,
+) {
+ const collection = rootCollection.children?.find(
+ (collection) => collection.type === type,
+ );
+ return collection?.can_write ? collection : undefined;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx
new file mode 100644
index 00000000000..21c42902c95
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx
@@ -0,0 +1,71 @@
+import { useDisclosure } from "@mantine/hooks";
+import { useMemo } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { isLibraryCollection } from "metabase/collections/utils";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getUserIsAdmin } from "metabase/selectors/user";
+import { ModelingSidebarSection } from "metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection";
+import type { Collection, CollectionId } from "metabase-types/api";
+
+import { CreateLibraryModal } from "./CreateLibraryModal";
+import { LibraryCollectionTree } from "./LibraryCollectionTree";
+
+export type LibrarySectionProps = {
+ collections: Collection[];
+ selectedCollectionId: CollectionId | undefined;
+ hasDataAccess: boolean;
+ hasNativeWrite: boolean;
+};
+
+export function LibrarySection({
+ collections,
+ selectedCollectionId,
+ hasDataAccess,
+ hasNativeWrite,
+}: LibrarySectionProps) {
+ const isAdmin = useSelector(getUserIsAdmin);
+ const [isModalOpened, { open: openModal, close: closeModal }] =
+ useDisclosure();
+ const dispatch = useDispatch();
+
+ const rootCollection = useMemo(
+ () => collections.find(isLibraryCollection),
+ [collections],
+ );
+
+ const handleCreate = (collection: Collection) => {
+ closeModal();
+ dispatch(push(Urls.dataStudioCollection(collection.id)));
+ };
+
+ if (rootCollection != null) {
+ return (
+ <LibraryCollectionTree
+ rootCollection={rootCollection}
+ selectedCollectionId={selectedCollectionId}
+ hasDataAccess={hasDataAccess}
+ hasNativeWrite={hasNativeWrite}
+ />
+ );
+ }
+
+ if (isAdmin) {
+ return (
+ <>
+ <ModelingSidebarSection
+ title={t`Library`}
+ icon="repository"
+ onClick={openModal}
+ />
+ {isModalOpened && (
+ <CreateLibraryModal onCreate={handleCreate} onClose={closeModal} />
+ )}
+ </>
+ );
+ }
+
+ return null;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/index.ts
new file mode 100644
index 00000000000..94f580053c2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/index.ts
@@ -0,0 +1 @@
+export * from "./LibrarySection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsx
new file mode 100644
index 00000000000..b1ffa8bf7ca
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsx
@@ -0,0 +1,56 @@
+import { useMemo } from "react";
+
+import {
+ useListCollectionsTreeQuery,
+ useListDatabasesQuery,
+} from "metabase/api";
+import { getHasDataAccess, getHasNativeWrite } from "metabase/selectors/data";
+import type { CollectionId, NativeQuerySnippetId } from "metabase-types/api";
+
+import { ModelingSidebarView } from "./ModelingSidebarView";
+
+type ModelingSidebarProps = {
+ selectedCollectionId: CollectionId | undefined;
+ selectedSnippetId: NativeQuerySnippetId | undefined;
+ isGlossaryActive: boolean;
+};
+
+export function ModelingSidebar({
+ selectedCollectionId,
+ selectedSnippetId,
+ isGlossaryActive,
+}: ModelingSidebarProps) {
+ const { data: databaseData, isLoading: isLoadingDatabases } =
+ useListDatabasesQuery();
+ const { data: collections = [], isLoading: isLoadingCollections } =
+ useListCollectionsTreeQuery({
+ "exclude-other-user-collections": true,
+ "exclude-archived": true,
+ "include-library": true,
+ });
+
+ const { hasDataAccess, hasNativeWrite } = useMemo(() => {
+ const databases = databaseData?.data ?? [];
+ return {
+ hasDataAccess: getHasDataAccess(databases),
+ hasNativeWrite: getHasNativeWrite(databases),
+ };
+ }, [databaseData]);
+
+ const isLoading = isLoadingDatabases || isLoadingCollections;
+
+ if (isLoading) {
+ return null;
+ }
+
+ return (
+ <ModelingSidebarView
+ collections={collections}
+ selectedCollectionId={selectedCollectionId}
+ selectedSnippetId={selectedSnippetId}
+ isGlossaryActive={isGlossaryActive}
+ hasDataAccess={hasDataAccess}
+ hasNativeWrite={hasNativeWrite}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.module.css
new file mode 100644
index 00000000000..388e8fd90db
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.module.css
@@ -0,0 +1,24 @@
+.sectionLink {
+ display: block;
+ border-radius: 0.5rem;
+ text-decoration: none;
+ background-color: transparent;
+ cursor: pointer;
+}
+
+.sectionLink[data-active] {
+ color: var(--mb-color-text-brand);
+ background-color: var(--mb-color-brand-light);
+}
+
+.sectionLink:not([data-active]):hover {
+ background-color: var(--mb-color-brand-lighter);
+}
+
+.sectionLink[data-active]:hover {
+ background-color: var(--mb-color-brand-light);
+}
+
+.titleText {
+ flex: 1;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.tsx
new file mode 100644
index 00000000000..ec0ddc96ebb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.tsx
@@ -0,0 +1,70 @@
+import type { ReactNode } from "react";
+import { Link } from "react-router";
+
+import type { IconName } from "metabase/ui";
+import { Box, FixedSizeIcon, Flex, Stack, Text } from "metabase/ui";
+
+import S from "./ModelingSidebarSection.module.css";
+
+interface ModelingSidebarSectionProps {
+ icon: IconName;
+ title: string;
+ children?: ReactNode;
+ to?: string;
+ onClick?: () => void;
+ isActive?: boolean;
+ action?: {
+ icon: IconName;
+ label: string;
+ onClick: () => void;
+ };
+ rightSection?: ReactNode;
+}
+
+export function ModelingSidebarSection({
+ icon,
+ title,
+ children,
+ to,
+ onClick,
+ isActive = false,
+ rightSection = null,
+}: ModelingSidebarSectionProps) {
+ const titleContent = (
+ <Flex align="center" gap="sm" px="sm" py="xs">
+ <FixedSizeIcon name={icon} size={16} />
+ <Text fw="bold" className={S.titleText}>
+ {title}
+ </Text>
+ {rightSection}
+ </Flex>
+ );
+
+ const titleWrapper = to ? (
+ <Box
+ component={Link}
+ to={to}
+ className={S.sectionLink}
+ data-active={isActive || undefined}
+ >
+ {titleContent}
+ </Box>
+ ) : onClick ? (
+ <Box
+ onClick={onClick}
+ className={S.sectionLink}
+ data-active={isActive || undefined}
+ >
+ {titleContent}
+ </Box>
+ ) : (
+ <Box>{titleContent}</Box>
+ );
+
+ return (
+ <Stack gap="sm">
+ {titleWrapper}
+ {children}
+ </Stack>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/index.ts
new file mode 100644
index 00000000000..d3fa8e93377
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/index.ts
@@ -0,0 +1 @@
+export { ModelingSidebarSection } from "./ModelingSidebarSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.module.css
new file mode 100644
index 00000000000..be912f2f327
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.module.css
@@ -0,0 +1,25 @@
+.treeNode {
+ display: flex;
+ align-items: center;
+ padding-right: 0.5rem;
+ cursor: pointer;
+ font-weight: 700;
+ border-radius: 0.5rem;
+}
+
+.treeNode[data-selected="true"] {
+ color: var(--mb-color-text-brand);
+ background-color: var(--mb-color-brand-light);
+}
+
+.treeNode[data-selected="false"] {
+ color: var(--mb-color-text-primary);
+}
+
+.treeNode[data-selected="false"]:hover {
+ background-color: var(--mb-color-brand-lighter);
+}
+
+.treeNode[data-selected="true"]:hover {
+ background-color: var(--mb-color-brand-light);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.tsx
new file mode 100644
index 00000000000..79398ab2a11
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.tsx
@@ -0,0 +1,19 @@
+import { forwardRef } from "react";
+
+import { Tree } from "metabase/common/components/tree";
+import type { TreeNodeProps } from "metabase/common/components/tree/types";
+
+import S from "./ModelingSidebarTreeNode.module.css";
+
+export const ModelingSidebarTreeNode = forwardRef<HTMLLIElement, TreeNodeProps>(
+ function ModelingSidebarTreeNode(props, ref) {
+ return (
+ <Tree.Node
+ {...props}
+ ref={ref}
+ className={S.treeNode}
+ data-selected={props.isSelected}
+ />
+ );
+ },
+);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/index.ts
new file mode 100644
index 00000000000..718b695b4d2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/index.ts
@@ -0,0 +1 @@
+export { ModelingSidebarTreeNode } from "./ModelingSidebarTreeNode";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx
new file mode 100644
index 00000000000..7ce8182ea99
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx
@@ -0,0 +1,101 @@
+import type { MouseEvent } from "react";
+import { t } from "ttag";
+
+import { ForwardRefLink } from "metabase/common/components/Link";
+import * as Urls from "metabase/lib/urls";
+import { Button, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";
+import type { CollectionId } from "metabase-types/api";
+
+type CreateCardMenuProps = {
+ modelCollectionId?: CollectionId;
+ metricCollectionId?: CollectionId;
+ canCreateModel: boolean;
+ canCreateMetric: boolean;
+ canCreateNativeQuery: boolean;
+};
+
+export function CreateCardMenu({
+ modelCollectionId,
+ metricCollectionId,
+ canCreateModel,
+ canCreateMetric,
+ canCreateNativeQuery,
+}: CreateCardMenuProps) {
+ const handleClick = (event: MouseEvent) => {
+ event.stopPropagation();
+ };
+
+ return (
+ <Menu position="bottom-end">
+ <Tooltip label={t`Create model or metric`}>
+ <Menu.Target>
+ <Button
+ w={24}
+ h={24}
+ size="compact-xs"
+ variant="subtle"
+ c="text-medium"
+ aria-label={t`Create model or metric`}
+ leftSection={<FixedSizeIcon name="add" size={16} />}
+ onClick={handleClick}
+ />
+ </Menu.Target>
+ </Tooltip>
+ <Menu.Dropdown>
+ {canCreateModel && canCreateNativeQuery && (
+ <Menu.Sub>
+ <Menu.Sub.Target>
+ <Menu.Sub.Item leftSection={<FixedSizeIcon name="model" />}>
+ {t`Model`}
+ </Menu.Sub.Item>
+ </Menu.Sub.Target>
+ <Menu.Sub.Dropdown>
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioQueryModel({
+ collectionId: modelCollectionId,
+ })}
+ leftSection={<FixedSizeIcon name="notebook" />}
+ onClick={handleClick}
+ >
+ {t`Query builder`}
+ </Menu.Item>
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioNativeModel({
+ collectionId: modelCollectionId,
+ })}
+ leftSection={<FixedSizeIcon name="sql" />}
+ onClick={handleClick}
+ >
+ {t`SQL query`}
+ </Menu.Item>
+ </Menu.Sub.Dropdown>
+ </Menu.Sub>
+ )}
+ {canCreateModel && !canCreateNativeQuery && (
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioQueryModel({
+ collectionId: modelCollectionId,
+ })}
+ leftSection={<FixedSizeIcon name="model" />}
+ onClick={handleClick}
+ >
+ {t`Model`}
+ </Menu.Item>
+ )}
+ {canCreateMetric && (
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioMetric({ collectionId: metricCollectionId })}
+ leftSection={<FixedSizeIcon name="metric" />}
+ onClick={handleClick}
+ >
+ {t`Metric`}
+ </Menu.Item>
+ )}
+ </Menu.Dropdown>
+ </Menu>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/index.ts
new file mode 100644
index 00000000000..2b7cfebb85b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/index.ts
@@ -0,0 +1 @@
+export * from "./CreateCardMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.module.css
new file mode 100644
index 00000000000..24ba1e5a92e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.module.css
@@ -0,0 +1,8 @@
+.sidebar {
+ border-right: 1px solid var(--mb-color-border);
+ overflow-y: auto;
+}
+
+.section {
+ border-bottom: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsx
new file mode 100644
index 00000000000..48838a13c90
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsx
@@ -0,0 +1,63 @@
+import { t } from "ttag";
+
+import * as Urls from "metabase/lib/urls";
+import { Box, Stack } from "metabase/ui";
+import { LibrarySection } from "metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection";
+import type {
+ Collection,
+ CollectionId,
+ NativeQuerySnippetId,
+} from "metabase-types/api";
+
+import { ModelingSidebarSection } from "../ModelingSidebarSection";
+
+import S from "./ModelingSidebarView.module.css";
+import { SnippetsSection } from "./SnippetsSection";
+
+interface ModelingSidebarViewProps {
+ collections: Collection[];
+ selectedCollectionId: CollectionId | undefined;
+ selectedSnippetId?: NativeQuerySnippetId;
+ isGlossaryActive: boolean;
+ hasDataAccess: boolean;
+ hasNativeWrite: boolean;
+}
+
+export function ModelingSidebarView({
+ collections,
+ selectedCollectionId,
+ selectedSnippetId,
+ isGlossaryActive,
+ hasDataAccess,
+ hasNativeWrite,
+}: ModelingSidebarViewProps) {
+ return (
+ <Box w={320} h="100%" className={S.sidebar} data-testid="modeling-sidebar">
+ <Stack gap={0}>
+ <Box className={S.section} p="md" data-testid="collections-section">
+ <LibrarySection
+ collections={collections}
+ selectedCollectionId={selectedCollectionId}
+ hasDataAccess={hasDataAccess}
+ hasNativeWrite={hasNativeWrite}
+ />
+ </Box>
+
+ {hasNativeWrite && (
+ <Box className={S.section} p="md" data-testid="snippets-section">
+ <SnippetsSection selectedSnippetId={selectedSnippetId} />
+ </Box>
+ )}
+
+ <Box p="md" data-testid="glossary-section">
+ <ModelingSidebarSection
+ icon="book_open"
+ title={t`Glossary`}
+ to={Urls.dataStudioGlossary()}
+ isActive={isGlossaryActive}
+ />
+ </Box>
+ </Stack>
+ </Box>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/SnippetsSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/SnippetsSection.tsx
new file mode 100644
index 00000000000..c99c5b57571
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/SnippetsSection.tsx
@@ -0,0 +1,184 @@
+import { useCallback, useMemo, useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";
+import { isRootCollection } from "metabase/collections/utils";
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { Tree } from "metabase/common/components/tree";
+import type { ITreeNodeItem } from "metabase/common/components/tree/types";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
+import { getUserIsAdmin } from "metabase/selectors/user";
+import { Button, FixedSizeIcon, Flex, Menu, Tooltip } from "metabase/ui";
+import type { Collection, CollectionId } from "metabase-types/api";
+
+import { ModelingSidebarTreeNode } from "../../ModelingSidebarTreeNode";
+
+import {
+ type TreeItem,
+ buildSnippetTree,
+ isCollectionTreeItem,
+ isSnippetTreeItem,
+} from "./utils";
+
+type SnippetsSectionProps = {
+ selectedSnippetId?: number;
+};
+
+export function SnippetsSection({ selectedSnippetId }: SnippetsSectionProps) {
+ const dispatch = useDispatch();
+ const isAdmin = useSelector(getUserIsAdmin);
+ const [editingCollection, setEditingCollection] = useState<Collection | null>(
+ null,
+ );
+ const [permissionsCollectionId, setPermissionsCollectionId] =
+ useState<CollectionId | null>(null);
+ const [creatingFolder, setCreatingFolder] = useState(false);
+
+ const { data: snippets = [] } = useListSnippetsQuery();
+ const { data: snippetCollections = [] } = useListCollectionsQuery({
+ namespace: "snippets",
+ });
+
+ const snippetTree = useMemo(
+ () => buildSnippetTree(snippetCollections, snippets),
+ [snippetCollections, snippets],
+ );
+
+ const handleSnippetSelect = useCallback(
+ (item: ITreeNodeItem<TreeItem>) => {
+ if (item.data && isSnippetTreeItem(item.data)) {
+ dispatch(push(Urls.dataStudioSnippet(item.data.id)));
+ }
+ },
+ [dispatch],
+ );
+
+ return (
+ <>
+ <Tree
+ data={snippetTree}
+ selectedId={selectedSnippetId}
+ onSelect={handleSnippetSelect}
+ TreeNode={ModelingSidebarTreeNode}
+ rightSection={(item: ITreeNodeItem<TreeItem>) => {
+ if (!item.data || !isCollectionTreeItem(item.data)) {
+ return null;
+ }
+
+ const isRoot = isRootCollection(item.data);
+
+ if (isRoot) {
+ return (
+ <Flex
+ gap="xs"
+ align="center"
+ onClick={(e) => e.stopPropagation()}
+ >
+ {isAdmin && (
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Button
+ w={24}
+ h={24}
+ c="text-medium"
+ size="compact-xs"
+ variant="subtle"
+ leftSection={
+ <FixedSizeIcon name="ellipsis" size={16} />
+ }
+ aria-label={t`Snippet collection options`}
+ />
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="lock" />}
+ onClick={() => {
+ if (item.data) {
+ setPermissionsCollectionId(item.data.id);
+ }
+ }}
+ >
+ {t`Change permissions`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ )}
+ {item.data.can_write && (
+ <Menu position="bottom-end">
+ <Tooltip label={t`Create snippet`}>
+ <Menu.Target>
+ <Button
+ w={24}
+ h={24}
+ size="compact-xs"
+ variant="subtle"
+ c="text-medium"
+ leftSection={<FixedSizeIcon name="add" size={16} />}
+ aria-label={t`Create snippet`}
+ />
+ </Menu.Target>
+ </Tooltip>
+ <Menu.Dropdown>
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioSnippet()}
+ leftSection={<FixedSizeIcon name="snippet" />}
+ aria-label={t`Create new snippet`}
+ >
+ {t`New snippet`}
+ </Menu.Item>
+ {PLUGIN_SNIPPET_FOLDERS.isEnabled && (
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="folder" />}
+ onClick={() => setCreatingFolder(true)}
+ >
+ {t`New folder`}
+ </Menu.Item>
+ )}
+ </Menu.Dropdown>
+ </Menu>
+ )}
+ </Flex>
+ );
+ }
+
+ return (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionMenu
+ collection={item.data}
+ onEditDetails={setEditingCollection}
+ onChangePermissions={setPermissionsCollectionId}
+ />
+ );
+ }}
+ role="tree"
+ aria-label="modeling-snippets-tree"
+ />
+ {editingCollection && (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionFormModal
+ collection={editingCollection}
+ onClose={() => setEditingCollection(null)}
+ onSaved={() => setEditingCollection(null)}
+ />
+ )}
+ {creatingFolder && (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionFormModal
+ collection={{
+ name: "",
+ description: null,
+ }}
+ onClose={() => setCreatingFolder(false)}
+ onSaved={() => setCreatingFolder(false)}
+ />
+ )}
+ {permissionsCollectionId != null && (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionPermissionsModal
+ collectionId={permissionsCollectionId}
+ onClose={() => setPermissionsCollectionId(null)}
+ />
+ )}
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/index.ts
new file mode 100644
index 00000000000..9e0b08c38f8
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/index.ts
@@ -0,0 +1 @@
+export { SnippetsSection } from "./SnippetsSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/utils.ts
new file mode 100644
index 00000000000..6d59745d2f5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/utils.ts
@@ -0,0 +1,81 @@
+import { t } from "ttag";
+
+import { isRootCollection } from "metabase/collections/utils";
+import type { ITreeNodeItem } from "metabase/common/components/tree/types";
+import type { Collection, NativeQuerySnippet } from "metabase-types/api";
+
+type SnippetTreeItem = NativeQuerySnippet & { model: "snippet" };
+type CollectionTreeItem = Collection & { model: "collection" };
+
+export type TreeItem = SnippetTreeItem | CollectionTreeItem;
+
+export const isSnippetTreeItem = (item: TreeItem): item is SnippetTreeItem =>
+ item.model === "snippet";
+
+export const isCollectionTreeItem = (
+ item: TreeItem,
+): item is CollectionTreeItem => item.model === "collection";
+
+function createSnippetNode(
+ snippet: NativeQuerySnippet,
+): ITreeNodeItem<TreeItem> {
+ return {
+ id: snippet.id,
+ name: snippet.name,
+ icon: "snippet",
+ data: { ...snippet, model: "snippet" },
+ };
+}
+
+function buildCollectionNode(
+ collection: Collection,
+ allCollections: Collection[],
+ allSnippets: NativeQuerySnippet[],
+): ITreeNodeItem<TreeItem> {
+ const isRoot = isRootCollection(collection);
+ const parentIdToMatch = isRoot ? null : collection.id;
+
+ const childCollections = allCollections.filter(
+ (c) => c.parent_id === parentIdToMatch,
+ );
+ const childSnippets = allSnippets.filter(
+ (s) => s.collection_id === parentIdToMatch,
+ );
+
+ const children = [
+ ...childCollections.map((child) =>
+ buildCollectionNode(child, allCollections, allSnippets),
+ ),
+ ...childSnippets.map(createSnippetNode),
+ ];
+
+ return {
+ id: collection.id,
+ name: collection.name,
+ icon: isRoot ? "snippet" : "folder",
+ data: { ...collection, model: "collection" },
+ children: children.length > 0 ? children : undefined,
+ };
+}
+
+export function buildSnippetTree(
+ snippetCollections: Collection[],
+ snippets: NativeQuerySnippet[],
+): ITreeNodeItem<TreeItem>[] {
+ const collections = snippetCollections.filter((c) => !c.archived);
+ const activeSnippets = snippets.filter((s) => !s.archived);
+
+ const rootCollection = collections.find(isRootCollection);
+ if (!rootCollection) {
+ return [];
+ }
+
+ const nonRootCollections = collections.filter((c) => !isRootCollection(c));
+ const rootNode = buildCollectionNode(
+ rootCollection,
+ nonRootCollections,
+ activeSnippets,
+ );
+
+ return [{ ...rootNode, name: t`SQL snippets` }];
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/index.ts
new file mode 100644
index 00000000000..9ece1a91122
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/index.ts
@@ -0,0 +1 @@
+export { ModelingSidebarView } from "./ModelingSidebarView";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/index.ts
new file mode 100644
index 00000000000..55eb947d9cd
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/index.ts
@@ -0,0 +1 @@
+export { ModelingSidebar } from "./ModelingSidebar";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/index.ts
new file mode 100644
index 00000000000..0a1f4cbe023
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/index.ts
@@ -0,0 +1 @@
+export * from "./ModelingSectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
new file mode 100644
index 00000000000..0ad222f3bfe
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
@@ -0,0 +1,70 @@
+import type { Location } from "history";
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import { usePageTitle } from "metabase/hooks/use-page-title";
+import * as Urls from "metabase/lib/urls";
+import { Group } from "metabase/ui";
+import {
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+
+import { SectionLayout } from "../../components/SectionLayout";
+
+type TransformsSectionLayoutProps = {
+ location: Location;
+ children?: ReactNode;
+};
+
+export function TransformsSectionLayout({
+ location,
+ children,
+}: TransformsSectionLayoutProps) {
+ usePageTitle(t`Transforms`);
+
+ return (
+ <SectionLayout tabs={<DataSectionTabs location={location} />}>
+ {children}
+ </SectionLayout>
+ );
+}
+
+type DataSectionTabsProps = {
+ location: Location;
+};
+
+function DataSectionTabs({ location }: DataSectionTabsProps) {
+ return (
+ <Group>
+ <PaneHeaderTabs tabs={getTabs(location)} withBackground />
+ </Group>
+ );
+}
+
+function getTabs({ pathname }: Location): PaneHeaderTab[] {
+ const isTransforms = pathname.startsWith(Urls.transformList());
+ const isJobs = pathname.startsWith(Urls.transformJobList());
+ const isRuns = pathname.startsWith(Urls.transformRunList());
+
+ return [
+ {
+ label: t`Transforms`,
+ to: Urls.transformList(),
+ icon: "transform",
+ isSelected: isTransforms && !isJobs && !isRuns,
+ },
+ {
+ label: t`Jobs`,
+ to: Urls.transformJobList(),
+ icon: "clock",
+ isSelected: isJobs,
+ },
+ {
+ label: t`Runs`,
+ to: Urls.transformRunList(),
+ icon: "play",
+ isSelected: isRuns,
+ },
+ ];
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/index.ts
new file mode 100644
index 00000000000..aec231243dd
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/index.ts
@@ -0,0 +1 @@
+export * from "./TransformsSectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.module.css
new file mode 100644
index 00000000000..215750900ee
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.module.css
@@ -0,0 +1,15 @@
+.root {
+ overflow: auto;
+}
+
+.visualization {
+ background-color: var(--mb-color-bg-white);
+ border: 1px solid var(--mb-color-border);
+ border-radius: var(--default-border-radius);
+ overflow: hidden;
+ flex: 1;
+}
+
+.sidebar {
+ flex-shrink: 0;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.tsx
new file mode 100644
index 00000000000..385ff4dce1a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.tsx
@@ -0,0 +1,32 @@
+import { EntityCreationInfo } from "metabase/common/components/EntityCreationInfo";
+import { Flex, Stack } from "metabase/ui";
+import type { Card } from "metabase-types/api";
+
+import S from "./CardOverview.module.css";
+import { CardOverviewVisualization } from "./CardOverviewVisualization";
+import { DescriptionSection } from "./DescriptionSection";
+import { QuerySourceSection } from "./QuerySourceSection";
+
+type CardOverviewProps = {
+ card: Card;
+};
+
+export function CardOverview({ card }: CardOverviewProps) {
+ return (
+ <Flex className={S.root} p="lg" flex={1} bg="bg-light">
+ <Flex direction="column" flex={1} mah={700}>
+ <CardOverviewVisualization className={S.visualization} card={card} />
+ </Flex>
+ <Stack maw={300} ml="lg" gap="lg" className={S.sidebar}>
+ <DescriptionSection card={card} />
+ <QuerySourceSection card={card} />
+ <EntityCreationInfo
+ createdAt={card.created_at}
+ creator={card.creator}
+ lastEditedAt={card["last-edit-info"]?.timestamp}
+ lastEditor={card["last-edit-info"]}
+ />
+ </Stack>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/CardOverviewVisualization.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/CardOverviewVisualization.tsx
new file mode 100644
index 00000000000..15a59e849e8
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/CardOverviewVisualization.tsx
@@ -0,0 +1,48 @@
+import { useMemo } from "react";
+
+import { useGetCardQueryQuery } from "metabase/api";
+import DebouncedFrame from "metabase/common/components/DebouncedFrame";
+import { useSelector } from "metabase/lib/redux";
+import QueryVisualization from "metabase/query_builder/components/QueryVisualization";
+import { getMetadata } from "metabase/selectors/metadata";
+import Question from "metabase-lib/v1/Question";
+import type { Card } from "metabase-types/api";
+
+import S from "./VisualizationSection.css";
+
+type CardOverviewVisualizationProps = {
+ className?: string;
+ card: Card;
+};
+
+export function CardOverviewVisualization({
+ className,
+ card,
+}: CardOverviewVisualizationProps) {
+ const metadata = useSelector(getMetadata);
+ const question = useMemo(
+ () => new Question(card, metadata),
+ [card, metadata],
+ );
+
+ const { data, isLoading } = useGetCardQueryQuery({ cardId: card.id });
+ const rawSeries = useMemo(
+ () => (data ? [{ card, data: data.data }] : null),
+ [card, data],
+ );
+
+ return (
+ <DebouncedFrame className={S.root}>
+ <QueryVisualization
+ className={className}
+ question={question}
+ result={data}
+ rawSeries={rawSeries}
+ isRunnable={false}
+ isRunning={isLoading}
+ isDirty
+ isResultDirty={false}
+ />
+ </DebouncedFrame>
+ );
+}
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/VisualizationSection.css
similarity index 100%
rename from frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/VisualizationSection.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/index.ts
new file mode 100644
index 00000000000..2ee9962e31b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverviewVisualization/index.ts
@@ -0,0 +1 @@
+export * from "./CardOverviewVisualization";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/DescriptionSection.tsx
new file mode 100644
index 00000000000..c26f957581b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/DescriptionSection.tsx
@@ -0,0 +1,71 @@
+import { t } from "ttag";
+
+import { useUpdateCardMutation } from "metabase/api";
+import EditableText from "metabase/common/components/EditableText";
+import Markdown from "metabase/common/components/Markdown";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Box } from "metabase/ui";
+import type { Card, CardType } from "metabase-types/api";
+
+type DescriptionSectionProps = {
+ card: Card;
+};
+
+export function DescriptionSection({ card }: DescriptionSectionProps) {
+ const [updateCard] = useUpdateCardMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const handleChange = async (newValue: string) => {
+ const newDescription = newValue.trim();
+ const { error } = await updateCard({
+ id: card.id,
+ description: newDescription.length > 0 ? newDescription : null,
+ });
+ if (error) {
+ sendErrorToast(getErrorMessage(card.type));
+ } else {
+ sendSuccessToast(getSuccessMessage(card.type));
+ }
+ };
+
+ if (card.can_write) {
+ return (
+ <Box mx="-5px">
+ <EditableText
+ initialValue={card.description ?? ""}
+ placeholder={t`No description`}
+ isMarkdown
+ onChange={handleChange}
+ />
+ </Box>
+ );
+ }
+
+ if (card.description) {
+ return <Markdown>{card.description}</Markdown>;
+ }
+
+ return <Box c="text-secondary" lh="h4">{t`No description`}</Box>;
+}
+
+function getSuccessMessage(cardType: CardType) {
+ switch (cardType) {
+ case "question":
+ return t`Question description updated`;
+ case "model":
+ return t`Model description updated`;
+ case "metric":
+ return t`Metric description updated`;
+ }
+}
+
+function getErrorMessage(cardType: CardType) {
+ switch (cardType) {
+ case "question":
+ return t`Failed to update question description`;
+ case "model":
+ return t`Failed to update model description`;
+ case "metric":
+ return t`Failed to update metric description`;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/index.ts
new file mode 100644
index 00000000000..64c023fdf2f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/index.ts
@@ -0,0 +1 @@
+export * from "./DescriptionSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceInfo.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceInfo.module.css
new file mode 100644
index 00000000000..9183caa2576
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceInfo.module.css
@@ -0,0 +1,6 @@
+.link {
+ &:hover {
+ text-decoration: none;
+ color: var(--mb-color-brand);
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceSection.tsx
new file mode 100644
index 00000000000..66ad5169825
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceSection.tsx
@@ -0,0 +1,165 @@
+import { Fragment, useMemo } from "react";
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import { useGetCardQuery, useGetTableQuery } from "metabase/api";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Group, Stack, Title } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { Card, CardId, TableId } from "metabase-types/api";
+
+import S from "./QuerySourceInfo.module.css";
+
+type QuerySourceSectionProps = {
+ card: Card;
+};
+
+export function QuerySourceSection({ card }: QuerySourceSectionProps) {
+ const metadata = useSelector(getMetadata);
+ const { query, queryInfo } = useMemo(() => {
+ const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
+ const queryInfo = Lib.queryDisplayInfo(query);
+ return { query, queryInfo };
+ }, [metadata, card]);
+
+ const pickerInfo = useMemo(() => {
+ const tableOrCardId = Lib.sourceTableOrCardId(query);
+ const tableOrCard =
+ tableOrCardId != null
+ ? Lib.tableOrCardMetadata(query, tableOrCardId)
+ : null;
+ return tableOrCard != null ? Lib.pickerInfo(query, tableOrCard) : null;
+ }, [query]);
+
+ if (!queryInfo.isEditable || pickerInfo == null) {
+ return null;
+ }
+
+ return (
+ <Stack gap="sm">
+ <Title order={6}>{t`Based on`}</Title>
+ {pickerInfo.cardId == null ? (
+ <TableSourcePath tableId={pickerInfo.tableId} />
+ ) : (
+ <CardSourcePath cardId={pickerInfo.cardId} />
+ )}
+ </Stack>
+ );
+}
+
+type TableSourcePathProps = {
+ tableId: TableId;
+};
+
+function TableSourcePath({ tableId }: TableSourcePathProps) {
+ const { data: table } = useGetTableQuery({ id: tableId });
+
+ const parts = useMemo(() => {
+ if (!table || !table.db) {
+ return null;
+ }
+
+ const pathParts: SourcePathPart[] = [];
+ pathParts.push({
+ name: table.db.name,
+ url: table.db.is_audit ? undefined : Urls.dataModelDatabase(table.db_id),
+ });
+
+ if (table.schema) {
+ pathParts.push({
+ name: table.schema,
+ url: table.db.is_audit
+ ? undefined
+ : Urls.dataModelSchema(table.db_id, table.schema),
+ });
+ }
+
+ pathParts.push({
+ name: table.display_name,
+ url: table.db.is_audit
+ ? undefined
+ : Urls.dataModelTable(table.db_id, table.schema, table.id),
+ });
+
+ return pathParts;
+ }, [table]);
+
+ if (!parts) {
+ return null;
+ }
+
+ return <SourcePath parts={parts} />;
+}
+
+type CardSourcePathProps = {
+ cardId: CardId;
+};
+
+function CardSourcePath({ cardId }: CardSourcePathProps) {
+ const { data: card } = useGetCardQuery({ id: cardId });
+
+ const parts = useMemo(() => {
+ if (card == null) {
+ return null;
+ }
+
+ const pathParts: SourcePathPart[] = [
+ { name: card.name, url: Urls.question(card) },
+ ];
+
+ const collection = card.collection;
+ if (collection != null) {
+ pathParts.unshift({
+ name: collection.name,
+ url: Urls.collection(collection),
+ });
+
+ if (collection.effective_ancestors != null) {
+ pathParts.unshift(
+ ...collection.effective_ancestors.map((parent) => ({
+ name: parent.name,
+ url: Urls.collection(parent),
+ })),
+ );
+ }
+ }
+
+ return pathParts;
+ }, [card]);
+
+ if (!parts) {
+ return null;
+ }
+
+ return <SourcePath parts={parts} />;
+}
+
+type SourcePathPart = {
+ name: string;
+ url?: string;
+};
+
+type SourcePathProps = {
+ parts: SourcePathPart[];
+};
+
+function SourcePath({ parts }: SourcePathProps) {
+ return (
+ <Group gap="xs">
+ {parts.map((part, index) => (
+ <Fragment key={index}>
+ {index > 0 && " / "}
+ {part.url ? (
+ <Link className={S.link} to={part.url}>
+ {part.name}
+ </Link>
+ ) : (
+ <span>{part.name}</span>
+ )}
+ </Fragment>
+ ))}
+ </Group>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/index.ts
new file mode 100644
index 00000000000..ec8ad52f0d2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/index.ts
@@ -0,0 +1 @@
+export * from "./QuerySourceSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/index.ts
new file mode 100644
index 00000000000..12b837dffab
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/index.ts
@@ -0,0 +1 @@
+export * from "./CardOverview";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/NameDescriptionInput.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.css
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/NameDescriptionInput.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.css
index dbb8d99f43f..3928ba9b966 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/NameDescriptionInput.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.module.css
@@ -1,3 +1,3 @@
-.section {
+.header {
border-bottom: 1px solid var(--mb-color-border);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx
new file mode 100644
index 00000000000..2074827e26c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx
@@ -0,0 +1,167 @@
+import cx from "classnames";
+import type { ReactNode } from "react";
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import EditableText from "metabase/common/components/EditableText";
+import { useSelector } from "metabase/lib/redux";
+import { getLocation } from "metabase/selectors/routing";
+import type { GroupProps, IconName } from "metabase/ui";
+import { Box, Button, FixedSizeIcon, Group, Stack, Tooltip } from "metabase/ui";
+
+import S from "./PaneHeader.module.css";
+import type { PaneHeaderTab } from "./types";
+
+interface PaneHeaderProps extends Omit<GroupProps, "title"> {
+ title: ReactNode;
+ icon?: IconName;
+ menu?: ReactNode;
+ tabs?: ReactNode;
+ actions?: ReactNode;
+}
+
+export const PaneHeader = ({
+ className,
+ title,
+ icon,
+ menu,
+ tabs,
+ actions,
+ ...rest
+}: PaneHeaderProps) => {
+ return (
+ <Group
+ className={cx(S.header, className)}
+ px="lg"
+ py="md"
+ justify="space-between"
+ gap="sm"
+ wrap="nowrap"
+ {...rest}
+ >
+ <Stack gap="sm">
+ <Group align="center" gap="xs" wrap="nowrap">
+ {icon && <FixedSizeIcon name={icon} c="brand" size={20} />}
+ {title}
+ {menu}
+ </Group>
+ {tabs}
+ </Stack>
+ {actions}
+ </Group>
+ );
+};
+
+type PaneHeaderTitleProps = {
+ children?: ReactNode;
+};
+
+export function PanelHeaderTitle({ children }: PaneHeaderTitleProps) {
+ return (
+ <Box fw="bold" fz="h3" lh="h3">
+ {children}
+ </Box>
+ );
+}
+
+type PaneHeaderInputProps = {
+ initialValue?: string;
+ placeholder?: string;
+ maxLength?: number;
+ isOptional?: boolean;
+ onChange?: (value: string) => void;
+ onContentChange?: (value: string) => void;
+};
+
+export function PaneHeaderInput({
+ initialValue,
+ placeholder = t`Name`,
+ maxLength,
+ isOptional,
+ onChange,
+ onContentChange,
+}: PaneHeaderInputProps) {
+ return (
+ <EditableText
+ initialValue={initialValue}
+ placeholder={placeholder}
+ maxLength={maxLength}
+ p={0}
+ fw="bold"
+ fz="h3"
+ lh="h3"
+ px={isOptional ? "xs" : undefined}
+ bd={isOptional ? "1px solid var(--mb-color-border)" : undefined}
+ isOptional={isOptional}
+ onChange={onChange}
+ onContentChange={onContentChange}
+ />
+ );
+}
+
+type PaneHeaderTabsProps = {
+ tabs: PaneHeaderTab[];
+ withBackground?: boolean;
+};
+
+export function PaneHeaderTabs({ tabs, withBackground }: PaneHeaderTabsProps) {
+ const { pathname } = useSelector(getLocation);
+ const backgroundColor = withBackground ? "bg-secondary" : "transparent";
+
+ return (
+ <Group gap="sm">
+ {tabs.map(({ label, to, icon, isSelected = to === pathname }) => {
+ return (
+ <Button
+ key={label}
+ component={Link}
+ to={to}
+ size="sm"
+ radius="xl"
+ c={isSelected ? "brand" : undefined}
+ bg={isSelected ? "brand-light" : backgroundColor}
+ bd="none"
+ leftSection={icon != null ? <FixedSizeIcon name={icon} /> : null}
+ >
+ {label}
+ </Button>
+ );
+ })}
+ </Group>
+ );
+}
+
+type PaneHeaderActionsProps = {
+ errorMessage?: string;
+ isValid?: boolean;
+ isDirty?: boolean;
+ isSaving?: boolean;
+ onSave: () => void;
+ onCancel: () => void;
+};
+
+export function PaneHeaderActions({
+ errorMessage,
+ isValid = true,
+ isDirty = false,
+ isSaving = false,
+ onSave,
+ onCancel,
+}: PaneHeaderActionsProps) {
+ const canSave = isDirty && !isSaving && isValid;
+
+ if (!isDirty && !isSaving) {
+ return null;
+ }
+
+ return (
+ <Group>
+ <Button onClick={onCancel}>{t`Cancel`}</Button>
+ <Tooltip label={errorMessage} disabled={errorMessage == null}>
+ <Button variant="filled" disabled={!canSave} onClick={onSave}>
+ {t`Save`}
+ </Button>
+ </Tooltip>
+ </Group>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/index.ts
new file mode 100644
index 00000000000..0414c457bca
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/index.ts
@@ -0,0 +1,2 @@
+export * from "./PaneHeader";
+export * from "./types";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/types.ts
new file mode 100644
index 00000000000..3eebf72c006
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/types.ts
@@ -0,0 +1,8 @@
+import type { IconName } from "metabase/ui";
+
+export type PaneHeaderTab = {
+ label: string;
+ to: string;
+ icon?: IconName;
+ isSelected?: boolean;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/DataStudioContext.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/DataStudioContext.tsx
new file mode 100644
index 00000000000..1e0cd0995fa
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/DataStudioContext.tsx
@@ -0,0 +1,15 @@
+import { createContext } from "react";
+
+type DataStudioContextType = {
+ isSidebarOpened: boolean;
+ isSidebarAvailable: boolean;
+ setIsSidebarOpened: (isOpened: boolean) => void;
+ setIsSidebarAvailable: (isAvailable: boolean) => void;
+};
+
+export const DataStudioContext = createContext<DataStudioContextType>({
+ isSidebarOpened: false,
+ isSidebarAvailable: false,
+ setIsSidebarOpened: () => undefined,
+ setIsSidebarAvailable: () => undefined,
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/index.ts
new file mode 100644
index 00000000000..dba94019899
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/index.ts
@@ -0,0 +1 @@
+export * from "./DataStudioContext";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/index.ts
new file mode 100644
index 00000000000..44da4def762
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/index.ts
@@ -0,0 +1 @@
+export * from "./use-load-card-with-metadata";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
new file mode 100644
index 00000000000..d13d7e5ed65
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
@@ -0,0 +1,22 @@
+import {
+ skipToken,
+ useGetCardQuery,
+ useGetCardQueryMetadataQuery,
+} from "metabase/api";
+import type { CardId } from "metabase-types/api";
+
+export function useLoadCardWithMetadata(cardId: CardId | undefined) {
+ const {
+ data: card,
+ isLoading: isLoadingCard,
+ error: cardError,
+ } = useGetCardQuery(cardId != null ? { id: cardId } : skipToken);
+ const { isLoading: isLoadingMetadata, error: metadataError } =
+ useGetCardQueryMetadataQuery(cardId ?? skipToken);
+
+ return {
+ card,
+ isLoading: isLoadingCard || isLoadingMetadata,
+ error: cardError ?? metadataError,
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts
new file mode 100644
index 00000000000..377aae48f25
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts
@@ -0,0 +1,17 @@
+import * as Lib from "metabase-lib";
+import type { Dataset, DatasetQuery } from "metabase-types/api";
+
+export function getResultMetadata(
+ currentQuery: DatasetQuery,
+ lastRunQuery: DatasetQuery | null,
+ lastRunResult: Dataset | null,
+) {
+ if (
+ lastRunQuery != null &&
+ lastRunResult != null &&
+ Lib.areLegacyQueriesEqual(currentQuery, lastRunQuery)
+ ) {
+ return lastRunResult.data?.results_metadata?.columns ?? null;
+ }
+ return null;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
new file mode 100644
index 00000000000..f38271e7ce9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
@@ -0,0 +1,43 @@
+import { t } from "ttag";
+
+import { useTemporaryState } from "metabase/common/hooks";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Button } from "metabase/ui";
+import { useDiscardTablesFieldValuesMutation } from "metabase-enterprise/api";
+import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
+
+interface Props {
+ databaseIds?: DatabaseId[];
+ schemaIds?: SchemaId[];
+ tableIds?: TableId[];
+}
+
+export const DiscardTableFieldValuesButton = ({
+ databaseIds,
+ schemaIds,
+ tableIds,
+}: Props) => {
+ const [discardTablesFieldValues] = useDiscardTablesFieldValuesMutation();
+ const { sendErrorToast } = useMetadataToasts();
+ const [started, setStarted] = useTemporaryState(false, 2000);
+
+ const handleClick = async () => {
+ const { error } = await discardTablesFieldValues({
+ database_ids: databaseIds,
+ schema_ids: schemaIds,
+ table_ids: tableIds,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to discard values`);
+ } else {
+ setStarted(true);
+ }
+ };
+
+ return (
+ <Button c="error" variant="subtle" onClick={handleClick}>
+ {started ? t`Discard triggered!` : t`Discard cached field values`}
+ </Button>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
new file mode 100644
index 00000000000..a7efc952861
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
@@ -0,0 +1,151 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupTableEndpoints,
+ setupTablesBulkEndpoints,
+} from "__support__/server-mocks";
+import {
+ act,
+ renderWithProviders,
+ screen,
+ waitFor,
+ within,
+} from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
+import { createMockTable } from "metabase-types/api/mocks";
+
+import { DiscardTableFieldValuesButton } from "./DiscardTableFieldValuesButton";
+
+function setup() {
+ const table = createMockTable();
+
+ setupTableEndpoints(table);
+ setupTablesBulkEndpoints();
+
+ renderWithProviders(
+ <>
+ <DiscardTableFieldValuesButton tableIds={[table.id]} />
+ <UndoListing />
+ </>,
+ );
+
+ return { table };
+}
+
+describe("DiscardTableFieldValuesButton", () => {
+ beforeEach(() => {
+ jest.useFakeTimers({ advanceTimers: true });
+ });
+
+ it("should show success message for 2 seconds", async () => {
+ const { table } = setup();
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Discard cached field values");
+
+ await userEvent.click(button);
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/discard-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Discard triggered!");
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(2000);
+ });
+ expect(button).toHaveTextContent("Discard cached field values");
+ });
+
+ it("resets success message timer after next click", async () => {
+ const { table } = setup();
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Discard cached field values");
+
+ await userEvent.click(button);
+ let calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/discard-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Discard triggered!");
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Discard triggered!");
+ await userEvent.click(button);
+ calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/discard-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(2);
+ expect(JSON.parse(calls[1].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Discard triggered!");
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Discard cached field values");
+ });
+
+ it("should show error message toast", async () => {
+ const { table } = setup();
+
+ fetchMock.modifyRoute("tables-discard-values", {
+ response: { status: 500 },
+ });
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Discard cached field values");
+
+ await userEvent.click(button);
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/discard-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Discard cached field values");
+ });
+
+ await waitFor(() => {
+ const undo = screen.getByTestId("undo-list");
+ expect(
+ within(undo).getByText("Failed to discard values"),
+ ).toBeInTheDocument();
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts
new file mode 100644
index 00000000000..a4a0b51bff0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts
@@ -0,0 +1 @@
+export * from "./DiscardTableFieldValuesButton";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
new file mode 100644
index 00000000000..e85c64d9b18
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
@@ -0,0 +1,53 @@
+import { t } from "ttag";
+
+import { useTemporaryState } from "metabase/common/hooks";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Button } from "metabase/ui";
+import { useRescanTablesFieldValuesMutation } from "metabase-enterprise/api";
+import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
+
+interface Props {
+ databaseIds?: DatabaseId[];
+ schemaIds?: SchemaId[];
+ tableIds?: TableId[];
+}
+
+export const RescanTableFieldsButton = ({
+ databaseIds,
+ schemaIds,
+ tableIds,
+}: Props) => {
+ const [rescanTablesFieldValues] = useRescanTablesFieldValuesMutation();
+ const [started, setStarted] = useTemporaryState(false, 2000);
+ const { sendErrorToast } = useMetadataToasts();
+
+ const isSingleTable =
+ (databaseIds == null || databaseIds.length === 0) &&
+ (schemaIds == null || schemaIds.length === 0) &&
+ tableIds != null &&
+ tableIds.length === 1;
+
+ const handleClick = async () => {
+ const { error } = await rescanTablesFieldValues({
+ database_ids: databaseIds,
+ schema_ids: schemaIds,
+ table_ids: tableIds,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to start scan`);
+ } else {
+ setStarted(true);
+ }
+ };
+
+ return (
+ <Button variant="default" onClick={handleClick}>
+ {started
+ ? t`Scan triggered!`
+ : isSingleTable
+ ? t`Re-scan table`
+ : t`Re-scan tables`}
+ </Button>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
new file mode 100644
index 00000000000..72352839db2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
@@ -0,0 +1,151 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupTableEndpoints,
+ setupTablesBulkEndpoints,
+} from "__support__/server-mocks";
+import {
+ act,
+ renderWithProviders,
+ screen,
+ waitFor,
+ within,
+} from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
+import { createMockTable } from "metabase-types/api/mocks";
+
+import { RescanTableFieldsButton } from "./RescanTableFieldsButton";
+
+function setup() {
+ const table = createMockTable();
+
+ setupTableEndpoints(table);
+ setupTablesBulkEndpoints();
+
+ renderWithProviders(
+ <>
+ <RescanTableFieldsButton tableIds={[table.id]} />
+ <UndoListing />
+ </>,
+ );
+
+ return { table };
+}
+
+describe("RescanTableFieldsButton", () => {
+ beforeEach(() => {
+ jest.useFakeTimers({ advanceTimers: true });
+ });
+
+ it("should show success message for 2 seconds", async () => {
+ const { table } = setup();
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Re-scan table");
+
+ await userEvent.click(button);
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/rescan-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Scan triggered!");
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(2000);
+ });
+ expect(button).toHaveTextContent("Re-scan table");
+ });
+
+ it("resets success message timer after next click", async () => {
+ const { table } = setup();
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Re-scan table");
+
+ await userEvent.click(button);
+ let calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/rescan-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Scan triggered!");
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Scan triggered!");
+ await userEvent.click(button);
+ calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/rescan-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(2);
+ expect(JSON.parse(calls[1].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Scan triggered!");
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Re-scan table");
+ });
+
+ it("should show error message toast", async () => {
+ const { table } = setup();
+
+ fetchMock.modifyRoute("tables-rescan-values", {
+ response: { status: 500 },
+ });
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Re-scan table");
+
+ await userEvent.click(button);
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/rescan-values`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Re-scan table");
+ });
+
+ await waitFor(() => {
+ const undo = screen.getByTestId("undo-list");
+ expect(
+ within(undo).getByText("Failed to start scan"),
+ ).toBeInTheDocument();
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/index.ts
new file mode 100644
index 00000000000..c4c848d5a10
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/RescanTableFieldsButton/index.ts
@@ -0,0 +1 @@
+export * from "./RescanTableFieldsButton";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncOptionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncOptionsModal.tsx
new file mode 100644
index 00000000000..95dc23e90a7
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncOptionsModal.tsx
@@ -0,0 +1,90 @@
+import { t } from "ttag";
+
+import { Modal, Stack, Text, rem } from "metabase/ui";
+import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
+
+import { DiscardTableFieldValuesButton } from "./DiscardTableFieldValuesButton";
+import { RescanTableFieldsButton } from "./RescanTableFieldsButton";
+import { SyncTableSchemaButton } from "./SyncTableSchemaButton";
+
+interface Props {
+ isOpen: boolean;
+ databaseIds?: DatabaseId[];
+ schemaIds?: SchemaId[];
+ tableIds?: TableId[];
+ onClose: () => void;
+}
+
+export const SyncOptionsModal = ({
+ isOpen,
+ databaseIds,
+ schemaIds,
+ tableIds,
+ onClose,
+}: Props) => {
+ const isSingleTable =
+ (databaseIds == null || databaseIds.length === 0) &&
+ (schemaIds == null || schemaIds.length === 0) &&
+ tableIds != null &&
+ tableIds.length === 1;
+
+ return (
+ <Modal
+ opened={isOpen}
+ padding="xl"
+ size={rem(512)}
+ title={t`Syncing and scanning`}
+ onClose={onClose}
+ >
+ <Stack gap="xl" pt="lg">
+ <Stack gap="md">
+ <Stack gap="xs">
+ <Text fw="bold">
+ {isSingleTable ? t`Re-sync schema` : t`Re-sync schemas`}
+ </Text>
+
+ <Text c="text-secondary" size="sm">
+ {isSingleTable
+ ? /* eslint-disable-next-line no-literal-metabase-strings -- Admin settings */
+ t`If you’ve made changes to this table in the underlying database that aren’t showing up in Metabase yet, re-syncing the schema can fix that.`
+ : /* eslint-disable-next-line no-literal-metabase-strings -- Admin settings */
+ t`If you’ve made changes to thes tables in the underlying databases that aren’t showing up in Metabase yet, re-syncing the schemas can fix that.`}
+ </Text>
+ </Stack>
+
+ <SyncTableSchemaButton
+ databaseIds={databaseIds}
+ schemaIds={schemaIds}
+ tableIds={tableIds}
+ />
+ </Stack>
+
+ <Stack gap="md">
+ <Stack gap="xs">
+ <Text fw="bold">{t`Scan field values`}</Text>
+
+ <Text c="text-secondary" size="sm">
+ {isSingleTable
+ ? /* eslint-disable-next-line no-literal-metabase-strings -- Admin settings */
+ t`Metabase can scan the values in this table to enable checkbox filters in dashboards and questions.`
+ : /* eslint-disable-next-line no-literal-metabase-strings -- Admin settings */
+ t`Metabase can scan the values in these tables to enable checkbox filters in dashboards and questions.`}
+ </Text>
+ </Stack>
+
+ <RescanTableFieldsButton
+ databaseIds={databaseIds}
+ schemaIds={schemaIds}
+ tableIds={tableIds}
+ />
+
+ <DiscardTableFieldValuesButton
+ databaseIds={databaseIds}
+ schemaIds={schemaIds}
+ tableIds={tableIds}
+ />
+ </Stack>
+ </Stack>
+ </Modal>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
new file mode 100644
index 00000000000..68cfe6e1809
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
@@ -0,0 +1,53 @@
+import { t } from "ttag";
+
+import { useTemporaryState } from "metabase/common/hooks";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Button } from "metabase/ui";
+import { useSyncTablesSchemasMutation } from "metabase-enterprise/api";
+import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
+
+interface Props {
+ databaseIds?: DatabaseId[];
+ schemaIds?: SchemaId[];
+ tableIds?: TableId[];
+}
+
+export function SyncTableSchemaButton({
+ databaseIds,
+ schemaIds,
+ tableIds,
+}: Props) {
+ const [syncTablesSchemas] = useSyncTablesSchemasMutation();
+ const [started, setStarted] = useTemporaryState(false, 2000);
+ const { sendErrorToast } = useMetadataToasts();
+
+ const isSingleTable =
+ (databaseIds == null || databaseIds.length === 0) &&
+ (schemaIds == null || schemaIds.length === 0) &&
+ tableIds != null &&
+ tableIds.length === 1;
+
+ const handleClick = async () => {
+ const { error } = await syncTablesSchemas({
+ database_ids: databaseIds,
+ schema_ids: schemaIds,
+ table_ids: tableIds,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to start sync`);
+ } else {
+ setStarted(true);
+ }
+ };
+
+ return (
+ <Button variant="default" onClick={handleClick}>
+ {started
+ ? t`Sync triggered!`
+ : isSingleTable
+ ? t`Sync table schema`
+ : t`Sync table schemas`}
+ </Button>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
new file mode 100644
index 00000000000..4b6155e4716
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
@@ -0,0 +1,151 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupTableEndpoints,
+ setupTablesBulkEndpoints,
+} from "__support__/server-mocks";
+import {
+ act,
+ renderWithProviders,
+ screen,
+ waitFor,
+ within,
+} from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
+import { createMockTable } from "metabase-types/api/mocks";
+
+import { SyncTableSchemaButton } from "./SyncTableSchemaButton";
+
+function setup() {
+ const table = createMockTable();
+
+ setupTableEndpoints(table);
+ setupTablesBulkEndpoints();
+
+ renderWithProviders(
+ <>
+ <SyncTableSchemaButton tableIds={[table.id]} />
+ <UndoListing />
+ </>,
+ );
+
+ return { table };
+}
+
+describe("SyncTableSchemaButton", () => {
+ beforeEach(() => {
+ jest.useFakeTimers({ advanceTimers: true });
+ });
+
+ it("should show success message for 2 seconds", async () => {
+ const { table } = setup();
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Sync table schema");
+
+ await userEvent.click(button);
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/sync-schema`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Sync triggered!");
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(2000);
+ });
+ expect(button).toHaveTextContent("Sync table schema");
+ });
+
+ it("resets success message timer after next click", async () => {
+ const { table } = setup();
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Sync table schema");
+
+ await userEvent.click(button);
+ let calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/sync-schema`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Sync triggered!");
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Sync triggered!");
+ await userEvent.click(button);
+ calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/sync-schema`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(2);
+ expect(JSON.parse(calls[1].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Sync triggered!");
+
+ await act(() => {
+ jest.advanceTimersByTime(1000);
+ });
+
+ expect(button).toHaveTextContent("Sync table schema");
+ });
+
+ it("should show error message toast", async () => {
+ const { table } = setup();
+
+ fetchMock.modifyRoute("tables-sync-schema", {
+ response: { status: 500 },
+ });
+
+ const button = screen.getByRole("button");
+ expect(button).toHaveTextContent("Sync table schema");
+
+ await userEvent.click(button);
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/ee/data-studio/table/sync-schema`,
+ {
+ method: "POST",
+ },
+ );
+ expect(calls).toHaveLength(1);
+ expect(JSON.parse(calls[0].options.body as string)).toEqual({
+ table_ids: [table.id],
+ });
+ await waitFor(() => {
+ expect(button).toHaveTextContent("Sync table schema");
+ });
+
+ await waitFor(() => {
+ const undo = screen.getByTestId("undo-list");
+ expect(
+ within(undo).getByText("Failed to start sync"),
+ ).toBeInTheDocument();
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/index.ts
new file mode 100644
index 00000000000..ee7b9d667b9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/SyncTableSchemaButton/index.ts
@@ -0,0 +1 @@
+export * from "./SyncTableSchemaButton";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts
new file mode 100644
index 00000000000..e73a91f95ac
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts
@@ -0,0 +1,277 @@
+import type { DatabaseId, TableId } from "metabase-types/api";
+
+import type { DatabaseNode, ExpandedItem, FlatItem, TreeNode } from "./types";
+import { isExpandedItem, isSchemaNode, isTableNode } from "./types";
+
+export interface NodeSelection {
+ tables: Set<TableId>;
+ schemas: Set<string>;
+ databases: Set<DatabaseId>;
+}
+
+export function isItemSelected(
+ node: TreeNode,
+ selection: NodeSelection,
+): "yes" | "no" | "some" {
+ if (!selection) {
+ return "no";
+ }
+ if (node.type === "table") {
+ return selection.tables.has(node.value.tableId) ? "yes" : "no";
+ }
+ if (isSchemaNode(node)) {
+ if (selection.schemas.has(getSchemaId(node) ?? "")) {
+ return "yes";
+ }
+
+ return areChildTablesSelected(node, selection.tables);
+ }
+ if (node.type === "database") {
+ if (selection.databases.has(node.value.databaseId)) {
+ return "yes";
+ }
+ return areChildSchemasSelected(node, selection);
+ }
+
+ return "no";
+}
+
+function areChildTablesSelected(
+ node: TreeNode,
+ selectedTables: Set<TableId>,
+): "yes" | "no" | "some" {
+ if (node.children.length === 0) {
+ return "no";
+ }
+
+ const selectedTablesCount = node.children.filter(
+ (child) =>
+ child.type === "table" && selectedTables.has(child.value.tableId),
+ ).length;
+
+ return selectedTablesCount === node.children.length
+ ? "yes"
+ : selectedTablesCount > 0
+ ? "some"
+ : "no";
+}
+
+function areChildSchemasSelected(
+ node: TreeNode,
+ selection: NodeSelection,
+): "yes" | "no" | "some" {
+ if (node.children.length === 0) {
+ return "no";
+ }
+
+ const selectedSchemasResult = node.children.map((child) =>
+ isItemSelected(child, selection),
+ );
+
+ return selectedSchemasResult.every((x) => x === "yes")
+ ? "yes"
+ : selectedSchemasResult.every((x) => x === "no")
+ ? "no"
+ : "some";
+}
+
+export function getSchemaId(item: FlatItem) {
+ if (!isExpandedItem(item)) {
+ return undefined;
+ }
+ if (!isTableNode(item)) {
+ return undefined;
+ }
+ return `${item.value.databaseId}:${item.value.schemaName}`;
+}
+
+export function isParentSchemaSelected(
+ item: FlatItem,
+ selectedSchemas: Set<string>,
+) {
+ if (item.type !== "table") {
+ return false;
+ }
+
+ const parentSchemaId = getSchemaId(item);
+
+ if (!parentSchemaId) {
+ return false;
+ }
+
+ return selectedSchemas?.has(parentSchemaId);
+}
+
+export function noManuallySelectedTables(
+ schema: FlatItem | undefined,
+ items: FlatItem[],
+ selectedItems: Set<TableId>,
+) {
+ if (!schema) {
+ return false;
+ }
+
+ const children = items.filter((child) => child.parent === schema.key);
+
+ return !children.some(
+ (child) =>
+ child.type === "table" && selectedItems?.has(child.value?.tableId ?? ""),
+ );
+}
+
+export function noManuallySelectedSchemas(
+ database: { key: string },
+ items: FlatItem[],
+ selectedSchemas: Set<string>,
+) {
+ if (!database) {
+ return false;
+ }
+
+ const children = items.filter((child) => child.parent === database.key);
+
+ return !children.some(
+ (child) =>
+ child.type === "schema" && selectedSchemas.has(getSchemaId(child) ?? ""),
+ );
+}
+
+export function noManuallySelectedDatabaseChildrenTables(
+ database: DatabaseNode,
+ selectedTables: Set<TableId>,
+) {
+ if (!database) {
+ return false;
+ }
+
+ const answer = !database.children.some(
+ (schema) =>
+ schema.type === "schema" &&
+ schema.children.some(
+ (child) =>
+ child.type === "table" && selectedTables.has(child.value.tableId),
+ ),
+ );
+
+ return answer;
+}
+
+export function getParentSchema(tableItem: FlatItem, allItems: FlatItem[]) {
+ return allItems.find((item) => {
+ return (
+ item.type === "schema" && getSchemaId(item) === getSchemaId(tableItem)
+ );
+ });
+}
+
+export function getSchemaTables(
+ schema: FlatItem,
+ allItems: ExpandedItem[] | TreeNode[],
+) {
+ const result = allItems
+ .filter(
+ (item) =>
+ isTableNode(item) &&
+ getSchemaId(schema) === getSchemaId(item) &&
+ item.value.tableId,
+ )
+ .filter(isTableNode);
+
+ return result;
+}
+
+export function getSchemaTableIds(schema: FlatItem, allItems: FlatItem[]) {
+ const expandedItems = allItems.filter(isExpandedItem);
+ return getSchemaTables(schema, expandedItems).map(
+ (table) => table.value.tableId,
+ );
+}
+
+export function getSchemaChildrenTableIds(schema: TreeNode) {
+ return schema.children
+ .filter((child) => child.type === "table")
+ .map((child) => child.value.tableId);
+}
+
+export function getParentSchemaTables(item: FlatItem, allItems: FlatItem[]) {
+ const parentSchema = getParentSchema(item, allItems);
+
+ if (!parentSchema) {
+ return [];
+ }
+
+ return allItems.filter((item) => {
+ return (
+ item.type === "table" && getSchemaId(parentSchema) === getSchemaId(item)
+ );
+ });
+}
+
+export function areTablesSelected(
+ schema: FlatItem,
+ allItems: TreeNode[],
+ selectedItems: Set<TableId>,
+): "all" | "some" | "none" {
+ const tables = getSchemaTables(schema, allItems);
+ if (tables.length === 0) {
+ return "none";
+ }
+ if (tables.every((table) => selectedItems.has(table.value.tableId))) {
+ return "all";
+ }
+ if (tables.some((table) => selectedItems.has(table.value.tableId))) {
+ return "some";
+ }
+ return "none";
+}
+
+export function getSchemas(database: FlatItem, allItems: FlatItem[]) {
+ return allItems.filter(
+ (item) =>
+ item.type === "schema" &&
+ item.value &&
+ item.value.databaseId === database.value?.databaseId,
+ );
+}
+
+export function getChildSchemas(databaseNode: DatabaseNode) {
+ return databaseNode.children.filter((x) => x.type === "schema");
+}
+
+export function areSchemasSelected(
+ database: FlatItem,
+ allItems: FlatItem[],
+ selectedSchemas: Set<string>,
+ selectedItems: Set<TableId>,
+): "all" | "some" | "none" {
+ if (database.type !== "database") {
+ return "none";
+ }
+
+ const schemas = getSchemas(database, allItems);
+ if (schemas.length === 0) {
+ return "none";
+ }
+
+ if (
+ schemas.every(
+ (schema) =>
+ selectedSchemas.has(getSchemaId(schema) ?? "") ||
+ areTablesSelected(schema, schema.children, selectedItems) === "all",
+ )
+ ) {
+ return "all";
+ }
+
+ if (
+ schemas.some(
+ (schema) =>
+ selectedSchemas.has(getSchemaId(schema) ?? "") ||
+ areTablesSelected(schema, schema.children, selectedItems) !== "none",
+ )
+ ) {
+ return "some";
+ }
+
+ return "none";
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts
new file mode 100644
index 00000000000..cc362d9d66a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts
@@ -0,0 +1,935 @@
+import type { DatabaseId, TableId } from "metabase-types/api";
+
+import {
+ type NodeSelection,
+ areSchemasSelected,
+ areTablesSelected,
+ getChildSchemas,
+ getParentSchema,
+ getParentSchemaTables,
+ getSchemaChildrenTableIds,
+ getSchemaId,
+ getSchemaTableIds,
+ getSchemaTables,
+ getSchemas,
+ isItemSelected,
+ isParentSchemaSelected,
+ noManuallySelectedDatabaseChildrenTables,
+ noManuallySelectedSchemas,
+ noManuallySelectedTables,
+} from "./bulk-selection.utils";
+import type { DatabaseNode, FlatItem, SchemaNode, TableNode } from "./types";
+
+describe("bulk-selection.utils", () => {
+ const createMockTableNode = (
+ databaseId: DatabaseId,
+ schemaName: string,
+ tableId: TableId,
+ ): TableNode => ({
+ type: "table",
+ label: `Table ${tableId}`,
+ key: `db-${databaseId}-schema-${schemaName}-table-${tableId}`,
+ value: { databaseId, schemaName, tableId },
+ children: [],
+ });
+
+ const createMockSchemaNode = (
+ databaseId: DatabaseId,
+ schemaName: string,
+ tables: TableNode[] = [],
+ ): SchemaNode => ({
+ type: "schema",
+ label: schemaName,
+ key: `db-${databaseId}-schema-${schemaName}`,
+ value: { databaseId, schemaName },
+ children: tables,
+ });
+
+ const createMockDatabaseNode = (
+ databaseId: DatabaseId,
+ schemas: SchemaNode[] = [],
+ ): DatabaseNode => ({
+ type: "database",
+ label: `Database ${databaseId}`,
+ key: `db-${databaseId}`,
+ value: { databaseId },
+ children: schemas,
+ });
+
+ const createMockFlatItem = (
+ node: TableNode | SchemaNode | DatabaseNode,
+ parent?: string,
+ level: number = 0,
+ ): FlatItem =>
+ ({
+ type: node.type,
+ label: node.label,
+ key: node.key,
+ value: node.value,
+ children: node.children,
+ level,
+ parent,
+ isExpanded: false,
+ }) as FlatItem;
+
+ describe("isItemSelected", () => {
+ describe("table selection", () => {
+ it("should return 'yes' when table is selected", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const selection: NodeSelection = {
+ tables: new Set([101]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(table, selection)).toBe("yes");
+ });
+
+ it("should return 'no' when table is not selected", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const selection: NodeSelection = {
+ tables: new Set([102]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(table, selection)).toBe("no");
+ });
+ });
+
+ describe("schema selection", () => {
+ it("should return 'yes' when schema is directly selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(["1:public"]),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("yes");
+ });
+
+ it("should return 'yes' when all tables in schema are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set([101, 102]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("yes");
+ });
+
+ it("should return 'some' when only some tables in schema are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set([101]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("some");
+ });
+
+ it("should return 'no' when no tables in schema are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("no");
+ });
+
+ it("should return 'no' when schema has no children", () => {
+ const schema = createMockSchemaNode(1, "public", []);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("no");
+ });
+ });
+
+ describe("database selection", () => {
+ it("should return 'yes' when database is directly selected", () => {
+ const schema = createMockSchemaNode(1, "public", []);
+ const database = createMockDatabaseNode(1, [schema]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(),
+ databases: new Set([1]),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("yes");
+ });
+
+ it("should return 'yes' when all schemas in database are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const table3 = createMockTableNode(1, "private", 103);
+ const schema1 = createMockSchemaNode(1, "public", [table1, table2]);
+ const schema2 = createMockSchemaNode(1, "private", [table3]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(["1:public", "1:private"]),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("yes");
+ });
+
+ it("should return 'yes' when all tables in all schemas are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const table3 = createMockTableNode(1, "private", 103);
+ const schema1 = createMockSchemaNode(1, "public", [table1, table2]);
+ const schema2 = createMockSchemaNode(1, "private", [table3]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selection: NodeSelection = {
+ tables: new Set([101, 102, 103]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("yes");
+ });
+
+ it("should return 'some' when only some schemas are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(["1:public"]),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("some");
+ });
+
+ it("should return 'some' when only some tables are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const database = createMockDatabaseNode(1, [schema]);
+ const selection: NodeSelection = {
+ tables: new Set([101]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("some");
+ });
+
+ it("should return 'no' when database has no children", () => {
+ const database = createMockDatabaseNode(1, []);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("no");
+ });
+ });
+
+ it("should return 'no' when selection is null/undefined", () => {
+ const table = createMockTableNode(1, "public", 101);
+
+ expect(isItemSelected(table, null as any)).toBe("no");
+ });
+ });
+
+ describe("getSchemaId", () => {
+ it("should return schema ID for table item", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const flatItem = createMockFlatItem(table);
+
+ expect(getSchemaId(flatItem)).toBe("1:public");
+ });
+
+ it("should return schema ID for schema item with table children", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const schema = createMockSchemaNode(1, "public", [table1]);
+ const flatItem = createMockFlatItem(schema);
+
+ expect(getSchemaId(flatItem)).toBe("1:public");
+ });
+
+ it("should return undefined for loading item", () => {
+ const loadingItem: FlatItem = {
+ isLoading: true,
+ type: "table",
+ key: "loading",
+ level: 0,
+ children: [],
+ };
+
+ expect(getSchemaId(loadingItem)).toBeUndefined();
+ });
+
+ it("should return undefined for database item", () => {
+ const database = createMockDatabaseNode(1, []);
+ const flatItem = createMockFlatItem(database);
+
+ expect(getSchemaId(flatItem)).toBeUndefined();
+ });
+
+ it("should return schema ID for schema item with no children", () => {
+ const schema = createMockSchemaNode(1, "public", []);
+ const flatItem = createMockFlatItem(schema);
+
+ expect(getSchemaId(flatItem)).toBe("1:public");
+ });
+ });
+
+ describe("isParentSchemaSelected", () => {
+ it("should return true when parent schema is selected", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const flatItem = createMockFlatItem(table);
+ const selectedSchemas = new Set(["1:public"]);
+
+ expect(isParentSchemaSelected(flatItem, selectedSchemas)).toBe(true);
+ });
+
+ it("should return false when parent schema is not selected", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const flatItem = createMockFlatItem(table);
+ const selectedSchemas = new Set(["1:private"]);
+
+ expect(isParentSchemaSelected(flatItem, selectedSchemas)).toBe(false);
+ });
+
+ it("should return false for non-table items", () => {
+ const schema = createMockSchemaNode(1, "public", []);
+ const flatItem = createMockFlatItem(schema);
+ const selectedSchemas = new Set(["1:public"]);
+
+ expect(isParentSchemaSelected(flatItem, selectedSchemas)).toBe(false);
+ });
+ });
+
+ describe("getSchemaTables", () => {
+ it("should return all tables in a schema", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const table3 = createMockTableNode(1, "private", 103);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const allItems = [table1, table2, table3];
+
+ const tables = getSchemaTables(createMockFlatItem(schema), allItems);
+
+ expect(tables).toHaveLength(2);
+ expect(tables.map((t) => t.value.tableId)).toEqual([101, 102]);
+ });
+
+ it("should return empty array when no tables match schema", () => {
+ const table = createMockTableNode(1, "private", 101);
+ const schema = createMockSchemaNode(1, "public", []);
+ const allItems = [table];
+
+ const tables = getSchemaTables(createMockFlatItem(schema), allItems);
+
+ expect(tables).toHaveLength(0);
+ });
+ });
+
+ describe("getSchemaTableIds", () => {
+ it("should return table IDs for all tables in a schema", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const flatItems = [
+ createMockFlatItem(table1),
+ createMockFlatItem(table2),
+ createMockFlatItem(schema),
+ ];
+
+ const tableIds = getSchemaTableIds(createMockFlatItem(schema), flatItems);
+
+ expect(tableIds).toEqual([101, 102]);
+ });
+ });
+
+ describe("getSchemaChildrenTableIds", () => {
+ it("should return table IDs from schema children", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+
+ const tableIds = getSchemaChildrenTableIds(schema);
+
+ expect(tableIds).toEqual([101, 102]);
+ });
+
+ it("should return empty array when schema has no children", () => {
+ const schema = createMockSchemaNode(1, "public", []);
+
+ const tableIds = getSchemaChildrenTableIds(schema);
+
+ expect(tableIds).toEqual([]);
+ });
+ });
+
+ describe("getParentSchema", () => {
+ it("should find parent schema for a table", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const schema = createMockSchemaNode(1, "public", [table]);
+ const flatItems = [createMockFlatItem(table), createMockFlatItem(schema)];
+
+ const parentSchema = getParentSchema(
+ createMockFlatItem(table),
+ flatItems,
+ );
+
+ expect(parentSchema).toBeDefined();
+ expect(parentSchema?.type).toBe("schema");
+ expect((parentSchema?.value as any).schemaName).toBe("public");
+ });
+
+ it("should return undefined when parent schema not found", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const schema = createMockSchemaNode(1, "private", []);
+ const flatItems = [createMockFlatItem(table), createMockFlatItem(schema)];
+
+ const parentSchema = getParentSchema(
+ createMockFlatItem(table),
+ flatItems,
+ );
+
+ expect(parentSchema).toBeUndefined();
+ });
+ });
+
+ describe("getParentSchemaTables", () => {
+ it("should return all tables in the same schema as the given table", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const table3 = createMockTableNode(1, "private", 103);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const flatItems = [
+ createMockFlatItem(table1),
+ createMockFlatItem(table2),
+ createMockFlatItem(table3),
+ createMockFlatItem(schema),
+ ];
+
+ const tables = getParentSchemaTables(
+ createMockFlatItem(table1),
+ flatItems,
+ );
+
+ expect(tables).toHaveLength(2);
+ expect(tables.map((t) => (t.value as any).tableId)).toEqual([101, 102]);
+ });
+
+ it("should return empty array when parent schema not found", () => {
+ const table = createMockTableNode(1, "public", 101);
+ const flatItems = [createMockFlatItem(table)];
+
+ const tables = getParentSchemaTables(
+ createMockFlatItem(table),
+ flatItems,
+ );
+
+ expect(tables).toEqual([]);
+ });
+ });
+
+ describe("areTablesSelected", () => {
+ it("should return 'all' when all tables are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const allItems = [table1, table2];
+ const selectedItems = new Set([101, 102]);
+
+ const result = areTablesSelected(
+ createMockFlatItem(schema),
+ allItems,
+ selectedItems,
+ );
+
+ expect(result).toBe("all");
+ });
+
+ it("should return 'some' when some tables are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const allItems = [table1, table2];
+ const selectedItems = new Set([101]);
+
+ const result = areTablesSelected(
+ createMockFlatItem(schema),
+ allItems,
+ selectedItems,
+ );
+
+ expect(result).toBe("some");
+ });
+
+ it("should return 'none' when no tables are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const allItems = [table1, table2];
+ const selectedItems = new Set<TableId>();
+
+ const result = areTablesSelected(
+ createMockFlatItem(schema),
+ allItems,
+ selectedItems,
+ );
+
+ expect(result).toBe("none");
+ });
+
+ it("should return 'none' when schema has no tables", () => {
+ const schema = createMockSchemaNode(1, "public", []);
+ const allItems: any[] = [];
+ const selectedItems = new Set([101]);
+
+ const result = areTablesSelected(
+ createMockFlatItem(schema),
+ allItems,
+ selectedItems,
+ );
+
+ expect(result).toBe("none");
+ });
+ });
+
+ describe("getSchemas", () => {
+ it("should return all schemas in a database", () => {
+ const database = createMockDatabaseNode(1, []);
+ const schema1 = createMockSchemaNode(1, "public", []);
+ const schema2 = createMockSchemaNode(1, "private", []);
+ const schema3 = createMockSchemaNode(2, "public", []);
+ const flatItems = [
+ createMockFlatItem(database),
+ createMockFlatItem(schema1),
+ createMockFlatItem(schema2),
+ createMockFlatItem(schema3),
+ ];
+
+ const schemas = getSchemas(createMockFlatItem(database), flatItems);
+
+ expect(schemas).toHaveLength(2);
+ expect(schemas.map((s) => (s.value as any).schemaName)).toEqual([
+ "public",
+ "private",
+ ]);
+ });
+ });
+
+ describe("getChildSchemas", () => {
+ it("should return child schemas of a database", () => {
+ const schema1 = createMockSchemaNode(1, "public", []);
+ const schema2 = createMockSchemaNode(1, "private", []);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+
+ const schemas = getChildSchemas(database);
+
+ expect(schemas).toHaveLength(2);
+ expect(schemas).toEqual([schema1, schema2]);
+ });
+ });
+
+ describe("areSchemasSelected", () => {
+ it("should return 'all' when all schemas are directly selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const flatItems = [
+ createMockFlatItem(database),
+ createMockFlatItem(schema1),
+ createMockFlatItem(schema2),
+ ];
+ const selectedSchemas = new Set(["1:public", "1:private"]);
+ const selectedTables = new Set<TableId>();
+
+ const result = areSchemasSelected(
+ createMockFlatItem(database),
+ flatItems,
+ selectedSchemas,
+ selectedTables,
+ );
+
+ expect(result).toBe("all");
+ });
+
+ it("should return 'all' when all tables in all schemas are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const flatItems = [
+ createMockFlatItem(database),
+ createMockFlatItem(schema1),
+ createMockFlatItem(schema2),
+ ];
+ const selectedSchemas = new Set<string>();
+ const selectedTables = new Set([101, 102]);
+
+ const result = areSchemasSelected(
+ createMockFlatItem(database),
+ flatItems,
+ selectedSchemas,
+ selectedTables,
+ );
+
+ expect(result).toBe("all");
+ });
+
+ it("should return 'some' when only some schemas are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const flatItems = [
+ createMockFlatItem(database),
+ createMockFlatItem(schema1),
+ createMockFlatItem(schema2),
+ ];
+ const selectedSchemas = new Set(["1:public"]);
+ const selectedTables = new Set<TableId>();
+
+ const result = areSchemasSelected(
+ createMockFlatItem(database),
+ flatItems,
+ selectedSchemas,
+ selectedTables,
+ );
+
+ expect(result).toBe("some");
+ });
+
+ it("should return 'none' when no schemas are selected", () => {
+ const schema1 = createMockSchemaNode(1, "public", []);
+ const schema2 = createMockSchemaNode(1, "private", []);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const flatItems = [
+ createMockFlatItem(database),
+ createMockFlatItem(schema1),
+ createMockFlatItem(schema2),
+ ];
+ const selectedSchemas = new Set<string>();
+ const selectedTables = new Set<TableId>();
+
+ const result = areSchemasSelected(
+ createMockFlatItem(database),
+ flatItems,
+ selectedSchemas,
+ selectedTables,
+ );
+
+ expect(result).toBe("none");
+ });
+
+ it("should return 'none' for non-database item", () => {
+ const schema = createMockSchemaNode(1, "public", []);
+ const flatItems = [createMockFlatItem(schema)];
+ const selectedSchemas = new Set<string>();
+ const selectedTables = new Set<TableId>();
+
+ const result = areSchemasSelected(
+ createMockFlatItem(schema),
+ flatItems,
+ selectedSchemas,
+ selectedTables,
+ );
+
+ expect(result).toBe("none");
+ });
+ });
+
+ describe("noManuallySelectedTables", () => {
+ it("should return true when no tables in schema are manually selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", []);
+ const flatItems = [
+ createMockFlatItem(schema),
+ createMockFlatItem(table1, schema.key),
+ createMockFlatItem(table2, schema.key),
+ ];
+ const selectedTables = new Set<TableId>();
+
+ const result = noManuallySelectedTables(
+ createMockFlatItem(schema),
+ flatItems,
+ selectedTables,
+ );
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when some tables in schema are manually selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", []);
+ const flatItems = [
+ createMockFlatItem(schema),
+ createMockFlatItem(table1, schema.key),
+ createMockFlatItem(table2, schema.key),
+ ];
+ const selectedTables = new Set([101]);
+
+ const result = noManuallySelectedTables(
+ createMockFlatItem(schema),
+ flatItems,
+ selectedTables,
+ );
+
+ expect(result).toBe(false);
+ });
+
+ it("should return false when schema is undefined", () => {
+ const flatItems: FlatItem[] = [];
+ const selectedTables = new Set<TableId>();
+
+ const result = noManuallySelectedTables(
+ undefined,
+ flatItems,
+ selectedTables,
+ );
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("noManuallySelectedSchemas", () => {
+ it("should return true when no schemas in database are manually selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", []);
+ const database = createMockDatabaseNode(1, []);
+ const flatItems = [
+ createMockFlatItem(database),
+ createMockFlatItem(schema1, database.key),
+ createMockFlatItem(schema2, database.key),
+ ];
+ const selectedSchemas = new Set<string>();
+
+ const result = noManuallySelectedSchemas(
+ database,
+ flatItems,
+ selectedSchemas,
+ );
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when some schemas in database are manually selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", []);
+ const database = createMockDatabaseNode(1, []);
+ const flatItems = [
+ createMockFlatItem(database),
+ createMockFlatItem(schema1, database.key),
+ createMockFlatItem(schema2, database.key),
+ ];
+ const selectedSchemas = new Set(["1:public"]);
+
+ const result = noManuallySelectedSchemas(
+ database,
+ flatItems,
+ selectedSchemas,
+ );
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("noManuallySelectedDatabaseChildrenTables", () => {
+ it("should return true when no tables in database schemas are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selectedTables = new Set<TableId>();
+
+ const result = noManuallySelectedDatabaseChildrenTables(
+ database,
+ selectedTables,
+ );
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when some tables in database schemas are selected", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selectedTables = new Set([101]);
+
+ const result = noManuallySelectedDatabaseChildrenTables(
+ database,
+ selectedTables,
+ );
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("integration scenarios", () => {
+ it("selecting a database selects all schemas and tables in it", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const table3 = createMockTableNode(1, "private", 103);
+ const schema1 = createMockSchemaNode(1, "public", [table1, table2]);
+ const schema2 = createMockSchemaNode(1, "private", [table3]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(),
+ databases: new Set([1]),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("yes");
+ });
+
+ it("selecting a schema selects all tables in it", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(["1:public"]),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("yes");
+ expect(isItemSelected(table1, selection)).toBe("no");
+ expect(isItemSelected(table2, selection)).toBe("no");
+ });
+
+ it("selecting all tables in a schema selects the schema", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set([101, 102]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("yes");
+ });
+
+ it("selecting all schemas in a database selects the database", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(["1:public", "1:private"]),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("yes");
+ });
+
+ it("selecting all tables in a database selects the database", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const table3 = createMockTableNode(1, "private", 103);
+ const schema1 = createMockSchemaNode(1, "public", [table1, table2]);
+ const schema2 = createMockSchemaNode(1, "private", [table3]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selection: NodeSelection = {
+ tables: new Set([101, 102, 103]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("yes");
+ expect(isItemSelected(schema1, selection)).toBe("yes");
+ expect(isItemSelected(schema2, selection)).toBe("yes");
+ });
+
+ it("deselecting a database deselects all schemas and tables", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const database = createMockDatabaseNode(1, [schema1]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("no");
+ expect(isItemSelected(schema1, selection)).toBe("no");
+ expect(isItemSelected(table1, selection)).toBe("no");
+ });
+
+ it("deselecting a schema deselects all tables in it", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("no");
+ expect(isItemSelected(table1, selection)).toBe("no");
+ expect(isItemSelected(table2, selection)).toBe("no");
+ });
+
+ it("deselecting one table in a schema changes schema to 'some'", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "public", 102);
+ const schema = createMockSchemaNode(1, "public", [table1, table2]);
+ const selection: NodeSelection = {
+ tables: new Set([101]),
+ schemas: new Set(),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(schema, selection)).toBe("some");
+ });
+
+ it("deselecting one schema in a database changes database to 'some'", () => {
+ const table1 = createMockTableNode(1, "public", 101);
+ const table2 = createMockTableNode(1, "private", 102);
+ const schema1 = createMockSchemaNode(1, "public", [table1]);
+ const schema2 = createMockSchemaNode(1, "private", [table2]);
+ const database = createMockDatabaseNode(1, [schema1, schema2]);
+ const selection: NodeSelection = {
+ tables: new Set(),
+ schemas: new Set(["1:public"]),
+ databases: new Set(),
+ };
+
+ expect(isItemSelected(database, selection)).toBe("some");
+ });
+ });
+});
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/BulkTableVisibilityToggle.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/BulkTableVisibilityToggle.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/EmptyState.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/EmptyState.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/EmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/EmptyState.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
new file mode 100644
index 00000000000..5eef5be6b89
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
@@ -0,0 +1,87 @@
+import { useState } from "react";
+import { t } from "ttag";
+
+import {
+ DataSourceInput,
+ LayerInput,
+ UserInput,
+} from "metabase/metadata/components";
+import { Button, Checkbox, Group, Stack } from "metabase/ui";
+
+import type { FilterState } from "../types";
+
+interface Props {
+ filters: FilterState;
+ onSubmit: (filters: FilterState) => void;
+}
+
+export function FilterPopover({ filters, onSubmit }: Props) {
+ const [form, setForm] = useState(filters);
+
+ const handleReset = () => {
+ onSubmit({
+ dataLayer: null,
+ dataSource: null,
+ ownerEmail: null,
+ ownerUserId: null,
+ unusedOnly: null,
+ });
+ };
+
+ return (
+ <form
+ onSubmit={(event) => {
+ event.preventDefault();
+ onSubmit(form);
+ }}
+ >
+ <Stack gap="xl" p="lg">
+ <LayerInput
+ clearable
+ value={form.dataLayer}
+ onChange={(dataLayer) => {
+ setForm((form) => ({ ...form, dataLayer }));
+ }}
+ />
+
+ <UserInput
+ clearable
+ email={form.ownerEmail}
+ label={t`Owner`}
+ userId={form.ownerUserId}
+ onEmailChange={(ownerEmail) => {
+ setForm((form) => ({ ...form, ownerEmail, ownerUserId: null }));
+ }}
+ onUserIdChange={(ownerUserId) => {
+ setForm((form) => ({ ...form, ownerEmail: null, ownerUserId }));
+ }}
+ />
+
+ <DataSourceInput
+ clearable
+ showMetabaseTransform
+ value={form.dataSource}
+ onChange={(dataSource) => {
+ setForm((form) => ({ ...form, dataSource }));
+ }}
+ />
+
+ <Checkbox
+ label={t`Table isn’t referenced by anything`}
+ checked={form.unusedOnly === true}
+ onChange={(e) =>
+ setForm((form) => ({ ...form, unusedOnly: e.target.checked }))
+ }
+ />
+
+ <Group justify="space-between" wrap="nowrap">
+ <Button flex={1} onClick={handleReset}>{t`Clear filters`}</Button>
+
+ <Button flex={1} variant="primary" type="submit">
+ {t`Apply`}
+ </Button>
+ </Group>
+ </Stack>
+ </form>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/PublishModelsModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/PublishModelsModal.tsx
new file mode 100644
index 00000000000..c032f29aa8c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/PublishModelsModal.tsx
@@ -0,0 +1,171 @@
+import { useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import {
+ CollectionPickerModal,
+ type CollectionPickerValueItem,
+} from "metabase/common/components/Pickers/CollectionPicker";
+import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";
+import { useDispatch } from "metabase/lib/redux";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { Box, Button, Checkbox, Group, Modal, Text, rem } from "metabase/ui";
+import { usePublishModelsMutation } from "metabase-enterprise/api";
+import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
+
+import { getPublishSeeItLink } from "../utils";
+
+interface Props {
+ tables?: Set<TableId>;
+ schemas?: Set<SchemaId>;
+ databases?: Set<DatabaseId>;
+ isOpen: boolean;
+ onClose?: () => void;
+ onSuccess?: () => void;
+}
+
+export function PublishModelsModal({
+ tables = new Set(),
+ schemas = new Set(),
+ databases = new Set(),
+ isOpen,
+ onClose,
+ onSuccess,
+}: Props) {
+ const dispatch = useDispatch();
+ const [seenPublishModelsInfo, { ack: ackSeenPublishModelsInfo }] =
+ useUserAcknowledgement("seen-publish-models-info");
+ const [showPublishInfo, setShowPublishInfo] = useState(
+ !seenPublishModelsInfo,
+ );
+ const [publishModels] = usePublishModelsMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const defaultPublishCollection =
+ PLUGIN_DATA_STUDIO.useGetLibraryChildCollectionByType({
+ type: "library-models",
+ });
+
+ const handleSubmit = async (collection: CollectionPickerValueItem) => {
+ if (!collection) {
+ sendErrorToast(t`Please select a collection`);
+ return;
+ }
+
+ const collectionId =
+ collection.id === "root" ? null : Number(collection.id);
+
+ const { error, data } = await publishModels({
+ table_ids: Array.from(tables),
+ schema_ids: Array.from(schemas),
+ database_ids: Array.from(databases),
+ target_collection_id: collectionId,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to publish models`);
+ } else if (data) {
+ sendSuccessToast(
+ t`Published`,
+ () => {
+ dispatch(push(getPublishSeeItLink(data)));
+ },
+ t`See it`,
+ );
+ onSuccess?.();
+ handleClose();
+ }
+ };
+
+ const handleClose = () => {
+ setShowPublishInfo(!seenPublishModelsInfo);
+ onClose?.();
+ };
+
+ if (!isOpen) {
+ return null;
+ }
+
+ if (showPublishInfo && !seenPublishModelsInfo) {
+ return (
+ <AcknowledgePublishModelsModal
+ isOpen={true}
+ handleSubmit={({ acknowledged }) => {
+ if (acknowledged) {
+ ackSeenPublishModelsInfo();
+ }
+ setShowPublishInfo(false);
+ }}
+ handleClose={() => {
+ handleClose();
+ }}
+ />
+ );
+ }
+
+ return (
+ <CollectionPickerModal
+ value={{
+ id: defaultPublishCollection?.id || "root",
+ model: "collection",
+ }}
+ options={{
+ showSearch: true,
+ hasConfirmButtons: true,
+ showRootCollection: true,
+ showPersonalCollections: true,
+ confirmButtonText: t`Publish here`,
+ }}
+ title={t`Pick the collection to publish this table in`}
+ onClose={() => {
+ handleClose();
+ }}
+ onChange={(collection) => {
+ handleSubmit(collection);
+ }}
+ />
+ );
+}
+
+function AcknowledgePublishModelsModal({
+ isOpen,
+ handleSubmit,
+ handleClose,
+}: {
+ isOpen: boolean;
+ handleSubmit: ({ acknowledged }: { acknowledged: boolean }) => void;
+ handleClose: () => void;
+}) {
+ const [isAcknowledged, setIsAcknowledged] = useState(false);
+
+ return (
+ <Modal
+ opened={isOpen}
+ padding="xl"
+ size={rem(512)}
+ title={t`What publishing a table does`}
+ onClose={() => handleClose()}
+ >
+ <Text pt="sm">
+ {t`Publishing a table means we'll create a model based on it and save it in the collection you choose so that it’s easy for your end users to find it.`}
+ </Text>
+
+ <Group pt="xl" justify="space-between">
+ <Box>
+ <Checkbox
+ label={t`Don’t show this to me again`}
+ checked={isAcknowledged}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ setIsAcknowledged(event.target.checked)
+ }
+ />
+ </Box>
+ <Button
+ onClick={() => handleSubmit({ acknowledged: isAcknowledged })}
+ variant="filled"
+ >{t`Got it`}</Button>
+ </Group>
+ </Modal>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/PublishModelsModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/PublishModelsModal.unit.spec.tsx
new file mode 100644
index 00000000000..4629ecf5a4d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/PublishModelsModal.unit.spec.tsx
@@ -0,0 +1,319 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import {
+ setupCollectionByIdEndpoint,
+ setupCollectionItemsEndpoint,
+ setupCollectionsEndpoints,
+ setupRecentViewsAndSelectionsEndpoints,
+ setupRecentViewsEndpoints,
+ setupUserAcknowledgementEndpoints,
+} from "__support__/server-mocks";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+ waitFor,
+} from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
+import type { PublishModelsResponse } from "metabase-types/api";
+import { createMockCard, createMockCollection } from "metabase-types/api/mocks";
+
+import { PublishModelsModal } from "./PublishModelsModal";
+
+function setup(
+ args: {
+ isOpen?: boolean;
+ tables?: Set<number | string>;
+ schemas?: Set<string>;
+ databases?: Set<number>;
+ seenPublishModelsInfo?: boolean;
+ publishResponse?: PublishModelsResponse;
+ publishError?: boolean;
+ } = {},
+) {
+ const {
+ isOpen = true,
+ tables = new Set([1]),
+ schemas = new Set<string>(),
+ databases = new Set<number>(),
+ seenPublishModelsInfo = true,
+ publishResponse,
+ publishError = false,
+ } = args;
+
+ const onClose = jest.fn();
+ const onSuccess = jest.fn();
+
+ setupUserAcknowledgementEndpoints({
+ key: "seen-publish-models-info",
+ value: seenPublishModelsInfo,
+ });
+ setupRecentViewsEndpoints([]);
+ const testCollection = createMockCollection({
+ id: 1,
+ name: "Test Collection",
+ });
+ setupCollectionsEndpoints({
+ collections: [testCollection],
+ });
+ setupRecentViewsAndSelectionsEndpoints([]);
+ setupCollectionByIdEndpoint({ collections: [testCollection] });
+ setupCollectionItemsEndpoint({
+ collection: createMockCollection({ id: "root" }),
+ collectionItems: [],
+ });
+ setupCollectionItemsEndpoint({
+ collection: testCollection,
+ collectionItems: [],
+ });
+
+ // Setup publish models API endpoint
+ if (publishError) {
+ fetchMock.post("path:/api/ee/data-studio/table/publish-model", {
+ status: 500,
+ body: { message: "Failed to publish" },
+ });
+ } else if (publishResponse) {
+ fetchMock.post(
+ "path:/api/ee/data-studio/table/publish-model",
+ publishResponse,
+ );
+ } else {
+ fetchMock.post("path:/api/ee/data-studio/table/publish-model", {
+ created_count: 1,
+ models: [createMockCard({ id: 1 })],
+ target_collection: testCollection,
+ });
+ }
+
+ mockGetBoundingClientRect();
+
+ renderWithProviders(
+ <>
+ <PublishModelsModal
+ isOpen={isOpen}
+ tables={tables}
+ schemas={schemas}
+ databases={databases}
+ onClose={onClose}
+ onSuccess={onSuccess}
+ />
+ <UndoListing />
+ </>,
+ {
+ withRouter: false,
+ },
+ );
+
+ return {
+ onClose,
+ onSuccess,
+ };
+}
+
+function getCheckbox() {
+ return screen.getByRole("checkbox", {
+ name: "Don’t show this to me again",
+ });
+}
+
+describe("PublishModelsModal", () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it("renders nothing when isOpen is false", () => {
+ setup({ isOpen: false });
+
+ expect(
+ screen.queryByText("Pick the collection to publish this table in"),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.queryByText("What publishing a table does"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("renders collection picker when user has seen publish models info", async () => {
+ setup({ seenPublishModelsInfo: true });
+
+ await waitFor(() => {
+ expect(
+ screen.getByText("Pick the collection to publish this table in"),
+ ).toBeInTheDocument();
+ });
+ });
+
+ it("calls onClose when closing info modal", async () => {
+ const { onClose } = setup({ seenPublishModelsInfo: false });
+
+ const closeButton = screen.getByRole("button", { name: /close/i });
+ await userEvent.click(closeButton);
+
+ await waitFor(() => {
+ expect(onClose).toHaveBeenCalled();
+ });
+ });
+
+ it("calls onClose when closing collection picker", async () => {
+ const { onClose } = setup({ seenPublishModelsInfo: true });
+
+ await waitFor(() => {
+ expect(
+ screen.getByText("Pick the collection to publish this table in"),
+ ).toBeInTheDocument();
+ });
+
+ const closeButton = screen.getByRole("button", { name: /close/i });
+ await userEvent.click(closeButton);
+
+ await waitFor(() => {
+ expect(onClose).toHaveBeenCalled();
+ });
+ });
+
+ it("handles success flow correctly", async () => {
+ const publishResponse: PublishModelsResponse = {
+ created_count: 1,
+ models: [createMockCard({ id: 1 })],
+ target_collection: createMockCollection({ id: 1 }),
+ };
+
+ const { onSuccess } = setup({
+ seenPublishModelsInfo: false,
+ tables: new Set([1, 2]),
+ schemas: new Set<string>(["10"]),
+ databases: new Set([100]),
+ publishResponse,
+ });
+
+ const checkbox = getCheckbox();
+ await userEvent.click(checkbox);
+
+ const gotItButton = screen.getByRole("button", { name: "Got it" });
+ await userEvent.click(gotItButton);
+
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/user-key-value/namespace/user_acknowledgement/key/seen-publish-models-info",
+ { method: "PUT" },
+ ),
+ ).toBe(true);
+ });
+
+ await waitFor(() => {
+ expect(
+ screen.getByText("Pick the collection to publish this table in"),
+ ).toBeInTheDocument();
+ });
+
+ // Select a collection and confirm
+ const collectionLink = await screen.findByText("Test Collection");
+ await userEvent.click(collectionLink);
+
+ const publishButton = await screen.findByRole("button", {
+ name: "Publish here",
+ });
+ await userEvent.click(publishButton);
+
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/ee/data-studio/table/publish-model",
+ ),
+ ).toBe(true);
+ });
+
+ const lastCall = fetchMock.callHistory.lastCall(
+ "path:/api/ee/data-studio/table/publish-model",
+ );
+ expect(lastCall).toBeTruthy();
+ const body = lastCall?.options?.body;
+ expect(body).toBeTruthy();
+ const parsedBody = typeof body === "string" ? JSON.parse(body) : body;
+ expect(parsedBody.table_ids).toEqual([1, 2]);
+ expect(parsedBody.schema_ids).toEqual(["10"]);
+ expect(parsedBody.database_ids).toEqual([100]);
+ expect(parsedBody.target_collection_id).toBe(1);
+
+ // make sure we call onSuccess
+ await waitFor(() => {
+ expect(onSuccess).toHaveBeenCalled();
+ });
+
+ // make sure we show the success toast
+ await waitFor(() => {
+ expect(screen.getByText(/Published/i)).toBeInTheDocument();
+ });
+ });
+
+ it("shows error toast when publishModels API fails", async () => {
+ setup({
+ seenPublishModelsInfo: true,
+ publishError: true,
+ });
+
+ await waitFor(() => {
+ expect(
+ screen.getByText("Pick the collection to publish this table in"),
+ ).toBeInTheDocument();
+ });
+
+ const collectionLink = await screen.findByText("Test Collection");
+ await userEvent.click(collectionLink);
+
+ const publishButton = await screen.findByRole("button", {
+ name: "Publish here",
+ });
+ await userEvent.click(publishButton);
+
+ await waitFor(() => {
+ expect(screen.getByText(/Failed to publish models/i)).toBeInTheDocument();
+ });
+ });
+
+ it("handles root collection selection correctly", async () => {
+ const publishResponse: PublishModelsResponse = {
+ created_count: 1,
+ models: [createMockCard({ id: 1 })],
+ target_collection: createMockCollection({ id: "root" }),
+ };
+
+ setup({
+ seenPublishModelsInfo: true,
+ publishResponse,
+ });
+
+ await waitFor(() => {
+ expect(
+ screen.getByText("Pick the collection to publish this table in"),
+ ).toBeInTheDocument();
+ });
+
+ const rootCollectionLink = await screen.findByText(/Our Analytics/i);
+ await userEvent.click(rootCollectionLink);
+
+ const publishButton = await screen.findByRole("button", {
+ name: "Publish here",
+ });
+ await userEvent.click(publishButton);
+
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/ee/data-studio/table/publish-model",
+ ),
+ ).toBe(true);
+ });
+
+ const lastCall = fetchMock.callHistory.lastCall(
+ "path:/api/ee/data-studio/table/publish-model",
+ );
+ expect(lastCall).toBeTruthy();
+ const body = lastCall?.options?.body;
+ expect(body).toBeTruthy();
+ const parsedBody = typeof body === "string" ? JSON.parse(body) : body;
+ expect(parsedBody.target_collection_id).toBeNull();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css
new file mode 100644
index 00000000000..d5c1bb7bbdc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.module.css
@@ -0,0 +1,181 @@
+.root {
+ --owner-column-width: 140px;
+ --rows-column-width: 80px;
+ --published-column-width: 80px;
+
+ height: 100%;
+}
+
+.header {
+ display: flex;
+ align-items: center;
+ padding-left: var(--mantine-spacing-md);
+ padding-bottom: var(--mantine-spacing-xs);
+ border-bottom: 1px solid var(--mb-color-border);
+ font-size: 0.75rem;
+ font-weight: 700;
+}
+
+.headerCell {
+ color: var(--mb-color-text-primary);
+ font-size: rem(12px);
+ font-weight: 700;
+ align-items: center;
+ flex: 0 0 auto;
+}
+
+.results {
+ position: relative;
+ overflow: auto;
+ flex: 1 1 auto;
+ min-height: 0;
+}
+
+.item {
+ --item-top-border-color: transparent;
+
+ position: absolute;
+ cursor: pointer;
+ border-bottom: 1px solid var(--mb-color-border);
+
+ &:focus-visible,
+ &.selected {
+ outline: 2px solid var(--mb-color-focus);
+
+ --item-top-border-color: var(--mb-color-border);
+ }
+
+ &:hover {
+ background-color: var(--mb-color-brand-lighter);
+
+ --item-top-border-color: var(--mb-color-border);
+ }
+
+ &.active {
+ color: var(--mb-color-brand);
+ background-color: var(--mb-color-brand-light);
+
+ --item-top-border-color: var(--mb-color-border);
+
+ .icon {
+ opacity: 1;
+ }
+ }
+}
+
+.icon {
+ opacity: 0.5;
+ flex-shrink: 0;
+}
+
+.database,
+.schema,
+.table,
+.field {
+ .icon {
+ opacity: 1;
+ color: var(--mb-color-text-dark);
+ }
+}
+
+.checkbox {
+ flex-shrink: 0;
+ width: 40px;
+ max-height: 40px;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.checkboxColumn {
+ flex-shrink: 0;
+ width: rem(40px);
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ padding-right: var(--mantine-spacing-sm);
+}
+
+.chevronSlot {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.chevron {
+ transition: transform 100ms ease-in-out;
+ opacity: 0.35;
+ flex-shrink: 0;
+
+ &.expanded {
+ transform: rotate(90deg);
+ }
+}
+
+.label {
+ user-select: none;
+ overflow-wrap: anywhere;
+ white-space: nowrap;
+}
+
+.content {
+ flex: 1;
+ min-width: 0;
+}
+
+.column {
+ color: var(--mb-color-text-light);
+ font-size: 0.875rem;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ display: flex;
+ align-items: center;
+ flex: 0 0 auto;
+}
+
+.tableColumn {
+ justify-content: flex-start;
+}
+
+.ownerColumn {
+ flex-basis: var(--owner-column-width);
+}
+
+.rowsColumn {
+ font-variant-numeric: tabular-nums;
+ flex-basis: var(--rows-column-width);
+}
+
+.publishedColumn {
+ flex-basis: var(--published-column-width);
+}
+
+.hidden {
+ opacity: 0;
+}
+
+.visibilityToggle {
+ flex-shrink: 0;
+
+ &:focus,
+ .item:hover &,
+ .item:focus &,
+ .item.selected &,
+ .item.active & {
+ opacity: 0.75;
+ }
+}
+
+.massVisibilityToggle {
+ flex-shrink: 0;
+ opacity: 0;
+
+ &:focus,
+ .item:hover &,
+ .item:focus &,
+ .item.selected {
+ opacity: 0.75;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx
new file mode 100644
index 00000000000..9711cf2e061
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Results.tsx
@@ -0,0 +1,647 @@
+import { useVirtualizer } from "@tanstack/react-virtual";
+import cx from "classnames";
+import {
+ type KeyboardEvent,
+ useContext,
+ useEffect,
+ useMemo,
+ useRef,
+} from "react";
+import { Link } from "react-router";
+import { useLatest } from "react-use";
+import { t } from "ttag";
+
+import { useListUsersQuery } from "metabase/api";
+import {
+ type NumberFormatter,
+ useNumberFormatter,
+} from "metabase/common/hooks/use-number-formatter";
+import { DataModelContext } from "metabase/metadata/pages/shared/DataModelContext";
+import { getUrl } from "metabase/metadata/pages/shared/utils";
+import { Box, Checkbox, Flex, Icon, Skeleton, Stack, rem } from "metabase/ui";
+import type { UserId } from "metabase-types/api";
+
+import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
+import { TYPE_ICONS } from "../constants";
+import type { FlatItem, TreePath } from "../types";
+import { hasChildren } from "../utils";
+
+import S from "./Results.module.css";
+
+const VIRTUAL_OVERSCAN = 5;
+const ITEM_MIN_HEIGHT = 40; // items can vary in size because of text wrapping
+const INDENT_OFFSET = 18;
+
+interface Props {
+ items: FlatItem[];
+ path: TreePath;
+ selectedIndex?: number;
+ toggle?: (key: string, value?: boolean) => void;
+ onItemClick?: (path: TreePath) => void;
+ onSelectedIndexChange?: (index: number) => void;
+ onItemToggle?: (item: FlatItem) => void;
+ onRangeSelect?: (items: FlatItem[], targetItem: FlatItem) => void;
+}
+
+export function TablePickerResults({
+ items,
+ path,
+ selectedIndex,
+ toggle,
+ onItemClick,
+ onSelectedIndexChange,
+ onItemToggle,
+ onRangeSelect,
+}: Props) {
+ const ref = useRef<HTMLDivElement>(null);
+ const { selectedItemsCount } = useSelection();
+ const lastSelectedTableIndex = useRef<number | null>(null);
+
+ const virtual = useVirtualizer({
+ count: items.length,
+ getScrollElement: () => ref.current,
+ overscan: VIRTUAL_OVERSCAN,
+ estimateSize: () => ITEM_MIN_HEIGHT,
+ measureElement: (element) =>
+ element?.getBoundingClientRect().height ?? ITEM_MIN_HEIGHT,
+ });
+
+ const latestItems = useLatest(items);
+ const latestVirtual = useLatest(virtual);
+
+ const virtualItems = virtual.getVirtualItems();
+
+ const { data: usersData } = useListUsersQuery();
+ const ownerNameById = useMemo(() => {
+ const users = usersData?.data ?? [];
+ return new Map<UserId, string>(
+ users.map((user) => [user.id, user.common_name]),
+ );
+ }, [usersData]);
+
+ useEffect(
+ function scrollActiveTableIntoView() {
+ if (path.tableId === undefined) {
+ return;
+ }
+ const index = latestItems.current.findIndex(
+ (item) => item.type === "table" && item.value?.tableId === path.tableId,
+ );
+ if (index === -1) {
+ return;
+ }
+
+ const visibleIndices = latestVirtual.current
+ .getVirtualItems()
+ .map((virtualItem) => virtualItem.index);
+ if (visibleIndices.includes(index)) {
+ return;
+ }
+
+ latestVirtual.current.scrollToIndex(index, {
+ align: "start",
+ behavior: "auto",
+ });
+ },
+ [path.tableId, latestItems, latestVirtual],
+ );
+
+ useEffect(() => {
+ // sync the selected index by focusing the corresponding item,
+ // but only when the user is not currently typing in the search input
+ if (document.activeElement?.tagName !== "INPUT") {
+ document
+ .querySelector<HTMLAnchorElement>(`[data-index='${selectedIndex}']`)
+ ?.focus();
+ }
+ }, [selectedIndex]);
+
+ // reset last selected table when there are no selected items
+ useEffect(() => {
+ if (selectedItemsCount === 0) {
+ lastSelectedTableIndex.current = null;
+ }
+ }, [selectedItemsCount]);
+
+ const handleCheckboxToggle = (
+ item: FlatItem,
+ itemIndex: number,
+ options?: { isShiftPressed?: boolean },
+ ) => {
+ if (!onItemToggle) {
+ return;
+ }
+
+ const isShiftPressed = Boolean(options?.isShiftPressed);
+ const isTable = item.type === "table";
+ const hasRangeAnchor =
+ lastSelectedTableIndex.current != null && onRangeSelect != null;
+ const isRangeSelection = isShiftPressed && isTable && hasRangeAnchor;
+
+ if (isRangeSelection) {
+ if (!lastSelectedTableIndex.current) {
+ return;
+ }
+
+ const start = Math.min(lastSelectedTableIndex.current, itemIndex);
+ const end = Math.max(lastSelectedTableIndex.current, itemIndex);
+ const rangeItems = items.slice(start, end + 1).filter((rangeItem) => {
+ return !rangeItem.disabled && !rangeItem.isLoading;
+ });
+
+ if (rangeItems.length > 0) {
+ onRangeSelect?.(rangeItems, item);
+ lastSelectedTableIndex.current = itemIndex;
+ return;
+ }
+ }
+
+ // single checkbox toggle
+ onItemToggle(item);
+ lastSelectedTableIndex.current = isTable ? itemIndex : null;
+ };
+
+ return (
+ <Stack className={S.root} gap={0}>
+ <Flex className={S.header} gap="sm" justify="flex-end">
+ <Box className={cx(S.headerCell, S.ownerColumn)}>{t`Owner`}</Box>
+ <Box className={cx(S.headerCell, S.rowsColumn)}>{t`Rows`}</Box>
+ <Box
+ className={cx(S.headerCell, S.publishedColumn)}
+ >{t`Published`}</Box>
+ </Flex>
+ <Box ref={ref} className={S.results}>
+ <Box style={{ height: virtual.getTotalSize() }}>
+ {virtualItems.map(({ start, index }) => {
+ const item = items[index];
+ const parentIndex = items.findIndex(
+ (item) => item.key === item.parent,
+ );
+
+ return (
+ <ResultsItem
+ key={item.key}
+ item={item}
+ parentIndex={parentIndex}
+ path={path}
+ start={start}
+ index={index}
+ selectedIndex={selectedIndex}
+ toggle={toggle}
+ onItemClick={onItemClick}
+ onSelectedIndexChange={onSelectedIndexChange}
+ onCheckboxToggle={handleCheckboxToggle}
+ rootRef={ref}
+ ownerNameById={ownerNameById}
+ />
+ );
+ })}
+ </Box>
+ </Box>
+ </Stack>
+ );
+}
+
+function ElementCheckbox({
+ item,
+ index,
+ disabled = false,
+ onCheckboxToggle,
+}: {
+ item: FlatItem;
+ index: number;
+ onCheckboxToggle?: (
+ item: FlatItem,
+ index: number,
+ options?: { isShiftPressed?: boolean },
+ ) => void;
+ disabled?: boolean;
+}) {
+ if (item.isLoading) {
+ return null;
+ }
+
+ const indeterminate = item.isSelected === "some";
+
+ const { isSelected } = item;
+
+ return (
+ <Checkbox
+ size="sm"
+ checked={isSelected !== "no"}
+ className={S.checkbox}
+ disabled={disabled}
+ onClick={(event) => {
+ event.stopPropagation();
+ if (disabled) {
+ return;
+ }
+ onCheckboxToggle?.(item, index, {
+ isShiftPressed: Boolean(
+ (event.nativeEvent as { shiftKey?: boolean }).shiftKey,
+ ),
+ });
+ }}
+ wrapperProps={{
+ onClick(event) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ if ((event.target as HTMLElement).tagName.toLowerCase() === "input") {
+ // it's already handled in onClick
+ return;
+ }
+
+ if (disabled) {
+ return;
+ }
+
+ onCheckboxToggle?.(item, index, {
+ isShiftPressed: event.shiftKey,
+ });
+ },
+ }}
+ onChange={() => {}}
+ indeterminate={indeterminate}
+ />
+ );
+}
+
+function Loading() {
+ const width = useMemo(() => 100 + Math.random() * 100, []);
+
+ return (
+ <Skeleton
+ data-testid="loading-placeholder"
+ height={rem(16)}
+ width={width}
+ radius="sm"
+ />
+ );
+}
+
+interface ResultsItemProps {
+ item: FlatItem;
+ path: TreePath;
+ parentIndex: number;
+ start: number;
+ index: number;
+ selectedIndex?: number;
+ toggle?: (key: string, value?: boolean) => void;
+ onItemClick?: (path: TreePath) => void;
+ onSelectedIndexChange?: (index: number) => void;
+ onCheckboxToggle?: (
+ item: FlatItem,
+ index: number,
+ options?: { isShiftPressed?: boolean },
+ ) => void;
+ rootRef: React.RefObject<HTMLDivElement>;
+ ownerNameById: Map<UserId, string>;
+}
+
+function isDatabaseActive(
+ item: FlatItem,
+ path: TreePath,
+ selectedItemsCount: number,
+): boolean {
+ return (
+ selectedItemsCount === 0 &&
+ item.type === "database" &&
+ item.value?.databaseId === path.databaseId &&
+ path.tableId == null &&
+ (path.schemaName == null || item.children.length === 1)
+ );
+}
+
+function isSchemaActive(
+ item: FlatItem,
+ path: TreePath,
+ selectedItemsCount: number,
+): boolean {
+ return (
+ selectedItemsCount === 0 &&
+ item.type === "schema" &&
+ item.value?.databaseId === path.databaseId &&
+ item.value?.schemaName === path.schemaName &&
+ path.tableId == null
+ );
+}
+
+function isTableActive(
+ item: FlatItem,
+ path: TreePath,
+ selectedItemsCount: number,
+): boolean {
+ return (
+ selectedItemsCount === 0 &&
+ item.type === "table" &&
+ item.value?.tableId === path.tableId
+ );
+}
+
+function isItemActive(
+ item: FlatItem,
+ path: TreePath,
+ selectedItemsCount: number,
+): boolean {
+ return (
+ isDatabaseActive(item, path, selectedItemsCount) ||
+ isSchemaActive(item, path, selectedItemsCount) ||
+ isTableActive(item, path, selectedItemsCount)
+ );
+}
+
+const ResultsItem = ({
+ item,
+ path,
+ start,
+ index,
+ selectedIndex,
+ parentIndex,
+ toggle,
+ onItemClick,
+ onSelectedIndexChange,
+ onCheckboxToggle,
+ rootRef,
+ ownerNameById,
+}: ResultsItemProps) => {
+ const { selectedItemsCount } = useSelection();
+ const { baseUrl } = useContext(DataModelContext);
+ const { value, label, type, isExpanded, isLoading, key, level, disabled } =
+ item;
+ const formatNumber = useNumberFormatter({ maximumFractionDigits: 0 });
+ const ownerDisplay = getOwnerDisplay(item, ownerNameById);
+ const expectedRowsDisplay = getExpectedRowsDisplay(item, formatNumber);
+ const publishedDisplay = getPublishedDisplay(item);
+
+ const isActive = isItemActive(item, path, selectedItemsCount);
+ const indent = level * INDENT_OFFSET;
+ const hasToggle = hasChildren(type);
+
+ const handleItemSelect = (open?: boolean, event?: React.MouseEvent) => {
+ if (disabled) {
+ return;
+ }
+
+ // In multi-select mode, prevent navigation and allow toggling for items with children
+ if (selectedItemsCount > 0) {
+ if (hasChildren(type)) {
+ // Toggle expansion for items with children
+ if (open !== undefined) {
+ toggle?.(key, open);
+ } else {
+ toggle?.(key);
+ }
+ }
+ // Prevent Link navigation in multi-select mode
+ if (event) {
+ event.preventDefault();
+ }
+ return;
+ }
+
+ // In single-select mode:
+ // If the item is already active, toggle its expansion state
+ // Otherwise, navigate to make it active
+ if (isActive && hasChildren(type)) {
+ // Second click on active item: toggle expansion
+ if (open !== undefined) {
+ toggle?.(key, open);
+ } else {
+ toggle?.(key);
+ }
+
+ // Prevent Link navigation when toggling
+ if (event) {
+ event.preventDefault();
+ }
+ } else {
+ // First click or clicking on a field: navigate
+ if (open !== undefined) {
+ toggle?.(key, open);
+ }
+
+ // Only navigate in single-select mode
+ if (selectedItemsCount === 0 && value) {
+ // Expand collapsed items when navigating to them
+ if (!isExpanded && hasChildren(type)) {
+ toggle?.(key, true);
+ }
+ onItemClick?.(value);
+ }
+ }
+ };
+
+ function itemByIndex(index: number) {
+ return rootRef.current?.querySelector<HTMLAnchorElement>(
+ `[data-index='${index}']`,
+ );
+ }
+
+ const handleKeyDown = (event: KeyboardEvent<HTMLElement>) => {
+ if (typeof selectedIndex === "number") {
+ // If there is a selected index externally
+ // don't handle the key events
+ return;
+ }
+ if (event.code === "ArrowDown") {
+ // focus the next item in the list
+ // does not wrap at around
+ itemByIndex(index + 1)?.focus();
+ event.preventDefault();
+ }
+ if (event.code === "ArrowUp") {
+ // focus the previous item in the list
+ // does not wrap at around
+ itemByIndex(index - 1)?.focus();
+ event.preventDefault();
+ }
+ if (event.code === "ArrowLeft") {
+ if (isExpanded) {
+ // when expanded, close the item
+ toggle?.(key, false);
+ } else {
+ // when already closed, go to parent node
+ itemByIndex(parentIndex)?.focus();
+ }
+ event.preventDefault();
+ }
+ if (event.code === "ArrowRight") {
+ if (!isExpanded) {
+ // expand the item
+ handleItemSelect(true);
+ } else {
+ // go to first child
+ itemByIndex(index + 1)?.focus();
+ }
+ event.preventDefault();
+ }
+
+ if (!disabled && (event.code === "Space" || event.code === "Enter")) {
+ // toggle the current item
+ handleItemSelect();
+ event.preventDefault();
+ }
+ };
+
+ return (
+ <Flex
+ component={Link}
+ key={key}
+ aria-selected={isActive}
+ align="center"
+ justify="flex-start"
+ gap={0}
+ w="100%"
+ mih={ITEM_MIN_HEIGHT}
+ className={cx(S.item, S[type], {
+ [S.active]: isActive,
+ [S.selected]: selectedIndex === index,
+ })}
+ data-index={index}
+ data-open={isExpanded}
+ tabIndex={disabled ? -1 : 0}
+ style={{
+ transform: `translateY(${start}px)`,
+ pointerEvents: disabled ? "none" : undefined,
+ }}
+ to={getUrl(baseUrl, {
+ databaseId: value?.databaseId,
+ schemaName:
+ type === "schema" || type === "table" ? value?.schemaName : undefined,
+ tableId: type === "table" ? value?.tableId : undefined,
+ })}
+ data-testid="tree-item"
+ data-type={type}
+ onKeyDown={handleKeyDown}
+ onClick={(e) => {
+ handleItemSelect(undefined, e);
+ }}
+ onFocus={() => onSelectedIndexChange?.(index)}
+ >
+ <Box className={S.checkboxColumn}>
+ <ElementCheckbox
+ item={item}
+ index={index}
+ disabled={disabled}
+ onCheckboxToggle={onCheckboxToggle}
+ />
+ </Box>
+
+ <Flex align="center" py="xs" w="100%" pl={indent} gap="sm">
+ <Flex align="flex-start" gap="xs" className={S.content}>
+ <Flex align="center" gap="xs">
+ <Box className={S.chevronSlot} w={INDENT_OFFSET}>
+ {hasToggle && (
+ <Icon
+ name="chevronright"
+ size={16}
+ color="var(--mb-color-text-light)"
+ className={cx(S.chevron, {
+ [S.expanded]: isExpanded,
+ })}
+ />
+ )}
+ </Box>
+
+ <Icon name={TYPE_ICONS[type]} className={S.icon} />
+ </Flex>
+
+ {isLoading ? (
+ <Loading />
+ ) : (
+ <Box
+ className={S.label}
+ c={
+ type === "table" &&
+ item.table &&
+ item.table.visibility_type != null &&
+ !isActive
+ ? "text-secondary"
+ : undefined
+ }
+ data-testid="tree-item-label"
+ pl="sm"
+ >
+ {label}
+ </Box>
+ )}
+ </Flex>
+
+ {type === "table" && (
+ <>
+ <Box
+ className={cx(S.column, S.ownerColumn)}
+ data-testid="table-owner"
+ >
+ {ownerDisplay}
+ </Box>
+
+ <Box
+ className={cx(S.column, S.rowsColumn)}
+ data-testid="table-expected-rows"
+ >
+ {expectedRowsDisplay}
+ </Box>
+
+ <Box
+ className={cx(S.column, S.publishedColumn)}
+ pl="md"
+ data-testid="table-published"
+ >
+ {publishedDisplay}
+ </Box>
+ </>
+ )}
+ </Flex>
+ </Flex>
+ );
+};
+
+function getOwnerDisplay(
+ item: FlatItem,
+ ownerNameById: Map<UserId, string>,
+): string {
+ if (item.type !== "table" || item.isLoading || !item.table) {
+ return "";
+ }
+
+ const ownerId = item.table.owner_user_id;
+ if (ownerId != null && ownerNameById.has(ownerId)) {
+ return ownerNameById.get(ownerId) ?? "";
+ }
+
+ if (item.table.owner_email) {
+ return item.table.owner_email;
+ }
+
+ return "";
+}
+
+function getExpectedRowsDisplay(
+ item: FlatItem,
+ formatNumber: NumberFormatter,
+): string | null {
+ if (item.type !== "table" || item.isLoading || !item.table) {
+ return null;
+ }
+
+ const expectedRows = item.table.estimated_row_count;
+
+ if (!expectedRows) {
+ return null;
+ }
+
+ const formatted = formatNumber(expectedRows);
+ return formatted;
+}
+
+function getPublishedDisplay(item: FlatItem): React.ReactNode {
+ if (item.type !== "table" || item.isLoading || !item.table) {
+ return null;
+ }
+
+ return item.table.published_as_model ? (
+ <Icon name="verified_round" aria-label={t`Published`} />
+ ) : null;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
new file mode 100644
index 00000000000..924f752d975
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
@@ -0,0 +1,254 @@
+import cx from "classnames";
+import { useContext, useEffect, useMemo, useRef } from "react";
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import { useListDatabasesQuery } from "metabase/api";
+import { useListTablesQuery } from "metabase/api/table";
+import { DataModelContext } from "metabase/metadata/pages/shared/DataModelContext";
+import { getUrl, parseRouteParams } from "metabase/metadata/pages/shared/utils";
+import { Box, Checkbox, Flex, Icon, Loader, Stack, Text } from "metabase/ui";
+import type { TableId } from "metabase-types/api";
+
+import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
+import type { RouteParams } from "../../../pages/DataModel/types";
+import type { FilterState } from "../types";
+
+import S from "./Results.module.css";
+
+interface SearchNewProps {
+ query: string;
+ params: RouteParams;
+ filters: FilterState;
+ setOnUpdateCallback: (callback: (() => void) | null) => void;
+}
+
+export function SearchNew({
+ query,
+ params,
+ filters,
+ setOnUpdateCallback,
+}: SearchNewProps) {
+ const { selectedTables, setSelectedTables, selectedItemsCount } =
+ useSelection();
+ const routeParams = parseRouteParams(params);
+ const { baseUrl } = useContext(DataModelContext);
+ const {
+ data: tables,
+ isLoading: isLoadingTables,
+ refetch,
+ } = useListTablesQuery({
+ term: query,
+ "data-layer": filters.dataLayer ?? undefined,
+ "data-source":
+ filters.dataSource === "unknown"
+ ? null
+ : (filters.dataSource ?? undefined),
+ "owner-user-id":
+ filters.ownerUserId === "unknown"
+ ? undefined
+ : (filters.ownerUserId ?? undefined),
+ "owner-email": filters.ownerEmail ?? undefined,
+ "orphan-only": filters.ownerUserId === "unknown" ? true : undefined,
+ "unused-only": filters.unusedOnly === true ? true : undefined,
+ });
+ const { data: databases, isLoading: isLoadingDatabases } =
+ useListDatabasesQuery({ include_editable_data_model: true });
+
+ const allowedDatabaseIds = useMemo(
+ () => new Set(databases?.data.map((database) => database.id) ?? []),
+ [databases],
+ );
+
+ const filteredTables = useMemo(() => {
+ if (!tables || allowedDatabaseIds.size === 0) {
+ return [];
+ }
+
+ return tables.filter((table) => allowedDatabaseIds.has(table.db_id));
+ }, [allowedDatabaseIds, tables]);
+
+ const isLoading = isLoadingTables || isLoadingDatabases;
+
+ useEffect(() => {
+ setOnUpdateCallback(() => refetch);
+ return () => setOnUpdateCallback(null);
+ }, [refetch, setOnUpdateCallback]);
+
+ const lastSelectedTableIndex = useRef<number | null>(null);
+
+ useEffect(() => {
+ if (selectedItemsCount === 0) {
+ lastSelectedTableIndex.current = null;
+ }
+ }, [selectedItemsCount]);
+
+ if (isLoading) {
+ return (
+ <Flex justify="center" align="center" p="xl">
+ <Loader />
+ </Flex>
+ );
+ }
+
+ if (filteredTables.length === 0) {
+ return (
+ <Box p="xl">
+ <Text c="text.2">{t`No tables found`}</Text>
+ </Box>
+ );
+ }
+
+ const handleTableSelect = (
+ tableId: TableId,
+ tableIndex: number,
+ options?: { isShiftPressed?: boolean },
+ ) => {
+ const isShiftPressed = Boolean(options?.isShiftPressed);
+ const hasRangeAnchor = lastSelectedTableIndex.current != null;
+
+ if (isShiftPressed && hasRangeAnchor) {
+ const anchorIndex = lastSelectedTableIndex.current;
+ if (anchorIndex == null) {
+ return;
+ }
+
+ const start = Math.min(anchorIndex, tableIndex);
+ const end = Math.max(anchorIndex, tableIndex);
+ const rangeTables = filteredTables.slice(start, end + 1);
+
+ setSelectedTables((prev) => {
+ const newSet = new Set(prev);
+ rangeTables.forEach((rangeTable) => {
+ newSet.add(rangeTable.id);
+ });
+ return newSet;
+ });
+
+ lastSelectedTableIndex.current = tableIndex;
+ return;
+ }
+
+ setSelectedTables((prev) => {
+ const newSet = new Set(prev);
+ if (newSet.has(tableId)) {
+ newSet.delete(tableId);
+ } else {
+ newSet.add(tableId);
+ }
+ return newSet;
+ });
+
+ lastSelectedTableIndex.current = tableIndex;
+ };
+
+ return (
+ <Stack h="100%" style={{ overflow: "auto" }}>
+ <Stack gap={0}>
+ {filteredTables.map((table, tableIndex) => {
+ const breadcrumbs = table.schema
+ ? `${table.db?.name} (${table.schema})`
+ : table.db?.name;
+ const isActive =
+ selectedItemsCount === 0 &&
+ routeParams.databaseId === table.db_id &&
+ routeParams.schemaName === table.schema &&
+ routeParams.tableId === table.id;
+
+ return (
+ <Flex
+ component={Link}
+ aria-selected={isActive}
+ className={cx(S.item, {
+ [S.active]: isActive,
+ })}
+ key={table.id}
+ data-testid="tree-item"
+ data-type="table"
+ py="sm"
+ pe="sm"
+ align="center"
+ gap="sm"
+ to={getUrl(baseUrl, {
+ databaseId: table.db_id,
+ schemaName: table.schema,
+ tableId: table.id,
+ })}
+ pos="relative"
+ left={0}
+ right={0}
+ >
+ <Checkbox
+ w={40}
+ style={{
+ alignSelf: "flex-start",
+ justifyContent: "center",
+ position: "relative",
+ top: 4,
+ display: "flex",
+ }}
+ size="sm"
+ checked={selectedTables.has(table.id)}
+ onClick={(event) => {
+ event.stopPropagation();
+ handleTableSelect(table.id, tableIndex, {
+ isShiftPressed: Boolean(
+ (event.nativeEvent as { shiftKey?: boolean }).shiftKey,
+ ),
+ });
+ }}
+ onChange={() => {}}
+ />
+ <Icon
+ style={{
+ alignSelf: "flex-start",
+ position: "relative",
+ top: 4,
+ }}
+ name="table2"
+ c={isActive ? "brand" : "text-light"}
+ size={16}
+ />
+ <Text
+ c={isActive ? "brand" : "text-primary"}
+ fw={500}
+ style={{ flex: 1 }}
+ >
+ {table.display_name}
+ </Text>
+ {breadcrumbs && (
+ <BreadCrumbs active={isActive} breadcrumbs={breadcrumbs} />
+ )}
+ </Flex>
+ );
+ })}
+ </Stack>
+ </Stack>
+ );
+}
+
+function BreadCrumbs({
+ breadcrumbs,
+ active = true,
+}: {
+ breadcrumbs: string;
+ active?: boolean;
+}) {
+ if (!breadcrumbs) {
+ return null;
+ }
+
+ return (
+ <Text
+ ta="right"
+ flex="0 0 auto"
+ c={active ? "var(--mb-color-text-medium)" : "var(--mb-color-text-light)"}
+ fz="0.75rem"
+ lh="1rem"
+ lineClamp={1}
+ maw="40%"
+ >
+ {breadcrumbs}
+ </Text>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
new file mode 100644
index 00000000000..e8a493760e9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
@@ -0,0 +1,174 @@
+import { useDisclosure } from "@mantine/hooks";
+import { useDeferredValue, useEffect, useState } from "react";
+import { usePrevious } from "react-use";
+import { t } from "ttag";
+
+import {
+ Badge,
+ Box,
+ Button,
+ Group,
+ Icon,
+ Input,
+ Popover,
+ Stack,
+ Tooltip,
+ rem,
+} from "metabase/ui";
+
+import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
+import type { RouteParams } from "../../../pages/DataModel/types";
+import type { ChangeOptions, FilterState, TreePath } from "../types";
+import { getFiltersCount } from "../utils";
+
+import { FilterPopover } from "./FilterPopover";
+import { PublishModelsModal } from "./PublishModelsModal";
+import { SearchNew } from "./SearchNew";
+import { Tree } from "./Tree";
+
+interface TablePickerProps {
+ params: RouteParams;
+ path: TreePath;
+ className?: string;
+ onChange: (path: TreePath, options?: ChangeOptions) => void;
+}
+
+export function TablePicker({
+ params,
+ path,
+ className,
+ onChange,
+}: TablePickerProps) {
+ const { selectedTables, selectedSchemas, selectedDatabases, resetSelection } =
+ useSelection();
+
+ const [query, setQuery] = useState("");
+ const deferredQuery = useDeferredValue(query);
+ const previousDeferredQuery = usePrevious(deferredQuery);
+ const [filters, setFilters] = useState<FilterState>({
+ dataLayer: null,
+ dataSource: null,
+ ownerEmail: null,
+ ownerUserId: null,
+ unusedOnly: null,
+ });
+ const [isOpen, { toggle, close }] = useDisclosure();
+ const filtersCount = getFiltersCount(filters);
+
+ const [isCreateModelsModalOpen, setIsCreateModelsModalOpen] = useState(false);
+ const [onUpdateCallback, setOnUpdateCallback] = useState<(() => void) | null>(
+ null,
+ );
+
+ function handlePublishSuccess() {
+ if (onUpdateCallback) {
+ onUpdateCallback();
+ }
+ resetSelection();
+ }
+
+ useEffect(() => {
+ if (previousDeferredQuery === "" && deferredQuery !== "") {
+ resetSelection();
+ }
+
+ if (previousDeferredQuery !== "" && deferredQuery === "") {
+ resetSelection();
+ }
+ }, [deferredQuery, previousDeferredQuery, resetSelection]);
+
+ return (
+ <Stack
+ data-testid="table-picker"
+ mih={rem(200)}
+ className={className}
+ style={{ overflow: "hidden" }}
+ >
+ <Group gap="sm" p="lg" pb={0}>
+ <Input
+ flex="1"
+ leftSection={<Icon name="search" />}
+ placeholder={t`Search tables`}
+ rightSection={
+ <Tooltip
+ label={
+ <Box ta="center">
+ <div>{t`Search matches from the start of words.`}</div>
+ <div>{t`Use * as a wildcard.`}</div>
+ </Box>
+ }
+ >
+ <Icon name="info" />
+ </Tooltip>
+ }
+ rightSectionPointerEvents="auto"
+ value={query}
+ onChange={(event) => setQuery(event.target.value)}
+ />
+
+ <Popover width={rem(340)} position="bottom-start" opened={isOpen}>
+ <Popover.Target>
+ <Tooltip label={t`Filter`}>
+ <Button
+ aria-label={t`Filter`}
+ leftSection={
+ <Box pos="relative">
+ <Icon name="filter" />
+
+ {filtersCount > 0 && (
+ <Badge
+ bg="brand"
+ circle
+ size="8"
+ pos="absolute"
+ top={-6}
+ right={-8}
+ />
+ )}
+ </Box>
+ }
+ onClick={toggle}
+ />
+ </Tooltip>
+ </Popover.Target>
+
+ <Popover.Dropdown>
+ <FilterPopover
+ filters={filters}
+ onSubmit={(newFilters) => {
+ setFilters(newFilters);
+ close();
+ }}
+ />
+ </Popover.Dropdown>
+ </Popover>
+ </Group>
+
+ <Box mih={0} flex="1 1 auto">
+ {deferredQuery === "" && filtersCount === 0 ? (
+ <Tree
+ path={path}
+ onChange={onChange}
+ setOnUpdateCallback={setOnUpdateCallback}
+ />
+ ) : (
+ <SearchNew
+ query={deferredQuery}
+ params={params}
+ filters={filters}
+ setOnUpdateCallback={setOnUpdateCallback}
+ />
+ )}
+ </Box>
+
+ <PublishModelsModal
+ tables={selectedTables}
+ schemas={selectedSchemas}
+ databases={selectedDatabases}
+ isOpen={isCreateModelsModalOpen}
+ onClose={() => setIsCreateModelsModalOpen(false)}
+ onSuccess={handlePublishSuccess}
+ />
+ </Stack>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
new file mode 100644
index 00000000000..3aeaeaaabb6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
@@ -0,0 +1,507 @@
+import userEvent from "@testing-library/user-event";
+import { Route } from "react-router";
+
+import {
+ setupDatabasesEndpoints,
+ setupTableSearchEndpoint,
+ setupUserKeyValueEndpoints,
+ setupUsersEndpoints,
+} from "__support__/server-mocks";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+ waitFor,
+} from "__support__/ui";
+import { SelectionProvider } from "metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext";
+import type { Database, User } from "metabase-types/api";
+import {
+ createMockDatabase,
+ createMockSchema,
+ createMockTable,
+ createMockUser,
+} from "metabase-types/api/mocks";
+
+import type { TreePath } from "../types";
+import { UncontrolledTablePicker } from "../wrappers";
+
+let id = 1000;
+function nextId() {
+ return id++;
+}
+
+beforeEach(() => {
+ // so the virtual list renders correctly in the tests
+ mockGetBoundingClientRect();
+});
+
+afterEach(() => {
+ jest.restoreAllMocks();
+});
+
+const PUBLIC_SCHEMA = createMockSchema({
+ id: "PUBLIC",
+ name: "PUBLIC",
+});
+
+const PRIVATE_SCHEMA = createMockSchema({
+ id: "PRIVATE",
+ name: "PRIVATE",
+});
+
+const FOO_TABLE = createMockTable({
+ id: nextId(),
+ name: "FOO",
+ display_name: "Foo",
+ schema: PRIVATE_SCHEMA.id,
+ fields: [],
+});
+
+const BAR_TABLE = createMockTable({
+ id: nextId(),
+ name: "BAR",
+ display_name: "Bar",
+ schema: PUBLIC_SCHEMA.id,
+ fields: [],
+});
+
+const DATABASE_WITH_MULTIPLE_SCHEMAS = createMockDatabase({
+ id: nextId(),
+ name: "DATABASE_WITH_MULTIPLE_SCHEMAS",
+ tables: [FOO_TABLE, BAR_TABLE],
+});
+
+const SINGLE_SCHEMA = createMockSchema({
+ id: "single_schema",
+ name: "SINGLE_SCHEMA",
+});
+
+const QUU = createMockTable({
+ id: nextId(),
+ name: "QUU",
+ display_name: "Quu",
+ schema: SINGLE_SCHEMA.name,
+});
+
+const QUX = createMockTable({
+ id: nextId(),
+ name: "QUX",
+ display_name: "Qux",
+ schema: SINGLE_SCHEMA.name,
+});
+
+const DATABASE_WITH_SINGLE_SCHEMA = createMockDatabase({
+ id: nextId(),
+ name: "DATABASE_SINGLE_SCHEMA",
+ tables: [QUU, QUX],
+});
+
+const UNNAMED_SCHEMA = createMockSchema({
+ id: "unnamed_schema",
+ name: "",
+});
+
+const NAMED_SCHEMA = createMockSchema({
+ id: "named",
+ name: "NAMED_SCHEMA",
+});
+
+const CORGE = createMockTable({
+ id: nextId(),
+ schema: UNNAMED_SCHEMA.name,
+ name: "CORGE",
+ display_name: "Corge",
+});
+
+const GRAULT = createMockTable({
+ id: nextId(),
+ schema: UNNAMED_SCHEMA.name,
+ name: "GRAULT",
+ display_name: "Grault",
+});
+
+const GLORP = createMockTable({
+ id: nextId(),
+ schema: NAMED_SCHEMA.name,
+ name: "GLORP",
+ display_name: "Glorp",
+});
+
+const DATABASE_WITH_UNNAMED_SCHEMA = createMockDatabase({
+ id: nextId(),
+ name: "DATABASE_WITH_UNNAMED_SCHEMA",
+ tables: [CORGE, GRAULT, GLORP],
+});
+
+const MOCK_DATABASES = [
+ DATABASE_WITH_MULTIPLE_SCHEMAS,
+ DATABASE_WITH_SINGLE_SCHEMA,
+ DATABASE_WITH_UNNAMED_SCHEMA,
+];
+
+const currentUser: User = createMockUser({
+ id: 2,
+ common_name: "Bar",
+ is_superuser: true,
+});
+
+function setup({
+ path = {},
+ databases = MOCK_DATABASES,
+}: {
+ path?: TreePath;
+ databases?: Database[];
+} = {}) {
+ setupDatabasesEndpoints(databases);
+ setupTableSearchEndpoint(
+ databases.flatMap(
+ (db) => db.tables?.map((t) => ({ ...t, db_id: db.id })) ?? [],
+ ),
+ );
+ setupUsersEndpoints([currentUser]);
+ setupUserKeyValueEndpoints({
+ namespace: "user_acknowledgement",
+ key: "seen-publish-models-info",
+ value: false,
+ });
+
+ const onChange = jest.fn();
+ const params = {};
+
+ renderWithProviders(
+ <Route
+ path="*"
+ component={() => (
+ <SelectionProvider>
+ <UncontrolledTablePicker
+ initialValue={path}
+ onChange={onChange}
+ params={params}
+ />
+ </SelectionProvider>
+ )}
+ />,
+ { withRouter: true },
+ );
+ return { onChange };
+}
+
+describe("TablePicker", () => {
+ describe("Tree view", () => {
+ it("renders databases and unfurls nested items", async () => {
+ const { onChange } = setup({ path: {} });
+
+ await waitLoading();
+
+ expect(item(DATABASE_WITH_MULTIPLE_SCHEMAS)).toBeInTheDocument();
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)).toBeInTheDocument();
+
+ await clickItem(DATABASE_WITH_MULTIPLE_SCHEMAS);
+ await waitLoading();
+
+ expect(onChange).toHaveBeenCalledWith({
+ databaseId: DATABASE_WITH_MULTIPLE_SCHEMAS.id,
+ });
+
+ expect(item(PRIVATE_SCHEMA)).toBeInTheDocument();
+ expect(item(PUBLIC_SCHEMA)).toBeInTheDocument();
+ expect(item(PUBLIC_SCHEMA)).toBeInTheDocument();
+
+ await clickItem(PUBLIC_SCHEMA);
+ await waitLoading();
+
+ expect(onChange).toHaveBeenCalledWith({
+ databaseId: DATABASE_WITH_MULTIPLE_SCHEMAS.id,
+ schemaName: PUBLIC_SCHEMA.name,
+ });
+
+ expect(item(FOO_TABLE)).not.toBeInTheDocument();
+ expect(item(BAR_TABLE)).toBeInTheDocument();
+
+ await clickItem(BAR_TABLE);
+
+ expect(onChange).toHaveBeenCalledWith({
+ databaseId: DATABASE_WITH_MULTIPLE_SCHEMAS.id,
+ schemaName: PUBLIC_SCHEMA.name,
+ tableId: BAR_TABLE.id,
+ });
+
+ // first select, then collapse
+ await clickItem(PUBLIC_SCHEMA);
+ await waitLoading();
+ await clickItem(PUBLIC_SCHEMA);
+ await waitLoading();
+
+ expect(item(FOO_TABLE)).not.toBeInTheDocument();
+ expect(item(BAR_TABLE)).not.toBeInTheDocument();
+
+ // first select, then collapse
+ await clickItem(DATABASE_WITH_MULTIPLE_SCHEMAS);
+ await waitLoading();
+ await clickItem(DATABASE_WITH_MULTIPLE_SCHEMAS);
+ await waitLoading();
+
+ expect(item(PUBLIC_SCHEMA)).not.toBeInTheDocument();
+ expect(item(PRIVATE_SCHEMA)).not.toBeInTheDocument();
+ });
+
+ it("flattens schemas with no names", async () => {
+ const { onChange } = setup({ path: {} });
+
+ await waitLoading();
+
+ expect(item(DATABASE_WITH_UNNAMED_SCHEMA)).toBeInTheDocument();
+ await clickItem(DATABASE_WITH_UNNAMED_SCHEMA);
+
+ expect(onChange).toHaveBeenCalledWith({
+ databaseId: DATABASE_WITH_UNNAMED_SCHEMA.id,
+ });
+
+ // first for the schema
+ await waitLoading();
+
+ // the schema does not render itself but it's children are rendered directly
+ expect(item(CORGE)).toBeInTheDocument();
+ expect(item(GRAULT)).toBeInTheDocument();
+
+ // Other schema's are still just rendered as normal
+ expect(item(NAMED_SCHEMA)).toBeInTheDocument();
+ expect(item(GLORP)).not.toBeInTheDocument();
+ });
+
+ it("automatically opens schemas when there is only one schema", async () => {
+ const { onChange } = setup({ path: {} });
+
+ await waitLoading();
+
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)).toBeInTheDocument();
+ await clickItem(DATABASE_WITH_SINGLE_SCHEMA);
+ await waitLoading();
+
+ expect(onChange).toHaveBeenCalledWith({
+ databaseId: DATABASE_WITH_SINGLE_SCHEMA.id,
+ });
+
+ expect(onChange).toHaveBeenCalledWith({
+ databaseId: DATABASE_WITH_SINGLE_SCHEMA.id,
+ schemaName: SINGLE_SCHEMA.name,
+ });
+
+ // the schema is flattened into the parent
+ expect(item(QUU)).toBeInTheDocument();
+ expect(item(QUX)).toBeInTheDocument();
+ });
+
+ it("should be possible to navigate with the keyboard", async () => {
+ const { onChange } = setup();
+
+ await userEvent.click(await screen.findByRole("textbox"));
+
+ // focus the first item - need to tab twice to skip the filter button
+ await userEvent.keyboard("{Tab}");
+ await userEvent.keyboard("{Tab}");
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)).toHaveFocus();
+
+ // arrow down moves focus down
+ await userEvent.keyboard("{ArrowDown}");
+ expect(item(DATABASE_WITH_MULTIPLE_SCHEMAS)).toHaveFocus();
+
+ // arrow up moves focus up
+ await userEvent.keyboard("{ArrowUp}");
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)).toHaveFocus();
+
+ // right arrow opens the node (auto-expands since single schema)
+ await userEvent.keyboard("{ArrowRight}");
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)?.dataset.open).toBe("true");
+
+ // arrow down moves focus down to first table (QUU)
+ await userEvent.keyboard("{ArrowDown}");
+ expect(item(QUU)).toHaveFocus();
+
+ // arrow down again to move to next table (QUX)
+ await userEvent.keyboard("{ArrowDown}");
+ expect(item(QUX)).toHaveFocus();
+
+ // arrow up returns to first table
+ await userEvent.keyboard("{ArrowUp}");
+ expect(item(QUU)).toHaveFocus();
+
+ // arrow up again moves to parent database
+ await userEvent.keyboard("{ArrowUp}");
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)).toHaveFocus();
+
+ // left arrow closes the node
+ await userEvent.keyboard("{ArrowLeft}");
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)?.dataset.open).toBe(undefined);
+
+ // space toggles the node
+ await userEvent.keyboard(" ");
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)?.dataset.open).toBe("true");
+
+ // space toggles the node
+ await userEvent.keyboard(" ");
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)?.dataset.open).toBe(undefined);
+
+ // enter selects the node
+ await userEvent.keyboard("{Enter}");
+ expect(onChange).toHaveBeenCalledWith({
+ databaseId: DATABASE_WITH_SINGLE_SCHEMA.id,
+ });
+ });
+ });
+
+ describe("Search view", () => {
+ it("should filter tables based on the search input", async () => {
+ setup();
+
+ await waitLoading();
+
+ // Initially no tables should be visible in search mode
+ expect(item(FOO_TABLE)).not.toBeInTheDocument();
+ expect(item(BAR_TABLE)).not.toBeInTheDocument();
+
+ await userEvent.type(searchInput(), "foo");
+ await waitLoading();
+
+ expect(item(FOO_TABLE)).toBeInTheDocument();
+ expect(item(BAR_TABLE)).not.toBeInTheDocument();
+ });
+
+ it("should render a message when no results are found", async () => {
+ setup();
+
+ await waitLoading();
+ await userEvent.type(searchInput(), "nonexistent");
+ await waitLoading();
+
+ expect(screen.getByText("No tables found")).toBeInTheDocument();
+ });
+
+ it("should clear search and return to tree view", async () => {
+ setup();
+
+ await waitLoading();
+
+ await userEvent.type(searchInput(), "foo");
+ await waitLoading();
+
+ expect(item(FOO_TABLE)).toBeInTheDocument();
+
+ await userEvent.clear(searchInput());
+ await waitLoading();
+
+ // Should return to tree view with databases
+ expect(item(DATABASE_WITH_MULTIPLE_SCHEMAS)).toBeInTheDocument();
+ expect(item(DATABASE_WITH_SINGLE_SCHEMA)).toBeInTheDocument();
+ });
+
+ it("should search case-insensitively", async () => {
+ setup();
+
+ await waitLoading();
+
+ // Search with uppercase
+ await userEvent.type(searchInput(), "BAR");
+ await waitLoading();
+
+ // Should find "Bar" table
+ expect(item(BAR_TABLE)).toBeInTheDocument();
+ expect(item(FOO_TABLE)).not.toBeInTheDocument();
+ });
+
+ it("should support partial matching", async () => {
+ setup();
+
+ await waitLoading();
+
+ // Search for partial string "oo" should match "Foo"
+ await userEvent.type(searchInput(), "oo");
+ await waitLoading();
+
+ expect(item(FOO_TABLE)).toBeInTheDocument();
+ expect(item(BAR_TABLE)).not.toBeInTheDocument();
+
+ // Clear and search for "ar" should match "Bar"
+ await userEvent.clear(searchInput());
+ await waitLoading();
+
+ await userEvent.type(searchInput(), "ar");
+ await waitLoading();
+
+ expect(item(BAR_TABLE)).toBeInTheDocument();
+ expect(item(FOO_TABLE)).not.toBeInTheDocument();
+ });
+
+ it("should support wildcard search with *", async () => {
+ setup();
+
+ await waitLoading();
+
+ // Search with wildcard pattern
+ await userEvent.type(searchInput(), "Q*");
+ await waitLoading();
+
+ // Should match both QUU and QUX
+ expect(item(QUU)).toBeInTheDocument();
+ expect(item(QUX)).toBeInTheDocument();
+ expect(item(FOO_TABLE)).not.toBeInTheDocument();
+ expect(item(BAR_TABLE)).not.toBeInTheDocument();
+ });
+
+ it("should match tables from all databases in search", async () => {
+ setup();
+
+ await waitLoading();
+
+ // Search for a pattern that matches tables in different databases
+ await userEvent.type(searchInput(), "o");
+ await waitLoading();
+
+ // Should find FOO (from DATABASE_WITH_MULTIPLE_SCHEMAS)
+ // and CORGE, GLORP (from DATABASE_WITH_UNNAMED_SCHEMA)
+ expect(item(FOO_TABLE)).toBeInTheDocument();
+ expect(item(CORGE)).toBeInTheDocument();
+ expect(item(GLORP)).toBeInTheDocument();
+
+ // Should not find tables without "o"
+ expect(item(BAR_TABLE)).not.toBeInTheDocument();
+ expect(item(QUU)).not.toBeInTheDocument();
+ expect(item(QUX)).not.toBeInTheDocument();
+ expect(item(GRAULT)).not.toBeInTheDocument();
+ });
+ });
+});
+
+function searchInput() {
+ return screen.getByRole("textbox");
+}
+
+async function waitLoading() {
+ await waitFor(() => {
+ expect(screen.queryByTestId("loading-placeholder")).not.toBeInTheDocument();
+ });
+ await waitFor(() => {
+ expect(screen.queryByTestId("loading-placeholder")).not.toBeInTheDocument();
+ });
+}
+
+function item(input: string | { display_name?: string; name: string } | null) {
+ if (input === null) {
+ throw new Error("item() was called with null");
+ }
+
+ const name =
+ typeof input === "string" ? input : (input.display_name ?? input.name);
+ return (screen.queryByText(name)?.parentNode?.parentNode?.parentNode ??
+ null) as HTMLAnchorElement | null;
+}
+
+async function clickItem(
+ input: string | { display_name?: string; name: string } | null,
+) {
+ const node = item(input);
+ expect(node).toBeInTheDocument();
+ if (node) {
+ await userEvent.click(node);
+ }
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TableVisibilityToggle.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TableVisibilityToggle.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Tree.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Tree.tsx
new file mode 100644
index 00000000000..4686deb7587
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/Tree.tsx
@@ -0,0 +1,444 @@
+import { useEffect } from "react";
+import { t } from "ttag";
+
+import type { TableId } from "metabase-types/api";
+
+import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
+import {
+ type NodeSelection,
+ getSchemaChildrenTableIds,
+ getSchemaId,
+ getSchemaTableIds,
+ isItemSelected,
+ noManuallySelectedDatabaseChildrenTables,
+ noManuallySelectedSchemas,
+ noManuallySelectedTables,
+} from "../bulk-selection.utils";
+import { useExpandedState, useTableLoader } from "../hooks";
+import type {
+ ChangeOptions,
+ DatabaseNode,
+ ExpandedItem,
+ FlatItem,
+ SchemaItem,
+ SchemaNode,
+ TreeNode,
+ TreePath,
+} from "../types";
+import { isSchemaNode, isTableNode } from "../types";
+import { flatten } from "../utils";
+
+import { EmptyState } from "./EmptyState";
+import { TablePickerResults } from "./Results";
+
+interface Props {
+ path: TreePath;
+ onChange: (path: TreePath, options?: ChangeOptions) => void;
+ setOnUpdateCallback: (callback: (() => void) | null) => void;
+}
+
+export function Tree({ path, onChange, setOnUpdateCallback }: Props) {
+ const {
+ selectedTables,
+ setSelectedTables,
+ selectedSchemas,
+ setSelectedSchemas,
+ selectedDatabases,
+ setSelectedDatabases,
+ } = useSelection();
+ const { databaseId, schemaName } = path;
+ const { isExpanded, toggle } = useExpandedState(path);
+ const { tree, reload } = useTableLoader(path);
+
+ useEffect(() => {
+ setOnUpdateCallback(() => () => reload(path));
+ return () => setOnUpdateCallback(null);
+ }, [path, reload, setOnUpdateCallback]);
+
+ const items = flatten(tree, {
+ isExpanded,
+ addLoadingNodes: true,
+ canFlattenSingleSchema: true,
+ selection: {
+ tables: selectedTables,
+ schemas: selectedSchemas,
+ databases: selectedDatabases,
+ },
+ });
+
+ useEffect(() => {
+ const expandedDatabases = items.filter(
+ (item) =>
+ item.type === "database" &&
+ item.isExpanded &&
+ item.children.length === 0,
+ );
+
+ expandedDatabases.forEach((database) => {
+ const databaseId = database.value?.databaseId;
+ if (databaseId) {
+ reload({ databaseId });
+ }
+ });
+ }, [items, reload]);
+
+ useEffect(() => {
+ // Load tables when schemas are expanded
+ const expandedSchemas = items.filter(
+ (item) =>
+ item.type === "schema" && item.isExpanded && item.children.length === 0,
+ ) as SchemaItem[];
+
+ expandedSchemas.forEach((schema) => {
+ const { databaseId, schemaName } = schema.value ?? {};
+ if (databaseId && schemaName) {
+ reload({ databaseId, schemaName });
+ }
+ });
+ }, [items, reload]);
+
+ const isEmpty = items.length === 0;
+
+ useEffect(() => {
+ // When we detect only one database, we automatically select and expand it.
+ const databases = tree.children.filter(
+ (node) => (node as DatabaseNode).type === "database",
+ ) as DatabaseNode[];
+
+ if (databases.length !== 1) {
+ return;
+ }
+
+ const [database] = databases;
+
+ if (
+ !isExpanded({ databaseId: database.value.databaseId }) &&
+ databaseId == null
+ ) {
+ toggle(database.key, true);
+ onChange(database.value, { isAutomatic: true });
+ }
+ }, [databaseId, schemaName, tree, toggle, isExpanded, onChange]);
+
+ useEffect(() => {
+ // When we detect a database with just one schema, we automatically
+ // select and expand that schema.
+ const database = tree.children.find(
+ (node) =>
+ node.type === "database" && node.value.databaseId === databaseId,
+ );
+ if (
+ databaseId &&
+ isExpanded({ databaseId }) &&
+ database?.children.length === 1 &&
+ schemaName == null
+ ) {
+ const schema = database.children[0];
+ if (schema.type === "schema") {
+ toggle(schema.key, true);
+ onChange(schema.value, { isAutomatic: true });
+ }
+ }
+ }, [databaseId, schemaName, tree, toggle, isExpanded, onChange]);
+
+ useEffect(() => {
+ const expandedSelectedSchemaItems = items.filter(
+ (x) =>
+ x.type === "schema" &&
+ selectedSchemas.has(getSchemaId(x) ?? "") &&
+ x.children.length > 0,
+ );
+
+ expandedSelectedSchemaItems.forEach((x) => {
+ if (noManuallySelectedTables(x, items, selectedTables)) {
+ // when expanding a schema, let's select all the tables in that schema
+ const tableIds = getSchemaTableIds(x, items);
+ if (tableIds.length === 0) {
+ return;
+ }
+
+ setSelectedTables((prev) => {
+ const newSet = new Set(prev);
+ tableIds.forEach((x) => {
+ newSet.add(x);
+ });
+ return newSet;
+ });
+
+ setSelectedSchemas((prev) => {
+ const newSet = new Set(prev);
+ newSet.delete(getSchemaId(x) ?? "");
+ return newSet;
+ });
+ }
+ });
+ }, [
+ isExpanded,
+ selectedSchemas,
+ items,
+ selectedTables,
+ setSelectedTables,
+ setSelectedSchemas,
+ ]);
+
+ useEffect(() => {
+ const expandedSelectedDatabaseItems = items.filter(
+ (x) =>
+ x.type === "database" &&
+ selectedDatabases.has(x.value?.databaseId ?? -1) &&
+ x.children.length > 0,
+ ) as unknown as DatabaseNode[];
+
+ expandedSelectedDatabaseItems.forEach((x) => {
+ if (
+ noManuallySelectedSchemas(x, items, selectedSchemas) &&
+ noManuallySelectedDatabaseChildrenTables(
+ x as unknown as DatabaseNode,
+ selectedTables,
+ )
+ ) {
+ // single schema that's not rendered and it's not part of flattened list
+ if (x.children.length === 1) {
+ setSelectedTables((prev) => {
+ const newSet = new Set(prev);
+ x.children[0].children.forEach((y) => {
+ newSet.add(y.value?.tableId ?? -1);
+ });
+ return newSet;
+ });
+ } else {
+ // when expanding a db, let's select all the schemas in that db
+ const schemaIds = (x as unknown as DatabaseNode).children.map((y) =>
+ getSchemaId(y as unknown as FlatItem),
+ );
+
+ if (schemaIds.length === 0) {
+ return;
+ }
+
+ setSelectedSchemas((prev) => {
+ const newSet = new Set(prev);
+ schemaIds.forEach((z) => {
+ newSet.add(z ?? "");
+ });
+ return newSet;
+ });
+ }
+
+ setSelectedDatabases((prev) => {
+ const newSet = new Set(prev);
+ newSet.delete((x as unknown as DatabaseNode).value?.databaseId ?? -1);
+ return newSet;
+ });
+ }
+ });
+ }, [
+ isExpanded,
+ selectedDatabases,
+ items,
+ selectedSchemas,
+ selectedTables,
+ setSelectedDatabases,
+ setSelectedTables,
+ setSelectedSchemas,
+ ]);
+
+ if (isEmpty) {
+ return <EmptyState title={t`No data to show`} />;
+ }
+
+ function onItemToggle(item: FlatItem) {
+ const isSelected = isItemSelected(item as unknown as TreeNode, {
+ tables: selectedTables,
+ schemas: selectedSchemas,
+ databases: selectedDatabases,
+ });
+
+ if (item.type === "table") {
+ const tableId = item.value?.tableId ?? -1;
+ if (tableId === -1) {
+ return;
+ }
+ setSelectedTables((prev) => {
+ const newSet = new Set(prev);
+ isSelected === "yes" ? newSet.delete(tableId) : newSet.add(tableId);
+
+ // Navigate to the table when checking/unchecking in multi-select mode
+ // This keeps it active in the URL without expanding it
+ if (item.value) {
+ onChange(item.value);
+ }
+
+ return newSet;
+ });
+ }
+ if (item.type === "database") {
+ if (item.children.length > 0) {
+ const targetChecked = isSelected === "yes" ? "no" : "yes";
+
+ const { schemasSelection, tablesSelection, databasesSelection } =
+ markAllSchemas(item, targetChecked, {
+ tables: selectedTables,
+ schemas: selectedSchemas,
+ databases: selectedDatabases,
+ });
+ setSelectedSchemas(schemasSelection);
+ setSelectedTables(tablesSelection);
+ setSelectedDatabases(databasesSelection);
+ } else {
+ const databaseId = item.value?.databaseId;
+ if (databaseId) {
+ setSelectedDatabases((prev) => toggleInSet(prev, databaseId));
+ }
+ }
+ }
+ if (item.type === "schema" && item.isLoading === undefined) {
+ if (item.children.length > 0 && isSchemaNode(item)) {
+ if (isSelected === "yes") {
+ setSelectedTables((prev) => {
+ const tableIds = getSchemaChildrenTableIds(item);
+ const newSet = new Set(prev);
+ tableIds.forEach((x) => {
+ newSet.delete(x);
+ });
+ return newSet;
+ });
+ } else {
+ setSelectedTables((prev) => {
+ const tableIds = getSchemaChildrenTableIds(item);
+ const newSet = new Set(prev);
+ tableIds.forEach((x) => {
+ newSet.add(x);
+ });
+ return newSet;
+ });
+ }
+ } else {
+ setSelectedSchemas((prev) => {
+ const newSet = new Set(prev);
+ const schemaId = getSchemaId(item);
+ if (!schemaId) {
+ return newSet;
+ }
+ if (schemaId && newSet.has(schemaId)) {
+ newSet.delete(schemaId);
+ } else {
+ newSet.add(schemaId);
+ }
+ return newSet;
+ });
+ }
+ }
+ }
+
+ function onItemRangeSelect(rangeItems: FlatItem[], targetItem: FlatItem) {
+ const tableIds = rangeItems
+ .filter(
+ (rangeItem): rangeItem is ExpandedItem =>
+ rangeItem.isLoading === undefined,
+ )
+ .filter(isTableNode)
+ .map((rangeItem) =>
+ rangeItem.value?.tableId ? rangeItem.value.tableId : null,
+ )
+ .filter((tableId): tableId is TableId => tableId != null);
+
+ if (tableIds.length === 0) {
+ return;
+ }
+
+ setSelectedTables((prev) => {
+ const newSet = new Set(prev);
+ tableIds.forEach((tableId) => {
+ newSet.add(tableId);
+ });
+ return newSet;
+ });
+
+ if (targetItem.type === "table" && targetItem.value) {
+ onChange(targetItem.value);
+ }
+ }
+
+ return (
+ <TablePickerResults
+ items={items}
+ path={path}
+ toggle={toggle}
+ onItemClick={onChange}
+ onItemToggle={onItemToggle}
+ onRangeSelect={onItemRangeSelect}
+ />
+ );
+}
+
+function markAllSchemas(
+ item: FlatItem,
+ targetChecked: "yes" | "no",
+ selection: NodeSelection,
+) {
+ const schemasSelection = new Set(selection.schemas);
+ const tablesSelection = new Set(selection.tables);
+
+ if (item.type !== "database") {
+ return {
+ schemasSelection,
+ tablesSelection,
+ databasesSelection: selection.databases,
+ };
+ }
+
+ const schemas = item.children.filter(
+ (child): child is SchemaNode => child.type === "schema",
+ );
+ schemas.forEach((schema) => {
+ if (!isSchemaNode(schema)) {
+ return;
+ }
+ const schemaId = getSchemaId(schema);
+ if (!schemaId) {
+ return;
+ }
+ if (schema.children.length === 0) {
+ targetChecked === "yes"
+ ? schemasSelection.add(schemaId)
+ : schemasSelection.delete(schemaId);
+ } else {
+ markAllTables(schema, targetChecked, tablesSelection);
+ }
+ });
+
+ return {
+ schemasSelection,
+ tablesSelection,
+ databasesSelection: selection.databases,
+ };
+}
+
+function markAllTables(
+ schema: SchemaNode,
+ targetChecked: "yes" | "no",
+ tablesSelection: Set<TableId>,
+) {
+ const tables = getSchemaChildrenTableIds(schema);
+ tables.forEach((tableId) => {
+ if (tableId === -1) {
+ return;
+ }
+ targetChecked === "yes"
+ ? tablesSelection.add(tableId)
+ : tablesSelection.delete(tableId);
+ });
+
+ return tablesSelection;
+}
+
+function toggleInSet<T>(set: Set<T>, item: T) {
+ const newSet = new Set(set);
+ if (newSet.has(item)) {
+ newSet.delete(item);
+ } else {
+ newSet.add(item);
+ }
+ return newSet;
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/constants.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/constants.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/useExpandedState.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/useExpandedState.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/useSearch.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/useSearch.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
new file mode 100644
index 00000000000..3b48a6f23e5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
@@ -0,0 +1,212 @@
+import { useCallback, useRef, useState } from "react";
+import { useDeepCompareEffect, useLatest } from "react-use";
+import _ from "underscore";
+
+import {
+ useLazyListDatabaseSchemaTablesQuery,
+ useLazyListDatabaseSchemasQuery,
+ useLazyListDatabasesQuery,
+} from "metabase/api";
+import { isSyncCompleted } from "metabase/lib/syncing";
+import type { DatabaseId, SchemaName } from "metabase-types/api";
+
+import { UNNAMED_SCHEMA_NAME } from "../constants";
+import type {
+ DatabaseNode,
+ SchemaNode,
+ TableNode,
+ TreeNode,
+ TreePath,
+} from "../types";
+import { merge, node, rootNode, toKey } from "../utils";
+
+/**
+ * For the currently view path, fetches the database, schema and table (or any subset that applies to the path).
+ *
+ * This state is managed at the top-level so we can generate a flat list of all nodes in the tree,
+ * which makes virtualization possible.
+ *
+ * This also makes it easier to do state transformations which needs more information than is available
+ * locally at any node in the path.
+ *
+ * This works by fetching the data and then recursively merging the results into the tree of data that was already fetched.
+ */
+export function useTableLoader(path: TreePath) {
+ const [fetchDatabases, databases] = useLazyListDatabasesQuery();
+ const [fetchSchemas, schemas] = useLazyListDatabaseSchemasQuery();
+ const [fetchTables, tables] = useLazyListDatabaseSchemaTablesQuery();
+ const databasesRef = useLatest(databases);
+ const schemasRef = useLatest(schemas);
+ const tablesRef = useLatest(tables);
+
+ const [tree, setTree] = useState<TreeNode>(rootNode());
+
+ const getDatabases = useCallback(async () => {
+ const response = await fetchDatabases(
+ { include_editable_data_model: true },
+ true,
+ );
+ if (databasesRef.current.isError) {
+ // Do not refetch when this call failed previously.
+ // This is to prevent infinite data-loading loop as RTK query does not cache error responses.
+ return [];
+ }
+
+ return (
+ response.data?.data.map((database) =>
+ node<DatabaseNode>({
+ type: "database",
+ label: database.name,
+ value: { databaseId: database.id },
+ }),
+ ) ?? []
+ );
+ }, [fetchDatabases, databasesRef]);
+
+ const getTables = useCallback(
+ async (
+ databaseId: DatabaseId | undefined,
+ schemaName: SchemaName | undefined,
+ ) => {
+ if (databaseId === undefined || schemaName === undefined) {
+ return [];
+ }
+
+ const newArgs = {
+ id: databaseId,
+ schema: schemaName,
+ include_hidden: true,
+ include_editable_data_model: true,
+ };
+
+ if (
+ tablesRef.current.isError &&
+ _.isEqual(tablesRef.current.originalArgs, newArgs)
+ ) {
+ // Do not refetch when this call failed previously.
+ // This is to prevent infinite data-loading loop as RTK query does not cache error responses.
+ return [];
+ }
+
+ const response = await fetchTables(newArgs, true);
+
+ return (
+ response?.data?.map((table) =>
+ node<TableNode>({
+ type: "table",
+ label: table.display_name,
+ value: { databaseId, schemaName, tableId: table.id },
+ table,
+ disabled: !isSyncCompleted(table),
+ }),
+ ) ?? []
+ );
+ },
+ [fetchTables, tablesRef],
+ );
+
+ const getSchemas = useCallback(
+ async (databaseId: DatabaseId | undefined) => {
+ if (databaseId === undefined) {
+ return [];
+ }
+
+ const newArgs = {
+ id: databaseId,
+ include_hidden: true,
+ include_editable_data_model: true,
+ };
+
+ if (
+ schemasRef.current.isError &&
+ _.isEqual(schemasRef.current.originalArgs, newArgs)
+ ) {
+ // Do not refetch when this call failed previously.
+ // This is to prevent infinite data-loading loop as RTK query does not cache error responses.
+ return [];
+ }
+
+ const response = await fetchSchemas(newArgs, true);
+ return Promise.all(
+ response.data?.map(async (schemaName, _, schemas) => {
+ const schema = node<SchemaNode>({
+ type: "schema",
+ label: schemaName,
+ value: { databaseId, schemaName },
+ });
+
+ // If the schema is unnamed, or if it's the only schema in the database,
+ // fetch the tables immediately so we can render a flattened tree.
+ if (schemaName === UNNAMED_SCHEMA_NAME || schemas.length === 1) {
+ schema.children = await getTables(databaseId, schemaName);
+ }
+ return schema;
+ }) ?? [],
+ );
+ },
+ [fetchSchemas, getTables, schemasRef],
+ );
+
+ const pendingPathsRef = useRef(new Set<string>());
+
+ const load = useCallback(
+ async function (path: TreePath) {
+ const key = toKey({
+ databaseId: path.databaseId,
+ schemaName: path.schemaName,
+ tableId: path.tableId,
+ });
+
+ if (pendingPathsRef.current.has(key)) {
+ return;
+ }
+
+ pendingPathsRef.current.add(key);
+
+ const { databaseId, schemaName } = path;
+ const [databases, schemas, tables] = await Promise.all([
+ getDatabases(),
+ getSchemas(path.databaseId),
+ getTables(path.databaseId, path.schemaName),
+ ]);
+
+ const newTree: TreeNode = rootNode(
+ databases.map((database) => ({
+ ...database,
+ children:
+ database.value.databaseId !== databaseId
+ ? database.children
+ : schemas.map((schema) => ({
+ ...schema,
+ children:
+ schema.value.schemaName !== schemaName
+ ? schema.children
+ : tables,
+ })),
+ })),
+ );
+ try {
+ setTree((current) => {
+ const merged = merge(current, newTree);
+ return _.isEqual(current, merged) ? current : merged;
+ });
+ } finally {
+ pendingPathsRef.current.delete(key);
+ }
+ },
+ [getDatabases, getSchemas, getTables],
+ );
+
+ useDeepCompareEffect(() => {
+ load(path);
+ }, [
+ load,
+ path,
+ // When a table is modified, e.g. we change display_name with PUT /api/table/:id
+ // we need to manually call the lazy RTK hooks, so that the the updated table
+ // is refetched here. We detect this modification with tables.isFetching.
+ tables.isFetching,
+ ]);
+
+ return { tree, reload: load };
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/types.ts
new file mode 100644
index 00000000000..ef9d39b5b59
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/types.ts
@@ -0,0 +1,135 @@
+import type {
+ DatabaseId,
+ SchemaName,
+ Table,
+ TableDataLayer,
+ TableDataSource,
+ TableId,
+ UserId,
+} from "metabase-types/api";
+
+export type NodeKey = string;
+
+export type TreePath = {
+ databaseId?: DatabaseId;
+ schemaName?: SchemaName;
+ tableId?: TableId;
+};
+
+export type TreeNode = RootNode | DatabaseNode | SchemaNode | TableNode;
+
+export type RootNode = {
+ type: "root";
+ key: string;
+ label: "";
+ value: Record<string, never>;
+ children: DatabaseNode[];
+};
+
+export type DatabaseNode = {
+ type: "database";
+ label: string;
+ key: NodeKey;
+ value: { databaseId: DatabaseId };
+ children: SchemaNode[];
+};
+
+export type SchemaNode = {
+ type: "schema";
+ label: string;
+ key: string;
+ value: { databaseId: DatabaseId; schemaName: SchemaName };
+ children: TableNode[];
+};
+
+export type TableNode = {
+ type: "table";
+ label: string;
+ key: string;
+ value: { databaseId: DatabaseId; schemaName: SchemaName; tableId: TableId };
+ children: [];
+ table?: Table;
+ disabled?: boolean;
+};
+
+export type DatabaseItem = Omit<DatabaseNode, "children">;
+export type SchemaItem = Omit<SchemaNode, "children">;
+export type TableItem = Omit<TableNode, "children">;
+
+export type Item = DatabaseItem | SchemaItem | TableItem;
+
+export type ItemType = Item["type"];
+
+export type FlatItem = LoadingItem | ExpandedItem;
+
+interface ExpandedItemBase {
+ isExpanded?: boolean;
+ isLoading?: false;
+ parent?: NodeKey;
+ level: number;
+ disabled?: boolean;
+ isSelected?: "yes" | "no" | "some";
+ children: TreeNode[];
+}
+
+export type ExpandedItem = Item & ExpandedItemBase;
+
+export type ExpandedSchemaItem = SchemaItem &
+ ExpandedItemBase & {
+ children: TableNode[];
+ };
+
+export type ExpandedTableItem = TableItem & ExpandedItemBase;
+
+type LoadingItem = {
+ isLoading: true;
+ type: ItemType;
+ key: string;
+ level: number;
+ isExpanded?: boolean;
+ value?: TreePath;
+ label?: string;
+ parent?: NodeKey;
+ table?: undefined;
+ disabled?: never;
+ children: [];
+};
+
+export type ExpandedState = {
+ [key: NodeKey]: boolean;
+};
+
+export interface ChangeOptions {
+ isAutomatic?: boolean;
+}
+
+export interface FilterState {
+ dataLayer: TableDataLayer | null;
+ dataSource: TableDataSource | "unknown" | null;
+ ownerEmail: string | null;
+ ownerUserId: UserId | "unknown" | null;
+ unusedOnly: boolean | null;
+}
+
+export function isExpandedItem(node: FlatItem): node is ExpandedItem {
+ return node.isLoading === undefined;
+}
+
+export function isSchemaNode(
+ node: ExpandedItem | TreeNode,
+): node is ExpandedSchemaItem {
+ return (
+ node.type === "schema" &&
+ node.children.every((child) => child.type === "table")
+ );
+}
+
+export function isTableNode(
+ node: ExpandedItem | TreeNode,
+): node is ExpandedTableItem {
+ return (
+ node.type === "table" ||
+ (node.type === "schema" &&
+ node.children.every((child) => child.type === "table"))
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/utils.ts
new file mode 100644
index 00000000000..ef382c0d174
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/utils.ts
@@ -0,0 +1,270 @@
+import * as Urls from "metabase/lib/urls";
+import { getUrl as getUrl_ } from "metabase/metadata/pages/shared/utils";
+import type { PublishModelsResponse } from "metabase-types/api";
+
+import { type NodeSelection, isItemSelected } from "./bulk-selection.utils";
+import { CHILD_TYPES, UNNAMED_SCHEMA_NAME } from "./constants";
+import type {
+ DatabaseNode,
+ ExpandedState,
+ FilterState,
+ FlatItem,
+ ItemType,
+ NodeKey,
+ RootNode,
+ TreeNode,
+ TreePath,
+} from "./types";
+
+export function hasChildren(type: ItemType): boolean {
+ return type !== "table";
+}
+
+export function getUrl(baseUrl: string, value: TreePath) {
+ return getUrl_(baseUrl, {
+ fieldId: undefined,
+ tableId: undefined,
+ databaseId: undefined,
+ schemaName: undefined,
+ ...value,
+ });
+}
+
+// Returns a new state object with all the nodes along the path expanded.
+// Note: This only expands parent containers (database, schema) but NOT tables,
+// to prevent unwanted expansion when navigating via checkbox selection.
+export function expandPath(
+ state: ExpandedState,
+ path: TreePath,
+): ExpandedState {
+ return {
+ ...state,
+ [toKey({
+ ...path,
+ tableId: undefined,
+ })]: true,
+ [toKey({
+ ...path,
+ tableId: undefined,
+ schemaName: undefined,
+ })]: true,
+ [toKey({
+ ...path,
+ tableId: undefined,
+ schemaName: undefined,
+ databaseId: undefined,
+ })]: true,
+ };
+}
+
+/**
+ * Convert a TreeNode into a flat list of items
+ * that can easily be rendered using virtualization.
+ *
+ * This does other things like removing nameless schemas
+ * from the tree and adding loading nodes.
+ */
+export function flatten(
+ node: TreeNode,
+ opts: {
+ addLoadingNodes?: boolean;
+ isExpanded?: (key: string) => boolean;
+ isSingleSchema?: boolean;
+ level?: number;
+ parent?: NodeKey;
+ canFlattenSingleSchema?: boolean;
+ selection?: NodeSelection;
+ } = {},
+): FlatItem[] {
+ const {
+ addLoadingNodes,
+ isExpanded,
+ isSingleSchema,
+ canFlattenSingleSchema,
+ level = 0,
+ parent,
+ selection,
+ } = opts;
+ if (node.type === "root") {
+ // root node doesn't render a title and is always expanded
+ if (addLoadingNodes && node.children.length === 0) {
+ return [
+ loadingItem("database", level),
+ loadingItem("database", level),
+ loadingItem("database", level),
+ ];
+ }
+ return sort(node.children).flatMap((child) => flatten(child, opts));
+ }
+
+ const isSelected = selection ? isItemSelected(node, selection) : "no";
+
+ if (
+ node.type === "schema" &&
+ (node.label === UNNAMED_SCHEMA_NAME ||
+ (isSingleSchema && canFlattenSingleSchema))
+ ) {
+ // Hide nameless schemas in the tree
+ return [
+ ...sort(node.children).flatMap((child) =>
+ flatten(child, {
+ ...opts,
+ level,
+ parent,
+ }),
+ ),
+ ];
+ }
+
+ if (typeof isExpanded === "function" && !isExpanded(node.key)) {
+ return [{ ...node, level, parent, isSelected }];
+ }
+
+ if (addLoadingNodes && node.children.length === 0) {
+ const childType = CHILD_TYPES[node.type];
+ if (!childType) {
+ return [{ ...node, level, parent, isSelected }];
+ }
+ return [
+ { ...node, isExpanded: true, level, parent, isSelected },
+ loadingItem(childType, level + 1, node),
+ ];
+ }
+
+ return [
+ { ...node, isExpanded: true, level, parent, isSelected },
+ ...sort(node.children).flatMap((child) =>
+ flatten(child, {
+ ...opts,
+ level: level + 1,
+ parent: node.key,
+ isSingleSchema: node.type === "database" && node.children.length === 1,
+ }),
+ ),
+ ];
+}
+
+export function sort(nodes: TreeNode[]): TreeNode[] {
+ return Array.from(nodes).sort((a, b) => {
+ return a.label.localeCompare(b.label);
+ });
+}
+
+/**
+ * Merge two TreeNodes together.
+ */
+export function merge(
+ a: TreeNode | undefined,
+ b: TreeNode | undefined,
+): TreeNode {
+ if (!a) {
+ if (!b) {
+ throw new Error("Both a and b are undefined");
+ }
+ return b;
+ }
+ if (!b) {
+ return a;
+ }
+
+ const len = Math.max(a.children.length, b.children.length);
+ const children = [];
+
+ for (let index = 0; index < len; index++) {
+ const aa = a.children?.[index];
+ const bb = b.children?.[index];
+ children.push(merge(aa, bb));
+ }
+
+ return {
+ ...a,
+ ...b,
+ // @ts-expect-error: we can't type the child node here correctly
+ // without checking all the combinations, just assume we are right.
+ children,
+ };
+}
+
+/**
+ * Create a unique key for a TreePath
+ */
+export function toKey({ databaseId, schemaName, tableId }: TreePath) {
+ return JSON.stringify([databaseId, schemaName, tableId]);
+}
+
+type Optional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+
+export function node<T extends TreeNode>(
+ x: Optional<T, "key" | "children">,
+): T {
+ return {
+ ...x,
+ key: toKey(x.value),
+ children: x.children ?? [],
+ } as T;
+}
+
+export function rootNode(children: DatabaseNode[] = []): RootNode {
+ return node<RootNode>({
+ type: "root",
+ label: "",
+ value: {},
+ children,
+ });
+}
+
+export function loadingItem(
+ type: ItemType,
+ level: number,
+ parent?: TreeNode,
+): FlatItem {
+ return {
+ type,
+ level,
+ value: parent?.type === "root" ? undefined : parent?.value,
+ parent: parent?.type === "root" ? undefined : parent?.key,
+ isLoading: true,
+ key: Math.random().toString(),
+ children: [],
+ };
+}
+
+export function getFiltersCount(filters: FilterState): number {
+ let count = 0;
+
+ if (filters.dataSource != null) {
+ ++count;
+ }
+
+ if (filters.dataLayer != null) {
+ ++count;
+ }
+
+ if (filters.ownerEmail != null || filters.ownerUserId != null) {
+ ++count;
+ }
+
+ if (filters.unusedOnly === true) {
+ ++count;
+ }
+
+ return count;
+}
+
+export function getPublishSeeItLink(response: PublishModelsResponse) {
+ if (response.target_collection?.type === "library-models") {
+ if (response.created_count === 1) {
+ return Urls.dataStudioModel(response.models[0].id);
+ } else {
+ return Urls.dataStudioCollection(
+ response.target_collection?.id ?? "root",
+ );
+ }
+ } else {
+ if (response.created_count === 1) {
+ return Urls.model(response.models[0]);
+ } else {
+ return Urls.collection(response.target_collection);
+ }
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/wrappers.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/wrappers.tsx
new file mode 100644
index 00000000000..99fe10a5fe2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/wrappers.tsx
@@ -0,0 +1,91 @@
+import { useCallback, useContext, useEffect, useState } from "react";
+import { push, replace } from "react-router-redux";
+
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import { DataModelContext } from "metabase/metadata/pages/shared/DataModelContext";
+import { getLocation } from "metabase/selectors/routing";
+
+import type { RouteParams } from "../../pages/DataModel/types";
+
+import { TablePicker } from "./components";
+import type { ChangeOptions, TreePath } from "./types";
+import { getUrl } from "./utils";
+
+type Props = TreePath & {
+ params: RouteParams;
+};
+
+export function RouterTablePicker({ params, ...props }: Props) {
+ const dispatch = useDispatch();
+ const [value, setValue] = useState(props);
+ const location = useSelector(getLocation);
+ const { baseUrl } = useContext(DataModelContext);
+ const isSegments = location.pathname?.startsWith(`${baseUrl}/segment`);
+ const {
+ databaseId: propDatabaseId,
+ schemaName: propSchemaName,
+ tableId: propTableId,
+ } = props;
+
+ const onChange = useCallback(
+ (value: TreePath, options?: ChangeOptions) => {
+ setValue(value);
+
+ // Update URL only when either opening a table or no table has been opened yet.
+ // We want to keep user looking at a table when navigating databases/schemas.
+ const canUpdateUrl = value.tableId != null || propTableId == null;
+
+ if (canUpdateUrl) {
+ if (options?.isAutomatic) {
+ // prevent auto-navigation from table-picker when Segments tab is open
+ if (!isSegments) {
+ dispatch(replace(getUrl(baseUrl, value)));
+ }
+ } else {
+ dispatch(push(getUrl(baseUrl, value)));
+ }
+ }
+ },
+ [dispatch, baseUrl, isSegments, propTableId],
+ );
+
+ useEffect(() => {
+ setValue((currentValue) => {
+ if (
+ currentValue.databaseId === propDatabaseId &&
+ currentValue.schemaName === propSchemaName &&
+ currentValue.tableId === propTableId
+ ) {
+ return currentValue;
+ }
+
+ return {
+ databaseId: propDatabaseId,
+ schemaName: propSchemaName,
+ tableId: propTableId,
+ };
+ });
+ }, [propDatabaseId, propSchemaName, propTableId]);
+
+ return <TablePicker path={value} onChange={onChange} params={params} />;
+}
+
+export function UncontrolledTablePicker({
+ initialValue,
+ onChange,
+ params,
+}: {
+ initialValue: TreePath;
+ onChange?: (path: TreePath) => void;
+ params: RouteParams;
+}) {
+ const [value, setValue] = useState(initialValue);
+ const handleChange = useCallback(
+ (value: TreePath) => {
+ onChange?.(value);
+ setValue(value);
+ },
+ [onChange],
+ );
+ return <TablePicker path={value} onChange={handleChange} params={params} />;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributes.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributes.module.css
new file mode 100644
index 00000000000..29814580b69
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributes.module.css
@@ -0,0 +1,20 @@
+.container {
+ display: grid;
+ grid-template-columns: auto minmax(min-content, 20rem);
+ grid-template-rows: 1fr;
+ gap: 1rem;
+ align-items: center;
+}
+
+.gridLabelInput {
+ display: grid;
+ justify-content: space-between;
+ align-items: center;
+ grid-template-columns: subgrid;
+ grid-column: 1 / 3;
+}
+
+.transformLink {
+ grid-column: 2 / 3;
+ margin-top: -8px;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx
new file mode 100644
index 00000000000..fb512ea9715
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx
@@ -0,0 +1,255 @@
+import { useDisclosure } from "@mantine/hooks";
+import { useEffect, useState } from "react";
+import { t } from "ttag";
+
+import {
+ DataSourceInput,
+ EntityTypeInput,
+ LayerInput,
+ UserInput,
+} from "metabase/metadata/components";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Box, Button, Group, Icon, Stack, Title } from "metabase/ui";
+import { useEditTablesMutation } from "metabase-enterprise/api";
+import type {
+ TableDataLayer,
+ TableDataSource,
+ UserId,
+} from "metabase-types/api";
+
+import { useSelection } from "../../pages/DataModel/contexts/SelectionContext";
+import { SyncOptionsModal } from "../SyncOptionsModal";
+import { PublishModelsModal } from "../TablePicker/components/PublishModelsModal";
+
+import S from "./TableAttributes.module.css";
+import { TableSectionGroup } from "./TableSectionGroup";
+
+export function TableAttributesEditBulk() {
+ const {
+ selectedTables,
+ selectedSchemas,
+ selectedDatabases,
+ selectedItemsCount,
+ } = useSelection();
+ const [isCreateModelsModalOpen, setIsCreateModelsModalOpen] = useState(false);
+ const { sendErrorToast, sendSuccessToast } = useMetadataToasts();
+ const [editTables] = useEditTablesMutation();
+ const [dataLayer, setDataLayer] = useState<TableDataLayer | null>(null);
+ const [dataSource, setDataSource] = useState<
+ TableDataSource | "unknown" | null
+ >(null);
+ const [email, setEmail] = useState<string | null>(null);
+ const [entityType, setEntityType] = useState<string | null>(null);
+ const [userId, setUserId] = useState<UserId | "unknown" | null>(null);
+ const [isSyncModalOpen, { close: closeSyncModal, open: openSyncModal }] =
+ useDisclosure();
+
+ const hasOnlyTablesSelected =
+ selectedTables.size > 0 &&
+ selectedSchemas.size === 0 &&
+ selectedDatabases.size === 0;
+
+ const handleSubmit = async ({
+ dataLayer,
+ dataSource,
+ email,
+ entityType,
+ userId,
+ }: {
+ dataLayer?: TableDataLayer | null;
+ dataSource?: TableDataSource | "unknown" | null;
+ email?: string | null;
+ entityType?: string | null;
+ userId?: UserId | "unknown" | null;
+ }) => {
+ const { error } = await editTables({
+ table_ids: Array.from(selectedTables),
+ schema_ids: Array.from(selectedSchemas),
+ database_ids: Array.from(selectedDatabases),
+ entity_type: entityType ?? undefined,
+ data_layer: dataLayer ?? undefined,
+ data_source: dataSource === "unknown" ? null : (dataSource ?? undefined),
+ owner_email:
+ userId === "unknown" || typeof userId === "number"
+ ? null
+ : (email ?? undefined),
+ owner_user_id: userId === "unknown" ? null : (userId ?? undefined),
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update items`);
+ } else {
+ sendSuccessToast(t`Items updated`);
+ }
+
+ if (dataLayer) {
+ setDataLayer(dataLayer);
+ }
+ if (dataSource) {
+ setDataSource(dataSource);
+ }
+ if (email) {
+ setEmail(email);
+ }
+ if (userId) {
+ setUserId(userId);
+ }
+ if (entityType) {
+ setEntityType(entityType);
+ }
+ };
+
+ useEffect(() => {
+ setDataLayer(null);
+ setDataSource(null);
+ setEmail(null);
+ setEntityType(null);
+ setUserId(null);
+ }, [selectedTables, selectedSchemas, selectedDatabases]);
+
+ return (
+ <>
+ <Stack gap="md">
+ <Group
+ align="center"
+ c="text-light"
+ gap={10}
+ flex="1"
+ fs="lg"
+ lh="normal"
+ wrap="nowrap"
+ px="lg"
+ pt="lg"
+ justify="space-between"
+ >
+ <Title
+ order={4}
+ c="text-dark"
+ style={{ display: "flex", alignItems: "center", gap: "0.5rem" }}
+ >
+ <Icon name="collection2" size={20} />
+ {hasOnlyTablesSelected
+ ? t`${selectedItemsCount} tables selected`
+ : t`Multiple tables selected`}
+ </Title>
+ </Group>
+
+ <Box px="lg">
+ <Group gap="sm">
+ <Box flex={1}>
+ <Button
+ leftSection={<Icon name="settings" />}
+ onClick={openSyncModal}
+ style={{
+ width: "100%",
+ }}
+ >
+ {t`Sync settings`}
+ </Button>
+ </Box>
+ <Box flex={1}>
+ <Button
+ onClick={() => setIsCreateModelsModalOpen(true)}
+ p="sm"
+ leftSection={<Icon name="add_folder" />}
+ style={{
+ width: "100%",
+ }}
+ >{t`Publish`}</Button>
+ </Box>
+ </Group>
+ </Box>
+
+ <Box px="lg">
+ <TableSectionGroup title={t`Attributes`}>
+ <Box className={S.container}>
+ <UserInput
+ email={email}
+ label={t`Owner`}
+ userId={userId}
+ onEmailChange={(newEmail) => {
+ handleSubmit({ email: newEmail });
+ }}
+ onUserIdChange={(newUserId) => {
+ handleSubmit({ userId: newUserId });
+ }}
+ className={S.gridLabelInput}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ />
+
+ <LayerInput
+ value={dataLayer}
+ onChange={(newDataLayer) =>
+ handleSubmit({ dataLayer: newDataLayer })
+ }
+ className={S.gridLabelInput}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ />
+
+ <EntityTypeInput
+ value={entityType}
+ onChange={(entityType) => handleSubmit({ entityType })}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ className={S.gridLabelInput}
+ />
+
+ <DataSourceInput
+ disabled={dataSource === "metabase-transform"}
+ value={dataSource}
+ onChange={(newDataSource) =>
+ handleSubmit({ dataSource: newDataSource })
+ }
+ className={S.gridLabelInput}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ />
+ </Box>
+ </TableSectionGroup>
+ </Box>
+ </Stack>
+
+ <PublishModelsModal
+ tables={selectedTables}
+ schemas={selectedSchemas}
+ databases={selectedDatabases}
+ isOpen={isCreateModelsModalOpen}
+ onClose={() => setIsCreateModelsModalOpen(false)}
+ />
+
+ <SyncOptionsModal
+ isOpen={isSyncModalOpen}
+ databaseIds={Array.from(selectedDatabases)}
+ schemaIds={Array.from(selectedSchemas)}
+ tableIds={Array.from(selectedTables)}
+ onClose={closeSyncModal}
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx
new file mode 100644
index 00000000000..89f8d855d05
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx
@@ -0,0 +1,116 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+import { useEffect, useState } from "react";
+
+import {
+ setupTableEndpoints,
+ setupUserKeyValueEndpoints,
+ setupUsersEndpoints,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import {
+ SelectionProvider,
+ useSelection,
+} from "metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext";
+import type { TableId } from "metabase-types/api";
+import { createMockTable, createMockUser } from "metabase-types/api/mocks";
+
+import { TableAttributesEditBulk } from "./TableAttributesEditBulk";
+
+// Component that allows controlling selection for testing
+function SelectionController({
+ initialTables,
+ onSelectionChange,
+}: {
+ initialTables: Set<TableId>;
+ onSelectionChange: () => void;
+}) {
+ const { setSelectedTables } = useSelection();
+
+ useEffect(() => {
+ // Set initial selection
+ setSelectedTables(initialTables);
+ }, [initialTables, setSelectedTables]);
+
+ return (
+ <button
+ data-testid="change-selection"
+ onClick={() => {
+ // Change selection to a different table
+ setSelectedTables(new Set([999]));
+ onSelectionChange();
+ }}
+ >
+ Change Selection
+ </button>
+ );
+}
+
+function TestWrapper({
+ initialTables = new Set([1]),
+}: {
+ initialTables?: Set<TableId>;
+}) {
+ const [_selectionChanged, setSelectionChanged] = useState(false);
+
+ return (
+ <SelectionProvider>
+ <TableAttributesEditBulk />
+ <SelectionController
+ initialTables={initialTables}
+ onSelectionChange={() => setSelectionChanged(true)}
+ />
+ </SelectionProvider>
+ );
+}
+
+function setup({
+ initialTables = new Set([1]),
+}: { initialTables?: Set<TableId> } = {}) {
+ setupUsersEndpoints([createMockUser()]);
+ setupUserKeyValueEndpoints({
+ namespace: "user_acknowledgement",
+ key: "seen-publish-models-info",
+ value: true,
+ });
+ setupTableEndpoints(createMockTable());
+
+ fetchMock.post("path:/api/ee/data-studio/table/edit", {
+ status: 200,
+ body: {
+ data: {
+ id: 1,
+ },
+ },
+ });
+
+ renderWithProviders(<TestWrapper initialTables={initialTables} />, {
+ withRouter: false,
+ });
+}
+
+describe("TableAttributesEditBulk", () => {
+ it("should reset form state when selection changes", async () => {
+ setup({ initialTables: new Set([1]) });
+ const userName = "Testy Tableton";
+
+ await waitFor(() => {
+ expect(screen.getByText(/tables selected/i)).toBeInTheDocument();
+ });
+
+ await userEvent.click(screen.getByRole("textbox", { name: "Owner" }));
+ await userEvent.click(screen.getByText(userName));
+ await waitFor(() => {
+ expect(screen.getByRole("textbox", { name: "Owner" })).toHaveValue(
+ userName,
+ );
+ });
+
+ const changeSelectionButton = screen.getByTestId("change-selection");
+ await userEvent.click(changeSelectionButton);
+
+ await waitFor(() => {
+ expect(screen.getByRole("textbox", { name: "Owner" })).toHaveValue("");
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditSingle.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditSingle.tsx
new file mode 100644
index 00000000000..2137e6cfe3d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditSingle.tsx
@@ -0,0 +1,259 @@
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import { useUpdateTableMutation } from "metabase/api";
+import * as Urls from "metabase/lib/urls";
+import {
+ DataSourceInput,
+ EntityTypeInput,
+ LayerInput,
+ UserInput,
+} from "metabase/metadata/components";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Box, Icon, Text } from "metabase/ui";
+import type {
+ Table,
+ TableDataLayer,
+ TableDataSource,
+ UserId,
+} from "metabase-types/api";
+
+import S from "./TableAttributes.module.css";
+import { TableSectionGroup } from "./TableSectionGroup";
+
+interface Props {
+ table: Table;
+}
+
+export function TableAttributesEditSingle({ table }: Props) {
+ const [updateTable] = useUpdateTableMutation();
+ const { sendErrorToast, sendSuccessToast, sendUndoToast } =
+ useMetadataToasts();
+ const handleOwnerEmailChange = async (email: string | null) => {
+ const { error } = await updateTable({
+ id: table.id,
+ owner_email: email,
+ owner_user_id: null,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update table owner`);
+ } else {
+ sendSuccessToast(t`Table owner updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ owner_email: table.owner_email,
+ owner_user_id: table.owner_user_id,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleOwnerUserIdChange = async (userId: UserId | "unknown" | null) => {
+ if (userId == null) {
+ return; // should never happen as the input is not clearable here
+ }
+
+ const { error } = await updateTable({
+ id: table.id,
+ owner_email: null,
+ owner_user_id: userId === "unknown" ? null : userId,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update table owner`);
+ } else {
+ sendSuccessToast(t`Table owner updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ owner_email: table.owner_email,
+ owner_user_id: table.owner_user_id,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleLayerChange = async (dataLayer: TableDataLayer | null) => {
+ if (dataLayer == null) {
+ return; // should never happen as the input is not clearable here
+ }
+
+ const { error } = await updateTable({
+ id: table.id,
+ data_layer: dataLayer,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update table layer`);
+ } else {
+ sendSuccessToast(t`Table layer updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ data_layer: table.data_layer,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleDataSourceChange = async (
+ dataSource: TableDataSource | "unknown" | null,
+ ) => {
+ if (dataSource == null) {
+ return; // should never happen as the input is not clearable here
+ }
+
+ const { error } = await updateTable({
+ id: table.id,
+ data_source: dataSource === "unknown" ? null : dataSource,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update table data source`);
+ } else {
+ sendSuccessToast(t`Table data source updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ data_source: table.data_source,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleEntityTypeChange = async (entityType: Table["entity_type"]) => {
+ const { error } = await updateTable({
+ id: table.id,
+ entity_type: entityType,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update entity type`);
+ } else {
+ sendSuccessToast(t`Entity type updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ entity_type: table.entity_type,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ return (
+ <TableSectionGroup title={t`Attributes`}>
+ <div className={S.container}>
+ <UserInput
+ email={table.owner_email}
+ label={t`Owner`}
+ userId={
+ !table.owner_email && !table.owner_user_id
+ ? "unknown"
+ : table.owner_user_id
+ }
+ onEmailChange={handleOwnerEmailChange}
+ onUserIdChange={handleOwnerUserIdChange}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ className={S.gridLabelInput}
+ />
+
+ <LayerInput
+ value={table.data_layer ?? "copper"}
+ onChange={handleLayerChange}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ className={S.gridLabelInput}
+ />
+
+ <EntityTypeInput
+ value={table.entity_type ?? "entity/GenericTable"}
+ onChange={handleEntityTypeChange}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ className={S.gridLabelInput}
+ />
+
+ <DataSourceInput
+ disabled={table.data_source === "metabase-transform"}
+ value={table.data_source ?? "unknown"}
+ onChange={handleDataSourceChange}
+ styles={{
+ label: {
+ gridColumn: 1,
+ },
+ input: {
+ gridColumn: 2,
+ },
+ }}
+ className={S.gridLabelInput}
+ />
+
+ <TransformLink table={table} />
+ </div>
+ </TableSectionGroup>
+ );
+}
+function TransformLink({ table }: { table: Table }) {
+ const { transform } = table;
+ const shouldShowTransform =
+ transform !== undefined && table.data_source === "metabase-transform";
+
+ if (!shouldShowTransform) {
+ return null;
+ }
+
+ return (
+ <Box className={S.transformLink}>
+ <Box
+ component={Link}
+ to={Urls.transform(transform.id)}
+ py="xs"
+ px="sm"
+ style={{
+ borderRadius: 4,
+ display: "inline-flex",
+ alignItems: "center",
+ gap: 4,
+ cursor: "pointer",
+ textDecoration: "none",
+ backgroundColor: "var(--mb-color-bg-ocean-alpha-light)",
+ }}
+ c="brand"
+ >
+ <Icon name="insight" size={12} />
+ <Text
+ size="sm"
+ fw="bold"
+ c="brand"
+ style={{
+ fontSize: 12,
+ lineHeight: "16px",
+ }}
+ >
+ {transform.name}
+ </Text>
+ </Box>
+ </Box>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableFieldList/TableFieldList.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableFieldList/TableFieldList.tsx
new file mode 100644
index 00000000000..48565c81df6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableFieldList/TableFieldList.tsx
@@ -0,0 +1,80 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+import _ from "underscore";
+
+import { useUpdateFieldMutation } from "metabase/api";
+import { FieldList } from "metabase/metadata/components/FieldList";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import type { Field, FieldId, Table } from "metabase-types/api";
+
+interface Props {
+ table: Table;
+ getFieldHref: (fieldId: FieldId) => string;
+ activeFieldId?: FieldId;
+}
+
+export const TableFieldList = ({
+ table,
+ activeFieldId,
+ getFieldHref,
+}: Props) => {
+ const [updateField] = useUpdateFieldMutation();
+ const { sendErrorToast, sendSuccessToast, sendUndoToast } =
+ useMetadataToasts();
+
+ const fields = useMemo(() => {
+ return _.sortBy(table.fields ?? [], (item) => item.position);
+ }, [table.fields]);
+
+ const handleNameChange = async (field: Field, name: string) => {
+ const id = getRawTableFieldId(field);
+ const { error } = await updateField({ id, display_name: name });
+
+ if (error) {
+ sendErrorToast(t`Failed to update name of ${field.display_name}`);
+ } else {
+ sendSuccessToast(t`Name of ${field.display_name} updated`, async () => {
+ const { error } = await updateField({
+ id,
+ display_name: field.display_name,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleDescriptionChange = async (
+ field: Field,
+ description: string | null,
+ ) => {
+ const id = getRawTableFieldId(field);
+ const { error } = await updateField({ id, description });
+
+ if (error) {
+ sendErrorToast(t`Failed to update description of ${field.display_name}`);
+ } else {
+ sendSuccessToast(
+ t`Description of ${field.display_name} updated`,
+ async () => {
+ const { error } = await updateField({
+ id,
+ description: field.description ?? "",
+ });
+ sendUndoToast(error);
+ },
+ );
+ }
+ };
+
+ return (
+ <FieldList
+ fields={fields}
+ activeFieldKey={activeFieldId}
+ getFieldKey={getRawTableFieldId}
+ getFieldHref={(field) => getFieldHref(getRawTableFieldId(field))}
+ onNameChange={handleNameChange}
+ onDescriptionChange={handleDescriptionChange}
+ />
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableFieldList/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableFieldList/index.ts
new file mode 100644
index 00000000000..f4cc9b5b941
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableFieldList/index.ts
@@ -0,0 +1 @@
+export * from "./TableFieldList";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableMetadata.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableMetadata.tsx
new file mode 100644
index 00000000000..7bdf3920ade
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableMetadata.tsx
@@ -0,0 +1,106 @@
+import type { ReactNode } from "react";
+import { useId } from "react";
+import { t } from "ttag";
+
+import Link from "metabase/common/components/Link";
+import { useNumberFormatter } from "metabase/common/hooks/use-number-formatter";
+import { isNullOrUndefined } from "metabase/lib/types";
+import { dependencyGraph } from "metabase/lib/urls/dependencies";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { Group, Stack, Text } from "metabase/ui";
+import type { Table } from "metabase-types/api";
+
+interface Props {
+ table: Table;
+}
+
+export function TableMetadata({ table }: Props) {
+ const formattedDate = new Date(table.updated_at).toLocaleString();
+ const formatNumber = useNumberFormatter();
+ const isDependenciesEnabled = PLUGIN_DEPENDENCIES.isEnabled;
+
+ const { dependenciesCount, dependentsCount } =
+ PLUGIN_DEPENDENCIES.useGetDependenciesCount({
+ id: Number(table.id),
+ type: "table",
+ });
+
+ return (
+ <Stack gap="md">
+ <MetadataRow label={t`Name on disk`} value={table.name} />
+ <MetadataRow label={t`Last updated at`} value={formattedDate} />
+ <MetadataRow
+ label={t`View count`}
+ value={formatNumber(table.view_count)}
+ />
+ {!isNullOrUndefined(table.estimated_row_count) ? (
+ <MetadataRow
+ label={t`Est. row count`}
+ value={formatNumber(table.estimated_row_count)}
+ />
+ ) : null}
+ {isDependenciesEnabled && (
+ <>
+ <MetadataRow
+ label={t`Dependencies`}
+ value={
+ <DependencyLink tableId={Number(table.id)}>
+ {dependenciesCount}
+ </DependencyLink>
+ }
+ />
+ <MetadataRow
+ label={t`Dependents`}
+ value={
+ <DependencyLink tableId={Number(table.id)}>
+ {dependentsCount}
+ </DependencyLink>
+ }
+ />
+ </>
+ )}
+ </Stack>
+ );
+}
+
+function DependencyLink({
+ children,
+ tableId,
+}: {
+ children: ReactNode;
+ tableId: number;
+}) {
+ return (
+ <Link
+ to={dependencyGraph({
+ entry: { id: tableId, type: "table" },
+ })}
+ variant="brand"
+ style={{
+ fontWeight: "bold",
+ }}
+ >
+ {children}
+ </Link>
+ );
+}
+
+function MetadataRow({
+ label,
+ value,
+}: {
+ label: string;
+ value: string | number | null | undefined | ReactNode;
+}) {
+ const id = useId();
+ return (
+ <Group justify="space-between">
+ <Text size="md" c="text-primary" id={id}>
+ {label}
+ </Text>
+ <Text size="md" c="text-primary" aria-labelledby={id}>
+ {value}
+ </Text>
+ </Group>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableModels.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableModels.module.css
new file mode 100644
index 00000000000..0e9d60d92a2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableModels.module.css
@@ -0,0 +1,22 @@
+.modelItem {
+ padding: 8px;
+ border-radius: 8px;
+ transition: background-color 0.2s ease;
+ cursor: pointer;
+}
+
+.modelItem:hover {
+ background-color: var(--mb-color-bg-light);
+}
+
+.modelName {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.collectionName {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableModels.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableModels.tsx
new file mode 100644
index 00000000000..1088620721f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableModels.tsx
@@ -0,0 +1,57 @@
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import * as Urls from "metabase/lib/urls";
+import { Box, Group, Icon, Stack, Text } from "metabase/ui";
+import type { Table } from "metabase-types/api";
+
+import S from "./TableModels.module.css";
+import { TableSectionGroup } from "./TableSectionGroup";
+
+interface Props {
+ table: Table;
+}
+
+export function TableModels({ table }: Props) {
+ if (table.published_models == null || table.published_models.length === 0) {
+ return null;
+ }
+
+ return (
+ <Box px="lg">
+ <TableSectionGroup title={t`This table has been published as a model`}>
+ <Stack gap={8}>
+ {table.published_models.map((model) => {
+ return (
+ <Box
+ key={model.id}
+ className={S.modelItem}
+ component={Link}
+ to={Urls.dataStudioModel(model.id)}
+ >
+ <Group gap={8} wrap="nowrap" align="flex-start">
+ <Icon name="model" size={16} c="brand" />
+ <Stack gap={4} style={{ flex: 1, minWidth: 0 }}>
+ <Text fw="bold" size="md" lh="md" className={S.modelName}>
+ {model.name}
+ </Text>
+ {model.collection && (
+ <Text
+ c="text-medium"
+ size="xs"
+ lh="16px"
+ className={S.collectionName}
+ >
+ {model.collection.name}
+ </Text>
+ )}
+ </Stack>
+ </Group>
+ </Box>
+ );
+ })}
+ </Stack>
+ </TableSectionGroup>
+ </Box>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css
new file mode 100644
index 00000000000..31bf3150c4f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css
@@ -0,0 +1,10 @@
+.header {
+ z-index: 3;
+}
+
+.box {
+ border-radius: var(--mantine-radius-md);
+ padding: var(--mantine-spacing-md);
+ background-color: var(--mb-color-bg-white);
+ border: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx
new file mode 100644
index 00000000000..ef97057c0c5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -0,0 +1,339 @@
+import { memo, useContext, useState } from "react";
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import {
+ useUpdateTableFieldsOrderMutation,
+ useUpdateTableMutation,
+} from "metabase/api";
+import EmptyState from "metabase/common/components/EmptyState";
+import * as Urls from "metabase/lib/urls";
+import { dependencyGraph } from "metabase/lib/urls/dependencies";
+import {
+ FieldOrderPicker,
+ NameDescriptionInput,
+} from "metabase/metadata/components";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { DataModelContext } from "metabase/metadata/pages/shared/DataModelContext";
+import { ResponsiveButton } from "metabase/metadata/pages/shared/ResponsiveButton";
+import { getUrl } from "metabase/metadata/pages/shared/utils";
+import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import {
+ Box,
+ Button,
+ Group,
+ Icon,
+ Loader,
+ Stack,
+ Text,
+ Tooltip,
+} from "metabase/ui";
+import type { FieldId, Table, TableFieldOrder } from "metabase-types/api";
+
+import { PublishModelsModal } from "../TablePicker/components/PublishModelsModal";
+
+import { TableAttributesEditSingle } from "./TableAttributesEditSingle";
+import { TableFieldList } from "./TableFieldList";
+import { TableMetadata } from "./TableMetadata";
+import { TableModels } from "./TableModels";
+import S from "./TableSection.module.css";
+import { TableSectionGroup } from "./TableSectionGroup";
+import { TableSortableFieldList } from "./TableSortableFieldList";
+
+interface Props {
+ table: Table;
+ activeFieldId?: FieldId;
+ onSyncOptionsClick: () => void;
+}
+
+const TableSectionBase = ({
+ table,
+ activeFieldId,
+ onSyncOptionsClick,
+}: Props) => {
+ const [updateTable] = useUpdateTableMutation();
+ const [updateTableSorting, { isLoading: isUpdatingSorting }] =
+ useUpdateTableMutation();
+ const [updateTableFieldsOrder] = useUpdateTableFieldsOrderMutation();
+ const { sendErrorToast, sendSuccessToast, sendUndoToast } =
+ useMetadataToasts();
+ const { baseUrl } = useContext(DataModelContext);
+ const [isSorting, setIsSorting] = useState(false);
+ const hasFields = Boolean(table.fields && table.fields.length > 0);
+ const [isCreateModelsModalOpen, setIsCreateModelsModalOpen] = useState(false);
+
+ const getFieldHref = (fieldId: FieldId) => {
+ return getUrl(baseUrl, {
+ databaseId: table.db_id,
+ schemaName: table.schema,
+ tableId: table.id,
+ fieldId,
+ });
+ };
+
+ const handleNameChange = async (name: string) => {
+ const { error } = await updateTable({
+ id: table.id,
+ display_name: name,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update table name`);
+ } else {
+ sendSuccessToast(t`Table name updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ display_name: table.display_name,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleDescriptionChange = async (description: string) => {
+ const { error } = await updateTable({ id: table.id, description });
+
+ if (error) {
+ sendErrorToast(t`Failed to update table description`);
+ } else {
+ sendSuccessToast(t`Table description updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ description: table.description ?? "",
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleFieldOrderTypeChange = async (fieldOrder: TableFieldOrder) => {
+ const { error } = await updateTableSorting({
+ id: table.id,
+ field_order: fieldOrder,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update field order`);
+ } else {
+ sendSuccessToast(t`Field order updated`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ field_order: table.field_order,
+ });
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleCustomFieldOrderChange = async (fieldOrder: FieldId[]) => {
+ const { error } = await updateTableFieldsOrder({
+ id: table.id,
+ field_order: fieldOrder,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update field order`);
+ } else {
+ sendSuccessToast(t`Field order updated`, async () => {
+ const { error: fieldsOrderError } = await updateTableFieldsOrder({
+ id: table.id,
+ field_order: table.fields?.map(getRawTableFieldId) ?? [],
+ });
+
+ if (table.field_order !== "custom") {
+ const { error: tableError } = await updateTable({
+ id: table.id,
+ field_order: table.field_order,
+ });
+ sendUndoToast(fieldsOrderError ?? tableError);
+ } else {
+ sendUndoToast(fieldsOrderError);
+ }
+ });
+ }
+ };
+
+ return (
+ <Stack data-testid="table-section" gap="md" pb="xl">
+ <Box className={S.header} bg="accent-gray-light" px="lg" mt="lg">
+ <NameDescriptionInput
+ description={table.description ?? ""}
+ descriptionPlaceholder={t`Give this table a description`}
+ name={table.display_name}
+ nameIcon="table2"
+ nameMaxLength={254}
+ namePlaceholder={t`Give this table a name`}
+ onNameChange={handleNameChange}
+ onDescriptionChange={handleDescriptionChange}
+ />
+ </Box>
+
+ <Box px="lg">
+ <Group justify="stretch" gap="sm">
+ <Button
+ flex="1"
+ leftSection={<Icon name="settings" />}
+ onClick={onSyncOptionsClick}
+ style={{
+ width: "100%",
+ }}
+ >
+ {t`Sync settings`}
+ </Button>
+ <Button
+ flex="1"
+ onClick={() => setIsCreateModelsModalOpen(true)}
+ p="sm"
+ leftSection={<Icon name="add_folder" />}
+ style={{
+ width: "100%",
+ }}
+ >{t`Publish`}</Button>
+ <Tooltip label={t`Dependency graph`}>
+ <Box /* wrapping with a Box because Tooltip does not work for <Button component={Link} /> */
+ >
+ <Button
+ component={Link}
+ to={dependencyGraph({
+ entry: { id: Number(table.id), type: "table" },
+ })}
+ p="sm"
+ leftSection={<Icon name="network" />}
+ style={{
+ flexGrow: 0,
+ width: 40,
+ }}
+ aria-label={t`Dependency graph`}
+ />
+ </Box>
+ </Tooltip>
+ <Box style={{ flexGrow: 0, width: 40 }}>
+ <TableLink table={table} />
+ </Box>
+ </Group>
+ </Box>
+
+ <Box px="lg">
+ <TableAttributesEditSingle table={table} />
+ </Box>
+
+ <Box px="lg">
+ <TableSectionGroup title={t`Metadata`}>
+ <TableMetadata table={table} />
+ </TableSectionGroup>
+ </Box>
+
+ {table.published_models != null && table.published_models.length > 0 && (
+ <TableModels table={table} />
+ )}
+
+ <Box px="lg">
+ <Stack gap={12}>
+ <Group
+ align="center"
+ gap="md"
+ justify="space-between"
+ miw={0}
+ wrap="nowrap"
+ h={36}
+ >
+ <Text flex="0 0 auto" fw="bold">{t`Fields`}</Text>
+
+ <Group
+ flex="1"
+ gap="md"
+ justify="flex-end"
+ miw={0}
+ wrap="nowrap"
+ h="100%"
+ >
+ {isUpdatingSorting && (
+ <Loader data-testid="loading-indicator" size="xs" />
+ )}
+
+ {!isSorting && hasFields && (
+ <ResponsiveButton
+ icon="sort_arrows"
+ showLabel
+ onClick={() => setIsSorting(true)}
+ >{t`Sorting`}</ResponsiveButton>
+ )}
+
+ {isSorting && (
+ <FieldOrderPicker
+ value={table.field_order}
+ onChange={handleFieldOrderTypeChange}
+ />
+ )}
+
+ {isSorting && (
+ <ResponsiveButton
+ icon="check"
+ showLabel
+ onClick={() => setIsSorting(false)}
+ >{t`Done`}</ResponsiveButton>
+ )}
+ </Group>
+ </Group>
+
+ {!hasFields && <EmptyState message={t`This table has no fields`} />}
+
+ {hasFields && (
+ <>
+ {isSorting && (
+ <TableSortableFieldList
+ activeFieldId={activeFieldId}
+ table={table}
+ onChange={handleCustomFieldOrderChange}
+ />
+ )}
+
+ {!isSorting && (
+ <TableFieldList
+ table={table}
+ activeFieldId={activeFieldId}
+ getFieldHref={getFieldHref}
+ />
+ )}
+ </>
+ )}
+ </Stack>
+ </Box>
+
+ <PublishModelsModal
+ tables={new Set([table.id])}
+ isOpen={isCreateModelsModalOpen}
+ onClose={() => setIsCreateModelsModalOpen(false)}
+ />
+ </Stack>
+ );
+};
+
+function TableLink({ table }: { table: Table }) {
+ const url =
+ Urls.modelToUrl({
+ id: Number(table.id),
+ name: table.name,
+ model: "table",
+ database: { id: table.db_id },
+ }) ?? "#";
+
+ return (
+ <Tooltip label={t`Go to this table`} position="top">
+ <Box>
+ {/* wrapping with a Box because Tooltip does not work for <Button component={Link} /> */}
+ <Button
+ component={Link}
+ to={url}
+ aria-label={t`Go to this table`}
+ leftSection={<Icon name="external" size={16} />}
+ style={{
+ width: "100%",
+ }}
+ />
+ </Box>
+ </Tooltip>
+ );
+}
+
+export const TableSection = memo(TableSectionBase);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx
new file mode 100644
index 00000000000..e2ce5c8c16a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx
@@ -0,0 +1,55 @@
+import { Route } from "react-router";
+
+import {
+ setupUserKeyValueEndpoints,
+ setupUsersEndpoints,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen } from "__support__/ui";
+import type { Table } from "metabase-types/api";
+import { createMockTable, createMockUser } from "metabase-types/api/mocks";
+
+import type { RouteParams } from "../../pages/DataModel/types";
+
+import { TableSection } from "./TableSection";
+
+type SetupOpts = {
+ table?: Table;
+ params?: RouteParams;
+};
+
+function setup({ table = createMockTable() }: SetupOpts = {}) {
+ const onSyncOptionsClick = jest.fn();
+
+ setupUsersEndpoints([createMockUser()]);
+ setupUserKeyValueEndpoints({
+ namespace: "user_acknowledgement",
+ key: "seen-publish-models-info",
+ value: true,
+ });
+
+ renderWithProviders(
+ <Route
+ path="/"
+ component={() => (
+ <TableSection table={table} onSyncOptionsClick={onSyncOptionsClick} />
+ )}
+ />,
+ { withRouter: true },
+ );
+
+ return { onSyncOptionsClick };
+}
+
+describe("TableSection", () => {
+ it("should render the link to explore this table in the query builder", () => {
+ const table = createMockTable();
+ setup({ table });
+
+ const tableLink = screen.getByLabelText("Go to this table");
+ expect(tableLink).toBeInTheDocument();
+ expect(tableLink).toHaveAttribute(
+ "href",
+ `/question#?db=${table.db_id}&table=${table.id}`,
+ );
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSectionGroup.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSectionGroup.tsx
new file mode 100644
index 00000000000..4f84e51292b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSectionGroup.tsx
@@ -0,0 +1,22 @@
+import { Stack, Title } from "metabase/ui";
+
+import S from "./TableSection.module.css";
+
+export function TableSectionGroup({
+ title,
+ children,
+}: {
+ title?: string;
+ children: React.ReactNode;
+}) {
+ return (
+ <Stack gap="md" className={S.box}>
+ {title && (
+ <Title order={4} fz="sm" c="text-secondary">
+ {title}
+ </Title>
+ )}
+ {children}
+ </Stack>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSortableFieldList/TableSortableFieldList.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSortableFieldList/TableSortableFieldList.tsx
new file mode 100644
index 00000000000..e13198e5703
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSortableFieldList/TableSortableFieldList.tsx
@@ -0,0 +1,29 @@
+import { useMemo } from "react";
+import _ from "underscore";
+
+import { SortableFieldList } from "metabase/metadata/components";
+import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import type { FieldId, Table } from "metabase-types/api";
+
+type TableSortableFieldListProps = {
+ table: Table;
+ activeFieldId?: FieldId;
+ onChange: (fieldOrder: FieldId[]) => void;
+};
+
+export function TableSortableFieldList({
+ table,
+ onChange,
+}: TableSortableFieldListProps) {
+ const fields = useMemo(() => {
+ return _.sortBy(table.fields ?? [], (item) => item.position);
+ }, [table.fields]);
+
+ return (
+ <SortableFieldList
+ fields={fields}
+ getFieldKey={getRawTableFieldId}
+ onChange={onChange}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSortableFieldList/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSortableFieldList/index.ts
new file mode 100644
index 00000000000..31aa17455b0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSortableFieldList/index.ts
@@ -0,0 +1 @@
+export * from "./TableSortableFieldList";
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/hooks.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/hooks.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/index.ts
new file mode 100644
index 00000000000..fdd6e055fa0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/index.ts
@@ -0,0 +1,9 @@
+export * from "metabase/metadata/pages/shared/FieldSection";
+export * from "metabase/metadata/pages/shared/FieldValuesModal";
+export * from "metabase/metadata/pages/shared/NoDatabasesEmptyState";
+export * from "metabase/metadata/pages/shared/PreviewSection";
+export * from "metabase/metadata/pages/shared/ResponsiveButton";
+export * from "metabase/metadata/pages/shared/SegmentsLink";
+export * from "./SyncOptionsModal";
+export * from "./TablePicker";
+export * from "./TableSection";
diff --git a/frontend/src/metabase/metadata/pages/DataModel/DataModel.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/DataModel.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx
new file mode 100644
index 00000000000..b92c253972b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -0,0 +1,292 @@
+import { useDisclosure, useWindowEvent } from "@mantine/hooks";
+import type { Location } from "history";
+import { type ReactNode, useMemo, useState } from "react";
+import { t } from "ttag";
+import _ from "underscore";
+
+import {
+ useGetTableQueryMetadataQuery,
+ useListDatabasesQuery,
+} from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import {
+ getTableMetadataQuery,
+ parseRouteParams,
+} from "metabase/metadata/pages/shared/utils";
+import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import { Box, Flex, Stack, rem } from "metabase/ui";
+
+import {
+ FieldSection,
+ FieldValuesModal,
+ NoDatabasesEmptyState,
+ PreviewSection,
+ type PreviewType,
+ RouterTablePicker,
+ SyncOptionsModal,
+ TableSection,
+} from "../../components";
+import { TableAttributesEditBulk } from "../../components/TableSection/TableAttributesEditBulk";
+
+import S from "./DataModel.module.css";
+import { COLUMN_CONFIG } from "./constants";
+import { SelectionProvider, useSelection } from "./contexts/SelectionContext";
+import type { RouteParams } from "./types";
+
+interface Props {
+ children?: ReactNode;
+ location: Location;
+ params: RouteParams;
+}
+
+export const DataModel = ({ children, location, params }: Props) => {
+ return (
+ <SelectionProvider>
+ <DataModelContent location={location} params={params}>
+ {children}
+ </DataModelContent>
+ </SelectionProvider>
+ );
+};
+
+function DataModelContent({ params }: Props) {
+ const {
+ hasSelectedItems,
+ hasOnlyOneTableSelected,
+ selectedTables,
+ hasSelectedMoreThanOneTable,
+ } = useSelection();
+ const {
+ databaseId,
+ fieldId,
+ schemaName,
+ tableId: queryTableId,
+ } = parseRouteParams(params);
+ const { data: databasesData, isLoading: isLoadingDatabases } =
+ useListDatabasesQuery({ include_editable_data_model: true });
+ const databaseExists = databasesData?.data?.some(
+ (database) => database.id === databaseId,
+ );
+ const [isPreviewOpen, { close: closePreview, toggle: togglePreview }] =
+ useDisclosure();
+ const [isSyncModalOpen, { close: closeSyncModal, open: openSyncModal }] =
+ useDisclosure();
+ const [
+ isFieldValuesModalOpen,
+ { close: closeFieldValuesModal, open: openFieldValuesModal },
+ ] = useDisclosure();
+ // Use the first selected table for fetching metadata when exactly one is selected
+ const metadataTableId = Array.from(selectedTables)[0] ?? queryTableId;
+ // But keep the URL tableId for navigation/path to avoid auto-expansion when selecting/deselecting
+ const navigationTableId = hasSelectedItems ? queryTableId : queryTableId;
+
+ const {
+ data: table,
+ error,
+ isLoading: isLoadingTables,
+ } = useGetTableQueryMetadataQuery(getTableMetadataQuery(metadataTableId));
+ const fieldsByName = useMemo(() => {
+ return _.indexBy(table?.fields ?? [], (field) => field.name);
+ }, [table]);
+ const field = table?.fields?.find((field) => field.id === fieldId);
+ const parentName = field?.nfc_path?.[0] ?? "";
+ const parentField = fieldsByName[parentName];
+ const [previewType, setPreviewType] = useState<PreviewType>("table");
+ const isLoading = isLoadingTables || isLoadingDatabases;
+
+ useWindowEvent(
+ "keydown",
+ (event) => {
+ const activeElement = document.activeElement;
+ const isInputFocused =
+ activeElement instanceof HTMLElement &&
+ (["INPUT", "TEXTAREA", "SELECT"].includes(activeElement.tagName) ||
+ activeElement.isContentEditable);
+ const isModalOpen = isSyncModalOpen || isFieldValuesModalOpen;
+
+ if (event.key === "Escape" && !isInputFocused && !isModalOpen) {
+ event.stopPropagation();
+ closePreview();
+ }
+ },
+ {
+ // otherwise modals get closed earlier and isModalOpen evaluates to false in the handler
+ capture: true,
+ },
+ );
+
+ if (databasesData?.data?.length === 0) {
+ return <NoDatabasesEmptyState />;
+ }
+
+ const isEmptyStateShown =
+ metadataTableId == null && fieldId == null && !hasSelectedItems;
+ const showFieldPreview =
+ !isEmptyStateShown && field && table && isPreviewOpen;
+
+ const showBulkTableEdit = hasSelectedItems && !hasOnlyOneTableSelected;
+ const showFieldDetails =
+ fieldId != null && !showBulkTableEdit && !isEmptyStateShown;
+ const showTableDetailsSection =
+ metadataTableId != null &&
+ !hasSelectedMoreThanOneTable &&
+ !showBulkTableEdit;
+
+ return (
+ <Flex
+ bg="accent-gray-light"
+ data-testid="data-model"
+ h="100%"
+ style={{ overflow: "auto" }}
+ >
+ <Stack
+ bg="bg-white"
+ className={S.column}
+ flex={COLUMN_CONFIG.nav.flex}
+ gap={0}
+ h="100%"
+ maw={COLUMN_CONFIG.nav.max}
+ miw={COLUMN_CONFIG.nav.min}
+ >
+ <RouterTablePicker
+ databaseId={databaseId}
+ schemaName={schemaName}
+ tableId={navigationTableId}
+ params={params}
+ />
+ </Stack>
+
+ <>
+ {databaseId != null &&
+ metadataTableId == null &&
+ databaseExists === false && (
+ <Stack
+ className={S.column}
+ h="100%"
+ justify="center"
+ miw={rem(400)}
+ p="xl"
+ >
+ <LoadingAndErrorWrapper error={t`Not found.`} />
+ </Stack>
+ )}
+
+ {showBulkTableEdit && (
+ <Stack
+ className={S.column}
+ flex={COLUMN_CONFIG.table.flex}
+ h="100%"
+ justify={error ? "center" : undefined}
+ maw={COLUMN_CONFIG.table.max}
+ miw={COLUMN_CONFIG.table.min}
+ >
+ <TableAttributesEditBulk />
+ </Stack>
+ )}
+
+ {showTableDetailsSection && (
+ <Stack
+ className={S.column}
+ flex={COLUMN_CONFIG.table.flex}
+ h="100%"
+ justify={error ? "center" : undefined}
+ maw={COLUMN_CONFIG.table.max}
+ miw={COLUMN_CONFIG.table.min}
+ >
+ <LoadingAndErrorWrapper error={error} loading={isLoading}>
+ {table && (
+ <TableSection
+ /**
+ * Make sure internal component state is reset when changing tables.
+ * This is to avoid state mix-up with optimistic updates.
+ */
+ key={table.id}
+ table={table}
+ activeFieldId={fieldId}
+ onSyncOptionsClick={openSyncModal}
+ />
+ )}
+ </LoadingAndErrorWrapper>
+ </Stack>
+ )}
+
+ {showFieldDetails && (
+ <Stack
+ bg="white"
+ className={S.column}
+ flex={COLUMN_CONFIG.field.flex}
+ h="100%"
+ justify={
+ (!isLoading && !error && !field) || error ? "center" : undefined
+ }
+ maw={COLUMN_CONFIG.field.max}
+ miw={COLUMN_CONFIG.field.min}
+ >
+ <LoadingAndErrorWrapper error={error} loading={isLoading}>
+ {field && table && databaseId != null && (
+ <Box flex="1" h="100%" maw={COLUMN_CONFIG.field.max}>
+ <FieldSection
+ databaseId={databaseId}
+ field={field}
+ /**
+ * Make sure internal component state is reset when changing fields.
+ * This is to avoid state mix-up with optimistic updates.
+ */
+ key={getRawTableFieldId(field)}
+ parent={parentField}
+ table={table}
+ onFieldValuesClick={openFieldValuesModal}
+ onPreviewClick={togglePreview}
+ />
+ </Box>
+ )}
+ </LoadingAndErrorWrapper>
+
+ {!isLoading && !error && !field && (
+ <LoadingAndErrorWrapper error={t`Not found.`} />
+ )}
+ </Stack>
+ )}
+
+ {showFieldPreview && databaseId != null && fieldId != null && (
+ <Box
+ bg="accent-gray-light"
+ flex={COLUMN_CONFIG.preview.flex}
+ h="100%"
+ p="lg"
+ maw={COLUMN_CONFIG.preview.max}
+ miw={COLUMN_CONFIG.preview.min}
+ >
+ <PreviewSection
+ className={S.preview}
+ databaseId={databaseId}
+ field={field}
+ fieldId={fieldId}
+ previewType={previewType}
+ table={table}
+ tableId={metadataTableId}
+ onClose={closePreview}
+ onPreviewTypeChange={setPreviewType}
+ />
+ </Box>
+ )}
+ </>
+
+ {table && (
+ <SyncOptionsModal
+ isOpen={isSyncModalOpen}
+ tableIds={[table.id]}
+ onClose={closeSyncModal}
+ />
+ )}
+
+ {fieldId && (
+ <FieldValuesModal
+ fieldId={fieldId}
+ isOpen={isFieldValuesModalOpen}
+ onClose={closeFieldValuesModal}
+ />
+ )}
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/DataModel.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
similarity index 92%
rename from frontend/src/metabase/metadata/pages/DataModel/DataModel.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
index f84afc07bff..3ccc292bf99 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/DataModel.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
@@ -7,10 +7,13 @@ import {
setupDatabaseIdFieldsEndpoints,
setupDatabasesEndpoints,
setupFieldsValuesEndpoints,
- setupSearchEndpoints,
setupTableEndpoints,
+ setupTableSearchEndpoint,
+ setupTablesBulkEndpoints,
setupUnauthorizedFieldEndpoint,
setupUnauthorizedFieldValuesEndpoints,
+ setupUserAcknowledgementEndpoints,
+ setupUsersEndpoints,
} from "__support__/server-mocks";
import {
mockGetBoundingClientRect,
@@ -20,8 +23,8 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { getNextId } from "__support__/utils";
import { checkNotNull } from "metabase/lib/types";
+import { getUrl } from "metabase/metadata/pages/shared/utils";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import registerVisualizations from "metabase/visualizations/register";
import type {
@@ -34,8 +37,8 @@ import {
createMockField,
createMockFieldDimension,
createMockFieldValues,
- createMockSearchResult,
createMockTable,
+ createMockUserListResult,
} from "metabase-types/api/mocks";
import {
SAMPLE_DB_FIELD_VALUES,
@@ -54,7 +57,6 @@ import {
import { DataModel } from "./DataModel";
import type { ParsedRouteParams } from "./types";
-import { getUrl } from "./utils";
registerVisualizations();
@@ -184,6 +186,8 @@ const OtherComponent = () => {
);
};
+const BASE_URL = "/admin/datamodel";
+
async function setup({
databases = [SAMPLE_DB],
fieldValues = SAMPLE_DB_FIELD_VALUES,
@@ -196,6 +200,12 @@ async function setup({
}: SetupOpts = {}) {
setupDatabasesEndpoints(databases, { hasSavedQuestions: false });
setupCardDataset();
+ setupTablesBulkEndpoints();
+ setupUsersEndpoints([createMockUserListResult()]);
+ setupUserAcknowledgementEndpoints({
+ key: "seen-publish-models-info",
+ value: false,
+ });
if (hasFieldValuesAccess) {
setupFieldsValuesEndpoints(fieldValues);
@@ -231,7 +241,7 @@ async function setup({
</>,
{
withRouter: true,
- initialRoute: initialRoute ?? getUrl(params),
+ initialRoute: initialRoute ?? getUrl(BASE_URL, params),
},
);
@@ -260,10 +270,9 @@ describe("DataModel", () => {
it("should show empty state by default", async () => {
await setup();
- expect(screen.getByRole("link", { name: /Segments/ })).toBeInTheDocument();
- expect(
- screen.getByText("Start by selecting data to model"),
- ).toBeInTheDocument();
+ expect(getTableSearchInput()).toBeInTheDocument();
+ expect(screen.queryByTestId("table-section")).not.toBeInTheDocument();
+ expect(screen.queryByTestId("field-section")).not.toBeInTheDocument();
});
describe("no schema database", () => {
@@ -294,16 +303,7 @@ describe("DataModel", () => {
it("should allow to search for a table", async () => {
await setup();
- setupSearchEndpoints([
- createMockSearchResult({
- id: getNextId(),
- model: "table",
- name: ORDERS_TABLE.display_name,
- table_name: ORDERS_TABLE.display_name,
- table_schema: "public",
- database_name: SAMPLE_DB.name,
- }),
- ]);
+ setupTableSearchEndpoint([ORDERS_TABLE]);
const searchValue = ORDERS_TABLE.name.substring(0, 3);
await userEvent.type(getTableSearchInput(), searchValue);
@@ -371,9 +371,7 @@ describe("DataModel", () => {
);
await waitForLoaderToBeRemoved();
- expect(
- await getHideTableButton(PRODUCTS_TABLE.display_name),
- ).toBeInTheDocument();
+ expect(getTableNameInput()).toHaveValue(PRODUCTS_TABLE.display_name);
});
it("should display hidden tables", async () => {
@@ -384,40 +382,25 @@ describe("DataModel", () => {
);
await waitForLoaderToBeRemoved();
- expect(
- await getUnhideTableButton(ORDERS_TABLE.display_name),
- ).toBeInTheDocument();
+ expect(getTableNameInput()).toHaveValue(ORDERS_TABLE.display_name);
});
it("clicking on tables with initial_sync_status='incomplete' should not navigate to the table", async () => {
await setup({ databases: [SAMPLE_DB_WITH_INITIAL_SYNC_INCOMPLETE] });
- expect(
- screen.getByText("Start by selecting data to model"),
- ).toBeInTheDocument();
+ expect(screen.queryByTestId("table-section")).not.toBeInTheDocument();
- expect(
- within(
- await findTablePickerTable(
- ORDERS_TABLE_INITIAL_SYNC_INCOMPLETE.display_name,
- ),
- ).queryByRole("button", {
- name: "Hide table",
- }),
- ).not.toBeInTheDocument();
+ const disabledTable = await findTablePickerTable(
+ ORDERS_TABLE_INITIAL_SYNC_INCOMPLETE.display_name,
+ );
+ expect(disabledTable).toHaveStyle({ pointerEvents: "none" });
// This click should not cause a change, as the table should be disabled
- await expect(
- userEvent.click(
- await findTablePickerTable(
- ORDERS_TABLE_INITIAL_SYNC_INCOMPLETE.display_name,
- ),
- ),
- ).rejects.toThrow(/pointer-events: none/);
+ await expect(userEvent.click(disabledTable)).rejects.toThrow(
+ /pointer-events: none/,
+ );
- expect(
- screen.getByText("Start by selecting data to model"),
- ).toBeInTheDocument();
+ expect(screen.queryByTestId("table-section")).not.toBeInTheDocument();
});
it("should display sort options", async () => {
@@ -697,17 +680,26 @@ describe("DataModel", () => {
);
await waitForLoaderToBeRemoved();
await userEvent.click(
- screen.getByRole("button", { name: /Sync options/ }),
+ screen.getByRole("button", { name: /Sync settings/ }),
);
await userEvent.click(
screen.getByRole("button", { name: "Re-scan table" }),
);
+ const calls = fetchMock.callHistory.calls(
+ "path:/api/ee/data-studio/table/rescan-values",
+ {
+ method: "POST",
+ },
+ );
+
await waitFor(() => {
- const path = `path:/api/table/${ORDERS_TABLE.id}/rescan_values`;
- expect(
- fetchMock.callHistory.called(path, { method: "POST" }),
- ).toBeTruthy();
+ expect(calls.length).toBeGreaterThan(0);
+ });
+
+ const lastCall = calls[calls.length - 1];
+ expect(JSON.parse(lastCall.options.body as string)).toEqual({
+ table_ids: [ORDERS_TABLE.id],
});
});
@@ -719,19 +711,27 @@ describe("DataModel", () => {
);
await waitForLoaderToBeRemoved();
await userEvent.click(
- screen.getByRole("button", { name: /Sync options/ }),
+ screen.getByRole("button", { name: /Sync settings/ }),
);
await userEvent.click(
screen.getByRole("button", {
name: "Discard cached field values",
}),
);
+ const calls = fetchMock.callHistory.calls(
+ "path:/api/ee/data-studio/table/discard-values",
+ {
+ method: "POST",
+ },
+ );
await waitFor(() => {
- const path = `path:/api/table/${ORDERS_TABLE.id}/discard_values`;
- expect(
- fetchMock.callHistory.called(path, { method: "POST" }),
- ).toBeTruthy();
+ expect(calls.length).toBeGreaterThan(0);
+ });
+
+ const lastCall = calls[calls.length - 1];
+ expect(JSON.parse(lastCall.options.body as string)).toEqual({
+ table_ids: [ORDERS_TABLE.id],
});
});
});
@@ -981,18 +981,6 @@ async function findTablePickerItem(
return items[0];
}
-async function getHideTableButton(name: string) {
- return within(await findTablePickerTable(name)).getByRole("button", {
- name: "Hide table",
- });
-}
-
-async function getUnhideTableButton(name: string) {
- return within(await findTablePickerTable(name)).getByRole("button", {
- name: "Unhide table",
- });
-}
-
/** table section helpers */
function getTableSection() {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts
new file mode 100644
index 00000000000..dd93ff6a484
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/constants.ts
@@ -0,0 +1,26 @@
+import type { Column, ColumnSizeConfig } from "./types";
+
+export const COLUMN_CONFIG: Record<Column, ColumnSizeConfig> = {
+ nav: {
+ flex: "6 1 0",
+ min: 600,
+ max: "100%",
+ },
+ table: {
+ flex: "4 1 0",
+ min: 400,
+ max: "100%",
+ },
+ field: {
+ flex: "4 1 0",
+ min: 400,
+ max: "100%",
+ },
+ preview: {
+ flex: "4 1 0",
+ min: 400,
+ max: "100%",
+ },
+};
+
+export const EMPTY_STATE_MIN_WIDTH = 400;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext.tsx
new file mode 100644
index 00000000000..ba8ec33ca6a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/contexts/SelectionContext.tsx
@@ -0,0 +1,86 @@
+import {
+ type Dispatch,
+ type ReactNode,
+ type SetStateAction,
+ createContext,
+ useContext,
+ useState,
+} from "react";
+
+import type { DatabaseId, TableId } from "metabase-types/api";
+
+interface SelectionContextValue {
+ selectedTables: Set<TableId>;
+ setSelectedTables: Dispatch<SetStateAction<Set<TableId>>>;
+ selectedSchemas: Set<string>;
+ setSelectedSchemas: Dispatch<SetStateAction<Set<string>>>;
+ selectedDatabases: Set<DatabaseId>;
+ setSelectedDatabases: Dispatch<SetStateAction<Set<DatabaseId>>>;
+ resetSelection: () => void;
+ hasSelectedItems: boolean;
+ selectedItemsCount: number;
+ hasOnlyOneTableSelected: boolean;
+ hasSelectedMoreThanOneTable: boolean;
+}
+
+const SelectionContext = createContext<SelectionContextValue | null>(null);
+
+export function SelectionProvider({ children }: { children: ReactNode }) {
+ const [selectedTables, setSelectedTables] = useState<Set<TableId>>(new Set());
+ const [selectedSchemas, setSelectedSchemas] = useState<Set<string>>(
+ new Set(),
+ );
+ const [selectedDatabases, setSelectedDatabases] = useState<Set<DatabaseId>>(
+ new Set(),
+ );
+
+ const resetSelection = () => {
+ setSelectedTables(new Set());
+ setSelectedSchemas(new Set());
+ setSelectedDatabases(new Set());
+ };
+
+ const hasSelectedItems =
+ selectedTables.size > 0 ||
+ selectedSchemas.size > 0 ||
+ selectedDatabases.size > 0;
+
+ const selectedItemsCount =
+ selectedTables.size + selectedSchemas.size + selectedDatabases.size;
+
+ const hasOnlyOneTableSelected =
+ selectedTables.size === 1 &&
+ selectedSchemas.size === 0 &&
+ selectedDatabases.size === 0;
+
+ const hasSelectedMoreThanOneTable =
+ selectedItemsCount > 1 && !hasOnlyOneTableSelected;
+
+ return (
+ <SelectionContext.Provider
+ value={{
+ selectedTables,
+ setSelectedTables,
+ selectedSchemas,
+ setSelectedSchemas,
+ selectedDatabases,
+ setSelectedDatabases,
+ resetSelection,
+ hasSelectedItems,
+ selectedItemsCount,
+ hasOnlyOneTableSelected,
+ hasSelectedMoreThanOneTable,
+ }}
+ >
+ {children}
+ </SelectionContext.Provider>
+ );
+}
+
+export function useSelection() {
+ const context = useContext(SelectionContext);
+ if (!context) {
+ throw new Error("useSelection must be used within a SelectionProvider");
+ }
+ return context;
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/types.ts
new file mode 100644
index 00000000000..194bf9fcb3e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/types.ts
@@ -0,0 +1,38 @@
+import type {
+ DatabaseId,
+ FieldId,
+ SchemaId,
+ SchemaName,
+ TableId,
+} from "metabase-types/api";
+
+export type RouteParams = {
+ databaseId?: string;
+ schemaId?: SchemaId;
+ tableId?: string;
+ fieldId?: string;
+};
+
+export type ParsedRouteParams = {
+ databaseId: DatabaseId | undefined;
+ schemaName: SchemaName | undefined;
+ tableId: TableId | undefined;
+ fieldId?: FieldId;
+};
+
+export type Column = "nav" | "table" | "field" | "preview";
+
+export interface ColumnSizeConfig {
+ flex: number | string;
+ min: number;
+ max: number | string;
+}
+
+export type MetadataEditAnalyticsDetail =
+ | "type_casting"
+ | "semantic_type_change"
+ | "visibility_change"
+ | "filtering_change"
+ | "display_values"
+ | "json_unfolding"
+ | "formatting";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/utils.unit.spec.ts
new file mode 100644
index 00000000000..f44e3136dbb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/utils.unit.spec.ts
@@ -0,0 +1,140 @@
+import { getUrl, parseRouteParams } from "metabase/metadata/pages/shared/utils";
+
+import type { ParsedRouteParams, RouteParams } from "./types";
+
+describe("parseRouteParams", () => {
+ it("should parse all route parameters correctly", () => {
+ const params: RouteParams = {
+ databaseId: "1",
+ schemaId: "1:public",
+ tableId: "2",
+ fieldId: "3",
+ };
+
+ expect(parseRouteParams(params)).toEqual({
+ databaseId: 1,
+ schemaName: "public",
+ tableId: 2,
+ fieldId: 3,
+ });
+ });
+
+ it("should handle missing parameters", () => {
+ const params: RouteParams = {
+ databaseId: "1",
+ schemaId: "1:public",
+ };
+
+ expect(parseRouteParams(params)).toEqual({
+ databaseId: 1,
+ schemaName: "public",
+ tableId: undefined,
+ fieldId: undefined,
+ });
+ });
+
+ it("should handle empty parameters", () => {
+ const params: RouteParams = {
+ databaseId: "",
+ schemaId: "",
+ tableId: "",
+ fieldId: "",
+ };
+
+ expect(parseRouteParams(params)).toEqual({
+ databaseId: undefined,
+ schemaName: "",
+ tableId: undefined,
+ fieldId: undefined,
+ });
+ });
+});
+
+const BASE_URL = "/admin/datamodel";
+
+describe("getUrl", () => {
+ it("should generate URL with all params", () => {
+ const params: ParsedRouteParams = {
+ databaseId: 1,
+ schemaName: "public",
+ tableId: 2,
+ fieldId: 3,
+ };
+
+ expect(getUrl(BASE_URL, params)).toBe(
+ `${BASE_URL}/database/1/schema/1:public/table/2/field/3`,
+ );
+ });
+
+ it("should generate URL with database, schema, and table", () => {
+ const params: ParsedRouteParams = {
+ databaseId: 1,
+ schemaName: "public",
+ tableId: 2,
+ fieldId: undefined,
+ };
+
+ expect(getUrl(BASE_URL, params)).toBe(
+ `${BASE_URL}/database/1/schema/1:public/table/2`,
+ );
+ });
+
+ it("should generate URL with database and schema", () => {
+ const params: ParsedRouteParams = {
+ databaseId: 1,
+ schemaName: "public",
+ tableId: undefined,
+ fieldId: undefined,
+ };
+
+ expect(getUrl(BASE_URL, params)).toBe(
+ `${BASE_URL}/database/1/schema/1:public`,
+ );
+ });
+
+ it("should generate URL with database", () => {
+ const params: ParsedRouteParams = {
+ databaseId: 1,
+ schemaName: undefined,
+ tableId: undefined,
+ fieldId: undefined,
+ };
+
+ expect(getUrl(BASE_URL, params)).toBe(`${BASE_URL}/database/1`);
+ });
+
+ it("should generate base URL when no params are provided", () => {
+ const params: ParsedRouteParams = {
+ databaseId: undefined,
+ schemaName: undefined,
+ tableId: undefined,
+ fieldId: undefined,
+ };
+
+ expect(getUrl(BASE_URL, params)).toBe(BASE_URL);
+ });
+
+ it("should not include field param when there is no table param", () => {
+ const params: ParsedRouteParams = {
+ databaseId: 1,
+ schemaName: "public",
+ tableId: undefined,
+ fieldId: 3,
+ };
+
+ expect(getUrl(BASE_URL, params)).toBe(
+ `${BASE_URL}/database/1/schema/1:public`,
+ );
+ });
+
+ it("should not include schema, table, and field params when there is no database param", () => {
+ const params: ParsedRouteParams = {
+ databaseId: undefined,
+ schemaName: "public",
+ tableId: 2,
+ fieldId: 3,
+ };
+
+ expect(getUrl(BASE_URL, params)).toBe(BASE_URL);
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx
new file mode 100644
index 00000000000..92d2bfdc23d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx
@@ -0,0 +1,51 @@
+import { IndexRoute, Redirect, Route } from "react-router";
+
+import RevisionHistoryApp from "metabase/admin/datamodel/containers/RevisionHistoryApp";
+import SegmentApp from "metabase/admin/datamodel/containers/SegmentApp";
+import SegmentListApp from "metabase/admin/datamodel/containers/SegmentListApp";
+
+import { DataModel } from "./pages/DataModel";
+
+export function getDataStudioMetadataRoutes() {
+ return (
+ <>
+ <IndexRoute component={DataModel} />
+ <Route path="database" component={DataModel} />
+ <Route path="database/:databaseId" component={DataModel} />
+ <Route
+ path="database/:databaseId/schema/:schemaId"
+ component={DataModel}
+ />
+ <Route
+ path="database/:databaseId/schema/:schemaId/table/:tableId"
+ component={DataModel}
+ />
+ <Route
+ path="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId"
+ component={DataModel}
+ />
+ <Redirect
+ from="database/:databaseId/schema/:schemaId/table/:tableId/settings"
+ to="database/:databaseId/schema/:schemaId/table/:tableId"
+ />
+ <Redirect
+ from="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId/:section"
+ to="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId"
+ />
+ <Route component={DataModel}>
+ <Route path="segments" component={SegmentListApp} />
+ <Route path="segment/create" component={SegmentApp} />
+ <Route path="segment/:id" component={SegmentApp} />
+ <Route path="segment/:id/revisions" component={RevisionHistoryApp} />
+ </Route>
+ <Redirect
+ from="database/:databaseId/schema/:schemaId/table/:tableId/settings"
+ to="database/:databaseId/schema/:schemaId/table/:tableId"
+ />
+ <Redirect
+ from="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId/:section"
+ to="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId"
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/utils.unit.spec.ts
new file mode 100644
index 00000000000..0995e95112b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/utils.unit.spec.ts
@@ -0,0 +1,54 @@
+import { createMockCard, createMockCollection } from "metabase-types/api/mocks";
+
+import { getPublishSeeItLink } from "./components/TablePicker/utils";
+
+const createMockPublishModelsResponse = ({
+ target_collection = createMockCollection({ type: "library-models" }),
+ models = [createMockCard({ type: "model" })],
+ created_count = 1,
+} = {}) => {
+ return { target_collection, models, created_count };
+};
+
+describe("getPublishSeeItLink", () => {
+ describe("published inside data studio", () => {
+ it("1 model created", () => {
+ const response = createMockPublishModelsResponse();
+ const link = getPublishSeeItLink(response);
+
+ expect(link).toContain(
+ `data-studio/modeling/models/${response.models[0].id}`,
+ );
+ });
+
+ it("> 1 model created", () => {
+ const response = createMockPublishModelsResponse({ created_count: 2 });
+ const link = getPublishSeeItLink(response);
+
+ expect(link).toContain(
+ `data-studio/modeling/collections/${response.target_collection.id}`,
+ );
+ });
+ });
+
+ describe("published outside data studio", () => {
+ it("1 model created", () => {
+ const response = createMockPublishModelsResponse({
+ target_collection: createMockCollection(),
+ });
+ const link = getPublishSeeItLink(response);
+
+ expect(link).toContain(`model/${response.models[0].id}`);
+ });
+
+ it("> 1 model created", () => {
+ const response = createMockPublishModelsResponse({
+ target_collection: createMockCollection(),
+ created_count: 2,
+ });
+ const link = getPublishSeeItLink(response);
+
+ expect(link).toContain(`collection/${response.target_collection.id}`);
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.module.css
new file mode 100644
index 00000000000..fba7270ccc6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.module.css
@@ -0,0 +1,4 @@
+.contentWrapper {
+ flex: 1;
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
new file mode 100644
index 00000000000..870145f6f56
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
@@ -0,0 +1,43 @@
+import { t } from "ttag";
+
+import {
+ useCreateGlossaryMutation,
+ useDeleteGlossaryMutation,
+ useListGlossaryQuery,
+ useUpdateGlossaryMutation,
+} from "metabase/api";
+import { GlossaryTable } from "metabase/reference/glossary/GlossaryTable";
+import { Box, Card, Group, Stack, Text } from "metabase/ui";
+
+import S from "./GlossaryPage.module.css";
+
+export function GlossaryPage() {
+ const { data: glossary = [] } = useListGlossaryQuery();
+ const [createGlossary] = useCreateGlossaryMutation();
+ const [updateGlossary] = useUpdateGlossaryMutation();
+ const [deleteGlossary] = useDeleteGlossaryMutation();
+
+ return (
+ <Stack w="100%" h="100%" p="xl" bg="background-light">
+ <Group align="center" wrap="nowrap" justify="space-between">
+ <Text fw="bold" fz="1.5rem">{t`Glossary`}</Text>
+ </Group>
+ <Box w="100%" className={S.contentWrapper}>
+ <Card px="lg" pb="sm" withBorder shadow="none">
+ <GlossaryTable
+ glossary={glossary}
+ onCreate={async (term, definition) => {
+ await createGlossary({ term, definition });
+ }}
+ onEdit={async (id, term, definition) => {
+ await updateGlossary({ id, term, definition });
+ }}
+ onDelete={async (id) => {
+ await deleteGlossary({ id });
+ }}
+ />
+ </Card>
+ </Box>
+ </Stack>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/index.ts
new file mode 100644
index 00000000000..35c698278cc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/pages/GlossaryPage/index.ts
@@ -0,0 +1 @@
+export { GlossaryPage } from "./GlossaryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/routes.tsx
new file mode 100644
index 00000000000..31df623391b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/glossary/routes.tsx
@@ -0,0 +1,7 @@
+import { Route } from "react-router";
+
+import { GlossaryPage } from "./pages/GlossaryPage";
+
+export function getDataStudioGlossaryRoutes() {
+ return <Route path="glossary" component={GlossaryPage} />;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts
new file mode 100644
index 00000000000..f3116f73b61
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts
@@ -0,0 +1,31 @@
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { NavbarLibrarySection } from "metabase-enterprise/data-studio/nav/components/NavbarLibrarySection";
+import { hasPremiumFeature } from "metabase-enterprise/settings";
+
+import { DataStudioToolbarButton } from "./query-builder/components/DataStudioToolbarButton";
+import { getDataStudioRoutes } from "./routes";
+import {
+ canAccessDataStudio,
+ canPlaceEntityInCollection,
+ canPlaceEntityInCollectionOrDescendants,
+ getLibraryCollectionType,
+ useGetLibraryChildCollectionByType,
+ useGetLibraryCollection,
+} from "./utils";
+
+export function initializePlugin() {
+ if (hasPremiumFeature("data_studio")) {
+ PLUGIN_DATA_STUDIO.isEnabled = true;
+ PLUGIN_DATA_STUDIO.canAccessDataStudio = canAccessDataStudio;
+ PLUGIN_DATA_STUDIO.getDataStudioRoutes = getDataStudioRoutes;
+ PLUGIN_DATA_STUDIO.DataStudioToolbarButton = DataStudioToolbarButton;
+ PLUGIN_DATA_STUDIO.NavbarLibrarySection = NavbarLibrarySection;
+ PLUGIN_DATA_STUDIO.getLibraryCollectionType = getLibraryCollectionType;
+ PLUGIN_DATA_STUDIO.canPlaceEntityInCollection = canPlaceEntityInCollection;
+ PLUGIN_DATA_STUDIO.canPlaceEntityInCollectionOrDescendants =
+ canPlaceEntityInCollectionOrDescendants;
+ PLUGIN_DATA_STUDIO.useGetLibraryCollection = useGetLibraryCollection;
+ PLUGIN_DATA_STUDIO.useGetLibraryChildCollectionByType =
+ useGetLibraryChildCollectionByType;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx
new file mode 100644
index 00000000000..f499ea8fff2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx
@@ -0,0 +1,144 @@
+import type { ReactNode } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useUpdateCardMutation } from "metabase/api";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { CardMoreMenu } from "metabase/questions/components/CardMoreMenu";
+import { getMetadata } from "metabase/selectors/metadata";
+import * as Lib from "metabase-lib";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type { Card } from "metabase-types/api";
+
+import {
+ PaneHeader,
+ PaneHeaderInput,
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+ PanelHeaderTitle,
+} from "../../../common/components/PaneHeader";
+import { NAME_MAX_LENGTH } from "../../constants";
+
+type MetricHeaderProps = {
+ card: Card;
+ actions?: ReactNode;
+};
+
+export function MetricHeader({ card, actions }: MetricHeaderProps) {
+ return (
+ <PaneHeader
+ data-testid="metric-header"
+ title={
+ card.can_write ? (
+ <MetricNameInput card={card} />
+ ) : (
+ <PanelHeaderTitle>{card.name}</PanelHeaderTitle>
+ )
+ }
+ icon="metric"
+ menu={<MetricMoreMenu card={card} />}
+ tabs={<MetricTabs card={card} />}
+ actions={actions}
+ />
+ );
+}
+
+type MetricNameInputProps = {
+ card: Card;
+ onChangeName?: (name: string) => void;
+};
+
+function MetricNameInput({ card }: MetricNameInputProps) {
+ const [updateCard] = useUpdateCardMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const handleChangeName = async (newName: string) => {
+ const { error } = await updateCard({
+ id: card.id,
+ name: newName,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update metric name`);
+ } else {
+ sendSuccessToast(t`Metric name updated`);
+ }
+ };
+
+ return (
+ <PaneHeaderInput
+ initialValue={card.name}
+ maxLength={NAME_MAX_LENGTH}
+ onChange={handleChangeName}
+ />
+ );
+}
+
+type MetricMoreMenuProps = {
+ card: Card;
+};
+
+function MetricMoreMenu({ card }: MetricMoreMenuProps) {
+ const dispatch = useDispatch();
+
+ const handleCopy = (newCard: Card) => {
+ dispatch(push(Urls.dataStudioMetric(newCard.id)));
+ };
+
+ const handleArchive = () => {
+ dispatch(push(Urls.dataStudioModeling()));
+ };
+
+ const handleUnarchive = () => {
+ dispatch(push(Urls.dataStudioMetric(card.id)));
+ };
+
+ return (
+ <CardMoreMenu
+ card={card}
+ onCopy={handleCopy}
+ onArchive={handleArchive}
+ onUnarchive={handleUnarchive}
+ />
+ );
+}
+
+type MetricTabsProps = {
+ card: Card;
+};
+
+function MetricTabs({ card }: MetricTabsProps) {
+ const metadata = useSelector(getMetadata);
+ const tabs = getTabs(card, metadata);
+ return <PaneHeaderTabs tabs={tabs} />;
+}
+
+function getTabs(card: Card, metadata: Metadata): PaneHeaderTab[] {
+ const tabs: PaneHeaderTab[] = [
+ {
+ label: t`Overview`,
+ to: Urls.dataStudioMetric(card.id),
+ },
+ ];
+
+ const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
+ const queryInfo = Lib.queryDisplayInfo(query);
+ if (queryInfo.isEditable) {
+ tabs.push({
+ label: t`Definition`,
+ to: Urls.dataStudioMetricQuery(card.id),
+ });
+ }
+
+ if (PLUGIN_DEPENDENCIES.isEnabled) {
+ tabs.push({
+ label: t`Dependencies`,
+ to: Urls.dataStudioMetricDependencies(card.id),
+ });
+ }
+
+ return tabs;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/index.ts
new file mode 100644
index 00000000000..624540c9496
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/index.ts
@@ -0,0 +1 @@
+export { MetricHeader } from "./MetricHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
new file mode 100644
index 00000000000..43b7f090779
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
@@ -0,0 +1,38 @@
+import { useMemo } from "react";
+
+import { QueryEditor } from "metabase/querying/editor/components/QueryEditor";
+import type { QueryEditorUiState } from "metabase/querying/editor/types";
+import type * as Lib from "metabase-lib";
+
+import { getEditorOptions } from "./utils";
+
+type MetricQueryEditorProps = {
+ query: Lib.Query;
+ uiState: QueryEditorUiState;
+ readOnly?: boolean;
+ onChangeQuery: (query: Lib.Query) => void;
+ onChangeUiState: (state: QueryEditorUiState) => void;
+};
+
+export function MetricQueryEditor({
+ query,
+ uiState,
+ readOnly = false,
+ onChangeQuery,
+ onChangeUiState,
+}: MetricQueryEditorProps) {
+ const uiOptions = useMemo(
+ () => getEditorOptions(query, readOnly),
+ [query, readOnly],
+ );
+
+ return (
+ <QueryEditor
+ query={query}
+ uiState={uiState}
+ uiOptions={uiOptions}
+ onChangeQuery={onChangeQuery}
+ onChangeUiState={onChangeUiState}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/index.ts
new file mode 100644
index 00000000000..2c7a4084e65
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/index.ts
@@ -0,0 +1 @@
+export { MetricQueryEditor } from "./MetricQueryEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/utils.ts
new file mode 100644
index 00000000000..847fa3cc1e2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricQueryEditor/utils.ts
@@ -0,0 +1,17 @@
+import type { QueryEditorUiOptions } from "metabase/querying/editor/types";
+import * as Lib from "metabase-lib";
+
+export function getEditorOptions(
+ query: Lib.Query,
+ readOnly: boolean,
+): QueryEditorUiOptions {
+ const { display, settings } = Lib.defaultDisplay(query);
+
+ return {
+ cardType: "metric",
+ cardDisplay: display,
+ cardVizSettings: settings,
+ readOnly,
+ canConvertToNative: false,
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/constants.ts
new file mode 100644
index 00000000000..9c12330ebda
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/constants.ts
@@ -0,0 +1 @@
+export const NAME_MAX_LENGTH = 254;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
new file mode 100644
index 00000000000..2e5c72ab397
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
@@ -0,0 +1,48 @@
+import type { ReactNode } from "react";
+
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { Center, Flex } from "metabase/ui";
+import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+
+import { MetricHeader } from "../../components/MetricHeader";
+
+type MetricDependenciesPageParams = {
+ cardId: string;
+};
+
+type MetricDependenciesPageProps = {
+ params: MetricDependenciesPageParams;
+ children?: ReactNode;
+};
+
+export function MetricDependenciesPage({
+ params,
+ children,
+}: MetricDependenciesPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <Flex direction="column" h="100%">
+ <MetricHeader card={card} />
+ <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider
+ value={{
+ baseUrl: Urls.dataStudioMetricDependencies(card.id),
+ defaultEntry: { id: card.id, type: "card" },
+ }}
+ >
+ {children}
+ </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/index.ts
new file mode 100644
index 00000000000..0b98948e2d0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricDependenciesPage/index.ts
@@ -0,0 +1 @@
+export { MetricDependenciesPage } from "./MetricDependenciesPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
new file mode 100644
index 00000000000..a499dbe00ed
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
@@ -0,0 +1,35 @@
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { Center, Flex } from "metabase/ui";
+import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+
+import { CardOverview } from "../../../common/components/CardOverview";
+import { MetricHeader } from "../../components/MetricHeader";
+
+type MetricOverviewPageParams = {
+ cardId: string;
+};
+
+type MetricOverviewPageProps = {
+ params: MetricOverviewPageParams;
+};
+
+export function MetricOverviewPage({ params }: MetricOverviewPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <Flex direction="column" h="100%" data-testid="metric-overview-page">
+ <MetricHeader card={card} />
+ <CardOverview card={card} />
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/index.ts
new file mode 100644
index 00000000000..efa7a38ef87
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/index.ts
@@ -0,0 +1 @@
+export { MetricOverviewPage } from "./MetricOverviewPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
new file mode 100644
index 00000000000..6ff5eedfcaa
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
@@ -0,0 +1,175 @@
+import { useLayoutEffect, useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { useLatest } from "react-use";
+import { t } from "ttag";
+
+import { useUpdateCardMutation } from "metabase/api";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Center, Stack } from "metabase/ui";
+import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
+import * as Lib from "metabase-lib";
+import Question from "metabase-lib/v1/Question";
+import type { Card } from "metabase-types/api";
+
+import { PaneHeaderActions } from "../../../common/components/PaneHeader";
+import { MetricHeader } from "../../components/MetricHeader";
+import { MetricQueryEditor } from "../../components/MetricQueryEditor";
+import { getValidationResult } from "../../utils";
+
+type MetricQueryPageParams = {
+ cardId: string;
+};
+
+type MetricQueryPageProps = {
+ params: MetricQueryPageParams;
+ route: Route;
+};
+
+export function MetricQueryPage({ params, route }: MetricQueryPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return <MetricQueryPageBody card={card} route={route} />;
+}
+
+type MetricQueryPageBodyProps = {
+ card: Card;
+ route: Route;
+};
+
+function MetricQueryPageBody({ card, route }: MetricQueryPageBodyProps) {
+ const metadata = useSelector(getMetadata);
+ const [datasetQuery, setDatasetQuery] = useState(card.dataset_query);
+ const [uiState, setUiState] = useState(getInitialUiState);
+ const [updateCard, { isLoading: isSaving }] = useUpdateCardMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const question = useMemo(() => {
+ return new Question(card, metadata).setDatasetQuery(datasetQuery);
+ }, [card, metadata, datasetQuery]);
+
+ const resultMetadata = useMemo(() => {
+ return getResultMetadata(
+ datasetQuery,
+ uiState.lastRunQuery,
+ uiState.lastRunResult,
+ );
+ }, [datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
+
+ const validationResult = useMemo(
+ () => getValidationResult(question.query()),
+ [question],
+ );
+
+ const isDirty = useMemo(() => {
+ return !Lib.areLegacyQueriesEqual(datasetQuery, card.dataset_query);
+ }, [datasetQuery, card.dataset_query]);
+
+ const {
+ checkData,
+ isCheckingDependencies,
+ isConfirmationShown,
+ handleInitialSave,
+ handleSaveAfterConfirmation,
+ handleCloseConfirmation,
+ } = PLUGIN_DEPENDENCIES.useCheckCardDependencies({
+ onSave: async (question) => {
+ const { display, settings } = Lib.defaultDisplay(question.query());
+ const { error } = await updateCard({
+ id: card.id,
+ dataset_query: question.datasetQuery(),
+ display,
+ visualization_settings: settings,
+ result_metadata: resultMetadata,
+ });
+ if (error) {
+ sendErrorToast(t`Failed to update metric query`);
+ } else {
+ sendSuccessToast(t`Metric query updated`);
+ }
+ },
+ });
+
+ const handleChangeQuery = (query: Lib.Query) => {
+ setDatasetQuery(Lib.toJsQuery(query));
+ };
+
+ const handleSave = () => {
+ handleInitialSave(question.setResultsMetadata({ columns: resultMetadata }));
+ };
+
+ const handleCancel = () => {
+ setDatasetQuery(card.dataset_query);
+ };
+
+ const handleResetRef = useLatest(() => {
+ setDatasetQuery(card.dataset_query);
+ setUiState(getInitialUiState());
+ });
+
+ useLayoutEffect(() => {
+ handleResetRef.current();
+ }, [card.id, handleResetRef]);
+
+ return (
+ <>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ data-testid="metric-query-editor"
+ gap={0}
+ >
+ <MetricHeader
+ card={card}
+ actions={
+ <PaneHeaderActions
+ errorMessage={validationResult.errorMessage}
+ isValid={validationResult.isValid}
+ isDirty={isDirty}
+ isSaving={isSaving || isCheckingDependencies}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ />
+ }
+ />
+ <MetricQueryEditor
+ query={question.query()}
+ uiState={uiState}
+ readOnly={!card.can_write}
+ onChangeQuery={handleChangeQuery}
+ onChangeUiState={setUiState}
+ />
+ </Stack>
+ {isConfirmationShown && checkData != null && (
+ <PLUGIN_DEPENDENCIES.CheckDependenciesModal
+ checkData={checkData}
+ opened
+ onSave={handleSaveAfterConfirmation}
+ onClose={handleCloseConfirmation}
+ />
+ )}
+ <LeaveRouteConfirmModal
+ route={route}
+ isEnabled={isDirty && !isSaving && !isCheckingDependencies}
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/index.ts
new file mode 100644
index 00000000000..b19f7fd954a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricQueryPage/index.ts
@@ -0,0 +1 @@
+export { MetricQueryPage } from "./MetricQueryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
new file mode 100644
index 00000000000..4755b5b6a09
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
@@ -0,0 +1,146 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+import * as Yup from "yup";
+
+import { useCreateCardMutation } from "metabase/api";
+import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";
+import {
+ Form,
+ FormErrorMessage,
+ FormProvider,
+ FormSubmitButton,
+ FormTextInput,
+ FormTextarea,
+} from "metabase/forms";
+import * as Errors from "metabase/lib/errors";
+import { Box, Button, Group, Modal, Stack } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { Card, CreateCardRequest } from "metabase-types/api";
+
+import type { NewMetricValues } from "../types";
+
+const NEW_METRIC_SCHEMA = Yup.object({
+ name: Yup.string().required(Errors.required),
+ description: Yup.string().nullable(),
+ collection_id: Yup.number().nullable().default(null),
+});
+
+type CreateMetricModalProps = {
+ query: Lib.Query;
+ defaultValues: Partial<NewMetricValues>;
+ onCreate: (card: Card) => void;
+ onClose: () => void;
+};
+
+export function CreateMetricModal({
+ query,
+ defaultValues,
+ onCreate,
+ onClose,
+}: CreateMetricModalProps) {
+ return (
+ <Modal title={t`Save your metric`} opened padding="xl" onClose={onClose}>
+ <CreateMetricForm
+ query={query}
+ defaultValues={defaultValues}
+ onCreate={onCreate}
+ onClose={onClose}
+ />
+ </Modal>
+ );
+}
+
+type CreateMetricFormProps = {
+ query: Lib.Query;
+ defaultValues: Partial<NewMetricValues>;
+ onCreate: (card: Card) => void;
+ onClose: () => void;
+};
+
+function CreateMetricForm({
+ query,
+ defaultValues,
+ onCreate,
+ onClose,
+}: CreateMetricFormProps) {
+ const [createCard] = useCreateCardMutation();
+
+ const initialValues: NewMetricValues = useMemo(
+ () => getInitialValues(defaultValues),
+ [defaultValues],
+ );
+
+ const handleSubmit = async (values: NewMetricValues) => {
+ const request = getCreateRequest(query, values);
+ const card = await createCard(request).unwrap();
+ onCreate(card);
+ };
+
+ return (
+ <FormProvider
+ initialValues={initialValues}
+ validationSchema={NEW_METRIC_SCHEMA}
+ onSubmit={handleSubmit}
+ >
+ <Form>
+ <Stack gap="lg">
+ <FormTextInput
+ name="name"
+ label={t`Name`}
+ placeholder={t`My Great Metric`}
+ data-autofocus
+ />
+ <FormTextarea
+ name="description"
+ label={t`Description`}
+ placeholder={t`This is optional, but helpful`}
+ minRows={4}
+ maxRows={10}
+ />
+ <FormCollectionPicker
+ name="collection_id"
+ title={t`Where do you want to save this?`}
+ entityType="metric"
+ />
+ <Group>
+ <Box flex={1}>
+ <FormErrorMessage />
+ </Box>
+ <Button variant="subtle" onClick={onClose}>{t`Back`}</Button>
+ <FormSubmitButton label={t`Save`} variant="filled" />
+ </Group>
+ </Stack>
+ </Form>
+ </FormProvider>
+ );
+}
+
+function getInitialValues(
+ defaultValues: Partial<NewMetricValues>,
+): NewMetricValues {
+ return {
+ name: "",
+ description: null,
+ collection_id: null,
+ result_metadata: null,
+ resultMetadata: null,
+ ...defaultValues,
+ };
+}
+
+function getCreateRequest(
+ query: Lib.Query,
+ { name, description, collection_id, result_metadata }: NewMetricValues,
+): CreateCardRequest {
+ const { display, settings = {} } = Lib.defaultDisplay(query);
+ return {
+ name,
+ description,
+ collection_id,
+ result_metadata,
+ type: "metric",
+ dataset_query: Lib.toJsQuery(query),
+ display,
+ visualization_settings: settings,
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
new file mode 100644
index 00000000000..6603fdec7a8
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
@@ -0,0 +1 @@
+export { CreateMetricModal } from "./CreateMetricModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx
new file mode 100644
index 00000000000..5edbfe6903c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -0,0 +1,140 @@
+import { useDisclosure } from "@mantine/hooks";
+import type { Location } from "history";
+import { useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useGetDefaultCollectionId } from "metabase/collections/hooks";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Stack } from "metabase/ui";
+import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
+import * as Lib from "metabase-lib";
+import type { Card } from "metabase-types/api";
+
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "../../../common/components/PaneHeader";
+import { MetricQueryEditor } from "../../components/MetricQueryEditor";
+import { NAME_MAX_LENGTH } from "../../constants";
+import { getValidationResult } from "../../utils";
+
+import { CreateMetricModal } from "./CreateMetricModal";
+import { getInitialQuery, getQuery } from "./utils";
+
+type NewMetricPageQuery = {
+ collectionId?: string;
+};
+
+type NewMetricPageProps = {
+ location: Location<NewMetricPageQuery>;
+ route: Route;
+};
+
+export function NewMetricPage({ location, route }: NewMetricPageProps) {
+ const metadata = useSelector(getMetadata);
+ const [name, setName] = useState("");
+ const [datasetQuery, setDatasetQuery] = useState(() =>
+ Lib.toJsQuery(getInitialQuery(metadata)),
+ );
+ const [uiState, setUiState] = useState(getInitialUiState);
+ const [isModalOpened, { open: openModal, close: closeModal }] =
+ useDisclosure();
+ const initialCollectionId = Urls.extractCollectionId(
+ location.query.collectionId,
+ );
+ const defaultCollectionId = useGetDefaultCollectionId();
+ const dispatch = useDispatch();
+
+ const query = useMemo(
+ () => getQuery(datasetQuery, metadata),
+ [datasetQuery, metadata],
+ );
+
+ const resultMetadata = useMemo(() => {
+ return getResultMetadata(
+ datasetQuery,
+ uiState.lastRunQuery,
+ uiState.lastRunResult,
+ );
+ }, [datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
+
+ const validationResult = useMemo(() => getValidationResult(query), [query]);
+
+ const defaultValues = useMemo(
+ () => ({
+ name,
+ result_metadata: resultMetadata,
+ collection_id: initialCollectionId ?? defaultCollectionId,
+ }),
+ [name, resultMetadata, initialCollectionId, defaultCollectionId],
+ );
+
+ const handleCreate = (card: Card) => {
+ dispatch(push(Urls.dataStudioMetric(card.id)));
+ };
+
+ const handleChangeQuery = (query: Lib.Query) => {
+ setDatasetQuery(Lib.toJsQuery(query));
+ };
+
+ const handleCancel = () => {
+ dispatch(push(Urls.dataStudioModeling()));
+ };
+
+ return (
+ <>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ data-testid="metric-query-editor"
+ gap={0}
+ >
+ <PaneHeader
+ title={
+ <PaneHeaderInput
+ initialValue={name}
+ placeholder={t`New metric`}
+ maxLength={NAME_MAX_LENGTH}
+ isOptional
+ onChange={setName}
+ />
+ }
+ icon="metric"
+ actions={
+ <PaneHeaderActions
+ errorMessage={validationResult.errorMessage}
+ isValid={validationResult.isValid}
+ isDirty
+ onSave={openModal}
+ onCancel={handleCancel}
+ />
+ }
+ />
+ <MetricQueryEditor
+ query={query}
+ uiState={uiState}
+ onChangeQuery={handleChangeQuery}
+ onChangeUiState={setUiState}
+ />
+ </Stack>
+ {isModalOpened && (
+ <CreateMetricModal
+ query={query}
+ defaultValues={defaultValues}
+ onCreate={handleCreate}
+ onClose={closeModal}
+ />
+ )}
+ <LeaveRouteConfirmModal route={route} isEnabled={!isModalOpened} />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/index.ts
new file mode 100644
index 00000000000..dbef0459061
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/index.ts
@@ -0,0 +1 @@
+export * from "./NewMetricPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/types.ts
new file mode 100644
index 00000000000..30c922d5367
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/types.ts
@@ -0,0 +1,9 @@
+import type { CollectionId, Field } from "metabase-types/api";
+
+export type NewMetricValues = {
+ name: string;
+ description: string | null;
+ resultMetadata: Field[] | null;
+ collection_id: CollectionId | null;
+ result_metadata: Field[] | null;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/utils.ts
new file mode 100644
index 00000000000..3ddb2db5489
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/NewMetricPage/utils.ts
@@ -0,0 +1,14 @@
+import Question from "metabase-lib/v1/Question";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type { DatasetQuery } from "metabase-types/api";
+
+export function getQuery(datasetQuery: DatasetQuery, metadata: Metadata) {
+ return Question.create({ dataset_query: datasetQuery, metadata }).query();
+}
+
+export function getInitialQuery(metadata: Metadata) {
+ return Question.create({
+ DEPRECATED_RAW_MBQL_type: "query",
+ metadata,
+ }).query();
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/routes.tsx
new file mode 100644
index 00000000000..b682a4bb5ab
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/routes.tsx
@@ -0,0 +1,23 @@
+import { IndexRoute, Route } from "react-router";
+
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+
+import { MetricDependenciesPage } from "./pages/MetricDependenciesPage";
+import { MetricOverviewPage } from "./pages/MetricOverviewPage";
+import { MetricQueryPage } from "./pages/MetricQueryPage";
+import { NewMetricPage } from "./pages/NewMetricPage";
+
+export function getDataStudioMetricRoutes() {
+ return (
+ <Route path="metrics">
+ <Route path="new" component={NewMetricPage} />
+ <Route path=":cardId" component={MetricOverviewPage} />
+ <Route path=":cardId/query" component={MetricQueryPage} />
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <Route path=":cardId/dependencies" component={MetricDependenciesPage}>
+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
+ </Route>
+ )}
+ </Route>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/utils.ts
new file mode 100644
index 00000000000..bb3ea43d94f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/utils.ts
@@ -0,0 +1,10 @@
+import * as Lib from "metabase-lib";
+
+export type ValidationResult = {
+ isValid: boolean;
+ errorMessage?: string;
+};
+
+export function getValidationResult(query: Lib.Query): ValidationResult {
+ return { isValid: Lib.canSave(query, "metric") };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx
new file mode 100644
index 00000000000..1b5c0962230
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx
@@ -0,0 +1,47 @@
+import { t } from "ttag";
+
+import EmptyStateCollection from "assets/img/empty-states/collection.svg";
+import EmptyState from "metabase/common/components/EmptyState";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { Center } from "metabase/ui";
+import type { Collection } from "metabase-types/api";
+
+type CollectionEmptyStateProps = {
+ collection: Collection;
+};
+
+export function CollectionEmptyState({
+ collection,
+}: CollectionEmptyStateProps) {
+ const { title, message } = getMessages(collection);
+
+ return (
+ <Center h="100%" bg="bg-light">
+ <EmptyState
+ illustrationElement={<img src={EmptyStateCollection} />}
+ title={title}
+ message={message}
+ />
+ </Center>
+ );
+}
+
+function getMessages(collection: Collection) {
+ switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection.type)) {
+ case "models":
+ return {
+ title: t`No models yet`,
+ message: t`Put models in the Library to see them here.`,
+ };
+ case "metrics":
+ return {
+ title: t`No metrics yet`,
+ message: t`Put metrics in the Library to see them here.`,
+ };
+ default:
+ return {
+ title: t`No models or metrics yet`,
+ message: t`Models and metrics in this collection will appear here.`,
+ };
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/index.ts
new file mode 100644
index 00000000000..eefde6fe4f2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/index.ts
@@ -0,0 +1 @@
+export * from "./CollectionEmptyState";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx
new file mode 100644
index 00000000000..458656061ce
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx
@@ -0,0 +1,97 @@
+import { useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { NameColumn } from "metabase/browse/components/BrowseTable.styled";
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import { SortableColumnHeader } from "metabase/common/components/ItemsTable/BaseItemsTable";
+import {
+ ColumnHeader,
+ TBody,
+ Table,
+ TableColumn,
+} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";
+import { Columns } from "metabase/common/components/ItemsTable/Columns";
+
+import { ItemRow } from "./ItemRow";
+import type { ModelingItem } from "./types";
+import { DEFAULT_SORTING_OPTIONS, sortItems } from "./utils";
+
+const CONTAINER_NAME = "ItemsTableContainer";
+const DOTMENU_WIDTH = 34;
+
+const sharedProps = {
+ containerName: CONTAINER_NAME,
+};
+
+const descriptionProps = {
+ ...sharedProps,
+};
+
+const menuProps = {
+ ...sharedProps,
+};
+
+interface CollectionItemsTableProps {
+ items: ModelingItem[];
+ skeleton?: boolean;
+}
+
+export function CollectionItemsTable({ items }: CollectionItemsTableProps) {
+ const [sortingOptions, setSortingOptions] = useState(DEFAULT_SORTING_OPTIONS);
+
+ const sortedItems = useMemo(
+ () => sortItems(items, sortingOptions),
+ [items, sortingOptions],
+ );
+
+ return (
+ <Table aria-label={t`Table of models and metrics`}>
+ <colgroup>
+ <NameColumn {...sharedProps} />
+ <TableColumn {...descriptionProps} width="60%" />
+ <TableColumn {...menuProps} width={DOTMENU_WIDTH} />
+ <Columns.RightEdge.Col />
+ </colgroup>
+ <thead>
+ <tr>
+ <SortableColumnHeader
+ name="name"
+ sortingOptions={sortingOptions}
+ onSortingOptionsChange={setSortingOptions}
+ {...sharedProps}
+ style={{ paddingInlineStart: ".625rem" }}
+ columnHeaderProps={{
+ style: { paddingInlineEnd: ".5rem" },
+ }}
+ >
+ {t`Name`}
+ </SortableColumnHeader>
+ <SortableColumnHeader
+ name="description"
+ sortingOptions={sortingOptions}
+ onSortingOptionsChange={setSortingOptions}
+ {...descriptionProps}
+ columnHeaderProps={{
+ style: {
+ paddingInline: ".5rem",
+ },
+ }}
+ >
+ <Ellipsified>{t`Description`}</Ellipsified>
+ </SortableColumnHeader>
+ <ColumnHeader
+ style={{
+ paddingInline: ".5rem",
+ }}
+ />
+ <Columns.RightEdge.Header />
+ </tr>
+ </thead>
+ <TBody>
+ {sortedItems.map((item) => (
+ <ItemRow item={item} key={`${item.model}-${item.id}`} />
+ ))}
+ </TBody>
+ </Table>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/DescriptionCell.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/DescriptionCell.tsx
new file mode 100644
index 00000000000..bf00f0bf38c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/DescriptionCell.tsx
@@ -0,0 +1,34 @@
+import { Cell } from "metabase/browse/components/BrowseTable.styled";
+import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";
+import { Skeleton } from "metabase/ui";
+
+import type { ModelingItem } from "../types";
+import { getItemDescription } from "../utils";
+
+interface DescriptionCellProps {
+ item?: ModelingItem;
+}
+
+const CONTAINER_NAME = "ItemsTableContainer";
+
+const descriptionProps = {
+ containerName: CONTAINER_NAME,
+};
+
+export function DescriptionCell({ item }: DescriptionCellProps) {
+ return (
+ <Cell {...descriptionProps}>
+ {item ? (
+ <MarkdownPreview
+ lineClamp={12}
+ allowedElements={["strong", "em"]}
+ oneLine
+ >
+ {getItemDescription(item) || ""}
+ </MarkdownPreview>
+ ) : (
+ <Skeleton natural h="16.8px" />
+ )}
+ </Cell>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/index.ts
new file mode 100644
index 00000000000..accba76d184
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/index.ts
@@ -0,0 +1 @@
+export * from "./DescriptionCell";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/ItemRow.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/ItemRow.tsx
new file mode 100644
index 00000000000..af38e21aa4d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/ItemRow.tsx
@@ -0,0 +1,61 @@
+import type { MouseEvent } from "react";
+import { useCallback } from "react";
+import { push } from "react-router-redux";
+
+import { TableRow } from "metabase/browse/components/BrowseTable.styled";
+import { Columns } from "metabase/common/components/ItemsTable/Columns";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+
+import { DescriptionCell } from "../DescriptionCell";
+import { MenuCell } from "../MenuCell";
+import { NameCell } from "../NameCell";
+import type { ModelingItem } from "../types";
+
+interface ItemRowProps {
+ item?: ModelingItem;
+}
+
+export function ItemRow({ item }: ItemRowProps) {
+ const dispatch = useDispatch();
+
+ const handleClick = useCallback(
+ (event: MouseEvent) => {
+ if (!item) {
+ return;
+ }
+
+ const selection = document.getSelection();
+ if (selection?.type === "Range") {
+ event.stopPropagation();
+ return;
+ }
+
+ const { id, model } = item;
+ const url =
+ model === "metric"
+ ? Urls.dataStudioMetric(id)
+ : Urls.dataStudioModel(id);
+ const subpathSafeUrl = Urls.getSubpathSafeUrl(url);
+
+ event.preventDefault();
+ event.stopPropagation();
+
+ if ((event.ctrlKey || event.metaKey) && event.button === 0) {
+ Urls.openInNewTab(subpathSafeUrl);
+ } else {
+ dispatch(push(url));
+ }
+ },
+ [item, dispatch],
+ );
+
+ return (
+ <TableRow onClick={handleClick}>
+ <NameCell item={item} />
+ <DescriptionCell item={item} />
+ <MenuCell item={item} />
+ <Columns.RightEdge.Cell />
+ </TableRow>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/index.ts
new file mode 100644
index 00000000000..e9c0ecf2c1b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/index.ts
@@ -0,0 +1 @@
+export * from "./ItemRow";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.module.css
new file mode 100644
index 00000000000..513848250dd
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.module.css
@@ -0,0 +1,3 @@
+.menuCell {
+ text-align: right;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx
new file mode 100644
index 00000000000..2d3c964ff6d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx
@@ -0,0 +1,67 @@
+import type { MouseEvent } from "react";
+import { useCallback } from "react";
+import { t } from "ttag";
+
+import { Cell } from "metabase/browse/components/BrowseTable.styled";
+import Questions from "metabase/entities/questions";
+import { useDispatch } from "metabase/lib/redux";
+import { Button, FixedSizeIcon, Menu } from "metabase/ui";
+
+import type { ModelingItem } from "../types";
+
+import S from "./MenuCell.module.css";
+
+interface MenuCellProps {
+ item?: ModelingItem;
+}
+
+function stopPropagation(event: MouseEvent) {
+ event.stopPropagation();
+}
+
+export function MenuCell({ item }: MenuCellProps) {
+ const dispatch = useDispatch();
+
+ const handleDelete = useCallback(() => {
+ if (!item) {
+ return;
+ }
+
+ dispatch(
+ Questions.actions.setArchived({ id: item.id, model: item.model }, true),
+ );
+ }, [item, dispatch]);
+
+ if (!item?.can_write) {
+ return <Cell />;
+ }
+
+ const deleteLabel =
+ item.model === "metric" ? t`Delete metric` : t`Delete model`;
+
+ return (
+ <Cell onClick={stopPropagation} className={S.menuCell}>
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Button
+ size="xs"
+ variant="subtle"
+ px="sm"
+ aria-label={deleteLabel}
+ c="text-dark"
+ >
+ <FixedSizeIcon name="ellipsis" />
+ </Button>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="trash" />}
+ onClick={handleDelete}
+ >
+ {t`Remove`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ </Cell>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/index.ts
new file mode 100644
index 00000000000..92626b58b71
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/index.ts
@@ -0,0 +1 @@
+export * from "./MenuCell";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.module.css
new file mode 100644
index 00000000000..887cacfd9df
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.module.css
@@ -0,0 +1,9 @@
+.nameLink {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+}
+
+.icon {
+ flex-shrink: 0;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.tsx
new file mode 100644
index 00000000000..c88aeae7be1
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.tsx
@@ -0,0 +1,78 @@
+import type { MouseEvent } from "react";
+
+import EntityItem from "metabase/common/components/EntityItem";
+import {
+ ItemNameCell,
+ MaybeItemLink,
+} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";
+import { entityForObject } from "metabase/lib/schema";
+import * as Urls from "metabase/lib/urls";
+import { FixedSizeIcon, type IconName, Skeleton } from "metabase/ui";
+
+import type { ItemIcon, ModelingItem } from "../types";
+
+import S from "./NameCell.module.css";
+
+interface NameCellProps {
+ item?: ModelingItem;
+}
+
+const CONTAINER_NAME = "ItemsTableContainer";
+
+const sharedProps = {
+ containerName: CONTAINER_NAME,
+};
+
+function preventDefault(event: MouseEvent) {
+ event.preventDefault();
+}
+
+function getItemIcon(item: ModelingItem): ItemIcon {
+ const entityIcon = entityForObject(item)?.objectSelectors?.getIcon?.(item) as
+ | ItemIcon
+ | undefined;
+
+ return entityIcon ?? { name: "folder" as IconName };
+}
+
+export function NameCell({ item }: NameCellProps) {
+ const headingId = item ? `${item.model}-${item.id}-heading` : "dummy-heading";
+
+ const icon = item ? getItemIcon(item) : { name: "folder" as IconName };
+
+ const itemUrl = item
+ ? item.model === "metric"
+ ? Urls.metric({ id: item.id, name: item.name, type: "metric" })
+ : Urls.dataStudioModel(item.id)
+ : undefined;
+
+ return (
+ <ItemNameCell
+ data-testid={`${item?.model || "item"}-name`}
+ aria-labelledby={headingId}
+ {...sharedProps}
+ >
+ <MaybeItemLink
+ to={itemUrl}
+ className={S.nameLink}
+ onClick={preventDefault}
+ >
+ <FixedSizeIcon
+ size={16}
+ {...icon}
+ c="icon-primary"
+ className={S.icon}
+ />
+ {item ? (
+ <EntityItem.Name
+ name={item.name || ""}
+ variant="list"
+ id={headingId}
+ />
+ ) : (
+ <Skeleton natural h="16.8px" />
+ )}
+ </MaybeItemLink>
+ </ItemNameCell>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/index.ts
new file mode 100644
index 00000000000..a3df8b11b65
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/index.ts
@@ -0,0 +1 @@
+export * from "./NameCell";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/index.ts
new file mode 100644
index 00000000000..e82c57d53ba
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/index.ts
@@ -0,0 +1,2 @@
+export * from "./CollectionItemsTable";
+export type { ModelingItem } from "./types";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/types.ts
new file mode 100644
index 00000000000..aa2bbf7455c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/types.ts
@@ -0,0 +1,13 @@
+import type { IconName } from "metabase/ui";
+import type { CollectionItem } from "metabase-types/api";
+
+export type ModelingItem = CollectionItem & {
+ model: "metric" | "model";
+};
+
+export type SortColumn = "name" | "description";
+
+export interface ItemIcon {
+ name: IconName;
+ color?: string;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/utils.ts
new file mode 100644
index 00000000000..6eac94ebf1a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/utils.ts
@@ -0,0 +1,31 @@
+import { t } from "ttag";
+
+import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
+
+import type { ModelingItem, SortColumn } from "./types";
+
+export const DEFAULT_SORTING_OPTIONS: SortingOptions<SortColumn> = {
+ sort_column: "name",
+ sort_direction: SortDirection.Asc,
+};
+
+export function getItemDescription(item: ModelingItem): string {
+ if (!item.description?.trim()) {
+ return item.model === "metric" ? t`A metric` : t`A model`;
+ }
+ return item.description;
+}
+
+export function sortItems(
+ items: ModelingItem[],
+ sortingOptions: SortingOptions<SortColumn>,
+): ModelingItem[] {
+ const { sort_column, sort_direction } = sortingOptions;
+
+ return [...items].sort((a, b) => {
+ const aValue = a[sort_column] ?? "";
+ const bValue = b[sort_column] ?? "";
+ const result = String(aValue).localeCompare(String(bValue));
+ return sort_direction === SortDirection.Asc ? result : -result;
+ });
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.module.css
new file mode 100644
index 00000000000..6c501d14c20
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.module.css
@@ -0,0 +1,3 @@
+.body {
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx
new file mode 100644
index 00000000000..759e31e3908
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx
@@ -0,0 +1,83 @@
+import { useMemo } from "react";
+
+import {
+ useGetCollectionQuery,
+ useListCollectionItemsQuery,
+} from "metabase/api/collection";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { Box, Center, Flex } from "metabase/ui";
+
+import {
+ PaneHeader,
+ PanelHeaderTitle,
+} from "../../../common/components/PaneHeader";
+
+import { CollectionEmptyState } from "./CollectionEmptyState";
+import {
+ CollectionItemsTable,
+ type ModelingItem,
+} from "./CollectionItemsTable";
+import S from "./CollectionPage.module.css";
+
+type CollectionPageParams = {
+ collectionId: string;
+};
+
+type CollectionPageProps = {
+ params: CollectionPageParams;
+};
+
+export function CollectionPage({ params }: CollectionPageProps) {
+ const {
+ data: collection,
+ isLoading: isLoadingCollection,
+ error: collectionError,
+ } = useGetCollectionQuery({
+ id: params.collectionId,
+ });
+ const {
+ data,
+ isLoading: isLoadingItems,
+ error: itemsError,
+ } = useListCollectionItemsQuery({
+ id: params.collectionId,
+ models: ["dataset", "metric"],
+ });
+ const isLoading = isLoadingCollection || isLoadingItems;
+ const error = collectionError ?? itemsError;
+
+ const items = useMemo(() => {
+ if (!data?.data) {
+ return [];
+ }
+ return data.data.filter(
+ (item): item is ModelingItem =>
+ item.model === "dataset" || item.model === "metric",
+ );
+ }, [data]);
+
+ if (isLoading || error != null || collection == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ const showEmptyState = items.length === 0;
+
+ return (
+ <Flex direction="column" h="100%" data-testid="collection-page">
+ <PaneHeader
+ title={<PanelHeaderTitle>{collection.name}</PanelHeaderTitle>}
+ />
+ <Box className={S.body} flex={1} p="lg" mih={0} bg="bg-light">
+ {showEmptyState ? (
+ <CollectionEmptyState collection={collection} />
+ ) : (
+ <CollectionItemsTable items={items} />
+ )}
+ </Box>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/index.ts
new file mode 100644
index 00000000000..c85f7eb9942
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/index.ts
@@ -0,0 +1 @@
+export { CollectionPage } from "./CollectionPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx
new file mode 100644
index 00000000000..352cff02f71
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx
@@ -0,0 +1,17 @@
+import { t } from "ttag";
+
+import EmptyDashboardBot from "assets/img/dashboard-empty.svg";
+import EmptyState from "metabase/common/components/EmptyState";
+import { Center } from "metabase/ui";
+
+export function ModelingEmptyPage() {
+ return (
+ <Center h="100%" bg="bg-light">
+ <EmptyState
+ illustrationElement={<img src={EmptyDashboardBot} />}
+ title={t`Pick a collection or create a new model or metric`}
+ message={t`Build your semantic layer with models and metrics.`}
+ />
+ </Center>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/index.ts
new file mode 100644
index 00000000000..2491855598f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/index.ts
@@ -0,0 +1 @@
+export * from "./ModelingEmptyPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/routes.tsx
new file mode 100644
index 00000000000..ec180fa467c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/routes.tsx
@@ -0,0 +1,13 @@
+import { IndexRoute, Route } from "react-router";
+
+import { CollectionPage } from "./pages/CollectionPage";
+import { ModelingEmptyPage } from "./pages/ModelingEmptyPage";
+
+export function getDataStudioModelingRoutes() {
+ return (
+ <>
+ <IndexRoute component={ModelingEmptyPage} />
+ <Route path="collections/:collectionId" component={CollectionPage} />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/ModelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/ModelHeader.tsx
new file mode 100644
index 00000000000..bdac4e9cf63
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/ModelHeader.tsx
@@ -0,0 +1,149 @@
+import type { ReactNode } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useUpdateCardMutation } from "metabase/api";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { CardMoreMenu } from "metabase/questions/components/CardMoreMenu";
+import { getMetadata } from "metabase/selectors/metadata";
+import * as Lib from "metabase-lib";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type { Card } from "metabase-types/api";
+
+import {
+ PaneHeader,
+ PaneHeaderInput,
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+ PanelHeaderTitle,
+} from "../../../common/components/PaneHeader";
+import { NAME_MAX_LENGTH } from "../../constants";
+
+type ModelHeaderProps = {
+ card: Card;
+ actions?: ReactNode;
+};
+
+export function ModelHeader({ card, actions }: ModelHeaderProps) {
+ return (
+ <PaneHeader
+ data-testid="model-header"
+ title={
+ card.can_write ? (
+ <ModelNameInput card={card} />
+ ) : (
+ <PanelHeaderTitle>{card.name}</PanelHeaderTitle>
+ )
+ }
+ icon="model"
+ menu={<ModelMoreMenu card={card} />}
+ tabs={<ModelTabs card={card} />}
+ actions={actions}
+ />
+ );
+}
+
+type ModelNameInputProps = {
+ card: Card;
+ onChangeName?: (name: string) => void;
+};
+
+function ModelNameInput({ card }: ModelNameInputProps) {
+ const [updateCard] = useUpdateCardMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const handleChangeName = async (newName: string) => {
+ const { error } = await updateCard({
+ id: card.id,
+ name: newName,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update model name`);
+ } else {
+ sendSuccessToast(t`Model name updated`);
+ }
+ };
+
+ return (
+ <PaneHeaderInput
+ initialValue={card.name}
+ maxLength={NAME_MAX_LENGTH}
+ onChange={handleChangeName}
+ />
+ );
+}
+
+type ModelMoreMenuProps = {
+ card: Card;
+};
+
+function ModelMoreMenu({ card }: ModelMoreMenuProps) {
+ const dispatch = useDispatch();
+
+ const handleCopy = (newCard: Card) => {
+ dispatch(push(Urls.dataStudioModel(newCard.id)));
+ };
+
+ const handleArchive = () => {
+ dispatch(push(Urls.dataStudioModeling()));
+ };
+
+ const handleUnarchive = () => {
+ dispatch(push(Urls.dataStudioModel(card.id)));
+ };
+
+ return (
+ <CardMoreMenu
+ card={card}
+ onCopy={handleCopy}
+ onArchive={handleArchive}
+ onUnarchive={handleUnarchive}
+ />
+ );
+}
+
+type ModelTabsProps = {
+ card: Card;
+};
+
+function ModelTabs({ card }: ModelTabsProps) {
+ const metadata = useSelector(getMetadata);
+ const tabs = getTabs(card, metadata);
+ return <PaneHeaderTabs tabs={tabs} />;
+}
+
+function getTabs(card: Card, metadata: Metadata): PaneHeaderTab[] {
+ const tabs: PaneHeaderTab[] = [
+ {
+ label: t`Overview`,
+ to: Urls.dataStudioModel(card.id),
+ },
+ ];
+
+ const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
+ const queryInfo = Lib.queryDisplayInfo(query);
+ if (queryInfo.isEditable) {
+ tabs.push({
+ label: t`Definition`,
+ to: Urls.dataStudioModelQuery(card.id),
+ });
+ }
+
+ tabs.push({
+ label: t`Fields`,
+ to: Urls.dataStudioModelFields(card.id),
+ });
+
+ if (PLUGIN_DEPENDENCIES.isEnabled) {
+ tabs.push({
+ label: t`Dependencies`,
+ to: Urls.dataStudioModelDependencies(card.id),
+ });
+ }
+
+ return tabs;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/index.ts
new file mode 100644
index 00000000000..7384e56e46e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/index.ts
@@ -0,0 +1 @@
+export * from "./ModelHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/ModelQueryEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/ModelQueryEditor.tsx
new file mode 100644
index 00000000000..417ff5779a3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/ModelQueryEditor.tsx
@@ -0,0 +1,35 @@
+import { useMemo } from "react";
+
+import { QueryEditor } from "metabase/querying/editor/components/QueryEditor";
+import type { QueryEditorUiState } from "metabase/querying/editor/types";
+import type * as Lib from "metabase-lib";
+
+import { getEditorOptions } from "./utils";
+
+type ModelEditorProps = {
+ query: Lib.Query;
+ uiState: QueryEditorUiState;
+ readOnly?: boolean;
+ onChangeQuery: (newQuery: Lib.Query) => void;
+ onChangeUiState: (newUiState: QueryEditorUiState) => void;
+};
+
+export function ModelQueryEditor({
+ query,
+ uiState,
+ readOnly = false,
+ onChangeQuery,
+ onChangeUiState,
+}: ModelEditorProps) {
+ const uiOptions = useMemo(() => getEditorOptions(readOnly), [readOnly]);
+
+ return (
+ <QueryEditor
+ query={query}
+ uiState={uiState}
+ uiOptions={uiOptions}
+ onChangeQuery={onChangeQuery}
+ onChangeUiState={onChangeUiState}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/index.ts
new file mode 100644
index 00000000000..b47e412f949
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/index.ts
@@ -0,0 +1 @@
+export * from "./ModelQueryEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/utils.ts
new file mode 100644
index 00000000000..8f19e854d36
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/utils.ts
@@ -0,0 +1,13 @@
+import { t } from "ttag";
+
+import type { QueryEditorUiOptions } from "metabase/querying/editor/types";
+
+export function getEditorOptions(readOnly: boolean): QueryEditorUiOptions {
+ return {
+ cardType: "model",
+ readOnly,
+ canConvertToNative: true,
+ convertToNativeTitle: t`SQL for this model`,
+ convertToNativeButtonLabel: t`Convert this model to SQL`,
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/constants.ts
new file mode 100644
index 00000000000..9c12330ebda
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/constants.ts
@@ -0,0 +1 @@
+export const NAME_MAX_LENGTH = 254;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/ModelDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/ModelDependenciesPage.tsx
new file mode 100644
index 00000000000..89a9a2a96fb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/ModelDependenciesPage.tsx
@@ -0,0 +1,48 @@
+import type { ReactNode } from "react";
+
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { Center, Flex } from "metabase/ui";
+import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+
+import { ModelHeader } from "../../components/ModelHeader";
+
+type ModelDependenciesPageParams = {
+ cardId: string;
+};
+
+type ModelDependenciesPageProps = {
+ params: ModelDependenciesPageParams;
+ children?: ReactNode;
+};
+
+export function ModelDependenciesPage({
+ params,
+ children,
+}: ModelDependenciesPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <Flex direction="column" h="100%">
+ <ModelHeader card={card} />
+ <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider
+ value={{
+ baseUrl: Urls.dataStudioModelDependencies(card.id),
+ defaultEntry: { id: card.id, type: "card" },
+ }}
+ >
+ {children}
+ </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/index.ts
new file mode 100644
index 00000000000..fbe46462baa
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/index.ts
@@ -0,0 +1 @@
+export * from "./ModelDependenciesPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.module.css
new file mode 100644
index 00000000000..fada053163c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.module.css
@@ -0,0 +1,3 @@
+.section {
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.tsx
new file mode 100644
index 00000000000..ecf433d273d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.tsx
@@ -0,0 +1,146 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import { getColumnIcon } from "metabase/common/utils/columns";
+import {
+ FieldVisibilityPicker,
+ LabeledValue,
+ NameDescriptionInput,
+ SemanticTypeAndTargetPicker,
+ TitledSection,
+} from "metabase/metadata/components";
+import { Box, Flex, Group, Title } from "metabase/ui";
+import ColumnSettings from "metabase/visualizations/components/ColumnSettings";
+import { getGlobalSettingsForColumn } from "metabase/visualizations/lib/settings/column";
+import * as Lib from "metabase-lib";
+import type {
+ Field,
+ FieldFormattingSettings,
+ FieldVisibilityType,
+} from "metabase-types/api";
+
+import { NAME_MAX_LENGTH } from "../../../constants";
+import type { FieldOverrides } from "../../../types";
+
+import S from "./ModelFieldDetails.module.css";
+
+type ModelFieldDetailsProps = {
+ field: Field;
+ idFields: Field[];
+ isReadOnly: boolean;
+ onChangeField: (field: Field, overrides: FieldOverrides) => void;
+};
+
+export function ModelFieldDetails({
+ field,
+ idFields,
+ isReadOnly,
+ onChangeField,
+}: ModelFieldDetailsProps) {
+ const denyList = useMemo(() => {
+ return Lib.isCurrency(Lib.legacyColumnTypeInfo(field))
+ ? new Set(["column_title", "number_style"])
+ : new Set(["column_title"]);
+ }, [field]);
+
+ const inheritedSettings = useMemo(() => {
+ return getGlobalSettingsForColumn();
+ }, []);
+
+ const handleChange = (overrides: FieldOverrides) => {
+ onChangeField(field, overrides);
+ };
+
+ const handleNameChange = (name: string) => {
+ onChangeField(field, { display_name: name });
+ };
+
+ const handleDescriptionChange = (description: string | null) => {
+ onChangeField(field, { description });
+ };
+
+ const handleVisibilityChange = (visibility: FieldVisibilityType) => {
+ onChangeField(field, { visibility_type: visibility });
+ };
+
+ const handleSettingsChange = (settings: FieldFormattingSettings) => {
+ onChangeField(field, { settings });
+ };
+
+ return (
+ <Flex
+ className={S.section}
+ flex={1}
+ direction="column"
+ h="100%"
+ bg="bg-white"
+ >
+ <Box p="md">
+ <NameDescriptionInput
+ name={field.display_name}
+ nameIcon={getColumnIcon(Lib.legacyColumnTypeInfo(field))}
+ nameMaxLength={NAME_MAX_LENGTH}
+ namePlaceholder={t`Give this field a name`}
+ description={field.description ?? ""}
+ descriptionPlaceholder={
+ isReadOnly
+ ? t`No description yet`
+ : t`Give this field a description`
+ }
+ readOnly={isReadOnly}
+ onNameChange={handleNameChange}
+ onDescriptionChange={handleDescriptionChange}
+ />
+ </Box>
+ <Title order={5} px="md">
+ {t`Settings`}
+ </Title>
+ <Flex direction="column" p="md" gap="md">
+ <TitledSection>
+ <Group>
+ <Box flex={1}>
+ <LabeledValue label={t`Field name`}>{field.name}</LabeledValue>
+ </Box>
+ <Box flex={1}>
+ <LabeledValue label={t`Data type`}>
+ {field.database_type}
+ </LabeledValue>
+ </Box>
+ </Group>
+ </TitledSection>
+ {!isReadOnly && (
+ <>
+ <TitledSection>
+ <SemanticTypeAndTargetPicker
+ label={t`Semantic type`}
+ description={t`What this data represents`}
+ field={field}
+ idFields={idFields}
+ onChange={handleChange}
+ />
+ </TitledSection>
+ <TitledSection>
+ <FieldVisibilityPicker
+ label={t`Visibility`}
+ description={t`Where this field should be displayed`}
+ value={field.visibility_type}
+ onChange={handleVisibilityChange}
+ />
+ </TitledSection>
+ <TitledSection>
+ <ColumnSettings
+ value={field.settings ?? {}}
+ column={field}
+ denylist={denyList}
+ extraData={{ forAdminSettings: true }}
+ inheritedSettings={inheritedSettings}
+ style={{ maxWidth: undefined }}
+ onChange={handleSettingsChange}
+ />
+ </TitledSection>
+ </>
+ )}
+ </Flex>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/index.ts
new file mode 100644
index 00000000000..a5784cce80c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/index.ts
@@ -0,0 +1 @@
+export * from "./ModelFieldDetails";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.module.css
new file mode 100644
index 00000000000..ef33573dccf
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.module.css
@@ -0,0 +1,11 @@
+.section {
+ overflow: auto;
+ border-right: 1px solid var(--mb-color-border);
+}
+
+.header {
+ position: sticky;
+ top: 0;
+ z-index: 1;
+ background-color: var(--mb-color-bg-light);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.tsx
new file mode 100644
index 00000000000..248f6ceca6b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.tsx
@@ -0,0 +1,100 @@
+import { t } from "ttag";
+
+import { SortableFieldList } from "metabase/metadata/components";
+import { FieldList } from "metabase/metadata/components/FieldList";
+import { Box, Button, Flex, Group, Icon } from "metabase/ui";
+import type { Field } from "metabase-types/api";
+
+import type { FieldOverrides } from "../../../types";
+
+import S from "./ModelFieldList.module.css";
+
+type ModelFieldListProps = {
+ fields: Field[];
+ activeFieldName?: string;
+ isSorting: boolean;
+ isReadOnly: boolean;
+ onSelectField: (field: Field) => void;
+ onChangeField: (field: Field, overrides: FieldOverrides) => void;
+ onChangeSorting: (fields: Field[]) => void;
+ onToggleSorting: (isSorting: boolean) => void;
+};
+
+export function ModelFieldList({
+ fields,
+ activeFieldName,
+ isSorting,
+ isReadOnly,
+ onSelectField,
+ onChangeField,
+ onChangeSorting,
+ onToggleSorting,
+}: ModelFieldListProps) {
+ const handleNameChange = (field: Field, name: string) => {
+ onChangeField(field, { display_name: name });
+ };
+
+ const handleDescriptionChange = (
+ field: Field,
+ description: string | null,
+ ) => {
+ onChangeField(field, { description });
+ };
+
+ const handleSortingClick = () => {
+ onToggleSorting(!isSorting);
+ };
+
+ const handleSortingChange = (fieldNames: string[]) => {
+ const fieldByName = Object.fromEntries(
+ fields.map((field) => [field.name, field]),
+ );
+ const fieldsInOrder = fieldNames.map((fieldName) => fieldByName[fieldName]);
+ onChangeSorting(fieldsInOrder);
+ };
+
+ return (
+ <Flex
+ className={S.section}
+ flex={activeFieldName ? "0 0 33%" : 1}
+ direction="column"
+ >
+ {!isReadOnly && (
+ <Group className={S.header} p="md" pb="sm">
+ <Button
+ px="sm"
+ py="0.85rem"
+ size="compact-md"
+ leftSection={<Icon name={isSorting ? "check" : "sort_arrows"} />}
+ onClick={handleSortingClick}
+ >
+ {isSorting ? t`Done` : t`Sorting`}
+ </Button>
+ </Group>
+ )}
+ <Box px="md" pb="md" pt={isReadOnly ? "md" : undefined}>
+ {isSorting ? (
+ <SortableFieldList
+ fields={fields}
+ getFieldKey={getFieldKey}
+ onChange={handleSortingChange}
+ />
+ ) : (
+ <FieldList
+ fields={fields}
+ activeFieldKey={activeFieldName}
+ readOnly={isReadOnly}
+ getFieldKey={getFieldKey}
+ onSelect={onSelectField}
+ onNameChange={handleNameChange}
+ onDescriptionChange={handleDescriptionChange}
+ />
+ )}
+ </Box>
+ </Flex>
+ );
+}
+
+function getFieldKey(field: Field) {
+ return field.name;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/index.ts
new file mode 100644
index 00000000000..a4a0963c294
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/index.ts
@@ -0,0 +1 @@
+export * from "./ModelFieldList";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.module.css
new file mode 100644
index 00000000000..18249a9b674
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.module.css
@@ -0,0 +1,3 @@
+.contentWrapper {
+ overflow-x: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.tsx
new file mode 100644
index 00000000000..1d0c7e68a75
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.tsx
@@ -0,0 +1,182 @@
+import { useLayoutEffect, useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { useLatest } from "react-use";
+import { t } from "ttag";
+import _ from "underscore";
+
+import {
+ skipToken,
+ useListDatabaseIdFieldsQuery,
+ useUpdateCardMutation,
+} from "metabase/api";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
+import { Center, Flex } from "metabase/ui";
+import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+import type { Card, Field } from "metabase-types/api";
+
+import { PaneHeaderActions } from "../../../common/components/PaneHeader";
+import { ModelHeader } from "../../components/ModelHeader";
+import type { FieldOverrides } from "../../types";
+
+import { ModelFieldDetails } from "./ModelFieldDetails";
+import { ModelFieldList } from "./ModelFieldList";
+import S from "./ModelFieldsPage.module.css";
+
+type ModelFieldsPageParams = {
+ cardId: string;
+};
+
+type ModelFieldsPageProps = {
+ params: ModelFieldsPageParams;
+ route: Route;
+};
+
+export function ModelFieldsPage({ params, route }: ModelFieldsPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const {
+ card,
+ isLoading: isLoadingCard,
+ error: cardError,
+ } = useLoadCardWithMetadata(cardId);
+ const {
+ data: idFields = [],
+ isLoading: isLoadingFields,
+ error: fieldsError,
+ } = useListDatabaseIdFieldsQuery(
+ card?.database_id != null
+ ? {
+ id: card.database_id,
+ ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,
+ }
+ : skipToken,
+ );
+ const isLoading = isLoadingCard || isLoadingFields;
+ const error = cardError ?? fieldsError;
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return <ModelFieldsPageBody card={card} idFields={idFields} route={route} />;
+}
+
+type ModelFieldsPageBodyProps = {
+ card: Card;
+ idFields: Field[];
+ route: Route;
+};
+
+function ModelFieldsPageBody({
+ card,
+ idFields,
+ route,
+}: ModelFieldsPageBodyProps) {
+ const [fields, setFields] = useState(card.result_metadata ?? []);
+ const [activeFieldName, setActiveFieldName] = useState<string>();
+ const [isSorting, setIsSorting] = useState(false);
+ const [updateCard, { isLoading: isSaving }] = useUpdateCardMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+ const isReadOnly = !card.can_write;
+
+ const activeField = useMemo(
+ () => (activeFieldName ? fieldField(fields, activeFieldName) : null),
+ [fields, activeFieldName],
+ );
+
+ const isDirty = useMemo(
+ () => !_.isEqual(fields, card.result_metadata ?? []),
+ [fields, card],
+ );
+
+ const handleSelectField = (field: Field) => {
+ setActiveFieldName(field.name);
+ };
+
+ const handleChangeField = (field: Field, overrides: FieldOverrides) => {
+ const newFields = [...fields];
+ newFields[findFieldIndex(fields, field.name)] = { ...field, ...overrides };
+ setFields(newFields);
+ };
+
+ const handleSave = async () => {
+ setIsSorting(false);
+ const { error } = await updateCard({
+ id: card.id,
+ result_metadata: fields,
+ });
+ if (error == null) {
+ sendSuccessToast(t`Model fields updated`);
+ } else {
+ sendErrorToast(t`Failed to update model fields`);
+ }
+ };
+
+ const handleCancel = () => {
+ setFields(card.result_metadata ?? []);
+ setActiveFieldName(undefined);
+ setIsSorting(false);
+ };
+
+ const resetRef = useLatest(handleCancel);
+
+ useLayoutEffect(() => {
+ resetRef.current();
+ }, [card.id, resetRef]);
+
+ return (
+ <>
+ <Flex direction="column" h="100%" data-testid="model-fields-page">
+ <ModelHeader
+ card={card}
+ actions={
+ <PaneHeaderActions
+ isDirty={isDirty}
+ isSaving={isSaving}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ />
+ }
+ />
+ <Flex className={S.contentWrapper} flex={1}>
+ <Flex flex={1} mih={0} bg="bg-light" miw={740}>
+ <ModelFieldList
+ fields={fields}
+ activeFieldName={activeFieldName}
+ isSorting={isSorting}
+ isReadOnly={isReadOnly}
+ onSelectField={handleSelectField}
+ onChangeField={handleChangeField}
+ onChangeSorting={setFields}
+ onToggleSorting={setIsSorting}
+ />
+ {activeField != null ? (
+ <ModelFieldDetails
+ field={activeField}
+ idFields={idFields}
+ isReadOnly={isReadOnly}
+ onChangeField={handleChangeField}
+ />
+ ) : null}
+ </Flex>
+ </Flex>
+ </Flex>
+ <LeaveRouteConfirmModal route={route} isEnabled={isDirty} />
+ </>
+ );
+}
+
+function fieldField(fields: Field[], fieldName: string) {
+ return fields[findFieldIndex(fields, fieldName)];
+}
+
+function findFieldIndex(fields: Field[], fieldName: string) {
+ return fields.findIndex((field) => field.name === fieldName);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/index.ts
new file mode 100644
index 00000000000..c2e644bb6fe
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/index.ts
@@ -0,0 +1 @@
+export * from "./ModelFieldsPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/ModelOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/ModelOverviewPage.tsx
new file mode 100644
index 00000000000..bad5e59f4c9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/ModelOverviewPage.tsx
@@ -0,0 +1,35 @@
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { Center, Flex } from "metabase/ui";
+import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+
+import { CardOverview } from "../../../common/components/CardOverview";
+import { ModelHeader } from "../../components/ModelHeader";
+
+type ModelOverviewPageParams = {
+ cardId: string;
+};
+
+type ModelOverviewPageProps = {
+ params: ModelOverviewPageParams;
+};
+
+export function ModelOverviewPage({ params }: ModelOverviewPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <Flex direction="column" h="100%" data-testid="model-overview-page">
+ <ModelHeader card={card} />
+ <CardOverview card={card} />
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/index.ts
new file mode 100644
index 00000000000..dc304796b28
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/index.ts
@@ -0,0 +1 @@
+export * from "./ModelOverviewPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/ModelQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/ModelQueryPage.tsx
new file mode 100644
index 00000000000..8f2143c6f91
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/ModelQueryPage.tsx
@@ -0,0 +1,202 @@
+import { useLayoutEffect, useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { useLatest } from "react-use";
+import { t } from "ttag";
+
+import { useUpdateCardMutation } from "metabase/api";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import {
+ type QueryEditorUiState,
+ getInitialUiState,
+} from "metabase/querying/editor/components/QueryEditor";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Center, Stack } from "metabase/ui";
+import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
+import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
+import * as Lib from "metabase-lib";
+import Question from "metabase-lib/v1/Question";
+import type { Card } from "metabase-types/api";
+
+import { PaneHeaderActions } from "../../../common/components/PaneHeader";
+import { ModelHeader } from "../../components/ModelHeader";
+import { ModelQueryEditor } from "../../components/ModelQueryEditor";
+import { getValidationResult } from "../../utils";
+
+import {
+ applyFieldOverridesInDataset,
+ applyFieldOverridesInResultMetadata,
+} from "./utils";
+
+type ModelQueryPageParams = {
+ cardId: string;
+};
+
+type ModelQueryPageProps = {
+ params: ModelQueryPageParams;
+ route: Route;
+};
+
+export function ModelQueryPage({ params, route }: ModelQueryPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return <ModelQueryPageBody card={card} route={route} />;
+}
+
+type ModelQueryPageBodyProps = {
+ card: Card;
+ route: Route;
+};
+
+function ModelQueryPageBody({ card, route }: ModelQueryPageBodyProps) {
+ const metadata = useSelector(getMetadata);
+ const [datasetQuery, setDatasetQuery] = useState(card.dataset_query);
+ const [uiState, setUiState] = useState(getInitialUiState);
+ const [updateCard, { isLoading: isSaving }] = useUpdateCardMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const question = useMemo(() => {
+ return new Question(card, metadata).setDatasetQuery(datasetQuery);
+ }, [card, metadata, datasetQuery]);
+
+ const resultMetadata = useMemo(() => {
+ const fields = getResultMetadata(
+ datasetQuery,
+ uiState.lastRunQuery,
+ uiState.lastRunResult,
+ );
+ if (fields == null || card.result_metadata == null) {
+ return fields;
+ }
+ return applyFieldOverridesInResultMetadata(fields, card.result_metadata);
+ }, [card, datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
+
+ const validationResult = useMemo(
+ () => getValidationResult(question.query(), resultMetadata),
+ [question, resultMetadata],
+ );
+
+ const isDirty = useMemo(() => {
+ return !Lib.areLegacyQueriesEqual(datasetQuery, card.dataset_query);
+ }, [datasetQuery, card.dataset_query]);
+
+ const {
+ checkData,
+ isCheckingDependencies,
+ isConfirmationShown,
+ handleInitialSave,
+ handleSaveAfterConfirmation,
+ handleCloseConfirmation,
+ } = PLUGIN_DEPENDENCIES.useCheckCardDependencies({
+ onSave: async (question) => {
+ const { error } = await updateCard({
+ id: card.id,
+ dataset_query: question.datasetQuery(),
+ result_metadata: resultMetadata,
+ });
+ if (error) {
+ sendErrorToast(t`Failed to update model query`);
+ } else {
+ sendSuccessToast(t`Model query updated`);
+ }
+ },
+ });
+
+ const handleChangeQuery = (newQuery: Lib.Query) => {
+ setDatasetQuery(Lib.toJsQuery(newQuery));
+ };
+
+ const handleChangeUiState = (newUiState: QueryEditorUiState) => {
+ if (
+ card.result_metadata != null &&
+ newUiState.lastRunResult != null &&
+ newUiState.lastRunResult !== uiState.lastRunResult
+ ) {
+ setUiState({
+ ...newUiState,
+ lastRunResult: applyFieldOverridesInDataset(
+ newUiState.lastRunResult,
+ card.result_metadata,
+ ),
+ });
+ } else {
+ setUiState(newUiState);
+ }
+ };
+
+ const handleSave = () => {
+ handleInitialSave(question.setResultsMetadata({ columns: resultMetadata }));
+ };
+
+ const handleCancel = () => {
+ setDatasetQuery(card.dataset_query);
+ };
+
+ const handleResetRef = useLatest(() => {
+ setDatasetQuery(card.dataset_query);
+ setUiState(getInitialUiState());
+ });
+
+ useLayoutEffect(() => {
+ handleResetRef.current();
+ }, [card.id, handleResetRef]);
+
+ return (
+ <>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ data-testid="model-query-editor"
+ gap={0}
+ >
+ <ModelHeader
+ card={card}
+ actions={
+ <PaneHeaderActions
+ errorMessage={validationResult.errorMessage}
+ isValid={validationResult.isValid}
+ isDirty={isDirty}
+ isSaving={isSaving || isCheckingDependencies}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ />
+ }
+ />
+ <ModelQueryEditor
+ query={question.query()}
+ uiState={uiState}
+ readOnly={!card.can_write}
+ onChangeQuery={handleChangeQuery}
+ onChangeUiState={handleChangeUiState}
+ />
+ </Stack>
+ {isConfirmationShown && checkData != null && (
+ <PLUGIN_DEPENDENCIES.CheckDependenciesModal
+ checkData={checkData}
+ opened
+ onSave={handleSaveAfterConfirmation}
+ onClose={handleCloseConfirmation}
+ />
+ )}
+ <LeaveRouteConfirmModal
+ route={route}
+ isEnabled={isDirty && !isSaving && !isCheckingDependencies}
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/index.ts
new file mode 100644
index 00000000000..effb63e016e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/index.ts
@@ -0,0 +1 @@
+export * from "./ModelQueryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/utils.ts
new file mode 100644
index 00000000000..dbd0044ec9a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/utils.ts
@@ -0,0 +1,61 @@
+import type { Dataset, DatasetColumn, Field } from "metabase-types/api";
+
+import type { FieldOverrides } from "../../types";
+
+function getFieldOverrides(field: Field): FieldOverrides {
+ const {
+ display_name,
+ description,
+ semantic_type,
+ fk_target_field_id,
+ visibility_type,
+ settings,
+ } = field;
+ return {
+ display_name,
+ description,
+ semantic_type,
+ fk_target_field_id,
+ visibility_type,
+ settings,
+ };
+}
+
+function applyFieldOverrides<T extends Field | DatasetColumn>(
+ queryFields: T[],
+ savedFields: Field[],
+): T[] {
+ const savedFieldByName = Object.fromEntries(
+ savedFields.map((field) => [field.name, field]),
+ );
+ return queryFields.map((queryField) => {
+ const savedField = savedFieldByName[queryField.name];
+ return savedField == null
+ ? queryField
+ : { ...queryField, ...getFieldOverrides(savedField) };
+ });
+}
+
+export function applyFieldOverridesInDataset(
+ dataset: Dataset,
+ savedMetadata: Field[],
+) {
+ if (dataset.data == null) {
+ return dataset;
+ }
+
+ return {
+ ...dataset,
+ data: {
+ ...dataset.data,
+ cols: applyFieldOverrides(dataset.data.cols, savedMetadata),
+ },
+ };
+}
+
+export function applyFieldOverridesInResultMetadata(
+ queryMetadata: Field[],
+ savedMetadata: Field[],
+) {
+ return applyFieldOverrides(queryMetadata, savedMetadata);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/CreateModelModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/CreateModelModal.tsx
new file mode 100644
index 00000000000..cb1d706b19f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/CreateModelModal.tsx
@@ -0,0 +1,145 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+import * as Yup from "yup";
+
+import { useCreateCardMutation } from "metabase/api";
+import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";
+import {
+ Form,
+ FormErrorMessage,
+ FormProvider,
+ FormSubmitButton,
+ FormTextInput,
+ FormTextarea,
+} from "metabase/forms";
+import * as Errors from "metabase/lib/errors";
+import { Box, Button, Group, Modal, Stack } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { Card, CreateCardRequest } from "metabase-types/api";
+
+import type { NewModelValues } from "../types";
+
+const NEW_MODEL_SCHEMA = Yup.object({
+ name: Yup.string().required(Errors.required),
+ description: Yup.string().nullable(),
+ collection_id: Yup.number().nullable().default(null),
+});
+
+type CreateModelModalProps = {
+ query: Lib.Query;
+ defaultValues: Partial<NewModelValues>;
+ onCreate: (card: Card) => void;
+ onClose: () => void;
+};
+
+export function CreateModelModal({
+ query,
+ defaultValues,
+ onCreate,
+ onClose,
+}: CreateModelModalProps) {
+ return (
+ <Modal title={t`Save your model`} opened padding="xl" onClose={onClose}>
+ <CreateModelForm
+ query={query}
+ defaultValues={defaultValues}
+ onCreate={onCreate}
+ onClose={onClose}
+ />
+ </Modal>
+ );
+}
+
+type CreateModelFormProps = {
+ query: Lib.Query;
+ defaultValues: Partial<NewModelValues>;
+ onCreate: (card: Card) => void;
+ onClose: () => void;
+};
+
+function CreateModelForm({
+ query,
+ defaultValues,
+ onCreate,
+ onClose,
+}: CreateModelFormProps) {
+ const [createCard] = useCreateCardMutation();
+
+ const initialValues: NewModelValues = useMemo(
+ () => getInitialValues(defaultValues),
+ [defaultValues],
+ );
+
+ const handleSubmit = async (values: NewModelValues) => {
+ const request = getCreateRequest(query, values);
+ const card = await createCard(request).unwrap();
+ onCreate(card);
+ };
+
+ return (
+ <FormProvider
+ initialValues={initialValues}
+ validationSchema={NEW_MODEL_SCHEMA}
+ onSubmit={handleSubmit}
+ >
+ <Form>
+ <Stack gap="lg">
+ <FormTextInput
+ name="name"
+ label={t`Name`}
+ placeholder={t`My Great Model`}
+ data-autofocus
+ />
+ <FormTextarea
+ name="description"
+ label={t`Description`}
+ placeholder={t`This is optional, but helpful`}
+ minRows={4}
+ maxRows={10}
+ />
+ <FormCollectionPicker
+ name="collection_id"
+ title={t`Where do you want to save this?`}
+ entityType="dataset"
+ />
+ <Group>
+ <Box flex={1}>
+ <FormErrorMessage />
+ </Box>
+ <Button variant="subtle" onClick={onClose}>{t`Back`}</Button>
+ <FormSubmitButton label={t`Save`} variant="filled" />
+ </Group>
+ </Stack>
+ </Form>
+ </FormProvider>
+ );
+}
+
+function getInitialValues(
+ defaultValues: Partial<NewModelValues>,
+): NewModelValues {
+ return {
+ name: "",
+ description: null,
+ result_metadata: null,
+ resultMetadata: null,
+ collection_id: null,
+ ...defaultValues,
+ };
+}
+
+function getCreateRequest(
+ query: Lib.Query,
+ { name, description, collection_id, result_metadata }: NewModelValues,
+): CreateCardRequest {
+ return {
+ name,
+ description,
+ collection_id,
+ result_metadata,
+ type: "model",
+ dataset_query: Lib.toJsQuery(query),
+ display: "table",
+ visualization_settings: {},
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/index.ts
new file mode 100644
index 00000000000..ab0909b6415
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/index.ts
@@ -0,0 +1 @@
+export * from "./CreateModelModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/NewModelPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/NewModelPage.tsx
new file mode 100644
index 00000000000..245535a9e50
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/NewModelPage.tsx
@@ -0,0 +1,191 @@
+import { useDisclosure } from "@mantine/hooks";
+import type { Location } from "history";
+import { useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useGetDefaultCollectionId } from "metabase/collections/hooks";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Stack } from "metabase/ui";
+import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
+import * as Lib from "metabase-lib";
+import type { Card, CollectionId } from "metabase-types/api";
+
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "../../../common/components/PaneHeader";
+import { ModelQueryEditor } from "../../components/ModelQueryEditor";
+import { NAME_MAX_LENGTH } from "../../constants";
+import { getValidationResult } from "../../utils";
+
+import { CreateModelModal } from "./CreateModelModal";
+import { getInitialNativeQuery, getInitialQuery, getQuery } from "./utils";
+
+type NewModelPageQuery = {
+ collectionId?: string;
+};
+
+type NewModelPageProps = {
+ initialQuery: Lib.Query;
+ initialCollectionId?: CollectionId | null;
+ route: Route;
+};
+
+function NewModelPage({
+ initialQuery,
+ initialCollectionId,
+ route,
+}: NewModelPageProps) {
+ const [name, setName] = useState("");
+ const [datasetQuery, setDatasetQuery] = useState(() =>
+ Lib.toJsQuery(initialQuery),
+ );
+ const [uiState, setUiState] = useState(getInitialUiState);
+ const [isModalOpened, { open: openModal, close: closeModal }] =
+ useDisclosure();
+ const metadata = useSelector(getMetadata);
+ const defaultCollectionId = useGetDefaultCollectionId();
+ const dispatch = useDispatch();
+
+ const query = useMemo(
+ () => getQuery(datasetQuery, metadata),
+ [datasetQuery, metadata],
+ );
+
+ const resultMetadata = useMemo(() => {
+ return getResultMetadata(
+ datasetQuery,
+ uiState.lastRunQuery,
+ uiState.lastRunResult,
+ );
+ }, [datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
+
+ const validationResult = useMemo(
+ () => getValidationResult(query, resultMetadata),
+ [query, resultMetadata],
+ );
+
+ const defaultValues = useMemo(
+ () => ({
+ name,
+ result_metadata: resultMetadata,
+ collection_id: initialCollectionId ?? defaultCollectionId,
+ }),
+ [name, resultMetadata, initialCollectionId, defaultCollectionId],
+ );
+
+ const handleCreate = (card: Card) => {
+ dispatch(push(Urls.dataStudioModel(card.id)));
+ };
+
+ const handleChangeQuery = (query: Lib.Query) => {
+ setDatasetQuery(Lib.toJsQuery(query));
+ };
+
+ const handleCancel = () => {
+ dispatch(push(Urls.dataStudioModeling()));
+ };
+
+ return (
+ <>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ data-testid="model-query-editor"
+ gap={0}
+ >
+ <PaneHeader
+ title={
+ <PaneHeaderInput
+ initialValue={name}
+ placeholder={t`New model`}
+ maxLength={NAME_MAX_LENGTH}
+ isOptional
+ onChange={setName}
+ />
+ }
+ icon="model"
+ actions={
+ <PaneHeaderActions
+ errorMessage={validationResult.errorMessage}
+ isValid={validationResult.isValid}
+ isDirty
+ onSave={openModal}
+ onCancel={handleCancel}
+ />
+ }
+ />
+ <ModelQueryEditor
+ query={query}
+ uiState={uiState}
+ onChangeQuery={handleChangeQuery}
+ onChangeUiState={setUiState}
+ />
+ </Stack>
+ {isModalOpened && (
+ <CreateModelModal
+ query={query}
+ defaultValues={defaultValues}
+ onCreate={handleCreate}
+ onClose={closeModal}
+ />
+ )}
+ <LeaveRouteConfirmModal route={route} isEnabled={!isModalOpened} />
+ </>
+ );
+}
+
+type NewQueryModelPageProps = {
+ location: Location<NewModelPageQuery>;
+ route: Route;
+};
+
+export function NewQueryModelPage({ route, location }: NewQueryModelPageProps) {
+ const metadata = useSelector(getMetadata);
+ const initialQuery = useMemo(() => getInitialQuery(metadata), [metadata]);
+ const collectionId = Urls.extractCollectionId(location.query.collectionId);
+
+ return (
+ <NewModelPage
+ initialQuery={initialQuery}
+ initialCollectionId={collectionId}
+ route={route}
+ />
+ );
+}
+
+type NewNativeModelPageProps = {
+ location: Location<NewModelPageQuery>;
+ route: Route;
+};
+
+export function NewNativeModelPage({
+ location,
+ route,
+}: NewNativeModelPageProps) {
+ const metadata = useSelector(getMetadata);
+ const initialQuery = useMemo(
+ () => getInitialNativeQuery(metadata),
+ [metadata],
+ );
+ const initialCollectionId = Urls.extractCollectionId(
+ location.query.collectionId,
+ );
+
+ return (
+ <NewModelPage
+ initialQuery={initialQuery}
+ initialCollectionId={initialCollectionId}
+ route={route}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/index.ts
new file mode 100644
index 00000000000..5a5d7ae4ab2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/index.ts
@@ -0,0 +1 @@
+export * from "./NewModelPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/types.ts
new file mode 100644
index 00000000000..3ee52ef62a1
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/types.ts
@@ -0,0 +1,9 @@
+import type { CollectionId, Field } from "metabase-types/api";
+
+export type NewModelValues = {
+ name: string;
+ description: string | null;
+ resultMetadata: Field[] | null;
+ collection_id: CollectionId | null;
+ result_metadata: Field[] | null;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/utils.ts
new file mode 100644
index 00000000000..4a26a4a2b78
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/utils.ts
@@ -0,0 +1,21 @@
+import Question from "metabase-lib/v1/Question";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type { DatasetQuery } from "metabase-types/api";
+
+export function getQuery(datasetQuery: DatasetQuery, metadata: Metadata) {
+ return Question.create({ dataset_query: datasetQuery, metadata }).query();
+}
+
+export function getInitialQuery(metadata: Metadata) {
+ return Question.create({
+ DEPRECATED_RAW_MBQL_type: "query",
+ metadata,
+ }).query();
+}
+
+export function getInitialNativeQuery(metadata: Metadata) {
+ return Question.create({
+ DEPRECATED_RAW_MBQL_type: "native",
+ metadata,
+ }).query();
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/routes.tsx
new file mode 100644
index 00000000000..ca5b289cae5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/routes.tsx
@@ -0,0 +1,26 @@
+import { IndexRoute, Route } from "react-router";
+
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+
+import { ModelDependenciesPage } from "./pages/ModelDependenciesPage";
+import { ModelFieldsPage } from "./pages/ModelFieldsPage";
+import { ModelOverviewPage } from "./pages/ModelOverviewPage";
+import { ModelQueryPage } from "./pages/ModelQueryPage";
+import { NewNativeModelPage, NewQueryModelPage } from "./pages/NewModelPage";
+
+export function getDataStudioModelRoutes() {
+ return (
+ <Route path="models">
+ <Route path="new/query" component={NewQueryModelPage} />
+ <Route path="new/native" component={NewNativeModelPage} />
+ <Route path=":cardId" component={ModelOverviewPage} />
+ <Route path=":cardId/query" component={ModelQueryPage} />
+ <Route path=":cardId/fields" component={ModelFieldsPage} />
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <Route path=":cardId/dependencies" component={ModelDependenciesPage}>
+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
+ </Route>
+ )}
+ </Route>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/types.ts
new file mode 100644
index 00000000000..82ccbbebe0c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/types.ts
@@ -0,0 +1,18 @@
+import type { Field } from "metabase-types/api";
+
+export type FieldOverrides = Partial<
+ Pick<
+ Field,
+ | "display_name"
+ | "description"
+ | "semantic_type"
+ | "fk_target_field_id"
+ | "visibility_type"
+ | "settings"
+ >
+>;
+
+export type ValidationResult = {
+ isValid: boolean;
+ errorMessage?: string;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/utils.ts
new file mode 100644
index 00000000000..b1b281a70c2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/models/utils.ts
@@ -0,0 +1,31 @@
+import { t } from "ttag";
+
+import * as Lib from "metabase-lib";
+import type { Field } from "metabase-types/api";
+
+import type { ValidationResult } from "./types";
+
+export function getValidationResult(
+ query: Lib.Query,
+ resultMetadata: Field[] | null,
+): ValidationResult {
+ const { isNative } = Lib.queryDisplayInfo(query);
+ if (isNative) {
+ const tags = Object.values(Lib.templateTags(query));
+ if (tags.some((t) => t.type !== "card" && t.type !== "snippet")) {
+ return {
+ isValid: false,
+ errorMessage: t`In models, you can use snippets and question or model references, but not variables.`,
+ };
+ }
+
+ if (resultMetadata == null) {
+ return {
+ isValid: false,
+ errorMessage: t`You must run the query before you can save this model.`,
+ };
+ }
+ }
+
+ return { isValid: Lib.canSave(query, "model") };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
new file mode 100644
index 00000000000..c82a633bd24
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
@@ -0,0 +1,72 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import ErrorBoundary from "metabase/ErrorBoundary";
+import { isLibraryCollection } from "metabase/collections/utils";
+import CollapseSection from "metabase/common/components/CollapseSection";
+import { Tree } from "metabase/common/components/tree";
+import { useUserSetting } from "metabase/common/hooks";
+import { buildCollectionTree } from "metabase/entities/collections";
+import {
+ SidebarHeading,
+ SidebarSection,
+} from "metabase/nav/containers/MainNavbar/MainNavbar.styled";
+import { SidebarCollectionLink } from "metabase/nav/containers/MainNavbar/SidebarItems";
+import type { Collection } from "metabase-types/api";
+
+type LibraryCollectionSectionProps = {
+ collections: Collection[];
+ selectedId?: string | number;
+ onItemSelect: () => void;
+};
+
+export function NavbarLibrarySection({
+ collections,
+ selectedId,
+ onItemSelect,
+}: LibraryCollectionSectionProps) {
+ const [expandLibrary = true, setExpandLibrary] = useUserSetting(
+ "expand-library-in-nav",
+ );
+
+ const libraryTree = useMemo(() => {
+ const libraryCollection = collections.find(isLibraryCollection);
+ if (!libraryCollection) {
+ return [];
+ }
+ const tree = buildCollectionTree([libraryCollection], () => true);
+ if (tree.length === 0) {
+ return [];
+ }
+ return tree[0].children || [];
+ }, [collections]);
+
+ if (libraryTree.length === 0) {
+ return null;
+ }
+
+ return (
+ <SidebarSection>
+ <ErrorBoundary>
+ <CollapseSection
+ header={<SidebarHeading>{t`Library`}</SidebarHeading>}
+ initialState={expandLibrary ? "expanded" : "collapsed"}
+ iconPosition="right"
+ iconSize={8}
+ role="section"
+ aria-label={t`Library`}
+ onToggle={setExpandLibrary}
+ >
+ <Tree
+ data={libraryTree}
+ selectedId={selectedId}
+ onSelect={onItemSelect}
+ TreeNode={SidebarCollectionLink}
+ role="tree"
+ aria-label="library-collection-tree"
+ />
+ </CollapseSection>
+ </ErrorBoundary>
+ </SidebarSection>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/index.ts
new file mode 100644
index 00000000000..cd4e97b908f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/nav/components/NavbarLibrarySection/index.ts
@@ -0,0 +1 @@
+export { NavbarLibrarySection } from "./NavbarLibrarySection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
new file mode 100644
index 00000000000..7ce06aceb8a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
@@ -0,0 +1,36 @@
+import { useCallback } from "react";
+import { t } from "ttag";
+
+import { ToolbarButton } from "metabase/common/components/ToolbarButton";
+import { useDispatch } from "metabase/lib/redux";
+import type { DataStudioToolbarButtonProps } from "metabase/plugins";
+import { openUrl } from "metabase/redux/app";
+import { Urls } from "metabase-enterprise/urls";
+
+export const DataStudioToolbarButton = ({
+ question,
+}: DataStudioToolbarButtonProps) => {
+ const dispatch = useDispatch();
+ const isModel = question.type() === "model";
+ const isMetric = question.type() === "metric";
+
+ const handleClick = useCallback(() => {
+ const url = isModel
+ ? Urls.dataStudioModel(question.id())
+ : Urls.dataStudioMetric(question.id());
+ dispatch(openUrl(url));
+ }, [isModel, question, dispatch]);
+
+ if (!isModel && !isMetric) {
+ return null;
+ }
+
+ return (
+ <ToolbarButton
+ onClick={handleClick}
+ icon="data_studio"
+ aria-label={t`Open in Data Studio`}
+ tooltipLabel={t`Open in Data Studio`}
+ />
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/index.ts
new file mode 100644
index 00000000000..b2c58cf746b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/index.ts
@@ -0,0 +1 @@
+export * from "./DataStudioToolbarButton";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
new file mode 100644
index 00000000000..a8392ec795b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
@@ -0,0 +1,76 @@
+import type { Store } from "@reduxjs/toolkit";
+import type { ComponentType } from "react";
+import { IndexRoute, Route } from "react-router";
+
+import * as Urls from "metabase/lib/urls";
+import {
+ PLUGIN_DEPENDENCIES,
+ PLUGIN_FEATURE_LEVEL_PERMISSIONS,
+ PLUGIN_TRANSFORMS,
+} from "metabase/plugins";
+import type { State } from "metabase-types/store";
+
+import { DataSectionLayout } from "./app/pages/DataSectionLayout";
+import { DataStudioLayout } from "./app/pages/DataStudioLayout";
+import { DependenciesSectionLayout } from "./app/pages/DependenciesSectionLayout";
+import { ModelingSectionLayout } from "./app/pages/ModelingSectionLayout";
+import { TransformsSectionLayout } from "./app/pages/TransformsSectionLayout";
+import { getDataStudioMetadataRoutes } from "./data-model/routes";
+import { getDataStudioGlossaryRoutes } from "./glossary/routes";
+import { getDataStudioMetricRoutes } from "./metrics/routes";
+import { getDataStudioModelingRoutes } from "./modeling/routes";
+import { getDataStudioModelRoutes } from "./models/routes";
+import { getDataStudioSnippetRoutes } from "./snippets/routes";
+
+export function getDataStudioRoutes(
+ store: Store<State>,
+ CanAccessDataStudio: ComponentType,
+ CanAccessDataModel: ComponentType,
+ CanAccessTransforms: ComponentType,
+) {
+ return (
+ <Route component={CanAccessDataStudio}>
+ <Route path="data-studio" component={DataStudioLayout}>
+ <IndexRoute
+ onEnter={(_state, replace) => {
+ replace(getIndexPath(store.getState()));
+ }}
+ />
+ <Route path="data" component={CanAccessDataModel}>
+ <Route component={DataSectionLayout}>
+ {getDataStudioMetadataRoutes()}
+ </Route>
+ </Route>
+ {PLUGIN_TRANSFORMS.isEnabled && (
+ <Route path="transforms" component={CanAccessTransforms}>
+ <Route component={TransformsSectionLayout}>
+ {PLUGIN_TRANSFORMS.getDataStudioTransformRoutes()}
+ </Route>
+ </Route>
+ )}
+ <Route path="modeling" component={ModelingSectionLayout}>
+ {getDataStudioModelingRoutes()}
+ {getDataStudioModelRoutes()}
+ {getDataStudioMetricRoutes()}
+ {getDataStudioSnippetRoutes()}
+ {getDataStudioGlossaryRoutes()}
+ </Route>
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <Route path="dependencies" component={DependenciesSectionLayout}>
+ {PLUGIN_DEPENDENCIES.getDataStudioDependencyRoutes()}
+ </Route>
+ )}
+ </Route>
+ </Route>
+ );
+}
+
+function getIndexPath(state: State) {
+ if (PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel(state)) {
+ return Urls.dataStudioData();
+ }
+ if (PLUGIN_TRANSFORMS.canAccessTransforms(state)) {
+ return Urls.transformList();
+ }
+ return Urls.dataStudioModeling();
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx
new file mode 100644
index 00000000000..1528a598e4d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx
@@ -0,0 +1,64 @@
+import { t } from "ttag";
+
+import { useUpdateSnippetMutation } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
+import { useToast } from "metabase/common/hooks";
+import { Button, Group, Modal, Stack, Text } from "metabase/ui";
+import type { NativeQuerySnippet } from "metabase-types/api";
+
+type DeleteSnippetModalProps = {
+ snippet: NativeQuerySnippet;
+ onDelete?: () => void;
+ onClose: () => void;
+};
+
+export function DeleteSnippetModal({
+ snippet,
+ onDelete,
+ onClose,
+}: DeleteSnippetModalProps) {
+ const [updateSnippet, { isLoading }] = useUpdateSnippetMutation();
+ const [sendToast] = useToast();
+
+ const handleDelete = async () => {
+ const { error } = await updateSnippet({
+ id: snippet.id,
+ archived: true,
+ });
+
+ if (error) {
+ sendToast({
+ message: getErrorMessage(error, t`Failed to delete snippet`),
+ icon: "warning",
+ });
+ } else {
+ sendToast({
+ message: t`Snippet deleted`,
+ icon: "check",
+ });
+ onDelete?.();
+ onClose();
+ }
+ };
+
+ return (
+ <Modal opened onClose={onClose} title={t`Delete snippet?`}>
+ <Stack>
+ <Text>
+ {t`Are you sure you want to delete "${snippet.name}"? This action cannot be undone.`}
+ </Text>
+ <Group gap="sm" justify="flex-end">
+ <Button onClick={onClose}>{t`Cancel`}</Button>
+ <Button
+ variant="filled"
+ color="error"
+ onClick={handleDelete}
+ loading={isLoading}
+ >
+ {t`Delete`}
+ </Button>
+ </Group>
+ </Stack>
+ </Modal>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/index.ts
new file mode 100644
index 00000000000..7779e9eb64f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/DeleteSnippetModal/index.ts
@@ -0,0 +1 @@
+export { DeleteSnippetModal } from "./DeleteSnippetModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx
new file mode 100644
index 00000000000..d615466170a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx
@@ -0,0 +1,45 @@
+import { t } from "ttag";
+
+import { useUpdateSnippetMutation } from "metabase/api";
+import EditableText from "metabase/common/components/EditableText";
+import { useToast } from "metabase/common/hooks";
+import type { NativeQuerySnippet } from "metabase-types/api";
+
+type SnippetDescriptionSectionProps = {
+ snippet: NativeQuerySnippet;
+};
+
+export function SnippetDescriptionSection({
+ snippet,
+}: SnippetDescriptionSectionProps) {
+ const [updateSnippet] = useUpdateSnippetMutation();
+ const [sendToast] = useToast();
+
+ const handleChange = async (newValue: string) => {
+ const newDescription = newValue.trim();
+ const { error } = await updateSnippet({
+ id: snippet.id,
+ description: newDescription.length > 0 ? newDescription : null,
+ });
+ if (error) {
+ sendToast({
+ message: t`Failed to update snippet description`,
+ icon: "warning",
+ });
+ } else {
+ sendToast({
+ message: t`Snippet description updated`,
+ icon: "check",
+ });
+ }
+ };
+
+ return (
+ <EditableText
+ initialValue={snippet.description ?? ""}
+ placeholder={t`No description`}
+ isMarkdown
+ onChange={handleChange}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/index.ts
new file mode 100644
index 00000000000..b57ea88ba8f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetDescriptionSection/index.ts
@@ -0,0 +1 @@
+export { SnippetDescriptionSection } from "./SnippetDescriptionSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
new file mode 100644
index 00000000000..19e18e83906
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
@@ -0,0 +1,107 @@
+import type { ReactNode } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useUpdateSnippetMutation } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
+import { useToast } from "metabase/common/hooks";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import type { NativeQuerySnippet } from "metabase-types/api";
+
+import {
+ PaneHeader,
+ PaneHeaderInput,
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+} from "../../../common/components/PaneHeader";
+import { SnippetMoreMenu } from "../SnippetMoreMenu";
+
+const SNIPPET_NAME_MAX_LENGTH = 254;
+
+type SnippetHeaderProps = {
+ snippet: NativeQuerySnippet;
+ actions?: ReactNode;
+};
+
+export function SnippetHeader({ snippet, actions }: SnippetHeaderProps) {
+ const dispatch = useDispatch();
+
+ const handleDelete = () => {
+ dispatch(push(Urls.dataStudioModeling()));
+ };
+
+ return (
+ <PaneHeader
+ title={<SnippetNameInput snippet={snippet} />}
+ menu={<SnippetMoreMenu snippet={snippet} onDelete={handleDelete} />}
+ tabs={<SnippetTabs snippet={snippet} />}
+ actions={actions}
+ data-testid="snippet-header"
+ />
+ );
+}
+
+type SnippetNameInputProps = {
+ snippet: NativeQuerySnippet;
+};
+
+function SnippetNameInput({ snippet }: SnippetNameInputProps) {
+ const [updateSnippet] = useUpdateSnippetMutation();
+ const [sendToast] = useToast();
+
+ const handleChangeName = async (newName: string) => {
+ const { error } = await updateSnippet({
+ id: snippet.id,
+ name: newName,
+ });
+
+ if (error) {
+ sendToast({
+ message: getErrorMessage(error, t`Failed to update snippet name`),
+ icon: "warning",
+ });
+ } else {
+ sendToast({
+ message: t`Snippet name updated`,
+ icon: "check",
+ });
+ }
+ };
+
+ return (
+ <PaneHeaderInput
+ initialValue={snippet.name}
+ maxLength={SNIPPET_NAME_MAX_LENGTH}
+ onChange={handleChangeName}
+ />
+ );
+}
+
+type SnippetTabsProps = {
+ snippet: NativeQuerySnippet;
+};
+
+function SnippetTabs({ snippet }: SnippetTabsProps) {
+ const tabs = getTabs(snippet.id);
+ return <PaneHeaderTabs tabs={tabs} />;
+}
+
+function getTabs(snippetId: number): PaneHeaderTab[] {
+ const tabs: PaneHeaderTab[] = [
+ {
+ label: t`Definition`,
+ to: Urls.dataStudioSnippet(snippetId),
+ },
+ ];
+
+ if (PLUGIN_DEPENDENCIES.isEnabled) {
+ tabs.push({
+ label: t`Dependencies`,
+ to: Urls.dataStudioSnippetDependencies(snippetId),
+ });
+ }
+
+ return tabs;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/index.ts
new file mode 100644
index 00000000000..0005bf95709
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetHeader/index.ts
@@ -0,0 +1 @@
+export { SnippetHeader } from "./SnippetHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx
new file mode 100644
index 00000000000..b2d0e32ac06
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx
@@ -0,0 +1,112 @@
+import { useState } from "react";
+import { c, t } from "ttag";
+
+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
+import { ActionIcon, Icon, Menu } from "metabase/ui";
+import type { NativeQuerySnippet } from "metabase-types/api";
+
+import { DeleteSnippetModal } from "../DeleteSnippetModal";
+
+type SnippetModalType = "move" | "delete";
+
+type SnippetMoreMenuProps = {
+ snippet: NativeQuerySnippet;
+ onDelete?: () => void;
+};
+
+export function SnippetMoreMenu({ snippet, onDelete }: SnippetMoreMenuProps) {
+ const [modalType, setModalType] = useState<SnippetModalType>();
+
+ return (
+ <>
+ <SnippetMenu onOpenModal={setModalType} />
+ {modalType != null && (
+ <SnippetModal
+ snippet={snippet}
+ modalType={modalType}
+ onDelete={onDelete}
+ onClose={() => setModalType(undefined)}
+ />
+ )}
+ </>
+ );
+}
+
+type SnippetMenuProps = {
+ onOpenModal: (modalType: SnippetModalType) => void;
+};
+
+function SnippetMenu({ onOpenModal }: SnippetMenuProps) {
+ const menuItems = [];
+
+ if (PLUGIN_SNIPPET_FOLDERS.isEnabled) {
+ menuItems.push(
+ <Menu.Item
+ key="move"
+ leftSection={<Icon name="move" />}
+ onClick={() => onOpenModal("move")}
+ >
+ {c("A verb, not a noun").t`Move`}
+ </Menu.Item>,
+ );
+ }
+
+ menuItems.push(
+ <Menu.Item
+ key="delete"
+ leftSection={<Icon name="trash" />}
+ onClick={() => onOpenModal("delete")}
+ >
+ {t`Delete`}
+ </Menu.Item>,
+ );
+
+ if (menuItems.length === 0) {
+ return null;
+ }
+
+ return (
+ <Menu>
+ <Menu.Target>
+ <ActionIcon>
+ <Icon name="ellipsis" />
+ </ActionIcon>
+ </Menu.Target>
+ <Menu.Dropdown>{menuItems}</Menu.Dropdown>
+ </Menu>
+ );
+}
+
+type SnippetModalProps = {
+ snippet: NativeQuerySnippet;
+ modalType: SnippetModalType;
+ onDelete?: () => void;
+ onClose: () => void;
+};
+
+function SnippetModal({
+ snippet,
+ modalType,
+ onDelete,
+ onClose,
+}: SnippetModalProps) {
+ switch (modalType) {
+ case "move":
+ return (
+ <PLUGIN_SNIPPET_FOLDERS.MoveSnippetModal
+ snippet={snippet}
+ onClose={onClose}
+ />
+ );
+ case "delete":
+ return (
+ <DeleteSnippetModal
+ snippet={snippet}
+ onDelete={onDelete}
+ onClose={onClose}
+ />
+ );
+ default:
+ return null;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/index.ts
new file mode 100644
index 00000000000..5ebf454b9ce
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/components/SnippetMoreMenu/index.ts
@@ -0,0 +1 @@
+export { SnippetMoreMenu } from "./SnippetMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
new file mode 100644
index 00000000000..3f1ce99957b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
@@ -0,0 +1,13 @@
+.editorContainer {
+ overflow: hidden;
+}
+
+.editor {
+ height: 100%;
+ background-color: var(--mb-color-bg-light);
+}
+
+.sidebar {
+ flex-shrink: 0;
+ border-left: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
new file mode 100644
index 00000000000..a4cfcc910a4
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
@@ -0,0 +1,153 @@
+import { sql } from "@codemirror/lang-sql";
+import { useLayoutEffect, useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { t } from "ttag";
+
+import {
+ skipToken,
+ useGetSnippetQuery,
+ useUpdateSnippetMutation,
+} from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
+import { CodeMirror } from "metabase/common/components/CodeMirror";
+import { EntityCreationInfo } from "metabase/common/components/EntityCreationInfo";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useToast } from "metabase/common/hooks";
+import * as Urls from "metabase/lib/urls";
+import { Box, Center, Flex, Stack } from "metabase/ui";
+
+import { PaneHeaderActions } from "../../../common/components/PaneHeader";
+import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";
+import { SnippetHeader } from "../../components/SnippetHeader";
+
+import S from "./EditSnippetPage.module.css";
+
+type EditSnippetPageParams = {
+ snippetId: string;
+};
+
+type EditSnippetPageProps = {
+ params: EditSnippetPageParams;
+ route: Route;
+};
+
+export function EditSnippetPage({ params, route }: EditSnippetPageProps) {
+ const snippetId = Urls.extractEntityId(params.snippetId);
+ const [sendToast] = useToast();
+
+ const {
+ data: snippet,
+ isLoading,
+ error,
+ } = useGetSnippetQuery(snippetId ?? skipToken);
+
+ const [content, setContent] = useState(snippet?.content ?? "");
+ const [updateSnippet, { isLoading: isSaving }] = useUpdateSnippetMutation();
+
+ const isDirty = useMemo(
+ () => snippet != null && content !== snippet.content,
+ [content, snippet],
+ );
+
+ useLayoutEffect(() => {
+ if (snippet) {
+ setContent(snippet.content);
+ }
+ }, [snippet]);
+
+ const handleSave = async () => {
+ if (!snippet) {
+ return;
+ }
+
+ const { error } = await updateSnippet({
+ id: snippet.id,
+ content,
+ });
+
+ if (error) {
+ sendToast({
+ message: getErrorMessage(error, t`Failed to update snippet content`),
+ icon: "warning",
+ });
+ } else {
+ sendToast({
+ message: t`Snippet content updated`,
+ icon: "check",
+ });
+ }
+ };
+
+ const handleCancel = () => {
+ if (snippet) {
+ setContent(snippet.content);
+ }
+ };
+
+ const extensions = useMemo(() => [sql()], []);
+
+ if (isLoading || error || !snippet) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ gap={0}
+ data-testid="edit-snippet-page"
+ >
+ <SnippetHeader
+ snippet={snippet}
+ actions={
+ <PaneHeaderActions
+ isValid={true}
+ isDirty={isDirty}
+ isSaving={isSaving}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ />
+ }
+ />
+ <Flex flex={1} w="100%">
+ <Box flex={1} className={S.editorContainer}>
+ <CodeMirror
+ value={content}
+ onChange={setContent}
+ extensions={extensions}
+ height="100%"
+ className={S.editor}
+ data-testid="snippet-editor"
+ basicSetup={{
+ lineNumbers: true,
+ foldGutter: true,
+ highlightActiveLineGutter: true,
+ highlightActiveLine: true,
+ }}
+ />
+ </Box>
+ <Stack w={320} gap="lg" p="md" bg="bg-white" className={S.sidebar}>
+ <SnippetDescriptionSection snippet={snippet} />
+ <EntityCreationInfo
+ createdAt={snippet.created_at}
+ creator={snippet.creator}
+ />
+ </Stack>
+ </Flex>
+ </Stack>
+ <LeaveRouteConfirmModal
+ key={snippetId}
+ route={route}
+ isEnabled={isDirty && !isSaving}
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/index.ts
new file mode 100644
index 00000000000..0abe186ea13
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/index.ts
@@ -0,0 +1 @@
+export { EditSnippetPage } from "./EditSnippetPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
new file mode 100644
index 00000000000..3f1ce99957b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
@@ -0,0 +1,13 @@
+.editorContainer {
+ overflow: hidden;
+}
+
+.editor {
+ height: 100%;
+ background-color: var(--mb-color-bg-light);
+}
+
+.sidebar {
+ flex-shrink: 0;
+ border-left: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
new file mode 100644
index 00000000000..cf27c1fc1c9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
@@ -0,0 +1,150 @@
+import { sql } from "@codemirror/lang-sql";
+import { useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useCreateSnippetMutation } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
+import { CodeMirror } from "metabase/common/components/CodeMirror";
+import EditableText from "metabase/common/components/EditableText";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { useToast } from "metabase/common/hooks";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
+import { Box, Flex, Stack } from "metabase/ui";
+import type { RegularCollectionId } from "metabase-types/api";
+
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "../../../common/components/PaneHeader";
+
+import S from "./NewSnippetPage.module.css";
+
+const SNIPPET_NAME_MAX_LENGTH = 254;
+
+type NewSnippetPageProps = {
+ route: Route;
+};
+
+export function NewSnippetPage({ route }: NewSnippetPageProps) {
+ const dispatch = useDispatch();
+ const [sendToast] = useToast();
+ const [name, setName] = useState("");
+ const [description, setDescription] = useState("");
+ const [content, setContent] = useState("");
+ const [isCollectionPickerOpen, setIsCollectionPickerOpen] = useState(false);
+ const [createSnippet, { isLoading: isSaving }] = useCreateSnippetMutation();
+ const isValid = name.length > 0 && content.length > 0;
+
+ const handleCreateSnippet = async (
+ collectionId: RegularCollectionId | null,
+ ) => {
+ try {
+ const result = await createSnippet({
+ name,
+ content,
+ description: description.trim().length > 0 ? description.trim() : null,
+ collection_id: collectionId,
+ }).unwrap();
+ dispatch(push(Urls.dataStudioSnippet(result.id)));
+ } catch (error) {
+ sendToast({
+ message: getErrorMessage(error, t`Failed to create snippet`),
+ icon: "warning",
+ });
+ }
+ };
+
+ const handleSave = async () => {
+ if (!PLUGIN_SNIPPET_FOLDERS.isEnabled) {
+ await handleCreateSnippet(null);
+ return;
+ }
+ setIsCollectionPickerOpen(true);
+ };
+
+ const handleCancel = () => {
+ dispatch(push(Urls.dataStudioModeling()));
+ };
+
+ const handleCollectionSelected = async (
+ collectionId: RegularCollectionId | null,
+ ) => {
+ setIsCollectionPickerOpen(false);
+ await handleCreateSnippet(collectionId);
+ };
+
+ const extensions = useMemo(() => [sql()], []);
+
+ return (
+ <>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ gap={0}
+ data-testid="new-snippet-page"
+ >
+ <PaneHeader
+ title={
+ <PaneHeaderInput
+ initialValue={name}
+ placeholder={t`New SQL snippet`}
+ maxLength={SNIPPET_NAME_MAX_LENGTH}
+ isOptional
+ onContentChange={setName}
+ />
+ }
+ actions={
+ <PaneHeaderActions
+ isValid={isValid}
+ isDirty={true}
+ isSaving={isSaving}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ />
+ }
+ />
+ <Flex flex={1} w="100%">
+ <Box flex={1} className={S.editorContainer}>
+ <CodeMirror
+ value={content}
+ onChange={setContent}
+ extensions={extensions}
+ height="100%"
+ className={S.editor}
+ data-testid="snippet-editor"
+ basicSetup={{
+ lineNumbers: true,
+ foldGutter: true,
+ highlightActiveLineGutter: true,
+ highlightActiveLine: true,
+ }}
+ />
+ </Box>
+ <Stack w={320} gap="lg" p="md" bg="bg-white" className={S.sidebar}>
+ <Box mx="-5px">
+ <EditableText
+ initialValue={description}
+ placeholder={t`No description`}
+ isMarkdown
+ onChange={setDescription}
+ />
+ </Box>
+ </Stack>
+ </Flex>
+ </Stack>
+ <LeaveRouteConfirmModal route={route} isEnabled={!isSaving} />
+ <PLUGIN_SNIPPET_FOLDERS.CollectionPickerModal
+ isOpen={isCollectionPickerOpen}
+ onSelect={handleCollectionSelected}
+ onClose={() => setIsCollectionPickerOpen(false)}
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/index.ts
new file mode 100644
index 00000000000..e90424df5a5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/index.ts
@@ -0,0 +1 @@
+export { NewSnippetPage } from "./NewSnippetPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
new file mode 100644
index 00000000000..9c951e5d4aa
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
@@ -0,0 +1,53 @@
+import type { ReactNode } from "react";
+
+import { skipToken, useGetSnippetQuery } from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { Center, Flex } from "metabase/ui";
+
+import { SnippetHeader } from "../../components/SnippetHeader";
+
+export type SnippetDependenciesPageParams = {
+ snippetId: string;
+};
+
+type SnippetDependenciesPageProps = {
+ params?: SnippetDependenciesPageParams;
+ children?: ReactNode;
+};
+
+export function SnippetDependenciesPage({
+ params,
+ children,
+}: SnippetDependenciesPageProps) {
+ const snippetId = Urls.extractEntityId(params?.snippetId);
+
+ const {
+ data: snippet,
+ isLoading,
+ error,
+ } = useGetSnippetQuery(snippetId ?? skipToken);
+
+ if (snippetId == null || snippet == null || isLoading || error != null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <Flex direction="column" h="100%">
+ <SnippetHeader snippet={snippet} />
+ <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider
+ value={{
+ baseUrl: Urls.dataStudioSnippetDependencies(snippet.id),
+ defaultEntry: { id: snippet.id, type: "snippet" },
+ }}
+ >
+ {children}
+ </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/index.ts
new file mode 100644
index 00000000000..16bcc41dc37
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/SnippetDependenciesPage/index.ts
@@ -0,0 +1 @@
+export { SnippetDependenciesPage } from "./SnippetDependenciesPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/routes.tsx
new file mode 100644
index 00000000000..0babcbc183b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/routes.tsx
@@ -0,0 +1,24 @@
+import { IndexRoute, Route } from "react-router";
+
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+
+import { EditSnippetPage } from "./pages/EditSnippetPage";
+import { NewSnippetPage } from "./pages/NewSnippetPage";
+import { SnippetDependenciesPage } from "./pages/SnippetDependenciesPage";
+
+export function getDataStudioSnippetRoutes() {
+ return (
+ <>
+ <Route path="snippets/new" component={NewSnippetPage} />
+ <Route path="snippets/:snippetId" component={EditSnippetPage} />
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <Route
+ path="snippets/:snippetId/dependencies"
+ component={SnippetDependenciesPage}
+ >
+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
+ </Route>
+ )}
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
new file mode 100644
index 00000000000..6f3defa9538
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
@@ -0,0 +1,142 @@
+import { useMemo } from "react";
+import { match } from "ts-pattern";
+
+import { skipToken, useListCollectionItemsQuery } from "metabase/api";
+import type { MiniPickerCollectionItem } from "metabase/common/components/Pickers/MiniPicker/types";
+import type { LibraryCollectionType } from "metabase/plugins";
+import { getIsEmbeddingIframe } from "metabase/selectors/embed";
+import { getUserIsAdmin } from "metabase/selectors/user";
+import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
+import type {
+ CollectionItem,
+ CollectionItemModel,
+ CollectionType,
+} from "metabase-types/api";
+import type { State } from "metabase-types/store";
+
+// Must be in sync with CanAccessDataStudio in frontend/src/metabase/route-guards.tsx
+export function canAccessDataStudio(state: State) {
+ return getUserIsAdmin(state) && !getIsEmbeddingIframe(state);
+}
+
+export function getLibraryCollectionType(
+ type: CollectionType | null | undefined,
+): LibraryCollectionType | undefined {
+ switch (type) {
+ case "library":
+ return "root";
+ case "library-models":
+ return "models";
+ case "library-metrics":
+ return "metrics";
+ }
+}
+
+export function canPlaceEntityInCollection(
+ entityType: CollectionItemModel,
+ collectionType: CollectionType | null | undefined,
+): boolean {
+ if (getLibraryCollectionType(collectionType) == null) {
+ return true;
+ }
+
+ // Can't create subcollections in any of special collections
+ if (entityType === "collection") {
+ return false;
+ }
+
+ // Can't create anything in the root Library collection
+ if (collectionType === "library") {
+ return false;
+ }
+
+ if (collectionType === "library-models") {
+ return entityType === "dataset";
+ }
+
+ if (collectionType === "library-metrics") {
+ return entityType === "metric";
+ }
+
+ return false;
+}
+
+export function canPlaceEntityInCollectionOrDescendants(
+ entityType: CollectionItemModel,
+ collectionType: CollectionType | null | undefined,
+): boolean {
+ if (canPlaceEntityInCollection(entityType, collectionType)) {
+ return true;
+ }
+
+ if (collectionType === "library") {
+ return (
+ canPlaceEntityInCollection(entityType, "library-models") ||
+ canPlaceEntityInCollection(entityType, "library-metrics")
+ );
+ }
+
+ return false;
+}
+
+export const useGetLibraryCollection = ({
+ skip = false,
+}: { skip?: boolean } = {}) => {
+ const { data: libraryCollection, isLoading: isLoadingCollection } =
+ useGetLibraryCollectionQuery(undefined, { skip });
+ const hasStuff = Boolean(
+ libraryCollection &&
+ (libraryCollection?.below?.length || libraryCollection?.here?.length),
+ );
+ const { data: libraryItems, isLoading: isLoadingItems } =
+ useListCollectionItemsQuery(
+ libraryCollection && hasStuff ? { id: libraryCollection.id } : skipToken,
+ );
+
+ const subcollectionsWithStuff =
+ libraryItems?.data.filter(
+ (item) =>
+ item.model === "collection" &&
+ (item.here?.length || item.below?.length),
+ ) ?? [];
+
+ const showableLibrary = match({ subcollectionsWithStuff, hasStuff })
+ .when(
+ // if there's only one subcollection with stuff, we want to go straight into it
+ ({ subcollectionsWithStuff }) => subcollectionsWithStuff?.length === 1,
+ () => subcollectionsWithStuff[0],
+ )
+ .with(
+ { hasStuff: true },
+ () => libraryCollection as MiniPickerCollectionItem,
+ )
+ .otherwise(() => undefined);
+
+ return {
+ isLoading: isLoadingCollection || isLoadingItems,
+ data: showableLibrary,
+ };
+};
+
+export const useGetLibraryChildCollectionByType = ({
+ skip,
+ type,
+}: {
+ skip?: boolean;
+ type: CollectionType;
+}) => {
+ const { data: rootLibraryCollection } = useGetLibraryCollectionQuery(
+ undefined,
+ { skip },
+ );
+ const { data: libraryCollections } = useListCollectionItemsQuery(
+ rootLibraryCollection ? { id: rootLibraryCollection.id } : skipToken,
+ );
+ return useMemo(
+ () =>
+ libraryCollections?.data.find(
+ (collection: CollectionItem) => collection.type === type,
+ ),
+ [libraryCollections, type],
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
index 910ca1bbdf4..6e7ade773e9 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
@@ -134,7 +134,7 @@ function getItemIcon(item: DependencyItem): IconName {
}
if (item.type === "transform") {
- return "refresh_downstream";
+ return "transform";
}
return "unknown";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.unit.spec.tsx
index 91a1db194b1..bc96b0eea1f 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.unit.spec.tsx
@@ -188,7 +188,7 @@ describe("CheckDependenciesForm", () => {
});
expect(screen.getByRole("link", { name: /SQL transform/ })).toHaveAttribute(
"href",
- "/admin/transforms/1",
+ "/data-studio/transforms/1",
);
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/EntryPickerModal.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/EntryPickerModal.tsx
index a378add3c70..f11efd968eb 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/EntryPickerModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntryPickerModal/EntryPickerModal.tsx
@@ -106,7 +106,7 @@ export function EntryPickerModal({
displayName: t`Transforms`,
models: ["transform"],
folderModels: [],
- icon: "refresh_downstream",
+ icon: "transform",
render: ({ onItemSelect }) => (
<PLUGIN_TRANSFORMS.TransformPicker
value={value ? getTransformPickerItem(value) : undefined}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts
index 9d94039b13d..7e0fabe2b20 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts
@@ -2,11 +2,11 @@ import { msgid, ngettext, t } from "ttag";
import * as Urls from "metabase/lib/urls";
import type {
- CardCreatorInfo,
DependencyEntry,
DependencyNode,
Field,
LastEditInfo,
+ UserInfo,
} from "metabase-types/api";
import type { NodeTableInfo } from "./types";
@@ -25,7 +25,7 @@ export function getNodeCreatedAt(node: DependencyNode): string | null {
}
}
-export function getNodeCreatedBy(node: DependencyNode): CardCreatorInfo | null {
+export function getNodeCreatedBy(node: DependencyNode): UserInfo | null {
switch (node.type) {
case "card":
case "dashboard":
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts
index d259efdbdf1..dc75bb8723d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts
@@ -137,7 +137,7 @@ export function getNodeIconWithType(
case "table":
return "table";
case "transform":
- return "refresh_downstream";
+ return "transform";
case "snippet":
return "sql";
case "dashboard":
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts
index abacc4ef836..be40075f2a4 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts
@@ -53,7 +53,7 @@ describe("getNodeIcon", () => {
},
{
node: createMockTransformDependencyNode(),
- expectedIcon: "refresh_downstream",
+ expectedIcon: "transform",
},
{
node: createMockSnippetDependencyNode(),
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-get-dependencies-count/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-get-dependencies-count/index.ts
new file mode 100644
index 00000000000..c5fec5d61c6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-get-dependencies-count/index.ts
@@ -0,0 +1 @@
+export { useGetDependenciesCount } from "./use-get-dependencies-count";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-get-dependencies-count/use-get-dependencies-count.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-get-dependencies-count/use-get-dependencies-count.ts
new file mode 100644
index 00000000000..7433806c5ad
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-get-dependencies-count/use-get-dependencies-count.ts
@@ -0,0 +1,34 @@
+import { skipToken } from "@reduxjs/toolkit/query";
+
+import { useGetDependencyGraphQuery } from "metabase-enterprise/api";
+import type { GetDependencyGraphRequest } from "metabase-types/api";
+
+export function useGetDependenciesCount(args: GetDependencyGraphRequest) {
+ const { data: dependencyGraphData } = useGetDependencyGraphQuery(
+ args.id != null ? { id: Number(args.id), type: args.type } : skipToken,
+ );
+
+ if (!dependencyGraphData) {
+ return { dependenciesCount: 0, dependentsCount: 0 };
+ }
+
+ const thisTable = dependencyGraphData.nodes.find(
+ (node) => node.id === args.id,
+ );
+
+ const dependentsCount = Object.values(
+ thisTable?.dependents_count ?? {},
+ ).reduce((acc, curr) => acc + curr, 0);
+
+ if (!dependencyGraphData?.edges) {
+ return { dependenciesCount: 0, dependentsCount };
+ }
+
+ // Dependencies: edges pointing TO this table (things this table depends on)
+ const dependencies = dependencyGraphData.edges.filter(
+ (edge) =>
+ edge.to_entity_id === args.id && edge.to_entity_type === args.type,
+ ).length;
+
+ return { dependenciesCount: dependencies, dependentsCount };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts
index c687d30fa5b..1ebebdc4bd5 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts
@@ -7,7 +7,9 @@ import { CheckDependenciesTitle } from "./components/CheckDependenciesTitle";
import { useCheckCardDependencies } from "./hooks/use-check-card-dependencies";
import { useCheckSnippetDependencies } from "./hooks/use-check-snippet-dependencies";
import { useCheckTransformDependencies } from "./hooks/use-check-transform-dependencies";
+import { useGetDependenciesCount } from "./hooks/use-get-dependencies-count";
import { DependencyGraphPage } from "./pages/DependencyGraphPage";
+import { getDataStudioDependencyRoutes } from "./routes";
/**
* Initialize dependencies plugin features that depend on hasPremiumFeature.
@@ -15,6 +17,8 @@ import { DependencyGraphPage } from "./pages/DependencyGraphPage";
export function initializePlugin() {
if (hasPremiumFeature("dependencies")) {
PLUGIN_DEPENDENCIES.isEnabled = true;
+ PLUGIN_DEPENDENCIES.getDataStudioDependencyRoutes =
+ getDataStudioDependencyRoutes;
PLUGIN_DEPENDENCIES.DependencyGraphPage = DependencyGraphPage;
PLUGIN_DEPENDENCIES.CheckDependenciesForm = CheckDependenciesForm;
PLUGIN_DEPENDENCIES.CheckDependenciesModal = CheckDependenciesModal;
@@ -24,5 +28,6 @@ export function initializePlugin() {
useCheckSnippetDependencies;
PLUGIN_DEPENDENCIES.useCheckTransformDependencies =
useCheckTransformDependencies;
+ PLUGIN_DEPENDENCIES.useGetDependenciesCount = useGetDependenciesCount;
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx
new file mode 100644
index 00000000000..74c8a24ddb2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx
@@ -0,0 +1,7 @@
+import { IndexRoute } from "react-router";
+
+import { DependencyGraphPage } from "./pages/DependencyGraphPage";
+
+export function getDataStudioDependencyRoutes() {
+ return <IndexRoute component={DependencyGraphPage} />;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentCopyForm/DocumentCopyForm.tsx b/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentCopyForm/DocumentCopyForm.tsx
index f631df06103..777defe8b97 100644
--- a/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentCopyForm/DocumentCopyForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentCopyForm/DocumentCopyForm.tsx
@@ -63,6 +63,7 @@ export const DocumentCopyForm = ({
<FormCollectionPicker
name="collection_id"
title={t`Folder this document should be copied to`}
+ entityType="document"
/>
</div>
</Stack>
diff --git a/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentPage.tsx b/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentPage.tsx
index 21ef7a5e05f..66155eec534 100644
--- a/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/documents/components/DocumentPage.tsx
@@ -469,6 +469,7 @@ export const DocumentPage = ({
showPersonalCollections: true,
showRootCollection: true,
}}
+ entityType="document"
onChange={async (collection) => {
if (collectionPickerMode === "save") {
handleSave(canonicalCollectionId(collection.id));
diff --git a/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts b/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts
index ae655e7784c..82396177935 100644
--- a/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts
+++ b/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts
@@ -17,7 +17,7 @@ export const Transforms = createEntity({
objectSelectors: {
getName: (transform: Transform) => transform && transform.name,
getUrl: (transform: Transform) => transform && Urls.transform(transform.id),
- getIcon: () => ({ name: "refresh_downstream" }),
+ getIcon: () => ({ name: "transform" }),
getColor: () => color("brand"),
},
});
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/index.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/index.ts
index 55f5c2ed94d..ff1a0639eac 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/index.ts
@@ -10,6 +10,7 @@ import {
getDownloadWidgetMessageOverride,
} from "./query-downloads";
import {
+ canAccessDataModel,
dataModelPermissionAllowedPathGetter,
databaseManagementPermissionAllowedPathGetter,
getDataColumns,
@@ -20,6 +21,7 @@ import {
*/
export function initializePlugin() {
if (hasPremiumFeature("advanced_permissions")) {
+ PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel = canAccessDataModel;
PLUGIN_ADMIN_ALLOWED_PATH_GETTERS.push(
dataModelPermissionAllowedPathGetter,
);
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.ts
index 002b56738f1..96b1c22c154 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.ts
@@ -1,26 +1,32 @@
import { t } from "ttag";
import type { PermissionSubject } from "metabase/admin/permissions/types";
-import type { AdminPathKey } from "metabase-types/store";
+import { getUser } from "metabase/selectors/user";
+import type { AdminPathKey, State } from "metabase-types/store";
import type { UserWithFeaturePermissions } from "./types/user";
-const canAccessDataModel = (user?: UserWithFeaturePermissions) =>
+const canUserAccessDataModel = (user?: UserWithFeaturePermissions) =>
user?.permissions?.can_access_data_model ?? false;
-const canAccessDatabaseManagement = (user?: UserWithFeaturePermissions) =>
+const canUserAccessDatabaseManagement = (user?: UserWithFeaturePermissions) =>
user?.permissions?.can_access_db_details ?? false;
+export const canAccessDataModel = (state: State): boolean => {
+ const user = getUser(state);
+ return user != null && canUserAccessDataModel(user);
+};
+
export const dataModelPermissionAllowedPathGetter = (
user?: UserWithFeaturePermissions,
): AdminPathKey[] => {
- return canAccessDataModel(user) ? ["data-model"] : [];
+ return canUserAccessDataModel(user) ? ["data-model"] : [];
};
export const databaseManagementPermissionAllowedPathGetter = (
user?: UserWithFeaturePermissions,
): AdminPathKey[] => {
- return canAccessDatabaseManagement(user) ? ["databases"] : [];
+ return canUserAccessDatabaseManagement(user) ? ["databases"] : [];
};
export const getDataColumns = (subject: PermissionSubject) => {
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdminAppBarButton.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdminAppBarButton.tsx
deleted file mode 100644
index 820a3c60591..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdminAppBarButton.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useLocation } from "react-use";
-import { t } from "ttag";
-
-import { METAKEY } from "metabase/lib/browser";
-import * as Urls from "metabase/lib/urls";
-import { AdminActionButton } from "metabase/nav/components/AdminNavbar/AdminNavbar.styled";
-import { Icon, Tooltip } from "metabase/ui";
-
-import { trackMetabotChatOpened } from "../analytics";
-import { useMetabotAgent } from "../hooks";
-
-export const MetabotAdminAppBarButton = () => {
- const metabot = useMetabotAgent();
-
- const location = useLocation();
- const disabled = !location.pathname?.startsWith(Urls.transformList());
-
- const handleClick = () => {
- if (!metabot.visible) {
- trackMetabotChatOpened("header");
- }
-
- metabot.setVisible(!metabot.visible);
- };
-
- return (
- <Tooltip
- label={
- disabled
- ? `Metabot can't be viewed on this page`
- : t`Chat with Metabot (${METAKEY}+E)`
- }
- >
- <AdminActionButton disabled={disabled} onClick={handleClick}>
- <Icon name="metabot" />
- </AdminActionButton>
- </Tooltip>
- );
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
index 42b1df40830..01cb38bd1fe 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
@@ -140,7 +140,7 @@ export const AgentSuggestionMessage = ({
<Paper
shadow="none"
radius="md"
- bg="white"
+ bg="bg-white"
className={S.container}
data-testid="metabot-chat-suggestion"
>
@@ -152,7 +152,7 @@ export const AgentSuggestionMessage = ({
className={cx(opened && S.headerOpened)}
>
<Flex align="center" gap="sm">
- <Icon name="refresh_downstream" size="1rem" c="text-secondary" />
+ <Icon name="transform" size="1rem" c="text-secondary" />
<Text size="sm">{suggestedTransform.name}</Text>
</Flex>
<Flex align="center" gap="sm">
@@ -251,7 +251,7 @@ function getSourceCode(
function getTransformUrl(transform: SuggestedTransform): string {
return match(transform)
- .with({ id: P.number }, ({ id }) => Urls.transformQuery(id))
+ .with({ id: P.number }, ({ id }) => Urls.transform(id))
.with({ source: { type: "python" } }, () => Urls.newPythonTransform())
.with({ source: { type: "query" } }, () => Urls.newNativeTransform())
.exhaustive();
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx
new file mode 100644
index 00000000000..807cd110c23
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx
@@ -0,0 +1,45 @@
+import { t } from "ttag";
+
+import { METAKEY } from "metabase/lib/browser";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getLocation } from "metabase/selectors/routing";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
+
+import { trackMetabotChatOpened } from "../analytics";
+import { useMetabotAgent } from "../hooks";
+
+export const MetabotDataStudioButton = () => {
+ const metabot = useMetabotAgent();
+ const location = useSelector(getLocation);
+ const disabled = !location.pathname?.startsWith(Urls.transformList());
+
+ const handleClick = () => {
+ if (!metabot.visible) {
+ trackMetabotChatOpened("header");
+ }
+
+ metabot.setVisible(!metabot.visible);
+ };
+
+ const label = disabled
+ ? `Metabot can't be viewed on this page`
+ : t`Chat with Metabot (${METAKEY}+E)`;
+
+ return (
+ <Tooltip label={label}>
+ <ActionIcon
+ variant="subtle"
+ bd="1px solid var(--mb-color-border)"
+ p="sm"
+ h="2.25rem"
+ w="2.25rem"
+ disabled={disabled}
+ aria-label={label}
+ onClick={handleClick}
+ >
+ <Icon c={disabled ? undefined : "text-primary"} name="metabot" />
+ </ActionIcon>
+ </Tooltip>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioSidebar.tsx
new file mode 100644
index 00000000000..d13b63a73b0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioSidebar.tsx
@@ -0,0 +1,25 @@
+import { t } from "ttag";
+
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getLocation } from "metabase/selectors/routing";
+
+import { Metabot } from "./Metabot";
+
+export function MetabotDataStudioSidebar() {
+ const location = useSelector(getLocation);
+ const disabled = !location.pathname?.startsWith(Urls.transformList());
+
+ return (
+ <Metabot
+ hide={disabled}
+ config={{
+ preventRetryMessage: true,
+ preventClose: true,
+ hideSuggestedPrompts: true,
+ emptyText: t`Let's transform your data together!`,
+ suggestionModels: ["dataset", "transform", "table", "database"],
+ }}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx
index 84fed677790..2cd31a46ff0 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx
@@ -4,14 +4,15 @@ import { t } from "ttag";
import { createAdminRouteGuard } from "metabase/admin/utils";
import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import { PLUGIN_METABOT, PLUGIN_REDUCERS } from "metabase/plugins";
+import { MetabotPurchasePage } from "metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage";
+import { MetabotDataStudioSidebar } from "metabase-enterprise/metabot/components/MetabotDataStudioSidebar";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { Metabot } from "./components/Metabot";
import { MetabotAdminPage } from "./components/MetabotAdmin/MetabotAdminPage";
-import { MetabotPurchasePage } from "./components/MetabotAdmin/MetabotPurchasePage";
import { MetabotTrialPage } from "./components/MetabotAdmin/MetabotTrialPage";
-import { MetabotAdminAppBarButton } from "./components/MetabotAdminAppBarButton";
import { MetabotAppBarButton } from "./components/MetabotAppBarButton";
+import { MetabotDataStudioButton } from "./components/MetabotDataStudioButton";
import { getMetabotQuickLinks } from "./components/MetabotQuickLinks";
import { MetabotToggleButton } from "./components/MetabotToggleButton";
import { MetabotContext, MetabotProvider, defaultContext } from "./context";
@@ -63,7 +64,8 @@ export function initializePlugin() {
PLUGIN_METABOT.MetabotToggleButton = MetabotToggleButton;
PLUGIN_METABOT.MetabotAppBarButton = MetabotAppBarButton;
- PLUGIN_METABOT.MetabotAdminAppBarButton = MetabotAdminAppBarButton;
+ PLUGIN_METABOT.MetabotDataStudioButton = MetabotDataStudioButton;
+ PLUGIN_METABOT.MetabotDataStudioSidebar = MetabotDataStudioSidebar;
} else if (hasPremiumFeature("offer_metabase_ai_tiered")) {
PLUGIN_METABOT.getAdminPaths = () => [
{
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.tsx
index 38cf42b20f9..58c2c75990d 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.tsx
@@ -1,23 +1,16 @@
-import type Question from "metabase-lib/v1/Question";
-import type { Dashboard } from "metabase-types/api";
+import type { ModerationReview } from "metabase-types/api";
import ModerationReviewIcon from "../../containers/ModerationReviewIcon";
import { getLatestModerationReview } from "../../service";
export interface EntityModerationIconProps {
- question?: Question;
- dashboard?: Dashboard;
+ moderationReviews?: ModerationReview[];
}
export const EntityModerationIcon = ({
- question,
- dashboard,
+ moderationReviews = [],
}: EntityModerationIconProps): JSX.Element | null => {
- const entityReviews = question
- ? question.getModerationReviews()
- : dashboard?.moderation_reviews;
-
- const review = getLatestModerationReview(entityReviews);
+ const review = getLatestModerationReview(moderationReviews);
if (review) {
return <ModerationReviewIcon review={review} />;
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx
index 819dd8d7d12..dee954c688b 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx
@@ -1,10 +1,7 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import Question from "metabase-lib/v1/Question";
import {
- createMockCard,
- createMockDashboard,
createMockModerationReview,
createMockTokenFeatures,
} from "metabase-types/api/mocks";
@@ -35,11 +32,7 @@ describe("EntityModerationIcon", () => {
describe("questions", () => {
it("verified question", () => {
setup({
- question: new Question(
- createMockCard({
- moderation_reviews: [createMockModerationReview()],
- }),
- ),
+ moderationReviews: [createMockModerationReview()],
});
expect(screen.getByRole("img", { name: /verified/ })).toBeInTheDocument();
@@ -47,15 +40,11 @@ describe("EntityModerationIcon", () => {
it("not verified question", () => {
setup({
- question: new Question(
- createMockCard({
- moderation_reviews: [
- createMockModerationReview({
- status: null,
- }),
- ],
+ moderationReviews: [
+ createMockModerationReview({
+ status: null,
}),
- ),
+ ],
});
expect(
@@ -67,9 +56,7 @@ describe("EntityModerationIcon", () => {
describe("dashboards", () => {
it("verified dashboard", () => {
setup({
- dashboard: createMockDashboard({
- moderation_reviews: [createMockModerationReview()],
- }),
+ moderationReviews: [createMockModerationReview()],
});
expect(screen.getByRole("img", { name: /verified/ })).toBeInTheDocument();
@@ -77,13 +64,11 @@ describe("EntityModerationIcon", () => {
it("not verified dashboard", () => {
setup({
- dashboard: createMockDashboard({
- moderation_reviews: [
- createMockModerationReview({
- status: null,
- }),
- ],
- }),
+ moderationReviews: [
+ createMockModerationReview({
+ status: null,
+ }),
+ ],
});
expect(
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx
index 2540e35dc6e..dd70ed9f94f 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx
@@ -4,8 +4,7 @@ import { useEditItemVerificationMutation } from "metabase/api";
import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Icon, Menu } from "metabase/ui";
-import type Question from "metabase-lib/v1/Question";
-import type { Dashboard, ModerationReview } from "metabase-types/api";
+import type { Card, Dashboard, ModerationReview } from "metabase-types/api";
import {
MODERATION_STATUS,
@@ -13,44 +12,37 @@ import {
getStatusIcon,
isItemVerified,
} from "../service";
-import { getVerifyQuestionTitle } from "../utils";
+import { getVerifyCardTitle } from "../utils";
-export const useQuestionMenuItems = (
- question: Question,
- reload: () => void,
-) => {
+export const useCardMenuItems = (card: Card, reload?: () => void) => {
const latestModerationReview = getLatestModerationReview(
- question.getModerationReviews(),
+ card.moderation_reviews ?? [],
);
- const items = useMenuItems({
+ return useMenuItems({
reload,
- moderated_item_id: question.id(),
+ moderated_item_id: card.id,
moderated_item_type: "card",
latestModerationReview,
- title: getVerifyQuestionTitle(question),
+ title: getVerifyCardTitle(card),
});
-
- return items;
};
export const useDashboardMenuItems = (
dashboard: Dashboard,
- reload: () => void,
+ reload?: () => void,
) => {
const latestModerationReview = getLatestModerationReview(
- dashboard.moderation_reviews || [],
+ dashboard.moderation_reviews ?? [],
);
- const items = useMenuItems({
+ return useMenuItems({
reload,
moderated_item_id: dashboard.id as number,
moderated_item_type: "dashboard",
latestModerationReview,
title: t`Verify this dashboard`,
});
-
- return items;
};
const useMenuItems = ({
@@ -60,7 +52,7 @@ const useMenuItems = ({
title,
latestModerationReview,
}: {
- reload: () => void;
+ reload?: () => void;
moderated_item_id: number;
moderated_item_type: "card" | "dashboard";
title: string;
@@ -97,7 +89,7 @@ const useMenuItems = ({
});
}
- reload();
+ reload?.();
}}
data-testid={testId}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/index.ts b/enterprise/frontend/src/metabase-enterprise/moderation/index.ts
index c72c9a86df2..bfe942154d4 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/index.ts
@@ -9,10 +9,7 @@ import {
} from "./components/ModerationReviewBanner";
import { ModerationStatusIcon } from "./components/ModerationStatusIcon";
import QuestionModerationSection from "./components/QuestionModerationSection";
-import {
- useDashboardMenuItems,
- useQuestionMenuItems,
-} from "./hooks/useMenuItems";
+import { useCardMenuItems, useDashboardMenuItems } from "./hooks/useMenuItems";
import {
getModerationTimelineEvents,
getQuestionIcon,
@@ -35,7 +32,7 @@ export function initializePlugin() {
getStatusIcon,
getQuestionIcon,
getModerationTimelineEvents,
- useQuestionMenuItems,
+ useCardMenuItems,
useDashboardMenuItems,
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/utils.ts b/enterprise/frontend/src/metabase-enterprise/moderation/utils.ts
index fb9776723b0..595fceb703e 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/utils.ts
@@ -1,9 +1,9 @@
import { t } from "ttag";
-import type Question from "metabase-lib/v1/Question";
+import type { Card } from "metabase-types/api";
-export const getVerifyQuestionTitle = (question: Question): string => {
- const type = question.type();
+export const getVerifyCardTitle = (card: Card): string => {
+ const type = card.type;
if (type === "question") {
return t`Verify this question`;
diff --git a/enterprise/frontend/src/metabase-enterprise/plugins.js b/enterprise/frontend/src/metabase-enterprise/plugins.js
index 585339a8ce8..428844b0e12 100644
--- a/enterprise/frontend/src/metabase-enterprise/plugins.js
+++ b/enterprise/frontend/src/metabase-enterprise/plugins.js
@@ -20,6 +20,7 @@ import { initializePlugin as initializeCleanUp } from "./clean_up";
import { initializePlugin as initializeCollections } from "./collections";
import { initializePlugin as initializeContentTranslation } from "./content_translation";
import { initializePlugin as initializeContentVerification } from "./content_verification";
+import { initializePlugin as initializeDataStudio } from "./data-studio";
import { initializePlugin as initializeDatabaseReplication } from "./database_replication";
import { initializePlugin as initializeDatabaseRouting } from "./database_routing";
import { initializePlugin as initializeDependencies } from "./dependencies";
@@ -62,6 +63,7 @@ export function initializePlugins() {
initializeContentTranslation?.();
initializeContentVerification?.();
initializeDatabaseRouting?.();
+ initializeDataStudio?.();
initializeRemoteSync?.();
initializeWhitelabel?.();
initializeEmbedding?.();
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsx
index e5ac15436c1..7fa7faf332b 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsx
@@ -15,7 +15,11 @@ class CollectionRow extends Component {
render() {
const { snippetCollection: collection, setSnippetCollectionId } =
this.props;
- const onSelectCollection = () => setSnippetCollectionId(collection.id);
+ const onSelectCollection = () => {
+ if (setSnippetCollectionId) {
+ setSnippetCollectionId(collection.id);
+ }
+ };
return (
<div
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/MoveSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/MoveSnippetModal.tsx
new file mode 100644
index 00000000000..5beebb1cb94
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/MoveSnippetModal.tsx
@@ -0,0 +1,48 @@
+import { useState } from "react";
+import { t } from "ttag";
+
+import { useUpdateSnippetMutation } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
+import { useToast } from "metabase/common/hooks";
+import type { MoveSnippetModalProps } from "metabase/plugins";
+import type { CollectionId } from "metabase-types/api";
+
+import { SnippetCollectionPickerModal } from "../SnippetCollectionPickerModal";
+
+export function MoveSnippetModal({ snippet, onClose }: MoveSnippetModalProps) {
+ const [updateSnippet] = useUpdateSnippetMutation();
+ const [sendToast] = useToast();
+ const [isMoving, setIsMoving] = useState(false);
+
+ const handleMove = async (collectionId: CollectionId | null) => {
+ setIsMoving(true);
+
+ const { error } = await updateSnippet({
+ id: snippet.id,
+ collection_id: collectionId,
+ });
+
+ if (error) {
+ sendToast({
+ message: getErrorMessage(error, t`Failed to move snippet`),
+ icon: "warning",
+ });
+ } else {
+ sendToast({
+ message: t`Snippet moved`,
+ icon: "check",
+ });
+ onClose();
+ }
+
+ setIsMoving(false);
+ };
+
+ return (
+ <SnippetCollectionPickerModal
+ isOpen={!isMoving}
+ onSelect={handleMove}
+ onClose={onClose}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/index.ts b/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/index.ts
new file mode 100644
index 00000000000..7ed2f93f475
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/index.ts
@@ -0,0 +1 @@
+export { MoveSnippetModal } from "./MoveSnippetModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx
index 70e3c17390a..eb081530beb 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx
@@ -137,7 +137,6 @@ function SnippetCollectionForm({
name="name"
title={t`Give your folder a name`}
placeholder={t`Something short but sweet`}
- autoFocus
/>
<FormTextArea
name="description"
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx
index 50eb238383f..bb790c40448 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx
@@ -1,47 +1,33 @@
-import { useCallback } from "react";
import { t } from "ttag";
-import ModalContent from "metabase/common/components/ModalContent";
-import type { Collection } from "metabase-types/api";
+import type { SnippetFormModalProps } from "metabase/plugins";
+import { Modal } from "metabase/ui";
-import type { SnippetCollectionFormOwnProps } from "./SnippetCollectionForm";
import SnippetCollectionForm from "./SnippetCollectionForm";
-interface SnippetCollectionFormModalOwnProps
- extends Omit<SnippetCollectionFormOwnProps, "onCancel"> {
- onClose?: () => void;
-}
-
-type SnippetCollectionFormModalProps = SnippetCollectionFormModalOwnProps;
-
function SnippetFormModal({
collection,
- onSave,
+ onSaved,
onClose,
- ...props
-}: SnippetCollectionFormModalProps) {
+}: SnippetFormModalProps) {
const isEditing = collection.id != null;
const title = isEditing
? t`Editing ${collection.name}`
: t`Create your new folder`;
- const handleSave = useCallback(
- (snippetCollection: Collection) => {
- onSave?.(snippetCollection);
- onClose?.();
- },
- [onSave, onClose],
- );
+ const handleSave = () => {
+ onSaved?.();
+ onClose();
+ };
return (
- <ModalContent title={title} onClose={onClose}>
+ <Modal opened onClose={onClose} title={title}>
<SnippetCollectionForm
- {...props}
collection={collection}
onSave={handleSave}
onCancel={onClose}
/>
- </ModalContent>
+ </Modal>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.unit.spec.tsx
index b0715049394..4c817b5a16b 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.unit.spec.tsx
@@ -20,7 +20,7 @@ const TOP_SNIPPETS_FOLDER = {
type SetupOpts = {
folder?: Partial<Collection>;
- onClose?: null | (() => void);
+ onClose?: () => void;
};
async function setup({ folder = {}, onClose = jest.fn() }: SetupOpts = {}) {
@@ -53,10 +53,7 @@ async function setup({ folder = {}, onClose = jest.fn() }: SetupOpts = {}) {
});
renderWithProviders(
- <SnippetCollectionFormModal
- collection={folder}
- onClose={onClose || undefined}
- />,
+ <SnippetCollectionFormModal collection={folder} onClose={onClose} />,
);
if (folder.id) {
@@ -121,13 +118,6 @@ describe("SnippetCollectionFormModal", () => {
});
});
- it("doesn't show cancel button if onClose props is not set", async () => {
- await setup({ onClose: null });
- expect(
- screen.queryByRole("button", { name: "Cancel" }),
- ).not.toBeInTheDocument();
- });
-
it("calls onClose when cancel button is clicked", async () => {
const { onClose } = await setup();
await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
@@ -188,13 +178,6 @@ describe("SnippetCollectionFormModal", () => {
});
});
- it("doesn't show cancel button if onClose props is not set", async () => {
- await setupEditing({ onClose: null });
- expect(
- screen.queryByRole("button", { name: "Cancel" }),
- ).not.toBeInTheDocument();
- });
-
it("calls onClose when cancel button is clicked", async () => {
const { onClose } = await setupEditing();
await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.module.css b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.module.css
new file mode 100644
index 00000000000..6a3eb226fa6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.module.css
@@ -0,0 +1,12 @@
+.root {
+ opacity: 0;
+ transition: opacity 0.2s ease;
+}
+
+.root:focus-within {
+ opacity: 1;
+}
+
+li:hover .root {
+ opacity: 1;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
new file mode 100644
index 00000000000..418e9828565
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
@@ -0,0 +1,112 @@
+import { t } from "ttag";
+
+import { useUpdateCollectionMutation } from "metabase/api";
+import { isRootCollection } from "metabase/collections/utils";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import type { SnippetCollectionMenuProps } from "metabase/plugins";
+import { addUndo } from "metabase/redux/undo";
+import { getUserIsAdmin } from "metabase/selectors/user";
+import { Box, Button, Icon, Menu } from "metabase/ui";
+
+import S from "./SnippetCollectionMenu.module.css";
+
+export function SnippetCollectionMenu({
+ collection,
+ onEditDetails,
+ onChangePermissions,
+}: SnippetCollectionMenuProps) {
+ const dispatch = useDispatch();
+
+ const isAdmin = useSelector(getUserIsAdmin);
+ const [updateCollection] = useUpdateCollectionMutation();
+
+ const isRoot = isRootCollection(collection);
+ const isArchived = collection.archived;
+
+ if (!collection.can_write) {
+ return null;
+ }
+
+ const handleArchiveToggle = async () => {
+ const wasArchived = collection.archived;
+ try {
+ await updateCollection({
+ id: collection.id,
+ archived: !wasArchived,
+ }).unwrap();
+
+ dispatch(
+ addUndo({
+ message: wasArchived
+ ? t`"${collection.name}" has been unarchived`
+ : t`"${collection.name}" has been archived`,
+ undo: async () => {
+ await updateCollection({
+ id: collection.id,
+ archived: wasArchived,
+ });
+ },
+ }),
+ );
+ } catch (error) {
+ console.error("Failed to update collection:", error);
+ }
+ };
+
+ return (
+ <Box onClick={(e) => e.stopPropagation()} className={S.root}>
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Button
+ variant="subtle"
+ p={0}
+ h={20}
+ w={20}
+ c="text-medium"
+ aria-label={t`Collection options`}
+ >
+ <Icon name="ellipsis" size={16} />
+ </Button>
+ </Menu.Target>
+ <Menu.Dropdown>
+ {isArchived ? (
+ <Menu.Item
+ leftSection={<Icon name="unarchive" />}
+ onClick={handleArchiveToggle}
+ >
+ {t`Unarchive`}
+ </Menu.Item>
+ ) : (
+ <>
+ {!isRoot && (
+ <Menu.Item
+ leftSection={<Icon name="pencil" />}
+ onClick={() => onEditDetails(collection)}
+ >
+ {t`Edit folder details`}
+ </Menu.Item>
+ )}
+ {isAdmin && (
+ <Menu.Item
+ leftSection={<Icon name="lock" />}
+ onClick={() => onChangePermissions(collection.id)}
+ >
+ {t`Change permissions`}
+ </Menu.Item>
+ )}
+ {!isRoot && (
+ <Menu.Item
+ leftSection={<Icon name="archive" />}
+ onClick={handleArchiveToggle}
+ c="error"
+ >
+ {t`Archive`}
+ </Menu.Item>
+ )}
+ </>
+ )}
+ </Menu.Dropdown>
+ </Menu>
+ </Box>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/index.ts
new file mode 100644
index 00000000000..486d402da79
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/index.ts
@@ -0,0 +1 @@
+export * from "./SnippetCollectionMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
new file mode 100644
index 00000000000..9dedda738d5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
@@ -0,0 +1,28 @@
+import { useEffect } from "react";
+
+import CollectionPermissionsModal from "metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal";
+import Modal from "metabase/common/components/Modal";
+import SnippetCollections from "metabase/entities/snippet-collections";
+import { useDispatch } from "metabase/lib/redux";
+import type { SnippetCollectionPermissionsModalProps } from "metabase/plugins";
+
+export function SnippetCollectionPermissionsModal({
+ collectionId,
+ onClose,
+}: SnippetCollectionPermissionsModalProps) {
+ const dispatch = useDispatch();
+
+ useEffect(() => {
+ dispatch(SnippetCollections.actions.fetchList());
+ }, [dispatch]);
+
+ return (
+ <Modal onClose={onClose}>
+ <CollectionPermissionsModal
+ params={{ slug: collectionId }}
+ onClose={onClose}
+ namespace="snippets"
+ />
+ </Modal>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/index.ts b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/index.ts
new file mode 100644
index 00000000000..031c4e30d08
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/index.ts
@@ -0,0 +1 @@
+export { SnippetCollectionPermissionsModal } from "./SnippetCollectionPermissionsModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPickerModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPickerModal.tsx
new file mode 100644
index 00000000000..39c4f129e9c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPickerModal.tsx
@@ -0,0 +1,44 @@
+import { useCallback } from "react";
+import { t } from "ttag";
+
+import type { CollectionPickerValueItem } from "metabase/common/components/Pickers/CollectionPicker";
+import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";
+import type { SnippetCollectionPickerModalProps } from "metabase/plugins";
+import type { CollectionId } from "metabase-types/api";
+
+export function SnippetCollectionPickerModal({
+ isOpen,
+ onSelect,
+ onClose,
+}: SnippetCollectionPickerModalProps) {
+ const handleChange = useCallback(
+ (item: CollectionPickerValueItem) => {
+ const collectionId: CollectionId | null =
+ item.id === "root" ? null : item.id;
+ onSelect(collectionId);
+ },
+ [onSelect],
+ );
+
+ if (!isOpen) {
+ return null;
+ }
+
+ return (
+ <CollectionPickerModal
+ value={undefined}
+ onChange={handleChange}
+ onClose={onClose}
+ title={t`Select a folder for your snippet`}
+ options={{
+ namespace: "snippets",
+ showPersonalCollections: false,
+ showRootCollection: true,
+ showSearch: false,
+ hasConfirmButtons: true,
+ hasRecents: false,
+ showLibrary: false,
+ }}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/index.js b/enterprise/frontend/src/metabase-enterprise/snippets/index.js
index bc3e1910154..801b4b242ff 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/index.js
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/index.js
@@ -4,6 +4,7 @@ import CollectionPermissionsModal from "metabase/admin/permissions/components/Co
import { canonicalCollectionId } from "metabase/collections/utils";
import Modal from "metabase/common/components/Modal";
import {
+ PLUGIN_SNIPPET_FOLDERS,
PLUGIN_SNIPPET_SIDEBAR_HEADER_BUTTONS,
PLUGIN_SNIPPET_SIDEBAR_MODALS,
PLUGIN_SNIPPET_SIDEBAR_PLUS_MENU_OPTIONS,
@@ -13,7 +14,11 @@ import { hasPremiumFeature } from "metabase-enterprise/settings";
import CollectionOptionsButton from "./components/CollectionOptionsButton";
import CollectionRow from "./components/CollectionRow";
+import { MoveSnippetModal } from "./components/MoveSnippetModal";
import SnippetCollectionFormModal from "./components/SnippetCollectionFormModal";
+import { SnippetCollectionMenu } from "./components/SnippetCollectionMenu";
+import { SnippetCollectionPermissionsModal } from "./components/SnippetCollectionPermissionsModal";
+import { SnippetCollectionPickerModal } from "./components/SnippetCollectionPickerModal";
/**
* Initialize snippets plugin features that depend on hasPremiumFeature.
@@ -21,6 +26,13 @@ import SnippetCollectionFormModal from "./components/SnippetCollectionFormModal"
export function initializePlugin() {
if (hasPremiumFeature("snippet_collections")) {
// Add new menu option
+ PLUGIN_SNIPPET_FOLDERS.isEnabled = true;
+ PLUGIN_SNIPPET_FOLDERS.CollectionPickerModal = SnippetCollectionPickerModal;
+ PLUGIN_SNIPPET_FOLDERS.CollectionFormModal = SnippetCollectionFormModal;
+ PLUGIN_SNIPPET_FOLDERS.CollectionMenu = SnippetCollectionMenu;
+ PLUGIN_SNIPPET_FOLDERS.CollectionPermissionsModal =
+ SnippetCollectionPermissionsModal;
+ PLUGIN_SNIPPET_FOLDERS.MoveSnippetModal = MoveSnippetModal;
PLUGIN_SNIPPET_SIDEBAR_PLUS_MENU_OPTIONS.push((snippetSidebar) => ({
icon: "folder",
name: t`New folder`,
@@ -38,21 +50,15 @@ export function initializePlugin() {
PLUGIN_SNIPPET_SIDEBAR_MODALS.push(
(snippetSidebar) =>
snippetSidebar.state.modalSnippetCollection && (
- <Modal
+ <SnippetCollectionFormModal
+ collection={snippetSidebar.state.modalSnippetCollection}
onClose={() =>
snippetSidebar.setState({ modalSnippetCollection: null })
}
- >
- <SnippetCollectionFormModal
- collection={snippetSidebar.state.modalSnippetCollection}
- onClose={() =>
- snippetSidebar.setState({ modalSnippetCollection: null })
- }
- onSaved={() => {
- snippetSidebar.setState({ modalSnippetCollection: null });
- }}
- />
- </Modal>
+ onSaved={() => {
+ snippetSidebar.setState({ modalSnippetCollection: null });
+ }}
+ />
),
(snippetSidebar) =>
snippetSidebar.state.permissionsModalCollectionId != null && (
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
index fcd2e807c85..f92f669c033 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
@@ -38,7 +38,7 @@ export const ErrorUpdateToast = ({ error }: ErrorUpdateToastProps) => {
<Text c="text-white">{jt`Add a primary key in your database or set an ${(
<Anchor
component={Link}
- to={`/admin/datamodel/database/${table?.db_id}/schema/${table?.schema}/table/${table?.id}`}
+ to={`/data-studio/data/database/${table?.db_id}/schema/${table?.schema}/table/${table?.id}`}
disabled={!table}
key="entity-key-link"
target="_blank"
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
index ebd48a3008f..6f0a01d3960 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
@@ -6,6 +6,7 @@ import {
type DataPickerItem,
DataPickerModal,
} from "metabase/common/components/Pickers/DataPicker";
+import type { TablePickerValue } from "metabase/common/components/Pickers/TablePicker";
import {
ActionIcon,
Box,
@@ -63,6 +64,9 @@ export function TableSelector({
if (item.model === "database") {
return item.id !== database;
}
+ if (item.model === "collection" && item.id === "databases") {
+ return false;
+ }
return true;
}
@@ -105,11 +109,17 @@ export function TableSelector({
{isOpened && (
<DataPickerModal
title={t`Pick a table`}
- value={getDataPickerValue(table)}
+ value={getDataPickerValue(table) as TablePickerValue}
databaseId={database}
onChange={handleChange}
onClose={close}
shouldDisableItem={shouldDisableItem}
+ models={["table"]}
+ options={{
+ showLibrary: false,
+ showRootCollection: false,
+ showPersonalCollections: false,
+ }}
/>
)}
</>
@@ -118,7 +128,7 @@ export function TableSelector({
function getDataPickerValue(table: Table | undefined) {
if (!table) {
- return undefined;
+ return { model: "table", id: null };
}
return {
model: "table" as const,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
index 4176f8761e9..e2ca654d3af 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
@@ -2,10 +2,19 @@ import type { ReactNode } from "react";
import { ResizableBox } from "react-resizable";
import { t } from "ttag";
-import Link from "metabase/common/components/Link";
+import { ForwardRefLink } from "metabase/common/components/Link";
import * as Urls from "metabase/lib/urls";
import RunButtonWithTooltip from "metabase/query_builder/components/RunButtonWithTooltip";
-import { Box, Button, Checkbox, Flex, Icon, Stack, Tooltip } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ Button,
+ Flex,
+ Group,
+ Icon,
+ Stack,
+ Tooltip,
+} from "metabase/ui";
import { SHARED_LIB_IMPORT_PATH } from "metabase-enterprise/transforms-python/constants";
import { PythonEditor } from "../../PythonEditor";
@@ -111,7 +120,11 @@ function MaybeResizableBox({
children?: ReactNode;
}) {
if (!resizable) {
- return <Box h="100%">{children}</Box>;
+ return (
+ <Box w="100%" h="100%">
+ {children}
+ </Box>
+ );
}
return (
@@ -134,50 +147,52 @@ function SharedLibraryActions({
onChange: (source: string) => void;
}) {
return (
- <Stack className={S.libraryActions} p="md" gap="sm">
- <SharedLibraryImportToggle source={source} onChange={onChange} />
+ <Group className={S.libraryActions} p="md" gap="sm">
+ <SharedLibraryImportButton source={source} onChange={onChange} />
<SharedLibraryEditLink />
- </Stack>
+ </Group>
);
}
-function SharedLibraryImportToggle({
+function SharedLibraryImportButton({
source,
onChange,
}: {
source: string;
onChange: (source: string) => void;
}) {
- const hasSharedLib = hasImport(source, SHARED_LIB_IMPORT_PATH);
+ const label = t`Import common library`;
- function handleToggleSharedLib() {
+ const handleToggleSharedLib = () => {
if (hasImport(source, SHARED_LIB_IMPORT_PATH)) {
onChange(removeImport(source, SHARED_LIB_IMPORT_PATH));
} else {
onChange(insertImport(source, SHARED_LIB_IMPORT_PATH));
}
- }
+ };
return (
- <Checkbox
- label={t`Import common library`}
- checked={hasSharedLib}
- onChange={handleToggleSharedLib}
- size="sm"
- />
+ <Tooltip label={label}>
+ <ActionIcon aria-label={label} onClick={handleToggleSharedLib}>
+ <Icon name="reference" c="text-dark" />
+ </ActionIcon>
+ </Tooltip>
);
}
function SharedLibraryEditLink() {
+ const label = t`Edit common library`;
+
return (
- <Flex
- component={Link}
- target="_blank"
- to={Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH })}
- gap="sm"
- >
- <Icon name="pencil" />
- {t`Edit common library`}
- </Flex>
+ <Tooltip label={label}>
+ <ActionIcon
+ component={ForwardRefLink}
+ target="_blank"
+ aria-label={label}
+ to={Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH })}
+ >
+ <Icon name="pencil" c="text-dark" />
+ </ActionIcon>
+ </Tooltip>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsx
index 598e61acc1f..3ede1dde527 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.tsx
@@ -2,14 +2,12 @@ import { useHotkeys } from "@mantine/hooks";
import type { PythonTransformEditorProps } from "metabase/plugins";
import { Flex, Stack } from "metabase/ui";
-import { EditorHeader } from "metabase-enterprise/transforms/components/TransformEditor/EditorHeader";
import type { PythonTransformTableAliases, Table } from "metabase-types/api";
import { PythonDataPicker } from "./PythonDataPicker";
import { PythonEditorBody } from "./PythonEditorBody";
import { PythonEditorResults } from "./PythonEditorResults";
import {
- getValidationResult,
isPythonTransformSource,
updateTransformSignature,
useShouldShowPythonDebugger,
@@ -17,15 +15,10 @@ import {
} from "./utils";
export function PythonTransformEditor({
- name,
source,
proposedSource,
- isNew = false,
- isDirty = false,
- isSaving = false,
+ isDirty,
onChangeSource,
- onSave,
- onCancel,
onAcceptProposed,
onRejectProposed,
}: PythonTransformEditorProps) {
@@ -75,53 +68,34 @@ export function PythonTransformEditor({
useHotkeys([["mod+Enter", handleCmdEnter]], []);
- const validationResult = getValidationResult(source);
-
return (
- <Stack
- w="100%"
- h="100%"
- bg="bg-white"
- data-testid="transform-query-editor"
- gap={0}
- >
- <EditorHeader
- name={name}
- validationResult={validationResult}
- isNew={isNew}
- isDirty={isDirty}
- isSaving={isSaving}
- onSave={onSave}
- onCancel={onCancel}
+ <Flex h="100%" w="100%">
+ <PythonDataPicker
+ database={source["source-database"]}
+ tables={source["source-tables"]}
+ onChange={handleDataChange}
/>
- <Flex h="100%" w="100%">
- <PythonDataPicker
- database={source["source-database"]}
- tables={source["source-tables"]}
- onChange={handleDataChange}
+ <Stack w="100%" h="100%" gap={0}>
+ <PythonEditorBody
+ isRunnable={isPythonTransformSource(source)}
+ isRunning={isRunning}
+ isDirty={isDirty}
+ onRun={run}
+ onCancel={cancel}
+ source={source.body}
+ proposedSource={proposedSource?.body}
+ onChange={handleScriptChange}
+ withDebugger={showDebugger}
+ onAcceptProposed={onAcceptProposed}
+ onRejectProposed={onRejectProposed}
/>
- <Stack w="100%" h="100%" gap={0}>
- <PythonEditorBody
- isRunnable={isPythonTransformSource(source)}
+ {showDebugger && (
+ <PythonEditorResults
isRunning={isRunning}
- isDirty={isDirty}
- onRun={run}
- onCancel={cancel}
- source={source.body}
- proposedSource={proposedSource?.body}
- onChange={handleScriptChange}
- withDebugger={showDebugger}
- onAcceptProposed={onAcceptProposed}
- onRejectProposed={onRejectProposed}
+ executionResult={executionResult}
/>
- {showDebugger && (
- <PythonEditorResults
- isRunning={isRunning}
- executionResult={executionResult}
- />
- )}
- </Stack>
- </Flex>
- </Stack>
+ )}
+ </Stack>
+ </Flex>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts
index 0c8a963519e..e3945178838 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/utils.ts
@@ -219,25 +219,3 @@ export function useShouldShowPythonDebugger() {
const params = new URLSearchParams(location.search);
return params.get("debugger") === "1";
}
-
-export function getValidationResult(source: PythonTransformSourceDraft) {
- if (!source["source-database"]) {
- return { isValid: false, errorMessage: t`Select a source a database` };
- }
-
- if (source.body.trim() === "") {
- return {
- isValid: false,
- errorMessage: t`The Python script cannot be empty`,
- };
- }
-
- if (Object.keys(source["source-tables"]).length === 0) {
- return {
- isValid: false,
- errorMessage: t`Select at least one table to alias`,
- };
- }
-
- return { isValid: true };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.module.css
deleted file mode 100644
index a51a0a3cf90..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.module.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.grid {
- display: grid;
- grid-template-columns: max-content 1fr;
- gap: var(--mantine-spacing-sm) var(--mantine-spacing-md);
-}
-
-.alias {
- font-family: var(--mb-default-monospace-font-family);
- font-size: 0.75rem;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.tsx
deleted file mode 100644
index cce4a5b22b9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { t } from "ttag";
-
-import { skipToken, useGetTableQuery } from "metabase/api";
-import Link from "metabase/common/components/Link";
-import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
-import { Box, Group, Icon, type IconName, Loader, Stack } from "metabase/ui";
-import { SplitSection } from "metabase-enterprise/transforms/components/SplitSection";
-import type { Transform } from "metabase-types/api";
-
-import S from "./SourceSection.module.css";
-
-type SourceSectionProps = {
- transform: Transform;
-};
-
-export function SourceSection({ transform }: SourceSectionProps) {
- const { source } = transform;
- if (source.type !== "python") {
- return null;
- }
-
- const { "source-database": sourceDatabaseId, "source-tables": sourceTables } =
- source;
-
- return (
- <SplitSection
- label={t`Transform source`}
- description={t`The data sources for this Python transform, by alias.`}
- >
- <Stack p="lg" gap="sm" className={S.grid}>
- {Object.entries(sourceTables).map(([alias, tableId]) => (
- <TableWithAlias
- key={alias}
- alias={alias}
- tableId={tableId as number}
- databaseId={sourceDatabaseId as number}
- />
- ))}
- </Stack>
- </SplitSection>
- );
-}
-
-type TableWithAliasProps = {
- alias: string;
- tableId: number;
- databaseId: number;
-};
-
-function TableWithAlias({ alias, tableId, databaseId }: TableWithAliasProps) {
- const { data: table, isLoading } = useGetTableQuery(
- tableId ? { id: tableId } : skipToken,
- );
-
- if (isLoading) {
- return <Loader size="xs" data-testid="loader" />;
- }
-
- return (
- <>
- <Group className={S.alias}>{alias}</Group>
- <Group gap="sm">
- {table?.db && (
- <>
- <SourceItemLink
- label={table.db.name}
- icon="database"
- to={Urls.dataModelDatabase(table.db.id)}
- data-testid="source-database-link"
- />
- <SourceItemDivider />
- </>
- )}
- {table?.schema && (
- <>
- <SourceItemLink
- label={table.schema}
- icon="folder"
- to={Urls.dataModelSchema(databaseId, table.schema)}
- />
- <SourceItemDivider />
- </>
- )}
- <SourceItemLink
- label={table?.display_name || table?.name || `Table ${tableId}`}
- icon="table2"
- to={table ? Urls.queryBuilderTable(table.id, table.db_id) : undefined}
- />
- </Group>
- </>
- );
-}
-
-type SourceItemLinkProps = {
- label: string;
- icon: IconName;
- to?: string;
-};
-
-function SourceItemLink({ label, icon, to }: SourceItemLinkProps) {
- return (
- <Link className={CS.link} to={to ?? ""} disabled={to == null}>
- <Group gap="xs" align="center" justify="center">
- <Icon name={icon} />
- <Box>{label}</Box>
- </Group>
- </Link>
- );
-}
-
-function SourceItemDivider() {
- return <Icon name="chevronright" size={8} />;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.unit.spec.tsx
deleted file mode 100644
index 16a3644593b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/SourceSection.unit.spec.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { setupTableEndpoints } from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import type { ConcreteTableId, Table, Transform } from "metabase-types/api";
-import { createMockTable } from "metabase-types/api/mocks";
-import {
- createMockPythonTransformSource,
- createMockTransform,
-} from "metabase-types/api/mocks/transform";
-
-import { SourceSection } from "./SourceSection";
-
-const TABLE_A = createMockTable({
- id: 1,
- name: "table_a",
- display_name: "Table A",
- schema: "schema_a",
-});
-
-const TABLE_B = createMockTable({
- id: 2,
- name: "table_b",
- display_name: "Table B",
- schema: "schema_b",
-});
-
-type SetupOpts = {
- tables?: Table[];
- transform?: Transform;
-};
-
-function setup({
- tables = [TABLE_A, TABLE_B],
- transform = createMockTransform(),
-}: SetupOpts = {}) {
- for (const table of tables) {
- setupTableEndpoints(table);
- }
- renderWithProviders(<SourceSection transform={transform} />);
-}
-
-describe("SourceSection", () => {
- it("should render nothing for query transform", () => {
- setup({
- transform: createMockTransform({
- source: {
- type: "query",
- query: { type: "query", database: 1, query: { "source-table": 1 } },
- },
- }),
- });
- expect(screen.queryByText("Transform source")).not.toBeInTheDocument();
- });
-
- it("should render the section with label and description", async () => {
- setup({
- transform: createMockTransform({
- source: createMockPythonTransformSource({
- sourceTables: {
- orders: TABLE_A.id as ConcreteTableId,
- customers: TABLE_B.id as ConcreteTableId,
- },
- }),
- }),
- });
-
- expect(screen.getByText("Transform source")).toBeInTheDocument();
- expect(
- screen.getByText("The data sources for this Python transform, by alias."),
- ).toBeInTheDocument();
-
- await waitFor(() => {
- expect(screen.queryAllByTestId("loader")).toHaveLength(0);
- });
-
- expect(screen.getByText("orders")).toBeInTheDocument();
- expect(screen.getByText("schema_a")).toBeInTheDocument();
- expect(screen.getByText("Table A")).toBeInTheDocument();
-
- expect(screen.getByText("customers")).toBeInTheDocument();
- expect(screen.getByText("schema_b")).toBeInTheDocument();
- expect(screen.getByText("Table B")).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/index.ts
deleted file mode 100644
index 364b1d65f4c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/SourceSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SourceSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
index 3cdb316c773..2d37e8104b5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/index.tsx
@@ -1,17 +1,10 @@
-import { Route } from "react-router";
-import { t } from "ttag";
-
-import { AdminNavItem } from "metabase/admin/components/AdminNav";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { hasPremiumFeature } from "metabase-enterprise/settings";
-import { FullWidthTransformPageLayout } from "metabase-enterprise/transforms/pages/TransformPageLayout";
import { PythonTransformEditor } from "./components/PythonTransformEditor";
-import { SourceSection } from "./components/SourceSection";
-import { SHARED_LIB_IMPORT_PATH } from "./constants";
-import { PythonLibraryEditorPage } from "./pages/PythonLibraryEditorPage";
import { PythonRunnerSettingsPage } from "./pages/PythonRunnerSettingsPage";
+import { getPythonLibraryRoutes } from "./routes";
+import { getPythonSourceValidationResult } from "./utils";
/**
* Initialize transforms-python plugin features that depend on hasPremiumFeature.
@@ -19,23 +12,11 @@ import { PythonRunnerSettingsPage } from "./pages/PythonRunnerSettingsPage";
export function initializePlugin() {
if (hasPremiumFeature("transforms-python")) {
PLUGIN_TRANSFORMS_PYTHON.isEnabled = true;
+ PLUGIN_TRANSFORMS_PYTHON.getPythonLibraryRoutes = getPythonLibraryRoutes;
+ PLUGIN_TRANSFORMS_PYTHON.getPythonSourceValidationResult =
+ getPythonSourceValidationResult;
+ PLUGIN_TRANSFORMS_PYTHON.TransformEditor = PythonTransformEditor;
PLUGIN_TRANSFORMS_PYTHON.PythonRunnerSettingsPage =
PythonRunnerSettingsPage;
- PLUGIN_TRANSFORMS_PYTHON.TransformEditor = PythonTransformEditor;
- PLUGIN_TRANSFORMS_PYTHON.SourceSection = SourceSection;
-
- PLUGIN_TRANSFORMS_PYTHON.getAdminRoutes = () => (
- <Route component={FullWidthTransformPageLayout}>
- <Route path="library/:path" component={PythonLibraryEditorPage} />
- </Route>
- );
-
- PLUGIN_TRANSFORMS_PYTHON.getTransformsNavLinks = () => (
- <AdminNavItem
- label={t`Python library`}
- path={Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH })}
- icon="code_block"
- />
- );
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.css
index 7b3022ff2fd..d08a0bde78f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.css
@@ -2,4 +2,5 @@
/* HACK: 133px is the height of the headers */
height: calc(100vh - 133px);
flex-grow: 1;
+ background-color: var(--mb-color-bg-light);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
index b5254eebd41..19a03551c59 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
@@ -1,17 +1,21 @@
-import { useEffect, useState } from "react";
+import { useLayoutEffect, useState } from "react";
+import type { Route } from "react-router";
import { t } from "ttag";
-import Button from "metabase/common/components/Button";
-import EditBar from "metabase/common/components/EditBar";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { isResourceNotFoundError } from "metabase/lib/errors";
import type * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Box, Flex } from "metabase/ui";
+import { Box, Button, Flex, Group } from "metabase/ui";
import {
useGetPythonLibraryQuery,
useUpdatePythonLibraryMutation,
} from "metabase-enterprise/api/python-transform-library";
+import {
+ PaneHeader,
+ PanelHeaderTitle,
+} from "metabase-enterprise/data-studio/common/components/PaneHeader";
import { PythonEditor } from "../../components/PythonEditor";
@@ -19,6 +23,7 @@ import S from "./PythonLibraryEditorPage.module.css";
type PythonLibraryEditorPageProps = {
params: Urls.TransformPythonLibraryParams;
+ route: Route;
};
const EMPTY_LIBRARY_SOURCE = `
@@ -30,6 +35,7 @@ const EMPTY_LIBRARY_SOURCE = `
export function PythonLibraryEditorPage({
params,
+ route,
}: PythonLibraryEditorPageProps) {
const { path } = params;
const [source, setSource] = useState("");
@@ -68,7 +74,11 @@ export function PythonLibraryEditorPage({
}
// When the library loads, set the source to the current library source
- useEffect(handleRevert, [isLoading, error, library]);
+ useLayoutEffect(() => {
+ if (library != null) {
+ setSource(library.source);
+ }
+ }, [library]);
const isDirty = source !== (library?.source ?? EMPTY_LIBRARY_SOURCE);
@@ -81,21 +91,24 @@ export function PythonLibraryEditorPage({
}
return (
- <Flex h="100%" w="100%" bg="bg-light" gap={0} direction="column">
- <LibraryEditorHeader
- onSave={handleSave}
- onRevert={handleRevert}
- isDirty={isDirty}
- isSaving={isSaving}
- />
- <PythonEditor
- value={source}
- onChange={setSource}
- withPandasCompletions
- className={S.editor}
- data-testid="python-editor"
- />
- </Flex>
+ <>
+ <Flex h="100%" w="100%" gap={0} direction="column">
+ <LibraryEditorHeader
+ onSave={handleSave}
+ onRevert={handleRevert}
+ isDirty={isDirty}
+ isSaving={isSaving}
+ />
+ <PythonEditor
+ value={source}
+ onChange={setSource}
+ withPandasCompletions
+ className={S.editor}
+ data-testid="python-editor"
+ />
+ </Flex>
+ <LeaveRouteConfirmModal route={route} isEnabled={isDirty} />
+ </>
);
}
@@ -111,30 +124,21 @@ export function LibraryEditorHeader({
onRevert: () => void;
}) {
return (
- <EditBar
- title={t`You are editing the shared Python library`}
- admin
- data-testid="library-editor-header"
- buttons={[
- <Button
- key="save"
- onClick={onRevert}
- primary
- small
- disabled={!isDirty || isSaving}
- >
- {t`Revert`}
- </Button>,
- <Button
- key="save"
- onClick={onSave}
- primary
- small
- disabled={!isDirty || isSaving}
- >
- {t`Save`}
- </Button>,
- ]}
+ <PaneHeader
+ title={<PanelHeaderTitle>{t`Python library`}</PanelHeaderTitle>}
+ actions={
+ (isDirty || isSaving) && (
+ <Group>
+ <Button disabled={isSaving} onClick={onRevert}>
+ {t`Revert`}
+ </Button>
+ <Button variant="filled" disabled={isSaving} onClick={onSave}>
+ {t`Save`}
+ </Button>
+ </Group>
+ )
+ }
+ data-testid="python-library-header"
/>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx
new file mode 100644
index 00000000000..fb92c0efa61
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx
@@ -0,0 +1,7 @@
+import { Route } from "react-router";
+
+import { PythonLibraryEditorPage } from "./pages/PythonLibraryEditorPage";
+
+export function getPythonLibraryRoutes() {
+ return <Route path="library/:path" component={PythonLibraryEditorPage} />;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/utils.ts
new file mode 100644
index 00000000000..8cba43228ed
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/utils.ts
@@ -0,0 +1,28 @@
+import { t } from "ttag";
+
+import type { PythonTransformSourceValidationResult } from "metabase/plugins";
+import type { PythonTransformSourceDraft } from "metabase-types/api";
+
+export function getPythonSourceValidationResult(
+ source: PythonTransformSourceDraft,
+): PythonTransformSourceValidationResult {
+ if (!source["source-database"]) {
+ return { isValid: false, errorMessage: t`Select a source a database` };
+ }
+
+ if (source.body.trim() === "") {
+ return {
+ isValid: false,
+ errorMessage: t`The Python script cannot be empty`,
+ };
+ }
+
+ if (Object.keys(source["source-tables"]).length === 0) {
+ return {
+ isValid: false,
+ errorMessage: t`Select at least one table to alias`,
+ };
+ }
+
+ return { isValid: true };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/analytics.ts b/enterprise/frontend/src/metabase-enterprise/transforms/analytics.ts
index 43cbc9c96e1..a16dfbab380 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/analytics.ts
@@ -3,42 +3,33 @@ import type { TransformId, TransformJobId } from "metabase-types/api";
export function trackTransformTriggerManualRun({
transformId,
- triggeredFrom,
}: {
transformId: TransformId;
- triggeredFrom: "transform-page";
}) {
trackSimpleEvent({
event: "transform_trigger_manual_run",
target_id: transformId,
- triggered_from: triggeredFrom,
});
}
export function trackTransformJobTriggerManualRun({
jobId,
- triggeredFrom,
}: {
jobId: TransformJobId;
- triggeredFrom: "job-page";
}) {
trackSimpleEvent({
event: "transform_job_trigger_manual_run",
target_id: jobId,
- triggered_from: triggeredFrom,
});
}
export function trackTransformCreate({
- triggeredFrom,
creationType,
}: {
- triggeredFrom: "transform-page-create-menu";
creationType: "query" | "native" | "python" | "saved-question";
}) {
trackSimpleEvent({
event: "transform_create",
- triggered_from: triggeredFrom,
event_detail: creationType,
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.module.css
new file mode 100644
index 00000000000..6c501d14c20
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.module.css
@@ -0,0 +1,3 @@
+.body {
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx
new file mode 100644
index 00000000000..4d541a9145f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx
@@ -0,0 +1,43 @@
+import type { ReactNode } from "react";
+
+import { Flex, Stack } from "metabase/ui";
+
+import S from "./ColumnLayout.module.css";
+
+type ColumnLayoutProps = {
+ children?: ReactNode;
+ "data-testid"?: string;
+};
+
+export function ColumnLayout({
+ children,
+ "data-testid": dataTestId,
+}: ColumnLayoutProps) {
+ return (
+ <Flex direction="column" h="100%" data-testid={dataTestId}>
+ {children}
+ </Flex>
+ );
+}
+
+type ColumnLayoutBodyProps = {
+ children?: ReactNode;
+};
+
+export function ColumnLayoutBody({ children }: ColumnLayoutBodyProps) {
+ return (
+ <Flex
+ className={S.body}
+ flex={1}
+ justify="center"
+ pt="3.5rem"
+ pb="xl"
+ px="xl"
+ bg="bg-light"
+ >
+ <Stack flex={1} gap="3.5rem" maw="50rem">
+ {children}
+ </Stack>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/index.ts
new file mode 100644
index 00000000000..88bc71753ae
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/index.ts
@@ -0,0 +1 @@
+export * from "./ColumnLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.module.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.tsx
new file mode 100644
index 00000000000..b9de04fc777
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.tsx
@@ -0,0 +1,71 @@
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { AdminContentTable } from "metabase/common/components/AdminContentTable";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { Card } from "metabase/ui";
+import { useListTransformJobTransformsQuery } from "metabase-enterprise/api";
+import type { Transform, TransformJobId } from "metabase-types/api";
+
+import { ListEmptyState } from "../../ListEmptyState";
+import { TitleSection } from "../../TitleSection";
+
+import S from "./DependenciesSection.module.css";
+
+type DependenciesSectionProps = {
+ jobId: TransformJobId;
+};
+
+export function DependenciesSection({ jobId }: DependenciesSectionProps) {
+ const {
+ data: transforms = [],
+ error,
+ isLoading,
+ } = useListTransformJobTransformsQuery(jobId);
+
+ return (
+ <TitleSection
+ label={t`Transforms`}
+ description={t`Transforms will be run in this order.`}
+ >
+ {isLoading || error != null ? (
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ ) : transforms.length === 0 ? (
+ <Card shadow="none" withBorder>
+ <ListEmptyState label={t`There are no transforms for this job.`} />
+ </Card>
+ ) : (
+ <TransformTable transforms={transforms} />
+ )}
+ </TitleSection>
+ );
+}
+
+type TransformTableProps = {
+ transforms: Transform[];
+};
+
+export function TransformTable({ transforms }: TransformTableProps) {
+ const dispatch = useDispatch();
+
+ const handleRowClick = (transform: Transform) => {
+ dispatch(push(Urls.transform(transform.id)));
+ };
+
+ return (
+ <AdminContentTable columnTitles={[t`Transform`, t`Target`]}>
+ {transforms.map((transform) => (
+ <tr
+ key={transform.id}
+ className={S.row}
+ onClick={() => handleRowClick(transform)}
+ >
+ <td className={S.wrap}>{transform.name}</td>
+ <td className={S.wrap}>{transform.target.name}</td>
+ </tr>
+ ))}
+ </AdminContentTable>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
new file mode 100644
index 00000000000..5accb5e9bf6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
@@ -0,0 +1,58 @@
+import type { ReactNode } from "react";
+
+import {
+ PaneHeader,
+ PaneHeaderInput,
+} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
+
+import { NAME_MAX_LENGTH } from "../../constants";
+import { ColumnLayout, ColumnLayoutBody } from "../ColumnLayout";
+
+import { DependenciesSection } from "./DependenciesSection";
+import { ScheduleSection } from "./ScheduleSection";
+import { TagSection } from "./TagSection";
+import type { TransformJobInfo } from "./types";
+
+type JobEditorProps = {
+ job: TransformJobInfo;
+ menu?: ReactNode;
+ actions?: ReactNode;
+ onNameChange: (name: string) => void;
+ onScheduleChange: (
+ schedule: string,
+ uiDisplayType: ScheduleDisplayType,
+ ) => void;
+ onTagListChange: (tagIds: TransformTagId[]) => void;
+};
+
+export function JobEditor({
+ job,
+ menu,
+ actions,
+ onNameChange,
+ onScheduleChange,
+ onTagListChange,
+}: JobEditorProps) {
+ return (
+ <ColumnLayout data-testid="jobs-editor">
+ <PaneHeader
+ title={
+ <PaneHeaderInput
+ initialValue={job.name}
+ maxLength={NAME_MAX_LENGTH}
+ onChange={onNameChange}
+ />
+ }
+ menu={menu}
+ actions={actions}
+ data-testid="jobs-header"
+ />
+ <ColumnLayoutBody>
+ <ScheduleSection job={job} onScheduleChange={onScheduleChange} />
+ <TagSection job={job} onTagsChange={onTagListChange} />
+ {job.id != null && <DependenciesSection jobId={job.id} />}
+ </ColumnLayoutBody>
+ </ColumnLayout>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
index 3ca950c6b76..b64e6d650ab 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
@@ -13,9 +13,9 @@ import type {
} from "metabase-types/api";
import { trackTransformJobTriggerManualRun } from "../../../analytics";
-import { RunButton } from "../../../components/RunButton";
-import { RunStatus } from "../../../components/RunStatus";
-import { SplitSection } from "../../../components/SplitSection";
+import { RunButton } from "../../RunButton";
+import { RunStatus } from "../../RunStatus";
+import { TitleSection } from "../../TitleSection";
import type { TransformJobInfo } from "../types";
type ScheduleSectionProps = {
@@ -31,7 +31,7 @@ export function ScheduleSection({
onScheduleChange,
}: ScheduleSectionProps) {
return (
- <SplitSection
+ <TitleSection
label={t`Schedule`}
description={t`Configure when this job should run.`}
>
@@ -46,7 +46,7 @@ export function ScheduleSection({
/>
<RunButtonSection job={job} />
</Group>
- </SplitSection>
+ </TitleSection>
);
}
@@ -122,10 +122,7 @@ function RunButtonSection({ job }: RunButtonSectionProps) {
return;
}
- trackTransformJobTriggerManualRun({
- jobId: job.id,
- triggeredFrom: "job-page",
- });
+ trackTransformJobTriggerManualRun({ jobId: job.id });
const { error } = await runJob(job.id);
@@ -137,6 +134,7 @@ function RunButtonSection({ job }: RunButtonSectionProps) {
return (
<Tooltip label={t`This job doesn't have tags to run.`} disabled={hasTags}>
<RunButton
+ id={job.id}
run={job.last_run}
isDisabled={!isSaved || !hasTags}
onRun={handleRun}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/ScheduleSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/ScheduleSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ScheduleSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/ScheduleSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.tsx
similarity index 77%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.tsx
index 342d3e981b2..28a9909d68d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { Box } from "metabase/ui";
import type { TransformTagId } from "metabase-types/api";
-import { SplitSection } from "../../../components/SplitSection";
-import { TagMultiSelect } from "../../../components/TagMultiSelect";
+import { TagMultiSelect } from "../../TagMultiSelect";
+import { TitleSection } from "../../TitleSection";
import type { TransformJobInfo } from "../types";
type TagSectionProps = {
@@ -14,13 +14,13 @@ type TagSectionProps = {
export function TagSection({ job, onTagsChange }: TagSectionProps) {
return (
- <SplitSection
+ <TitleSection
label={t`Tags to run`}
description={t`This job will run all transforms tagged with any of the tags you pick here.`}
>
<Box p="xl">
<TagMultiSelect tagIds={job.tag_ids ?? []} onChange={onTagsChange} />
</Box>
- </SplitSection>
+ </TitleSection>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/TagSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TagSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/index.ts
new file mode 100644
index 00000000000..22f337d8623
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/index.ts
@@ -0,0 +1,2 @@
+export * from "./JobEditor";
+export * from "./types";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/types.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/types.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/types.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/DependenciesSection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/DependenciesSection.module.css
deleted file mode 100644
index 81b6f530d41..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/DependenciesSection.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.row {
- cursor: pointer;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/DependenciesSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/DependenciesSection.tsx
deleted file mode 100644
index 624b09ac857..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/DependenciesSection/DependenciesSection.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { t } from "ttag";
-
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useListTransformJobTransformsQuery } from "metabase-enterprise/api";
-import type { TransformJobId } from "metabase-types/api";
-
-import { TitleSection } from "../../../components/TitleSection";
-import { TransformTable } from "../../../components/TransformTable";
-import { ListEmptyState } from "../../ListEmptyState";
-
-type DependenciesSectionProps = {
- jobId: TransformJobId;
-};
-
-export function DependenciesSection({ jobId }: DependenciesSectionProps) {
- const {
- data: transforms = [],
- error,
- isLoading,
- } = useListTransformJobTransformsQuery(jobId);
-
- return (
- <TitleSection
- label={t`Transforms`}
- description={t`Transforms will be run in this order.`}
- >
- {isLoading || error != null ? (
- <LoadingAndErrorWrapper loading={isLoading} error={error} />
- ) : transforms.length === 0 ? (
- <ListEmptyState label={t`There are no transforms for this job.`} />
- ) : (
- <TransformTable transforms={transforms} />
- )}
- </TitleSection>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.tsx
deleted file mode 100644
index 3b2fc9136f3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { t } from "ttag";
-
-import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";
-import * as Urls from "metabase/lib/urls";
-
-import type { TransformJobInfo } from "../types";
-
-type HeaderSectionProps = {
- job: TransformJobInfo;
-};
-
-export function HeaderSection({ job }: HeaderSectionProps) {
- return (
- <BrowserCrumbs
- crumbs={[
- {
- title: t`Jobs`,
- to: Urls.transformJobList(),
- },
- {
- title: job.name,
- to: job.id != null ? Urls.transformJob(job.id) : "",
- },
- ]}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.unit.spec.tsx
deleted file mode 100644
index 5f5501414e6..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/HeaderSection.unit.spec.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Route } from "react-router";
-
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockTransformJob } from "metabase-types/api/mocks";
-
-import type { TransformJobInfo } from "../types";
-
-import { HeaderSection } from "./HeaderSection";
-
-type SetupOpts = {
- job?: TransformJobInfo;
-};
-
-function setup({ job = createMockTransformJob() }: SetupOpts = {}) {
- renderWithProviders(
- <Route path="/" component={() => <HeaderSection job={job} />} />,
- { withRouter: true },
- );
-}
-
-describe("HeaderSection", () => {
- it("should render links", () => {
- setup({ job: createMockTransformJob({ name: "Daily job" }) });
- expect(screen.getByRole("link", { name: "Jobs" })).toBeInTheDocument();
- expect(screen.getByRole("link", { name: "Daily job" })).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/index.ts
deleted file mode 100644
index 4d41590ab85..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/HeaderSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./HeaderSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/JobView.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/JobView.tsx
deleted file mode 100644
index 2d9c175e45e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/JobView.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Stack } from "metabase/ui";
-import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
-
-import { DependenciesSection } from "./DependenciesSection";
-import { HeaderSection } from "./HeaderSection";
-import { ManageSection } from "./ManageSection";
-import { NameSection } from "./NameSection";
-import { SaveSection } from "./SaveSection";
-import { ScheduleSection } from "./ScheduleSection";
-import { TagSection } from "./TagSection";
-import type { TransformJobInfo } from "./types";
-
-type JobPageProps = {
- job: TransformJobInfo;
- onNameChange: (name: string) => void;
- onDescriptionChange: (description: string | null) => void;
- onScheduleChange: (
- schedule: string,
- uiDisplayType: ScheduleDisplayType,
- ) => void;
- onTagListChange: (tagIds: TransformTagId[]) => void;
-};
-
-export function JobView({
- job,
- onNameChange,
- onDescriptionChange,
- onScheduleChange,
- onTagListChange,
-}: JobPageProps) {
- return (
- <Stack gap="3.5rem" data-testid="job-view">
- <Stack gap="lg">
- <HeaderSection job={job} />
- <NameSection
- job={job}
- onNameChange={onNameChange}
- onDescriptionChange={onDescriptionChange}
- />
- </Stack>
- <ScheduleSection job={job} onScheduleChange={onScheduleChange} />
- <TagSection job={job} onTagsChange={onTagListChange} />
- {job.id != null && <ManageSection job={job} />}
- {job.id == null && <SaveSection job={job} />}
- {job.id != null && <DependenciesSection jobId={job.id} />}
- </Stack>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/JobView.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/JobView.unit.spec.tsx
deleted file mode 100644
index 59413c32b57..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/JobView.unit.spec.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import {
- setupListTransformJobTransformsEndpoint,
- setupListTransformTagsEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockTransformJob } from "metabase-types/api/mocks";
-
-import { JobView } from "./JobView";
-import type { TransformJobInfo } from "./types";
-
-type SetupOpts = {
- job?: TransformJobInfo;
-};
-
-function setup({ job = createMockTransformJob() }: SetupOpts) {
- const onNameChange = jest.fn();
- const onDescriptionChange = jest.fn();
- const onScheduleChange = jest.fn();
- const onTagListChange = jest.fn();
-
- setupListTransformTagsEndpoint([]);
- if (job.id) {
- setupListTransformJobTransformsEndpoint(job.id, []);
- }
-
- renderWithProviders(
- <JobView
- job={job}
- onNameChange={onNameChange}
- onDescriptionChange={onDescriptionChange}
- onScheduleChange={onScheduleChange}
- onTagListChange={onTagListChange}
- />,
- );
-
- return {
- onNameChange,
- onDescriptionChange,
- onScheduleChange,
- onTagListChange,
- };
-}
-
-describe("JobView", () => {
- it("should render the manage section for a saved job", () => {
- setup({ job: createMockTransformJob() });
- expect(
- screen.getByRole("button", { name: "Delete this job" }),
- ).toBeInTheDocument();
- expect(
- screen.queryByRole("button", { name: "Save" }),
- ).not.toBeInTheDocument();
- });
-
- it("should render the save section for a unsaved job", () => {
- const { id, ...unsavedJob } = createMockTransformJob();
- setup({ job: unsavedJob });
- expect(screen.getByRole("button", { name: "Save" })).toBeInTheDocument();
- expect(
- screen.queryByRole("button", { name: "Delete this job" }),
- ).not.toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.tsx
deleted file mode 100644
index ff04fe547a1..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Box, Button, Icon } from "metabase/ui";
-
-import { SplitSection } from "../../../components/SplitSection";
-import type { TransformJobInfo } from "../types";
-
-import { DeleteJobModal } from "./DeleteJobModal";
-
-export type ManageSectionProps = {
- job: TransformJobInfo;
-};
-
-export function ManageSection({ job }: ManageSectionProps) {
- return (
- <SplitSection
- label={t`Manage this job`}
- description={t`Deleting this job won’t delete any transforms.`}
- >
- <Box p="xl">
- <DeleteJobButton job={job} />
- </Box>
- </SplitSection>
- );
-}
-
-type DeleteJobButtonProps = {
- job: TransformJobInfo;
-};
-
-function DeleteJobButton({ job }: DeleteJobButtonProps) {
- const dispatch = useDispatch();
- const [isModalOpened, { open: openModal, close: closeModal }] =
- useDisclosure();
- const { sendSuccessToast } = useMetadataToasts();
-
- const handleDelete = () => {
- sendSuccessToast(t`Job deleted`);
- dispatch(push(Urls.transformJobList()));
- };
-
- return (
- <>
- <Button
- leftSection={<Icon name="trash" aria-hidden />}
- onClick={openModal}
- >
- {t`Delete this job`}
- </Button>
- {isModalOpened && (
- <DeleteJobModal
- job={job}
- onDelete={handleDelete}
- onClose={closeModal}
- />
- )}
- </>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.unit.spec.tsx
deleted file mode 100644
index f9759f3317a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/ManageSection.unit.spec.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
-
-import { setupDeleteTransformJobEndpoint } from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
-import type { TransformJob } from "metabase-types/api";
-import { createMockTransformJob } from "metabase-types/api/mocks";
-
-import { ManageSection } from "./ManageSection";
-
-type SetupOpts = {
- job?: TransformJob;
-};
-
-function setup({ job = createMockTransformJob() }: SetupOpts = {}) {
- setupDeleteTransformJobEndpoint(job.id);
-
- renderWithProviders(
- <>
- <Route
- path={Urls.transformJobList()}
- component={() => <div>Job list</div>}
- />
- <Route
- path={Urls.transformJob(job.id)}
- component={() => <ManageSection job={job} />}
- />
- </>,
- { withRouter: true, initialRoute: Urls.transformJob(job.id) },
- );
-}
-
-describe("ManageSection", () => {
- it("should delete the job and navigate to the job list page", async () => {
- setup();
- await userEvent.click(
- screen.getByRole("button", { name: "Delete this job" }),
- );
- await userEvent.click(screen.getByRole("button", { name: "Delete job" }));
- expect(await screen.findByText("Job list")).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/index.ts
deleted file mode 100644
index 22916b492be..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ManageSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/NameSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/NameSection.tsx
deleted file mode 100644
index c5d1a3932c5..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/NameSection.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NameDescriptionInput } from "../../../components/NameDescriptionInput";
-import type { TransformJobInfo } from "../types";
-
-type NameSectionProps = {
- job: TransformJobInfo;
- onNameChange: (name: string) => void;
- onDescriptionChange: (description: string | null) => void;
-};
-
-export function NameSection({
- job,
- onNameChange,
- onDescriptionChange,
-}: NameSectionProps) {
- return (
- <NameDescriptionInput
- name={job.name}
- description={job.description}
- onNameChange={onNameChange}
- onDescriptionChange={onDescriptionChange}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/NameSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/NameSection.unit.spec.tsx
deleted file mode 100644
index dd761ff6abc..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/NameSection.unit.spec.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockTransformJob } from "metabase-types/api/mocks";
-
-import type { TransformJobInfo } from "../types";
-
-import { NameSection } from "./NameSection";
-
-type SetupOpts = {
- job?: TransformJobInfo;
-};
-
-function setup({ job = createMockTransformJob() }: SetupOpts = {}) {
- const onNameChange = jest.fn();
- const onDescriptionChange = jest.fn();
-
- renderWithProviders(
- <NameSection
- job={job}
- onNameChange={onNameChange}
- onDescriptionChange={onDescriptionChange}
- />,
- );
-
- return {
- onNameChange,
- onDescriptionChange,
- };
-}
-
-describe("NameSection", () => {
- it("should be able to update the name", async () => {
- const { onNameChange } = setup({
- job: createMockTransformJob({ name: "Original Name" }),
- });
-
- const nameInput = screen.getByDisplayValue("Original Name");
- await userEvent.clear(nameInput);
- await userEvent.type(nameInput, "New Name");
- await userEvent.tab();
-
- expect(onNameChange).toHaveBeenCalledWith("New Name");
- });
-
- it("should be able to update the description", async () => {
- const { onDescriptionChange } = setup({
- job: createMockTransformJob({ description: "Original description" }),
- });
-
- const descriptionInput = screen.getByDisplayValue("Original description");
- await userEvent.clear(descriptionInput);
- await userEvent.type(descriptionInput, "New description");
- await userEvent.tab();
-
- expect(onDescriptionChange).toHaveBeenCalledWith("New description");
- });
-
- it("should be able to clear the description", async () => {
- const { onDescriptionChange } = setup({
- job: createMockTransformJob({ description: "Some description" }),
- });
-
- const descriptionInput = screen.getByDisplayValue("Some description");
- await userEvent.clear(descriptionInput);
- await userEvent.tab();
-
- expect(onDescriptionChange).toHaveBeenCalledWith(null);
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/index.ts
deleted file mode 100644
index 2f439741460..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/NameSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./NameSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.tsx
deleted file mode 100644
index 4374e77d7ba..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Link } from "react-router";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Button, Group } from "metabase/ui";
-import {
- useCreateTransformJobMutation,
- useLazyGetTransformJobQuery,
-} from "metabase-enterprise/api";
-
-import type { TransformJobInfo } from "../types";
-
-import S from "./SaveSection.module.css";
-
-type SaveSectionProps = {
- job: TransformJobInfo;
-};
-
-export function SaveSection({ job: jobInfo }: SaveSectionProps) {
- const [createJob, { isLoading: isCreating }] =
- useCreateTransformJobMutation();
- const [fetchJob, { isFetching }] = useLazyGetTransformJobQuery();
- const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
- const dispatch = useDispatch();
-
- const handleCreate = async () => {
- const { data: job, error } = await createJob(jobInfo);
-
- if (error) {
- sendErrorToast(t`Failed to create a job`);
- } else if (job != null) {
- // prefetch the job to avoid the loader on the job details page
- await fetchJob(job.id);
- sendSuccessToast(t`New job created`);
- dispatch(push(Urls.transformJob(job.id)));
- }
- };
-
- return (
- <Group className={S.section} pt="md">
- <Button
- variant="filled"
- disabled={isCreating || isFetching}
- onClick={handleCreate}
- >
- {t`Save`}
- </Button>
- <Button component={Link} to={Urls.transformJobList()}>{t`Cancel`}</Button>
- </Group>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.unit.spec.tsx
deleted file mode 100644
index 4a4e2b87c07..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.unit.spec.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
-
-import {
- setupCreateTransformJobEndpoint,
- setupGetTransformJobEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
-import type { TransformJob } from "metabase-types/api";
-import { createMockTransformJob } from "metabase-types/api/mocks";
-
-import { SaveSection } from "./SaveSection";
-
-type SetupOpts = {
- job?: TransformJob;
-};
-
-function setup({ job = createMockTransformJob() }: SetupOpts = {}) {
- setupCreateTransformJobEndpoint(job);
- setupGetTransformJobEndpoint(job);
-
- renderWithProviders(
- <>
- <Route
- path={Urls.newTransformJob()}
- component={() => <SaveSection job={job} />}
- />
- <Route
- path={Urls.transformJob(job.id)}
- component={() => <div>Job page</div>}
- />
- <Route
- path={Urls.transformJobList()}
- component={() => <div>Job list page</div>}
- />
- </>,
- { withRouter: true, initialRoute: Urls.newTransformJob() },
- );
-}
-
-describe("SaveSection", () => {
- it("should allow to save a job", async () => {
- setup();
- await userEvent.click(screen.getByRole("button", { name: "Save" }));
- expect(await screen.findByText("Job page")).toBeInTheDocument();
- });
-
- it("should allow to cancel creation", async () => {
- setup();
- await userEvent.click(screen.getByRole("link", { name: "Cancel" }));
- expect(await screen.findByText("Job list page")).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/index.ts
deleted file mode 100644
index bff1c457896..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SaveSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/index.ts
deleted file mode 100644
index c4a972a598b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./JobView";
-export * from "./types";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.tsx
index 269b9221eef..447775642d3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ListEmptyState/ListEmptyState.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import EmptyDashboardBot from "assets/img/dashboard-empty.svg";
-import { Card, Stack, Text } from "metabase/ui";
+import { Stack, Text } from "metabase/ui";
type ListEmptyStateProps = {
label: string;
@@ -9,16 +9,14 @@ type ListEmptyStateProps = {
export function ListEmptyState({ label }: ListEmptyStateProps) {
return (
- <Card shadow="none" withBorder>
- <Stack p="xl" align="center">
- <img
- src={EmptyDashboardBot}
- alt={t`Empty dashboard`}
- width={100}
- height={100}
- />
- <Text c="text-secondary">{label}</Text>
- </Stack>
- </Card>
+ <Stack p="xl" align="center">
+ <img
+ src={EmptyDashboardBot}
+ alt={t`Empty dashboard`}
+ width={100}
+ height={100}
+ />
+ <Text c="text-secondary">{label}</Text>
+ </Stack>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/NameDescriptionInput.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/NameDescriptionInput.tsx
deleted file mode 100644
index d4a436f572b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/NameDescriptionInput.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { t } from "ttag";
-
-import EditableText from "metabase/common/components/EditableText";
-import { Stack } from "metabase/ui";
-
-import { NAME_MAX_LENGTH } from "../../constants";
-
-import S from "./NameDescriptionInput.module.css";
-
-type NameDescriptionInputProps = {
- name: string;
- description: string | null;
- onNameChange: (name: string) => void;
- onDescriptionChange: (description: string | null) => void;
-};
-
-export function NameDescriptionInput({
- name,
- description,
- onNameChange,
- onDescriptionChange,
-}: NameDescriptionInputProps) {
- const handleDescriptionChange = async (description: string) => {
- onDescriptionChange(description.length === 0 ? null : description);
- };
-
- return (
- <Stack className={S.section} gap="sm" pb="md">
- <EditableText
- initialValue={name}
- maxLength={NAME_MAX_LENGTH}
- placeholder={t`Name`}
- p={0}
- fw="bold"
- fz="h2"
- lh="h2"
- onChange={onNameChange}
- />
- <EditableText
- initialValue={description ?? ""}
- placeholder={t`No description yet`}
- p={0}
- fz="md"
- lh="1.25rem"
- isOptional
- onChange={handleDescriptionChange}
- />
- </Stack>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/index.ts
deleted file mode 100644
index bee1dee967c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/NameDescriptionInput/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./NameDescriptionInput";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/QueryView.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/QueryView.tsx
deleted file mode 100644
index 5264bd963ce..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/QueryView.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useMemo } from "react";
-
-import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
-import { CodeMirrorEditor as Editor } from "metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor";
-import { useQueryMetadata } from "metabase/querying/editor/hooks/use-query-metadata";
-import { Notebook } from "metabase/querying/notebook/components/Notebook";
-import { getMetadata } from "metabase/selectors/metadata";
-import { Center, Loader } from "metabase/ui";
-import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
-import type { DatasetQuery } from "metabase-types/api";
-
-type QueryViewProps = {
- query: DatasetQuery;
-};
-
-export function QueryView({ query }: QueryViewProps) {
- const metadata = useSelector(getMetadata);
- const question = useMemo(
- () => Question.create({ dataset_query: query, metadata }),
- [query, metadata],
- );
- const { isNative } = Lib.queryDisplayInfo(question.query());
- const { isLoading } = useQueryMetadata(question);
- const reportTimezone = useSetting("report-timezone-long");
-
- if (isLoading) {
- return (
- <Center>
- <Loader />
- </Center>
- );
- }
-
- if (isNative) {
- return <Editor query={question.query()} readOnly />;
- }
-
- return (
- <Notebook
- question={question}
- reportTimezone={reportTimezone}
- readOnly
- isDirty={false}
- isRunnable={false}
- isResultDirty={false}
- hasVisualizeButton={false}
- updateQuestion={() => Promise.resolve()}
- runQuestionQuery={() => Promise.resolve()}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/index.ts
deleted file mode 100644
index 14af7a5e70e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/QueryView/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./QueryView";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx
index 520da5af15f..f160fdc8875 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx
@@ -1,13 +1,23 @@
-import { type ReactNode, type Ref, forwardRef, useState } from "react";
-import { useUpdateEffect } from "react-use";
+import {
+ type ReactNode,
+ type Ref,
+ forwardRef,
+ useLayoutEffect,
+ useState,
+} from "react";
import { t } from "ttag";
import { Button, Icon, Loader, Tooltip } from "metabase/ui";
-import type { TransformRun } from "metabase-types/api";
+import type {
+ TransformId,
+ TransformJobId,
+ TransformRun,
+} from "metabase-types/api";
const RECENT_TIMEOUT = 5000;
type RunButtonProps = {
+ id: TransformId | TransformJobId | undefined;
run: TransformRun | null | undefined;
isDisabled?: boolean;
allowCancellation?: boolean;
@@ -17,11 +27,12 @@ type RunButtonProps = {
export const RunButton = forwardRef(function RunButton(
{
+ id,
run,
isDisabled: isExternallyDisabled = false,
+ allowCancellation = false,
onRun,
onCancel,
- allowCancellation = false,
}: RunButtonProps,
ref: Ref<HTMLButtonElement>,
) {
@@ -32,12 +43,16 @@ export const RunButton = forwardRef(function RunButton(
isDisabled: isExternallyDisabled,
});
- useUpdateEffect(() => {
+ useLayoutEffect(() => {
setIsRecent(true);
const timeoutId = setTimeout(() => setIsRecent(false), RECENT_TIMEOUT);
return () => clearTimeout(timeoutId);
}, [run]);
+ useLayoutEffect(() => {
+ setIsRecent(false);
+ }, [id]);
+
return (
<Button.Group>
<Button
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx
index 52a73787f1c..19eff555b2b 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/SchemaFormSelect/SchemaFormSelect.tsx
@@ -8,15 +8,15 @@ import { SelectItem, Text } from "metabase/ui";
export function SchemaFormSelect(props: FormSelectProps & { data: string[] }) {
const { data, name, ...rest } = props;
- const [{ value }] = useField(name);
+ const [{ value }] = useField<string | null>(name);
- const [searchValue, setSearchValue] = useState(value);
+ const [searchValue, setSearchValue] = useState(value ?? "");
const dataWithNewItem = _.uniq([
...data,
...(searchValue !== "" ? [searchValue] : []),
]);
- const isNewValue = value !== "" && !data.includes(value);
+ const isNewValue = value !== "" && !data.includes(value ?? "");
return (
<FormField>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/SplitSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/SplitSection.tsx
deleted file mode 100644
index d6e5af761c8..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/SplitSection.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { HTMLAttributes, ReactNode } from "react";
-
-import { Card, Group, Stack, Text, Title } from "metabase/ui";
-
-type SplitSectionProps = {
- label: string;
- description: string;
- children?: ReactNode;
-} & HTMLAttributes<HTMLDivElement>;
-
-export function SplitSection({
- label,
- description,
- children,
- ...rest
-}: SplitSectionProps) {
- return (
- <Group align="start" gap="5rem" {...rest}>
- <Stack flex={3} py="md" gap="md" maw="15rem">
- <Title order={4}>{label}</Title>
- <Text c="text-secondary">{description}</Text>
- </Stack>
- <Card flex={8} p={0} shadow="none" withBorder>
- {children}
- </Card>
- </Group>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/SplitSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/SplitSection.unit.spec.tsx
deleted file mode 100644
index abc7999b66a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/SplitSection.unit.spec.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { ReactNode } from "react";
-
-import { renderWithProviders, screen } from "__support__/ui";
-
-import { SplitSection } from "./SplitSection";
-
-type SetupOpts = {
- label?: string;
- description?: string;
- children?: ReactNode;
-};
-
-function setup({
- label = "Default Label",
- description = "Default description",
- children,
-}: SetupOpts = {}) {
- renderWithProviders(
- <SplitSection label={label} description={description}>
- {children}
- </SplitSection>,
- );
-}
-
-describe("SplitSection", () => {
- it("should render label, description, and children", () => {
- const label = "Custom Section Label";
- const description = "Custom section description";
- const children = <span>Custom child content</span>;
-
- setup({ label, description, children });
-
- expect(screen.getByText(label)).toBeInTheDocument();
- expect(screen.getByText(description)).toBeInTheDocument();
- expect(screen.getByText("Custom child content")).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/index.ts
deleted file mode 100644
index 5a634bbe2c1..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/SplitSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SplitSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.tsx
index 24b8428de28..9f014e8ffd1 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.tsx
@@ -1,30 +1,29 @@
import type { ReactNode } from "react";
-import { Group, Stack, Text, Title } from "metabase/ui";
+import { Card, Group, Stack, Text, Title } from "metabase/ui";
type TitleSectionProps = {
label: string;
description?: string;
- rightSection?: ReactNode;
children?: ReactNode;
};
export function TitleSection({
label,
description,
- rightSection,
children,
}: TitleSectionProps) {
return (
<Stack>
<Group>
- <Stack flex={1}>
+ <Stack flex={1} gap="sm">
<Title order={4}>{label}</Title>
<Text c="text-secondary">{description}</Text>
</Stack>
- {rightSection}
</Group>
- {children}
+ <Card p={0} shadow="none" withBorder>
+ {children}
+ </Card>
</Stack>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.unit.spec.tsx
index 2ba998e71df..c9565c71193 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TitleSection/TitleSection.unit.spec.tsx
@@ -6,34 +6,21 @@ import { TitleSection } from "./TitleSection";
type SetupOpts = {
label?: string;
- rightSection?: ReactNode;
children?: ReactNode;
};
-function setup({
- label = "Default Title",
- rightSection,
- children,
-}: SetupOpts = {}) {
- renderWithProviders(
- <TitleSection label={label} rightSection={rightSection}>
- {children}
- </TitleSection>,
- );
+function setup({ label = "Default Title", children }: SetupOpts = {}) {
+ renderWithProviders(<TitleSection label={label}>{children}</TitleSection>);
}
describe("TitleSection", () => {
it("should render label, rightSection, and children", () => {
const label = "Custom Title Label";
- const rightSection = <button>Action Button</button>;
const children = <div>Title section content</div>;
- setup({ label, rightSection, children });
+ setup({ label, children });
expect(screen.getByText(label)).toBeInTheDocument();
- expect(
- screen.getByRole("button", { name: "Action Button" }),
- ).toBeInTheDocument();
expect(screen.getByText("Title section content")).toBeInTheDocument();
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/EditorHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/EditorHeader.tsx
deleted file mode 100644
index bb6d057b45d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/EditorHeader.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { t } from "ttag";
-
-import Button from "metabase/common/components/Button";
-import EditBar from "metabase/common/components/EditBar";
-import { Tooltip } from "metabase/ui";
-
-import type { ValidationResult } from "./types";
-
-type EditorHeaderProps = {
- name?: string;
- validationResult: ValidationResult;
- isNew: boolean;
- isDirty: boolean;
- isSaving: boolean;
- onSave: () => void;
- onCancel: () => void;
-};
-
-export function EditorHeader({
- name,
- validationResult,
- isNew,
- isDirty,
- isSaving,
- onSave,
- onCancel,
-}: EditorHeaderProps) {
- const canSave = (isNew || isDirty) && !isSaving && validationResult.isValid;
-
- return (
- <EditBar
- title={getTitle(name, isNew)}
- admin
- buttons={[
- <Button key="cancel" small onClick={onCancel}>{t`Cancel`}</Button>,
- <Tooltip
- key="save"
- label={validationResult.errorMessage}
- disabled={validationResult.errorMessage == null}
- >
- <Button onClick={onSave} primary small disabled={!canSave}>
- {getSaveButtonLabel(isNew, isSaving)}
- </Button>
- </Tooltip>,
- ]}
- />
- );
-}
-
-function getTitle(name: string | undefined, isNew: boolean) {
- if (isNew) {
- return t`You’re creating a new transform`;
- } else {
- return t`You’re editing the "${name}" transform`;
- }
-}
-
-function getSaveButtonLabel(isNew: boolean, isSaving: boolean) {
- if (isSaving) {
- return isNew ? t`Saving` : t`Saving changes`;
- } else {
- return isNew ? t`Save` : t`Save changes`;
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/index.ts
deleted file mode 100644
index 541ab7c1a45..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./EditorHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/types.ts
deleted file mode 100644
index 14c0f604290..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/EditorHeader/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type ValidationResult = {
- isValid: boolean;
- errorMessage?: string;
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx
index 832539be73b..809e313f487 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/TransformEditor.tsx
@@ -6,87 +6,60 @@ import {
type QueryEditorUiState,
} from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
-import { Stack } from "metabase/ui";
import * as Lib from "metabase-lib";
import type { Database, QueryTransformSource } from "metabase-types/api";
-import { EditorHeader } from "./EditorHeader";
-import { getEditorOptions, getQuery, getValidationResult } from "./utils";
+import { getEditorOptions } from "./utils";
type TransformEditorProps = {
- name?: string;
source: QueryTransformSource;
uiState: QueryEditorUiState;
proposedSource: QueryTransformSource | undefined;
databases: Database[];
- isNew: boolean;
- isDirty: boolean;
- isSaving: boolean;
onChangeSource: (source: QueryTransformSource) => void;
onChangeUiState: (state: QueryEditorUiState) => void;
- onSave: () => void;
- onCancel: () => void;
onAcceptProposed: () => void;
onRejectProposed: () => void;
};
export function TransformEditor({
- name,
source,
proposedSource,
databases,
uiState,
- isNew,
- isDirty,
- isSaving,
- onSave,
onChangeSource,
onChangeUiState,
- onCancel,
onAcceptProposed,
onRejectProposed,
}: TransformEditorProps) {
const metadata = useSelector(getMetadata);
- const query = useMemo(() => getQuery(source, metadata), [source, metadata]);
+ const query = useMemo(
+ () => Lib.fromJsQueryAndMetadata(metadata, source.query),
+ [source, metadata],
+ );
const proposedQuery = useMemo(
- () => (proposedSource ? getQuery(proposedSource, metadata) : undefined),
+ () =>
+ proposedSource
+ ? Lib.fromJsQueryAndMetadata(metadata, proposedSource.query)
+ : undefined,
[proposedSource, metadata],
);
const uiOptions = useMemo(() => getEditorOptions(databases), [databases]);
- const validationResult = useMemo(() => getValidationResult(query), [query]);
const handleQueryChange = (query: Lib.Query) => {
onChangeSource({ type: "query", query: Lib.toJsQuery(query) });
};
return (
- <Stack
- pos="relative"
- w="100%"
- h="100%"
- bg="bg-white"
- data-testid="transform-query-editor"
- gap={0}
- >
- <EditorHeader
- name={name}
- validationResult={validationResult}
- isNew={isNew}
- isDirty={isDirty}
- isSaving={isSaving}
- onSave={onSave}
- onCancel={onCancel}
- />
- <QueryEditor
- query={query}
- uiState={uiState}
- uiOptions={uiOptions}
- proposedQuery={proposedQuery}
- onChangeQuery={handleQueryChange}
- onChangeUiState={onChangeUiState}
- onAcceptProposed={onAcceptProposed}
- onRejectProposed={onRejectProposed}
- />
- </Stack>
+ <QueryEditor
+ query={query}
+ uiState={uiState}
+ uiOptions={uiOptions}
+ proposedQuery={proposedQuery}
+ onChangeQuery={handleQueryChange}
+ onChangeUiState={onChangeUiState}
+ onAcceptProposed={onAcceptProposed}
+ onRejectProposed={onRejectProposed}
+ />
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts
index b727d1b8d12..90904114b4f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformEditor/utils.ts
@@ -1,36 +1,13 @@
import { t } from "ttag";
import type { QueryEditorUiOptions } from "metabase/querying/editor/types";
-import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
-import type { Database, QueryTransformSource } from "metabase-types/api";
+import type { Database } from "metabase-types/api";
import { doesDatabaseSupportTransforms } from "../../utils";
-import type { ValidationResult } from "./EditorHeader/types";
-
-export function getQuery(source: QueryTransformSource, metadata: Metadata) {
- return Question.create({ dataset_query: source.query, metadata }).query();
-}
-
-export function getValidationResult(query: Lib.Query): ValidationResult {
- const { isNative } = Lib.queryDisplayInfo(query);
- if (isNative) {
- const tags = Object.values(Lib.templateTags(query));
- if (tags.some((t) => t.type !== "card" && t.type !== "snippet")) {
- return {
- isValid: false,
- errorMessage: t`In transforms, you can use snippets and question or model references, but not variables.`,
- };
- }
- }
-
- return { isValid: Lib.canSave(query, "question") };
-}
-
export function getEditorOptions(databases: Database[]): QueryEditorUiOptions {
return {
+ canConvertToNative: true,
convertToNativeTitle: t`SQL for this transform`,
convertToNativeButtonLabel: t`Convert this transform to SQL`,
shouldDisableDatabasePickerItem: (item) => {
@@ -49,7 +26,8 @@ export function getEditorOptions(databases: Database[]): QueryEditorUiOptions {
item.model === "metric" ||
item.model === "table"
) {
- const database = databases.find((db) => db.id === item.database_id);
+ const databaseId = "db_id" in item ? item.db_id : item.database_id;
+ const database = databases.find((db) => db.id === databaseId);
return !doesDatabaseSupportTransforms(database);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx
new file mode 100644
index 00000000000..29beacf0c67
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx
@@ -0,0 +1,105 @@
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { useUpdateTransformMutation } from "metabase-enterprise/api";
+import {
+ PaneHeader,
+ PaneHeaderInput,
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import type { Transform, TransformId } from "metabase-types/api";
+
+import { NAME_MAX_LENGTH } from "../../constants";
+
+import { TransformMoreMenu } from "./TransformMoreMenu";
+
+type TransformHeaderProps = {
+ transform: Transform;
+ actions?: ReactNode;
+ hasMenu?: boolean;
+};
+
+export function TransformHeader({
+ transform,
+ actions,
+ hasMenu = true,
+}: TransformHeaderProps) {
+ return (
+ <PaneHeader
+ title={<TransformNameInput transform={transform} />}
+ menu={hasMenu && <TransformMoreMenu transform={transform} />}
+ tabs={<TransformTabs transform={transform} />}
+ actions={actions}
+ data-testid="transforms-header"
+ />
+ );
+}
+
+type TransformNameInputProps = {
+ transform: Transform;
+};
+
+function TransformNameInput({ transform }: TransformNameInputProps) {
+ const [updateTransform] = useUpdateTransformMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const handleChangeName = async (newName: string) => {
+ const { error } = await updateTransform({
+ id: transform.id,
+ name: newName,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update transform name`);
+ } else {
+ sendSuccessToast(t`Transform name updated`);
+ }
+ };
+
+ return (
+ <PaneHeaderInput
+ initialValue={transform.name}
+ maxLength={NAME_MAX_LENGTH}
+ onChange={handleChangeName}
+ />
+ );
+}
+
+type TransformTabsProps = {
+ transform: Transform;
+};
+
+function TransformTabs({ transform }: TransformTabsProps) {
+ const tabs = getTabs(transform.id);
+ return <PaneHeaderTabs tabs={tabs} />;
+}
+
+function getTabs(id: TransformId): PaneHeaderTab[] {
+ const tabs: PaneHeaderTab[] = [
+ {
+ label: t`Definition`,
+ to: Urls.transform(id),
+ },
+ {
+ label: t`Run`,
+ to: Urls.transformRun(id),
+ },
+ {
+ label: t`Target`,
+ to: Urls.transformTarget(id),
+ },
+ ];
+
+ if (PLUGIN_DEPENDENCIES.isEnabled) {
+ tabs.push({
+ label: t`Dependencies`,
+ to: Urls.transformDependencies(id),
+ });
+ }
+
+ return tabs;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/DeleteTransformModal/DeleteTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
similarity index 83%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/DeleteTransformModal/DeleteTransformModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
index 27eae61b03e..04aa14682d6 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/DeleteTransformModal/DeleteTransformModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/TransformDeleteModal.tsx
@@ -1,6 +1,7 @@
import { useState } from "react";
import { jt, t } from "ttag";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import {
Form,
FormErrorMessage,
@@ -20,6 +21,7 @@ import {
import {
useDeleteTransformMutation,
useDeleteTransformTargetMutation,
+ useGetTransformQuery,
} from "metabase-enterprise/api";
import type { Transform } from "metabase-types/api";
@@ -34,6 +36,12 @@ export function DeleteTransformModal({
onDelete,
onClose,
}: DeleteTransformModalProps) {
+ const {
+ data: transformWithTable,
+ isLoading,
+ error,
+ } = useGetTransformQuery(transform.id);
+
return (
<Modal
title={getModalTitle(transform)}
@@ -42,11 +50,15 @@ export function DeleteTransformModal({
onClose={onClose}
>
<FocusTrap.InitialFocus />
- <DeleteTransformForm
- transform={transform}
- onDelete={onDelete}
- onClose={onClose}
- />
+ {isLoading || error != null || transformWithTable == null ? (
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ ) : (
+ <DeleteTransformForm
+ transform={transformWithTable}
+ onDelete={onDelete}
+ onClose={onClose}
+ />
+ )}
</Modal>
);
}
@@ -67,6 +79,9 @@ function DeleteTransformForm({
const [shouldDeleteTarget, setShouldDeleteTarget] = useState(false);
const handleSubmit = async () => {
+ if (transform == null) {
+ return;
+ }
if (shouldDeleteTarget) {
await deleteTransformTarget(transform.id).unwrap();
}
@@ -110,8 +125,8 @@ function DeleteTransformForm({
);
}
-function getModalTitle({ table }: Transform) {
- return table != null
+function getModalTitle(transform: Transform) {
+ return transform.table != null
? t`Delete only the transform, or the table it generates, too?`
: t`Delete this transform?`;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/index.ts
new file mode 100644
index 00000000000..3a45df33800
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/DeleteTransformModal/index.ts
@@ -0,0 +1 @@
+export * from "./TransformDeleteModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
new file mode 100644
index 00000000000..27a78342aca
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
@@ -0,0 +1,96 @@
+import { type MouseEvent, useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { ActionIcon, Icon, Menu } from "metabase/ui";
+import type { Transform } from "metabase-types/api";
+
+import { DeleteTransformModal } from "./DeleteTransformModal";
+import type { TransformMoreMenuModalType } from "./types";
+
+type TransformMoreMenuProps = {
+ transform: Transform;
+};
+
+export function TransformMoreMenu({ transform }: TransformMoreMenuProps) {
+ const [modalType, setModalType] = useState<TransformMoreMenuModalType>();
+
+ return (
+ <>
+ <TransformMenu onOpenModal={setModalType} />
+ {modalType != null && (
+ <TransformModal
+ transform={transform}
+ modalType={modalType}
+ onClose={() => setModalType(undefined)}
+ />
+ )}
+ </>
+ );
+}
+
+type TransformMenuProps = {
+ onOpenModal: (modalType: TransformMoreMenuModalType) => void;
+};
+
+function TransformMenu({ onOpenModal }: TransformMenuProps) {
+ const handleIconClick = (event: MouseEvent) => {
+ event.preventDefault();
+ event.stopPropagation();
+ };
+
+ return (
+ <Menu>
+ <Menu.Target>
+ <ActionIcon size="sm" onClick={handleIconClick}>
+ <Icon name="ellipsis" />
+ </ActionIcon>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ leftSection={<Icon name="trash" />}
+ onClick={() => onOpenModal("delete")}
+ >
+ {t`Delete`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ );
+}
+
+type TransformModalProps = {
+ transform: Transform;
+ modalType: TransformMoreMenuModalType;
+ onClose: () => void;
+};
+
+function TransformModal({
+ transform,
+ modalType,
+ onClose,
+}: TransformModalProps) {
+ const { sendSuccessToast } = useMetadataToasts();
+ const dispatch = useDispatch();
+
+ const handleDelete = () => {
+ sendSuccessToast(t`Transform deleted`);
+ dispatch(push(Urls.transformList()));
+ onClose();
+ };
+
+ switch (modalType) {
+ case "delete":
+ return (
+ <DeleteTransformModal
+ transform={transform}
+ onDelete={handleDelete}
+ onClose={onClose}
+ />
+ );
+ default:
+ return null;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/index.ts
new file mode 100644
index 00000000000..73be8fc08b5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/index.ts
@@ -0,0 +1 @@
+export * from "./TransformMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/types.ts
new file mode 100644
index 00000000000..8513a09d14a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformMoreMenu/types.ts
@@ -0,0 +1,8 @@
+import type { TransformId } from "metabase-types/api";
+
+export type TransformMoreMenuModalType = "delete";
+
+export type TransformMoreMenuModalState = {
+ transformId: TransformId;
+ modalType: TransformMoreMenuModalType;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/index.ts
new file mode 100644
index 00000000000..9de008c1b40
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/index.ts
@@ -0,0 +1 @@
+export * from "./TransformHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx
deleted file mode 100644
index c17bc37d02e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { Card } from "metabase/ui";
-import type { Transform } from "metabase-types/api";
-
-import S from "./TransformTable.module.css";
-
-type TransformTableProps = {
- transforms: Transform[];
-};
-
-export function TransformTable({ transforms }: TransformTableProps) {
- const dispatch = useDispatch();
-
- const handleRowClick = (transform: Transform) => {
- dispatch(push(Urls.transform(transform.id)));
- };
-
- return (
- <Card p={0} shadow="none" withBorder>
- <AdminContentTable columnTitles={[t`Transform`, t`Target`]}>
- {transforms.map((transform) => (
- <tr
- key={transform.id}
- className={S.row}
- onClick={() => handleRowClick(transform)}
- >
- <td className={S.wrap}>{transform.name}</td>
- <td className={S.wrap}>{transform.target.name}</td>
- </tr>
- ))}
- </AdminContentTable>
- </Card>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/index.ts
deleted file mode 100644
index 83e631a935e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./TransformTable";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
index a4d30b3aacf..b5e2418bad4 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx
@@ -1,66 +1,21 @@
-import { IndexRoute, Route } from "react-router";
-import { t } from "ttag";
-
-import { createAdminRouteGuard } from "metabase/admin/utils";
-import {
- PLUGIN_ENTITIES,
- PLUGIN_TRANSFORMS,
- PLUGIN_TRANSFORMS_PYTHON,
-} from "metabase/plugins";
+import { PLUGIN_ENTITIES, PLUGIN_TRANSFORMS } from "metabase/plugins";
+import { getUserIsAdmin } from "metabase/selectors/user";
import { Transforms } from "metabase-enterprise/entities/transforms";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { TransformPicker } from "./components/TransformPicker";
-import { JobListPage } from "./pages/JobListPage";
-import { JobPage } from "./pages/JobPage";
-import { NewJobPage } from "./pages/NewJobPage";
-import {
- NewCardTransformPage,
- NewNativeTransformPage,
- NewPythonTransformPage,
- NewQueryTransformPage,
-} from "./pages/NewTransformPage";
-import { RunListPage } from "./pages/RunListPage";
-import { TransformListPage } from "./pages/TransformListPage";
-import { TransformPage } from "./pages/TransformPage";
-import { DetailsPageLayout, ListPageLayout } from "./pages/TransformPageLayout";
-import { TransformQueryPage } from "./pages/TransformQueryPage";
+import { getDataStudioTransformRoutes } from "./routes";
/**
* Initialize transforms plugin features that depend on hasPremiumFeature.
*/
export function initializePlugin() {
if (hasPremiumFeature("transforms")) {
+ PLUGIN_TRANSFORMS.isEnabled = true;
PLUGIN_ENTITIES.entities["transforms"] = Transforms;
+ PLUGIN_TRANSFORMS.canAccessTransforms = getUserIsAdmin;
+ PLUGIN_TRANSFORMS.getDataStudioTransformRoutes =
+ getDataStudioTransformRoutes;
PLUGIN_TRANSFORMS.TransformPicker = TransformPicker;
-
- PLUGIN_TRANSFORMS.getAdminPaths = () => [
- { key: "transforms", name: t`Transforms`, path: "/admin/transforms" },
- ];
-
- PLUGIN_TRANSFORMS.getAdminRoutes = () => (
- <Route path="transforms" component={createAdminRouteGuard("transforms")}>
- <Route>
- <Route component={ListPageLayout}>
- <IndexRoute component={TransformListPage} />
- <Route path="jobs" component={JobListPage} />
- <Route path="runs" component={RunListPage} />
- </Route>
- <Route component={DetailsPageLayout}>
- <Route path="jobs/new" component={NewJobPage} />
- <Route path="jobs/:jobId" component={JobPage} />
- <Route path=":transformId" component={TransformPage} />
- </Route>
- {PLUGIN_TRANSFORMS_PYTHON.getAdminRoutes()}
- <Route path="new/query" component={NewQueryTransformPage} />
- <Route path="new/native" component={NewNativeTransformPage} />
- <Route path="new/card/:cardId" component={NewCardTransformPage} />
- {PLUGIN_TRANSFORMS_PYTHON.isEnabled && (
- <Route path="new/python" component={NewPythonTransformPage} />
- )}
- <Route path=":transformId/query" component={TransformQueryPage} />
- </Route>
- </Route>
- );
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx
new file mode 100644
index 00000000000..a51fc51b3e3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx
@@ -0,0 +1,17 @@
+import { t } from "ttag";
+
+import EmptyDashboardBot from "assets/img/dashboard-empty.svg";
+import EmptyState from "metabase/common/components/EmptyState";
+import { Center } from "metabase/ui";
+
+export function JobEmptyPage() {
+ return (
+ <Center h="100%" bg="bg-light">
+ <EmptyState
+ illustrationElement={<img src={EmptyDashboardBot} />}
+ title={t`Pick a job or create a new one`}
+ message={t`Jobs let you run groups of transforms on a schedule.`}
+ />
+ </Center>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/index.ts
new file mode 100644
index 00000000000..ea6eea01944
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/index.ts
@@ -0,0 +1 @@
+export * from "./JobEmptyPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx
deleted file mode 100644
index 2e713c14c38..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { replace } from "react-router-redux";
-import { t } from "ttag";
-
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import type { RelativeIntervalDirection } from "metabase/querying/filters/types";
-import { Group } from "metabase/ui";
-import type {
- TransformRunStatus,
- TransformTag,
- TransformTagId,
-} from "metabase-types/api";
-
-import { StatusFilterWidget } from "../../../components/StatusFilterWidget";
-import { TagFilterWidget } from "../../../components/TagFilterWidget";
-import { TimeFilterWidget } from "../../../components/TimeFilterWidget";
-
-type JobFilterListProps = {
- params: Urls.TransformJobListParams;
- tags: TransformTag[];
-};
-
-const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [
- "past",
- "current",
-];
-
-const FUTURE_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [
- "current",
- "future",
-];
-
-export function JobFilterList({ params, tags }: JobFilterListProps) {
- const dispatch = useDispatch();
-
- const handleLastRunStartTimeChange = (lastRunStartTime?: string) => {
- dispatch(replace(Urls.transformJobList({ ...params, lastRunStartTime })));
- };
-
- const handleLastRunStatusesChange = (
- lastRunStatuses?: TransformRunStatus[],
- ) => {
- dispatch(replace(Urls.transformJobList({ ...params, lastRunStatuses })));
- };
-
- const handleNextRunStartTimeChange = (nextRunStartTime?: string) => {
- dispatch(replace(Urls.transformJobList({ ...params, nextRunStartTime })));
- };
-
- const handleTagsChange = (tagIds: TransformTagId[]) => {
- dispatch(replace(Urls.transformJobList({ ...params, tagIds })));
- };
-
- return (
- <Group>
- <TimeFilterWidget
- label={t`Last run at`}
- value={params.lastRunStartTime}
- availableDirections={PAST_INTERVAL_DIRECTIONS}
- onChange={handleLastRunStartTimeChange}
- />
- <StatusFilterWidget
- label={t`Last run status`}
- statuses={params.lastRunStatuses ?? []}
- onChange={handleLastRunStatusesChange}
- />
- <TimeFilterWidget
- label={t`Next run at`}
- value={params.nextRunStartTime}
- availableDirections={FUTURE_INTERVAL_DIRECTIONS}
- onChange={handleNextRunStartTimeChange}
- />
- <TagFilterWidget
- label={t`Tags`}
- tagIds={params.tagIds ?? []}
- tags={tags}
- onChange={handleTagsChange}
- />
- </Group>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.unit.spec.tsx
deleted file mode 100644
index c40f896e918..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.unit.spec.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import { renderWithProviders, screen } from "__support__/ui";
-import type * as Urls from "metabase/lib/urls";
-import type { TransformTag } from "metabase-types/api";
-
-import { JobFilterList } from "./JobFilterList";
-
-type SetupOpts = {
- params?: Urls.TransformJobListParams;
- tags?: TransformTag[];
-};
-
-function setup({ params = {}, tags = [] }: SetupOpts = {}) {
- renderWithProviders(<JobFilterList params={params} tags={tags} />);
-}
-
-describe("JobFilterList", () => {
- it("should allow only past or current date options for the last run filter", async () => {
- setup();
-
- await userEvent.click(screen.getByText("Last run at"));
- expect(await screen.findByText("Today")).toBeInTheDocument();
- expect(screen.getByText("Yesterday")).toBeInTheDocument();
-
- await userEvent.click(screen.getByText("Relative date range…"));
- expect(await screen.findByText("Previous")).toBeInTheDocument();
- expect(screen.getByText("Current")).toBeInTheDocument();
- expect(screen.queryByText("Next")).not.toBeInTheDocument();
- });
-
- it("should allow only current or future date options for the next run filter", async () => {
- setup();
-
- await userEvent.click(screen.getByText("Next run at"));
- expect(await screen.findByText("Today")).toBeInTheDocument();
- expect(screen.queryByText("Yesterday")).not.toBeInTheDocument();
-
- await userEvent.click(screen.getByText("Relative date range…"));
- expect(await screen.findByText("Current")).toBeInTheDocument();
- expect(screen.getByText("Next")).toBeInTheDocument();
- expect(screen.queryByText("Previous")).not.toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/index.ts
deleted file mode 100644
index 2e704b66488..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./JobFilterList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.module.css
deleted file mode 100644
index f508fd8d425..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.row {
- cursor: pointer;
-}
-
-.wrap {
- overflow-wrap: anywhere;
-}
-
-.nowrap {
- white-space: nowrap;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
deleted file mode 100644
index 1557a0c05fe..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { getErrorMessage } from "metabase/api/utils";
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSetting } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { Card, FixedSizeIcon, Flex, Loader } from "metabase/ui";
-import {
- useListTransformJobTransformsQuery,
- useListTransformJobsQuery,
- useListTransformTagsQuery,
-} from "metabase-enterprise/api";
-import type { TransformJob, TransformJobId } from "metabase-types/api";
-
-import { ListEmptyState } from "../../../components/ListEmptyState";
-import { RunStatusInfo } from "../../../components/RunStatusInfo";
-import { TagList } from "../../../components/TagList";
-import { TimezoneIndicator } from "../../../components/TimezoneIndicator";
-import { parseTimestampWithTimezone } from "../../../utils";
-import { hasFilterParams } from "../utils";
-
-import S from "./JobList.module.css";
-
-type JobListProps = {
- params: Urls.TransformJobListParams;
-};
-
-export function JobList({ params }: JobListProps) {
- const systemTimezone = useSetting("system-timezone");
- const {
- data: jobs = [],
- isLoading: isLoadingJobs,
- error: jobsError,
- } = useListTransformJobsQuery({
- last_run_start_time: params.lastRunStartTime,
- last_run_statuses: params.lastRunStatuses,
- next_run_start_time: params.nextRunStartTime,
- tag_ids: params.tagIds,
- });
- const {
- data: tags = [],
- isLoading: isLoadingTags,
- error: tagsError,
- } = useListTransformTagsQuery();
- const isLoading = isLoadingJobs || isLoadingTags;
- const error = jobsError ?? tagsError;
- const dispatch = useDispatch();
-
- const handleRowClick = (job: TransformJob) => {
- dispatch(push(Urls.transformJob(job.id)));
- };
-
- if (isLoading || error != null) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- if (jobs.length === 0) {
- const hasFilters = hasFilterParams(params);
- return (
- <ListEmptyState label={hasFilters ? t`No jobs found` : t`No jobs yet`} />
- );
- }
-
- return (
- <Card p={0} shadow="none" withBorder>
- <AdminContentTable
- columnTitles={[
- t`Job`,
- <Flex align="center" gap="xs" key="last-run-at">
- <span className={S.nowrap}>{t`Last run at`}</span>{" "}
- <TimezoneIndicator />
- </Flex>,
- <span key="last-run-status" className={S.nowrap}>
- {t`Last run status`}
- </span>,
- <Flex align="center" gap="xs" key="next-run">
- <span className={S.nowrap}>{t`Next run at`}</span>{" "}
- <TimezoneIndicator />
- </Flex>,
- t`Transforms`,
- t`Tags`,
- ]}
- >
- {jobs.map((job) => (
- <tr
- key={job.id}
- className={S.row}
- onClick={() => handleRowClick(job)}
- >
- <td className={S.wrap}>{job.name}</td>
- <td className={S.nowrap}>
- {job.last_run?.start_time
- ? parseTimestampWithTimezone(
- job.last_run?.start_time,
- systemTimezone,
- ).format("lll")
- : null}
- </td>
- <td className={S.nowrap}>
- {job.last_run != null ? (
- <RunStatusInfo
- status={job.last_run.status}
- message={job.last_run.message}
- endTime={
- job.last_run.end_time != null
- ? parseTimestampWithTimezone(
- job.last_run.end_time,
- systemTimezone,
- ).toDate()
- : null
- }
- />
- ) : null}
- </td>
- <td className={S.nowrap}>
- {job.next_run?.start_time
- ? parseTimestampWithTimezone(
- job.next_run?.start_time,
- systemTimezone,
- ).format("lll")
- : null}
- </td>
- <td className={S.nowrap}>
- <JobTransformCount jobId={job.id} />
- </td>
- <td className={S.wrap}>
- <TagList tags={tags} tagIds={job.tag_ids ?? []} />
- </td>
- </tr>
- ))}
- </AdminContentTable>
- </Card>
- );
-}
-
-type JobTransformCountProps = {
- jobId: TransformJobId;
-};
-
-function JobTransformCount({ jobId }: JobTransformCountProps) {
- const {
- data = [],
- isLoading,
- error,
- } = useListTransformJobTransformsQuery(jobId);
- if (isLoading) {
- return <Loader size="sm" />;
- }
- if (error != null) {
- return <FixedSizeIcon name="warning" tooltip={getErrorMessage(error)} />;
- }
- return <>{data.length}</>;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx
deleted file mode 100644
index a72a3b8ff5e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
-
-import {
- setupListTransformJobTransformsEndpoint,
- setupListTransformJobTransformsEndpointWithError,
- setupListTransformJobsEndpoint,
- setupListTransformTagsEndpoint,
-} from "__support__/server-mocks";
-import { renderWithProviders, screen, within } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
-import type {
- Transform,
- TransformJob,
- TransformJobId,
- TransformTag,
-} from "metabase-types/api";
-import {
- createMockTransform,
- createMockTransformJob,
- createMockTransformRun,
-} from "metabase-types/api/mocks";
-
-import { JobList } from "./JobList";
-
-type TransformListInfo = {
- data: Transform[];
- error?: unknown;
-};
-
-type SetupOpts = {
- jobs?: TransformJob[];
- jobTransforms?: Map<TransformJobId, TransformListInfo>;
- tags?: TransformTag[];
- params?: Urls.TransformJobListParams;
-};
-
-function setup({
- jobs = [],
- jobTransforms = new Map(),
- tags = [],
- params = {},
-}: SetupOpts) {
- setupListTransformJobsEndpoint(jobs);
- setupListTransformTagsEndpoint(tags);
-
- jobTransforms.forEach(({ data, error }, jobId) => {
- if (error != null) {
- setupListTransformJobTransformsEndpointWithError(jobId, error);
- } else {
- setupListTransformJobTransformsEndpoint(jobId, data);
- }
- });
-
- renderWithProviders(
- <Route
- path={Urls.transformJobList(params)}
- component={() => <JobList params={params} />}
- />,
- { withRouter: true, initialRoute: Urls.transformJobList(params) },
- );
-}
-
-describe("JobList", () => {
- it("should show the last run status", async () => {
- const jobId = 1;
- setup({
- jobs: [
- createMockTransformJob({
- id: jobId,
- last_run: createMockTransformRun({ status: "started" }),
- }),
- ],
- jobTransforms: new Map([[jobId, { data: [createMockTransform()] }]]),
- });
- expect(await screen.findByText("In progress")).toBeInTheDocument();
- });
-
- it("should show the number of transforms per job", async () => {
- const job1Id = 1;
- const job2Id = 2;
- setup({
- jobs: [
- createMockTransformJob({ id: job1Id, name: "Job1" }),
- createMockTransformJob({ id: job2Id, name: "Job2" }),
- ],
- jobTransforms: new Map([
- [job1Id, { data: [createMockTransform(), createMockTransform()] }],
- [job2Id, { data: [createMockTransform()] }],
- ]),
- });
-
- const job1Row = await screen.findByRole("row", { name: /Job1/ });
- const job2Row = await screen.findByRole("row", { name: /Job2/ });
- expect(await within(job1Row).findByText("2")).toBeInTheDocument();
- expect(await within(job2Row).findByText("1")).toBeInTheDocument();
- });
-
- it("should show BE errors when loading transforms", async () => {
- const jobId = 1;
- const errorMessage = "Custom error";
-
- setup({
- jobs: [createMockTransformJob({ id: jobId, name: "Job1" })],
- jobTransforms: new Map([
- [
- jobId,
- { data: [createMockTransform()], error: { message: errorMessage } },
- ],
- ]),
- });
-
- const jobRow = await screen.findByRole("row", { name: /Job1/ });
- const warningIcon = await within(jobRow).findByLabelText("warning icon");
- await userEvent.hover(warningIcon);
-
- expect(await screen.findByText(errorMessage)).toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/index.ts
deleted file mode 100644
index 4fb6a699866..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./JobList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx
deleted file mode 100644
index cd966618a79..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import type { Location } from "history";
-import { Link } from "react-router";
-import { t } from "ttag";
-
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
-import { Box, Button, Group, Icon, Stack, Title } from "metabase/ui";
-import { useListTransformTagsQuery } from "metabase-enterprise/api";
-
-import { JobFilterList } from "./JobFilterList";
-import { JobList } from "./JobList";
-import { getParsedParams } from "./utils";
-
-type JobListPageProps = {
- location: Location;
-};
-
-export function JobListPage({ location }: JobListPageProps) {
- const params = getParsedParams(location);
- const { data: tags = [], isLoading, error } = useListTransformTagsQuery();
-
- if (!tags || isLoading || error != null) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- return (
- <Stack gap="xl" data-testid="job-list-page">
- <Group justify="space-between" align="start">
- <Stack gap="sm">
- <Title order={1}>{t`Jobs`}</Title>
- <Box>{t`Jobs let you run groups of transforms on a schedule.`}</Box>
- </Stack>
- <Button
- component={Link}
- to={Urls.newTransformJob()}
- variant="filled"
- leftSection={<Icon name="add" aria-hidden />}
- >
- {t`Create a job`}
- </Button>
- </Group>
- <JobFilterList params={params} tags={tags} />
- <JobList params={params} />
- </Stack>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/index.ts
deleted file mode 100644
index 54c6cfc7b3b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./JobListPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts
deleted file mode 100644
index c5b5af84284..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { Location } from "history";
-
-import type * as Urls from "metabase/lib/urls";
-
-import {
- parseInteger,
- parseList,
- parseRunStatus,
- parseString,
-} from "../../utils";
-
-export function getParsedParams(
- location: Location,
-): Urls.TransformJobListParams {
- const { lastRunStartTime, lastRunStatuses, nextRunStartTime, tagIds } =
- location.query;
-
- return {
- lastRunStartTime: parseString(lastRunStartTime),
- lastRunStatuses: parseList(lastRunStatuses, parseRunStatus),
- nextRunStartTime: parseString(nextRunStartTime),
- tagIds: parseList(tagIds, parseInteger),
- };
-}
-
-export function hasFilterParams(params: Urls.TransformJobListParams) {
- return (
- params.lastRunStartTime != null ||
- params.lastRunStatuses != null ||
- params.nextRunStartTime != null ||
- params.tagIds != null
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/DeleteJobModal/DeleteJobModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
similarity index 88%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/DeleteJobModal/DeleteJobModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
index 4e6999e8d20..04f6dee8547 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/DeleteJobModal/DeleteJobModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.tsx
@@ -8,11 +8,10 @@ import {
} from "metabase/forms";
import { Box, Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
import { useDeleteTransformJobMutation } from "metabase-enterprise/api";
-
-import type { TransformJobInfo } from "../../types";
+import type { TransformJob } from "metabase-types/api";
type DeleteJobModalProps = {
- job: TransformJobInfo;
+ job: TransformJob;
onDelete: () => void;
onClose: () => void;
};
@@ -31,7 +30,7 @@ export function DeleteJobModal({
}
type DeleteJobFormProps = {
- job: TransformJobInfo;
+ job: TransformJob;
onDelete: () => void;
onClose: () => void;
};
@@ -40,10 +39,8 @@ function DeleteJobForm({ job, onDelete, onClose }: DeleteJobFormProps) {
const [deleteJob] = useDeleteTransformJobMutation();
const handleSubmit = async () => {
- if (job.id != null) {
- await deleteJob(job.id).unwrap();
- onDelete();
- }
+ await deleteJob(job.id).unwrap();
+ onDelete();
};
return (
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/DeleteJobModal/DeleteJobModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/DeleteJobModal/DeleteJobModal.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/DeleteJobModal.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/DeleteJobModal/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/ManageSection/DeleteJobModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/DeleteJobModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
new file mode 100644
index 00000000000..68e82795ef2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
@@ -0,0 +1,88 @@
+import { type MouseEvent, useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { ActionIcon, Icon, Menu } from "metabase/ui";
+import type { TransformJob } from "metabase-types/api";
+
+import { DeleteJobModal } from "./DeleteJobModal";
+import type { JobMoreMenuModalType } from "./types";
+
+type JobMoreMenuProps = {
+ job: TransformJob;
+};
+
+export function JobMoreMenu({ job }: JobMoreMenuProps) {
+ const [modalType, setModalType] = useState<JobMoreMenuModalType>();
+
+ return (
+ <>
+ <JobMenu onOpenModal={setModalType} />
+ {modalType != null && (
+ <JobModal
+ job={job}
+ modalType={modalType}
+ onClose={() => setModalType(undefined)}
+ />
+ )}
+ </>
+ );
+}
+
+type JobMenuProps = {
+ onOpenModal: (modalType: JobMoreMenuModalType) => void;
+};
+
+function JobMenu({ onOpenModal }: JobMenuProps) {
+ const handleIconClick = (event: MouseEvent) => {
+ event.preventDefault();
+ event.stopPropagation();
+ };
+
+ return (
+ <Menu>
+ <Menu.Target>
+ <ActionIcon onClick={handleIconClick}>
+ <Icon name="ellipsis" />
+ </ActionIcon>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ leftSection={<Icon name="trash" />}
+ onClick={() => onOpenModal("delete")}
+ >
+ {t`Delete`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ );
+}
+
+type JobModalProps = {
+ job: TransformJob;
+ modalType: JobMoreMenuModalType;
+ onClose: () => void;
+};
+
+function JobModal({ job, modalType, onClose }: JobModalProps) {
+ const { sendSuccessToast } = useMetadataToasts();
+ const dispatch = useDispatch();
+
+ const handleDelete = () => {
+ sendSuccessToast(t`Job deleted`);
+ dispatch(push(Urls.transformJobList()));
+ onClose();
+ };
+
+ switch (modalType) {
+ case "delete":
+ return (
+ <DeleteJobModal job={job} onDelete={handleDelete} onClose={onClose} />
+ );
+ default:
+ return null;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/index.ts
new file mode 100644
index 00000000000..15c97ca8b46
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/index.ts
@@ -0,0 +1 @@
+export * from "./JobMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/types.ts
new file mode 100644
index 00000000000..45d964e3c3a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobMoreMenu/types.ts
@@ -0,0 +1 @@
+export type JobMoreMenuModalType = "delete";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx
index fe597e2d531..dee6a7cbd19 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobPage/JobPage.tsx
@@ -5,6 +5,7 @@ import { skipToken } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Center } from "metabase/ui";
import {
useGetTransformJobQuery,
useUpdateTransformJobMutation,
@@ -16,9 +17,11 @@ import type {
TransformTagId,
} from "metabase-types/api";
-import { JobView } from "../../components/JobView";
+import { JobEditor } from "../../components/JobEditor";
import { POLLING_INTERVAL } from "../../constants";
+import { JobMoreMenu } from "./JobMoreMenu";
+
type JobPageParams = {
jobId: string;
};
@@ -46,12 +49,12 @@ export function JobPage({ params }: JobPageProps) {
setIsPolling(isPollingNeeded(job));
}
- if (isLoading || error != null) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- if (job == null) {
- return <LoadingAndErrorWrapper error={t`Not found.`} />;
+ if (isLoading || error != null || job == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
}
return <JobPageBody job={job} />;
@@ -75,32 +78,7 @@ function JobPageBody({ job }: JobPageBodyProps) {
if (error) {
sendErrorToast(t`Failed to update job name`);
} else {
- sendSuccessToast(t`Job name updated`, async () => {
- const { error } = await updateJob({
- id: job.id,
- name: job.name,
- });
- sendUndoToast(error);
- });
- }
- };
-
- const handleDescriptionChange = async (description: string | null) => {
- const { error } = await updateJob({
- id: job.id,
- description,
- });
-
- if (error) {
- sendErrorToast(t`Failed to update job description`);
- } else {
- sendSuccessToast(t`Job description updated`, async () => {
- const { error } = await updateJob({
- id: job.id,
- description: job.description,
- });
- sendUndoToast(error);
- });
+ sendSuccessToast(t`Job name updated`);
}
};
@@ -147,10 +125,10 @@ function JobPageBody({ job }: JobPageBodyProps) {
};
return (
- <JobView
+ <JobEditor
job={job}
+ menu={<JobMoreMenu job={job} />}
onNameChange={handleNameChange}
- onDescriptionChange={handleDescriptionChange}
onScheduleChange={handleScheduleChange}
onTagListChange={handleTagListChange}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/NewJobPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/NewJobPage.tsx
index f2eee519121..52c6acbf89e 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/NewJobPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewJobPage/NewJobPage.tsx
@@ -1,21 +1,41 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { push } from "react-router-redux";
import { t } from "ttag";
+import _ from "underscore";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import {
+ useCreateTransformJobMutation,
+ useLazyGetTransformJobQuery,
+} from "metabase-enterprise/api";
+import { PaneHeaderActions } from "metabase-enterprise/data-studio/common/components/PaneHeader";
import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
-import { JobView, type TransformJobInfo } from "../../components/JobView";
+import { JobEditor, type TransformJobInfo } from "../../components/JobEditor";
-export function NewJobPage() {
- const [job, setJob] = useState(() => getNewJobInfo());
+type NewJobPageProps = {
+ route: Route;
+};
+
+export function NewJobPage({ route }: NewJobPageProps) {
+ const initialJob = useMemo(() => getNewJobInfo(), []);
+ const [job, setJob] = useState(initialJob);
+ const isDirty = useMemo(() => !_.isEqual(job, initialJob), [job, initialJob]);
+ const [createJob, { isLoading: isCreating }] =
+ useCreateTransformJobMutation();
+ const [fetchJob, { isFetching }] = useLazyGetTransformJobQuery();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+ const dispatch = useDispatch();
+ const isSaving = isCreating || isFetching;
const handleNameChange = (name: string) => {
setJob({ ...job, name });
};
- const handleDescriptionChange = (description: string | null) => {
- setJob({ ...job, description });
- };
-
const handleScheduleChange = (
schedule: string,
uiDisplayType: ScheduleDisplayType,
@@ -27,14 +47,41 @@ export function NewJobPage() {
setJob({ ...job, tag_ids: tagIds });
};
+ const handleSave = async () => {
+ const { data: newJob, error } = await createJob(job);
+
+ if (error) {
+ sendErrorToast(t`Failed to create a job`);
+ } else if (newJob != null) {
+ // prefetch the job to avoid the loader on the job details page
+ await fetchJob(newJob.id);
+ sendSuccessToast(t`New job created`);
+ dispatch(push(Urls.transformJob(newJob.id)));
+ }
+ };
+
+ const handleCancel = () => {
+ dispatch(push(Urls.transformJobList()));
+ };
+
return (
- <JobView
- job={job}
- onNameChange={handleNameChange}
- onDescriptionChange={handleDescriptionChange}
- onScheduleChange={handleScheduleChange}
- onTagListChange={handleTagListChange}
- />
+ <>
+ <JobEditor
+ job={job}
+ actions={
+ <PaneHeaderActions
+ isDirty
+ isSaving={isSaving}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ />
+ }
+ onNameChange={handleNameChange}
+ onScheduleChange={handleScheduleChange}
+ onTagListChange={handleTagListChange}
+ />
+ <LeaveRouteConfirmModal route={route} isEnabled={isDirty && !isSaving} />
+ </>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
index ac5e3728c01..4a18760e67d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx
@@ -15,50 +15,45 @@ import {
FormProvider,
FormSubmitButton,
FormTextInput,
- FormTextarea,
} from "metabase/forms";
import * as Errors from "metabase/lib/errors";
-import { Box, Button, FocusTrap, Group, Modal, Stack } from "metabase/ui";
+import { Box, Button, Group, Modal, Stack } from "metabase/ui";
import { useCreateTransformMutation } from "metabase-enterprise/api";
import type {
CreateTransformRequest,
- SuggestedTransform,
Transform,
TransformSource,
} from "metabase-types/api";
import { trackTransformCreated } from "../../../analytics";
+import type { NewTransformValues } from "../types";
import { SchemaFormSelect } from "./../../../components/SchemaFormSelect";
const NEW_TRANSFORM_SCHEMA = Yup.object({
name: Yup.string().required(Errors.required),
- description: Yup.string().nullable(),
targetName: Yup.string().required(Errors.required),
targetSchema: Yup.string().nullable(),
});
-type NewTransformValues = Yup.InferType<typeof NEW_TRANSFORM_SCHEMA>;
-
type CreateTransformModalProps = {
source: TransformSource;
- suggestedTransform: SuggestedTransform | undefined;
+ defaultValues: Partial<NewTransformValues>;
onCreate: (transform: Transform) => void;
onClose: () => void;
};
export function CreateTransformModal({
source,
- suggestedTransform,
+ defaultValues,
onCreate,
onClose,
}: CreateTransformModalProps) {
return (
<Modal title={t`Save your transform`} opened padding="xl" onClose={onClose}>
- <FocusTrap.InitialFocus />
<CreateTransformForm
source={source}
- suggestedTransform={suggestedTransform}
+ defaultValues={defaultValues}
onCreate={onCreate}
onClose={onClose}
/>
@@ -68,14 +63,14 @@ export function CreateTransformModal({
type CreateTransformFormProps = {
source: TransformSource;
- suggestedTransform: SuggestedTransform | undefined;
+ defaultValues: Partial<NewTransformValues>;
onCreate: (transform: Transform) => void;
onClose: () => void;
};
function CreateTransformForm({
source,
- suggestedTransform,
+ defaultValues,
onCreate,
onClose,
}: CreateTransformFormProps) {
@@ -103,8 +98,8 @@ function CreateTransformForm({
const supportsSchemas = database && hasFeature(database, "schemas");
const initialValues: NewTransformValues = useMemo(
- () => getInitialValues(schemas, suggestedTransform),
- [schemas, suggestedTransform],
+ () => getInitialValues(schemas, defaultValues),
+ [schemas, defaultValues],
);
if (isLoading || error != null) {
@@ -135,13 +130,7 @@ function CreateTransformForm({
name="name"
label={t`Name`}
placeholder={t`My Great Transform`}
- />
- <FormTextarea
- name="description"
- label={t`Description`}
- placeholder={t`This is optional, but helpful`}
- minRows={4}
- maxRows={10}
+ data-autofocus
/>
{supportsSchemas && (
<SchemaFormSelect
@@ -170,26 +159,23 @@ function CreateTransformForm({
function getInitialValues(
schemas: string[],
- suggestedTransform: SuggestedTransform | undefined,
+ defaultValues: Partial<NewTransformValues>,
): NewTransformValues {
return {
name: "",
- description: suggestedTransform ? suggestedTransform.description : null,
- targetName: suggestedTransform ? suggestedTransform.target.name : "",
- targetSchema: suggestedTransform
- ? suggestedTransform.target.schema
- : schemas?.[0] || null,
+ targetName: "",
+ targetSchema: schemas?.[0] || null,
+ ...defaultValues,
};
}
function getCreateRequest(
source: TransformSource,
- { name, description, targetName, targetSchema }: NewTransformValues,
+ { name, targetName, targetSchema }: NewTransformValues,
databaseId: number,
): CreateTransformRequest {
return {
name: name,
- description,
source,
target: {
type: "table",
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
index 3c18ec2847f..97e7b87fbd5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx
@@ -2,20 +2,27 @@ import { useDisclosure } from "@mantine/hooks";
import { useMemo, useState } from "react";
import type { Route } from "react-router";
import { push } from "react-router-redux";
+import { t } from "ttag";
import {
skipToken,
useGetCardQuery,
useListDatabasesQuery,
} from "metabase/api";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
-import { Center } from "metabase/ui";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Center, Stack } from "metabase/ui";
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import * as Lib from "metabase-lib";
import type {
Database,
DraftTransformSource,
@@ -23,12 +30,14 @@ import type {
} from "metabase-types/api";
import { TransformEditor } from "../../components/TransformEditor";
+import { NAME_MAX_LENGTH } from "../../constants";
import { useRegisterMetabotTransformContext } from "../../hooks/use-register-transform-metabot-context";
import { useSourceState } from "../../hooks/use-source-state";
-import { isNotDraftSource } from "../../utils";
+import { getValidationResult, isNotDraftSource } from "../../utils";
import { CreateTransformModal } from "./CreateTransformModal";
import {
+ getDefaultValues,
getInitialCardSource,
getInitialNativeSource,
getInitialPythonSource,
@@ -84,12 +93,20 @@ function NewTransformPageBody({
acceptProposed,
rejectProposed,
} = useSourceState({ initialSource });
+ const [name, setName] = useState(suggestedTransform?.name ?? "");
const [uiState, setUiState] = useState(getInitialUiState);
+ const metadata = useSelector(getMetadata);
const [isModalOpened, { open: openModal, close: closeModal }] =
useDisclosure();
const dispatch = useDispatch();
useRegisterMetabotTransformContext(undefined, source);
+ const validationResult = useMemo(() => {
+ return source.type === "query"
+ ? getValidationResult(Lib.fromJsQueryAndMetadata(metadata, source.query))
+ : PLUGIN_TRANSFORMS_PYTHON.getPythonSourceValidationResult(source);
+ }, [source, metadata]);
+
const handleCreate = (transform: Transform) => {
dispatch(push(Urls.transform(transform.id)));
};
@@ -100,19 +117,42 @@ function NewTransformPageBody({
return (
<>
- <AdminSettingsLayout fullWidth>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ data-testid="transform-query-editor"
+ gap={0}
+ >
+ <PaneHeader
+ title={
+ <PaneHeaderInput
+ initialValue={name}
+ placeholder={t`New transform`}
+ maxLength={NAME_MAX_LENGTH}
+ isOptional
+ onChange={setName}
+ />
+ }
+ actions={
+ <PaneHeaderActions
+ errorMessage={validationResult.errorMessage}
+ isValid={validationResult.isValid}
+ isDirty
+ onSave={openModal}
+ onCancel={handleCancel}
+ />
+ }
+ />
{source.type === "python" ? (
<PLUGIN_TRANSFORMS_PYTHON.TransformEditor
source={source}
proposedSource={
proposedSource?.type === "python" ? proposedSource : undefined
}
- isNew={true}
isDirty={isDirty}
- isSaving={false}
onChangeSource={setSourceAndRejectProposed}
- onSave={openModal}
- onCancel={handleCancel}
onAcceptProposed={acceptProposed}
onRejectProposed={rejectProposed}
/>
@@ -124,22 +164,17 @@ function NewTransformPageBody({
}
uiState={uiState}
databases={databases}
- isNew={true}
- isSaving={false}
- isDirty={isDirty}
onChangeSource={setSourceAndRejectProposed}
onChangeUiState={setUiState}
- onSave={openModal}
- onCancel={handleCancel}
onAcceptProposed={acceptProposed}
onRejectProposed={rejectProposed}
/>
)}
- </AdminSettingsLayout>
+ </Stack>
{isModalOpened && isNotDraftSource(source) && (
<CreateTransformModal
source={source}
- suggestedTransform={suggestedTransform}
+ defaultValues={getDefaultValues(name, suggestedTransform)}
onCreate={handleCreate}
onClose={closeModal}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/types.ts
new file mode 100644
index 00000000000..b8a1ea8b56b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/types.ts
@@ -0,0 +1,5 @@
+export type NewTransformValues = {
+ name: string;
+ targetName: string;
+ targetSchema: string | null;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts
index eb77029e7da..c537e3464b0 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/utils.ts
@@ -3,8 +3,11 @@ import type {
Card,
PythonTransformSourceDraft,
QueryTransformSource,
+ SuggestedTransform,
} from "metabase-types/api";
+import type { NewTransformValues } from "./types";
+
export function getInitialQuerySource(): QueryTransformSource {
const question = Question.create({ DEPRECATED_RAW_MBQL_type: "query" });
return {
@@ -46,3 +49,18 @@ def transform():
export function getInitialCardSource(card: Card): QueryTransformSource {
return { type: "query", query: card.dataset_query };
}
+
+export function getDefaultValues(
+ name: string,
+ suggestedTransform?: SuggestedTransform,
+): Partial<NewTransformValues> {
+ if (suggestedTransform == null) {
+ return { name };
+ }
+
+ return {
+ name,
+ targetName: suggestedTransform.target.name,
+ targetSchema: suggestedTransform.target.schema,
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/FilterFieldSet/FilterFieldSet.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/FilterFieldSet/FilterFieldSet.module.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/FilterFieldSet/FilterFieldSet.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/FilterFieldSet/FilterFieldSet.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/FilterFieldSet/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/FilterFieldSet/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx
index b9fff97dac9..0073375efbf 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx
@@ -14,11 +14,10 @@ import type {
TransformTagId,
} from "metabase-types/api";
-import { StatusFilterWidget } from "../../../components/StatusFilterWidget";
-import { TagFilterWidget } from "../../../components/TagFilterWidget";
-import { TimeFilterWidget } from "../../../components/TimeFilterWidget";
-
import { RunMethodFilterWidget } from "./RunMethodFilterWidget";
+import { StatusFilterWidget } from "./StatusFilterWidget";
+import { TagFilterWidget } from "./TagFilterWidget";
+import { TimeFilterWidget } from "./TimeFilterWidget";
import { TransformFilterWidget } from "./TransformFilterWidget";
const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx
index 9654cecf769..2e3cb1951fc 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx
@@ -11,11 +11,11 @@ import {
Popover,
Stack,
} from "metabase/ui";
+import { formatRunMethod } from "metabase-enterprise/transforms/utils";
import type { TransformRunMethod } from "metabase-types/api";
-import { FilterFieldSet } from "../../../../components/FilterFieldSet";
import { FILTER_WIDGET_MIN_WIDTH } from "../../../../constants";
-import { formatRunMethod } from "../../../../utils";
+import { FilterFieldSet } from "../FilterFieldSet";
const RUN_METHODS: TransformRunMethod[] = ["manual", "cron"];
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/StatusFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/StatusFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsx
index bd4b772e974..465271698e5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/StatusFilterWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsx
@@ -13,8 +13,8 @@ import {
} from "metabase/ui";
import type { TransformRunStatus } from "metabase-types/api";
-import { FILTER_WIDGET_MIN_WIDTH } from "../../constants";
-import { formatStatus } from "../../utils";
+import { FILTER_WIDGET_MIN_WIDTH } from "../../../../constants";
+import { formatStatus } from "../../../../utils";
import { FilterFieldSet } from "../FilterFieldSet";
const STATUSES: TransformRunStatus[] = [
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/TagFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/TagFilterWidget.tsx
similarity index 99%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/TagFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/TagFilterWidget.tsx
index b1e081a54f2..d12ea8094cf 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/TagFilterWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/TagFilterWidget.tsx
@@ -16,7 +16,7 @@ import type { TransformTag, TransformTagId } from "metabase-types/api";
import {
FILTER_WIDGET_MAX_HEIGHT,
FILTER_WIDGET_MIN_WIDTH,
-} from "../../constants";
+} from "../../../../constants";
import { FilterFieldSet } from "../FilterFieldSet";
type TagFilterWidgetProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TimeFilterWidget/TimeFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/TimeFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TimeFilterWidget/TimeFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/TimeFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TimeFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TimeFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/TransformFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/TransformFilterWidget.tsx
index b8fbb4613bb..cde865d25f5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/TransformFilterWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/TransformFilterWidget.tsx
@@ -14,11 +14,11 @@ import {
} from "metabase/ui";
import type { Transform, TransformId } from "metabase-types/api";
-import { FilterFieldSet } from "../../../../components/FilterFieldSet";
import {
FILTER_WIDGET_MAX_HEIGHT,
FILTER_WIDGET_MIN_WIDTH,
} from "../../../../constants";
+import { FilterFieldSet } from "../FilterFieldSet";
type TransformFilterWidgetProps = {
transformIds: TransformId[];
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
index 73ad8a16df3..9fcd48b4575 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
@@ -11,13 +11,13 @@ import type { TransformRun, TransformTag } from "metabase-types/api";
import { ListEmptyState } from "../../../components/ListEmptyState";
import { RunStatusInfo } from "../../../components/RunStatusInfo";
-import { TagList } from "../../../components/TagList";
-import { TimezoneIndicator } from "../../../components/TimezoneIndicator";
import { formatRunMethod, parseTimestampWithTimezone } from "../../../utils";
import { PAGE_SIZE } from "../constants";
import { hasFilterParams } from "../utils";
import S from "./RunList.module.css";
+import { TagList } from "./TagList";
+import { TimezoneIndicator } from "./TimezoneIndicator";
type RunListProps = {
runs: TransformRun[];
@@ -33,7 +33,11 @@ export function RunList({ runs, totalCount, params, tags }: RunListProps) {
if (runs.length === 0) {
const hasFilters = hasFilterParams(params);
return (
- <ListEmptyState label={hasFilters ? t`No runs found` : t`No runs yet`} />
+ <Card p={0} shadow="none" withBorder>
+ <ListEmptyState
+ label={hasFilters ? t`No runs found` : t`No runs yet`}
+ />
+ </Card>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx
new file mode 100644
index 00000000000..2320de11b5c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx
@@ -0,0 +1,36 @@
+import { useMemo } from "react";
+
+import { Group, Pill } from "metabase/ui";
+import type { TransformTag, TransformTagId } from "metabase-types/api";
+
+type TagListProps = {
+ tagIds: TransformTagId[];
+ tags: TransformTag[];
+};
+
+export function TagList({ tagIds, tags }: TagListProps) {
+ const tagById = useMemo(() => getTagById(tags), [tags]);
+
+ return (
+ <Group gap="sm">
+ {getTagList(tagIds, tagById).map((tag) => (
+ <Pill key={tag.id} c="text-dark" bg="bg-medium">
+ {tag.name}
+ </Pill>
+ ))}
+ </Group>
+ );
+}
+
+export function getTagById(
+ tags: TransformTag[],
+): Record<TransformTagId, TransformTag> {
+ return Object.fromEntries(tags.map((tag) => [tag.id, tag]));
+}
+
+export function getTagList(
+ tagIds: TransformTagId[],
+ tagById: Record<TransformTagId, TransformTag>,
+) {
+ return tagIds.map((tagId) => tagById[tagId]).filter((tag) => tag != null);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.unit.spec.tsx
new file mode 100644
index 00000000000..6b3e89a81b8
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.unit.spec.tsx
@@ -0,0 +1,41 @@
+import { renderWithProviders, screen } from "__support__/ui";
+import type { TransformTag, TransformTagId } from "metabase-types/api";
+import { createMockTransformTag } from "metabase-types/api/mocks";
+
+import { TagList } from "./TagList";
+
+type SetupOpts = {
+ tagIds?: TransformTagId[];
+ tags?: TransformTag[];
+};
+
+function setup({ tagIds = [], tags = [] }: SetupOpts = {}) {
+ renderWithProviders(<TagList tagIds={tagIds} tags={tags} />);
+}
+
+describe("TagList", () => {
+ it("should render tag names when tags exist", () => {
+ const dailyTag = createMockTransformTag({ id: 1, name: "daily" });
+ const hourlyTag = createMockTransformTag({ id: 2, name: "hourly" });
+ const tags = [dailyTag, hourlyTag];
+ const tagIds = [dailyTag.id, hourlyTag.id];
+
+ setup({ tagIds, tags });
+
+ expect(screen.getByText("daily")).toBeInTheDocument();
+ expect(screen.getByText("hourly")).toBeInTheDocument();
+ });
+
+ it("should ignore non-existing tagIds", () => {
+ const dailyTag = createMockTransformTag({ id: 1, name: "daily" });
+ const hourlyTag = createMockTransformTag({ id: 2, name: "hourly" });
+ const tags = [dailyTag, hourlyTag];
+ const tagIds = [dailyTag.id, hourlyTag.id, 999];
+
+ setup({ tagIds, tags });
+
+ expect(screen.getByText("daily")).toBeInTheDocument();
+ expect(screen.getByText("hourly")).toBeInTheDocument();
+ expect(screen.queryByText("999")).not.toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/index.ts
new file mode 100644
index 00000000000..0928f51c713
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/index.ts
@@ -0,0 +1 @@
+export * from "./TagList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/TimezoneIndicator.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/TimezoneIndicator.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css
new file mode 100644
index 00000000000..6c501d14c20
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css
@@ -0,0 +1,3 @@
+.body {
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
index 245f8abfaae..8526a0fdec9 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
@@ -4,18 +4,18 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import type * as Urls from "metabase/lib/urls";
-import { Box, Stack, Title } from "metabase/ui";
+import { Box, Center, Stack } from "metabase/ui";
import {
useListTransformRunsQuery,
useListTransformTagsQuery,
useListTransformsQuery,
} from "metabase-enterprise/api";
+import { POLLING_INTERVAL } from "metabase-enterprise/transforms/constants";
import type { TransformRun } from "metabase-types/api";
-import { POLLING_INTERVAL } from "../../constants";
-
import { RunFilterList } from "./RunFilterList";
import { RunList } from "./RunList";
+import S from "./RunListPage.module.css";
import { PAGE_SIZE } from "./constants";
import { getParsedParams } from "./utils";
@@ -27,11 +27,10 @@ export function RunListPage({ location }: RunListPageProps) {
const params = getParsedParams(location);
return (
- <div>
- <Title order={1} mb="sm">{t`Runs`}</Title>
- <Box mb="xl">{t`A list of when each transform ran.`}</Box>
+ <Stack className={S.body} p="lg" h="100%" bg="bg-light">
+ <Box>{t`A list of when each transform ran.`}</Box>
<RunListPageBody params={params} />
- </div>
+ </Stack>
);
}
@@ -89,7 +88,11 @@ function RunListPageBody({ params }: RunListPageBodyProps) {
}
if (!data || isLoading || error != null) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
}
return (
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
new file mode 100644
index 00000000000..971df4094ed
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
@@ -0,0 +1,53 @@
+import type { ReactNode } from "react";
+
+import { skipToken } from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { Center, Flex } from "metabase/ui";
+import { useGetTransformQuery } from "metabase-enterprise/api";
+
+import { TransformHeader } from "../../components/TransformHeader";
+
+export type TransformDependenciesPageParams = {
+ transformId: string;
+};
+
+type TransformDependenciesPageProps = {
+ params?: TransformDependenciesPageParams;
+ children?: ReactNode;
+};
+
+export function TransformDependenciesPage({
+ params,
+ children,
+}: TransformDependenciesPageProps) {
+ const id = Urls.extractEntityId(params?.transformId);
+ const {
+ data: transform,
+ isLoading,
+ error,
+ } = useGetTransformQuery(id ?? skipToken);
+
+ if (id == null || transform == null || isLoading || error != null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <Flex direction="column" h="100%">
+ <TransformHeader transform={transform} />
+ <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider
+ value={{
+ baseUrl: Urls.transformDependencies(transform.id),
+ defaultEntry: { id: transform.id, type: "transform" },
+ }}
+ >
+ {children}
+ </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/index.ts
new file mode 100644
index 00000000000..b57c7d47171
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/index.ts
@@ -0,0 +1 @@
+export * from "./TransformDependenciesPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx
new file mode 100644
index 00000000000..c7c96809eb7
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx
@@ -0,0 +1,17 @@
+import { t } from "ttag";
+
+import EmptyDashboardBot from "assets/img/dashboard-empty.svg";
+import EmptyState from "metabase/common/components/EmptyState";
+import { Center } from "metabase/ui";
+
+export function TransformEmptyPage() {
+ return (
+ <Center h="100%" bg="bg-light">
+ <EmptyState
+ illustrationElement={<img src={EmptyDashboardBot} />}
+ title={t`Pick a transform or create a new one`}
+ message={t`Create custom tables with transforms, and run them on a schedule.`}
+ />
+ </Center>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/index.ts
new file mode 100644
index 00000000000..f473393588e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/index.ts
@@ -0,0 +1 @@
+export * from "./TransformEmptyPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/index.ts
deleted file mode 100644
index af47d09e8d6..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./CreateTransformMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx
deleted file mode 100644
index 3f665f4b65c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { replace } from "react-router-redux";
-import { t } from "ttag";
-
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import type { RelativeIntervalDirection } from "metabase/querying/filters/types";
-import { Group } from "metabase/ui";
-import type {
- TransformRunStatus,
- TransformTag,
- TransformTagId,
-} from "metabase-types/api";
-
-import { StatusFilterWidget } from "../../../components/StatusFilterWidget";
-import { TagFilterWidget } from "../../../components/TagFilterWidget";
-import { TimeFilterWidget } from "../../../components/TimeFilterWidget";
-
-type TransformFilterListProps = {
- params: Urls.TransformListParams;
- tags: TransformTag[];
-};
-
-const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [
- "past",
- "current",
-];
-
-export function TransformFilterList({
- params,
- tags,
-}: TransformFilterListProps) {
- const dispatch = useDispatch();
-
- const handleLastRunStartTimeChange = (lastRunStartTime?: string) => {
- dispatch(replace(Urls.transformList({ ...params, lastRunStartTime })));
- };
-
- const handleLastRunStatusesChange = (
- lastRunStatuses?: TransformRunStatus[],
- ) => {
- dispatch(replace(Urls.transformList({ ...params, lastRunStatuses })));
- };
-
- const handleTagsChange = (tagIds: TransformTagId[]) => {
- dispatch(replace(Urls.transformList({ ...params, tagIds })));
- };
-
- return (
- <Group>
- <TimeFilterWidget
- label={t`Last run at`}
- value={params.lastRunStartTime}
- availableDirections={PAST_INTERVAL_DIRECTIONS}
- onChange={handleLastRunStartTimeChange}
- />
- <StatusFilterWidget
- label={t`Last run status`}
- statuses={params.lastRunStatuses ?? []}
- onChange={handleLastRunStatusesChange}
- />
- <TagFilterWidget
- label={t`Tags`}
- tagIds={params.tagIds ?? []}
- tags={tags}
- onChange={handleTagsChange}
- />
- </Group>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx
deleted file mode 100644
index 8694e367bcc..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import userEvent from "@testing-library/user-event";
-
-import { renderWithProviders, screen } from "__support__/ui";
-import type * as Urls from "metabase/lib/urls";
-import type { TransformTag } from "metabase-types/api";
-
-import { TransformFilterList } from "./TransformFilterList";
-
-type SetupOpts = {
- params?: Urls.TransformListParams;
- tags?: TransformTag[];
-};
-
-function setup({ params = {}, tags = [] }: SetupOpts = {}) {
- renderWithProviders(<TransformFilterList params={params} tags={tags} />);
-}
-
-describe("TransformFilterList", () => {
- it("should allow only past or current date options for the last run filter", async () => {
- setup();
-
- await userEvent.click(screen.getByText("Last run at"));
- expect(await screen.findByText("Today")).toBeInTheDocument();
- expect(screen.getByText("Yesterday")).toBeInTheDocument();
-
- await userEvent.click(screen.getByText("Relative date range…"));
- expect(await screen.findByText("Previous")).toBeInTheDocument();
- expect(screen.getByText("Current")).toBeInTheDocument();
- expect(screen.queryByText("Next")).not.toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/index.ts
deleted file mode 100644
index 2b822bd3a0f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./TransformFilterList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.module.css
deleted file mode 100644
index f508fd8d425..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.row {
- cursor: pointer;
-}
-
-.wrap {
- overflow-wrap: anywhere;
-}
-
-.nowrap {
- white-space: nowrap;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
deleted file mode 100644
index 23075966880..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSetting } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { Card, Flex } from "metabase/ui";
-import {
- useListTransformTagsQuery,
- useListTransformsQuery,
-} from "metabase-enterprise/api";
-import type { Transform } from "metabase-types/api";
-
-import { ListEmptyState } from "../../../components/ListEmptyState";
-import { RunStatusInfo } from "../../../components/RunStatusInfo";
-import { TagList } from "../../../components/TagList";
-import { TimezoneIndicator } from "../../../components/TimezoneIndicator";
-import { parseTimestampWithTimezone } from "../../../utils";
-import { hasFilterParams } from "../utils";
-
-import S from "./TransformList.module.css";
-
-type TransformListProps = {
- params: Urls.TransformListParams;
-};
-
-export function TransformList({ params }: TransformListProps) {
- const systemTimezone = useSetting("system-timezone");
- const {
- data: transforms = [],
- isLoading: isLoadingTransforms,
- error: transformsError,
- } = useListTransformsQuery({
- last_run_start_time: params.lastRunStartTime,
- last_run_statuses: params.lastRunStatuses,
- tag_ids: params.tagIds,
- });
- const {
- data: tags = [],
- isLoading: isLoadingTags,
- error: tagsError,
- } = useListTransformTagsQuery();
- const isLoading = isLoadingTransforms || isLoadingTags;
- const error = transformsError ?? tagsError;
- const dispatch = useDispatch();
-
- const handleRowClick = (transform: Transform) => {
- dispatch(push(Urls.transform(transform.id)));
- };
-
- if (isLoading || error != null) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- if (transforms.length === 0) {
- const hasFilters = hasFilterParams(params);
- return (
- <ListEmptyState
- label={hasFilters ? t`No transforms found` : t`No transforms yet`}
- />
- );
- }
-
- return (
- <Card p={0} shadow="none" withBorder>
- <AdminContentTable
- columnTitles={[
- t`Transform`,
- t`Target`,
- <Flex key="last-run-at" component="span" align="center" gap="xs">
- <span className={S.nowrap}>{t`Last run at`}</span>{" "}
- <TimezoneIndicator />
- </Flex>,
- <span key="last-run-status" className={S.nowrap}>
- {t`Last run status`}
- </span>,
- t`Tags`,
- ]}
- >
- {transforms.map((transform) => (
- <tr
- key={transform.id}
- className={S.row}
- onClick={() => handleRowClick(transform)}
- >
- <td className={S.wrap}>{transform.name}</td>
- <td className={S.wrap}>{transform.target.name}</td>
- <td className={S.nowrap}>
- {transform.last_run?.end_time
- ? parseTimestampWithTimezone(
- transform.last_run.end_time,
- systemTimezone,
- ).format("lll")
- : null}
- </td>
- <td className={S.nowrap}>
- {transform.last_run != null ? (
- <RunStatusInfo
- status={transform.last_run.status}
- message={transform.last_run.message}
- endTime={
- transform.last_run.end_time != null
- ? parseTimestampWithTimezone(
- transform.last_run.end_time,
- systemTimezone,
- ).toDate()
- : null
- }
- />
- ) : null}
- </td>
- <td className={S.wrap}>
- <TagList tags={tags} tagIds={transform.tag_ids ?? []} />
- </td>
- </tr>
- ))}
- </AdminContentTable>
- </Card>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/index.ts
deleted file mode 100644
index c53a24b9881..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./TransformList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx
deleted file mode 100644
index ecce9e7b75b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { Location } from "history";
-import { t } from "ttag";
-
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { Box, Group, Stack, Title } from "metabase/ui";
-import { useListTransformTagsQuery } from "metabase-enterprise/api";
-
-import { CreateTransformMenu } from "./CreateTransformMenu";
-import { TransformFilterList } from "./TransformFilterList";
-import { TransformList } from "./TransformList";
-import { getParsedParams } from "./utils";
-
-type TransformListPageProps = {
- location: Location;
-};
-
-export function TransformListPage({ location }: TransformListPageProps) {
- const params = getParsedParams(location);
- const { data: tags = [], isLoading, error } = useListTransformTagsQuery();
-
- if (!tags || isLoading || error != null) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- return (
- <Stack gap="xl" data-testid="transform-list-page">
- <Group justify="space-between" align="start">
- <Stack gap="sm" flex={1}>
- <Title order={1}>{t`Transforms`}</Title>
- <Box>{t`Create custom tables with transforms, and run them on a schedule.`}</Box>
- </Stack>
- <CreateTransformMenu />
- </Group>
- <TransformFilterList params={params} tags={tags} />
- <TransformList params={params} />
- </Stack>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/index.ts
deleted file mode 100644
index 57d16dd3fdb..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./TransformListPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts
deleted file mode 100644
index b04103e6b37..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { Location } from "history";
-
-import type * as Urls from "metabase/lib/urls";
-
-import {
- parseInteger,
- parseList,
- parseRunStatus,
- parseString,
-} from "../../utils";
-
-export function getParsedParams(location: Location): Urls.TransformListParams {
- const { lastRunStartTime, lastRunStatuses, tagIds } = location.query;
-
- return {
- lastRunStartTime: parseString(lastRunStartTime),
- lastRunStatuses: parseList(lastRunStatuses, parseRunStatus),
- tagIds: parseList(tagIds, parseInteger),
- };
-}
-
-export function hasFilterParams(params: Urls.TransformListParams) {
- return (
- params.lastRunStartTime != null ||
- params.lastRunStatuses != null ||
- params.tagIds != null
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/DependenciesSection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/DependenciesSection.module.css
deleted file mode 100644
index 81b6f530d41..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/DependenciesSection.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.row {
- cursor: pointer;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/DependenciesSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/DependenciesSection.tsx
deleted file mode 100644
index e5add152575..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/DependenciesSection.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { t } from "ttag";
-
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useListTransformDependenciesQuery } from "metabase-enterprise/api";
-import type { Transform } from "metabase-types/api";
-
-import { TitleSection } from "../../../components/TitleSection";
-import { TransformTable } from "../../../components/TransformTable";
-
-export function DependenciesSection({ transform }: { transform: Transform }) {
- const {
- data: transforms = [],
- error,
- isLoading,
- } = useListTransformDependenciesQuery(transform.id);
-
- if (isLoading || transforms.length === 0) {
- return null;
- }
-
- return (
- <TitleSection
- label={t`Dependencies`}
- description={t`This transform depends on the output of the transforms below, so they need to be run first.`}
- >
- {error != null ? (
- <LoadingAndErrorWrapper error={error} />
- ) : (
- <TransformTable transforms={transforms} />
- )}
- </TitleSection>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/index.ts
deleted file mode 100644
index ea90badf0d9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/DependenciesSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DependenciesSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/HeaderSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/HeaderSection.tsx
deleted file mode 100644
index 96f2b3a3b5f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/HeaderSection.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { t } from "ttag";
-
-import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";
-import * as Urls from "metabase/lib/urls";
-import type { Transform } from "metabase-types/api";
-
-type HeaderSectionProps = {
- transform: Transform;
-};
-
-export function HeaderSection({ transform }: HeaderSectionProps) {
- return (
- <BrowserCrumbs
- crumbs={[
- { title: t`Transforms`, to: Urls.transformList() },
- { title: transform.name, to: Urls.transform(transform.id) },
- ]}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/index.ts
deleted file mode 100644
index 4d41590ab85..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/HeaderSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./HeaderSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/DeleteTransformModal/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/DeleteTransformModal/index.ts
deleted file mode 100644
index 2a3a9a79c95..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/DeleteTransformModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DeleteTransformModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.tsx
deleted file mode 100644
index 7551c9decda..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import { Link } from "react-router";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Button, Card, Group, Icon } from "metabase/ui";
-import { PythonEditor } from "metabase-enterprise/transforms-python/components/PythonEditor";
-import type { Transform } from "metabase-types/api";
-
-import { QueryView } from "../../../components/QueryView";
-import { TitleSection } from "../../../components/TitleSection";
-import { isTransformRunning } from "../utils";
-
-import { DeleteTransformModal } from "./DeleteTransformModal";
-
-type ManageSectionProps = {
- transform: Transform;
-};
-
-export function ManageSection({ transform }: ManageSectionProps) {
- const sectionLabel =
- transform.source.type === "python" ? t`Python script` : t`Query`;
-
- return (
- <TitleSection
- label={sectionLabel}
- rightSection={
- <Group>
- <EditQueryButton transform={transform} />
- <DeleteTransformButton transform={transform} />
- </Group>
- }
- >
- <Card p={0} shadow="none" withBorder>
- {transform.source.type === "query" && (
- <QueryView query={transform.source.query} />
- )}
- {transform.source.type === "python" && (
- <PythonEditor value={transform.source.body} readOnly />
- )}
- </Card>
- </TitleSection>
- );
-}
-
-type EditQueryButtonProps = {
- transform: Transform;
-};
-
-function EditQueryButton({ transform }: EditQueryButtonProps) {
- const isDisabled = isTransformRunning(transform);
- const buttonText =
- transform.source.type === "python" ? t`Edit script` : t`Edit query`;
-
- return (
- <Button
- component={isDisabled ? undefined : Link}
- to={Urls.transformQuery(transform.id)}
- leftSection={<Icon name="pencil_lines" aria-hidden />}
- disabled={isDisabled}
- >
- {buttonText}
- </Button>
- );
-}
-
-type DeleteTransformButtonProps = {
- transform: Transform;
-};
-
-function DeleteTransformButton({ transform }: DeleteTransformButtonProps) {
- const dispatch = useDispatch();
- const [isModalOpened, { open: openModal, close: closeModal }] =
- useDisclosure();
- const { sendSuccessToast } = useMetadataToasts();
-
- const handleDelete = () => {
- sendSuccessToast(t`Transform deleted`);
- dispatch(push(Urls.transformList()));
- };
-
- return (
- <>
- <Button
- leftSection={<Icon name="trash" aria-hidden />}
- disabled={isTransformRunning(transform)}
- onClick={openModal}
- >
- {t`Delete transform`}
- </Button>
- {isModalOpened && (
- <DeleteTransformModal
- transform={transform}
- onDelete={handleDelete}
- onClose={closeModal}
- />
- )}
- </>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.unit.spec.tsx
deleted file mode 100644
index 30469394deb..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/ManageSection.unit.spec.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Route } from "react-router";
-
-import { setupAdhocQueryMetadataEndpoint } from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
-import type { Transform } from "metabase-types/api";
-import {
- createMockCardQueryMetadata,
- createMockTransform,
- createMockTransformRun,
-} from "metabase-types/api/mocks";
-
-import { ManageSection } from "./ManageSection";
-
-type SetupOpts = {
- transform?: Transform;
-};
-
-function setup({ transform = createMockTransform() }: SetupOpts) {
- setupAdhocQueryMetadataEndpoint(createMockCardQueryMetadata());
-
- renderWithProviders(
- <Route
- path={Urls.transform(transform.id)}
- component={() => <ManageSection transform={transform} />}
- />,
- { withRouter: true, initialRoute: Urls.transform(transform.id) },
- );
-}
-
-describe("ManageSection", () => {
- it("should disable the edit query button when the transform is running", () => {
- setup({
- transform: createMockTransform({
- last_run: createMockTransformRun({ status: "started" }),
- }),
- });
- const button = screen.getByRole("button", { name: "Edit query" });
- expect(button).toBeDisabled();
- });
-
- it("should not disable the edit query button when the transform is not running", () => {
- setup({
- transform: createMockTransform({
- last_run: createMockTransformRun({ status: "failed" }),
- }),
- });
- const button = screen.getByRole("link", { name: "Edit query" });
- expect(button).toBeEnabled();
- });
-
- it("should disable the delete button when the transform is running", () => {
- setup({
- transform: createMockTransform({
- last_run: createMockTransformRun({ status: "started" }),
- }),
- });
- const button = screen.getByRole("button", { name: "Delete transform" });
- expect(button).toBeDisabled();
- });
-
- it("should not disable the delete button when the transform is not running", () => {
- setup({
- transform: createMockTransform({
- last_run: createMockTransformRun({ status: "succeeded" }),
- }),
- });
- const button = screen.getByRole("button", { name: "Delete transform" });
- expect(button).toBeEnabled();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/index.ts
deleted file mode 100644
index 22916b492be..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/ManageSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ManageSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/NameSection/NameSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/NameSection/NameSection.tsx
deleted file mode 100644
index 9e13bb9bf91..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/NameSection/NameSection.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { t } from "ttag";
-
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { useUpdateTransformMutation } from "metabase-enterprise/api";
-import type { Transform } from "metabase-types/api";
-
-import { NameDescriptionInput } from "../../../components/NameDescriptionInput";
-
-type NameSectionProps = {
- transform: Transform;
-};
-
-export function NameSection({ transform }: NameSectionProps) {
- const [updateTransform] = useUpdateTransformMutation();
- const { sendErrorToast, sendSuccessToast, sendUndoToast } =
- useMetadataToasts();
-
- const handleNameChange = async (name: string) => {
- const { error } = await updateTransform({
- id: transform.id,
- name,
- });
-
- if (error) {
- sendErrorToast(t`Failed to update transform name`);
- } else {
- sendSuccessToast(t`Transform name updated`, async () => {
- const { error } = await updateTransform({
- id: transform.id,
- name: transform.name,
- });
- sendUndoToast(error);
- });
- }
- };
-
- const handleDescriptionChange = async (description: string | null) => {
- const { error } = await updateTransform({
- id: transform.id,
- description,
- });
-
- if (error) {
- sendErrorToast(t`Failed to update transform description`);
- } else {
- sendSuccessToast(t`Transform description updated`, async () => {
- const { error } = await updateTransform({
- id: transform.id,
- description: transform.description,
- });
- sendUndoToast(error);
- });
- }
- };
-
- return (
- <NameDescriptionInput
- name={transform.name}
- description={transform.description}
- onNameChange={handleNameChange}
- onDescriptionChange={handleDescriptionChange}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/NameSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/NameSection/index.ts
deleted file mode 100644
index 2f439741460..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/NameSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./NameSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TransformPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TransformPage.tsx
deleted file mode 100644
index 0793ba706d4..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TransformPage.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { useState } from "react";
-import { t } from "ttag";
-
-import { skipToken } from "metabase/api";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
-import { useRegisterMetabotContextProvider } from "metabase/metabot";
-import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
-import { Stack } from "metabase/ui";
-import { useGetTransformQuery } from "metabase-enterprise/api";
-import type { Transform, TransformId } from "metabase-types/api";
-
-import { POLLING_INTERVAL } from "../../constants";
-
-import { DependenciesSection } from "./DependenciesSection";
-import { HeaderSection } from "./HeaderSection";
-import { ManageSection } from "./ManageSection";
-import { NameSection } from "./NameSection";
-import { RunSection } from "./RunSection";
-import { TargetSection } from "./TargetSection";
-import {
- isTransformCanceling,
- isTransformRunning,
- isTransformSyncing,
-} from "./utils";
-
-type TransformPageParams = {
- transformId: string;
-};
-
-type TransformPageParsedParams = {
- transformId?: TransformId;
-};
-
-type TransformPageProps = {
- params: TransformPageParams;
-};
-
-export function TransformPage({ params }: TransformPageProps) {
- const { transformId } = getParsedParams(params);
- const [isPolling, setIsPolling] = useState(false);
- const {
- data: transform,
- isLoading,
- error,
- } = useGetTransformQuery(transformId ?? skipToken, {
- pollingInterval: isPolling ? POLLING_INTERVAL : undefined,
- });
-
- if (isPolling !== isPollingNeeded(transform)) {
- setIsPolling(isPollingNeeded(transform));
- }
-
- useRegisterMetabotContextProvider(async () => {
- return transform
- ? { user_is_viewing: [{ type: "transform", ...transform }] }
- : {};
- }, [transform]);
-
- if (isLoading || error != null) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- if (transform == null) {
- return <LoadingAndErrorWrapper error={t`Not found.`} />;
- }
-
- return (
- <Stack gap="3.5rem" data-testid="transform-page">
- <Stack gap="lg">
- <HeaderSection transform={transform} />
- <NameSection transform={transform} />
- </Stack>
- <RunSection transform={transform} />
- <PLUGIN_TRANSFORMS_PYTHON.SourceSection transform={transform} />
- <TargetSection transform={transform} />
- <ManageSection transform={transform} />
- <DependenciesSection transform={transform} />
- </Stack>
- );
-}
-
-function getParsedParams({
- transformId,
-}: TransformPageParams): TransformPageParsedParams {
- return {
- transformId: Urls.extractEntityId(transformId),
- };
-}
-
-function isPollingNeeded(transform?: Transform) {
- return (
- transform != null &&
- (isTransformRunning(transform) ||
- isTransformSyncing(transform) ||
- isTransformCanceling(transform))
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/index.ts
deleted file mode 100644
index 2e50dbe0dcd..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./TransformPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/utils.ts
deleted file mode 100644
index 41c204d9ee6..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/utils.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import type { Transform } from "metabase-types/api";
-
-export function isTransformRunning(transform: Transform) {
- const lastRun = transform.last_run;
- return lastRun?.status === "started";
-}
-
-export function isTransformCanceling(transform: Transform) {
- const lastRun = transform.last_run;
- return lastRun?.status === "canceling";
-}
-
-export function isTransformSyncing(transform: Transform) {
- const lastRun = transform.last_run;
-
- // If the last run succeeded but there is no table yet, wait for the sync to
- // finish. If the transform is changed until the sync finishes, stop polling,
- // because the table could be already deleted.
- if (
- transform.table == null &&
- lastRun?.status === "succeeded" &&
- lastRun?.end_time != null
- ) {
- const endedAt = parseTimestamp(lastRun.end_time);
- const updatedAt = parseTimestamp(transform.updated_at);
- return endedAt.isAfter(updatedAt);
- }
-
- return false;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/TransformPageLayout.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/TransformPageLayout.tsx
deleted file mode 100644
index 1f6d0547147..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/TransformPageLayout.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import type { ReactNode } from "react";
-import { t } from "ttag";
-
-import {
- AdminNavItem,
- AdminNavWrapper,
-} from "metabase/admin/components/AdminNav";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
-import { getLocation } from "metabase/selectors/routing";
-
-type TransformPageLayoutPropsParams = {
- transformId?: string;
- jobId?: string;
-};
-
-type TransformPageLayoutProps = {
- params: TransformPageLayoutPropsParams;
- fullWidth?: boolean;
- children?: ReactNode;
-};
-
-type TransformPageLayoutOwnProps = TransformPageLayoutProps & {
- maw?: string;
-};
-
-export function ListPageLayout({ params, children }: TransformPageLayoutProps) {
- return (
- <TransformPageLayout params={params} maw="100rem">
- {children}
- </TransformPageLayout>
- );
-}
-
-export function DetailsPageLayout({
- params,
- children,
-}: TransformPageLayoutProps) {
- return (
- <TransformPageLayout params={params} maw="60rem">
- {children}
- </TransformPageLayout>
- );
-}
-
-function TransformPageLayout({
- params,
- maw,
- fullWidth,
- children,
-}: TransformPageLayoutOwnProps) {
- return (
- <AdminSettingsLayout
- sidebar={<TransformPageSidebar params={params} />}
- maw={maw}
- fullWidth={fullWidth}
- >
- {children}
- </AdminSettingsLayout>
- );
-}
-
-export function FullWidthTransformPageLayout(props: TransformPageLayoutProps) {
- return <TransformPageLayout {...props} fullWidth />;
-}
-
-type TransformPageSidebarProps = {
- params: TransformPageLayoutPropsParams;
-};
-
-function TransformPageSidebar({ params }: TransformPageSidebarProps) {
- const { transformId, jobId } = params;
- const location = useSelector(getLocation);
- const pathname = location?.pathname;
- const transformListUrl = Urls.transformList();
- const jobListUrl = Urls.transformJobList();
- const runListUrl = Urls.transformRunList();
-
- return (
- <AdminNavWrapper data-testid="transform-sidebar">
- <AdminNavItem
- label={t`Transforms`}
- path={transformListUrl}
- icon="refresh_downstream"
- active={pathname === transformListUrl || transformId != null}
- />
- <AdminNavItem
- label={t`Jobs`}
- path={jobListUrl}
- icon="play_outlined"
- active={pathname === jobListUrl || jobId != null}
- />
- <AdminNavItem
- label={t`Runs`}
- path={runListUrl}
- icon="list"
- active={pathname === runListUrl}
- />
- {PLUGIN_TRANSFORMS_PYTHON.getTransformsNavLinks()}
- </AdminNavWrapper>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/index.ts
deleted file mode 100644
index e5d500cfe10..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPageLayout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./TransformPageLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
index d510b9654d2..c90f540e7a5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
@@ -1,14 +1,12 @@
-import { useLayoutEffect, useState } from "react";
+import { useLayoutEffect, useMemo, useState } from "react";
import type { Route } from "react-router";
-import { push } from "react-router-redux";
import { useLatest } from "react-use";
import { t } from "ttag";
import { skipToken, useListDatabasesQuery } from "metabase/api";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch } from "metabase/lib/redux";
+import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
@@ -16,16 +14,21 @@ import {
PLUGIN_TRANSFORMS_PYTHON,
} from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Stack } from "metabase/ui";
import {
useGetTransformQuery,
useUpdateTransformMutation,
} from "metabase-enterprise/api";
+import { PaneHeaderActions } from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import * as Lib from "metabase-lib";
import type { Database, Transform } from "metabase-types/api";
import { TransformEditor } from "../../components/TransformEditor";
+import { TransformHeader } from "../../components/TransformHeader";
import { useRegisterMetabotTransformContext } from "../../hooks/use-register-transform-metabot-context";
import { useSourceState } from "../../hooks/use-source-state";
-import { isNotDraftSource } from "../../utils";
+import { getValidationResult, isNotDraftSource } from "../../utils";
type TransformQueryPageParams = {
transformId: string;
@@ -74,7 +77,7 @@ type TransformQueryPageBodyProps = {
route: Route;
};
-export function TransformQueryPageBody({
+function TransformQueryPageBody({
transform,
databases,
route,
@@ -92,20 +95,17 @@ export function TransformQueryPageBody({
initialSource: transform.source,
});
const [uiState, setUiState] = useState(getInitialUiState);
+ const metadata = useSelector(getMetadata);
const [updateTransform, { isLoading: isSaving }] =
useUpdateTransformMutation();
- const dispatch = useDispatch();
const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
useRegisterMetabotTransformContext(transform, source);
- const resetRef = useLatest(() => {
- setSource(transform.source);
- setUiState(getInitialUiState());
- });
-
- useLayoutEffect(() => {
- resetRef.current();
- }, [transform.id, resetRef]);
+ const validationResult = useMemo(() => {
+ return source.type === "query"
+ ? getValidationResult(Lib.fromJsQueryAndMetadata(metadata, source.query))
+ : PLUGIN_TRANSFORMS_PYTHON.getPythonSourceValidationResult(source);
+ }, [source, metadata]);
const {
checkData,
@@ -121,7 +121,6 @@ export function TransformQueryPageBody({
sendErrorToast(t`Failed to update transform query`);
} else {
sendSuccessToast(t`Transform query updated`);
- dispatch(push(Urls.transform(transform.id)));
}
},
});
@@ -136,47 +135,68 @@ export function TransformQueryPageBody({
};
const handleCancel = () => {
- dispatch(push(Urls.transform(transform.id)));
+ setSourceAndRejectProposed(transform.source);
};
+ const handleResetRef = useLatest(() => {
+ setSource(transform.source);
+ setUiState(getInitialUiState());
+ });
+
+ useLayoutEffect(() => {
+ handleResetRef.current();
+ }, [transform.id, handleResetRef]);
+
return (
- <AdminSettingsLayout fullWidth>
- {source.type === "python" ? (
- <PLUGIN_TRANSFORMS_PYTHON.TransformEditor
- name={transform.name}
- source={source}
- proposedSource={
- proposedSource?.type === "python" ? proposedSource : undefined
+ <>
+ <Stack
+ pos="relative"
+ w="100%"
+ h="100%"
+ bg="bg-white"
+ data-testid="transform-query-editor"
+ gap={0}
+ >
+ <TransformHeader
+ transform={transform}
+ actions={
+ <PaneHeaderActions
+ errorMessage={validationResult.errorMessage}
+ isValid={validationResult.isValid}
+ isDirty={isDirty}
+ isSaving={isSaving || isCheckingDependencies}
+ onSave={handleSave}
+ onCancel={handleCancel}
+ />
}
- isNew={false}
- isDirty={isDirty}
- isSaving={isSaving || isCheckingDependencies}
- onChangeSource={setSourceAndRejectProposed}
- onSave={handleSave}
- onCancel={handleCancel}
- onAcceptProposed={acceptProposed}
- onRejectProposed={rejectProposed}
+ hasMenu={!isDirty}
/>
- ) : (
- <TransformEditor
- name={transform.name}
- source={source}
- proposedSource={
- proposedSource?.type === "query" ? proposedSource : undefined
- }
- uiState={uiState}
- databases={databases}
- isNew={false}
- isDirty={isDirty}
- isSaving={isSaving || isCheckingDependencies}
- onChangeSource={setSourceAndRejectProposed}
- onChangeUiState={setUiState}
- onSave={handleSave}
- onCancel={handleCancel}
- onAcceptProposed={acceptProposed}
- onRejectProposed={rejectProposed}
- />
- )}
+ {source.type === "python" ? (
+ <PLUGIN_TRANSFORMS_PYTHON.TransformEditor
+ source={source}
+ proposedSource={
+ proposedSource?.type === "python" ? proposedSource : undefined
+ }
+ isDirty={isDirty}
+ onChangeSource={setSourceAndRejectProposed}
+ onAcceptProposed={acceptProposed}
+ onRejectProposed={rejectProposed}
+ />
+ ) : (
+ <TransformEditor
+ source={source}
+ proposedSource={
+ proposedSource?.type === "query" ? proposedSource : undefined
+ }
+ uiState={uiState}
+ databases={databases}
+ onChangeSource={setSourceAndRejectProposed}
+ onChangeUiState={setUiState}
+ onAcceptProposed={acceptProposed}
+ onRejectProposed={rejectProposed}
+ />
+ )}
+ </Stack>
{isConfirmationShown && checkData != null && (
<PLUGIN_DEPENDENCIES.CheckDependenciesModal
checkData={checkData}
@@ -190,6 +210,6 @@ export function TransformQueryPageBody({
isEnabled={isDirty && !isSaving && !isCheckingDependencies}
onConfirm={rejectProposed}
/>
- </AdminSettingsLayout>
+ </>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/LogOutput/LogOutput.modules.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/LogOutput/LogOutput.modules.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/LogOutput/LogOutput.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/LogOutput/LogOutput.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx
index a6c440e6413..8e3b9497925 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/LogOutput/LogOutput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx
@@ -7,9 +7,9 @@ import { AnsiLogs } from "metabase/common/components/AnsiLogs";
import S from "./LogOutput.modules.css";
-interface LogOutputProps {
+type LogOutputProps = {
content?: string;
-}
+};
export function LogOutput({ content }: LogOutputProps) {
const containerRef = useRef<HTMLDivElement>(null);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/LogOutput/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/LogOutput/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
index cae0879cfc5..1c7bd5bd19f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/RunSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
@@ -16,11 +16,12 @@ import {
import type { Transform, TransformTagId } from "metabase-types/api";
import { trackTransformTriggerManualRun } from "../../../analytics";
-import { LogOutput } from "../../../components/LogOutput";
import { RunButton } from "../../../components/RunButton";
import { RunStatus } from "../../../components/RunStatus";
-import { SplitSection } from "../../../components/SplitSection";
import { TagMultiSelect } from "../../../components/TagMultiSelect";
+import { TitleSection } from "../../../components/TitleSection";
+
+import { LogOutput } from "./LogOutput";
type RunSectionProps = {
transform: Transform;
@@ -28,10 +29,9 @@ type RunSectionProps = {
export function RunSection({ transform }: RunSectionProps) {
return (
- <SplitSection
+ <TitleSection
label={t`Run this transform`}
- description={t`This transform will be run whenever the jobs it belongs to are scheduled.`}
- data-testid="run-section"
+ description={t`This transform will be run whenever the jobs it belongs are scheduled.`}
>
<Stack>
<Group p="lg" justify="space-between">
@@ -48,7 +48,7 @@ export function RunSection({ transform }: RunSectionProps) {
</Stack>
<TagSection transform={transform} />
</Group>
- </SplitSection>
+ </TitleSection>
);
}
@@ -103,10 +103,7 @@ function RunButtonSection({ transform }: RunButtonSectionProps) {
] = useDisclosure(false);
const handleRun = async () => {
- trackTransformTriggerManualRun({
- transformId: transform.id,
- triggeredFrom: "transform-page",
- });
+ trackTransformTriggerManualRun({ transformId: transform.id });
const { error } = await runTransform(transform.id);
if (error) {
sendErrorToast(t`Failed to run transform`);
@@ -123,8 +120,9 @@ function RunButtonSection({ transform }: RunButtonSectionProps) {
return (
<>
<RunButton
- allowCancellation
+ id={transform.id}
run={transform.last_run}
+ allowCancellation
onRun={handleRun}
onCancel={openConfirmModal}
/>
@@ -142,7 +140,11 @@ function RunButtonSection({ transform }: RunButtonSectionProps) {
);
}
-function RunOutputSection({ transform }: RunSectionProps) {
+type RunOutputSectionProps = {
+ transform: Transform;
+};
+
+function RunOutputSection({ transform }: RunOutputSectionProps) {
if (!transform?.last_run?.message) {
return null;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/RunSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.module.css
new file mode 100644
index 00000000000..6c501d14c20
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.module.css
@@ -0,0 +1,3 @@
+.body {
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx
new file mode 100644
index 00000000000..4076dfc4d4b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx
@@ -0,0 +1,69 @@
+import { useState } from "react";
+
+import { skipToken } from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { Center } from "metabase/ui";
+import { useGetTransformQuery } from "metabase-enterprise/api";
+import type { Transform } from "metabase-types/api";
+
+import { ColumnLayout, ColumnLayoutBody } from "../../components/ColumnLayout";
+import { TransformHeader } from "../../components/TransformHeader";
+import { POLLING_INTERVAL } from "../../constants";
+import {
+ isTransformCanceling,
+ isTransformRunning,
+ isTransformSyncing,
+} from "../../utils";
+
+import { RunSection } from "./RunSection";
+
+type TransformRunPageParams = {
+ transformId: string;
+};
+
+type TransformRunPageProps = {
+ params: TransformRunPageParams;
+};
+
+export function TransformRunPage({ params }: TransformRunPageProps) {
+ const [isPolling, setIsPolling] = useState(false);
+ const transformId = Urls.extractEntityId(params.transformId);
+ const {
+ data: transform,
+ isLoading,
+ error,
+ } = useGetTransformQuery(transformId ?? skipToken, {
+ pollingInterval: isPolling ? POLLING_INTERVAL : undefined,
+ });
+
+ if (isPolling !== isPollingNeeded(transform)) {
+ setIsPolling(isPollingNeeded(transform));
+ }
+
+ if (isLoading || error || transform == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <ColumnLayout>
+ <TransformHeader transform={transform} />
+ <ColumnLayoutBody>
+ <RunSection transform={transform} />
+ </ColumnLayoutBody>
+ </ColumnLayout>
+ );
+}
+
+function isPollingNeeded(transform?: Transform) {
+ return (
+ transform != null &&
+ (isTransformRunning(transform) ||
+ isTransformCanceling(transform) ||
+ isTransformSyncing(transform))
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/index.ts
new file mode 100644
index 00000000000..3597459aa5b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/index.ts
@@ -0,0 +1 @@
+export * from "./TransformRunPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.module.css
new file mode 100644
index 00000000000..e57981867fe
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.module.css
@@ -0,0 +1,3 @@
+.button {
+ border-radius: 8px;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.tsx
similarity index 51%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.tsx
index 0db4b188d32..022e80cf23a 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.tsx
@@ -3,52 +3,41 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { useListDatabasesQuery } from "metabase/api";
-import { ForwardRefLink } from "metabase/common/components/Link";
-import {
- type QuestionPickerItem,
- QuestionPickerModal,
- type QuestionPickerValueItem,
-} from "metabase/common/components/Pickers/QuestionPicker";
+import { QuestionPickerModal } from "metabase/common/components/Pickers/QuestionPicker";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
-import { Button, Center, Icon, Loader, Menu } from "metabase/ui";
+import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";
import { trackTransformCreate } from "../../../analytics";
+import S from "./CreateTransformMenu.module.css";
import { shouldDisableItem } from "./utils";
-export function CreateTransformMenu() {
+export const CreateTransformMenu = () => {
const dispatch = useDispatch();
const [isPickerOpened, { open: openPicker, close: closePicker }] =
useDisclosure();
- const handleSavedQuestionClick = () => {
- openPicker();
- trackTransformCreate({
- triggeredFrom: "transform-page-create-menu",
- creationType: "saved-question",
- });
- };
-
- const handlePickerChange = (item: QuestionPickerValueItem) => {
- dispatch(push(Urls.newCardTransform(item.id)));
- };
-
const { data: databases, isLoading } = useListDatabasesQuery({
include_analytics: true,
});
return (
<>
- <Menu>
+ <Menu position="bottom-end">
<Menu.Target>
- <Button
- variant="filled"
- leftSection={<Icon name="add" aria-hidden />}
- >
- {t`Create a transform`}
- </Button>
+ <Tooltip label={t`Create a transform`}>
+ <Button
+ aria-label={t`Create a transform`}
+ variant="filled"
+ p="sm"
+ w={32}
+ h={32}
+ leftSection={<Icon name="add" size={16} />}
+ classNames={{ root: S.button }}
+ />
+ </Tooltip>
</Menu.Target>
<Menu.Dropdown>
{isLoading ? (
@@ -59,41 +48,29 @@ export function CreateTransformMenu() {
<>
<Menu.Label>{t`Create your transform with…`}</Menu.Label>
<Menu.Item
- component={ForwardRefLink}
- to={Urls.newQueryTransform()}
leftSection={<Icon name="notebook" />}
onClick={() => {
- trackTransformCreate({
- triggeredFrom: "transform-page-create-menu",
- creationType: "query",
- });
+ trackTransformCreate({ creationType: "query" });
+ dispatch(push(Urls.newQueryTransform()));
}}
>
{t`Query builder`}
</Menu.Item>
<Menu.Item
- component={ForwardRefLink}
- to={Urls.newNativeTransform()}
leftSection={<Icon name="sql" />}
onClick={() => {
- trackTransformCreate({
- triggeredFrom: "transform-page-create-menu",
- creationType: "native",
- });
+ trackTransformCreate({ creationType: "native" });
+ dispatch(push(Urls.newNativeTransform()));
}}
>
{t`SQL query`}
</Menu.Item>
{PLUGIN_TRANSFORMS_PYTHON.isEnabled && (
<Menu.Item
- component={ForwardRefLink}
- to={Urls.newPythonTransform()}
leftSection={<Icon name="code_block" />}
onClick={() => {
- trackTransformCreate({
- triggeredFrom: "transform-page-create-menu",
- creationType: "python",
- });
+ trackTransformCreate({ creationType: "python" });
+ dispatch(push(Urls.newPythonTransform()));
}}
>
{t`Python script`}
@@ -101,25 +78,32 @@ export function CreateTransformMenu() {
)}
<Menu.Item
leftSection={<Icon name="folder" />}
- onClick={handleSavedQuestionClick}
+ onClick={() => {
+ trackTransformCreate({ creationType: "saved-question" });
+ openPicker();
+ }}
>
- {t`A copy of a saved question`}
+ {t`Copy of a saved question`}
</Menu.Item>
</>
)}
</Menu.Dropdown>
</Menu>
+
{isPickerOpened && (
<QuestionPickerModal
- title={t`Pick a question`}
+ title={t`Pick a question or a model`}
models={["card", "dataset"]}
- onChange={handlePickerChange}
+ shouldDisableItem={(item) => shouldDisableItem(item, databases?.data)}
+ onChange={(item) => {
+ if (item.model === "card") {
+ dispatch(push(Urls.newTransformFromCard(item.id)));
+ closePicker();
+ }
+ }}
onClose={closePicker}
- shouldDisableItem={(item: QuestionPickerItem) =>
- shouldDisableItem(item, databases?.data ?? [])
- }
/>
)}
</>
);
-}
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/index.ts
new file mode 100644
index 00000000000..53e4566937e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/index.ts
@@ -0,0 +1 @@
+export { CreateTransformMenu } from "./CreateTransformMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/utils.ts
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/utils.ts
index 89fc79d3332..7d5a8f8b069 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CreateTransformMenu/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/utils.ts
@@ -5,14 +5,15 @@ import { doesDatabaseSupportTransforms } from "../../../utils";
export function shouldDisableItem(
item: QuestionPickerItem,
- databases: Database[],
+ databases?: Database[],
) {
if (
+ // Disable questions based on unsuppported databases
item.model === "card" ||
item.model === "dataset" ||
item.model === "metric"
) {
- const database = databases.find(
+ const database = databases?.find(
(database) => database.id === item.database_id,
);
return !doesDatabaseSupportTransforms(database);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.module.css
new file mode 100644
index 00000000000..e57981867fe
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.module.css
@@ -0,0 +1,3 @@
+.button {
+ border-radius: 8px;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.tsx
new file mode 100644
index 00000000000..5951c3dd564
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.tsx
@@ -0,0 +1,132 @@
+import { useDebouncedValue } from "@mantine/hooks";
+import { useMemo, useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useSetting } from "metabase/common/hooks";
+import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { Button, Flex, Icon, Tooltip } from "metabase/ui";
+import { useListTransformJobsQuery } from "metabase-enterprise/api";
+import { SidebarListItem } from "metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem";
+
+import { ListEmptyState } from "../../../components/ListEmptyState";
+import { SidebarContainer } from "../SidebarContainer";
+import { SidebarList } from "../SidebarList";
+import { SidebarLoadingState } from "../SidebarLoadingState";
+import { SidebarSearchAndControls } from "../SidebarSearchAndControls";
+import { JOB_SORT_OPTIONS } from "../SidebarSortControl";
+import { lastModifiedSorter, nameSorter } from "../utils";
+
+import S from "./JobsSidebar.module.css";
+
+const DEFAULT_SORT_TYPE = "alphabetical";
+
+interface JobsSidebarProps {
+ selectedJobId?: number;
+}
+
+export const JobsSidebar = ({ selectedJobId }: JobsSidebarProps) => {
+ const dispatch = useDispatch();
+ const systemTimezone = useSetting("system-timezone");
+ const [searchQuery, setSearchQuery] = useState("");
+ const [debouncedSearchQuery] = useDebouncedValue(searchQuery, 300);
+ const { value: sortType, setValue: setSortType } = useUserKeyValue({
+ namespace: "transforms",
+ key: "jobs-sort-type",
+ defaultValue: DEFAULT_SORT_TYPE,
+ });
+
+ const { data: jobs, error, isLoading } = useListTransformJobsQuery({});
+
+ const filteredJobs = useMemo(() => {
+ if (!jobs) {
+ return [];
+ }
+
+ if (!debouncedSearchQuery) {
+ return jobs;
+ }
+
+ const query = debouncedSearchQuery.toLowerCase();
+ return jobs.filter((job) => job.name.toLowerCase().includes(query));
+ }, [jobs, debouncedSearchQuery]);
+
+ const sortFn = sortType === "last-modified" ? lastModifiedSorter : nameSorter;
+
+ const jobsSorted = useMemo(
+ () => [...filteredJobs].sort(sortFn),
+ [filteredJobs, sortFn],
+ );
+
+ const handleAdd = () => {
+ dispatch(push(Urls.newTransformJob()));
+ };
+
+ if (error) {
+ return <LoadingAndErrorWrapper loading={false} error={error} />;
+ }
+
+ return (
+ <SidebarContainer data-testid="jobs-sidebar">
+ <Flex direction="column" gap="md" px="md" pt="md" pb="md">
+ <SidebarSearchAndControls
+ searchValue={searchQuery}
+ onSearchChange={setSearchQuery}
+ sortValue={sortType}
+ sortOptions={JOB_SORT_OPTIONS}
+ onSortChange={setSortType}
+ sortLabel={t`Sort jobs`}
+ addButton={
+ <Tooltip label={t`Create a job`}>
+ <Button
+ variant="filled"
+ p="sm"
+ w={32}
+ h={32}
+ leftSection={<Icon name="add" size={16} />}
+ aria-label={t`Create a job`}
+ onClick={handleAdd}
+ classNames={{ root: S.button }}
+ />
+ </Tooltip>
+ }
+ />
+ </Flex>
+ <Flex direction="column" flex={1} mih={0}>
+ {isLoading ? (
+ <SidebarLoadingState />
+ ) : jobsSorted.length === 0 ? (
+ <ListEmptyState
+ label={debouncedSearchQuery ? t`No jobs found` : t`No jobs yet`}
+ />
+ ) : (
+ <SidebarList>
+ {jobsSorted.map((job) => {
+ const subtitle =
+ job.last_run?.start_time &&
+ `${job.last_run?.status === "failed" ? t`Failed` : t`Last run`}: ${new Date(
+ job.last_run.start_time,
+ ).toLocaleString("en-US", {
+ timeZone: systemTimezone ?? undefined,
+ })}`;
+
+ return (
+ <SidebarListItem
+ key={job.id}
+ icon="play_outlined"
+ href={Urls.transformJob(job.id)}
+ label={job.name}
+ subtitle={subtitle}
+ isActive={job.id === selectedJobId}
+ />
+ );
+ })}
+ </SidebarList>
+ )}
+ </Flex>
+ </SidebarContainer>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/index.ts
new file mode 100644
index 00000000000..7eab02a9cf0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/index.ts
@@ -0,0 +1 @@
+export { JobsSidebar } from "./JobsSidebar";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.module.css
new file mode 100644
index 00000000000..df21f172240
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.module.css
@@ -0,0 +1,3 @@
+.root {
+ border-right: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.tsx
new file mode 100644
index 00000000000..d6d9095914b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.tsx
@@ -0,0 +1,25 @@
+import { Flex } from "metabase/ui";
+
+import S from "./SidebarContainer.module.css";
+
+interface SidebarContainerProps {
+ children: React.ReactNode;
+ "data-testid"?: string;
+}
+
+export const SidebarContainer = ({
+ children,
+ "data-testid": dataTestId,
+}: SidebarContainerProps) => {
+ return (
+ <Flex
+ data-testid={dataTestId}
+ direction="column"
+ w={360}
+ h="100%"
+ className={S.root}
+ >
+ {children}
+ </Flex>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/index.ts
new file mode 100644
index 00000000000..56668f51a73
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/index.ts
@@ -0,0 +1 @@
+export { SidebarContainer } from "./SidebarContainer";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/SidebarList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/SidebarList.tsx
new file mode 100644
index 00000000000..17a6d987047
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/SidebarList.tsx
@@ -0,0 +1,22 @@
+import { VirtualizedList } from "metabase/common/components/VirtualizedList";
+import { Box, Flex } from "metabase/ui";
+
+interface SidebarListProps {
+ children: React.ReactNode[];
+}
+
+const ListWrapper = ({ children, style }: any) => (
+ <Box px="md" style={style}>
+ {children}
+ </Box>
+);
+
+export const SidebarList = ({ children }: SidebarListProps) => {
+ return (
+ <Flex direction="column" flex={1} mih={0}>
+ <VirtualizedList estimatedItemSize={64} Wrapper={ListWrapper}>
+ {children}
+ </VirtualizedList>
+ </Flex>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/index.ts
new file mode 100644
index 00000000000..b421a046f55
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/index.ts
@@ -0,0 +1 @@
+export { SidebarList } from "./SidebarList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.module.css
new file mode 100644
index 00000000000..cafd51c171f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.module.css
@@ -0,0 +1,46 @@
+.itemRoot {
+ color: var(--mb-color-text-primary);
+
+ .icon {
+ color: var(--mb-color-icon-primary);
+ }
+
+ .content {
+ flex: 1;
+ overflow: hidden;
+ }
+
+ .subtitle {
+ color: var(--mb-color-text-light);
+ }
+
+ .tags {
+ color: var(--mb-color-admin-navbar);
+ }
+}
+
+.itemRoot.isActive {
+ color: var(--mb-color-text-hover);
+
+ .subtitle {
+ color: var(--mb-color-text-brand);
+ }
+}
+
+.navLink {
+ border-radius: 0.5rem;
+
+ &[data-active] {
+ .itemRoot {
+ color: var(--mb-color-text-hover);
+ }
+
+ .subtitle {
+ color: var(--mb-color-text-brand);
+ }
+ }
+
+ &:not([data-active]):hover {
+ background-color: var(--mb-color-brand-lighter);
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.tsx
new file mode 100644
index 00000000000..37f41383f8d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.tsx
@@ -0,0 +1,106 @@
+import cx from "classnames";
+import type { LocationDescriptor } from "history";
+import type { ReactNode } from "react";
+import { Link } from "react-router";
+
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import {
+ Box,
+ FixedSizeIcon,
+ Group,
+ type IconName,
+ NavLink,
+ Stack,
+ Text,
+} from "metabase/ui";
+
+import S from "./SidebarListItem.module.css";
+
+interface SidebarListItemProps extends SidebarListItemContentProps {
+ href: LocationDescriptor;
+ isActive?: boolean;
+}
+
+export const SidebarListItem = ({
+ href,
+ isActive,
+ label,
+ icon,
+ subtitle,
+ thirdLine,
+ rightGroup,
+}: SidebarListItemProps) => {
+ return (
+ <NavLink
+ component={Link}
+ className={S.navLink}
+ to={href}
+ active={isActive}
+ label={
+ <SidebarListItemContent
+ label={label}
+ icon={icon}
+ subtitle={subtitle}
+ thirdLine={thirdLine}
+ rightGroup={rightGroup}
+ />
+ }
+ />
+ );
+};
+
+interface SidebarListItemContentProps {
+ label: ReactNode;
+ icon: IconName;
+ subtitle?: ReactNode;
+ thirdLine?: ReactNode;
+ rightGroup?: ReactNode;
+ isActive?: boolean;
+}
+
+export const SidebarListItemContent = ({
+ label,
+ icon,
+ subtitle,
+ thirdLine,
+ rightGroup,
+ isActive,
+}: SidebarListItemContentProps) => {
+ const isOnlyLabel = !subtitle && !thirdLine;
+
+ return (
+ <Group
+ className={cx(S.itemRoot, isActive && S.isActive)}
+ gap="sm"
+ align="flex-start"
+ wrap="nowrap"
+ >
+ <FixedSizeIcon className={S.icon} size={16} name={icon} />
+ <Stack className={S.content} gap="xs">
+ <Ellipsified
+ fw={isOnlyLabel ? "normal" : "bold"}
+ size="md"
+ lh="1rem"
+ c="inherit"
+ ignoreHeightTruncation
+ >
+ {label}
+ </Ellipsified>
+ {subtitle && (
+ <Box className={S.subtitle}>
+ {typeof subtitle === "string" ? (
+ <Text size="sm" lh="1rem" c="inherit">
+ {subtitle}
+ </Text>
+ ) : (
+ subtitle
+ )}
+ </Box>
+ )}
+
+ {thirdLine}
+ </Stack>
+ {rightGroup}
+ </Group>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/TransformListItem.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/TransformListItem.tsx
new file mode 100644
index 00000000000..7494e354047
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/TransformListItem.tsx
@@ -0,0 +1,24 @@
+import * as Urls from "metabase/lib/urls";
+import type { Transform, TransformId } from "metabase-types/api";
+
+import { SidebarListItem } from "./SidebarListItem";
+
+interface TransformListItemProps {
+ transform: Transform;
+ selectedId?: TransformId;
+}
+
+export const TransformListItem = ({
+ transform,
+ selectedId,
+}: TransformListItemProps) => {
+ return (
+ <SidebarListItem
+ icon="transform"
+ href={Urls.transform(transform.id)}
+ label={transform.name}
+ subtitle={transform.target.name}
+ isActive={transform.id === selectedId}
+ />
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.module.css
new file mode 100644
index 00000000000..475385588f6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.module.css
@@ -0,0 +1,3 @@
+.container {
+ overflow: hidden;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.tsx
new file mode 100644
index 00000000000..41c71b7f77f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.tsx
@@ -0,0 +1,13 @@
+import { Box, Repeat, Skeleton } from "metabase/ui";
+
+import S from "./SidebarLoadingState.module.css";
+
+export const SidebarLoadingState = () => {
+ return (
+ <Box className={S.container} px="md">
+ <Repeat times={8}>
+ <Skeleton h={40} mb="md" radius="sm" />
+ </Repeat>
+ </Box>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/index.ts
new file mode 100644
index 00000000000..4e7b536fa04
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/index.ts
@@ -0,0 +1 @@
+export { SidebarLoadingState } from "./SidebarLoadingState";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/SidebarSearch.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/SidebarSearch.tsx
new file mode 100644
index 00000000000..3faf2fa9a61
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/SidebarSearch.tsx
@@ -0,0 +1,19 @@
+import { t } from "ttag";
+
+import { Icon, TextInput } from "metabase/ui";
+
+interface SidebarSearchProps {
+ value: string;
+ onChange: (value: string) => void;
+}
+
+export const SidebarSearch = ({ value, onChange }: SidebarSearchProps) => {
+ return (
+ <TextInput
+ placeholder={t`Search…`}
+ leftSection={<Icon name="search" />}
+ value={value}
+ onChange={(e) => onChange(e.target.value)}
+ />
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/index.ts
new file mode 100644
index 00000000000..becf74ecaf9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/index.ts
@@ -0,0 +1 @@
+export { SidebarSearch } from "./SidebarSearch";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.module.css
new file mode 100644
index 00000000000..468197abbd3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.module.css
@@ -0,0 +1,8 @@
+.input {
+ border-radius: 8px;
+ padding-left: 28px;
+}
+
+.button {
+ border-radius: 8px;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.tsx
new file mode 100644
index 00000000000..4aa19773e12
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.tsx
@@ -0,0 +1,73 @@
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import { Button, Group, Icon, Menu, TextInput, Tooltip } from "metabase/ui";
+
+import type { SortOptionData } from "../SidebarSortControl";
+
+import S from "./SidebarSearchAndControls.module.css";
+
+interface SidebarSearchAndControlsProps {
+ searchValue: string;
+ onSearchChange: (value: string) => void;
+ sortValue: string;
+ sortOptions: SortOptionData[];
+ onSortChange: (value: string) => void;
+ addButton?: ReactNode;
+ searchPlaceholder?: string;
+ sortLabel?: string;
+}
+
+export const SidebarSearchAndControls = ({
+ searchValue,
+ onSearchChange,
+ sortValue,
+ sortOptions,
+ onSortChange,
+ addButton,
+ searchPlaceholder = t`Search…`,
+ sortLabel = t`Sort`,
+}: SidebarSearchAndControlsProps) => {
+ return (
+ <Group gap="sm" wrap="nowrap">
+ <TextInput
+ flex={1}
+ size="xs"
+ placeholder={searchPlaceholder}
+ leftSection={<Icon name="search" />}
+ value={searchValue}
+ onChange={(e) => onSearchChange(e.target.value)}
+ classNames={{ input: S.input }}
+ styles={{ input: { fontSize: 14, paddingLeft: 32 } }}
+ />
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Tooltip label={sortLabel}>
+ <Button
+ p="sm"
+ w={32}
+ h={32}
+ aria-label={sortLabel}
+ leftSection={<Icon name="sort" size={16} />}
+ classNames={{ root: S.button }}
+ />
+ </Tooltip>
+ </Menu.Target>
+ <Menu.Dropdown>
+ {sortOptions.map((option) => (
+ <Menu.Item
+ key={option.value}
+ onClick={() => onSortChange(option.value)}
+ rightSection={
+ sortValue === option.value ? <Icon name="check" /> : null
+ }
+ >
+ {option.label}
+ </Menu.Item>
+ ))}
+ </Menu.Dropdown>
+ </Menu>
+ {addButton}
+ </Group>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/index.ts
new file mode 100644
index 00000000000..e47ca5d7e94
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/index.ts
@@ -0,0 +1 @@
+export { SidebarSearchAndControls } from "./SidebarSearchAndControls";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/SidebarSortControl.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/SidebarSortControl.tsx
new file mode 100644
index 00000000000..94e5a2aa83a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/SidebarSortControl.tsx
@@ -0,0 +1,90 @@
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import { Group, Select } from "metabase/ui";
+
+export type SortOption = "tree" | "alphabetical" | "last-modified";
+
+export type SortOptionData = {
+ value: SortOption;
+ label: string;
+};
+
+export const TRANSFORM_SORT_OPTIONS: SortOptionData[] = [
+ {
+ value: "tree" as const,
+ get label() {
+ return t`Target table`;
+ },
+ },
+ {
+ value: "alphabetical" as const,
+ get label() {
+ return t`Alphabetical`;
+ },
+ },
+ {
+ value: "last-modified" as const,
+ get label() {
+ return t`Last modified`;
+ },
+ },
+];
+
+export const JOB_SORT_OPTIONS: SortOptionData[] = [
+ {
+ value: "alphabetical" as const,
+ get label() {
+ return t`Alphabetical`;
+ },
+ },
+ {
+ value: "last-modified" as const,
+ get label() {
+ return t`Last modified`;
+ },
+ },
+];
+
+interface SidebarSortControlProps {
+ value: SortOption;
+ options: SortOptionData[];
+ addButton?: ReactNode;
+ onChange: (value: SortOption) => void;
+}
+
+export const SidebarSortControl = ({
+ value,
+ onChange,
+ addButton,
+ options,
+}: SidebarSortControlProps) => {
+ if (!options || options.length === 0) {
+ return null;
+ }
+
+ const selectData = options.map((opt) => ({
+ value: opt.value,
+ label: opt.label,
+ }));
+
+ const validValue =
+ selectData.find((opt) => opt.value === value)?.value ??
+ selectData[0]?.value;
+
+ return (
+ <Group gap="sm" wrap="nowrap">
+ <Select
+ flex={1}
+ value={validValue}
+ onChange={(value) => {
+ if (value) {
+ onChange(value as SortOption);
+ }
+ }}
+ data={selectData}
+ />
+ {addButton}
+ </Group>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/index.ts
new file mode 100644
index 00000000000..6b14e064932
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/index.ts
@@ -0,0 +1,7 @@
+export {
+ SidebarSortControl,
+ TRANSFORM_SORT_OPTIONS,
+ JOB_SORT_OPTIONS,
+ type SortOption,
+ type SortOptionData,
+} from "./SidebarSortControl";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformSidebarLayout.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformSidebarLayout.tsx
new file mode 100644
index 00000000000..2611f466cb9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformSidebarLayout.tsx
@@ -0,0 +1,57 @@
+import { type ReactNode, useContext, useLayoutEffect } from "react";
+
+import * as Urls from "metabase/lib/urls";
+import { Box, Flex } from "metabase/ui";
+import { DataStudioContext } from "metabase-enterprise/data-studio/common/contexts/DataStudioContext";
+
+import { JobsSidebar } from "./JobsSidebar";
+import { TransformsSidebar } from "./TransformsSidebar";
+import { useTransformsCurrentTab } from "./hooks";
+
+type TransformSidebarLayoutParams = {
+ transformId?: string;
+ jobId?: string;
+};
+
+type TransformSidebarLayoutProps = {
+ children: ReactNode;
+ params: TransformSidebarLayoutParams;
+};
+
+export const TransformSidebarLayout = ({
+ children,
+ params,
+}: TransformSidebarLayoutProps) => {
+ const currentTab = useTransformsCurrentTab();
+ const selectedTransformId = Urls.extractEntityId(params?.transformId);
+ const selectedJobId = Urls.extractEntityId(params.jobId);
+ const { isSidebarOpened, setIsSidebarOpened, setIsSidebarAvailable } =
+ useContext(DataStudioContext);
+
+ useLayoutEffect(() => {
+ setIsSidebarOpened(true);
+ setIsSidebarAvailable(true);
+ return () => {
+ setIsSidebarOpened(false);
+ setIsSidebarAvailable(false);
+ };
+ }, [currentTab, setIsSidebarOpened, setIsSidebarAvailable]);
+
+ return (
+ <Flex direction="row" w="100%" h="100%">
+ {isSidebarOpened && (
+ <>
+ {currentTab === "transforms" && (
+ <TransformsSidebar selectedTransformId={selectedTransformId} />
+ )}
+ {currentTab === "jobs" && (
+ <JobsSidebar selectedJobId={selectedJobId} />
+ )}
+ </>
+ )}
+ <Box data-testid="transforms-content" flex={1} miw={0}>
+ {children}
+ </Box>
+ </Flex>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.module.css
similarity index 81%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.module.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.module.css
index 81d543ba2c9..7de7bd2846f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/SaveSection/SaveSection.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.module.css
@@ -1,3 +1,3 @@
-.section {
+.footer {
border-top: 1px solid var(--mb-color-border);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.tsx
new file mode 100644
index 00000000000..b8b99cc9e7a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.tsx
@@ -0,0 +1,157 @@
+import { useDebouncedValue } from "@mantine/hooks";
+import { useCallback, useMemo, useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useListDatabasesQuery } from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { VirtualizedTree } from "metabase/common/components/tree/VirtualizedTree";
+import type { ITreeNodeItem } from "metabase/common/components/tree/types";
+import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
+import { getUserIsAdmin } from "metabase/selectors/user";
+import { Box, Flex } from "metabase/ui";
+import { useListTransformsQuery } from "metabase-enterprise/api";
+import { SidebarListItem } from "metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem";
+import { TransformListItem } from "metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/TransformListItem";
+import { SHARED_LIB_IMPORT_PATH } from "metabase-enterprise/transforms-python/constants";
+
+import { ListEmptyState } from "../../../components/ListEmptyState";
+import { CreateTransformMenu } from "../CreateTransformMenu";
+import { SidebarContainer } from "../SidebarContainer";
+import { SidebarList } from "../SidebarList";
+import { SidebarLoadingState } from "../SidebarLoadingState";
+import { SidebarSearchAndControls } from "../SidebarSearchAndControls";
+import { TRANSFORM_SORT_OPTIONS } from "../SidebarSortControl";
+import { lastModifiedSorter, nameSorter } from "../utils";
+
+import S from "./TransformsSidebar.module.css";
+import { TransformsTreeNode } from "./TransformsTreeNode";
+import { buildTreeData } from "./utils";
+
+const DEFAULT_SORT_TYPE = "tree";
+
+interface TransformsSidebarProps {
+ selectedTransformId?: number;
+}
+
+export const TransformsSidebar = ({
+ selectedTransformId,
+}: TransformsSidebarProps) => {
+ const dispatch = useDispatch();
+ const isAdmin = useSelector(getUserIsAdmin);
+ const [searchQuery, setSearchQuery] = useState("");
+ const [debouncedSearchQuery] = useDebouncedValue(searchQuery, 300);
+ const { value: sortType, setValue: setSortType } = useUserKeyValue({
+ namespace: "transforms",
+ key: "transforms-sort-type",
+ defaultValue: DEFAULT_SORT_TYPE,
+ });
+
+ const { data: transforms, error, isLoading } = useListTransformsQuery({});
+ const { data: databaseData } = useListDatabasesQuery();
+
+ const filteredTransforms = useMemo(() => {
+ if (!transforms) {
+ return [];
+ }
+
+ if (!debouncedSearchQuery) {
+ return transforms;
+ }
+
+ const query = debouncedSearchQuery.toLowerCase();
+ return transforms.filter(
+ (transform) =>
+ transform.name.toLowerCase().includes(query) ||
+ transform.target.name.toLowerCase().includes(query),
+ );
+ }, [transforms, debouncedSearchQuery]);
+
+ const sortFn = sortType === "last-modified" ? lastModifiedSorter : nameSorter;
+
+ const transformsSorted = useMemo(
+ () => [...filteredTransforms].sort(sortFn),
+ [filteredTransforms, sortFn],
+ );
+
+ const treeData = useMemo(
+ () =>
+ databaseData && sortType === "tree"
+ ? buildTreeData(transformsSorted, databaseData.data)
+ : [],
+ [databaseData, transformsSorted, sortType],
+ );
+
+ const getTreeItemEstimateSize = useCallback((item: ITreeNodeItem) => {
+ return item.icon === "table2" ? 52 : 33;
+ }, []);
+
+ if (error) {
+ return <LoadingAndErrorWrapper loading={false} error={error} />;
+ }
+
+ return (
+ <SidebarContainer data-testid="transforms-sidebar">
+ <Flex direction="column" gap="md" p="md">
+ <SidebarSearchAndControls
+ searchValue={searchQuery}
+ onSearchChange={setSearchQuery}
+ sortValue={sortType}
+ sortOptions={TRANSFORM_SORT_OPTIONS}
+ onSortChange={setSortType}
+ addButton={<CreateTransformMenu />}
+ sortLabel={t`Sort transforms`}
+ />
+ </Flex>
+ <Flex direction="column" flex={1} mih={0}>
+ {isLoading ? (
+ <SidebarLoadingState />
+ ) : transformsSorted.length === 0 ? (
+ <ListEmptyState
+ label={
+ debouncedSearchQuery
+ ? t`No transforms found`
+ : t`No transforms yet`
+ }
+ />
+ ) : sortType === "tree" ? (
+ <VirtualizedTree
+ initiallyExpanded
+ data={treeData}
+ selectedId={selectedTransformId}
+ onSelect={(node) => {
+ if (typeof node.id === "number") {
+ dispatch(push(Urls.transform(node.id)));
+ }
+ }}
+ TreeNode={TransformsTreeNode}
+ estimateSize={getTreeItemEstimateSize}
+ />
+ ) : (
+ <SidebarList>
+ {transformsSorted.map((transform) => (
+ <TransformListItem
+ key={transform.id}
+ transform={transform}
+ selectedId={selectedTransformId}
+ />
+ ))}
+ </SidebarList>
+ )}
+ </Flex>
+ {isAdmin && PLUGIN_TRANSFORMS_PYTHON.isEnabled && (
+ <Box p="sm" className={S.footer}>
+ <SidebarListItem
+ icon="code_block"
+ href={Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH })}
+ label={t`Python library`}
+ subtitle={t`Shared helper functions`}
+ />
+ </Box>
+ )}
+ </SidebarContainer>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.module.css
new file mode 100644
index 00000000000..fadf0a7ea24
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.module.css
@@ -0,0 +1,29 @@
+.treeNode.treeNode {
+ border-radius: 0.5rem;
+
+ &.isSelected {
+ background-color: var(--mb-color-brand-light);
+ }
+
+ &:hover:not(&.isSelected) {
+ background-color: var(--mb-color-brand-lighter);
+ }
+
+ &:not(.isLeaf) {
+ color: var(--mb-color-text-dark);
+
+ &.isSelected {
+ color: var(--mb-color-text-hover);
+ }
+ }
+}
+
+.nameContainer {
+ font-weight: normal;
+ overflow: hidden;
+}
+
+.leafContent {
+ overflow: hidden;
+ font-weight: normal;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.tsx
new file mode 100644
index 00000000000..02fb6faf7cf
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.tsx
@@ -0,0 +1,106 @@
+import cx from "classnames";
+import { forwardRef } from "react";
+import { isObject } from "underscore";
+
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import { TreeNode } from "metabase/common/components/tree/TreeNode";
+import type { TreeNodeProps } from "metabase/common/components/tree/types";
+import { Box, Icon } from "metabase/ui";
+import { SidebarListItemContent } from "metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem";
+import type { Transform } from "metabase-types/api";
+
+import S from "./TransformsTreeNode.module.css";
+
+export const TransformsTreeNode = forwardRef<HTMLLIElement, TreeNodeProps>(
+ function TransformsTreeNode(
+ {
+ item,
+ depth,
+ isExpanded,
+ isSelected,
+ hasChildren,
+ onSelect,
+ onToggleExpand,
+ ...props
+ }: TreeNodeProps,
+ ref,
+ ) {
+ const { name, icon } = item;
+ const transform = item.data as Transform | undefined;
+
+ const iconProps = isObject(icon) ? icon : { name: icon };
+
+ function onClick() {
+ onSelect?.();
+ onToggleExpand();
+ }
+
+ const handleKeyDown: React.KeyboardEventHandler = ({ key }) => {
+ switch (key) {
+ case "Enter":
+ onClick();
+ break;
+ case "ArrowRight":
+ !isExpanded && onToggleExpand();
+ break;
+ case "ArrowLeft":
+ isExpanded && onToggleExpand();
+ break;
+ }
+ };
+
+ const isLeaf = transform && !hasChildren;
+
+ return (
+ <TreeNode.Root
+ role="menuitem"
+ aria-label={name}
+ tabIndex={0}
+ onClick={onClick}
+ {...props}
+ className={cx(S.treeNode, props.className, {
+ [S.isSelected]: isSelected,
+ [S.isLeaf]: isLeaf,
+ })}
+ depth={depth}
+ isSelected={isLeaf ? false : isSelected}
+ aria-expanded={isExpanded}
+ onKeyDown={handleKeyDown}
+ ref={ref}
+ >
+ <TreeNode.ExpandToggleButton hidden={!hasChildren}>
+ <TreeNode.ExpandToggleIcon
+ isExpanded={isExpanded}
+ name="chevronright"
+ size={10}
+ />
+ </TreeNode.ExpandToggleButton>
+
+ {transform && !hasChildren ? (
+ <Box p="sm" flex={1} className={S.leafContent}>
+ <SidebarListItemContent
+ label={transform.name}
+ icon="table2"
+ subtitle={transform.target.name}
+ isActive={isSelected}
+ />
+ </Box>
+ ) : (
+ <>
+ {icon && (
+ <TreeNode.IconContainer transparent={false}>
+ <Icon {...iconProps} />
+ </TreeNode.IconContainer>
+ )}
+ <TreeNode.NameContainer
+ data-testid="tree-item-name"
+ className={S.nameContainer}
+ >
+ <Ellipsified>{name}</Ellipsified>
+ </TreeNode.NameContainer>
+ </>
+ )}
+ </TreeNode.Root>
+ );
+ },
+);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/index.ts
new file mode 100644
index 00000000000..4270386663f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/index.ts
@@ -0,0 +1 @@
+export { TransformsSidebar } from "./TransformsSidebar";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/utils.ts
new file mode 100644
index 00000000000..3ef2bf5285a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/utils.ts
@@ -0,0 +1,65 @@
+import { t } from "ttag";
+
+import type { ITreeNodeItem } from "metabase/common/components/tree/types";
+import type { Database, Transform } from "metabase-types/api";
+
+import { nameSorter } from "../utils";
+
+export function buildTreeData(
+ transforms: Transform[],
+ databases: Database[],
+): ITreeNodeItem[] {
+ type Tier<T> = (t: T) => ITreeNodeItem;
+ const tiers: Tier<Transform>[] = [
+ ({ target }) => ({
+ id: `database-${target.database}`,
+ name:
+ databases.find((d) => d.id === target.database)?.name ||
+ t`Unknown database`,
+ icon: "database",
+ }),
+ ({ target }) => ({
+ id: `schema-${target.database}-${target.schema}`,
+ name: target.schema || t`Unknown schema`,
+ icon: "folder",
+ }),
+ ];
+
+ const nodes: Record<string | number, ITreeNodeItem> = {};
+ const root: ITreeNodeItem = {
+ id: "root",
+ name: "root",
+ icon: "empty",
+ children: [],
+ };
+
+ transforms.forEach((transform) => {
+ let prev = root;
+ tiers.forEach((tier) => {
+ let node = tier(transform);
+ const existingNode = nodes[node.id];
+ if (!existingNode) {
+ node = { ...node, children: [] };
+ nodes[node.id] = node;
+ prev.children?.push(node);
+ } else {
+ node = existingNode;
+ }
+ prev = node;
+ });
+ prev.children?.push({
+ id: transform.id,
+ name: transform.target.name,
+ icon: "table2",
+ data: transform,
+ });
+ });
+
+ const recursiveAlpha = (node: ITreeNodeItem) => {
+ node.children?.sort(nameSorter);
+ node.children?.forEach(recursiveAlpha);
+ return node;
+ };
+
+ return recursiveAlpha(root).children || [];
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/hooks.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/hooks.ts
new file mode 100644
index 00000000000..51460a8cc44
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/hooks.ts
@@ -0,0 +1,21 @@
+import { useMemo } from "react";
+
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getLocation } from "metabase/selectors/routing";
+
+export type TransformsNavTab = "transforms" | "jobs" | "runs";
+
+export function useTransformsCurrentTab(): TransformsNavTab {
+ const { pathname } = useSelector(getLocation);
+
+ return useMemo(() => {
+ if (pathname.startsWith(Urls.transformJobList())) {
+ return "jobs";
+ }
+ if (pathname.startsWith(Urls.transformRunList())) {
+ return "runs";
+ }
+ return "transforms";
+ }, [pathname]);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/index.ts
new file mode 100644
index 00000000000..86c5b9c8b52
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/index.ts
@@ -0,0 +1 @@
+export * from "./TransformSidebarLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/utils.ts
new file mode 100644
index 00000000000..3ff85d4ec74
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/utils.ts
@@ -0,0 +1,11 @@
+export const nameSorter = <T extends { name: string }>(a: T, b: T) =>
+ a.name.localeCompare(b.name);
+
+export const lastModifiedSorter = <T extends { updated_at: string }>(
+ a: T,
+ b: T,
+) => {
+ const dateA = new Date(a.updated_at).getTime();
+ const dateB = new Date(b.updated_at).getTime();
+ return dateB - dateA;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/TargetSection.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/TargetSection.tsx
index 735fddbb723..b6f82bd14bb 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/TargetSection.tsx
@@ -21,9 +21,8 @@ import {
} from "metabase/ui";
import type { Transform } from "metabase-types/api";
-import { SplitSection } from "../../../components/SplitSection";
-import { sourceDatabaseId } from "../../../utils";
-import { isTransformRunning } from "../utils";
+import { TitleSection } from "../../../components/TitleSection";
+import { isTransformRunning, sourceDatabaseId } from "../../../utils";
import { UpdateTargetModal } from "./UpdateTargetModal";
@@ -33,7 +32,7 @@ type TargetSectionProps = {
export function TargetSection({ transform }: TargetSectionProps) {
return (
- <SplitSection
+ <TitleSection
label={t`Transform target`}
description={t`Change what this transform generates and where.`}
>
@@ -45,7 +44,7 @@ export function TargetSection({ transform }: TargetSectionProps) {
<EditTargetButton transform={transform} />
<EditMetadataButton transform={transform} />
</Group>
- </SplitSection>
+ </TitleSection>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/TargetSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/TargetSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/TargetSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx
index 14346604a21..d4dfc693389 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/UpdateTargetModal/UpdateTargetModal.tsx
@@ -30,11 +30,10 @@ import {
useDeleteTransformTargetMutation,
useUpdateTransformMutation,
} from "metabase-enterprise/api";
+import { SchemaFormSelect } from "metabase-enterprise/transforms/components/SchemaFormSelect";
+import { sourceDatabaseId } from "metabase-enterprise/transforms/utils";
import type { Transform, UpdateTransformRequest } from "metabase-types/api";
-import { SchemaFormSelect } from "../../../../components/SchemaFormSelect";
-import { sourceDatabaseId } from "../../../../utils";
-
type UpdateTargetModalProps = {
transform: Transform;
onUpdate: () => void;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/UpdateTargetModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/UpdateTargetModal/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/UpdateTargetModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformPage/TargetSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TargetSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx
new file mode 100644
index 00000000000..7d03e0d8b02
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx
@@ -0,0 +1,69 @@
+import { useState } from "react";
+
+import { skipToken } from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import * as Urls from "metabase/lib/urls";
+import { Center } from "metabase/ui";
+import { useGetTransformQuery } from "metabase-enterprise/api";
+import type { Transform } from "metabase-types/api";
+
+import { ColumnLayout, ColumnLayoutBody } from "../../components/ColumnLayout";
+import { TransformHeader } from "../../components/TransformHeader";
+import { POLLING_INTERVAL } from "../../constants";
+import {
+ isTransformCanceling,
+ isTransformRunning,
+ isTransformSyncing,
+} from "../../utils";
+
+import { TargetSection } from "./TargetSection";
+
+type TransformTargetPageParams = {
+ transformId: string;
+};
+
+type TransformTargetPageProps = {
+ params: TransformTargetPageParams;
+};
+
+export function TransformTargetPage({ params }: TransformTargetPageProps) {
+ const [isPolling, setIsPolling] = useState(false);
+ const transformId = Urls.extractEntityId(params.transformId);
+ const {
+ data: transform,
+ isLoading,
+ error,
+ } = useGetTransformQuery(transformId ?? skipToken, {
+ pollingInterval: isPolling ? POLLING_INTERVAL : undefined,
+ });
+
+ if (isPolling !== isPollingNeeded(transform)) {
+ setIsPolling(isPollingNeeded(transform));
+ }
+
+ if (isLoading || error || transform == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <ColumnLayout>
+ <TransformHeader transform={transform} />
+ <ColumnLayoutBody>
+ <TargetSection transform={transform} />
+ </ColumnLayoutBody>
+ </ColumnLayout>
+ );
+}
+
+function isPollingNeeded(transform?: Transform) {
+ return (
+ transform != null &&
+ (isTransformRunning(transform) ||
+ isTransformCanceling(transform) ||
+ isTransformSyncing(transform))
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/index.ts
new file mode 100644
index 00000000000..a4a1db0fc5a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/index.ts
@@ -0,0 +1 @@
+export * from "./TransformTargetPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css
new file mode 100644
index 00000000000..3928ba9b966
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css
@@ -0,0 +1,3 @@
+.header {
+ border-bottom: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx
new file mode 100644
index 00000000000..c7018b11581
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx
@@ -0,0 +1,17 @@
+import type { ReactNode } from "react";
+
+import { Flex } from "metabase/ui";
+
+interface TransformTopNavLayoutProps {
+ children: ReactNode;
+}
+
+export const TransformTopNavLayout = ({
+ children,
+}: TransformTopNavLayoutProps) => {
+ return (
+ <Flex direction="column" w="100%" h="100%">
+ {children}
+ </Flex>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/index.ts
new file mode 100644
index 00000000000..5076b630446
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTopNavLayout/index.ts
@@ -0,0 +1 @@
+export { TransformTopNavLayout } from "./TransformTopNavLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx
new file mode 100644
index 00000000000..a0f89f72dbc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx
@@ -0,0 +1,58 @@
+import { IndexRoute, Route } from "react-router";
+
+import {
+ PLUGIN_DEPENDENCIES,
+ PLUGIN_TRANSFORMS_PYTHON,
+} from "metabase/plugins";
+
+import { JobEmptyPage } from "./pages/JobEmptyPage";
+import { JobPage } from "./pages/JobPage";
+import { NewJobPage } from "./pages/NewJobPage";
+import {
+ NewCardTransformPage,
+ NewNativeTransformPage,
+ NewPythonTransformPage,
+ NewQueryTransformPage,
+} from "./pages/NewTransformPage";
+import { RunListPage } from "./pages/RunListPage";
+import { TransformDependenciesPage } from "./pages/TransformDependenciesPage";
+import { TransformEmptyPage } from "./pages/TransformEmptyPage";
+import { TransformQueryPage } from "./pages/TransformQueryPage";
+import { TransformRunPage } from "./pages/TransformRunPage";
+import { TransformSidebarLayout } from "./pages/TransformSidebarLayout";
+import { TransformTargetPage } from "./pages/TransformTargetPage";
+import { TransformTopNavLayout } from "./pages/TransformTopNavLayout";
+
+export function getDataStudioTransformRoutes() {
+ return (
+ <>
+ <Route path="runs" component={TransformTopNavLayout}>
+ <IndexRoute component={RunListPage} />
+ </Route>
+ <Route component={TransformSidebarLayout}>
+ <IndexRoute component={TransformEmptyPage} />
+ <Route path="jobs" component={JobEmptyPage} />
+ <Route path="jobs/new" component={NewJobPage} />
+ <Route path="jobs/:jobId" component={JobPage} />
+ <Route path="new/query" component={NewQueryTransformPage} />
+ <Route path="new/native" component={NewNativeTransformPage} />
+ <Route path="new/card/:cardId" component={NewCardTransformPage} />
+ {PLUGIN_TRANSFORMS_PYTHON.isEnabled && (
+ <Route path="new/python" component={NewPythonTransformPage} />
+ )}
+ <Route path=":transformId" component={TransformQueryPage} />
+ <Route path=":transformId/run" component={TransformRunPage} />
+ <Route path=":transformId/target" component={TransformTargetPage} />
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <Route
+ path=":transformId/dependencies"
+ component={TransformDependenciesPage}
+ >
+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
+ </Route>
+ )}
+ {PLUGIN_TRANSFORMS_PYTHON.getPythonLibraryRoutes()}
+ </Route>
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
index fe12713cfd0..d9e0e657856 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
@@ -9,6 +9,7 @@ import type {
Database,
DatabaseId,
DraftTransformSource,
+ Transform,
TransformRunMethod,
TransformRunStatus,
TransformSource,
@@ -125,6 +126,35 @@ export function parseRunMethod(value: unknown): TransformRunMethod | undefined {
}
}
+export function isTransformRunning(transform: Transform) {
+ const lastRun = transform.last_run;
+ return lastRun?.status === "started";
+}
+
+export function isTransformCanceling(transform: Transform) {
+ const lastRun = transform.last_run;
+ return lastRun?.status === "canceling";
+}
+
+export function isTransformSyncing(transform: Transform) {
+ const lastRun = transform.last_run;
+
+ // If the last run succeeded but there is no table yet, wait for the sync to
+ // finish. If the transform is changed until the sync finishes, stop polling,
+ // because the table could be already deleted.
+ if (
+ transform.table == null &&
+ lastRun?.status === "succeeded" &&
+ lastRun?.end_time != null
+ ) {
+ const endedAt = parseTimestamp(lastRun.end_time);
+ const updatedAt = parseTimestamp(transform.updated_at);
+ return endedAt.isAfter(updatedAt);
+ }
+
+ return false;
+}
+
export function isSameSource(
source1: DraftTransformSource,
source2: DraftTransformSource,
@@ -143,3 +173,23 @@ export function isNotDraftSource(
): source is TransformSource {
return source.type !== "python" || source["source-database"] != null;
}
+
+export type ValidationResult = {
+ isValid: boolean;
+ errorMessage?: string;
+};
+
+export function getValidationResult(query: Lib.Query): ValidationResult {
+ const { isNative } = Lib.queryDisplayInfo(query);
+ if (isNative) {
+ const tags = Object.values(Lib.templateTags(query));
+ if (tags.some((t) => t.type !== "card" && t.type !== "snippet")) {
+ return {
+ isValid: false,
+ errorMessage: t`In transforms, you can use snippets and question or model references, but not variables.`,
+ };
+ }
+ }
+
+ return { isValid: Lib.canSave(query, "question") };
+}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.tsx b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.tsx
index 63c4683670b..d2711e72d2d 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.tsx
@@ -29,7 +29,6 @@ export const PublicComponentStylesWrapper = forwardRef<
{...props}
ref={ref}
dir="ltr"
- // eslint-disable-next-line react/prop-types -- className is in div props :shrugs:
className={cx("mb-wrapper", S.publicComponentWrapper, props.className)}
// Mantine's cssVariablesSelector expects data-mantine-color-scheme to be set on the target element
data-mantine-color-scheme="light"
diff --git a/frontend/src/embedding-sdk-bundle/types/collection.ts b/frontend/src/embedding-sdk-bundle/types/collection.ts
index d34c39c7fb7..6787670ed2a 100644
--- a/frontend/src/embedding-sdk-bundle/types/collection.ts
+++ b/frontend/src/embedding-sdk-bundle/types/collection.ts
@@ -30,6 +30,10 @@ export type MetabaseCollectionItem = {
type?:
| "instance-analytics"
| "trash"
+ | "remote-synced"
+ | "library"
+ | "library-models"
+ | "library-metrics"
| "model"
| "question"
| "metric"
@@ -37,8 +41,8 @@ export type MetabaseCollectionItem = {
is_remote_synced?: boolean;
"last-edit-info"?: {
email: string;
- first_name: string;
- last_name: string;
+ first_name: string | null;
+ last_name: string | null;
id: SdkUserId;
timestamp: string;
};
diff --git a/frontend/src/metabase-lib/query.ts b/frontend/src/metabase-lib/query.ts
index 383ecadd09e..bd82286318a 100644
--- a/frontend/src/metabase-lib/query.ts
+++ b/frontend/src/metabase-lib/query.ts
@@ -1,4 +1,6 @@
import * as ML from "cljs/metabase.lib.js";
+import { metadataProvider } from "metabase-lib/metadata";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
CardId,
CardType,
@@ -137,6 +139,13 @@ export function fromJsQuery(
return ML.from_js_query(metadataProvider, jsQuery);
}
+export function fromJsQueryAndMetadata(
+ metadata: Metadata,
+ jsQuery: OpaqueDatasetQuery | DatasetQuery,
+): Query {
+ return fromJsQuery(metadataProvider(jsQuery.database, metadata), jsQuery);
+}
+
export function toJsQuery(query: Query): OpaqueDatasetQuery {
return ML.to_js_query(query);
}
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts b/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts
index d4b9ed4b7d7..83547f2d70e 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts
+++ b/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts
@@ -722,7 +722,7 @@ function getModelVirtualTable(card: Card) {
db_id: savedQuestionsDb.id,
name: card.name,
display_name: card.name,
- fields: card.result_metadata,
+ fields: card.result_metadata ?? [],
});
}
diff --git a/frontend/src/metabase-types/analytics/event.ts b/frontend/src/metabase-types/analytics/event.ts
index 639e77d7565..5f169df16c0 100644
--- a/frontend/src/metabase-types/analytics/event.ts
+++ b/frontend/src/metabase-types/analytics/event.ts
@@ -3,7 +3,7 @@ import type {
ChecklistItemCTA,
ChecklistItemValue,
} from "metabase/home/components/Onboarding/types";
-import type { MetadataEditAnalyticsDetail } from "metabase/metadata/pages/DataModel/types";
+import type { MetadataEditAnalyticsDetail } from "metabase/metadata/pages/DataModelV1/types";
import type { KeyboardShortcutId } from "metabase/palette/shortcuts";
import type { ClickActionSection } from "metabase/visualizations/types";
import type {
@@ -261,19 +261,16 @@ export type ConnectionStringParsedFailedEvent = ValidateEvent<{
export type TransformTriggerManualRunEvent = ValidateEvent<{
event: "transform_trigger_manual_run";
- triggered_from: "transform-page";
target_id: TransformId;
}>;
export type TransformJobTriggerManualRunEvent = ValidateEvent<{
event: "transform_job_trigger_manual_run";
- triggered_from: "job-page";
target_id: TransformId;
}>;
export type TransformCreateEvent = ValidateEvent<{
event: "transform_create";
- triggered_from: "transform-page-create-menu";
event_detail: "query" | "native" | "python" | "saved-question";
}>;
diff --git a/frontend/src/metabase-types/api/activity.ts b/frontend/src/metabase-types/api/activity.ts
index f642a8f0e13..e4c85d79843 100644
--- a/frontend/src/metabase-types/api/activity.ts
+++ b/frontend/src/metabase-types/api/activity.ts
@@ -1,4 +1,4 @@
-import type { CollectionId } from "./collection";
+import type { CollectionId, CollectionType } from "./collection";
import type { DashboardId } from "./dashboard";
import type { DatabaseId, InitialSyncStatus } from "./database";
import type { ModerationReviewStatus } from "./moderation";
@@ -70,6 +70,7 @@ export type RecentCollectionItem = BaseRecentItem & {
id: DashboardId;
moderation_status: ModerationReviewStatus;
};
+ collection_type?: CollectionType;
};
export type RecentItem = RecentTableItem | RecentCollectionItem;
diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.ts
index 435c3a5a41c..b5408c4305e 100644
--- a/frontend/src/metabase-types/api/card.ts
+++ b/frontend/src/metabase-types/api/card.ts
@@ -31,11 +31,6 @@ import type { CardDisplayType, VisualizationDisplay } from "./visualization";
import type { SmartScalarComparison } from "./visualization-settings";
export type CardType = "model" | "question" | "metric";
-export type CardCreatorInfo = Pick<
- UserInfo,
- "first_name" | "last_name" | "email" | "id" | "common_name"
->;
-
export type CardDashboardInfo = Pick<Dashboard, "id" | "name">;
export interface Card<Q extends DatasetQuery = DatasetQuery>
@@ -67,8 +62,9 @@ export interface Card<Q extends DatasetQuery = DatasetQuery>
dashboard_id: DashboardId | null;
document_id?: DocumentId;
dashboard_count: number | null;
+ parameter_usage_count?: number | null;
- result_metadata: Field[];
+ result_metadata: Field[] | null;
moderation_reviews?: ModerationReview[];
persisted?: boolean;
@@ -81,7 +77,7 @@ export interface Card<Q extends DatasetQuery = DatasetQuery>
archived: boolean;
is_remote_synced?: boolean;
- creator?: CardCreatorInfo;
+ creator?: UserInfo;
"last-edit-info"?: LastEditInfo;
table_id?: TableId;
}
@@ -389,14 +385,14 @@ export interface CreateCardRequest {
type?: CardType;
parameters?: Parameter[];
parameter_mappings?: unknown;
- description?: string;
- collection_id?: CollectionId;
- dashboard_id?: DashboardId;
+ description?: string | null;
+ collection_id?: CollectionId | null;
+ dashboard_id?: DashboardId | null;
document_id?: DocumentId | null;
dashboard_tab_id?: DashboardTabId;
- collection_position?: number;
- result_metadata?: Field[];
- cache_ttl?: number;
+ collection_position?: number | null;
+ result_metadata?: Field[] | null;
+ cache_ttl?: number | null;
}
export interface CreateCardFromCsvRequest {
@@ -411,7 +407,7 @@ export interface UpdateCardRequest {
dataset_query?: DatasetQuery;
type?: CardType;
display?: string;
- description?: string;
+ description?: string | null;
visualization_settings?: VisualizationSettings;
archived?: boolean;
enable_embedding?: boolean;
@@ -421,7 +417,7 @@ export interface UpdateCardRequest {
dashboard_id?: DashboardId | null;
document_id?: DocumentId | null;
collection_position?: number;
- result_metadata?: Field[];
+ result_metadata?: Field[] | null;
cache_ttl?: number;
collection_preview?: boolean;
delete_old_dashcards?: boolean;
diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.ts
index 04b06a8f91c..2226f812da9 100644
--- a/frontend/src/metabase-types/api/collection.ts
+++ b/frontend/src/metabase-types/api/collection.ts
@@ -14,7 +14,7 @@ import type { CardId, CardType } from "./card";
import type { DatabaseId } from "./database";
import type { SortingOptions } from "./sorting";
import type { TableId } from "./table";
-import type { UserId } from "./user";
+import type { UserId, UserInfo } from "./user";
// Collection ID can be either a numeric or entity id
export type RegularCollectionId = number | string;
@@ -26,17 +26,23 @@ export type CollectionId =
| "users"
| "trash";
-export type CollectionContentModel = "card" | "dataset";
+export type CollectionContentModel = "card" | "dataset" | "metric";
export type CollectionAuthorityLevel = "official" | null;
-export type CollectionType = "instance-analytics" | "trash" | null;
-
-export type LastEditInfo = {
- email: string;
- first_name: string;
- last_name: string;
- id: UserId;
+export type CollectionType =
+ | "instance-analytics"
+ | "trash"
+ | "remote-synced"
+ | "library"
+ | "library-models"
+ | "library-metrics"
+ | null;
+
+export type LastEditInfo = Pick<
+ UserInfo,
+ "id" | "email" | "first_name" | "last_name"
+> & {
timestamp: string;
};
@@ -211,6 +217,7 @@ export interface ListCollectionsRequest {
export interface ListCollectionsTreeRequest {
"exclude-archived"?: boolean;
"exclude-other-user-collections"?: boolean;
+ "include-library"?: boolean;
namespace?: string;
shallow?: boolean;
"collection-id"?: RegularCollectionId | null;
diff --git a/frontend/src/metabase-types/api/dashboard.ts b/frontend/src/metabase-types/api/dashboard.ts
index 7635855e2db..170dabf9bc3 100644
--- a/frontend/src/metabase-types/api/dashboard.ts
+++ b/frontend/src/metabase-types/api/dashboard.ts
@@ -4,7 +4,6 @@ import type {
} from "metabase/public/lib/types";
import type {
BaseEntityId,
- CardCreatorInfo,
CardDisplayType,
ClickBehavior,
Collection,
@@ -19,6 +18,7 @@ import type {
ParameterValueOrArray,
Table,
UserId,
+ UserInfo,
VirtualCardDisplay,
VisualizerVizDefinition,
} from "metabase-types/api";
@@ -48,7 +48,7 @@ export interface Dashboard {
entity_id: BaseEntityId;
created_at: string;
creator_id: UserId;
- creator?: CardCreatorInfo;
+ creator?: UserInfo;
updated_at: string;
collection?: Collection | null;
collection_id: CollectionId | null;
diff --git a/frontend/src/metabase-types/api/dataset.ts b/frontend/src/metabase-types/api/dataset.ts
index a501e59a0ba..707ed6d11b1 100644
--- a/frontend/src/metabase-types/api/dataset.ts
+++ b/frontend/src/metabase-types/api/dataset.ts
@@ -8,7 +8,12 @@ import type {
import type { Card } from "./card";
import type { DatabaseId } from "./database";
-import type { FieldFingerprint, FieldId, FieldVisibilityType } from "./field";
+import type {
+ Field,
+ FieldFingerprint,
+ FieldId,
+ FieldVisibilityType,
+} from "./field";
import type { Insight } from "./insight";
import type { ParameterOptions } from "./parameters";
import type { DownloadPermission } from "./permissions";
@@ -75,7 +80,7 @@ export interface DatasetColumn {
}
export interface ResultsMetadata {
- columns: DatasetColumn[];
+ columns: Field[];
}
export interface DatasetData {
diff --git a/frontend/src/metabase-types/api/dependencies.ts b/frontend/src/metabase-types/api/dependencies.ts
index cce2010315b..bea8b28ffcb 100644
--- a/frontend/src/metabase-types/api/dependencies.ts
+++ b/frontend/src/metabase-types/api/dependencies.ts
@@ -162,6 +162,7 @@ export type ListNodeDependentsRequest = {
type: DependencyType;
dependent_type: DependencyType;
dependent_card_type?: CardType;
+ archived?: boolean;
};
export type CheckDependenciesResponse = {
diff --git a/frontend/src/metabase-types/api/field.ts b/frontend/src/metabase-types/api/field.ts
index d1c7f03ee51..b82072bef7a 100644
--- a/frontend/src/metabase-types/api/field.ts
+++ b/frontend/src/metabase-types/api/field.ts
@@ -1,5 +1,5 @@
import type { RowValue } from "./dataset";
-import type { FieldReference } from "./query";
+import type { DimensionReference, FieldReference } from "./query";
import type { Table, TableId } from "./table";
export type FieldId = number;
@@ -70,7 +70,7 @@ export interface Field {
id: FieldId | FieldReference;
table_id: TableId;
table?: Table;
- field_ref?: FieldReference;
+ field_ref?: DimensionReference;
name: string;
display_name: string;
@@ -86,7 +86,7 @@ export interface Field {
preview_display: boolean;
position: number;
- parent_id?: FieldId;
+ parent_id?: FieldId | null;
fk_target_field_id: FieldId | null;
target?: Field;
values?: FieldValue[];
diff --git a/frontend/src/metabase-types/api/mocks/dataset.ts b/frontend/src/metabase-types/api/mocks/dataset.ts
index 63d8314892b..858d5537dd7 100644
--- a/frontend/src/metabase-types/api/mocks/dataset.ts
+++ b/frontend/src/metabase-types/api/mocks/dataset.ts
@@ -5,9 +5,12 @@ import type {
EmbedDataset,
EmbedDatasetData,
ErrorEmbedDataset,
+ Field,
ResultsMetadata,
TemplateTag,
-} from "metabase-types/api/dataset";
+} from "metabase-types/api";
+
+import { createMockField } from "./field";
export const createMockColumn = (
data: Partial<DatasetColumn> = {},
@@ -64,7 +67,7 @@ export const createMockDatasetData = ({
rows: [],
cols,
rows_truncated: 0,
- results_metadata: createMockResultsMetadata(cols),
+ results_metadata: createMockResultsMetadata(cols?.map(createMockField)),
native_form: { query: "" },
...opts,
});
@@ -137,7 +140,7 @@ export const createMockTemplateTag = (
});
export const createMockResultsMetadata = (
- columns: DatasetColumn[] = [createMockColumn()],
+ columns: Field[] = [createMockField()],
opts?: Partial<ResultsMetadata>,
): ResultsMetadata => ({
columns,
diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.ts
index d4acccea663..950eecc976e 100644
--- a/frontend/src/metabase-types/api/mocks/settings.ts
+++ b/frontend/src/metabase-types/api/mocks/settings.ts
@@ -143,6 +143,7 @@ export const createMockTokenFeatures = (
transforms: false,
remote_sync: false,
"transforms-python": false,
+ data_studio: false,
"support-users": false,
...opts,
});
diff --git a/frontend/src/metabase-types/api/mocks/table.ts b/frontend/src/metabase-types/api/mocks/table.ts
index d2d1aa12f7e..1c33c31df56 100644
--- a/frontend/src/metabase-types/api/mocks/table.ts
+++ b/frontend/src/metabase-types/api/mocks/table.ts
@@ -16,6 +16,12 @@ export const createMockTable = (opts?: Partial<Table>): Table => {
is_upload: false,
created_at: "2021-05-01T00:00:00",
updated_at: "2021-05-01T00:00:00",
+ data_source: null,
+ data_layer: null,
+ owner_email: null,
+ owner_user_id: null,
+ transform_id: null,
+ view_count: 0,
...opts,
};
};
diff --git a/frontend/src/metabase-types/api/modelIndexes.ts b/frontend/src/metabase-types/api/modelIndexes.ts
index 68033a3db83..93b19e4dd03 100644
--- a/frontend/src/metabase-types/api/modelIndexes.ts
+++ b/frontend/src/metabase-types/api/modelIndexes.ts
@@ -1,13 +1,13 @@
import type { CardId } from "./card";
-import type { FieldReference } from "./query";
+import type { DimensionReference } from "./query";
export type NormalizedIndexedEntity = IndexedEntity;
export type ModelIndex = {
id: number;
model_id: CardId;
- value_ref: FieldReference;
- pk_ref: FieldReference;
+ value_ref: DimensionReference;
+ pk_ref: DimensionReference;
state: "indexed" | "pending";
creator_id: number;
error: string | null;
@@ -22,7 +22,7 @@ export type IndexedEntity = {
model: "indexed-entity";
model_name: string;
name: string;
- pk_ref: FieldReference;
+ pk_ref: DimensionReference;
};
export type ModelIndexesListQuery = {
diff --git a/frontend/src/metabase-types/api/search.ts b/frontend/src/metabase-types/api/search.ts
index 6dc3de485a3..d21282e6f8b 100644
--- a/frontend/src/metabase-types/api/search.ts
+++ b/frontend/src/metabase-types/api/search.ts
@@ -76,6 +76,7 @@ export interface SearchResult<
archived: boolean | null;
collection_position: number | null;
collection: CollectionEssentials;
+ collection_type?: Collection["type"];
table_id: TableId;
bookmark: boolean | null;
dashboard:
diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.ts
index b5ac85475b9..951dfc44428 100644
--- a/frontend/src/metabase-types/api/settings.ts
+++ b/frontend/src/metabase-types/api/settings.ts
@@ -330,6 +330,7 @@ export const tokenFeatures = [
"semantic_search",
"transforms",
"transforms-python",
+ "data_studio",
"support-users",
] as const;
@@ -573,6 +574,8 @@ export type UserSettings = {
"notebook-native-preview-sidebar-width"?: number | null;
"expand-browse-in-nav"?: boolean;
"expand-bookmarks-in-nav"?: boolean;
+ "expand-collections-in-nav"?: boolean;
+ "expand-library-in-nav"?: boolean;
"browse-filter-only-verified-models"?: boolean;
"browse-filter-only-verified-metrics"?: boolean;
"show-updated-permission-modal": boolean;
diff --git a/frontend/src/metabase-types/api/table.ts b/frontend/src/metabase-types/api/table.ts
index 6218ab8e6f6..4949fcb7fc5 100644
--- a/frontend/src/metabase-types/api/table.ts
+++ b/frontend/src/metabase-types/api/table.ts
@@ -1,8 +1,11 @@
import type { Card, CardType } from "./card";
+import type { Collection } from "./collection";
import type { Database, DatabaseId, InitialSyncStatus } from "./database";
import type { DatasetData } from "./dataset";
import type { Field, FieldId } from "./field";
import type { Segment } from "./segment";
+import type { Transform, TransformId } from "./transform";
+import type { UserId } from "./user";
export type ConcreteTableId = number;
export type VirtualTableId = string; // e.g. "card__17" where 17 is a card id
@@ -19,6 +22,15 @@ export type TableVisibilityType =
| "technical"
| "cruft";
+export type TableDataLayer = "gold" | "silver" | "bronze" | "copper";
+
+export type TableDataSource =
+ | "ingested"
+ | "transform"
+ | "metabase-transform"
+ | "source-data"
+ | "upload";
+
export type TableFieldOrder = "database" | "alphabetical" | "custom" | "smart";
export type Table = {
@@ -49,6 +61,18 @@ export type Table = {
points_of_interest?: string;
created_at: string;
updated_at: string;
+
+ data_source: TableDataSource | null;
+ data_layer: TableDataLayer | null;
+ owner_email: string | null;
+ owner_user_id: UserId | null;
+ estimated_row_count?: number | null;
+ transform_id: TransformId | null; // readonly
+ view_count: number;
+ transform?: Transform;
+
+ published_models?: Card[] | null; // present in /api/table/:id/query_metadata
+ published_as_model?: boolean; // present in /api/database/:id/schemas/:schemaId
};
export type SchemaName = string;
@@ -77,6 +101,14 @@ export interface TableListQuery {
include_editable_data_model?: boolean;
remove_inactive?: boolean;
skip_fields?: boolean;
+
+ term?: string;
+ "data-layer"?: TableDataLayer;
+ "data-source"?: string | null;
+ "owner-user-id"?: UserId | null;
+ "owner-email"?: string | null;
+ "unused-only"?: boolean | null;
+ "orphan-only"?: boolean;
}
export interface ForeignKey {
@@ -108,6 +140,12 @@ export interface UpdateTableRequest {
points_of_interest?: string;
show_in_getting_started?: boolean;
field_order?: TableFieldOrder;
+
+ data_source?: TableDataSource | null;
+ data_layer?: TableDataLayer | null;
+ entity_type?: string | null;
+ owner_email?: string | null;
+ owner_user_id?: UserId | null;
}
export interface UpdateTableListRequest {
@@ -118,6 +156,12 @@ export interface UpdateTableListRequest {
caveats?: string;
points_of_interest?: string;
show_in_getting_started?: boolean;
+
+ data_source?: TableDataSource | null;
+ data_layer?: TableDataLayer | null;
+ entity_type?: string | null;
+ owner_email?: string | null;
+ owner_user_id?: UserId | null;
}
export interface UpdateTableFieldsOrderRequest {
@@ -125,6 +169,37 @@ export interface UpdateTableFieldsOrderRequest {
field_order: FieldId[];
}
+export interface EditTablesRequest {
+ database_ids?: DatabaseId[];
+ schema_ids?: SchemaId[];
+ table_ids?: TableId[];
+ visibility_type?: TableVisibilityType;
+ data_authority?: string;
+ data_source?: TableDataSource | null;
+ data_layer?: TableDataLayer | null;
+ owner_email?: string | null;
+ owner_user_id?: UserId | null;
+ entity_type?: string | null;
+}
+
+export interface SyncTablesSchemaRequest {
+ database_ids?: DatabaseId[];
+ schema_ids?: SchemaId[];
+ table_ids?: TableId[];
+}
+
+export interface RescanTablesValuesRequest {
+ database_ids?: DatabaseId[];
+ schema_ids?: SchemaId[];
+ table_ids?: TableId[];
+}
+
+export interface DiscardTablesValuesRequest {
+ database_ids?: DatabaseId[];
+ schema_ids?: SchemaId[];
+ table_ids?: TableId[];
+}
+
export type UploadManagementResponse = Table[];
export interface DeleteUploadTableRequest {
@@ -136,6 +211,19 @@ export interface GetTableDataRequest {
tableId: TableId;
}
+export interface PublishModelsRequest {
+ database_ids?: DatabaseId[];
+ schema_ids?: SchemaId[];
+ table_ids?: TableId[];
+ target_collection_id: number | "library" | null;
+}
+
+export interface PublishModelsResponse {
+ created_count: number;
+ models: Card[];
+ target_collection: Collection | null;
+}
+
export type TableData = {
data: DatasetData;
database_id: DatabaseId;
diff --git a/frontend/src/metabase-types/api/user.ts b/frontend/src/metabase-types/api/user.ts
index bbd820f41ea..e6c0274e27e 100644
--- a/frontend/src/metabase-types/api/user.ts
+++ b/frontend/src/metabase-types/api/user.ts
@@ -152,6 +152,11 @@ export type UserKeyValue =
last_download_format: "csv" | "xlsx" | "json" | "png";
last_table_download_format: "csv" | "xlsx" | "json";
};
+ }
+ | {
+ namespace: "transforms";
+ key: string;
+ value: "tree" | "alphabetical" | "last-modified";
};
export type UserKeyValueKey = Pick<UserKeyValue, "namespace" | "key">;
diff --git a/frontend/src/metabase-types/store/admin.ts b/frontend/src/metabase-types/store/admin.ts
index 5dc9b6d1270..63a445714fa 100644
--- a/frontend/src/metabase-types/store/admin.ts
+++ b/frontend/src/metabase-types/store/admin.ts
@@ -18,8 +18,7 @@ export type AdminPathKey =
| "performance"
| "performance-models"
| "performance-dashboards-and-questions"
- | "performance-databases"
- | "transforms";
+ | "performance-databases";
export type AdminPath = {
key: AdminPathKey;
diff --git a/frontend/src/metabase/App.tsx b/frontend/src/metabase/App.tsx
index c8ca4f9bdab..a37d5d3fcb4 100644
--- a/frontend/src/metabase/App.tsx
+++ b/frontend/src/metabase/App.tsx
@@ -26,6 +26,7 @@ import {
getErrorPage,
getIsAdminApp,
getIsAppBarVisible,
+ getIsDataStudioApp,
getIsNavBarEnabled,
} from "metabase/selectors/app";
import { getApplicationName } from "metabase/selectors/whitelabel";
@@ -57,6 +58,7 @@ const getErrorComponent = ({ status, data, context }: AppErrorDescriptor) => {
interface AppStateProps {
errorPage: AppErrorDescriptor | null;
isAdminApp: boolean;
+ isDataStudioApp: boolean;
bannerMessageDescriptor?: string;
isAppBarVisible: boolean;
isNavBarEnabled: boolean;
@@ -79,6 +81,7 @@ const mapStateToProps = (
): AppStateProps => ({
errorPage: getErrorPage(state),
isAdminApp: getIsAdminApp(state, props),
+ isDataStudioApp: getIsDataStudioApp(state, props),
isAppBarVisible: getIsAppBarVisible(state, props),
isNavBarEnabled: getIsNavBarEnabled(state, props),
});
@@ -90,6 +93,7 @@ const mapDispatchToProps: AppDispatchProps = {
function App({
errorPage,
isAdminApp,
+ isDataStudioApp,
isAppBarVisible,
isNavBarEnabled,
children,
@@ -125,7 +129,7 @@ function App({
<UndoListing />
<StatusListing />
<NewModals />
- <PLUGIN_METABOT.Metabot hide={isAdminApp} />
+ <PLUGIN_METABOT.Metabot hide={isAdminApp || isDataStudioApp} />
</AppContentContainer>
</AppContainer>
<Palette />
diff --git a/frontend/src/metabase/admin/app/reducers.ts b/frontend/src/metabase/admin/app/reducers.ts
index 1cec8af077e..e19f51ca689 100644
--- a/frontend/src/metabase/admin/app/reducers.ts
+++ b/frontend/src/metabase/admin/app/reducers.ts
@@ -6,7 +6,6 @@ import { isNotNull } from "metabase/lib/types";
import {
PLUGIN_ADMIN_ALLOWED_PATH_GETTERS,
PLUGIN_METABOT,
- PLUGIN_TRANSFORMS,
} from "metabase/plugins";
import { refreshCurrentUser } from "metabase/redux/user";
import type { AdminPath, AdminPathKey } from "metabase-types/store";
@@ -34,7 +33,6 @@ export const getAdminPaths: () => AdminPath[] = () => {
path: "/admin/datamodel",
key: "data-model",
},
- ...PLUGIN_TRANSFORMS.getAdminPaths(),
{
name: t`People`,
path: "/admin/people",
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseFeatureComponents/DatabaseFeatureComponents.tsx b/frontend/src/metabase/admin/databases/components/DatabaseFeatureComponents/DatabaseFeatureComponents.tsx
index a3faad35219..ac67858af61 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseFeatureComponents/DatabaseFeatureComponents.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseFeatureComponents/DatabaseFeatureComponents.tsx
@@ -5,19 +5,12 @@ import S from "./DatabaseFeatureComponents.module.css";
export const Label: React.FC<LabelHTMLAttributes<HTMLLabelElement>> = (
props,
-) => (
- // eslint-disable-next-line react/prop-types -- className is props
- <label {...props} className={cx(S.label, props.className)} />
-);
+) => <label {...props} className={cx(S.label, props.className)} />;
-export const Description: React.FC<
- HTMLAttributes<HTMLParagraphElement>
- // eslint-disable-next-line react/prop-types -- className is props
-> = (props) => <p {...props} className={cx(S.description, props.className)} />;
+export const Description: React.FC<HTMLAttributes<HTMLParagraphElement>> = (
+ props,
+) => <p {...props} className={cx(S.description, props.className)} />;
export const Error: React.FC<HTMLAttributes<HTMLParagraphElement>> = (
props,
-) => (
- // eslint-disable-next-line react/prop-types -- className is props
- <p {...props} className={cx(S.error, props.className)} />
-);
+) => <p {...props} className={cx(S.error, props.className)} />;
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
index 74f797cd930..9d780ad5eb5 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
@@ -4,6 +4,8 @@ import { Route } from "react-router";
import { callMockEvent } from "__support__/events";
import {
setupCardDataset,
+ setupCollectionByIdEndpoint,
+ setupCollectionItemsEndpoint,
setupDatabasesEndpoints,
setupRecentViewsAndSelectionsEndpoints,
setupSearchEndpoints,
@@ -19,6 +21,7 @@ import {
} from "__support__/ui";
import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
import { checkNotNull } from "metabase/lib/types";
+import { createMockCollection } from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
import SegmentApp from "./SegmentApp";
@@ -43,6 +46,20 @@ const setup = ({ initialRoute = FORM_URL }: SetupOpts = {}) => {
});
setupRecentViewsAndSelectionsEndpoints([], ["selections"]);
setupSegmentsEndpoints([]);
+ setupCollectionByIdEndpoint({
+ collections: [
+ createMockCollection({ id: "root" }),
+ createMockCollection({ id: 1 }),
+ ],
+ });
+ setupCollectionItemsEndpoint({
+ collection: createMockCollection({ id: "root" }),
+ collectionItems: [],
+ });
+ setupCollectionItemsEndpoint({
+ collection: createMockCollection({ id: 1 }),
+ collectionItems: [],
+ });
const { history } = renderWithProviders(
<>
diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.ts b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.ts
index d30dd280a53..f29b701b64a 100644
--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.ts
@@ -5,6 +5,7 @@ import _ from "underscore";
import {
isInstanceAnalyticsCollection,
+ isLibraryCollection,
nonPersonalOrArchivedCollection,
} from "metabase/collections/utils";
import Collections, {
@@ -41,6 +42,7 @@ export const collectionsQuery = {
tree: true,
"exclude-other-user-collections": true,
"exclude-archived": true,
+ "include-library": true,
};
export const getIsDirty = createSelector(
@@ -87,7 +89,16 @@ const getCollections = (state: State) =>
).filter(nonPersonalOrArchivedCollection);
const getCollectionsTree = createSelector([getCollections], (collections) => {
- return [getRootCollectionTreeItem(), ...buildCollectionTree(collections)];
+ const libraryCollections = collections.filter(isLibraryCollection);
+ const nonLibraryCollections = collections.filter(
+ (collection: Collection) => !isLibraryCollection(collection),
+ );
+
+ return [
+ ...buildCollectionTree(libraryCollections),
+ getRootCollectionTreeItem(),
+ ...buildCollectionTree(nonLibraryCollections),
+ ];
});
export function buildCollectionTree(
diff --git a/frontend/src/metabase/admin/routes.jsx b/frontend/src/metabase/admin/routes.jsx
index 39ebf83e607..478ae07d91c 100644
--- a/frontend/src/metabase/admin/routes.jsx
+++ b/frontend/src/metabase/admin/routes.jsx
@@ -40,7 +40,7 @@ import { TasksApp } from "metabase/admin/tools/components/TasksApp";
import { ToolsApp } from "metabase/admin/tools/components/ToolsApp";
import { EmbeddingHubAdminSettingsPage } from "metabase/embedding/embedding-hub";
import { ModalRoute } from "metabase/hoc/ModalRoute";
-import { DataModel } from "metabase/metadata/pages/DataModel";
+import { DataModelV1 } from "metabase/metadata/pages/DataModelV1";
import {
PLUGIN_ADMIN_SETTINGS,
PLUGIN_ADMIN_TOOLS,
@@ -50,7 +50,6 @@ import {
PLUGIN_DEPENDENCIES,
PLUGIN_METABOT,
PLUGIN_SUPPORT,
- PLUGIN_TRANSFORMS,
} from "metabase/plugins";
import { ModelPersistenceConfiguration } from "./performance/components/ModelPersistenceConfiguration";
@@ -82,21 +81,21 @@ const getRoutes = (store, CanAccessSettings, IsAdmin) => (
<Route path="datamodel" component={createAdminRouteGuard("data-model")}>
<Route title={t`Table Metadata`}>
<IndexRedirect to="database" />
- <Route path="database" component={DataModel} />
- <Route path="database/:databaseId" component={DataModel} />
+ <Route path="database" component={DataModelV1} />
+ <Route path="database/:databaseId" component={DataModelV1} />
<Route
path="database/:databaseId/schema/:schemaId"
- component={DataModel}
+ component={DataModelV1}
/>
<Route
path="database/:databaseId/schema/:schemaId/table/:tableId"
- component={DataModel}
+ component={DataModelV1}
/>
<Route
path="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId"
- component={DataModel}
+ component={DataModelV1}
/>
- <Route component={DataModel}>
+ <Route component={DataModelV1}>
<Route path="segments" component={SegmentListApp} />
<Route path="segment/create" component={SegmentApp} />
<Route path="segment/:id" component={SegmentApp} />
@@ -115,7 +114,6 @@ const getRoutes = (store, CanAccessSettings, IsAdmin) => (
/>
</Route>
</Route>
- {PLUGIN_TRANSFORMS.getAdminRoutes()}
{/* PEOPLE */}
<Route path="people" component={createAdminRouteGuard("people")}>
<Route title={t`People`} component={AdminPeopleApp}>
diff --git a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx b/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
index f0a9ea3df7b..1b0f75ebde8 100644
--- a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
+++ b/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
@@ -9,7 +9,6 @@ import {
} from "metabase/admin/components/AdminNav";
import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import * as Urls from "metabase/lib/urls";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
type ToolsAppProps = {
location: Location;
@@ -59,14 +58,6 @@ export function ToolsApp({ location, children }: ToolsAppProps) {
icon="database"
location={location}
/>
- {PLUGIN_DEPENDENCIES.isEnabled && (
- <ToolsNavItem
- label={t`Dependency graph`}
- path={Urls.dependencyGraph()}
- icon="schema"
- location={location}
- />
- )}
</AdminNavWrapper>
}
>
diff --git a/frontend/src/metabase/api/card.ts b/frontend/src/metabase/api/card.ts
index f5a2dd7eb71..f8c8260c020 100644
--- a/frontend/src/metabase/api/card.ts
+++ b/frontend/src/metabase/api/card.ts
@@ -163,6 +163,7 @@ export const cardApi = Api.injectEndpoints({
idTag("card", payload.id),
idTag("table", `card__${payload.id}`),
listTag("revision"),
+ listTag("table"), // table listings include information about published models
];
if (payload.dashboard_id != null) {
diff --git a/frontend/src/metabase/api/table.ts b/frontend/src/metabase/api/table.ts
index f875a2a8242..328789d526f 100644
--- a/frontend/src/metabase/api/table.ts
+++ b/frontend/src/metabase/api/table.ts
@@ -155,6 +155,7 @@ export const {
useListTablesQuery,
useGetTableQuery,
useGetTableQueryMetadataQuery,
+ useLazyGetTableQueryMetadataQuery,
useGetTableDataQuery,
useListTableForeignKeysQuery,
useLazyListTableForeignKeysQuery,
diff --git a/frontend/src/metabase/api/tags/utils.ts b/frontend/src/metabase/api/tags/utils.ts
index 588cfb01f36..a50640a6dae 100644
--- a/frontend/src/metabase/api/tags/utils.ts
+++ b/frontend/src/metabase/api/tags/utils.ts
@@ -16,7 +16,6 @@ import type {
DashboardSubscription,
Database,
DatabaseXray,
- Dataset,
Field,
FieldDimension,
FieldId,
@@ -107,21 +106,6 @@ export function provideActivityItemTags(
return [idTag(TAG_TYPE_MAPPING[item.model], item.id)];
}
-export function provideAdhocQueryTags(
- dataset: Dataset,
-): TagDescription<TagType>[] {
- return [
- listTag("database"),
- idTag("database", dataset.database_id),
- listTag("field"),
- ...(dataset.data?.results_metadata?.columns
- ?.map((column) =>
- column.id !== undefined ? idTag("field", column.id) : null,
- )
- .filter((tag): tag is TagType => tag !== null) ?? []),
- ];
-}
-
export function provideAdhocQueryMetadataTags(
metadata: CardQueryMetadata,
): TagDescription<TagType>[] {
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index a0dc1a38dfd..90ad33451c6 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -11,7 +11,10 @@ import { useDocsUrl } from "metabase/common/hooks";
import { useFetchMetrics } from "metabase/common/hooks/use-fetch-metrics";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { PLUGIN_CONTENT_VERIFICATION } from "metabase/plugins";
+import {
+ PLUGIN_CONTENT_VERIFICATION,
+ PLUGIN_DATA_STUDIO,
+} from "metabase/plugins";
import { getHasDataAccess } from "metabase/selectors/data";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import {
@@ -53,9 +56,15 @@ export function BrowseMetrics() {
const isEmpty = !isLoading && !error && !metrics?.length;
const titleId = useMemo(() => _.uniqueId("browse-metrics"), []);
+ const libraryMetricCollection =
+ PLUGIN_DATA_STUDIO.useGetLibraryChildCollectionByType({
+ type: "library-metrics",
+ });
+
const newMetricLink = Urls.newQuestion({
mode: "query",
cardType: "metric",
+ collectionId: libraryMetricCollection?.id,
});
const databases = data?.data ?? [];
diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
index 6b854e348c8..168f126ffd5 100644
--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
@@ -13,6 +13,7 @@ import type {
} from "metabase/collections/types";
import {
canArchiveItem,
+ canBookmarkItem,
canCopyItem,
canMoveItem,
canPinItem,
@@ -86,6 +87,7 @@ function ActionMenu({
const dispatch = useDispatch();
const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure();
const isBookmarked = bookmarks && getIsBookmarked(item, bookmarks);
+ const canBookmark = canBookmarkItem(item);
const canPin = canPinItem(item, collection);
const canPreview = canPreviewItem(item, collection);
const canMove = canMoveItem(item, collection);
@@ -171,7 +173,7 @@ function ActionMenu({
onMove={canMove ? handleMove : undefined}
onCopy={canCopy ? handleCopy : undefined}
onArchive={canArchive ? handleArchive : undefined}
- onToggleBookmark={!item.archived ? handleToggleBookmark : undefined}
+ onToggleBookmark={canBookmark ? handleToggleBookmark : undefined}
onTogglePreview={canPreview ? handleTogglePreview : undefined}
onRestore={canRestore ? handleRestore : undefined}
onDeletePermanently={canDelete ? openModal : undefined}
diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsx
index f0c7de63959..d84e59bfed8 100644
--- a/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsx
+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsx
@@ -5,7 +5,6 @@ import _ from "underscore";
import CollectionCopyEntityModal from "metabase/collections/components/CollectionCopyEntityModal";
import { isTrashedCollection } from "metabase/collections/utils";
import { BulkActionBar } from "metabase/common/components/BulkActionBar";
-import Modal from "metabase/common/components/Modal";
import { BulkMoveModal } from "metabase/common/components/MoveModal";
import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";
import type { Collection, CollectionItem } from "metabase-types/api";
@@ -151,13 +150,11 @@ export const CollectionBulkActions = memo(
</BulkActionBar>
{selectedItems && hasSelectedItems && selectedAction === "copy" && (
- <Modal onClose={handleCloseModal}>
- <CollectionCopyEntityModal
- entityObject={selectedItems?.[0]}
- onClose={handleCloseModal}
- onSaved={handleCloseModal}
- />
- </Modal>
+ <CollectionCopyEntityModal
+ entityObject={selectedItems?.[0]}
+ onClose={handleCloseModal}
+ onSaved={handleCloseModal}
+ />
)}
{selectedItems && hasSelectedItems && selectedAction === "move" && (
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
index e344c6d4cb1..0a6db255ece 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
@@ -2,8 +2,12 @@ import type { PropsWithChildren } from "react";
import { t } from "ttag";
import EmptyStateIcon from "assets/img/empty-states/collection.svg";
-import { isRootTrashCollection } from "metabase/collections/utils";
+import {
+ isLibraryCollection,
+ isRootTrashCollection,
+} from "metabase/collections/utils";
import NewItemMenu from "metabase/common/components/NewItemMenu";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { Box, Button, Icon, Stack, Text, useMantineTheme } from "metabase/ui";
import type { Collection } from "metabase-types/api";
@@ -52,16 +56,17 @@ const ArchivedCollectionEmptyState = () => {
const DefaultCollectionEmptyState = ({
collection,
}: CollectionEmptyStateProps) => {
+ const { title, description } = getDefaultEmptyStateMessages(collection);
const canWrite = !!collection?.can_write;
+ const isSemanticLayer = collection != null && isLibraryCollection(collection);
+ const showAddButton = canWrite && !isSemanticLayer;
return (
<EmptyStateWrapper>
<CollectionEmptyIcon />
- <EmptyStateTitle>{t`This collection is empty`}</EmptyStateTitle>
- <EmptyStateSubtitle>
- {t`Use collections to organize questions, dashboards, models, and other collections.`}
- </EmptyStateSubtitle>
- {canWrite && (
+ <EmptyStateTitle>{title}</EmptyStateTitle>
+ <EmptyStateSubtitle>{description}</EmptyStateSubtitle>
+ {showAddButton && (
<NewItemMenu
trigger={
<Button
@@ -78,6 +83,26 @@ const DefaultCollectionEmptyState = ({
);
};
+function getDefaultEmptyStateMessages(collection: Collection | undefined) {
+ switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection?.type)) {
+ case "models":
+ return {
+ title: t`No models yet`,
+ description: t`Put models in the Library to see them here.`,
+ };
+ case "metrics":
+ return {
+ title: t`No metrics yet`,
+ description: t`Put metrics in the Library to see them here.`,
+ };
+ default:
+ return {
+ title: t`This collection is empty`,
+ description: t`Use collections to organize questions, dashboards, models, and other collections.`,
+ };
+ }
+}
+
export const CollectionEmptyIcon = (): JSX.Element => {
return (
<Box w="6rem">
@@ -86,7 +111,7 @@ export const CollectionEmptyIcon = (): JSX.Element => {
);
};
-const EmptyStateTitle = ({ children }: PropsWithChildren) => {
+export const EmptyStateTitle = ({ children }: PropsWithChildren) => {
const theme = useMantineTheme();
return (
<Box
@@ -102,7 +127,7 @@ const EmptyStateTitle = ({ children }: PropsWithChildren) => {
);
};
-const EmptyStateSubtitle = ({ children }: PropsWithChildren) => {
+export const EmptyStateSubtitle = ({ children }: PropsWithChildren) => {
const theme = useMantineTheme();
return (
<Text
@@ -117,9 +142,16 @@ const EmptyStateSubtitle = ({ children }: PropsWithChildren) => {
);
};
-const EmptyStateWrapper = ({ children }: PropsWithChildren) => {
+export const EmptyStateWrapper = ({
+ children,
+ ...props
+}: PropsWithChildren<{ "data-testid"?: string }>) => {
return (
- <Stack data-testid="collection-empty-state" align="center" gap={0}>
+ <Stack
+ data-testid={props["data-testid"] || "collection-empty-state"}
+ align="center"
+ gap={0}
+ >
{children}
</Stack>
);
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/index.ts b/frontend/src/metabase/collections/components/CollectionEmptyState/index.ts
index e688132e844..f350c122cfa 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/index.ts
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/index.ts
@@ -1,2 +1,8 @@
// eslint-disable-next-line import/no-default-export -- deprecated usage
export { default } from "./CollectionEmptyState";
+export {
+ CollectionEmptyIcon,
+ EmptyStateTitle,
+ EmptyStateSubtitle,
+ EmptyStateWrapper,
+} from "./CollectionEmptyState";
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx
index 88abc574ad6..cfd34770d40 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx
@@ -2,6 +2,7 @@ import { withRouter } from "react-router";
import {
isInstanceAnalyticsCollection,
+ isLibraryCollection,
isTrashedCollection,
} from "metabase/collections/utils";
import type { Collection } from "metabase-types/api";
@@ -41,22 +42,25 @@ const CollectionHeader = ({
uploadsEnabled,
}: CollectionHeaderProps): JSX.Element => {
const isTrash = isTrashedCollection(collection);
- const showUploadButton =
- collection.can_write && (canUpload || !uploadsEnabled);
const isInstanceAnalytics = isInstanceAnalyticsCollection(collection);
+ const isSemanticLayer = isLibraryCollection(collection);
const hasCuratePermissions = !!collection?.can_write;
+ const showNewButton = hasCuratePermissions && !isInstanceAnalytics;
+ const showUploadButton =
+ collection.can_write && (canUpload || !uploadsEnabled);
+ const showTimelinesButton = !isInstanceAnalytics;
+ const showCollectionMenu = !isInstanceAnalytics && !isSemanticLayer;
+
return (
<HeaderRoot>
<CollectionCaption
collection={collection}
onUpdateCollection={onUpdateCollection}
/>
- {!isTrash && (
+ {!isTrash && !isSemanticLayer && (
<HeaderActions data-testid="collection-menu">
- {!isInstanceAnalytics && hasCuratePermissions && (
- <CollectionNewButton />
- )}
+ {showNewButton && <CollectionNewButton />}
{showUploadButton && (
<CollectionUpload
collection={collection}
@@ -65,7 +69,7 @@ const CollectionHeader = ({
saveFile={saveFile}
/>
)}
- {!isInstanceAnalytics && (
+ {showTimelinesButton && (
<CollectionTimeline collection={collection} />
)}
{isInstanceAnalytics && (
@@ -81,7 +85,7 @@ const CollectionHeader = ({
collection={collection}
onUpdateCollection={onUpdateCollection}
/>
- {!isInstanceAnalytics && (
+ {showCollectionMenu && (
<CollectionMenu
collection={collection}
isAdmin={isAdmin}
diff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
index 102fe2c5e7c..727499aa1f1 100644
--- a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
+++ b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
@@ -124,6 +124,7 @@ function CreateCollectionForm({
name="parent_id"
title={t`Collection it's saved in`}
filterPersonalCollections={filterPersonalCollections}
+ entityType="collection"
/>
<FormAuthorityLevelField />
<FormFooter>
diff --git a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx
index d66998c61d4..116105d2efc 100644
--- a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx
+++ b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx
@@ -41,6 +41,7 @@ const MoveCollectionModalView = ({
title={t`Move "${collection.name}"?`}
initialCollectionId={collection.parent_id ?? "root"}
movingCollectionId={collection.id}
+ entityType="collection"
onMove={handleMove}
onClose={onClose}
recentAndSearchFilter={recentsAndSearchFilter}
diff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
index a2f40654ade..4cd2316692c 100644
--- a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
+++ b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
@@ -5,6 +5,7 @@ import { t } from "ttag";
import { useGetCollectionQuery, useLazyGetDashboardQuery } from "metabase/api";
import {
+ type EntityType,
canonicalCollectionId,
isTrashedCollection,
isValidCollectionId,
@@ -76,6 +77,7 @@ interface FormCollectionPickerProps extends HTMLAttributes<HTMLDivElement> {
initialOpenCollectionId?: CollectionId;
onOpenCollectionChange?: (collectionId: CollectionId) => void;
filterPersonalCollections?: FilterItemsInPersonalCollection;
+ entityType?: EntityType;
zIndex?: number;
collectionPickerModalProps?: Partial<CollectionPickerModalProps>;
}
@@ -91,6 +93,7 @@ export function FormCollectionAndDashboardPicker({
collectionIdFieldName,
dashboardIdFieldName,
dashboardTabIdFieldName,
+ entityType,
}: FormCollectionPickerProps) {
const id = useUniqueId();
@@ -257,6 +260,7 @@ export function FormCollectionAndDashboardPicker({
onChange={handleChange}
onClose={handleModalClose}
options={options}
+ entityType={entityType}
{...collectionPickerModalProps}
/>
)}
diff --git a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
index 5ad38c981fd..fd65c5cbd70 100644
--- a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
+++ b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
@@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { t } from "ttag";
import {
+ type EntityType,
canonicalCollectionId,
isTrashedCollection,
isValidCollectionId,
@@ -32,6 +33,7 @@ interface FormCollectionPickerProps extends HTMLAttributes<HTMLDivElement> {
initialOpenCollectionId?: CollectionId;
onOpenCollectionChange?: (collectionId: CollectionId) => void;
filterPersonalCollections?: FilterItemsInPersonalCollection;
+ entityType?: EntityType;
collectionPickerModalProps?: Partial<CollectionPickerModalProps>;
}
@@ -57,6 +59,7 @@ function FormCollectionPicker({
placeholder = t`Select a collection`,
type = "collections",
filterPersonalCollections,
+ entityType,
collectionPickerModalProps,
}: FormCollectionPickerProps) {
const id = useUniqueId();
@@ -153,6 +156,7 @@ function FormCollectionPicker({
onChange={handleChange}
onClose={() => setIsPickerOpen(false)}
options={options}
+ entityType={entityType}
{...collectionPickerModalProps}
/>
)}
diff --git a/frontend/src/metabase/collections/utils.ts b/frontend/src/metabase/collections/utils.ts
index 79fc5c4633a..9010dc8c388 100644
--- a/frontend/src/metabase/collections/utils.ts
+++ b/frontend/src/metabase/collections/utils.ts
@@ -1,14 +1,30 @@
import { t } from "ttag";
-import { PLUGIN_COLLECTIONS } from "metabase/plugins";
+import { PLUGIN_COLLECTIONS, PLUGIN_DATA_STUDIO } from "metabase/plugins";
import {
+ type CardType,
type Collection,
type CollectionEssentials,
type CollectionId,
type CollectionItem,
+ type CollectionItemModel,
+ type CollectionType,
isBaseEntityID,
} from "metabase-types/api";
+export type EntityType = CollectionItemModel;
+
+export function getEntityTypeFromCardType(cardType: CardType): EntityType {
+ switch (cardType) {
+ case "question":
+ return "card";
+ case "model":
+ return "dataset";
+ case "metric":
+ return "metric";
+ }
+}
+
export function nonPersonalOrArchivedCollection(
collection: Collection,
): boolean {
@@ -51,7 +67,8 @@ export function isEditableCollection(collection: Collection) {
collection.can_write &&
!isRootCollection(collection) &&
!isRootPersonalCollection(collection) &&
- !isTrashedCollection(collection)
+ !isTrashedCollection(collection) &&
+ !isLibraryCollection(collection)
);
}
@@ -78,6 +95,12 @@ export function isSyncedCollection(collection: Partial<Collection>): boolean {
return PLUGIN_COLLECTIONS.isSyncedCollection(collection);
}
+export function isLibraryCollection(
+ collection: Pick<Collection, "type">,
+): boolean {
+ return PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection.type) != null;
+}
+
export function isExamplesCollection(collection: Collection): boolean {
return !!collection.is_sample && collection.name === "Examples";
}
@@ -124,26 +147,10 @@ export function isPersonalCollectionChild(
return Boolean(parentCollection && !!parentCollection.personal_owner_id);
}
-export function isPersonalCollectionOrChild(
- collection: Collection,
- collectionList: Collection[],
-): boolean {
- return (
- isRootPersonalCollection(collection) ||
- isPersonalCollectionChild(collection, collectionList)
- );
-}
-
export function isRootCollection(collection: Pick<Collection, "id">): boolean {
return canonicalCollectionId(collection?.id) === null;
}
-export function isTopLevelCollection(
- collection: Pick<Collection, "location">,
-): boolean {
- return collection.location === "/";
-}
-
export function isItemPinned(item: CollectionItem) {
return item.collection_position != null;
}
@@ -168,6 +175,12 @@ export function isReadOnlyCollection(collection: CollectionItem) {
return isItemCollection(collection) && !collection.can_write;
}
+export function canBookmarkItem(item: CollectionItem) {
+ return (
+ !isLibraryCollection(item as Pick<Collection, "type">) && !item.archived
+ );
+}
+
export function canPinItem(item: CollectionItem, collection?: Collection) {
return collection?.can_write && item.setPinned != null && !item.archived;
}
@@ -186,7 +199,8 @@ export function canMoveItem(item: CollectionItem, collection?: Collection) {
(collection?.can_write || isRootTrashCollection(collection)) &&
!isReadOnlyCollection(item) &&
item.setCollection != null &&
- !(isItemCollection(item) && isRootPersonalCollection(item))
+ !(isItemCollection(item) && isRootPersonalCollection(item)) &&
+ !isLibraryCollection(item as Pick<Collection, "type">)
);
}
@@ -195,6 +209,7 @@ export function canArchiveItem(item: CollectionItem, collection?: Collection) {
collection?.can_write &&
!isReadOnlyCollection(item) &&
!(isItemCollection(item) && isRootPersonalCollection(item)) &&
+ !isLibraryCollection(item as Pick<Collection, "type">) &&
!item.archived
);
}
@@ -203,6 +218,26 @@ export function canCopyItem(item: CollectionItem) {
return item.copy && !item.archived;
}
+export function canPlaceEntityInCollection(
+ entityType: EntityType,
+ collectionType: CollectionType | null | undefined,
+): boolean {
+ return PLUGIN_DATA_STUDIO.canPlaceEntityInCollection(
+ entityType,
+ collectionType,
+ );
+}
+
+export function canPlaceEntityInCollectionOrDescendants(
+ entityType: EntityType,
+ collectionType: CollectionType | null | undefined,
+): boolean {
+ return PLUGIN_DATA_STUDIO.canPlaceEntityInCollectionOrDescendants(
+ entityType,
+ collectionType,
+ );
+}
+
export function isPreviewShown(item: CollectionItem) {
return isPreviewEnabled(item) && isFullyParameterized(item);
}
diff --git a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx b/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
index 178ffbeb1a0..95fd31833db 100644
--- a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
+++ b/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
@@ -1,10 +1,6 @@
import type React from "react";
-import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
-import { useSelector } from "metabase/lib/redux";
-import { PLUGIN_METABOT } from "metabase/plugins";
-import { getLocation } from "metabase/selectors/routing";
import { Box } from "metabase/ui";
import { NotFound } from "../ErrorPages";
@@ -22,10 +18,6 @@ export const AdminSettingsLayout = ({
fullWidth?: boolean;
maw?: string;
}) => {
- const location = useSelector(getLocation);
- const isMetabotEnabledForRoute =
- location.pathname.startsWith("/admin/transforms");
-
return (
<Box className={S.Wrapper}>
<Box className={S.Main}>
@@ -45,21 +37,6 @@ export const AdminSettingsLayout = ({
</Box>
</Box>
</Box>
-
- <PLUGIN_METABOT.Metabot
- hide={!isMetabotEnabledForRoute}
- config={{
- // we don't save snapshots of the metabot conversation "state" value and do not
- // revert it to the point in time of a message was sent. this will cause values
- // like the todo list to confuse the agent as there may no longer be any conversation
- // history but an in progress/complete todo list.
- preventRetryMessage: true,
- preventClose: true,
- hideSuggestedPrompts: true,
- emptyText: t`Let's transform your data together!`,
- suggestionModels: ["dataset", "transform", "table", "database"],
- }}
- />
</Box>
</Box>
);
diff --git a/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx b/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx
index 31f1f428a1a..fc07c93f485 100644
--- a/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx
+++ b/frontend/src/metabase/common/components/ArchiveModal/ArchiveModal.tsx
@@ -1,19 +1,18 @@
-import { useState } from "react";
+import type { ReactNode } from "react";
import { t } from "ttag";
import { archiveAndTrack } from "metabase/archive/analytics";
-import ModalContent from "metabase/common/components/ModalContent";
-import { FormMessage } from "metabase/forms";
-import { Button, FocusTrap, Group } from "metabase/ui";
+import { Form, FormErrorMessage, FormProvider } from "metabase/forms";
+import { Box, Button, Group, Modal, Stack, Text } from "metabase/ui";
interface ArchiveModalProps {
title?: string;
- message: React.ReactNode;
+ message?: ReactNode;
model: "card" | "model" | "metric" | "dashboard" | "collection";
modelId: number;
isLoading?: boolean;
onArchive: () => Promise<void>;
- onClose?: () => void;
+ onClose: () => void;
}
export const ArchiveModal = ({
@@ -25,46 +24,40 @@ export const ArchiveModal = ({
onClose,
onArchive,
}: ArchiveModalProps) => {
- const [error, setError] = useState();
-
const archive = async () => {
await archiveAndTrack({
archive: onArchive,
model,
modelId,
triggeredFrom: "detail_page",
- })
- .catch((error) => setError(error))
- .finally(() => {
- onClose?.();
- });
+ });
+ onClose();
};
return (
- <ModalContent
- title={title || t`Trash this?`}
- footer={[
- error ? <FormMessage key="message" formError={error} /> : null,
- <FocusTrap key="buttons">
- <Group gap="0.5rem">
- <Button key="cancel" onClick={onClose}>
- {t`Cancel`}
- </Button>
- <Button
- key="archive"
- color="error"
- variant="filled"
- onClick={archive}
- loading={isLoading}
- data-autofocus
- >
- {t`Move to trash`}
- </Button>
- </Group>
- </FocusTrap>,
- ]}
- >
- {message}
- </ModalContent>
+ <Modal opened title={title || t`Trash this?`} onClose={onClose}>
+ <FormProvider initialValues={{}} onSubmit={archive}>
+ <Form>
+ <Stack>
+ <Text>{message}</Text>
+ <Group gap="sm">
+ <Box flex={1}>
+ <FormErrorMessage />
+ </Box>
+ <Button onClick={onClose}>{t`Cancel`}</Button>
+ <Button
+ color="error"
+ variant="filled"
+ loading={isLoading}
+ data-autofocus
+ onClick={archive}
+ >
+ {t`Move to trash`}
+ </Button>
+ </Group>
+ </Stack>
+ </Form>
+ </FormProvider>
+ </Modal>
);
};
diff --git a/frontend/src/metabase/common/components/CollapseSection/CollapseSection.styled.tsx b/frontend/src/metabase/common/components/CollapseSection/CollapseSection.styled.tsx
index 783d59651ca..2a3168de4e8 100644
--- a/frontend/src/metabase/common/components/CollapseSection/CollapseSection.styled.tsx
+++ b/frontend/src/metabase/common/components/CollapseSection/CollapseSection.styled.tsx
@@ -7,18 +7,24 @@ import type { HTMLAttributes } from "react";
import type { IconName, IconProps } from "metabase/ui";
import { Icon } from "metabase/ui";
-type HeaderContainerProps = HTMLAttributes<HTMLDivElement>;
-
-export const HeaderContainer = styled((props: HeaderContainerProps) => (
- <div
- {...props}
- role={props.role ?? "button"}
- tabIndex={props.tabIndex ?? 0}
- />
-))`
+type HeaderContainerProps = HTMLAttributes<HTMLDivElement> & {
+ hasRightAction?: boolean;
+};
+
+export const HeaderContainer = styled(
+ ({ hasRightAction, ...props }: HeaderContainerProps) => (
+ <div
+ {...props}
+ role={props.role ?? "button"}
+ tabIndex={props.tabIndex ?? 0}
+ />
+ ),
+)`
display: flex;
align-items: center;
cursor: pointer;
+ min-height: 28px;
+ ${(props) => props.hasRightAction && "justify-content: space-between;"}
`;
export const Header = styled.span`
@@ -26,6 +32,12 @@ export const Header = styled.span`
align-items: center;
`;
+export const HeaderContent = styled.div`
+ display: flex;
+ align-items: center;
+ flex: 1;
+`;
+
const ICON_VARIANTS = {
"right-down": {
collapsed: "chevronright",
diff --git a/frontend/src/metabase/common/components/CollapseSection/CollapseSection.tsx b/frontend/src/metabase/common/components/CollapseSection/CollapseSection.tsx
index a77ab78e1fc..ab3c5170142 100644
--- a/frontend/src/metabase/common/components/CollapseSection/CollapseSection.tsx
+++ b/frontend/src/metabase/common/components/CollapseSection/CollapseSection.tsx
@@ -1,11 +1,18 @@
import {
type HTMLAttributes,
type KeyboardEvent,
+ type MouseEvent,
useCallback,
+ useId,
useState,
} from "react";
-import { Header, HeaderContainer, ToggleIcon } from "./CollapseSection.styled";
+import {
+ Header,
+ HeaderContainer,
+ HeaderContent,
+ ToggleIcon,
+} from "./CollapseSection.styled";
type CollapseSectionProps = {
children?: React.ReactNode;
@@ -18,6 +25,7 @@ type CollapseSectionProps = {
iconPosition?: "left" | "right";
iconSize?: number;
onToggle?: (nextState: boolean) => void;
+ rightAction?: React.ReactNode;
} & HTMLAttributes<HTMLDivElement>;
const CollapseSection = ({
@@ -31,9 +39,12 @@ const CollapseSection = ({
bodyClass,
children,
onToggle,
+ rightAction,
...props
}: CollapseSectionProps) => {
const [isExpanded, setIsExpanded] = useState(initialState === "expanded");
+ const buttonId = useId();
+ const regionId = useId();
const toggle = useCallback(() => {
const nextState = !isExpanded;
@@ -41,6 +52,13 @@ const CollapseSection = ({
onToggle?.(nextState);
}, [isExpanded, onToggle]);
+ const handleRightActionClick = useCallback(
+ (e: MouseEvent<HTMLDivElement>) => {
+ e.stopPropagation();
+ },
+ [],
+ );
+
const onKeyDown = useCallback(
(e: KeyboardEvent<HTMLDivElement>) => {
if (e.nativeEvent.isComposing) {
@@ -63,19 +81,35 @@ const CollapseSection = ({
);
return (
- <div className={className} role="tab" aria-selected={isExpanded} {...props}>
+ <div className={className} {...props}>
<HeaderContainer
+ id={buttonId}
className={headerClass}
- onClick={toggle}
+ hasRightAction={!!rightAction}
+ aria-expanded={isExpanded}
+ aria-controls={regionId}
onKeyDown={onKeyDown}
+ onClick={toggle}
>
- {iconPosition === "left" && HeaderIcon}
- <Header>{header}</Header>
- {iconPosition === "right" && HeaderIcon}
+ <HeaderContent>
+ {iconPosition === "left" && HeaderIcon}
+ <Header>{header}</Header>
+ {iconPosition === "right" && HeaderIcon}
+ </HeaderContent>
+ {rightAction && (
+ <div onClick={handleRightActionClick}>{rightAction}</div>
+ )}
</HeaderContainer>
- <div role="tabpanel">
- {isExpanded && <div className={bodyClass}>{children}</div>}
- </div>
+ {isExpanded && (
+ <div
+ id={regionId}
+ role="region"
+ aria-labelledby={buttonId}
+ className={bodyClass}
+ >
+ {children}
+ </div>
+ )}
</div>
);
};
diff --git a/frontend/src/metabase/common/components/EditableText/EditableText.tsx b/frontend/src/metabase/common/components/EditableText/EditableText.tsx
index e52e3792633..2adda4104ae 100644
--- a/frontend/src/metabase/common/components/EditableText/EditableText.tsx
+++ b/frontend/src/metabase/common/components/EditableText/EditableText.tsx
@@ -30,6 +30,7 @@ export interface EditableTextProps extends BoxProps, EditableTextAttributes {
isDisabled?: boolean;
isMarkdown?: boolean;
onChange?: (value: string) => void;
+ onContentChange?: (value: string) => void;
onFocus?: FocusEventHandler<HTMLTextAreaElement>;
onBlur?: FocusEventHandler<HTMLTextAreaElement>;
"data-testid"?: string;
@@ -46,6 +47,7 @@ const EditableText = forwardRef(function EditableText(
isDisabled = false,
isMarkdown = false,
onChange,
+ onContentChange,
onFocus,
onBlur,
"data-testid": dataTestId,
@@ -95,10 +97,12 @@ const EditableText = forwardRef(function EditableText(
const handleChange = useCallback(
(event: ChangeEvent<HTMLTextAreaElement>) => {
- setInputValue(event.currentTarget.value);
+ const nextValue = event.currentTarget.value;
+ setInputValue(nextValue);
submitOnBlur.current = true;
+ onContentChange?.(nextValue);
},
- [submitOnBlur],
+ [onContentChange],
);
const handleKeyDown = useCallback(
diff --git a/frontend/src/metabase/common/components/Ellipsified/Ellipsified.tsx b/frontend/src/metabase/common/components/Ellipsified/Ellipsified.tsx
index 6c979a58cfc..bc4c6801763 100644
--- a/frontend/src/metabase/common/components/Ellipsified/Ellipsified.tsx
+++ b/frontend/src/metabase/common/components/Ellipsified/Ellipsified.tsx
@@ -13,6 +13,7 @@ interface EllipsifiedProps extends TextProps {
lines?: number;
multiline?: boolean;
placement?: FloatingPosition;
+ ignoreHeightTruncation?: boolean;
}
export const Ellipsified = ({
@@ -24,11 +25,13 @@ export const Ellipsified = ({
lines = 1,
multiline = false,
placement = "top",
+ ignoreHeightTruncation = false,
...textProps
}: EllipsifiedProps) => {
const canSkipTooltipRendering = !showTooltip && !alwaysShowTooltip;
const { isTruncated, ref } = useIsTruncated<HTMLDivElement>({
disabled: canSkipTooltipRendering,
+ ignoreHeightTruncation,
});
const isEnabled =
(showTooltip && (isTruncated || alwaysShowTooltip)) || false;
diff --git a/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx b/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
new file mode 100644
index 00000000000..f73daa6872d
--- /dev/null
+++ b/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
@@ -0,0 +1,57 @@
+import { c, t } from "ttag";
+
+import DateTime from "metabase/common/components/DateTime";
+import { getUserName } from "metabase/lib/user";
+import { Box, FixedSizeIcon, Group, Stack, Title } from "metabase/ui";
+import type { LastEditInfo, UserInfo } from "metabase-types/api";
+
+type EntityCreationInfoProps = {
+ createdAt?: string | null;
+ creator?: UserInfo | null;
+ lastEditedAt?: string | null;
+ lastEditor?: LastEditInfo | null;
+};
+
+export function EntityCreationInfo({
+ createdAt,
+ creator,
+ lastEditedAt,
+ lastEditor,
+}: EntityCreationInfoProps) {
+ const hasCreatedInfo = createdAt != null && creator != null;
+ const hasEditedInfo = lastEditedAt != null && lastEditor != null;
+
+ if (!hasCreatedInfo && !hasEditedInfo) {
+ return null;
+ }
+
+ return (
+ <Stack gap="sm" lh="1rem">
+ <Title order={6}>{t`Creator and last editor`}</Title>
+ {createdAt != null && creator != null && (
+ <Group gap="sm" wrap="nowrap">
+ <FixedSizeIcon name="ai" />
+ <Box>
+ {c(
+ "Describes when an entity was created. {0} is a date/time and {1} is a person's name",
+ ).jt`${(
+ <DateTime unit="day" value={createdAt} key="date" />
+ )} by ${getUserName(creator)}`}
+ </Box>
+ </Group>
+ )}
+ {lastEditedAt != null && lastEditor != null && (
+ <Group gap="sm" wrap="nowrap">
+ <FixedSizeIcon name="pencil" />
+ <Box>
+ {c(
+ "Describes when an entity was last edited. {0} is a date/time and {1} is a person's name",
+ ).jt`${(
+ <DateTime unit="day" value={lastEditedAt} key="date" />
+ )} by ${getUserName(lastEditor)}`}
+ </Box>
+ </Group>
+ )}
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/common/components/EntityCreationInfo/index.ts b/frontend/src/metabase/common/components/EntityCreationInfo/index.ts
new file mode 100644
index 00000000000..c3f61e610da
--- /dev/null
+++ b/frontend/src/metabase/common/components/EntityCreationInfo/index.ts
@@ -0,0 +1 @@
+export { EntityCreationInfo } from "./EntityCreationInfo";
diff --git a/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsx b/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsx
index 608483dec0c..72ec5445fe6 100644
--- a/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsx
+++ b/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsx
@@ -27,6 +27,7 @@ import {
import type {
RecentContexts,
RecentItem,
+ SearchModel,
SearchRequest,
SearchResult,
SearchResultId,
@@ -63,12 +64,15 @@ export type EntityPickerModalOptions = {
confirmButtonText?: string | ((model?: string) => string);
cancelButtonText?: string;
hasRecents?: boolean;
+ showDatabases?: boolean;
+ showLibrary?: boolean;
};
export const defaultOptions: EntityPickerModalOptions = {
showSearch: true,
hasConfirmButtons: true,
hasRecents: true,
+ showLibrary: true,
};
export const DEFAULT_RECENTS_CONTEXT: RecentContexts[] = [
@@ -108,6 +112,7 @@ export interface EntityPickerModalProps<
searchExtraButtons?: ReactNode[];
children?: ReactNode;
disableCloseOnEscape?: boolean;
+ searchModels?: (SearchModel | "table")[];
}
export function EntityPickerModal<
@@ -134,6 +139,7 @@ export function EntityPickerModal<
isLoadingTabs = false,
disableCloseOnEscape = false,
children,
+ searchModels: _searchModels,
}: EntityPickerModalProps<Id, Model, Item>) {
const [modalContentMinWidth, setModalContentMinWidth] = useState(920);
const modalContentRef = useRef<HTMLDivElement | null>(null);
@@ -147,7 +153,10 @@ export function EntityPickerModal<
refetchOnMountOrArgChange: true,
},
);
- const searchModels = useMemo(() => getSearchModels(passedTabs), [passedTabs]);
+ const searchModels = useMemo(
+ () => _searchModels || getSearchModels(passedTabs),
+ [passedTabs, _searchModels],
+ );
const folderModels = useMemo(
() => getSearchFolderModels(passedTabs),
diff --git a/frontend/src/metabase/common/components/EntityPicker/components/ItemList/ItemList.tsx b/frontend/src/metabase/common/components/EntityPicker/components/ItemList/ItemList.tsx
index f19a167556e..8d2af9bdee2 100644
--- a/frontend/src/metabase/common/components/EntityPicker/components/ItemList/ItemList.tsx
+++ b/frontend/src/metabase/common/components/EntityPicker/components/ItemList/ItemList.tsx
@@ -95,6 +95,7 @@ export const ItemList = <
{filteredItems.map((item: Item) => {
const isSelected = isSelectedItem(item, selectedItem);
const icon = getEntityPickerIcon(item, isSelected && isCurrentLevel);
+ const isDisabled = shouldDisableItem?.(item);
return (
<Box
@@ -104,7 +105,7 @@ export const ItemList = <
>
<NavLink
w={"auto"}
- disabled={shouldDisableItem?.(item)}
+ disabled={isDisabled}
rightSection={
isFolder(item) ? <Icon name="chevronright" size={10} /> : null
}
diff --git a/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.tsx b/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.tsx
index 24081a304b4..89bd9c151a2 100644
--- a/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.tsx
+++ b/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.tsx
@@ -1,6 +1,11 @@
import type { ComponentType } from "react";
+import { useState } from "react";
import ErrorBoundary from "metabase/ErrorBoundary";
+import type {
+ TablePickerStatePath,
+ TablePickerValue,
+} from "metabase/common/components/Pickers/TablePicker";
import { Flex } from "metabase/ui";
import type {
@@ -27,10 +32,13 @@ export interface NestedItemPickerProps<
onItemSelect: (item: Item) => void;
options: Options;
path: PickerState<Item, Query>;
+ initialValue?: TablePickerValue;
isFolder: IsFolder<Id, Model, Item>;
listResolver: ComponentType<ListProps<Id, Model, Item, Query, Options>>;
shouldDisableItem?: (item: Item) => boolean;
shouldShowItem?: (item: Item) => boolean;
+ tablesPath?: TablePickerStatePath;
+ onTablesPathChange?: (tablesPath: TablePickerStatePath) => void;
}
export function NestedItemPicker<
@@ -48,6 +56,9 @@ export function NestedItemPicker<
listResolver: ListResolver,
shouldDisableItem,
shouldShowItem,
+ initialValue,
+ tablesPath,
+ onTablesPathChange,
}: NestedItemPickerProps<Id, Model, Item, Query, Options>) {
const handleClick = (item: Item) => {
if (isFolder(item)) {
@@ -56,13 +67,14 @@ export function NestedItemPicker<
onItemSelect(item);
}
};
+ const [hashBuster, setHashBuster] = useState(0);
const lastSelectedItem = findLastSelectedItem(path);
return (
<AutoScrollBox
data-testid="nested-item-picker"
- contentHash={generateKey(path[path.length - 1].query)}
+ contentHash={generateKey(path[path.length - 1].query) + hashBuster}
>
<Flex h="100%" w="fit-content">
{path.map((level, index) => {
@@ -89,6 +101,10 @@ export function NestedItemPicker<
shouldDisableItem={shouldDisableItem}
shouldShowItem={shouldShowItem}
isFolder={isFolder}
+ refresh={() => setHashBuster((b) => b + 1)}
+ initialValue={initialValue}
+ tablesPath={tablesPath}
+ onTablesPathChange={onTablesPathChange}
/>
</ErrorBoundary>
</ListBox>
diff --git a/frontend/src/metabase/common/components/EntityPicker/hooks/use-log-recent-item.tsx b/frontend/src/metabase/common/components/EntityPicker/hooks/use-log-recent-item.tsx
index ad595973d96..c6ba350fcbf 100644
--- a/frontend/src/metabase/common/components/EntityPicker/hooks/use-log-recent-item.tsx
+++ b/frontend/src/metabase/common/components/EntityPicker/hooks/use-log-recent-item.tsx
@@ -5,12 +5,15 @@ import { isLoggableActivityModel } from "metabase-types/api";
import type { CollectionPickerItem } from "../../Pickers/CollectionPicker";
import type { DataPickerValueItem } from "../../Pickers/DataPicker";
+import type { MiniPickerPickableItem } from "../../Pickers/MiniPicker/types";
export const useLogRecentItem = () => {
const [logRecentItem] = useLogRecentItemMutation();
const tryLogRecentItem = useCallback(
- (item: CollectionPickerItem | DataPickerValueItem) => {
+ (
+ item: CollectionPickerItem | DataPickerValueItem | MiniPickerPickableItem,
+ ) => {
if (isLoggableActivityModel(item)) {
logRecentItem({
model_id: item.id,
diff --git a/frontend/src/metabase/common/components/EntityPicker/hooks/use-scoped-search-results.ts b/frontend/src/metabase/common/components/EntityPicker/hooks/use-scoped-search-results.ts
index b988253facf..9eb42898e8a 100644
--- a/frontend/src/metabase/common/components/EntityPicker/hooks/use-scoped-search-results.ts
+++ b/frontend/src/metabase/common/components/EntityPicker/hooks/use-scoped-search-results.ts
@@ -7,6 +7,7 @@ import {
useListDashboardItemsQuery,
useListDatabaseSchemaTablesQuery,
} from "metabase/api";
+import { DATABASES_COLLECTION } from "metabase/entities/collections";
import { isNotNull } from "metabase/lib/types";
import type {
CollectionId,
@@ -51,7 +52,9 @@ export const useScopedSearchResults = <
const isScopedSearchEnabled = searchScope === "folder" && folder != null;
const shouldUseCollectionItems =
- isScopedSearchEnabled && folder.model === "collection";
+ isScopedSearchEnabled &&
+ folder.model === "collection" &&
+ folder.id !== DATABASES_COLLECTION.id;
const shouldUseDashboardItems =
isScopedSearchEnabled && folder.model === "dashboard";
diff --git a/frontend/src/metabase/common/components/EntityPicker/types.ts b/frontend/src/metabase/common/components/EntityPicker/types.ts
index b641bcc4848..4c14ada7f74 100644
--- a/frontend/src/metabase/common/components/EntityPicker/types.ts
+++ b/frontend/src/metabase/common/components/EntityPicker/types.ts
@@ -7,6 +7,11 @@ import type {
SearchResultId,
} from "metabase-types/api";
+import type {
+ TablePickerStatePath,
+ TablePickerValue,
+} from "../Pickers/TablePicker";
+
import type { EntityPickerModalOptions } from "./components/EntityPickerModal";
export type TypeWithModel<Id, Model extends string> = {
@@ -80,6 +85,10 @@ export type ListProps<
shouldDisableItem?: (item: Item) => boolean;
shouldShowItem?: (item: Item) => boolean;
entity?: "collection" | "dashboard";
+ refresh?: () => void;
+ initialValue?: TablePickerValue;
+ tablesPath?: TablePickerStatePath;
+ onTablesPathChange?: (tablesPath: TablePickerStatePath) => void;
};
export type FilterItemsInPersonalCollection = "only" | "exclude";
diff --git a/frontend/src/metabase/common/components/EntityPicker/utils.ts b/frontend/src/metabase/common/components/EntityPicker/utils.ts
index 9bed185b821..09b225372b8 100644
--- a/frontend/src/metabase/common/components/EntityPicker/utils.ts
+++ b/frontend/src/metabase/common/components/EntityPicker/utils.ts
@@ -134,7 +134,11 @@ export const isSearchFolder = <
folder: Item,
folderModels: Model[],
) => {
- return folder.id !== "personal" && folderModels.includes(folder.model);
+ return (
+ folder.id !== "personal" &&
+ folder.id !== "databases" &&
+ folderModels.includes(folder.model)
+ );
};
const isSearchModel = (model: string): model is SearchModel => {
diff --git a/frontend/src/metabase/common/components/MoveModal.tsx b/frontend/src/metabase/common/components/MoveModal.tsx
index 28c1e5dc0b9..bce2156f50b 100644
--- a/frontend/src/metabase/common/components/MoveModal.tsx
+++ b/frontend/src/metabase/common/components/MoveModal.tsx
@@ -7,12 +7,18 @@ import type {
MoveDestination,
OnMoveWithOneItem,
} from "metabase/collections/types";
-import { isItemCollection } from "metabase/collections/utils";
+import {
+ type EntityType,
+ canPlaceEntityInCollection,
+ canPlaceEntityInCollectionOrDescendants,
+ isItemCollection,
+} from "metabase/collections/utils";
import {
type CollectionPickerItem,
CollectionPickerModal,
type CollectionPickerModel,
type CollectionPickerValueItem,
+ getCollectionType,
} from "metabase/common/components/Pickers/CollectionPicker";
import type {
CollectionId,
@@ -26,6 +32,7 @@ interface BaseMoveModalProps {
onClose: () => void;
initialCollectionId: CollectionId;
movingCollectionId?: CollectionId;
+ entityType?: EntityType;
recentAndSearchFilter?: (item: CollectionPickerItem) => boolean;
}
@@ -67,19 +74,31 @@ export const MoveModal = ({
onMove,
initialCollectionId,
movingCollectionId,
+ entityType,
canMoveToDashboard,
recentAndSearchFilter,
}: MoveModalProps) => {
- // if we are moving a collection, we can't move it into itself or any of its children
- const shouldDisableItem = movingCollectionId
- ? (item: CollectionPickerItem) =>
- Boolean(
- item.id === movingCollectionId ||
- (item.effective_location ?? item?.location)
- ?.split("/")
- .includes(String(movingCollectionId)),
- )
- : undefined;
+ const shouldDisableItem = (item: CollectionPickerItem): boolean => {
+ if (movingCollectionId) {
+ if (
+ item.id === movingCollectionId ||
+ (item.effective_location ?? item?.location)
+ ?.split("/")
+ .includes(String(movingCollectionId))
+ ) {
+ return true;
+ }
+ }
+
+ if (entityType && item.model === "collection") {
+ return !canPlaceEntityInCollectionOrDescendants(
+ entityType,
+ getCollectionType(item),
+ );
+ }
+
+ return false;
+ };
const searchResultFilter = makeSearchResultFilter([
shouldDisableItem,
@@ -146,6 +165,7 @@ export const MoveModal = ({
confirmButtonText: t`Move`,
}}
shouldDisableItem={shouldDisableItem}
+ entityType={entityType}
searchResultFilter={searchResultFilter}
recentFilter={recentFilter}
onClose={onClose}
@@ -172,18 +192,35 @@ export const BulkMoveModal = ({
.filter((item: CollectionItem) => isItemCollection(item))
.map((item: CollectionItem) => String(item.id));
- const shouldDisableItem = movingCollectionIds.length
- ? (item: CollectionPickerItem) => {
- const collectionItemFullPath =
- (item?.effective_location ?? item?.location)
- ?.split("/")
- .map(String)
- .concat(String(item.id)) ?? [];
- return (
- _.intersection(collectionItemFullPath, movingCollectionIds).length > 0
- );
+ const shouldDisableItem = (item: CollectionPickerItem): boolean => {
+ if (movingCollectionIds.length > 0) {
+ const collectionItemFullPath =
+ (item?.effective_location ?? item?.location)
+ ?.split("/")
+ .map(String)
+ .concat(String(item.id)) ?? [];
+ if (
+ _.intersection(collectionItemFullPath, movingCollectionIds).length > 0
+ ) {
+ return true;
+ }
+ }
+
+ if (item.model === "collection") {
+ const hasInvalidItem = selectedItems.some(
+ (selectedItem) =>
+ !canPlaceEntityInCollectionOrDescendants(
+ selectedItem.model,
+ getCollectionType(item),
+ ),
+ );
+ if (hasInvalidItem) {
+ return true;
}
- : undefined;
+ }
+
+ return false;
+ };
const searchResultFilter = makeSearchResultFilter([
shouldDisableItem,
@@ -207,6 +244,21 @@ export const BulkMoveModal = ({
? ["collection", "dashboard"]
: ["collection"];
+ const canSelectItem = useCallback(
+ (item: CollectionPickerItem) => {
+ if (item.model === "collection") {
+ return selectedItems.every((selectedItem) =>
+ canPlaceEntityInCollection(
+ selectedItem.model,
+ getCollectionType(item),
+ ),
+ );
+ }
+ return true;
+ },
+ [selectedItems],
+ );
+
const handleMove = useCallback(
async (destination: CollectionPickerValueItem) => {
return onMove({
@@ -234,6 +286,7 @@ export const BulkMoveModal = ({
confirmButtonText: t`Move`,
}}
shouldDisableItem={shouldDisableItem}
+ canSelectItem={canSelectItem}
searchResultFilter={searchResultFilter}
recentFilter={recentFilter}
onClose={onClose}
diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsx b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsx
index 53d9f8551b2..6d8ee5053b5 100644
--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsx
@@ -1,8 +1,21 @@
import { skipToken, useListCollectionItemsQuery } from "metabase/api";
+import type { CollectionItemModel } from "metabase-types/api";
import { ItemList } from "../../../EntityPicker";
import type { CollectionItemListProps, CollectionPickerItem } from "../types";
+const validModels: CollectionItemModel[] = [
+ "collection",
+ "dashboard",
+ "document",
+ "card",
+ "dataset",
+ "metric",
+];
+
+const getValidCollectionItemModels = (models?: CollectionItemModel[]) =>
+ models ? models.filter((model) => validModels.includes(model)) : undefined;
+
export const CollectionItemList = ({
query,
onClick,
@@ -22,7 +35,14 @@ export const CollectionItemList = ({
};
error: any;
isLoading: boolean;
- }>(query ? query : skipToken);
+ }>(
+ query
+ ? {
+ ...query,
+ models: getValidCollectionItemModels(query.models),
+ }
+ : skipToken,
+ );
return (
<ItemList
diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemPickerResolver.tsx b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemPickerResolver.tsx
index a0fa5b9a1dd..3acdbe68874 100644
--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemPickerResolver.tsx
+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemPickerResolver.tsx
@@ -1,6 +1,9 @@
+import _ from "underscore";
+
+import { TablePicker } from "metabase/common/components/Pickers/TablePicker";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections";
-import type { CollectionItemListProps } from "../types";
+import type { CollectionItemListProps, CollectionPickerItem } from "../types";
import { CollectionItemList } from "./CollectionItemList";
import { DashboardItemList } from "./DashboardItemList";
@@ -17,6 +20,9 @@ export const CollectionItemPickerResolver = ({
shouldDisableItem,
shouldShowItem,
entity = "collection",
+ initialValue,
+ tablesPath,
+ onTablesPathChange,
}: CollectionItemListProps) => {
if (!query) {
return (
@@ -61,6 +67,22 @@ export const CollectionItemPickerResolver = ({
);
}
+ if (query?.id === "databases") {
+ return (
+ <TablePicker
+ value={initialValue}
+ onItemSelect={(i) => onClick(i as unknown as CollectionPickerItem)}
+ path={tablesPath}
+ onPathChange={onTablesPathChange || _.noop}
+ shouldDisableItem={(i) =>
+ shouldDisableItem?.(i as unknown as CollectionPickerItem) ||
+ !shouldShowItem?.(i as unknown as CollectionPickerItem) ||
+ false
+ }
+ />
+ );
+ }
+
return (
<CollectionItemList
query={query}
diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPicker.tsx b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPicker.tsx
index 880b1f4e23c..c45facdffd1 100644
--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPicker.tsx
@@ -29,6 +29,8 @@ import { CollectionItemPickerResolver } from "./CollectionItemPickerResolver";
const defaultOptions: CollectionPickerOptions = {
showPersonalCollections: true,
showRootCollection: true,
+ showLibrary: true,
+ showDatabases: true,
};
interface CollectionPickerProps {
@@ -57,13 +59,20 @@ export const CollectionPickerInner = (
}: CollectionPickerProps,
ref: Ref<unknown>,
) => {
+ const pathOptions = useMemo(
+ () => ({
+ models,
+ namespace: options.namespace,
+ }),
+ [models, options?.namespace],
+ );
+
const defaultPath = useMemo(() => {
return getStateFromIdPath({
idPath: ["root"],
- namespace: options.namespace,
- models,
+ ...pathOptions,
});
- }, [options.namespace, models]);
+ }, [pathOptions]);
const path = pathProp ?? defaultPath;
const {
currentCollection,
@@ -78,19 +87,12 @@ export const CollectionPickerInner = (
({ folder }: { folder: CollectionPickerItem }) => {
const newPath = getStateFromIdPath({
idPath: getCollectionIdPath(folder, userPersonalCollectionId),
- namespace: options.namespace,
- models,
+ ...pathOptions,
});
onItemSelect(folder);
onPathChange(newPath);
},
- [
- onItemSelect,
- onPathChange,
- options.namespace,
- userPersonalCollectionId,
- models,
- ],
+ [onItemSelect, onPathChange, userPersonalCollectionId, pathOptions],
);
const handleItemSelect = useCallback(
@@ -191,8 +193,7 @@ export const CollectionPickerInner = (
},
userPersonalCollectionId,
),
- namespace: options.namespace,
- models,
+ ...pathOptions,
});
const newSelectedItem = {
@@ -222,12 +223,12 @@ export const CollectionPickerInner = (
id: currentCollection.id,
location: currentCollection.effective_location,
is_personal: currentCollection.is_personal,
+ type: currentCollection.type,
model: "collection",
},
userPersonalCollectionId,
),
- namespace: options.namespace,
- models,
+ ...pathOptions,
});
onPathChange(newPath);
@@ -242,8 +243,8 @@ export const CollectionPickerInner = (
},
[
pathProp,
+ pathOptions,
currentCollection,
- options.namespace,
userPersonalCollectionId,
onPathChange,
],
diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPickerModal.tsx b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPickerModal.tsx
index ef020b24846..328b7699c0a 100644
--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPickerModal.tsx
+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionPickerModal.tsx
@@ -2,6 +2,11 @@ import { useCallback, useMemo, useRef, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
+import {
+ type EntityType,
+ canPlaceEntityInCollection,
+ canPlaceEntityInCollectionOrDescendants,
+} from "metabase/collections/utils";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { Button, Icon } from "metabase/ui";
import type { RecentItem, SearchResult } from "metabase-types/api";
@@ -20,6 +25,7 @@ import type {
CollectionPickerStatePath,
CollectionPickerValueItem,
} from "../types";
+import { getCollectionType } from "../types";
import { CollectionPicker } from "./CollectionPicker";
import { NewCollectionDialog } from "./NewCollectionDialog";
@@ -31,6 +37,7 @@ export interface CollectionPickerModalProps {
options?: CollectionPickerOptions;
value?: Pick<CollectionPickerValueItem, "id" | "model" | "collection_id">;
shouldDisableItem?: (item: CollectionPickerItem) => boolean;
+ entityType?: EntityType;
searchResultFilter?: (searchResults: SearchResult[]) => SearchResult[];
recentFilter?: (recentItems: RecentItem[]) => RecentItem[];
models?: CollectionPickerModel[];
@@ -47,10 +54,37 @@ const baseCanSelectItem = (
);
};
-const searchFilter = (searchResults: SearchResult[]): SearchResult[] => {
- return searchResults.filter(
- (result) => result.can_write && result.collection.type !== "trash",
- );
+const searchFilter = (
+ searchResults: SearchResult[],
+ entityType?: EntityType,
+): SearchResult[] => {
+ return searchResults.filter((result) => {
+ if (!result.can_write || result.collection.type === "trash") {
+ return false;
+ }
+
+ if (result.model === "collection" && entityType) {
+ return canPlaceEntityInCollection(entityType, result.collection_type);
+ }
+
+ return true;
+ });
+};
+
+const recentItemFilter = (
+ recentItems: RecentItem[],
+ entityType?: EntityType,
+): RecentItem[] => {
+ if (!entityType) {
+ return recentItems;
+ }
+
+ return recentItems.filter((item) => {
+ if (item.model === "collection") {
+ return canPlaceEntityInCollection(entityType, item.collection_type);
+ }
+ return true;
+ });
};
export const CollectionPickerModal = ({
@@ -59,7 +93,8 @@ export const CollectionPickerModal = ({
onClose,
value,
options = defaultOptions,
- shouldDisableItem,
+ shouldDisableItem: shouldDisableItemProp,
+ entityType,
searchResultFilter,
recentFilter,
models: modelsProp,
@@ -69,6 +104,28 @@ export const CollectionPickerModal = ({
const models = modelsProp || ["collection"];
+ const shouldDisableItem = useMemo(() => {
+ const entityTypeCheck = entityType
+ ? (item: CollectionPickerItem) => {
+ if (item.model === "collection") {
+ return !canPlaceEntityInCollectionOrDescendants(
+ entityType,
+ getCollectionType(item),
+ );
+ }
+ return false;
+ }
+ : undefined;
+
+ if (shouldDisableItemProp && entityTypeCheck) {
+ return (item: CollectionPickerItem) => {
+ return shouldDisableItemProp(item) || entityTypeCheck(item);
+ };
+ }
+
+ return shouldDisableItemProp || entityTypeCheck;
+ }, [shouldDisableItemProp, entityType]);
+
const [selectedItem, setSelectedItem] = useState<CollectionPickerItem | null>(
null,
);
@@ -79,9 +136,24 @@ export const CollectionPickerModal = ({
| null
| undefined,
): item is CollectionPickerValueItem => {
- return baseCanSelectItem(item) && (_canSelectItem?.(item) ?? true);
+ if (!baseCanSelectItem(item)) {
+ return false;
+ }
+
+ if (_canSelectItem && !_canSelectItem(item)) {
+ return false;
+ }
+
+ if (entityType && item.model === "collection") {
+ const collectionType = getCollectionType(item as CollectionPickerItem);
+ if (!canPlaceEntityInCollection(entityType, collectionType)) {
+ return false;
+ }
+ }
+
+ return true;
},
- [_canSelectItem],
+ [_canSelectItem, entityType],
);
const { tryLogRecentItem } = useLogRecentItem();
@@ -133,6 +205,11 @@ export const CollectionPickerModal = ({
}
};
+ const canCreateCollectionInSelected =
+ selectedItem?.can_write !== false &&
+ (selectedItem?.model !== "collection" ||
+ canPlaceEntityInCollection("collection", selectedItem.type));
+
const modalActions = options.allowCreateNew
? _.compact([
models.includes("dashboard") && (
@@ -151,7 +228,7 @@ export const CollectionPickerModal = ({
miw="9.5rem"
onClick={openCreateCollectionDialog}
leftSection={<Icon name="collection" />}
- disabled={selectedItem?.can_write === false}
+ disabled={!canCreateCollectionInSelected}
>
{t`New collection`}
</Button>,
@@ -201,11 +278,22 @@ export const CollectionPickerModal = ({
const composedSearchResultFilter = useCallback(
(searchResults: SearchResult[]) => {
if (searchResultFilter) {
- return searchFilter(searchResultFilter(searchResults));
+ return searchFilter(searchResultFilter(searchResults), entityType);
+ }
+ return searchFilter(searchResults, entityType);
+ },
+ [searchResultFilter, entityType],
+ );
+
+ const composedRecentFilter = useCallback(
+ (recentItems: RecentItem[]) => {
+ const filtered = recentItemFilter(recentItems, entityType);
+ if (recentFilter) {
+ return recentFilter(filtered);
}
- return searchFilter(searchResults);
+ return filtered;
},
- [searchResultFilter],
+ [recentFilter, entityType],
);
const parentCollectionId = useMemo(() => {
@@ -236,7 +324,7 @@ export const CollectionPickerModal = ({
tabs={tabs}
options={options}
searchResultFilter={composedSearchResultFilter}
- recentFilter={recentFilter}
+ recentFilter={composedRecentFilter}
actionButtons={modalActions}
trapFocus={!isCreateCollectionDialogOpen}
disableCloseOnEscape={
diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/hooks.ts b/frontend/src/metabase/common/components/Pickers/CollectionPicker/hooks.ts
index 2e7d8fb4943..e8482259424 100644
--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/hooks.ts
+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/hooks.ts
@@ -6,10 +6,16 @@ import {
useGetCollectionQuery,
useListCollectionItemsQuery,
} from "metabase/api";
+import { isRootCollection } from "metabase/collections/utils";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
import { useSelector } from "metabase/lib/redux";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
-import type { Collection, Dashboard } from "metabase-types/api";
+import type {
+ Collection,
+ CollectionItemModel,
+ Dashboard,
+} from "metabase-types/api";
import type { CollectionItemListProps, CollectionPickerItem } from "./types";
@@ -42,6 +48,11 @@ export const useRootCollectionPickerItems = (
: skipToken,
);
+ const { data: libraryCollection } =
+ PLUGIN_DATA_STUDIO.useGetLibraryCollection({
+ skip: !options.showLibrary,
+ });
+
const {
data: personalCollectionItems,
isLoading: isLoadingPersonalCollectionItems,
@@ -65,6 +76,26 @@ export const useRootCollectionPickerItems = (
const items = useMemo(() => {
const collectionItems: CollectionPickerItem[] = [];
+ if (options.showLibrary && libraryCollection) {
+ collectionItems.push({
+ ...libraryCollection,
+ model: "collection",
+ moderated_status: null,
+ });
+ }
+
+ if (options.showDatabases) {
+ collectionItems.push({
+ id: "databases",
+ name: t`Databases`,
+ model: "collection",
+ can_write: true,
+ location: "/",
+ here: ["collection"],
+ below: ["table" as CollectionItemModel],
+ });
+ }
+
if (options.showRootCollection || options.namespace === "snippets") {
if (rootCollection && !rootCollectionError) {
collectionItems.push({
@@ -117,6 +148,7 @@ export const useRootCollectionPickerItems = (
options,
rootCollectionError,
totalPersonalCollectionItems,
+ libraryCollection,
]);
const isLoading =
@@ -171,7 +203,7 @@ export const useEnsureCollectionSelected = ({
}, [currentCollection, currentDashboard]);
const defaultCollectionItem = useRootCollection
- ? items[0]
+ ? items.find(isRootCollection)
: currentCollectionItem;
useEffect(() => {
diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/types.ts b/frontend/src/metabase/common/components/Pickers/CollectionPicker/types.ts
index 10b1ff01e82..b718086b57f 100644
--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/types.ts
+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/types.ts
@@ -2,6 +2,7 @@ import type {
CardId,
CollectionId,
CollectionItemModel,
+ CollectionType,
DashboardId,
ListCollectionItemsRequest,
SearchResult,
@@ -33,15 +34,30 @@ export type CollectionPickerItem = TypeWithModel<
CollectionItemId,
CollectionPickerModel
> &
- Pick<Partial<SearchResult>, "description" | "can_write" | "database_id"> & {
+ Pick<
+ Partial<SearchResult>,
+ "description" | "can_write" | "database_id" | "collection_type"
+ > & {
location?: string | null;
effective_location?: string | null;
is_personal?: boolean;
collection_id?: CollectionId | null;
here?: CollectionItemModel[];
below?: CollectionItemModel[];
+ type?: CollectionType;
};
+/**
+ * Returns the collection type for an item.
+ * Recent items and search results use `collection_type` field,
+ * while regular collection picker items use `type` field.
+ */
+export function getCollectionType(
+ item: CollectionPickerItem,
+): CollectionType | null {
+ return item.collection_type ?? item.type ?? null;
+}
+
export type CollectionPickerValueItem =
| (Omit<CollectionPickerItem, "model" | "id"> & {
id: CollectionId;
@@ -54,10 +70,11 @@ export type CollectionPickerValueItem =
});
export type CollectionPickerOptions = EntityPickerModalOptions & {
+ namespace?: "snippets";
allowCreateNew?: boolean;
showPersonalCollections?: boolean;
showRootCollection?: boolean;
- namespace?: "snippets";
+ showLibrary?: boolean;
};
export type CollectionItemListProps = ListProps<
diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/CollectionPicker/utils.ts
index e0489fc8594..139a0f3cf18 100644
--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/utils.ts
@@ -37,6 +37,11 @@ export const getPathLevelForItem = (
return 0;
}
+ if (item.model === "table") {
+ // we can ignore this, it's not actually in the collection hierarchy
+ return 0;
+ }
+
const parentCollectionId =
item.collection_id ??
getParentCollectionId(item?.effective_location ?? item?.location);
diff --git a/frontend/src/metabase/common/components/Pickers/DashboardPicker/components/DashboardPicker.tsx b/frontend/src/metabase/common/components/Pickers/DashboardPicker/components/DashboardPicker.tsx
index b57bc599714..ae48c546e44 100644
--- a/frontend/src/metabase/common/components/Pickers/DashboardPicker/components/DashboardPicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/DashboardPicker/components/DashboardPicker.tsx
@@ -134,6 +134,7 @@ const DashboardPickerInner = (
id: currentCollection.id,
location: currentCollection.effective_location,
is_personal: currentCollection.is_personal,
+ type: currentCollection.type,
model: "collection",
},
userPersonalCollectionId,
diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsx b/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsx
index c1f83d2d9bc..81823435ea1 100644
--- a/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsx
+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/components/DataPickerModal.tsx
@@ -5,7 +5,6 @@ import { useSetting } from "metabase/common/hooks";
import { Button, Checkbox, Icon, Popover } from "metabase/ui";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type {
- CollectionItemModel,
DatabaseId,
RecentContexts,
RecentItem,
@@ -18,6 +17,7 @@ import { useLogRecentItem } from "../../../EntityPicker/hooks/use-log-recent-ite
import type { CollectionPickerItem } from "../../CollectionPicker";
import {
QuestionPicker,
+ type QuestionPickerModel,
type QuestionPickerStatePath,
} from "../../QuestionPicker";
import { TablePicker } from "../../TablePicker";
@@ -32,7 +32,6 @@ import {
createQuestionPickerItemSelectHandler,
createShouldShowItem,
getRecentItemDatabaseId,
- isCollectionItem,
isTableItem,
isValueItem,
} from "../utils";
@@ -50,24 +49,28 @@ interface Props {
shouldDisableItem?: (
item: DataPickerItem | CollectionPickerItem | RecentItem,
) => boolean;
+ options?: DataPickerModalOptions;
}
-type FilterOption = { label: string; value: CollectionItemModel };
+type FilterOption = { label: string; value: QuestionPickerModel };
-const QUESTION_PICKER_MODELS: CollectionItemModel[] = [
+const QUESTION_PICKER_MODELS: QuestionPickerModel[] = [
"card",
"dataset",
"metric",
"dashboard",
+ "table", // yes, tables are in the question picker now, I'm sorry
];
const RECENTS_CONTEXT: RecentContexts[] = ["selections"];
-const options: DataPickerModalOptions = {
+const OPTIONS: DataPickerModalOptions = {
...defaultOptions,
hasConfirmButtons: false,
showPersonalCollections: true,
showRootCollection: true,
+ showLibrary: true,
+ showDatabases: true,
hasRecents: true,
};
@@ -75,19 +78,26 @@ export const DataPickerModal = ({
databaseId,
title,
value,
- models = ["table", "card", "dataset"],
onChange,
onClose,
shouldDisableItem,
+ options,
+ models,
}: Props) => {
- const [modelFilter, setModelFilter] = useState<CollectionItemModel[]>(
+ options = {
+ ...OPTIONS,
+ ...options,
+ };
+ const [modelFilter, setModelFilter] = useState<QuestionPickerModel[]>(
QUESTION_PICKER_MODELS,
);
const hasNestedQueriesEnabled = useSetting("enable-nested-queries");
+
const {
hasQuestions,
hasModels,
hasMetrics,
+ hasTables,
isLoading: isLoadingAvailableData,
} = useAvailableData({
databaseId,
@@ -114,8 +124,14 @@ export const DataPickerModal = ({
value: "metric" as const,
});
}
+ if (hasTables) {
+ filterOptions.push({
+ label: t`Tables`,
+ value: "table" as const,
+ });
+ }
return filterOptions;
- }, [hasQuestions, hasModels, hasMetrics]);
+ }, [hasQuestions, hasModels, hasMetrics, hasTables]);
const { tryLogRecentItem } = useLogRecentItem();
@@ -164,7 +180,6 @@ export const DataPickerModal = ({
const [questionsPath, setQuestionsPath] = useState<QuestionPickerStatePath>();
const [tablesPath, setTablesPath] = useState<TablePickerStatePath>();
-
const filterButton = (
<FilterButton
value={modelFilter}
@@ -180,7 +195,7 @@ export const DataPickerModal = ({
DataPickerItem
>[] = [];
- if (models.includes("table")) {
+ if (!hasNestedQueriesEnabled) {
computedTabs.push({
id: "tables-tab",
displayName: t`Tables`,
@@ -198,26 +213,22 @@ export const DataPickerModal = ({
/>
),
});
- }
-
- const shouldShowCollectionsTab =
- (hasQuestions || hasMetrics || hasModels) &&
- hasNestedQueriesEnabled &&
- (models.includes("card") ||
- models.includes("dataset") ||
- models.includes("metric"));
-
- if (shouldShowCollectionsTab) {
+ } else {
computedTabs.push({
id: "questions-tab",
- displayName: t`Collections`,
- models: ["card" as const, "dataset" as const, "metric" as const],
- folderModels: ["collection" as const, "dashboard" as const],
+ displayName: t`Data`,
+ models: [
+ "card" as const,
+ "dataset" as const,
+ "metric" as const,
+ "table" as const,
+ ],
+ folderModels: ["collection", "dashboard", "schema", "database"],
icon: "folder",
extraButtons: [filterButton],
render: ({ onItemSelect }) => (
<QuestionPicker
- initialValue={isCollectionItem(value) ? value : undefined}
+ initialValue={value}
models={QUESTION_PICKER_MODELS}
options={options}
path={questionsPath}
@@ -226,6 +237,8 @@ export const DataPickerModal = ({
onItemSelect={createQuestionPickerItemSelectHandler(onItemSelect)}
onPathChange={setQuestionsPath}
shouldDisableItem={shouldDisableItem}
+ tablesPath={tablesPath}
+ onTablesPathChange={setTablesPath}
/>
),
});
@@ -250,6 +263,7 @@ export const DataPickerModal = ({
onItemSelect={handleItemSelect}
isLoadingTabs={isLoadingAvailableData}
searchExtraButtons={[filterButton]}
+ searchModels={models}
/>
);
};
@@ -259,8 +273,8 @@ const FilterButton = ({
onChange,
options,
}: {
- value: CollectionItemModel[];
- onChange: (value: CollectionItemModel[]) => void;
+ value: QuestionPickerModel[];
+ onChange: (value: QuestionPickerModel[]) => void;
options: FilterOption[];
}) => {
return (
@@ -274,7 +288,7 @@ const FilterButton = ({
<Checkbox.Group
value={value}
onChange={(newValues: string[]) =>
- onChange(newValues as CollectionItemModel[])
+ onChange(newValues as QuestionPickerModel[])
}
px="1rem"
py="0.5rem"
diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/hooks/useAvailableData.ts b/frontend/src/metabase/common/components/Pickers/DataPicker/hooks/useAvailableData.ts
index e94499a854a..982ae1f3a77 100644
--- a/frontend/src/metabase/common/components/Pickers/DataPicker/hooks/useAvailableData.ts
+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/hooks/useAvailableData.ts
@@ -22,11 +22,13 @@ export const useAvailableData = ({ databaseId }: Props = {}) => {
const hasQuestions = availableModels.includes("card");
const hasModels = availableModels.includes("dataset");
const hasMetrics = availableModels.includes("metric");
+ const hasTables = availableModels.includes("table");
return {
isLoading,
hasQuestions,
hasModels,
hasMetrics,
+ hasTables,
};
};
diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/types.ts b/frontend/src/metabase/common/components/Pickers/DataPicker/types.ts
index 2def93f1588..602680a81d1 100644
--- a/frontend/src/metabase/common/components/Pickers/DataPicker/types.ts
+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/types.ts
@@ -68,4 +68,6 @@ export type DataPickerValueItem =
export type DataPickerItem = DataPickerFolderItem | DataPickerValueItem;
export type DataPickerModalOptions = EntityPickerModalOptions &
- QuestionPickerOptions;
+ QuestionPickerOptions & {
+ showDatabases?: boolean;
+ };
diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts
index c7a61d2aa02..ead9c390b06 100644
--- a/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts
@@ -6,10 +6,11 @@ import type {
CollectionItemModel,
DatabaseId,
RecentItem,
+ Table,
} from "metabase-types/api";
import type { QuestionPickerItem } from "../QuestionPicker";
-import type { TablePickerValue } from "../TablePicker";
+import type { TablePickerItem, TablePickerValue } from "../TablePicker";
import type {
DataPickerFolderItem,
@@ -97,11 +98,15 @@ export const isFolderItem = (
return ["collection", "database", "schema"].includes(item.model);
};
+type OmniPickerModel = CollectionItemModel | TablePickerItem["model"];
+
export const createShouldShowItem = (
- models: CollectionItemModel[],
+ models: OmniPickerModel[],
databaseId?: DatabaseId,
) => {
- return (item: QuestionPickerItem & { database_id?: DatabaseId }) => {
+ return (
+ item: QuestionPickerItem | (TablePickerItem & { database_id?: DatabaseId }),
+ ) => {
if (item.model === "collection") {
if (item.id === "root" || item.is_personal) {
return true;
@@ -110,12 +115,26 @@ export const createShouldShowItem = (
const below = item.below ?? [];
const here = item.here ?? [];
const contents = [...below, ...here];
- const hasCards = models.some((model) =>
+ const hasCards = models.some((model: OmniPickerModel) =>
contents.includes(model as CollectionItemModel),
);
return hasCards;
}
+
+ if (!isNullOrUndefined(databaseId) && item.model === "database") {
+ return item.id === databaseId;
+ }
+
+ if (item.model === "table") {
+ const itemDbId = item.database_id ?? (item as unknown as Table).db_id;
+ return isNullOrUndefined(databaseId) || itemDbId === databaseId;
+ }
+
+ if (item.model === "schema") {
+ return isNullOrUndefined(databaseId) || item.dbId === databaseId;
+ }
+
if (
(isNullOrUndefined(databaseId) ||
!hasDatabaseId(item) ||
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker.tsx
new file mode 100644
index 00000000000..9e9a717d054
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker.tsx
@@ -0,0 +1,112 @@
+import { useCallback, useEffect, useMemo } from "react";
+
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { Box, Menu } from "metabase/ui";
+
+import { useLogRecentItem } from "../../../EntityPicker/hooks/use-log-recent-item";
+import type { DataPickerValue } from "../../DataPicker";
+import { MiniPickerContext } from "../context";
+import type { MiniPickerItem, MiniPickerPickableItem } from "../types";
+import {
+ focusFirstMiniPickerItem,
+ getFolderAndHiddenFunctions,
+ useGetPathFromValue,
+} from "../utils";
+
+import { MiniPickerListLoader } from "./MiniPickerItemList";
+import { MiniPickerPane } from "./MiniPickerPane";
+
+export type MiniPickerProps = {
+ searchQuery?: string;
+ value?: DataPickerValue;
+ opened: boolean;
+ trapFocus?: boolean;
+ onChange: (value: MiniPickerPickableItem) => void;
+ onClose: () => void;
+ models: MiniPickerPickableItem["model"][];
+ onBrowseAll?: () => void;
+ shouldHide?: (item: MiniPickerItem | unknown) => boolean;
+};
+
+export function MiniPicker({
+ searchQuery,
+ value,
+ onChange,
+ opened,
+ onClose,
+ models,
+ onBrowseAll,
+ trapFocus = false,
+ shouldHide,
+}: MiniPickerProps) {
+ const { data: libraryCollection } =
+ PLUGIN_DATA_STUDIO.useGetLibraryCollection();
+
+ const [path, setPath, { isLoadingPath }] = useGetPathFromValue({
+ value,
+ opened,
+ libraryCollection,
+ });
+
+ const { isFolder, isHidden } = useMemo(() => {
+ return getFolderAndHiddenFunctions(models, shouldHide);
+ }, [models, shouldHide]);
+
+ useEffect(() => {
+ if (trapFocus && path) {
+ // any time the path changes, focus the first item
+ focusFirstMiniPickerItem();
+ }
+ }, [path, trapFocus]);
+
+ const { tryLogRecentItem } = useLogRecentItem();
+
+ const handleChange = useCallback(
+ async (item: MiniPickerPickableItem) => {
+ await onChange(item);
+ tryLogRecentItem(item);
+ },
+ [onChange, tryLogRecentItem],
+ );
+
+ return (
+ <MiniPickerContext.Provider
+ value={{
+ path,
+ setPath,
+ onChange: handleChange,
+ isFolder,
+ isHidden,
+ searchQuery,
+ onBrowseAll,
+ models,
+ canBrowse: !!onBrowseAll,
+ libraryCollection,
+ }}
+ >
+ <Menu
+ opened={opened}
+ onChange={onClose}
+ closeOnItemClick={false}
+ clickOutsideEvents={["mousedown", "touchstart"]}
+ position="bottom-start"
+ // menuItemTabIndex={-1}
+ trapFocus={false}
+ >
+ <Menu.Target>
+ <Box />
+ </Menu.Target>
+
+ <Menu.Dropdown
+ mt="xl"
+ ml="-1rem"
+ px={0}
+ py="sm"
+ data-testid="mini-picker"
+ >
+ {isLoadingPath ? <MiniPickerListLoader /> : <MiniPickerPane />}
+ </Menu.Dropdown>
+ </Menu>
+ </MiniPickerContext.Provider>
+ );
+}
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker.unit.spec.tsx
new file mode 100644
index 00000000000..301efb5968a
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker.unit.spec.tsx
@@ -0,0 +1,437 @@
+import userEvent from "@testing-library/user-event";
+
+import {
+ findRequests,
+ setupCardEndpoints,
+ setupCollectionItemsEndpoint,
+ setupDatabasesEndpoints,
+ setupRecentViewsAndSelectionsEndpoints,
+ setupSearchEndpoints,
+} from "__support__/server-mocks";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+} from "__support__/ui";
+import type { CollectionContentModel } from "metabase-types/api";
+import {
+ createMockCard,
+ createMockCollection,
+ createMockCollectionItem,
+ createMockDatabase,
+ createMockSearchResult,
+ createMockTable,
+} from "metabase-types/api/mocks";
+
+import { MiniPicker, type MiniPickerProps } from "./MiniPicker";
+
+const collectionItemModels = [
+ "dataset",
+ "metric",
+ "card",
+] as CollectionContentModel[];
+
+const setup = async (props: Partial<MiniPickerProps> = {}) => {
+ const onChangeSpy = jest.fn();
+ const onCloseSpy = jest.fn();
+
+ mockGetBoundingClientRect(); // for virtualization
+ const db = createMockDatabase({
+ name: "Mini Db",
+ id: 1,
+ tables: [
+ createMockTable({
+ id: 1,
+ db_id: 1,
+ display_name: "weather",
+ schema: "public",
+ }),
+ createMockTable({
+ id: 2,
+ db_id: 1,
+ display_name: "roads",
+ schema: "public",
+ }),
+ createMockTable({
+ id: 3,
+ db_id: 1,
+ display_name: "pokedex",
+ schema: "pokemon",
+ }),
+ createMockTable({
+ id: 4,
+ db_id: 1,
+ display_name: "cards",
+ schema: "pokemon",
+ }),
+ createMockTable({
+ id: 5,
+ db_id: 1,
+ display_name: "digimon",
+ schema: "digimon",
+ }),
+ ],
+ });
+
+ const db2 = createMockDatabase({
+ name: "Solo Db",
+ id: 2,
+ tables: [
+ createMockTable({
+ id: 6,
+ db_id: 2,
+ display_name: "pride",
+ schema: "only",
+ }),
+ createMockTable({
+ id: 7,
+ db_id: 2,
+ display_name: "prejudice",
+ schema: "only",
+ }),
+ ],
+ });
+
+ const db3 = createMockDatabase({
+ name: "NoSchema Db",
+ id: 3,
+ tables: [
+ createMockTable({ id: 8, db_id: 3, display_name: "jane", schema: "" }),
+ createMockTable({
+ id: 9,
+ db_id: 3,
+ display_name: "elizabeth",
+ schema: "",
+ }),
+ createMockTable({ id: 10, db_id: 3, display_name: "mary", schema: "" }),
+ createMockTable({ id: 11, db_id: 3, display_name: "kitty", schema: "" }),
+ createMockTable({ id: 12, db_id: 3, display_name: "lydia", schema: "" }),
+ ],
+ });
+ setupDatabasesEndpoints([db, db2, db3]);
+
+ setupCollectionItemsEndpoint({
+ collection: createMockCollection({ id: "root", name: "Our analytics" }),
+ collectionItems: [
+ createMockCollectionItem({
+ id: 101,
+ model: "collection",
+ name: "more things",
+ collection_id: "root",
+ here: collectionItemModels,
+ }),
+ createMockCollectionItem({
+ id: 102,
+ model: "card",
+ name: "Brighton",
+ collection_id: "root",
+ }),
+ createMockCollectionItem({
+ id: 103,
+ model: "dataset",
+ name: "Pemberly",
+ collection_id: "root",
+ }),
+ createMockCollectionItem({
+ id: 104,
+ model: "document",
+ name: "Longbourn",
+ collection_id: "root",
+ }),
+ createMockCollectionItem({
+ id: 105,
+ model: "dashboard",
+ name: "NetherField",
+ collection_id: "root",
+ }),
+ createMockCollectionItem({
+ id: 106,
+ model: "metric",
+ name: "Catherine",
+ collection_id: "root",
+ }),
+ ],
+ });
+
+ setupCollectionItemsEndpoint({
+ collection: createMockCollection({
+ id: 101,
+ name: "more things",
+ here: collectionItemModels,
+ }),
+ collectionItems: [
+ createMockCollectionItem({
+ id: 201,
+ model: "collection",
+ name: "even more things",
+ collection_id: 101,
+ }),
+ createMockCollectionItem({
+ id: 202,
+ model: "card",
+ name: "Rosings",
+ collection_id: 101,
+ }),
+ createMockCollectionItem({
+ id: 203,
+ model: "dataset",
+ name: "Meryton",
+ collection_id: 101,
+ }),
+ createMockCollectionItem({
+ id: 204,
+ model: "document",
+ name: "Lambton",
+ collection_id: 101,
+ }),
+ createMockCollectionItem({
+ id: 205,
+ model: "dashboard",
+ name: "Hunsford",
+ collection_id: 101,
+ }),
+ ],
+ models: ["card", "dataset", "document", "dashboard", "collection"],
+ });
+
+ setupSearchEndpoints([
+ createMockSearchResult({ id: 301, model: "card", name: "Lucas" }),
+ createMockSearchResult({ id: 302, model: "dataset", name: "Forster" }),
+ createMockSearchResult({ id: 303, model: "metric", name: "Bingley" }),
+ createMockSearchResult({ id: 304, model: "document", name: "Wickham" }),
+ createMockSearchResult({ id: 305, model: "collection", name: "Reynolds" }),
+ ]);
+
+ setupRecentViewsAndSelectionsEndpoints([], ["selections", "views"], {}, true);
+
+ renderWithProviders(
+ <MiniPicker
+ opened
+ models={["table", "dataset", "metric", "card"]}
+ onClose={onCloseSpy}
+ onChange={onChangeSpy}
+ {...props}
+ />,
+ );
+ expect(await screen.findByTestId("mini-picker")).toBeInTheDocument();
+
+ return { onChangeSpy, onCloseSpy };
+};
+
+describe("MiniPicker", () => {
+ it("renders the MiniPicker", async () => {
+ await setup();
+ expect(await screen.findByTestId("mini-picker")).toBeInTheDocument();
+ });
+
+ it("shows browse when the onBrowseAll prop is provided", async () => {
+ await setup({ onBrowseAll: jest.fn() });
+ expect(await screen.findByText("Browse all")).toBeInTheDocument();
+ });
+
+ it("does not show browse when the onBrowseAll prop is not provided", async () => {
+ //@ts-expect-error - using a null value to test absence of prop
+ await setup({ onBrowseAll: null });
+ expect(screen.queryByText("Browse all")).not.toBeInTheDocument();
+ });
+
+ it("records recent items when an item is picked", async () => {
+ const { onChangeSpy } = await setup();
+ await userEvent.click(await screen.findByText("Mini Db"));
+ await userEvent.click(await screen.findByText("public"));
+ await userEvent.click(await screen.findByText("roads"));
+
+ expect(onChangeSpy).toHaveBeenCalledWith({
+ id: 2,
+ model: "table",
+ name: "roads",
+ db_id: 1,
+ });
+
+ const [req] = await findRequests("POST");
+
+ expect(req.url).toContain("/api/activity/recents");
+ expect(req.body).toEqual({
+ context: "selection",
+ model: "table",
+ model_id: 2,
+ });
+ });
+
+ describe("tables", () => {
+ it("can pick a table from a db with multiple schemas", async () => {
+ const { onChangeSpy } = await setup();
+ await userEvent.click(await screen.findByText("Mini Db"));
+ await userEvent.click(await screen.findByText("public"));
+ await userEvent.click(await screen.findByText("weather"));
+
+ expect(onChangeSpy).toHaveBeenCalledWith({
+ id: 1,
+ model: "table",
+ name: "weather",
+ db_id: 1,
+ });
+ });
+
+ it("can pick a table from a db with a single schema", async () => {
+ const { onChangeSpy } = await setup();
+ await userEvent.click(await screen.findByText("Solo Db"));
+ // doesn't show schema
+ expect(screen.queryByText("only")).not.toBeInTheDocument();
+ await userEvent.click(await screen.findByText("pride"));
+
+ expect(onChangeSpy).toHaveBeenCalledWith({
+ id: 6,
+ model: "table",
+ name: "pride",
+ db_id: 2,
+ });
+ });
+
+ it("can pick a table from a db with no schemas", async () => {
+ const { onChangeSpy } = await setup();
+ await userEvent.click(await screen.findByText("NoSchema Db"));
+ // doesn't show schema
+ expect(screen.queryByText("only")).not.toBeInTheDocument();
+ await userEvent.click(await screen.findByText("mary"));
+
+ expect(onChangeSpy).toHaveBeenCalledWith({
+ id: 10,
+ model: "table",
+ name: "mary",
+ db_id: 3,
+ });
+ });
+
+ it("shows proper back headers when navigating into db and schema", async () => {
+ await setup();
+ await userEvent.click(await screen.findByText("Mini Db"));
+ expect(await screen.findByText("Mini Db")).toBeInTheDocument(); // db header
+ await userEvent.click(await screen.findByText("pokemon"));
+ expect(await screen.findByText("pokemon")).toBeInTheDocument(); // schema header
+ expect(await screen.findByText("pokedex")).toBeInTheDocument(); // table
+ });
+
+ it("should show a schema when provided a table as a value", async () => {
+ await setup({
+ value: {
+ model: "table",
+ id: 4,
+ db_id: 1,
+ schema: "pokemon",
+ name: "cards",
+ },
+ });
+ expect(await screen.findByText("pokemon")).toBeInTheDocument();
+ expect(await screen.findByText("cards")).toBeInTheDocument();
+ expect(await screen.findByText("pokedex")).toBeInTheDocument();
+ });
+ });
+
+ describe("collections", () => {
+ it("can pick a model", async () => {
+ const { onChangeSpy } = await setup();
+ await userEvent.click(await screen.findByText("Our analytics"));
+ await userEvent.click(await screen.findByText("more things"));
+ await userEvent.click(await screen.findByText("Meryton"));
+ expect(onChangeSpy).toHaveBeenCalledWith({
+ id: 203,
+ model: "dataset",
+ name: "Meryton",
+ });
+ });
+
+ it("can pick a question", async () => {
+ const { onChangeSpy } = await setup();
+ await userEvent.click(await screen.findByText("Our analytics"));
+ await userEvent.click(await screen.findByText("Brighton"));
+ expect(onChangeSpy).toHaveBeenCalledWith({
+ id: 102,
+ model: "card",
+ name: "Brighton",
+ });
+ });
+
+ it("can pick a metric", async () => {
+ const { onChangeSpy } = await setup();
+ await userEvent.click(await screen.findByText("Our analytics"));
+ expect(await screen.findByText("Brighton")).toBeInTheDocument();
+ await userEvent.click(await screen.findByText("Catherine"));
+ expect(onChangeSpy).toHaveBeenCalledWith({
+ id: 106,
+ model: "metric",
+ name: "Catherine",
+ });
+ });
+
+ it("ignores documents", async () => {
+ await setup();
+ await userEvent.click(await screen.findByText("Our analytics"));
+ expect(await screen.findByText("Brighton")).toBeInTheDocument();
+ expect(screen.queryByText("Longbourn")).not.toBeInTheDocument();
+ });
+
+ it("ignores metrics when the model is missing", async () => {
+ await setup({
+ models: ["table", "dataset", "card"],
+ });
+ await userEvent.click(await screen.findByText("Our analytics"));
+ expect(await screen.findByText("Brighton")).toBeInTheDocument();
+ expect(screen.queryByText("Catherine")).not.toBeInTheDocument();
+ });
+
+ it("should show a collection when provided a card as a value", async () => {
+ setupCardEndpoints(
+ createMockCard({
+ id: 202,
+ name: "Rosings",
+ collection_id: 101,
+ collection: createMockCollection({
+ effective_location: "/",
+ }),
+ }),
+ );
+ await setup({
+ value: {
+ id: 202,
+ model: "card",
+ name: "Rosings",
+ database_id: 1,
+ },
+ });
+ expect(await screen.findByText("more things")).toBeInTheDocument();
+ expect(await screen.findByText("Rosings")).toBeInTheDocument();
+ expect(await screen.findByText("Meryton")).toBeInTheDocument(); // sibling
+ expect(screen.queryByText(/Our analytics/)).not.toBeInTheDocument(); // document sibling
+ });
+ });
+
+ describe("search", () => {
+ it("shows search results", async () => {
+ await setup({ searchQuery: "e" });
+ expect(await screen.findByText("Forster")).toBeInTheDocument();
+ expect(await screen.findByText("Bingley")).toBeInTheDocument();
+ });
+
+ it("properly filters search results", async () => {
+ await setup({ searchQuery: "a" });
+ expect(await screen.findByText("Lucas")).toBeInTheDocument();
+ expect(screen.queryByText("Wickham")).not.toBeInTheDocument();
+ });
+
+ it("can pick a search result", async () => {
+ const { onChangeSpy } = await setup({ searchQuery: "e" });
+ expect(await screen.findByText("Forster")).toBeInTheDocument();
+ expect(await screen.findByText("Bingley")).toBeInTheDocument();
+ await userEvent.click(await screen.findByText("Bingley"));
+
+ expect(onChangeSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ id: 303,
+ model: "metric",
+ name: "Bingley",
+ }),
+ );
+ });
+ });
+});
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerFooter.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerFooter.tsx
new file mode 100644
index 00000000000..bcdba3a107e
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerFooter.tsx
@@ -0,0 +1,26 @@
+import { t } from "ttag";
+
+import { Icon, Menu } from "metabase/ui";
+
+import { useMiniPickerContext } from "../context";
+
+import { MiniPickerItem } from "./MiniPickerItem";
+
+export function MiniPickerFooter() {
+ const { canBrowse, onBrowseAll } = useMiniPickerContext();
+
+ if (!canBrowse) {
+ return null;
+ }
+ return (
+ <>
+ <Menu.Divider mx="sm" />
+ <MiniPickerItem
+ variant="mb-light"
+ leftSection={<Icon name="search" />}
+ name={t`Browse all`}
+ onClick={onBrowseAll}
+ />
+ </>
+ );
+}
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerHeader.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerHeader.tsx
new file mode 100644
index 00000000000..123da3c353d
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerHeader.tsx
@@ -0,0 +1,22 @@
+import { Icon } from "metabase/ui";
+
+import { useMiniPickerContext } from "../context";
+
+import { MiniPickerItem } from "./MiniPickerItem";
+
+export function MiniPickerHeader() {
+ const { path, setPath } = useMiniPickerContext();
+ const backName = path[path.length - 1]?.name || "";
+ return (
+ <MiniPickerItem
+ name={backName}
+ data-testid="mini-picker-header"
+ data-autofocus
+ variant="mb-light"
+ leftSection={<Icon name="chevronleft" />}
+ onClick={() => {
+ setPath((prevPath) => prevPath.slice(0, -1));
+ }}
+ />
+ );
+}
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
new file mode 100644
index 00000000000..5ae51814a86
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
@@ -0,0 +1,36 @@
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import { getIcon } from "metabase/lib/icon";
+import { Box, Icon, Menu, type MenuItemProps } from "metabase/ui";
+
+import type { MiniPickerItem as MiniPickerItemType } from "../types";
+
+export const MiniPickerItem = ({
+ model,
+ name,
+ onClick,
+ isFolder,
+ isHidden,
+ ...menuItemProps
+}: {
+ name: string;
+ model?: MiniPickerItemType["model"];
+ onClick?: () => void;
+ isFolder?: boolean;
+ isHidden?: boolean;
+} & MenuItemProps) => {
+ if (isHidden) {
+ return null;
+ }
+ return (
+ <Box px="sm" py="2px">
+ <Menu.Item
+ leftSection={model ? <Icon {...getIcon({ model })} /> : undefined}
+ rightSection={isFolder ? <Icon name="chevronright" /> : undefined}
+ onClick={onClick}
+ {...menuItemProps}
+ >
+ <Ellipsified maw={isFolder ? "13rem" : "16rem"}>{name}</Ellipsified>
+ </Menu.Item>
+ </Box>
+ );
+};
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
new file mode 100644
index 00000000000..6226fd589cc
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
@@ -0,0 +1,326 @@
+import { t } from "ttag";
+
+import {
+ skipToken,
+ useListCollectionItemsQuery,
+ useListDatabaseSchemaTablesQuery,
+ useListDatabaseSchemasQuery,
+ useListDatabasesQuery,
+ useSearchQuery,
+} from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { VirtualizedList } from "metabase/common/components/VirtualizedList";
+import { useSetting } from "metabase/common/hooks";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
+import { Box, Text } from "metabase/ui";
+import type { SchemaName, SearchModel } from "metabase-types/api";
+
+import { useMiniPickerContext } from "../context";
+import type {
+ MiniPickerCollectionItem,
+ MiniPickerDatabaseItem,
+ MiniPickerPickableItem,
+ MiniPickerSchemaItem,
+} from "../types";
+
+import { MiniPickerItem } from "./MiniPickerItem";
+
+export function MiniPickerItemList() {
+ const { path, searchQuery } = useMiniPickerContext();
+
+ if (searchQuery) {
+ return <SearchItemList query={searchQuery} />;
+ }
+
+ if (path.length === 0) {
+ return <RootItemList />;
+ }
+
+ const lastParent = path[path.length - 1];
+
+ if (lastParent.model === "database" || lastParent.model === "schema") {
+ return <DatabaseItemList parent={lastParent} />;
+ }
+
+ if (lastParent.model === "collection") {
+ return <CollectionItemList parent={lastParent} />;
+ }
+
+ return null;
+}
+
+function RootItemList() {
+ const { data: databases } = useListDatabasesQuery();
+ const { setPath, isHidden } = useMiniPickerContext();
+ const { data: libraryCollection, isLoading } =
+ PLUGIN_DATA_STUDIO.useGetLibraryCollection();
+ const enableNestedQueries = useSetting("enable-nested-queries");
+
+ if (isLoading) {
+ return <MiniPickerListLoader />;
+ }
+
+ const enabledDatabases = (databases?.data ?? []).filter(
+ (db) => !isHidden({ model: "database", ...db }),
+ );
+
+ if (!enableNestedQueries) {
+ return (
+ <ItemList>
+ {enabledDatabases.map((db) => (
+ <MiniPickerItem
+ key={db.id}
+ name={db.name}
+ isHidden={isHidden({ model: "database", id: db.id, name: db.name })}
+ model="database"
+ isFolder
+ onClick={() => {
+ setPath([{ model: "database", id: db.id, name: db.name }]);
+ }}
+ />
+ )) ?? []}
+ </ItemList>
+ );
+ }
+
+ if (libraryCollection) {
+ return (
+ <CollectionItemList
+ parent={{
+ model: "collection",
+ id: libraryCollection.id,
+ name: libraryCollection.name,
+ }}
+ />
+ );
+ }
+
+ return (
+ <ItemList>
+ {enabledDatabases.map((db) => (
+ <MiniPickerItem
+ key={db.id}
+ name={db.name}
+ model="database"
+ isHidden={isHidden({ model: "database", id: db.id, name: db.name })}
+ isFolder
+ onClick={() => {
+ setPath([{ model: "database", id: db.id, name: db.name }]);
+ }}
+ />
+ )) ?? <MiniPickerListLoader />}
+ <MiniPickerItem
+ name={t`Our analytics`}
+ model="collection"
+ isFolder
+ onClick={() => {
+ setPath([
+ {
+ model: "collection",
+ id: "root" as any, // cmon typescript, trust me
+ name: t`Our analytics`,
+ },
+ ]);
+ }}
+ />
+ </ItemList>
+ );
+}
+
+function DatabaseItemList({
+ parent,
+}: {
+ parent: MiniPickerDatabaseItem | MiniPickerSchemaItem;
+}) {
+ const { setPath, onChange, isHidden } = useMiniPickerContext();
+ const { data: schemas, isLoading: isLoadingSchemas } =
+ useListDatabaseSchemasQuery(
+ parent.model === "database" ? { id: parent.id } : skipToken,
+ );
+
+ const schemaName: SchemaName | null =
+ parent.model === "schema"
+ ? String(parent.id)
+ : schemas?.length === 1
+ ? schemas[0] // if there's one schema, go straight to tables
+ : null;
+
+ const dbId = parent.model === "database" ? parent.id : parent.dbId!;
+
+ const { data: tablesData, isLoading: isLoadingTables } =
+ useListDatabaseSchemaTablesQuery(
+ schemaName !== null
+ ? {
+ id: dbId,
+ schema: schemaName,
+ }
+ : skipToken,
+ );
+
+ if (isLoadingSchemas) {
+ return <MiniPickerListLoader />;
+ }
+
+ if (schemas?.length && schemas.length > 1 && parent.model === "database") {
+ return (
+ <ItemList>
+ {schemas.map((schema) => (
+ <MiniPickerItem
+ key={schema}
+ name={schema}
+ isHidden={isHidden({
+ model: "schema",
+ id: schema,
+ dbId,
+ name: schema,
+ })}
+ isFolder
+ model="schema"
+ onClick={() => {
+ setPath((prevPath) => [
+ ...prevPath,
+ {
+ model: "schema",
+ id: schema,
+ dbId,
+ name: schema,
+ },
+ ]);
+ }}
+ />
+ ))}
+ </ItemList>
+ );
+ }
+
+ if (isLoadingTables) {
+ return <MiniPickerListLoader />;
+ }
+
+ if (!isLoadingSchemas && tablesData?.length) {
+ const tables =
+ parent.model === "schema"
+ ? tablesData.filter((table) => table.schema === parent.id)
+ : tablesData;
+
+ return (
+ <ItemList>
+ {tables?.map((table) => (
+ <MiniPickerItem
+ key={table.id}
+ name={table.display_name}
+ isHidden={isHidden({ model: "table", ...table })}
+ model="table"
+ onClick={() => {
+ onChange({
+ model: "table",
+ id: table.id,
+ db_id: table.db_id,
+ name: table.display_name ?? table.name,
+ });
+ }}
+ />
+ ))}
+ </ItemList>
+ );
+ }
+}
+
+function CollectionItemList({ parent }: { parent: MiniPickerCollectionItem }) {
+ const { setPath, onChange, isFolder, isHidden } = useMiniPickerContext();
+
+ const {
+ data: items,
+ isLoading,
+ isFetching,
+ } = useListCollectionItemsQuery({
+ id: parent.id === null ? "root" : parent.id,
+ });
+
+ if (isLoading || isFetching) {
+ return <MiniPickerListLoader />;
+ }
+
+ if (items?.data?.length) {
+ return (
+ <ItemList>
+ {items.data.map((item) => (
+ <MiniPickerItem
+ key={`${item.model}-${item.id}`}
+ name={item.name}
+ model={item.model}
+ isFolder={isFolder(item)}
+ isHidden={isHidden(item)}
+ onClick={() => {
+ if (isFolder(item)) {
+ setPath((prevPath) => [
+ ...prevPath,
+ {
+ model: item.model,
+ id: item.id,
+ name: item.name,
+ },
+ ]);
+ } else {
+ onChange({
+ model: item.model,
+ id: item.id,
+ name: item.name,
+ });
+ }
+ }}
+ />
+ ))}
+ </ItemList>
+ );
+ }
+}
+
+function SearchItemList({ query }: { query: string }) {
+ const { onChange, models, libraryCollection, isHidden } =
+ useMiniPickerContext();
+
+ const { data: searchResponse, isLoading } = useSearchQuery({
+ q: query,
+ models: models as SearchModel[],
+ limit: 50,
+ ...(libraryCollection ? { collection: libraryCollection.id } : {}),
+ });
+
+ const searchResults: MiniPickerPickableItem[] = (
+ searchResponse?.data ?? []
+ ).filter((i) => !isHidden(i));
+
+ return (
+ <ItemList>
+ <Box>
+ {isLoading && <MiniPickerListLoader />}
+ {!isLoading && searchResults.length === 0 && (
+ <Text px="md" py="sm" c="text-medium">{t`No search results`}</Text>
+ )}
+ </Box>
+ {searchResults.map((item) => {
+ return (
+ <MiniPickerItem
+ key={`${item.model}-${item.id}`}
+ name={item.name}
+ model={item.model}
+ onClick={() => {
+ onChange(item);
+ }}
+ />
+ );
+ })}
+ </ItemList>
+ );
+}
+
+export const MiniPickerListLoader = () => (
+ <Box data-testid="mini-picker-loader">
+ <LoadingAndErrorWrapper loading />
+ </Box>
+);
+
+const ItemList = ({ children }: { children: React.ReactNode[] }) => {
+ return <VirtualizedList extraPadding={2}>{children}</VirtualizedList>;
+};
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerPane.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerPane.tsx
new file mode 100644
index 00000000000..a97886e4888
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerPane.tsx
@@ -0,0 +1,22 @@
+import { Stack } from "metabase/ui";
+
+import { useMiniPickerContext } from "../context";
+
+import { MiniPickerFooter } from "./MiniPickerFooter";
+import { MiniPickerHeader } from "./MiniPickerHeader";
+import { MiniPickerItemList } from "./MiniPickerItemList";
+
+export function MiniPickerPane() {
+ const { path, searchQuery } = useMiniPickerContext();
+
+ const isRoot = path.length === 0;
+
+ return (
+ <Stack mah="30rem" w="20rem" gap={0}>
+ {!isRoot && !searchQuery && <MiniPickerHeader />}
+ <MiniPickerItemList />
+ {(isRoot || searchQuery) && <MiniPickerFooter />}
+ {/* <pre>{JSON.stringify(path, null, 2)} </pre> */}
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/context.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/context.ts
new file mode 100644
index 00000000000..6a605ac90cc
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/context.ts
@@ -0,0 +1,42 @@
+import {
+ type Dispatch,
+ type SetStateAction,
+ createContext,
+ useContext,
+} from "react";
+
+import type {
+ MiniPickerCollectionItem,
+ MiniPickerFolderItem,
+ MiniPickerItem,
+ MiniPickerPickableItem,
+} from "./types";
+
+export interface MiniPickerContextValue {
+ path: MiniPickerFolderItem[];
+ setPath: Dispatch<SetStateAction<MiniPickerFolderItem[]>>;
+ onChange: (value: MiniPickerPickableItem) => void;
+ initialValue?: unknown;
+ isFolder: (item: MiniPickerItem | unknown) => item is MiniPickerFolderItem;
+ isHidden: (item: MiniPickerItem | unknown) => item is unknown;
+ models: MiniPickerPickableItem["model"][];
+ searchQuery?: string;
+ canBrowse: boolean;
+ onBrowseAll?: () => void;
+ libraryCollection?: MiniPickerCollectionItem;
+}
+
+export const MiniPickerContext = createContext<
+ MiniPickerContextValue | undefined
+>(undefined);
+
+export const useMiniPickerContext = () => {
+ const context = useContext(MiniPickerContext);
+
+ if (!context) {
+ throw new Error(
+ "useMiniPickerContext must be used within a MiniPickerProvider",
+ );
+ }
+ return context;
+};
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/index.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/index.ts
new file mode 100644
index 00000000000..83df5c940fb
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/index.ts
@@ -0,0 +1 @@
+export * from "./components/MiniPicker";
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts
new file mode 100644
index 00000000000..a0d70658ef3
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts
@@ -0,0 +1,73 @@
+import type {
+ CollectionId,
+ CollectionItem,
+ DatabaseId,
+ SchemaName,
+ TableId,
+} from "metabase-types/api";
+
+export type MiniPickerCollectionItem = Pick<
+ CollectionItem,
+ "id" | "name" | "model" | "here" | "below"
+> & {
+ id: CollectionItem["id"] | CollectionId;
+};
+
+export type MiniPickerPickableCollectionItem = MiniPickerCollectionItem & {
+ // maz says this will never happen, but
+ // if this is used outside the data picker, this should be generic
+ model: Omit<
+ CollectionItem["model"],
+ "collection" | "dashboard" | "document" | "snippet" | "indexed-entity"
+ >;
+};
+
+export type MiniPickerSchemaItem = {
+ model: "schema";
+ id: SchemaName;
+ dbId: DatabaseId;
+ name: SchemaName;
+};
+
+export type MiniPickerTableItem = {
+ model: "table";
+ id: TableId;
+ db_id: DatabaseId;
+ name: string;
+};
+
+export type MiniPickerDatabaseItem = {
+ model: "database";
+ id: DatabaseId;
+ name: string;
+};
+
+export enum MiniPickerFolderModel {
+ Database = "database",
+ Schema = "schema",
+ Collection = "collection",
+}
+
+// this includes all possible item types that can be shown in the mini picker
+export type MiniPickerItem =
+ | MiniPickerCollectionItem
+ | MiniPickerSchemaItem
+ | MiniPickerTableItem
+ | MiniPickerDatabaseItem;
+
+// this is only the intermediate/folder types that cannot ultimately be picked
+export type MiniPickerFolderItem =
+ | MiniPickerDatabaseItem
+ | MiniPickerSchemaItem
+ | (MiniPickerCollectionItem & { model: "collection" });
+
+// this omits intermediate/folder types that cannot ultimately be picked
+export type MiniPickerPickableItem =
+ | MiniPickerPickableCollectionItem
+ | MiniPickerTableItem;
+
+// can't get schemas in search results
+export type SearchableMiniPickerItem =
+ | MiniPickerPickableCollectionItem
+ | MiniPickerTableItem
+ | MiniPickerDatabaseItem;
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts
new file mode 100644
index 00000000000..f253ef8f56f
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts
@@ -0,0 +1,231 @@
+import { useState } from "react";
+import { useDeepCompareEffect } from "react-use";
+import { t } from "ttag";
+
+import { cardApi, collectionApi, databaseApi } from "metabase/api";
+import type { DispatchFn } from "metabase/lib/redux";
+import { useDispatch } from "metabase/lib/redux";
+import type { SchemaName } from "metabase-types/api";
+
+import type { DataPickerValue } from "../DataPicker";
+import type { TablePickerValue } from "../TablePicker";
+
+import {
+ type MiniPickerCollectionItem,
+ type MiniPickerFolderItem,
+ MiniPickerFolderModel,
+ type MiniPickerItem,
+ type MiniPickerPickableItem,
+} from "./types";
+
+export const getOurAnalytics = (): MiniPickerFolderItem => ({
+ model: "collection",
+ id: "root" as any, // cmon typescript
+ name: t`Our analytics`,
+ here: ["card"],
+ below: ["card"],
+});
+
+export function useGetPathFromValue({
+ value,
+ opened,
+ libraryCollection,
+}: {
+ value?: DataPickerValue;
+ opened: boolean;
+ libraryCollection?: MiniPickerCollectionItem;
+}) {
+ const [path, setPath] = useState<MiniPickerFolderItem[]>([]);
+ const [isLoadingPath, setIsLoadingPath] = useState(false);
+ const dispatch = useDispatch();
+
+ useDeepCompareEffect(() => {
+ if (!opened || !value) {
+ return;
+ }
+ setIsLoadingPath(true);
+
+ getPathFromValue(value, dispatch, libraryCollection).then((newPath) => {
+ setPath(newPath);
+ setIsLoadingPath(false);
+ });
+ }, [value, opened, dispatch, libraryCollection]);
+
+ return [path, setPath, { isLoadingPath }] as const;
+}
+
+async function getPathFromValue(
+ value: DataPickerValue,
+ dispatch: DispatchFn,
+ libraryCollection?: MiniPickerCollectionItem,
+): Promise<MiniPickerFolderItem[]> {
+ return value?.model === "table"
+ ? getTablePathFromValue(value, dispatch)
+ : getCollectionPathFromValue(value, dispatch, libraryCollection);
+}
+
+async function getTablePathFromValue(
+ value: TablePickerValue,
+ dispatch: DispatchFn,
+): Promise<MiniPickerFolderItem[]> {
+ // get the list endpoints instead of the single table endpoint
+ // so that they'll be in the cache when we navigate
+ const dbReq = dispatch(
+ databaseApi.endpoints.listDatabases.initiate(),
+ ).unwrap();
+
+ const schemaReq = dispatch(
+ databaseApi.endpoints.listDatabaseSchemas.initiate({ id: value.db_id }),
+ ).unwrap();
+
+ const [dbs, schemas] = await Promise.all([dbReq, schemaReq]);
+ const db = dbs.data.find((db) => db.id === value.db_id);
+ const schema: SchemaName | undefined =
+ schemas?.length > 1
+ ? schemas.find((sch) => sch === value.schema)
+ : undefined;
+ return [
+ ...(db ? [{ id: db.id, name: db.name, model: "database" as const }] : []),
+ ...(db && schema
+ ? [{ id: schema, name: schema, model: "schema" as const, dbId: db.id }]
+ : []),
+ ];
+}
+
+async function getCollectionPathFromValue(
+ value: Exclude<DataPickerValue, TablePickerValue>,
+ dispatch: DispatchFn,
+ libraryCollection?: MiniPickerCollectionItem,
+): Promise<MiniPickerFolderItem[]> {
+ const card = await dispatch(
+ cardApi.endpoints.getCard.initiate({ id: value.id }),
+ ).unwrap();
+
+ const location =
+ card.collection?.effective_location ?? card.collection?.location;
+
+ if (!location) {
+ return [getOurAnalytics()];
+ }
+
+ const locationPath = [getOurAnalytics()];
+
+ const collectionIds = [
+ "root",
+ ...(location?.split("/") ?? []),
+ card?.collection_id,
+ ].filter(Boolean);
+
+ if (collectionIds.includes(String(libraryCollection?.id))) {
+ collectionIds.shift(); // pretend the library is at the top level
+ locationPath.shift();
+ }
+
+ for (let i = 0; i < collectionIds.length; i++) {
+ const collectionId = collectionIds[i];
+
+ if (!collectionId) {
+ break;
+ }
+
+ const collectionItems = await dispatch(
+ collectionApi.endpoints.listCollectionItems.initiate({
+ id: collectionId,
+ }),
+ ).unwrap();
+
+ if (!collectionItems?.data) {
+ break;
+ }
+
+ const nextItem = collectionItems.data.find(
+ (item) =>
+ item.model === "collection" &&
+ String(item.id) === String(collectionIds[i + 1]),
+ );
+
+ if (!nextItem) {
+ break;
+ }
+
+ locationPath.push({
+ id: nextItem.id,
+ name: nextItem.name,
+ model: "collection",
+ here: nextItem.here,
+ below: nextItem.below,
+ });
+ }
+
+ return locationPath;
+}
+
+// not a factory
+export function getFolderAndHiddenFunctions(
+ models: MiniPickerPickableItem["model"][],
+ shouldHide?: (item: MiniPickerItem | unknown) => boolean,
+) {
+ const modelSet = new Set(models);
+ const isFolder = (
+ item: MiniPickerItem | unknown,
+ ): item is MiniPickerFolderItem => {
+ if (!item || typeof item !== "object" || !("model" in item)) {
+ return false;
+ }
+
+ if (
+ item.model === MiniPickerFolderModel.Database ||
+ item.model === MiniPickerFolderModel.Schema
+ ) {
+ return true;
+ }
+
+ if (item.model !== MiniPickerFolderModel.Collection) {
+ return false;
+ }
+
+ if (!("here" in item) && !("below" in item)) {
+ return false;
+ }
+
+ const hereBelowSet = Array.from(
+ new Set([
+ ...("here" in item && Array.isArray(item.here) ? item.here : []),
+ ...("below" in item && Array.isArray(item.below) ? item.below : []),
+ ]),
+ );
+ return (
+ item.model === "collection" &&
+ hereBelowSet.some((hereBelowModel) => modelSet.has(hereBelowModel))
+ );
+ };
+
+ const isHidden = (item: MiniPickerItem | unknown): item is unknown => {
+ if (!item || typeof item !== "object" || !("model" in item)) {
+ return true;
+ }
+
+ if (shouldHide && shouldHide(item)) {
+ return true;
+ }
+
+ return (
+ !modelSet.has(item.model as MiniPickerPickableItem["model"]) &&
+ !isFolder(item)
+ );
+ };
+ return { isFolder, isHidden };
+}
+
+export const focusFirstMiniPickerItem = () => {
+ // any time the path changes, focus the first item
+ setTimeout(() => {
+ // dirty, but let's wait for a render
+ const firstItem = document.querySelector(
+ '[data-testid="mini-picker"] [role="menuitem"]',
+ );
+ if (firstItem) {
+ (firstItem as HTMLElement)?.focus?.();
+ }
+ }, 10);
+};
diff --git a/frontend/src/metabase/common/components/Pickers/QuestionPicker/components/QuestionPicker.tsx b/frontend/src/metabase/common/components/Pickers/QuestionPicker/components/QuestionPicker.tsx
index 49c6f493db8..f1554dc1a78 100644
--- a/frontend/src/metabase/common/components/Pickers/QuestionPicker/components/QuestionPicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/QuestionPicker/components/QuestionPicker.tsx
@@ -3,20 +3,34 @@ import { useDeepCompareEffect } from "react-use";
import { useSelector } from "metabase/lib/redux";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
-import type { CollectionItemModel } from "metabase-types/api";
import { DelayedLoadingSpinner, NestedItemPicker } from "../../../EntityPicker";
-import { useEnsureCollectionSelected } from "../../CollectionPicker";
+import {
+ type CollectionPickerItem,
+ type CollectionPickerModel,
+ useEnsureCollectionSelected,
+} from "../../CollectionPicker";
import { CollectionItemPickerResolver } from "../../CollectionPicker/components/CollectionItemPickerResolver";
import { getPathLevelForItem } from "../../CollectionPicker/utils";
+import {
+ type TablePickerItem,
+ type TablePickerStatePath,
+ type TablePickerValue,
+ isTablePickerValue,
+} from "../../TablePicker";
import { useGetInitialContainer } from "../../hooks";
import { getCollectionIdPath, getStateFromIdPath } from "../../utils";
import type {
QuestionPickerItem,
+ QuestionPickerModel,
QuestionPickerOptions,
QuestionPickerStatePath,
} from "../types";
-import { getQuestionPickerValueModel, isFolder } from "../utils";
+import {
+ getQuestionPickerValueModel,
+ isFolder,
+ isTablePickerFolderOrQuestionPickerFolder,
+} from "../utils";
export const defaultOptions: QuestionPickerOptions = {
showPersonalCollections: true,
@@ -25,14 +39,16 @@ export const defaultOptions: QuestionPickerOptions = {
};
interface QuestionPickerProps {
- initialValue?: Pick<QuestionPickerItem, "model" | "id">;
- models?: CollectionItemModel[];
+ initialValue?: Pick<QuestionPickerItem, "model" | "id"> | TablePickerValue;
+ models?: QuestionPickerModel[];
options: QuestionPickerOptions;
path: QuestionPickerStatePath | undefined;
+ tablesPath?: TablePickerStatePath;
shouldShowItem?: (item: QuestionPickerItem) => boolean;
onInit: (item: QuestionPickerItem) => void;
onItemSelect: (item: QuestionPickerItem) => void;
onPathChange: (path: QuestionPickerStatePath) => void;
+ onTablesPathChange?: (path: TablePickerStatePath) => void;
shouldDisableItem?: (item: QuestionPickerItem) => boolean;
}
@@ -41,14 +57,19 @@ export const QuestionPicker = ({
models = ["dataset", "card"],
options,
path: pathProp,
+ tablesPath,
shouldShowItem,
onInit,
onItemSelect,
onPathChange,
+ onTablesPathChange,
shouldDisableItem,
}: QuestionPickerProps) => {
const defaultPath = useMemo(() => {
- return getStateFromIdPath({ idPath: ["root"], models });
+ return getStateFromIdPath({
+ idPath: ["root"],
+ models: models as CollectionPickerModel[],
+ });
}, [models]);
const path = pathProp ?? defaultPath;
@@ -59,12 +80,20 @@ export const QuestionPicker = ({
const onFolderSelect = useCallback(
({ folder }: { folder: QuestionPickerItem }) => {
- const newPath = getStateFromIdPath({
- idPath: getCollectionIdPath(folder, userPersonalCollectionId),
- models,
- });
onItemSelect(folder);
- onPathChange(newPath);
+
+ //if it's actually a folder
+ if (isFolder(folder, models as QuestionPickerModel[])) {
+ const newPath = getStateFromIdPath({
+ idPath: getCollectionIdPath(
+ folder as CollectionPickerItem,
+ userPersonalCollectionId,
+ ),
+ models: models as CollectionPickerModel[],
+ });
+
+ onPathChange(newPath);
+ }
},
[onItemSelect, onPathChange, userPersonalCollectionId, models],
);
@@ -105,7 +134,7 @@ export const QuestionPicker = ({
const newPath = getStateFromIdPath({
idPath,
- models,
+ models: models as CollectionPickerModel[],
});
// start with the current item selected if we can
@@ -128,7 +157,7 @@ export const QuestionPicker = ({
{ ...currentCollection, model: "collection" },
userPersonalCollectionId,
),
- models,
+ models: models as CollectionPickerModel[],
});
// start with the current item selected if we can
@@ -173,14 +202,23 @@ export const QuestionPicker = ({
return (
<NestedItemPicker
- isFolder={(item: QuestionPickerItem) => isFolder(item, models)}
+ initialValue={isTablePickerValue(initialValue) ? initialValue : undefined}
+ isFolder={(item: QuestionPickerItem | TablePickerItem) =>
+ isTablePickerFolderOrQuestionPickerFolder(
+ item,
+ models as QuestionPickerModel[],
+ )
+ }
options={options}
onFolderSelect={onFolderSelect}
onItemSelect={handleItemSelect}
+ // @ts-expect-error - CollectionPickerItem and QuestionPickerItem don't mix 😢
path={path}
listResolver={CollectionItemPickerResolver}
shouldShowItem={shouldShowItem}
shouldDisableItem={shouldDisableItem}
+ tablesPath={tablesPath}
+ onTablesPathChange={onTablesPathChange}
/>
);
};
diff --git a/frontend/src/metabase/common/components/Pickers/QuestionPicker/types.ts b/frontend/src/metabase/common/components/Pickers/QuestionPicker/types.ts
index 1b4b57e7fa6..bab73a131e6 100644
--- a/frontend/src/metabase/common/components/Pickers/QuestionPicker/types.ts
+++ b/frontend/src/metabase/common/components/Pickers/QuestionPicker/types.ts
@@ -13,11 +13,14 @@ import type {
CollectionItemId,
CollectionPickerItem,
} from "../CollectionPicker";
+import type { TablePickerValueItem } from "../TablePicker";
-export type QuestionPickerModel = Extract<
- CollectionPickerItem["model"],
- "card" | "dataset" | "metric" | "collection"
->;
+export type QuestionPickerModel =
+ | Extract<
+ CollectionPickerItem["model"],
+ "card" | "dataset" | "metric" | "collection" | "dashboard"
+ >
+ | "table";
export type QuestionPickerValueModel = Extract<
CollectionPickerItem["model"],
"card" | "dataset" | "metric"
@@ -29,12 +32,12 @@ export type QuestionPickerValueItem = CollectionPickerItem & {
};
// we could tighten this up in the future, but there's relatively little value to it
-export type QuestionPickerItem = CollectionPickerItem;
+export type QuestionPickerItem = CollectionPickerItem | TablePickerValueItem;
export type QuestionPickerValue = Pick<QuestionPickerItem, "id" | "model">;
-
export type QuestionPickerOptions = EntityPickerModalOptions & {
showPersonalCollections?: boolean;
showRootCollection?: boolean;
+ showLibrary?: boolean;
};
export type QuestionItemListProps = ListProps<
diff --git a/frontend/src/metabase/common/components/Pickers/QuestionPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/QuestionPicker/utils.ts
index 40ad9951ed7..25fccf25241 100644
--- a/frontend/src/metabase/common/components/Pickers/QuestionPicker/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/QuestionPicker/utils.ts
@@ -1,26 +1,45 @@
import _ from "underscore";
-import type { Card, CardType, CollectionItemModel } from "metabase-types/api";
+import type { Card, CardType } from "metabase-types/api";
+
+import type { CollectionPickerItem } from "../CollectionPicker";
+import {
+ type TablePickerFolderItem,
+ type TablePickerItem,
+ isTablePickerFolder,
+ isTablePickerItem,
+} from "../TablePicker";
import type {
QuestionPickerItem,
+ QuestionPickerModel,
QuestionPickerValue,
QuestionPickerValueModel,
} from "./types";
export const isFolder = (
item: QuestionPickerItem,
- models: CollectionItemModel[],
+ models: QuestionPickerModel[],
) => {
return (
item.id === "root" ||
- item.is_personal ||
+ (item as CollectionPickerItem).is_personal ||
((item?.model === "collection" || item?.model === "dashboard") &&
_.intersection([...(item?.below ?? []), ...(item?.here ?? [])], models)
.length > 0)
);
};
+export const isTablePickerFolderOrQuestionPickerFolder = (
+ item: QuestionPickerItem | TablePickerItem,
+ models: QuestionPickerModel[],
+): item is TablePickerFolderItem | QuestionPickerItem => {
+ if (isTablePickerItem(item)) {
+ return isTablePickerFolder(item);
+ }
+ return isFolder(item, models);
+};
+
export const getQuestionPickerValue = ({
id,
type,
diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/DatabaseList.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/DatabaseList.tsx
index c3fb9a85653..d2c506a5c29 100644
--- a/frontend/src/metabase/common/components/Pickers/TablePicker/DatabaseList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/DatabaseList.tsx
@@ -53,17 +53,6 @@ export const DatabaseList = ({
selectedItem={selectedItem}
onClick={onClick}
shouldDisableItem={(item) => shouldDisableItem?.(item) || false}
- containerProps={{
- pb: "1rem",
- }}
- navLinkProps={(isSelected) => ({
- px: "1.5rem",
- py: "1.25rem",
- rightSection: null,
- style: {
- border: isSelected ? undefined : "1px solid var(--mb-color-border)",
- },
- })}
/>
</ListBox>
);
diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/SchemaList.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/SchemaList.tsx
index 51adee9ff38..99c2b4fadb0 100644
--- a/frontend/src/metabase/common/components/Pickers/TablePicker/SchemaList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/SchemaList.tsx
@@ -48,7 +48,7 @@ export const SchemaList = ({
}
return (
- <ListBox data-testid="item-picker-level-1">
+ <ListBox data-testid="item-picker-level-2">
<ItemList
error={error}
isCurrentLevel={isCurrentLevel}
diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx
index 2c42def9623..5b52fb0dbf4 100644
--- a/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/TableList.tsx
@@ -38,7 +38,7 @@ export const TableList = ({
}, [tables]);
return (
- <ListBox data-testid="item-picker-level-2">
+ <ListBox data-testid="item-picker-level-3">
<ItemList
error={error}
isCurrentLevel={isCurrentLevel}
diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/TablePicker.tsx b/frontend/src/metabase/common/components/Pickers/TablePicker/TablePicker.tsx
index 2b9d80405bc..ecc4e4c51e6 100644
--- a/frontend/src/metabase/common/components/Pickers/TablePicker/TablePicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/TablePicker.tsx
@@ -11,8 +11,6 @@ import { isNotNull } from "metabase/lib/types";
import { Flex } from "metabase/ui";
import type { DatabaseId, SchemaName, TableId } from "metabase-types/api";
-import { AutoScrollBox } from "../../EntityPicker";
-
import { DatabaseList } from "./DatabaseList";
import { SchemaList } from "./SchemaList";
import { TableList } from "./TableList";
@@ -23,14 +21,14 @@ import type {
TablePickerStatePath,
TablePickerValue,
} from "./types";
-import { generateKey, getDbItem, getSchemaItem, getTableItem } from "./utils";
+import { getDbItem, getSchemaItem, getTableItem } from "./utils";
interface Props {
/**
* Limit selection to a particular database
*/
databaseId?: DatabaseId;
- path: TablePickerStatePath | undefined;
+ path?: TablePickerStatePath | undefined;
value: TablePickerValue | undefined;
onItemSelect: (value: TablePickerItem) => void;
onPathChange: (path: TablePickerStatePath) => void;
@@ -169,8 +167,15 @@ export const TablePicker = ({
const hasDbs = !isLoadingDatabases && databases && databases.length > 0;
if (hasDbs && !selectedDbItem) {
- const firstDatabase = databases[0];
- const item = getDbItem(databases, firstDatabase.id);
+ const firstDatabase = shouldDisableItem
+ ? databases.find(
+ (db) => !shouldDisableItem({ ...db, model: "database" }),
+ )
+ : databases[0];
+
+ const item = firstDatabase
+ ? getDbItem(databases, firstDatabase.id)
+ : undefined;
if (item) {
handleFolderSelectRef.current(item);
@@ -183,6 +188,7 @@ export const TablePicker = ({
databases,
handleFolderSelectRef,
selectedDbItem,
+ shouldDisableItem,
],
);
@@ -240,54 +246,45 @@ export const TablePicker = ({
);
return (
- <AutoScrollBox
- contentHash={generateKey(
- selectedDbItem,
- selectedSchemaItem,
- selectedTableItem,
+ <Flex h="100%" w="fit-content">
+ {!databaseId && (
+ <DatabaseList
+ databases={databases}
+ error={errorDatabases}
+ isCurrentLevel={
+ schemaName == null || (schemas?.length === 1 && !tableId)
+ }
+ isLoading={isLoadingDatabases}
+ selectedItem={selectedDbItem}
+ onClick={handleFolderSelect}
+ shouldDisableItem={shouldDisableItem}
+ />
)}
- data-testid="nested-item-picker"
- >
- <Flex h="100%" w="fit-content">
- {!databaseId && (
- <DatabaseList
- databases={databases}
- error={errorDatabases}
- isCurrentLevel={
- schemaName == null || (schemas?.length === 1 && !tableId)
- }
- isLoading={isLoadingDatabases}
- selectedItem={selectedDbItem}
- onClick={handleFolderSelect}
- shouldDisableItem={shouldDisableItem}
- />
- )}
- {isNotNull(dbId) && (
- <SchemaList
- dbId={dbId}
- dbName={selectedDbItem?.name}
- error={errorSchemas}
- isCurrentLevel={!tableId}
- isLoading={isLoadingSchemas}
- schemas={isLoadingSchemas ? undefined : schemas}
- selectedItem={selectedSchemaItem}
- onClick={handleFolderSelect}
- />
- )}
+ {isNotNull(dbId) && (
+ <SchemaList
+ dbId={dbId}
+ dbName={selectedDbItem?.name}
+ error={errorSchemas}
+ isCurrentLevel={!tableId}
+ isLoading={isLoadingSchemas}
+ schemas={isLoadingSchemas ? undefined : schemas}
+ selectedItem={selectedSchemaItem}
+ onClick={handleFolderSelect}
+ />
+ )}
- {isNotNull(schemaName) && (
- <TableList
- error={errorTables}
- isCurrentLevel
- isLoading={isLoadingTables}
- selectedItem={selectedTableItem}
- tables={isLoadingTables ? undefined : tables}
- onClick={handleTableSelect}
- shouldDisableItem={shouldDisableItem}
- />
- )}
- </Flex>
- </AutoScrollBox>
+ {isNotNull(schemaName) && (
+ <TableList
+ error={errorTables}
+ isCurrentLevel
+ isLoading={isLoadingTables}
+ selectedItem={selectedTableItem}
+ tables={isLoadingTables ? undefined : tables}
+ onClick={handleTableSelect}
+ shouldDisableItem={shouldDisableItem}
+ />
+ )}
+ </Flex>
);
};
diff --git a/frontend/src/metabase/common/components/Pickers/TablePicker/types.ts b/frontend/src/metabase/common/components/Pickers/TablePicker/types.ts
index 2d822fe8ac5..590f1c0446c 100644
--- a/frontend/src/metabase/common/components/Pickers/TablePicker/types.ts
+++ b/frontend/src/metabase/common/components/Pickers/TablePicker/types.ts
@@ -1,5 +1,8 @@
import type { DatabaseId, SchemaName, TableId } from "metabase-types/api";
+import type { CollectionPickerItem } from "../CollectionPicker";
+import type { QuestionPickerItem } from "../QuestionPicker";
+
export type DatabaseItem = {
id: DatabaseId;
name: string;
@@ -41,3 +44,19 @@ export type TablePickerValueItem = TableItem;
export type TablePickerFolderItem = DatabaseItem | SchemaItem;
export type TablePickerItem = TablePickerValueItem | TablePickerFolderItem;
+
+export const isTablePickerValue = (
+ input?: Pick<QuestionPickerItem, "model" | "id">,
+): input is TablePickerValue => input?.model === "table";
+
+export const isTablePickerFolder = (
+ input?: TablePickerItem | CollectionPickerItem,
+): input is TablePickerFolderItem =>
+ input?.model === "database" || input?.model === "schema";
+
+export const isTablePickerItem = (
+ input?: TablePickerItem | CollectionPickerItem,
+): input is TablePickerItem =>
+ input?.model === "database" ||
+ input?.model === "schema" ||
+ input?.model === "table";
diff --git a/frontend/src/metabase/common/components/Pickers/hooks.ts b/frontend/src/metabase/common/components/Pickers/hooks.ts
index 08146a8616b..a6821a83e4f 100644
--- a/frontend/src/metabase/common/components/Pickers/hooks.ts
+++ b/frontend/src/metabase/common/components/Pickers/hooks.ts
@@ -5,17 +5,21 @@ import {
useGetDashboardQuery,
} from "metabase/api";
import { isValidCollectionId } from "metabase/collections/utils";
+import { DATABASES_COLLECTION } from "metabase/entities/collections";
+import type { Collection } from "metabase-types/api";
-import type { CollectionPickerItem } from "./CollectionPicker";
+import type { QuestionPickerItem } from "./QuestionPicker";
+import type { TablePickerValue } from "./TablePicker";
export const useGetInitialContainer = (
- initialValue?: Pick<CollectionPickerItem, "model" | "id">,
+ initialValue?: Pick<QuestionPickerItem, "model" | "id"> | TablePickerValue,
) => {
// Figure out what we're working with
const isQuestion =
initialValue && ["card", "dataset", "metric"].includes(initialValue.model);
const isCollection = initialValue?.model === "collection";
const isDashboard = initialValue?.model === "dashboard";
+ const isTable = initialValue?.model === "table";
// Determine the IDs of the things we care about
const cardId = isQuestion ? Number(initialValue.id) : undefined;
@@ -26,6 +30,10 @@ export const useGetInitialContainer = (
: "root"
: undefined;
+ const databasesCollection = isTable
+ ? (DATABASES_COLLECTION as Collection)
+ : undefined;
+
// Fetch the initial value's entity
const {
data: currentCollection,
@@ -81,6 +89,7 @@ export const useGetInitialContainer = (
return {
currentQuestion: currentQuestion,
currentCollection:
+ databasesCollection ??
currentQuestionCollection ??
currentDashboardCollection ??
currentCollection,
diff --git a/frontend/src/metabase/common/components/Pickers/utils.ts b/frontend/src/metabase/common/components/Pickers/utils.ts
index 4dc996de7fd..4224fe43123 100644
--- a/frontend/src/metabase/common/components/Pickers/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/utils.ts
@@ -16,7 +16,7 @@ import type {
export const getCollectionIdPath = (
collection: Pick<
CollectionPickerItem,
- "id" | "location" | "is_personal" | "effective_location" | "model"
+ "id" | "location" | "is_personal" | "effective_location" | "model" | "type"
>,
userPersonalCollectionId?: CollectionId,
): CollectionId[] => {
@@ -24,6 +24,14 @@ export const getCollectionIdPath = (
return ["root"];
}
+ if (collection.id === "databases") {
+ return ["databases"];
+ }
+
+ if (collection.type === "library") {
+ return [collection.id];
+ }
+
if (collection.id === PERSONAL_COLLECTIONS.id) {
return ["personal"];
}
@@ -42,10 +50,14 @@ export const getCollectionIdPath = (
(collection.id === userPersonalCollectionId ||
pathFromRoot.includes(userPersonalCollectionId));
+ const isInSemanticLayerCollection = collection?.type?.includes("library");
+
const id = collection.model === "collection" ? collection.id : -collection.id;
if (isInUserPersonalCollection) {
return [...pathFromRoot, id];
+ } else if (isInSemanticLayerCollection) {
+ return [...pathFromRoot, id];
} else if (collection.is_personal) {
return ["personal", ...pathFromRoot, id];
} else {
diff --git a/frontend/src/metabase/common/components/Pickers/utils.unit.spec.ts b/frontend/src/metabase/common/components/Pickers/utils.unit.spec.ts
index 718fc8c4d1e..455755b41e1 100644
--- a/frontend/src/metabase/common/components/Pickers/utils.unit.spec.ts
+++ b/frontend/src/metabase/common/components/Pickers/utils.unit.spec.ts
@@ -16,6 +16,22 @@ describe("getCollectionIdPath", () => {
expect(path).toEqual([1337]);
});
+ it("should handle the library collections", () => {
+ const path = getCollectionIdPath(
+ {
+ id: 5,
+ location: "/6/",
+ effective_location: "/6/",
+ is_personal: true,
+ model: "collection",
+ type: "library-metrics",
+ },
+ 1337,
+ );
+
+ expect(path).toEqual([6, 5]);
+ });
+
it("should handle subcollections of the current user's personal collection", () => {
const path = getCollectionIdPath(
{
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx
index 3541c79fa6c..3f42c74b0e7 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx
@@ -2,6 +2,7 @@ import cx from "classnames";
import { c, t } from "ttag";
import { FormCollectionAndDashboardPicker } from "metabase/collections/containers/FormCollectionAndDashboardPicker";
+import { getEntityTypeFromCardType } from "metabase/collections/utils";
import { FormFooter } from "metabase/common/components/FormFooter";
import type { CollectionPickerModel } from "metabase/common/components/Pickers/CollectionPicker";
import { getPlaceholder } from "metabase/common/components/SaveQuestionForm/util";
@@ -123,6 +124,7 @@ export const SaveQuestionForm = ({
collectionIdFieldName="collection_id"
dashboardIdFieldName="dashboard_id"
title={t`Where do you want to save this?`}
+ entityType={getEntityTypeFromCardType(question.type())}
collectionPickerModalProps={{
models,
recentFilter: (items) =>
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx
index 40fe578cc4b..d56abc7934b 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx
@@ -11,7 +11,11 @@ import {
import { getCurrentUser } from "metabase/admin/datamodel/selectors";
import { useListRecentsQuery } from "metabase/api";
import { useGetDefaultCollectionId } from "metabase/collections/hooks";
-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
+import {
+ canPlaceEntityInCollection,
+ getEntityTypeFromCardType,
+ isInstanceAnalyticsCollection,
+} from "metabase/collections/utils";
import { FormProvider } from "metabase/forms";
import { useSelector } from "metabase/lib/redux";
import { isNotNull } from "metabase/lib/types";
@@ -111,6 +115,15 @@ export const SaveQuestionProvider = ({
// analytics questions should not default to saving in dashboard
const isAnalytics = isInstanceAnalyticsCollection(question.collection());
+ const entityType = getEntityTypeFromCardType(question.type());
+
+ const isValidLastSelectedCollection =
+ lastSelectedCollection &&
+ canPlaceEntityInCollection(
+ entityType,
+ lastSelectedCollection.collection_type,
+ );
+
const initialDashboardId =
question.type() === "question" &&
!isAnalytics &&
@@ -124,7 +137,7 @@ export const SaveQuestionProvider = ({
(!isAnalytics
? lastSelectedDashboard?.parent_collection.id
: defaultCollectionId) ??
- lastSelectedCollection?.id ??
+ (isValidLastSelectedCollection ? lastSelectedCollection?.id : undefined) ??
defaultCollectionId;
const initialValues: FormValues = useMemo(
diff --git a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx
index 8a3f5e8a066..f90e197fb40 100644
--- a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx
@@ -8,6 +8,7 @@ import {
setupCollectionItemsEndpoint,
setupCollectionsEndpoints,
setupDashboardEndpoints,
+ setupLibraryEndpoints,
setupRecentViewsAndSelectionsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
@@ -119,6 +120,7 @@ const setup = async (
});
setupDashboardEndpoints(FOO_DASH);
setupDashboardEndpoints(BAR_DASH);
+ setupLibraryEndpoints();
setupRecentViewsAndSelectionsEndpoints([], ["selections"]);
setupRecentViewsAndSelectionsEndpoints(
diff --git a/frontend/src/metabase/common/components/VirtualizedList/VariableHeightVirtualizedList.tsx b/frontend/src/metabase/common/components/VirtualizedList/VariableHeightVirtualizedList.tsx
index a33381130d8..b4c3491ec67 100644
--- a/frontend/src/metabase/common/components/VirtualizedList/VariableHeightVirtualizedList.tsx
+++ b/frontend/src/metabase/common/components/VirtualizedList/VariableHeightVirtualizedList.tsx
@@ -16,11 +16,13 @@ export function VirtualizedList({
children,
Wrapper = Box,
estimatedItemSize = 32,
+ extraPadding = 0, // sometimes needed to prevent unnecessary scrollbars
scrollTo,
}: {
children: React.ReactNode[];
Wrapper?: React.JSXElementConstructor<any>;
estimatedItemSize?: number;
+ extraPadding?: number;
scrollTo?: number;
}) {
const parentRef = useRef(null);
@@ -57,7 +59,7 @@ export function VirtualizedList({
>
<div
style={{
- height: virtualizer.getTotalSize(),
+ height: virtualizer.getTotalSize() + extraPadding,
position: "relative",
}}
>
diff --git a/frontend/src/metabase/common/components/tree/Tree.tsx b/frontend/src/metabase/common/components/tree/Tree.tsx
index 220fa70490d..00c3ee78d69 100644
--- a/frontend/src/metabase/common/components/tree/Tree.tsx
+++ b/frontend/src/metabase/common/components/tree/Tree.tsx
@@ -3,31 +3,39 @@ import * as React from "react";
import { usePrevious } from "react-use";
import _ from "underscore";
+import type { BoxProps } from "metabase/ui";
+
import { TreeNode as DefaultTreeNode } from "./TreeNode";
import { TreeNodeList } from "./TreeNodeList";
import type { ITreeNodeItem } from "./types";
import { getInitialExpandedIds } from "./utils";
-interface TreeProps {
- data: ITreeNodeItem[];
- selectedId?: ITreeNodeItem["id"];
- role?: string;
+interface TreeProps<TData = unknown> extends Omit<BoxProps, "children"> {
+ data: ITreeNodeItem<TData>[];
+ selectedId?: ITreeNodeItem<TData>["id"];
emptyState?: React.ReactNode;
- onSelect?: (item: ITreeNodeItem) => void;
- rightSection?: (item: ITreeNodeItem) => React.ReactNode;
- TreeNode?: any; // This was previously set to TreeNodeComponent, but after upgrading to react 18, the type no longer played nice with forward ref compontents, including styled components
+ initialExpandedIds?: ITreeNodeItem<TData>["id"][];
+ role?: string;
+ onSelect?: (item: ITreeNodeItem<TData>) => void;
+ rightSection?: (item: ITreeNodeItem<TData>) => React.ReactNode;
+ TreeNode?: any;
}
-function BaseTree({
+function BaseTree<TData = unknown>({
data,
selectedId,
role = "menu",
emptyState = null,
+ initialExpandedIds,
onSelect,
TreeNode = DefaultTreeNode,
rightSection,
-}: TreeProps) {
+ ...boxProps
+}: TreeProps<TData>) {
const [expandedIds, setExpandedIds] = useState(() => {
+ if (initialExpandedIds) {
+ return new Set(initialExpandedIds);
+ }
return new Set(
selectedId != null ? getInitialExpandedIds(selectedId, data) : [],
);
@@ -70,8 +78,8 @@ function BaseTree({
return (
<TreeNodeList
- items={data}
role={role}
+ items={data}
TreeNode={TreeNode}
expandedIds={expandedIds}
selectedId={selectedId}
@@ -79,6 +87,7 @@ function BaseTree({
onSelect={onSelect}
onToggleExpand={handleToggleExpand}
rightSection={rightSection}
+ {...boxProps}
/>
);
}
diff --git a/frontend/src/metabase/common/components/tree/TreeNodeList.styled.tsx b/frontend/src/metabase/common/components/tree/TreeNodeList.styled.tsx
deleted file mode 100644
index 5f7d857d282..00000000000
--- a/frontend/src/metabase/common/components/tree/TreeNodeList.styled.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const ListRoot = styled.ul``;
diff --git a/frontend/src/metabase/common/components/tree/TreeNodeList.tsx b/frontend/src/metabase/common/components/tree/TreeNodeList.tsx
index e7df12741db..cbd82b432a0 100644
--- a/frontend/src/metabase/common/components/tree/TreeNodeList.tsx
+++ b/frontend/src/metabase/common/components/tree/TreeNodeList.tsx
@@ -1,27 +1,26 @@
import { Fragment } from "react";
import { useScrollOnMount } from "metabase/common/hooks/use-scroll-on-mount";
+import type { BoxProps } from "metabase/ui";
+import { Box } from "metabase/ui";
-import { ListRoot } from "./TreeNodeList.styled";
import type { ITreeNodeItem, TreeNodeComponent } from "./types";
-interface TreeNodeListProps {
- items: ITreeNodeItem[];
- expandedIds: Set<ITreeNodeItem["id"]>;
- selectedId?: ITreeNodeItem["id"];
+interface TreeNodeListProps<TData = unknown>
+ extends Omit<BoxProps, "children"> {
+ items: ITreeNodeItem<TData>[];
+ expandedIds: Set<ITreeNodeItem<TData>["id"]>;
+ selectedId?: ITreeNodeItem<TData>["id"];
depth: number;
role?: string;
- className?: string;
- onToggleExpand: (id: ITreeNodeItem["id"]) => void;
- onSelect?: (item: ITreeNodeItem) => void;
- TreeNode: TreeNodeComponent;
- rightSection?: (item: ITreeNodeItem) => React.ReactNode;
+ onToggleExpand: (id: ITreeNodeItem<TData>["id"]) => void;
+ onSelect?: (item: ITreeNodeItem<TData>) => void;
+ TreeNode: TreeNodeComponent<TData>;
+ rightSection?: (item: ITreeNodeItem<TData>) => React.ReactNode;
}
-function BaseTreeNodeList({
+function BaseTreeNodeList<TData = unknown>({
items,
- role,
- className,
expandedIds,
selectedId,
depth,
@@ -29,11 +28,13 @@ function BaseTreeNodeList({
onToggleExpand,
TreeNode,
rightSection,
-}: TreeNodeListProps) {
+ role,
+ ...boxProps
+}: TreeNodeListProps<TData>) {
const selectedRef = useScrollOnMount();
return (
- <ListRoot className={className} role={role}>
+ <Box component="ul" role={role} {...boxProps}>
{items.map((item) => {
const isSelected = selectedId === item.id;
const hasChildren =
@@ -71,10 +72,8 @@ function BaseTreeNodeList({
</Fragment>
);
})}
- </ListRoot>
+ </Box>
);
}
-export const TreeNodeList = Object.assign(BaseTreeNodeList, {
- Root: ListRoot,
-});
+export const TreeNodeList = BaseTreeNodeList;
diff --git a/frontend/src/metabase/common/components/tree/VirtualizedTree.module.css b/frontend/src/metabase/common/components/tree/VirtualizedTree.module.css
new file mode 100644
index 00000000000..2d3e92e60a5
--- /dev/null
+++ b/frontend/src/metabase/common/components/tree/VirtualizedTree.module.css
@@ -0,0 +1,19 @@
+.scrollContainer {
+ flex: 1;
+ overflow: auto;
+ padding: 0 1.5rem 1rem;
+}
+
+.listContainer {
+ position: relative;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.listItem {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+}
diff --git a/frontend/src/metabase/common/components/tree/VirtualizedTree.tsx b/frontend/src/metabase/common/components/tree/VirtualizedTree.tsx
new file mode 100644
index 00000000000..e69f9bf7b9a
--- /dev/null
+++ b/frontend/src/metabase/common/components/tree/VirtualizedTree.tsx
@@ -0,0 +1,212 @@
+import { useVirtualizer } from "@tanstack/react-virtual";
+import cx from "classnames";
+import { useCallback, useEffect, useRef, useState } from "react";
+import * as React from "react";
+import { usePrevious } from "react-use";
+
+import type { BoxProps } from "metabase/ui";
+import { Box } from "metabase/ui";
+
+import { TreeNode as DefaultTreeNode } from "./TreeNode";
+import S from "./VirtualizedTree.module.css";
+import type { ITreeNodeItem, TreeNodeProps } from "./types";
+import { getAllExpandableIds, getInitialExpandedIds } from "./utils";
+
+interface VirtualizedTreeProps extends Omit<BoxProps, "data" | "onSelect"> {
+ data: ITreeNodeItem[];
+ selectedId?: ITreeNodeItem["id"];
+ role?: string;
+ emptyState?: React.ReactNode;
+ initiallyExpanded?: boolean;
+ onSelect?: (item: ITreeNodeItem) => void;
+ rightSection?: (item: ITreeNodeItem) => React.ReactNode;
+ TreeNode?: React.ComponentType<React.PropsWithChildren<TreeNodeProps>>;
+ estimateSize?: number | ((item: ITreeNodeItem) => number);
+}
+
+interface FlatTreeItem {
+ item: ITreeNodeItem;
+ depth: number;
+ hasChildren: boolean;
+ isExpanded: boolean;
+}
+
+const ITEM_HEIGHT = 36;
+
+function flattenTree(
+ nodes: ITreeNodeItem[],
+ expandedIds: Set<ITreeNodeItem["id"]>,
+ depth = 0,
+): FlatTreeItem[] {
+ const result: FlatTreeItem[] = [];
+
+ for (const node of nodes) {
+ const hasChildren = Boolean(node.children && node.children.length > 0);
+ const isExpanded = hasChildren && expandedIds.has(node.id);
+
+ result.push({
+ item: node,
+ depth,
+ hasChildren,
+ isExpanded,
+ });
+
+ if (isExpanded && node.children) {
+ result.push(...flattenTree(node.children, expandedIds, depth + 1));
+ }
+ }
+
+ return result;
+}
+
+export function VirtualizedTree({
+ data,
+ selectedId,
+ role = "menu",
+ emptyState = null,
+ initiallyExpanded = false,
+ onSelect,
+ TreeNode = DefaultTreeNode,
+ estimateSize = ITEM_HEIGHT,
+ rightSection,
+ ...boxProps
+}: VirtualizedTreeProps) {
+ const [expandedIds, setExpandedIds] = useState(() => {
+ if (initiallyExpanded) {
+ return new Set(getAllExpandableIds(data));
+ }
+ return new Set(
+ selectedId != null ? getInitialExpandedIds(selectedId, data) : [],
+ );
+ });
+
+ const previousSelectedId = usePrevious(selectedId);
+ const prevData = usePrevious(data);
+
+ useEffect(() => {
+ if (initiallyExpanded && data !== prevData) {
+ setExpandedIds(new Set(getAllExpandableIds(data)));
+ return;
+ }
+
+ if (!selectedId) {
+ return;
+ }
+ const selectedItemChanged =
+ previousSelectedId !== selectedId && !expandedIds.has(selectedId);
+ if (selectedItemChanged || data !== prevData) {
+ setExpandedIds(
+ (prev) =>
+ new Set([...prev, ...getInitialExpandedIds(selectedId, data)]),
+ );
+ }
+ }, [
+ prevData,
+ data,
+ selectedId,
+ previousSelectedId,
+ expandedIds,
+ initiallyExpanded,
+ ]);
+
+ const handleToggleExpand = useCallback(
+ (itemId: string | number) => {
+ if (expandedIds.has(itemId)) {
+ setExpandedIds(
+ (prev) => new Set([...prev].filter((id) => id !== itemId)),
+ );
+ } else {
+ setExpandedIds((prev) => new Set([...prev, itemId]));
+ }
+ },
+ [expandedIds],
+ );
+
+ const flatItems = flattenTree(data, expandedIds);
+ const parentRef = useRef<HTMLDivElement>(null);
+
+ const getScrollElement = useCallback(() => parentRef.current, []);
+ const getEstimateSize = useCallback(
+ (index: number) => {
+ if (typeof estimateSize === "number") {
+ return estimateSize;
+ }
+
+ if (typeof estimateSize === "function") {
+ const item = flatItems[index];
+
+ return item ? estimateSize(item.item) : ITEM_HEIGHT;
+ }
+ return ITEM_HEIGHT;
+ },
+ [estimateSize, flatItems],
+ );
+
+ const virtualizer = useVirtualizer({
+ count: flatItems.length,
+ getScrollElement,
+ estimateSize: getEstimateSize,
+ overscan: 5,
+ });
+
+ const virtualItems = virtualizer.getVirtualItems();
+ const previouslySelectedId = usePrevious(selectedId);
+
+ useEffect(() => {
+ if (selectedId === undefined || selectedId === previouslySelectedId) {
+ return;
+ }
+ const index = flatItems.findIndex(
+ (flatItem) => flatItem.item.id === selectedId,
+ );
+ if (index !== -1) {
+ virtualizer.scrollToIndex(index, { align: "auto" });
+ }
+ }, [selectedId, previouslySelectedId, flatItems, virtualizer]);
+
+ if (data.length === 0) {
+ return <React.Fragment>{emptyState}</React.Fragment>;
+ }
+
+ return (
+ <Box
+ ref={parentRef}
+ className={cx(S.scrollContainer, boxProps.className)}
+ {...boxProps}
+ >
+ <Box
+ component="ul"
+ role={role}
+ className={S.listContainer}
+ style={{ height: virtualizer.getTotalSize() }}
+ >
+ {virtualItems.map((virtualRow) => {
+ const flatItem = flatItems[virtualRow.index];
+ const { item, depth, hasChildren, isExpanded } = flatItem;
+ const isSelected = selectedId === item.id;
+
+ return (
+ <div
+ key={virtualRow.key}
+ data-index={virtualRow.index}
+ className={S.listItem}
+ style={{ transform: `translateY(${virtualRow.start}px)` }}
+ ref={virtualizer.measureElement}
+ >
+ <TreeNode
+ item={item}
+ onSelect={onSelect ? () => onSelect(item) : undefined}
+ onToggleExpand={() => handleToggleExpand(item.id)}
+ isSelected={isSelected}
+ isExpanded={isExpanded}
+ hasChildren={hasChildren}
+ depth={depth}
+ rightSection={rightSection}
+ />
+ </div>
+ );
+ })}
+ </Box>
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/common/components/tree/types.ts b/frontend/src/metabase/common/components/tree/types.ts
index d122801b6b2..ec3b78b8ba1 100644
--- a/frontend/src/metabase/common/components/tree/types.ts
+++ b/frontend/src/metabase/common/components/tree/types.ts
@@ -2,24 +2,33 @@ import type * as React from "react";
import type { IconName, IconProps } from "metabase/ui";
-export interface ITreeNodeItem {
+export interface ITreeNodeItem<TData = unknown> {
id: string | number;
name: string;
icon: IconName | IconProps;
- children?: ITreeNodeItem[];
+ children?: ITreeNodeItem<TData>[];
+ data?: TData;
}
-export interface TreeNodeProps {
- item: ITreeNodeItem;
+export interface TreeNodeProps<TData = unknown> {
+ item: ITreeNodeItem<TData>;
depth: number;
hasChildren: boolean;
isExpanded: boolean;
isSelected: boolean;
- rightSection?: (item: ITreeNodeItem) => React.ReactNode;
+ rightSection?: (item: ITreeNodeItem<TData>) => React.ReactNode;
onSelect?: () => void;
onToggleExpand: () => void;
+ className?: string;
+ classNames?: {
+ root?: string;
+ expandToggleButton?: string;
+ iconContainer?: string;
+ };
}
-export type TreeNodeComponent = React.ComponentType<
- React.PropsWithChildren<TreeNodeProps & React.RefAttributes<HTMLLIElement>>
+export type TreeNodeComponent<TData = unknown> = React.ComponentType<
+ React.PropsWithChildren<
+ TreeNodeProps<TData> & React.RefAttributes<HTMLLIElement>
+ >
>;
diff --git a/frontend/src/metabase/common/components/tree/utils.tsx b/frontend/src/metabase/common/components/tree/utils.tsx
index e12b6fba33e..9e368409642 100644
--- a/frontend/src/metabase/common/components/tree/utils.tsx
+++ b/frontend/src/metabase/common/components/tree/utils.tsx
@@ -18,3 +18,21 @@ export const getInitialExpandedIds = (
return [];
})
.flat();
+
+export const getAllExpandableIds = (
+ nodes: ITreeNodeItem[],
+): ITreeNodeItem["id"][] => {
+ const ids: ITreeNodeItem["id"][] = [];
+
+ const traverse = (items: ITreeNodeItem[]) => {
+ for (const item of items) {
+ if (item.children && item.children.length > 0) {
+ ids.push(item.id);
+ traverse(item.children);
+ }
+ }
+ };
+
+ traverse(nodes);
+ return ids;
+};
diff --git a/frontend/src/metabase/common/hooks/use-is-truncated.ts b/frontend/src/metabase/common/hooks/use-is-truncated.ts
index 115dc915a3a..6b15b894712 100644
--- a/frontend/src/metabase/common/hooks/use-is-truncated.ts
+++ b/frontend/src/metabase/common/hooks/use-is-truncated.ts
@@ -5,10 +5,12 @@ import resizeObserver from "metabase/lib/resize-observer";
type UseIsTruncatedProps = {
disabled?: boolean;
+ ignoreHeightTruncation?: boolean;
};
export const useIsTruncated = <E extends Element>({
disabled = false,
+ ignoreHeightTruncation = false,
}: UseIsTruncatedProps = {}) => {
const ref = useRef<E | null>(null);
const [isTruncated, setIsTruncated] = useState(false);
@@ -21,7 +23,7 @@ export const useIsTruncated = <E extends Element>({
}
const handleResize = () => {
- setIsTruncated(getIsTruncated(element));
+ setIsTruncated(getIsTruncated(element, ignoreHeightTruncation));
};
handleResize();
@@ -30,17 +32,24 @@ export const useIsTruncated = <E extends Element>({
return () => {
resizeObserver.unsubscribe(element, handleResize);
};
- }, [disabled]);
+ }, [disabled, ignoreHeightTruncation]);
return { isTruncated, ref };
};
-const getIsTruncated = (element: Element): boolean => {
+const getIsTruncated = (
+ element: Element,
+ ignoreHeightTruncation = false,
+): boolean => {
const range = document.createRange();
range.selectNodeContents(element);
const elementRect = element.getBoundingClientRect();
const rangeRect = range.getBoundingClientRect();
+ if (ignoreHeightTruncation) {
+ return rangeRect.width > elementRect.width;
+ }
+
return (
rangeRect.height > elementRect.height || rangeRect.width > elementRect.width
);
@@ -48,6 +57,7 @@ const getIsTruncated = (element: Element): boolean => {
export const useAreAnyTruncated = <E extends Element>({
disabled = false,
+ ignoreHeightTruncation = false,
}: UseIsTruncatedProps = {}) => {
const ref = useRef(new Map<string, E>());
const [truncationStatusByKey, setTruncationStatusByKey] = useState<
@@ -64,7 +74,7 @@ export const useAreAnyTruncated = <E extends Element>({
[...elementsMap.entries()].forEach(([elementKey, element]) => {
const handleResize = () => {
- const isTruncated = getIsTruncated(element);
+ const isTruncated = getIsTruncated(element, ignoreHeightTruncation);
setTruncationStatusByKey((statuses) => {
const newStatuses = new Map(statuses);
newStatuses.set(elementKey, isTruncated);
@@ -81,7 +91,7 @@ export const useAreAnyTruncated = <E extends Element>({
return () => {
unsubscribeFns.forEach((fn) => fn());
};
- }, [disabled]);
+ }, [disabled, ignoreHeightTruncation]);
const areAnyTruncated = [...truncationStatusByKey.values()].some(Boolean);
return { areAnyTruncated, ref };
diff --git a/frontend/src/metabase/common/hooks/use-user-key-value.ts b/frontend/src/metabase/common/hooks/use-user-key-value.ts
index b58779ffc3a..f3f477c1157 100644
--- a/frontend/src/metabase/common/hooks/use-user-key-value.ts
+++ b/frontend/src/metabase/common/hooks/use-user-key-value.ts
@@ -63,6 +63,8 @@ export function useUserKeyValue<T extends UserKeyValue>({
const isMutating = setMutationReq.isLoading || clearMutationReq.isLoading;
const error = fetchError ?? setMutationReq.error ?? clearMutationReq.error;
+ // 2025-11-10 @chodorowicz:
+ // valueFromQuery for non-existing keys is "", so the default value is not returned
return {
value: user ? (valueFromQuery ?? defaultValue) : defaultValue,
setValue,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
index 85c1198ab54..8585f4054aa 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
@@ -157,7 +157,7 @@ export function DashboardHeaderView({
top={2}
>
<PLUGIN_MODERATION.EntityModerationIcon
- dashboard={dashboard}
+ moderationReviews={dashboard.moderation_reviews}
/>
<PLUGIN_COLLECTION_COMPONENTS.CollectionInstanceAnalyticsIcon
color="brand"
diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx
index f2657511fa0..84c9bf57287 100644
--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx
@@ -42,6 +42,7 @@ function DashboardMoveModal({
onClose={onClose}
initialCollectionId={dashboard.collection_id ?? "root"}
canMoveToDashboard={false}
+ entityType="dashboard"
onMove={async (destination) => {
await setDashboardCollection({ id: dashboard.id }, destination, {
notify: {
diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsx
index 93746beb25e..f995e654acd 100644
--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsx
+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsx
@@ -71,6 +71,7 @@ export const ArchiveDashboardModalConnected = _.compose(
}),
Collections.load({
id: (state, props) => props.dashboard && props.dashboard.collection_id,
+ loadingAndErrorWrapper: false,
}),
withRouter,
)(ArchiveDashboardModal);
diff --git a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx
index ea52117f6c2..fcdd1ad745a 100644
--- a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx
+++ b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx
@@ -133,6 +133,7 @@ function CopyDashboardForm({
name="collection_id"
title={t`Which collection should this go in?`}
filterPersonalCollections={filterPersonalCollections}
+ entityType="dashboard"
/>
{!hideShallowCopy && (
diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx
index a2192141090..6815a0997b7 100644
--- a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx
+++ b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx
@@ -125,6 +125,7 @@ export function CreateDashboardForm({
name="collection_id"
title={t`Which collection should this go in?`}
filterPersonalCollections={filterPersonalCollections}
+ entityType="dashboard"
/>
<FormFooter>
<FormErrorMessage inline />
diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/CreateDashboardModal.unit.spec.tsx
index 5a56c08f853..03ca2be4ca6 100644
--- a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/containers/CreateDashboardModal.unit.spec.tsx
@@ -5,6 +5,7 @@ import { setupEnterpriseTest } from "__support__/enterprise";
import {
setupCollectionItemsEndpoint,
setupCollectionsEndpoints,
+ setupLibraryEndpoints,
setupRecentViewsAndSelectionsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
@@ -52,6 +53,7 @@ COLLECTION.CHILD.location = `/${COLLECTION.PARENT.id}/`;
function setup({ mockCreateDashboardResponse = true } = {}) {
mockGetBoundingClientRect();
setupRecentViewsAndSelectionsEndpoints([]);
+ setupLibraryEndpoints();
const onClose = jest.fn();
const settings = mockSettings({});
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx
index 98934a1f43d..f08fd43244f 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx
@@ -3,6 +3,8 @@ import fetchMock from "fetch-mock";
import { push } from "react-router-redux";
import {
+ setupCollectionByIdEndpoint,
+ setupCollectionItemsEndpoint,
setupDatabaseListEndpoint,
setupRecentViewsAndSelectionsEndpoints,
setupSearchEndpoints,
@@ -10,6 +12,7 @@ import {
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import {
+ createMockCollection,
createMockRecentTableDatabaseInfo,
createMockRecentTableItem,
createMockUser,
@@ -51,6 +54,20 @@ const setup = ({ isAdmin = true } = {}) => {
setupSearchEndpoints([]);
setupDatabaseListEndpoint([]);
+ setupCollectionByIdEndpoint({
+ collections: [
+ createMockCollection({ id: "root" }),
+ createMockCollection({ id: 1 }),
+ ],
+ });
+ setupCollectionItemsEndpoint({
+ collection: createMockCollection({ id: "root" }),
+ collectionItems: [],
+ });
+ setupCollectionItemsEndpoint({
+ collection: createMockCollection({ id: 1 }),
+ collectionItems: [],
+ });
// Additional query param variant for uploadable databases
fetchMock.get({
@@ -81,7 +98,7 @@ describe("EmbeddingHub", () => {
});
});
- it("opens DataPickerModal when 'Create a dashboard' is clicked", async () => {
+ it("opens table picker when 'Create a dashboard' is clicked", async () => {
setup();
await userEvent.click(screen.getByText("Create a dashboard"));
@@ -93,6 +110,8 @@ describe("EmbeddingHub", () => {
await within(dialog).findByText("Choose a table to generate a dashboard"),
).toBeInTheDocument();
+ await userEvent.click(await screen.findByText("Recents"));
+
expect(
await within(dialog).findByText("Foo Bar Table"),
).toBeInTheDocument();
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx
index edd4ccf599c..0a09d85037a 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx
+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx
@@ -2,6 +2,7 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { DataPickerModal } from "metabase/common/components/Pickers/DataPicker";
+import type { TablePickerValue } from "metabase/common/components/Pickers/TablePicker";
import { useDispatch } from "metabase/lib/redux";
import type { TableId } from "metabase-types/api";
@@ -27,10 +28,15 @@ export const EmbeddingHubXrayPickerModal = ({
return (
<DataPickerModal
title={t`Choose a table to generate a dashboard`}
- value={undefined}
+ value={{ model: "table", id: null } as unknown as TablePickerValue}
models={["table"]}
onChange={handleTableSelect}
onClose={onClose}
+ options={{
+ showLibrary: false,
+ showRootCollection: false,
+ showPersonalCollections: false,
+ }}
/>
);
};
diff --git a/frontend/src/metabase/entities/collections/constants.ts b/frontend/src/metabase/entities/collections/constants.ts
index 1bce5094e80..4c19b228965 100644
--- a/frontend/src/metabase/entities/collections/constants.ts
+++ b/frontend/src/metabase/entities/collections/constants.ts
@@ -34,3 +34,12 @@ export const PERSONAL_COLLECTIONS = {
can_write: false,
is_personal: true,
};
+
+export const DATABASES_COLLECTION = {
+ id: "databases" as const,
+ get name() {
+ return t`Databases`;
+ },
+ location: "/",
+ can_write: false,
+};
diff --git a/frontend/src/metabase/entities/collections/getInitialCollectionId.ts b/frontend/src/metabase/entities/collections/getInitialCollectionId.ts
index 600f4e11417..cfadf47e255 100644
--- a/frontend/src/metabase/entities/collections/getInitialCollectionId.ts
+++ b/frontend/src/metabase/entities/collections/getInitialCollectionId.ts
@@ -3,6 +3,7 @@ import type { Location } from "history";
import {
canonicalCollectionId,
+ isLibraryCollection,
isRootTrashCollection,
} from "metabase/collections/utils";
import * as Urls from "metabase/lib/urls/collections";
@@ -65,7 +66,11 @@ const getInitialCollectionId = createSelector(
for (const collectionId of validCollectionIds) {
const collection = collections[collectionId];
- if (collection?.can_write) {
+ if (
+ collection != null &&
+ collection.can_write &&
+ !isLibraryCollection(collection)
+ ) {
return canonicalCollectionId(collectionId);
}
}
diff --git a/frontend/src/metabase/entities/collections/utils.ts b/frontend/src/metabase/entities/collections/utils.ts
index cdd6a96674a..db56f51a826 100644
--- a/frontend/src/metabase/entities/collections/utils.ts
+++ b/frontend/src/metabase/entities/collections/utils.ts
@@ -5,7 +5,7 @@ import {
isSyncedCollection,
} from "metabase/collections/utils";
import { color } from "metabase/lib/colors";
-import { PLUGIN_COLLECTIONS } from "metabase/plugins";
+import { PLUGIN_COLLECTIONS, PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
import type { IconName, IconProps } from "metabase/ui";
import type { Collection, CollectionContentModel } from "metabase-types/api";
@@ -41,8 +41,16 @@ export function getCollectionIcon(
return { name: "synced_collection" };
}
- const type = PLUGIN_COLLECTIONS.getCollectionType(collection);
+ switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection.type)) {
+ case "root":
+ return { name: "repository" };
+ case "models":
+ return { name: "model" };
+ case "metrics":
+ return { name: "metric" };
+ }
+ const type = PLUGIN_COLLECTIONS.getCollectionType(collection);
return type
? {
name: type.icon as unknown as IconName,
diff --git a/frontend/src/metabase/entities/containers/EntityCopyModal.tsx b/frontend/src/metabase/entities/containers/EntityCopyModal.tsx
index b9ed05627d6..acc8b22051e 100644
--- a/frontend/src/metabase/entities/containers/EntityCopyModal.tsx
+++ b/frontend/src/metabase/entities/containers/EntityCopyModal.tsx
@@ -2,13 +2,14 @@ import { dissoc } from "icepick";
import { t } from "ttag";
import { useGetDefaultCollectionId } from "metabase/collections/hooks";
-import ModalContent from "metabase/common/components/ModalContent";
+import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";
import {
CopyDashboardFormConnected,
type CopyDashboardFormProperties,
} from "metabase/dashboard/containers/CopyDashboardForm";
import { PLUGIN_DOCUMENTS } from "metabase/plugins";
-import { CopyQuestionForm } from "metabase/questions/components/CopyQuestionForm";
+import { CopyCardForm } from "metabase/questions/components/CopyCardForm/CopyCardForm";
+import { Modal } from "metabase/ui";
interface EntityCopyModalProps {
entityType: string;
@@ -48,10 +49,14 @@ const EntityCopyModal = ({
name: resolvedObject.name + " - " + t`Duplicate`,
};
+ useEscapeToCloseModal(onClose);
+
return (
- <ModalContent
+ <Modal
title={title || t`Duplicate "${resolvedObject.name}"`}
+ opened
onClose={onClose}
+ closeOnEscape={false}
>
{entityType === "dashboards" && (
<CopyDashboardFormConnected
@@ -63,8 +68,8 @@ const EntityCopyModal = ({
originalDashboardId={resolvedObject.id}
/>
)}
- {entityType === "questions" && (
- <CopyQuestionForm
+ {entityType === "cards" && (
+ <CopyCardForm
onSubmit={copy}
onCancel={onClose}
onSaved={onSaved}
@@ -83,7 +88,7 @@ const EntityCopyModal = ({
{...props}
/>
)}
- </ModalContent>
+ </Modal>
);
};
diff --git a/frontend/src/metabase/lib/colors/colors.ts b/frontend/src/metabase/lib/colors/colors.ts
index 9443a3340af..e367e2ddcb1 100644
--- a/frontend/src/metabase/lib/colors/colors.ts
+++ b/frontend/src/metabase/lib/colors/colors.ts
@@ -305,6 +305,10 @@ const getColorConfig = (settings: ColorSettings = {}) => ({
light: baseColors.orionAlpha[60],
dark: baseColors.orionAlpha[70],
},
+ "bg-ocean-alpha-light": {
+ light: baseColors.oceanAlpha[5],
+ dark: baseColors.oceanAlpha[20],
+ },
"bg-black": { light: baseColors.orion[80], dark: baseColors.orion[20] }, //should be background-primary-inverse
"bg-dark": { light: baseColors.orion[40], dark: baseColors.orion[70] }, //should be background-tertiary-inverse
"bg-darker": { light: baseColors.orion[70], dark: baseColors.orion[30] }, //should be background-secondary-inverse
@@ -681,3 +685,13 @@ export const staticVizOverrides = {
"text-medium": baseColors.orion[60],
"text-light": baseColors.orion[40],
};
+
+// one-off colors for data layers which are not part of Metabase color palette
+// we got a blessing from the design team to use these colors 😇
+export const dataLayerColors = {
+ copper: "#B87333",
+ bronze: "#CD7F32",
+ silver: "#C0C0C0",
+ gold: "#FFD700",
+ default: "#B87333",
+} as const;
diff --git a/frontend/src/metabase/lib/icon.ts b/frontend/src/metabase/lib/icon.ts
index f7cf5fa6742..d87720d0658 100644
--- a/frontend/src/metabase/lib/icon.ts
+++ b/frontend/src/metabase/lib/icon.ts
@@ -1,5 +1,5 @@
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
-import { PLUGIN_COLLECTIONS } from "metabase/plugins";
+import { PLUGIN_COLLECTIONS, PLUGIN_DATA_STUDIO } from "metabase/plugins";
import type { IconName } from "metabase/ui";
import { getIconForVisualizationType } from "metabase/visualizations";
import type {
@@ -49,7 +49,7 @@ export const modelIconMap: Record<IconModel, IconName> = {
snippet: "unknown",
document: "document",
timeline: "calendar",
- transform: "refresh_downstream",
+ transform: "transform",
user: "person",
};
@@ -72,6 +72,19 @@ export const getIconBase = (item: ObjectWithModel): IconData => {
return { name: "person" };
}
+ if (item.model === "collection" && item.id === "databases") {
+ return { name: "database" };
+ }
+
+ switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(item.type)) {
+ case "root":
+ return { name: "repository" };
+ case "models":
+ return { name: "model" };
+ case "metrics":
+ return { name: "metric" };
+ }
+
return { name: modelIconMap?.[item.model] ?? "unknown" };
};
diff --git a/frontend/src/metabase/lib/urls/admin.ts b/frontend/src/metabase/lib/urls/admin.ts
index 3bef5f0648d..0b2680a65be 100644
--- a/frontend/src/metabase/lib/urls/admin.ts
+++ b/frontend/src/metabase/lib/urls/admin.ts
@@ -45,8 +45,12 @@ export function editDatabase(databaseId: DatabaseId) {
return `/admin/databases/${databaseId}/edit`;
}
+export function dataModel() {
+ return `/admin/datamodel`;
+}
+
export function dataModelDatabase(databaseId: DatabaseId) {
- return `/admin/datamodel/database/${databaseId}`;
+ return `${dataModel()}/database/${databaseId}`;
}
export function dataModelSchema(
diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/lib/urls/data-studio.ts
new file mode 100644
index 00000000000..5db478c0b7d
--- /dev/null
+++ b/frontend/src/metabase/lib/urls/data-studio.ts
@@ -0,0 +1,108 @@
+import type {
+ CardId,
+ CollectionId,
+ NativeQuerySnippetId,
+} from "metabase-types/api";
+
+const ROOT_URL = "/data-studio";
+
+type OptionalParams = {
+ collectionId?: CollectionId;
+};
+
+function getQueryString({ collectionId }: OptionalParams) {
+ const searchParams = new URLSearchParams();
+ if (collectionId != null) {
+ searchParams.set("collectionId", String(collectionId));
+ }
+ const queryString = searchParams.toString();
+ return queryString.length > 0 ? `?${queryString}` : "";
+}
+
+export function dataStudio() {
+ return ROOT_URL;
+}
+
+export function dataStudioData() {
+ return `${ROOT_URL}/data`;
+}
+
+export function dataStudioModeling() {
+ return `${ROOT_URL}/modeling`;
+}
+
+export type NewDataStudioQueryModelParams = {
+ collectionId?: CollectionId;
+};
+
+export function newDataStudioQueryModel(
+ params: NewDataStudioQueryModelParams = {},
+) {
+ return `${dataStudioModeling()}/models/new/query${getQueryString(params)}`;
+}
+
+export type NewDataStudioNativeModelParams = {
+ collectionId?: CollectionId;
+};
+
+export function newDataStudioNativeModel(
+ params: NewDataStudioNativeModelParams = {},
+) {
+ return `${dataStudioModeling()}/models/new/native${getQueryString(params)}`;
+}
+
+export function dataStudioModel(cardId: CardId) {
+ return `${dataStudioModeling()}/models/${cardId}`;
+}
+
+export function dataStudioModelQuery(cardId: CardId) {
+ return `${dataStudioModel(cardId)}/query`;
+}
+
+export function dataStudioModelFields(cardId: CardId) {
+ return `${dataStudioModel(cardId)}/fields`;
+}
+
+export function dataStudioModelDependencies(cardId: CardId) {
+ return `${dataStudioModel(cardId)}/dependencies`;
+}
+
+export type NewDataStudioMetricProps = {
+ collectionId?: CollectionId;
+};
+
+export function newDataStudioMetric(params: NewDataStudioMetricProps = {}) {
+ return `${dataStudioModeling()}/metrics/new${getQueryString(params)}`;
+}
+
+export function dataStudioMetric(cardId: CardId) {
+ return `${dataStudioModeling()}/metrics/${cardId}`;
+}
+
+export function dataStudioMetricQuery(cardId: CardId) {
+ return `${dataStudioMetric(cardId)}/query`;
+}
+
+export function dataStudioMetricDependencies(cardId: CardId) {
+ return `${dataStudioMetric(cardId)}/dependencies`;
+}
+
+export function dataStudioGlossary() {
+ return `${dataStudioModeling()}/glossary`;
+}
+
+export function dataStudioCollection(collectionId: CollectionId) {
+ return `${dataStudioModeling()}/collections/${collectionId}`;
+}
+
+export function dataStudioSnippet(snippetId: NativeQuerySnippetId) {
+ return `${dataStudioModeling()}/snippets/${snippetId}`;
+}
+
+export function dataStudioSnippetDependencies(snippetId: NativeQuerySnippetId) {
+ return `${dataStudioSnippet(snippetId)}/dependencies`;
+}
+
+export function newDataStudioSnippet() {
+ return `${dataStudioModeling()}/snippets/new`;
+}
diff --git a/frontend/src/metabase/lib/urls/dependencies.ts b/frontend/src/metabase/lib/urls/dependencies.ts
index 92f2ca470bb..aaff7bdc0fe 100644
--- a/frontend/src/metabase/lib/urls/dependencies.ts
+++ b/frontend/src/metabase/lib/urls/dependencies.ts
@@ -1,6 +1,6 @@
import type { DependencyEntry } from "metabase-types/api";
-const BASE_URL = `/admin/tools/dependencies`;
+const BASE_URL = `/data-studio/dependencies`;
export type DependencyGraphParams = {
entry?: DependencyEntry;
diff --git a/frontend/src/metabase/lib/urls/index.ts b/frontend/src/metabase/lib/urls/index.ts
index 8c091d1e378..8d242851db9 100644
--- a/frontend/src/metabase/lib/urls/index.ts
+++ b/frontend/src/metabase/lib/urls/index.ts
@@ -1,6 +1,7 @@
export * from "./actions";
export * from "./admin";
export * from "./auth";
+export * from "./data-studio";
export * from "./bookmarks";
export * from "./browse";
export * from "./collections";
diff --git a/frontend/src/metabase/lib/urls/misc.ts b/frontend/src/metabase/lib/urls/misc.ts
index bf1781d90d0..e69922df0e9 100644
--- a/frontend/src/metabase/lib/urls/misc.ts
+++ b/frontend/src/metabase/lib/urls/misc.ts
@@ -9,3 +9,7 @@ export const exportFormatPng: ExportFormat = "png";
export function accountSettings() {
return "/account/profile";
}
+
+export function unauthorized() {
+ return "/unauthorized";
+}
diff --git a/frontend/src/metabase/lib/urls/transforms.ts b/frontend/src/metabase/lib/urls/transforms.ts
index 55c45a147dc..d94d66a99e3 100644
--- a/frontend/src/metabase/lib/urls/transforms.ts
+++ b/frontend/src/metabase/lib/urls/transforms.ts
@@ -9,117 +9,73 @@ import type {
TransformTagId,
} from "metabase-types/api";
-const ROOT_URL = "/admin/transforms";
-
-export type TransformListParams = {
- lastRunStartTime?: string;
- lastRunStatuses?: TransformRunStatus[];
- tagIds?: TransformTagId[];
-};
-
-export type TransformJobListParams = {
- lastRunStartTime?: string;
- lastRunStatuses?: TransformRunStatus[];
- nextRunStartTime?: string;
- tagIds?: TransformTagId[];
-};
-
-export type TransformRunListParams = {
- page?: number;
- statuses?: TransformRunStatus[];
- transformIds?: TransformId[];
- transformTagIds?: TransformTagId[];
- startTime?: string;
- endTime?: string;
- runMethods?: TransformRunMethod[];
-};
+const TRANSFORMS_ROOT_URL = `/data-studio/transforms`;
+const JOBS_ROOT_URL = `${TRANSFORMS_ROOT_URL}/jobs`;
+const RUNS_ROOT_URL = `${TRANSFORMS_ROOT_URL}/runs`;
+const LIBRARY_ROOT_URL = `${TRANSFORMS_ROOT_URL}/library`;
export type TransformPythonLibraryParams = {
path: string;
};
-export function transformList({
- lastRunStartTime,
- lastRunStatuses,
- tagIds,
-}: TransformListParams = {}) {
- const searchParams = new URLSearchParams();
- if (lastRunStartTime != null) {
- searchParams.set("lastRunStartTime", lastRunStartTime);
- }
- lastRunStatuses?.forEach((status) => {
- searchParams.append("lastRunStatuses", status);
- });
- tagIds?.forEach((tagId) => {
- searchParams.append("tagIds", String(tagId));
- });
- const queryString = searchParams.toString();
- if (queryString.length > 0) {
- return `${ROOT_URL}?${queryString}`;
- } else {
- return ROOT_URL;
- }
+export function transformList() {
+ return TRANSFORMS_ROOT_URL;
}
export function newQueryTransform() {
- return `${ROOT_URL}/new/query`;
+ return `${TRANSFORMS_ROOT_URL}/new/query`;
}
export function newNativeTransform() {
- return `${ROOT_URL}/new/native`;
+ return `${TRANSFORMS_ROOT_URL}/new/native`;
}
export function newPythonTransform() {
- return `${ROOT_URL}/new/python`;
+ return `${TRANSFORMS_ROOT_URL}/new/python`;
}
-export function newCardTransform(cardId: CardId) {
- return `${ROOT_URL}/new/card/${cardId}`;
+export function newTransformFromCard(cardId: CardId) {
+ return `${TRANSFORMS_ROOT_URL}/new/card/${cardId}`;
}
export function transform(transformId: TransformId) {
- return `${ROOT_URL}/${transformId}`;
+ return `${TRANSFORMS_ROOT_URL}/${transformId}`;
}
-export function transformQuery(transformId: TransformId) {
- return `${ROOT_URL}/${transformId}/query`;
+export function transformRun(transformId: TransformId) {
+ return `${TRANSFORMS_ROOT_URL}/${transformId}/run`;
}
-export function transformJobList({
- lastRunStartTime,
- lastRunStatuses,
- nextRunStartTime,
- tagIds,
-}: TransformJobListParams = {}) {
- const searchParams = new URLSearchParams();
- if (lastRunStartTime != null) {
- searchParams.set("lastRunStartTime", lastRunStartTime);
- }
- lastRunStatuses?.forEach((status) => {
- searchParams.append("lastRunStatuses", status);
- });
- if (nextRunStartTime != null) {
- searchParams.set("nextRunStartTime", nextRunStartTime);
- }
- tagIds?.forEach((tagId) => {
- searchParams.append("tagIds", String(tagId));
- });
- const queryString = searchParams.toString();
- if (queryString.length > 0) {
- return `${ROOT_URL}/jobs?${queryString}`;
- } else {
- return `${ROOT_URL}/jobs`;
- }
+export function transformTarget(transformId: TransformId) {
+ return `${TRANSFORMS_ROOT_URL}/${transformId}/target`;
+}
+
+export function transformDependencies(transformId: TransformId) {
+ return `${TRANSFORMS_ROOT_URL}/${transformId}/dependencies`;
+}
+
+export function transformJobList() {
+ return JOBS_ROOT_URL;
}
export function newTransformJob() {
- return `${ROOT_URL}/jobs/new`;
+ return `${JOBS_ROOT_URL}/new`;
}
export function transformJob(id: TransformJobId) {
- return `${ROOT_URL}/jobs/${id}`;
+ return `${JOBS_ROOT_URL}/${id}`;
}
+export type TransformRunListParams = {
+ page?: number;
+ statuses?: TransformRunStatus[];
+ transformIds?: TransformId[];
+ transformTagIds?: TransformTagId[];
+ startTime?: string;
+ endTime?: string;
+ runMethods?: TransformRunMethod[];
+};
+
export function transformRunList({
page,
transformIds,
@@ -154,14 +110,14 @@ export function transformRunList({
const queryString = searchParams.toString();
if (queryString.length > 0) {
- return `${ROOT_URL}/runs?${queryString}`;
+ return `${RUNS_ROOT_URL}?${queryString}`;
} else {
- return `${ROOT_URL}/runs`;
+ return RUNS_ROOT_URL;
}
}
export function transformPythonLibrary({ path }: TransformPythonLibraryParams) {
- return `/admin/transforms/library/${path}`;
+ return `${LIBRARY_ROOT_URL}/${path}`;
}
export function queryBuilderTable(tableId: TableId, databaseId: DatabaseId) {
diff --git a/frontend/src/metabase/metadata/README.md b/frontend/src/metabase/metadata/README.md
index 95d02ce6544..0dddf4178fe 100644
--- a/frontend/src/metabase/metadata/README.md
+++ b/frontend/src/metabase/metadata/README.md
@@ -2,4 +2,4 @@
This directory is primarily maintained by the Semantic Layer team.
-As we revamp various metadata-related UIs, most of the content from `admin/datamodel` will eventually be moved here.
+As we revamp various metadata-related UIs, most of the content from `bench/data` will eventually be moved here.
diff --git a/frontend/src/metabase/metadata/components/DataSourceInput.tsx b/frontend/src/metabase/metadata/components/DataSourceInput.tsx
new file mode 100644
index 00000000000..10bc44333b1
--- /dev/null
+++ b/frontend/src/metabase/metadata/components/DataSourceInput.tsx
@@ -0,0 +1,54 @@
+import { t } from "ttag";
+
+import { Select, type SelectProps } from "metabase/ui";
+import type { TableDataSource } from "metabase-types/api";
+
+interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {
+ showMetabaseTransform?: boolean;
+ value: TableDataSource | "unknown" | null;
+ onChange: (value: TableDataSource | "unknown" | null) => void;
+}
+
+export const DataSourceInput = ({
+ comboboxProps,
+ showMetabaseTransform,
+ value,
+ onChange,
+ onFocus,
+ ...props
+}: Props) => {
+ return (
+ <Select
+ comboboxProps={{
+ middlewares: {
+ flip: true,
+ size: {
+ padding: 6,
+ },
+ },
+ position: "bottom-start",
+ ...comboboxProps,
+ }}
+ data={getData(showMetabaseTransform || value === "metabase-transform")}
+ label={t`Source`}
+ placeholder={t`Select a data source`}
+ value={value}
+ onChange={(value) => onChange(value)}
+ {...props}
+ />
+ );
+};
+
+function getData(showMetabaseTransform?: boolean) {
+ return [
+ { value: "unknown" as const, label: t`Unknown` },
+ { value: "ingested" as const, label: t`Ingested` },
+ showMetabaseTransform
+ ? // eslint-disable-next-line no-literal-metabase-strings -- shown in Data Studio only
+ { value: "metabase-transform" as const, label: t`Metabase transform` }
+ : undefined,
+ { value: "transform" as const, label: t`Transform` },
+ { value: "source-data" as const, label: t`Source data` },
+ { value: "upload" as const, label: t`Uploaded data` },
+ ].filter((option) => option != null);
+}
diff --git a/frontend/src/metabase/metadata/components/EntityTypeInput.tsx b/frontend/src/metabase/metadata/components/EntityTypeInput.tsx
new file mode 100644
index 00000000000..ec92e4afc56
--- /dev/null
+++ b/frontend/src/metabase/metadata/components/EntityTypeInput.tsx
@@ -0,0 +1,69 @@
+import type { FocusEvent } from "react";
+import { t } from "ttag";
+
+import { getEntityIcon } from "metabase/detail-view/utils";
+import { Group, Icon, Select, SelectItem, type SelectProps } from "metabase/ui";
+import type { Table } from "metabase-types/api";
+
+interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {
+ value: Table["entity_type"];
+ onChange: (value: Table["entity_type"]) => void;
+}
+
+export const EntityTypeInput = ({
+ comboboxProps,
+ value,
+ onChange,
+ onFocus,
+ ...props
+}: Props) => {
+ const handleFocus = (event: FocusEvent<HTMLInputElement>) => {
+ event.target.select();
+ onFocus?.(event);
+ };
+
+ const entities = [
+ { value: "entity/GenericTable", label: t`Generic` },
+ { value: "entity/UserTable", label: t`Person` },
+ { value: "entity/CompanyTable", label: t`Company` },
+ { value: "entity/TransactionTable", label: t`Transaction` },
+ { value: "entity/ProductTable", label: t`Product` },
+ { value: "entity/SubscriptionTable", label: t`Subscription` },
+ { value: "entity/EventTable", label: t`Event` },
+ ];
+
+ return (
+ <Select
+ comboboxProps={{
+ middlewares: {
+ flip: true,
+ size: {
+ padding: 6,
+ },
+ },
+ position: "bottom-start",
+ ...comboboxProps,
+ }}
+ data={entities}
+ label={t`Entity type`}
+ renderOption={(item) => {
+ const selected = item.option.value === value;
+
+ return (
+ <SelectItem selected={selected}>
+ <Group align="center" gap="sm" justify="center">
+ <Icon name={getEntityIcon(item.option.value)} />
+ <span>{item.option.label}</span>
+ </Group>
+ </SelectItem>
+ );
+ }}
+ leftSection={value ? <Icon name={getEntityIcon(value)} /> : undefined}
+ placeholder={t`Select entity type`}
+ value={value}
+ onChange={(value) => onChange(value)}
+ onFocus={handleFocus}
+ {...props}
+ />
+ );
+};
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldItem/FieldItem.module.css b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldItem/FieldItem.module.css
rename to frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.module.css
diff --git a/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx
new file mode 100644
index 00000000000..719793c9338
--- /dev/null
+++ b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx
@@ -0,0 +1,175 @@
+import cx from "classnames";
+import type { MouseEvent } from "react";
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import EditableText from "metabase/common/components/EditableText";
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import { getColumnIcon } from "metabase/common/utils/columns";
+import { Box, Card, Flex, Group, Icon, rem } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { Field } from "metabase-types/api";
+
+import S from "./FieldItem.module.css";
+
+type FieldItemProps = {
+ field: Field;
+ href: string;
+ active?: boolean;
+ parent?: Field;
+ readOnly?: boolean;
+ onSelect?: () => void;
+ onNameChange: (newName: string) => void;
+ onDescriptionChange: (newDescription: string | null) => void;
+};
+
+export function FieldItem({
+ active,
+ field,
+ href,
+ parent,
+ readOnly,
+ onSelect,
+ onNameChange,
+ onDescriptionChange,
+}: FieldItemProps) {
+ const icon = getColumnIcon(Lib.legacyColumnTypeInfo(field));
+
+ const handleNameChange = async (newValue: string) => {
+ const newName = newValue.trim();
+ if (field.display_name !== newName) {
+ onNameChange(newName);
+ }
+ };
+
+ const handleDescriptionChange = async (newValue: string) => {
+ const trimmedValue = newValue.trim();
+ const newDescription = trimmedValue.length === 0 ? null : trimmedValue;
+
+ if (field.description !== newDescription) {
+ onDescriptionChange(newDescription);
+ }
+ };
+
+ const handleInputClick = (event: MouseEvent) => {
+ // EditableText component breaks a11y with the programmatic
+ // event.currentTarget.click() call. The click event bubbles
+ // to this Link component. This is problematic e.g. when tabbing
+ // out of the EditableText component, as the link gets clicked.
+ if (!event.isTrusted) {
+ event.stopPropagation();
+ event.preventDefault();
+ }
+ };
+
+ const handleClick = (event: MouseEvent) => {
+ // prevent navigation when focusing textareas with mouse
+ if (
+ event.target instanceof HTMLElement &&
+ event.target.tagName === "TEXTAREA"
+ ) {
+ event.preventDefault();
+ } else {
+ onSelect?.();
+ }
+ };
+
+ return (
+ <Card
+ aria-label={field.display_name}
+ bg={active ? "brand-light" : "bg-white"}
+ c="text-medium"
+ className={cx(S.card, {
+ [S.active]: active,
+ })}
+ role="listitem"
+ p={0}
+ pb={1}
+ withBorder
+ >
+ <Flex
+ align="flex-start"
+ className={S.link}
+ component={Link}
+ direction="column"
+ draggable={false} // this + onClick handler is required, otherwise interaction is broken on macOS
+ gap={rem(12)}
+ justify="space-between"
+ mih={rem(40)}
+ pos="relative"
+ px="md"
+ py={rem(12)}
+ to={href}
+ w="100%"
+ wrap="nowrap"
+ onClick={handleClick} // this + draggable={false} is required, otherwise interaction is broken on macOS
+ >
+ <Group
+ align="center"
+ c="text-light"
+ flex="0 0 auto"
+ gap={0}
+ maw="100%"
+ w="100%"
+ wrap="nowrap"
+ >
+ <Icon className={S.icon} flex="0 0 auto" mr="sm" name={icon} />
+
+ {parent && (
+ <Box
+ data-testid="name-prefix"
+ flex="0 0 auto"
+ lh="normal"
+ maw="50%"
+ mb={rem(-4)}
+ mr="xs"
+ mt={rem(-3)}
+ >
+ <Ellipsified lines={1} tooltip={parent.display_name}>
+ {parent.display_name}
+ {":"}
+ </Ellipsified>
+ </Box>
+ )}
+
+ <Box
+ className={cx(S.input, S.name)}
+ component={EditableText}
+ fw="bold"
+ initialValue={field.display_name}
+ maxLength={254}
+ mb={rem(-4)}
+ ml={rem(-2)}
+ mt={rem(-3)}
+ placeholder={t`Give this field a name`}
+ px={rem(1)}
+ py={rem(2)}
+ tabIndex={undefined} // override the default 0 which breaks a11y
+ isDisabled={readOnly}
+ onChange={handleNameChange}
+ onClick={handleInputClick}
+ />
+ </Group>
+
+ <Box
+ className={cx(S.input, S.description)}
+ component={EditableText}
+ initialValue={field.description ?? ""}
+ isMultiline
+ isOptional
+ maw="100%"
+ mb={rem(-4)}
+ mt={rem(-3)}
+ mx={rem(-2)}
+ px={rem(1)}
+ py={0}
+ placeholder={t`No description yet`}
+ tabIndex={undefined} // override the default 0 which breaks a11y
+ isDisabled={readOnly}
+ onChange={handleDescriptionChange}
+ onClick={handleInputClick}
+ />
+ </Flex>
+ </Card>
+ );
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldItem/index.ts b/frontend/src/metabase/metadata/components/FieldList/FieldItem/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldItem/index.ts
rename to frontend/src/metabase/metadata/components/FieldList/FieldItem/index.ts
diff --git a/frontend/src/metabase/metadata/components/FieldList/FieldList.tsx b/frontend/src/metabase/metadata/components/FieldList/FieldList.tsx
new file mode 100644
index 00000000000..bf538dc7a27
--- /dev/null
+++ b/frontend/src/metabase/metadata/components/FieldList/FieldList.tsx
@@ -0,0 +1,59 @@
+import { useMemo } from "react";
+import _ from "underscore";
+
+import { Stack, rem } from "metabase/ui";
+import type { Field } from "metabase-types/api";
+
+import { FieldItem } from "./FieldItem";
+
+interface Props<T extends number | string> {
+ fields: Field[];
+ activeFieldKey?: T;
+ readOnly?: boolean;
+ getFieldKey: (field: Field) => T;
+ getFieldHref?: (field: Field) => string;
+ onSelect?: (field: Field) => void;
+ onNameChange: (field: Field, newName: string) => void;
+ onDescriptionChange: (field: Field, newDescription: string | null) => void;
+}
+
+export function FieldList<T extends number | string>({
+ fields,
+ activeFieldKey,
+ readOnly,
+ getFieldKey,
+ getFieldHref,
+ onSelect,
+ onNameChange,
+ onDescriptionChange,
+}: Props<T>) {
+ const fieldsByName = useMemo(() => {
+ return _.indexBy(fields, (field) => field.name);
+ }, [fields]);
+
+ return (
+ <Stack gap={rem(12)}>
+ {fields.map((field) => {
+ const key = getFieldKey(field);
+ const parentName = field.nfc_path?.[0] ?? "";
+ const parent = fieldsByName[parentName];
+
+ return (
+ <FieldItem
+ key={key}
+ field={field}
+ active={key === activeFieldKey}
+ parent={parent}
+ href={getFieldHref?.(field) ?? ""}
+ readOnly={readOnly}
+ onSelect={() => onSelect?.(field)}
+ onNameChange={(newName) => onNameChange(field, newName)}
+ onDescriptionChange={(newDescription) =>
+ onDescriptionChange(field, newDescription)
+ }
+ />
+ );
+ })}
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/index.ts b/frontend/src/metabase/metadata/components/FieldList/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/index.ts
rename to frontend/src/metabase/metadata/components/FieldList/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/LabeledValue.tsx b/frontend/src/metabase/metadata/components/LabeledValue/LabeledValue.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/LabeledValue.tsx
rename to frontend/src/metabase/metadata/components/LabeledValue/LabeledValue.tsx
diff --git a/frontend/src/metabase/metadata/components/LabeledValue/index.ts b/frontend/src/metabase/metadata/components/LabeledValue/index.ts
new file mode 100644
index 00000000000..08798d14724
--- /dev/null
+++ b/frontend/src/metabase/metadata/components/LabeledValue/index.ts
@@ -0,0 +1 @@
+export * from "./LabeledValue";
diff --git a/frontend/src/metabase/metadata/components/LayerInput.tsx b/frontend/src/metabase/metadata/components/LayerInput.tsx
new file mode 100644
index 00000000000..9844d5dca3d
--- /dev/null
+++ b/frontend/src/metabase/metadata/components/LayerInput.tsx
@@ -0,0 +1,79 @@
+import type { FocusEvent } from "react";
+import { t } from "ttag";
+
+import { dataLayerColors } from "metabase/lib/colors";
+import { Group, Icon, Select, SelectItem, type SelectProps } from "metabase/ui";
+import type { TableDataLayer } from "metabase-types/api";
+
+interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {
+ value: TableDataLayer | null;
+ onChange: (value: TableDataLayer | null) => void;
+}
+
+const dataLayers = ["copper", "bronze", "silver", "gold"] as const;
+
+export const LayerInput = ({
+ comboboxProps,
+ value,
+ onChange,
+ onFocus,
+ ...props
+}: Props) => {
+ const handleFocus = (event: FocusEvent<HTMLInputElement>) => {
+ event.target.select();
+ onFocus?.(event);
+ };
+
+ return (
+ <Select
+ comboboxProps={{
+ middlewares: {
+ flip: true,
+ size: {
+ padding: 6,
+ },
+ },
+ position: "bottom-start",
+ ...comboboxProps,
+ }}
+ data={[
+ { value: "copper" as const, label: t`Copper` },
+ { value: "bronze" as const, label: t`Bronze` },
+ { value: "silver" as const, label: t`Silver` },
+ { value: "gold" as const, label: t`Gold` },
+ ]}
+ label={t`Visibility type`}
+ renderOption={(item) => {
+ const selected = item.option.value === value;
+
+ return (
+ <SelectItem selected={selected}>
+ <Group align="center" gap="sm" justify="center">
+ <Icon c={getColor(item.option.value)} name="medallion" />
+ <span>{item.option.label}</span>
+ </Group>
+ </SelectItem>
+ );
+ }}
+ leftSection={
+ value ? <Icon c={getColor(value)} name="medallion" /> : undefined
+ }
+ placeholder={t`Select a layer`}
+ value={value}
+ onChange={(value) => onChange(value)}
+ onFocus={handleFocus}
+ {...props}
+ />
+ );
+};
+
+function isDataLayer(value: string): value is TableDataLayer {
+ return dataLayers.some((layer) => layer === value);
+}
+
+function getColor(value: TableDataLayer | string): string {
+ if (isDataLayer(value)) {
+ return dataLayerColors[value];
+ }
+ return dataLayerColors.default;
+}
diff --git a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx
index c7f26008094..7e5a3b2c4d0 100644
--- a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx
+++ b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx
@@ -9,29 +9,31 @@ import S from "./NameDescriptionInput.module.css";
import { Textarea } from "./Textarea";
interface Props {
- description: string;
- descriptionPlaceholder: string;
name: string;
nameIcon: IconName;
nameMaxLength?: number;
namePlaceholder: string;
namePrefix?: string;
nameRightSection?: ReactNode;
- onDescriptionChange: (description: string) => void;
+ description: string;
+ descriptionPlaceholder: string;
+ readOnly?: boolean;
onNameChange: (name: string) => void;
+ onDescriptionChange: (description: string) => void;
}
export const NameDescriptionInput = ({
- description,
- descriptionPlaceholder,
name,
nameIcon,
nameMaxLength,
namePlaceholder,
namePrefix,
nameRightSection,
- onDescriptionChange,
+ description,
+ descriptionPlaceholder,
+ readOnly,
onNameChange,
+ onDescriptionChange,
}: Props) => {
const { ref, width } = useElementSize();
const { ref: sectionRef, width: sectionWidth } = useElementSize();
@@ -75,7 +77,7 @@ export const NameDescriptionInput = ({
ref={sectionRef}
wrap="nowrap"
>
- <Icon c="brand" flex="0 0 auto" name={nameIcon} size={20} />
+ <Icon flex="0 0 auto" name={nameIcon} size={20} c="brand" />
{namePrefix && (
<Ellipsified
@@ -115,6 +117,7 @@ export const NameDescriptionInput = ({
},
}}
value={name}
+ readOnly={readOnly}
onChange={handleNameChange}
/>
@@ -128,6 +131,7 @@ export const NameDescriptionInput = ({
minRows={2}
placeholder={descriptionPlaceholder}
value={description}
+ readOnly={readOnly}
onChange={handleDescriptionChange}
/>
</Box>
diff --git a/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsx b/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsx
index 5dd5cd5f524..d368d771b36 100644
--- a/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsx
+++ b/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsx
@@ -3,27 +3,27 @@ import cx from "classnames";
import { Ellipsified } from "metabase/common/components/Ellipsified";
import { Sortable } from "metabase/common/components/Sortable";
import { getColumnIcon } from "metabase/common/utils/columns";
-import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { Box, Card, Flex, Icon, Text, rem } from "metabase/ui";
import * as Lib from "metabase-lib";
import type { Field } from "metabase-types/api";
import S from "./SortableFieldItem.module.css";
-interface Props {
- active?: boolean;
- disabled?: boolean;
+type SortableFieldItemProps<T extends number | string> = {
field: Field;
+ fieldKey: T;
parent?: Field | undefined;
-}
+ active?: boolean;
+ disabled?: boolean;
+};
-export const SortableFieldItem = ({
- active,
- disabled,
+export function SortableFieldItem<T extends number | string>({
field,
+ fieldKey,
parent,
-}: Props) => {
- const id = getRawTableFieldId(field);
+ active,
+ disabled,
+}: SortableFieldItemProps<T>) {
const icon = getColumnIcon(Lib.legacyColumnTypeInfo(field));
const label = field.display_name;
const draggable = !disabled;
@@ -33,9 +33,9 @@ export const SortableFieldItem = ({
className={cx(S.sortableField, {
[S.active]: active,
})}
+ id={fieldKey}
disabled={disabled}
draggingStyle={{ opacity: 0.5 }}
- id={id}
>
<Card
aria-label={label}
@@ -92,4 +92,4 @@ export const SortableFieldItem = ({
</Card>
</Sortable>
);
-};
+}
diff --git a/frontend/src/metabase/metadata/components/SortableFieldList/SortableFieldList.tsx b/frontend/src/metabase/metadata/components/SortableFieldList/SortableFieldList.tsx
index 53252b297b1..ff50566d68a 100644
--- a/frontend/src/metabase/metadata/components/SortableFieldList/SortableFieldList.tsx
+++ b/frontend/src/metabase/metadata/components/SortableFieldList/SortableFieldList.tsx
@@ -6,61 +6,60 @@ import {
type DragEndEvent,
SortableList,
} from "metabase/common/components/Sortable";
-import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { Stack, rem } from "metabase/ui";
-import type { Field, FieldId, Table } from "metabase-types/api";
+import type { Field, FieldId } from "metabase-types/api";
import { SortableFieldItem } from "../SortableFieldItem";
-interface Props {
- activeFieldId?: FieldId;
- table: Table;
- onChange: (fieldOrder: FieldId[]) => void;
+interface Props<T extends number | string> {
+ fields: Field[];
+ activeFieldKey?: FieldId;
+ getFieldKey: (field: Field) => T;
+ onChange: (fieldOrder: T[]) => void;
}
-export const SortableFieldList = ({
- activeFieldId,
- table,
+export function SortableFieldList<T extends number | string>({
+ fields,
+ activeFieldKey,
+ getFieldKey,
onChange,
-}: Props) => {
+}: Props<T>) {
const pointerSensor = useSensor(PointerSensor, {
activationConstraint: { distance: 15 },
});
- const fields = useMemo(() => {
- return _.sortBy(table.fields ?? [], (item) => item.position);
- }, [table.fields]);
const fieldsByName = useMemo(() => {
return _.indexBy(fields, (field) => field.name);
}, [fields]);
const isDragDisabled = fields.length <= 1;
const handleSortEnd = ({ itemIds }: DragEndEvent) => {
- // in this context field id will never be a string because it's a raw table field, so it's ok to cast
- onChange(itemIds as FieldId[]);
+ onChange(itemIds as T[]);
};
return (
<Stack gap={rem(12)}>
<SortableList<Field>
- getId={getRawTableFieldId}
items={fields}
- renderItem={({ id, item: field }) => {
+ sensors={[pointerSensor]}
+ getId={getFieldKey}
+ renderItem={({ item: field }) => {
+ const key = getFieldKey(field);
const parentName = field.nfc_path?.[0] ?? "";
const parent = fieldsByName[parentName];
return (
<SortableFieldItem
- active={id === activeFieldId}
- disabled={isDragDisabled}
+ key={key}
field={field}
+ fieldKey={key}
parent={parent}
- key={id}
+ active={getFieldKey(field) === activeFieldKey}
+ disabled={isDragDisabled}
/>
);
}}
- sensors={[pointerSensor]}
onSortEnd={handleSortEnd}
/>
</Stack>
);
-};
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TitledSection/TitledSection.module.css b/frontend/src/metabase/metadata/components/TitledSection/TitledSection.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TitledSection/TitledSection.module.css
rename to frontend/src/metabase/metadata/components/TitledSection/TitledSection.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TitledSection/TitledSection.tsx b/frontend/src/metabase/metadata/components/TitledSection/TitledSection.tsx
similarity index 71%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TitledSection/TitledSection.tsx
rename to frontend/src/metabase/metadata/components/TitledSection/TitledSection.tsx
index 6eaa9d16636..db2a512d74e 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/TitledSection/TitledSection.tsx
+++ b/frontend/src/metabase/metadata/components/TitledSection/TitledSection.tsx
@@ -6,16 +6,18 @@ import S from "./TitledSection.module.css";
interface Props {
children?: ReactNode;
- title: string;
+ title?: string;
}
export const TitledSection = ({ children, title }: Props) => {
return (
<Card className={S.card} p="lg" pt="md" withBorder>
<Stack gap="lg">
- <Text c="text-secondary" fw="bold" size="sm">
- {title}
- </Text>
+ {title != null ? (
+ <Text c="text-secondary" fw="bold" size="sm">
+ {title}
+ </Text>
+ ) : null}
{children}
</Stack>
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TitledSection/index.ts b/frontend/src/metabase/metadata/components/TitledSection/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TitledSection/index.ts
rename to frontend/src/metabase/metadata/components/TitledSection/index.ts
diff --git a/frontend/src/metabase/metadata/components/UserInput.tsx b/frontend/src/metabase/metadata/components/UserInput.tsx
new file mode 100644
index 00000000000..3692f94d00f
--- /dev/null
+++ b/frontend/src/metabase/metadata/components/UserInput.tsx
@@ -0,0 +1,156 @@
+import { type FocusEvent, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { useListUsersQuery } from "metabase/api";
+import { isEmail } from "metabase/lib/email";
+import { Avatar, Group, Icon, Select, type SelectProps } from "metabase/ui";
+import type { User, UserId } from "metabase-types/api";
+
+interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {
+ email: string | null;
+ userId: UserId | "unknown" | null;
+ onEmailChange: (email: string) => void;
+ onUserIdChange: (value: UserId | "unknown" | null) => void;
+}
+
+export const UserInput = ({
+ comboboxProps,
+ email,
+ userId,
+ onEmailChange,
+ onFocus,
+ onUserIdChange,
+ ...props
+}: Props) => {
+ const [search, setSearch] = useState(email ?? "");
+ const { data: usersData } = useListUsersQuery();
+ const users = useMemo(() => usersData?.data ?? [], [usersData]);
+ const data = useMemo(() => getData(search, users), [search, users]);
+
+ const userName = useMemo(() => {
+ if (userId == null) {
+ return undefined;
+ }
+
+ return users.find((user) => user.id === userId)?.common_name;
+ }, [users, userId]);
+
+ const handleFocus = (event: FocusEvent<HTMLInputElement>) => {
+ event.target.select();
+ onFocus?.(event);
+ };
+
+ const handleChange = (value: string | null) => {
+ if (value == null) {
+ onUserIdChange(null);
+ return;
+ }
+
+ const newValue = parseValue(value);
+
+ if (typeof newValue === "number" || newValue === "unknown") {
+ onUserIdChange(newValue);
+ } else {
+ onEmailChange(value);
+ }
+ };
+
+ return (
+ <Select<string | null>
+ comboboxProps={{
+ middlewares: {
+ flip: true,
+ size: {
+ padding: 6,
+ },
+ },
+ position: "bottom-start",
+ ...comboboxProps,
+ }}
+ data={data}
+ leftSection={
+ userName ? (
+ <Avatar name={userName} />
+ ) : email ? (
+ <Avatar color="initials" name="emails">
+ <Icon name="mail" />
+ </Avatar>
+ ) : userId === "unknown" ? (
+ <Avatar name={t`?`} />
+ ) : null
+ }
+ placeholder={t`Pick someone, or type an email`}
+ nothingFoundMessage={t`Didn't find any results`}
+ searchable
+ searchValue={search}
+ renderOption={(item) => {
+ const option = item.option as Option;
+ return (
+ <Group gap="sm" p="sm">
+ {option.type === "user" && <Avatar name={item.option.label} />}
+ {option.type === "unknown" && <Avatar name={t`?`} />}
+ {option.type === "email" && (
+ <Avatar color="initials" name="emails">
+ <Icon name="mail" />
+ </Avatar>
+ )}
+
+ {option.type === "unknown" && <i>{item.option.label}</i>}
+ {option.type !== "unknown" && <span>{item.option.label}</span>}
+ </Group>
+ );
+ }}
+ value={email ? email : userId ? String(userId) : null}
+ onChange={handleChange}
+ onFocus={handleFocus}
+ onSearchChange={setSearch}
+ {...props}
+ />
+ );
+};
+
+type Option = {
+ label: string;
+ value: string;
+ disabled?: boolean;
+ type: "email" | "user" | "unknown";
+};
+
+function getData(email: string | null, users: User[]): Option[] {
+ return [
+ {
+ label: t`No one`,
+ value: "unknown",
+ type: "unknown" as const,
+ },
+ ...users.map((user) => ({
+ label: user.common_name,
+ value: stringifyValue(user.id) as string,
+ type: "user" as const,
+ })),
+ email == null || email.trim().length === 0
+ ? null
+ : {
+ label: email,
+ value: email,
+ disabled: !isEmail(email),
+ type: "email" as const,
+ },
+ ].filter((option) => option != null);
+}
+
+function stringifyValue(value: UserId | "unknown" | null): string | null {
+ return value === null ? null : String(value);
+}
+
+function parseValue(value: string): UserId | string | "unknown" {
+ if (value === "unknown") {
+ return "unknown";
+ }
+
+ if (isEmail(value)) {
+ return value;
+ }
+
+ return parseInt(value, 10);
+}
diff --git a/frontend/src/metabase/metadata/components/index.ts b/frontend/src/metabase/metadata/components/index.ts
index 6a74ff95de6..1eb68df165f 100644
--- a/frontend/src/metabase/metadata/components/index.ts
+++ b/frontend/src/metabase/metadata/components/index.ts
@@ -1,11 +1,15 @@
export * from "./CoercionStrategyPicker";
export * from "./CurrencyPicker";
+export * from "./DataSourceInput";
export * from "./DiscardFieldValuesButton";
export * from "./DiscardTableFieldValuesButton";
+export * from "./EntityTypeInput";
export * from "./FieldOrderPicker";
export * from "./FieldValuesTypePicker";
export * from "./FieldVisibilityPicker";
export * from "./FkTargetPicker";
+export * from "./LabeledValue";
+export * from "./LayerInput";
export * from "./NameDescriptionInput";
export * from "./RescanFieldButton";
export * from "./RescanTableFieldsButton";
@@ -15,4 +19,6 @@ export * from "./SortableFieldItem";
export * from "./SortableFieldList";
export * from "./SyncTableSchemaButton";
export * from "./TableBreadcrumbs";
+export * from "./TitledSection";
export * from "./UnfoldJsonPicker";
+export * from "./UserInput";
diff --git a/frontend/src/metabase/metadata/hooks/useMetadataToasts.ts b/frontend/src/metabase/metadata/hooks/useMetadataToasts.ts
index b3b38c67da8..92f75cd3a45 100644
--- a/frontend/src/metabase/metadata/hooks/useMetadataToasts.ts
+++ b/frontend/src/metabase/metadata/hooks/useMetadataToasts.ts
@@ -7,9 +7,10 @@ export const useMetadataToasts = () => {
const [sendToast] = useToast();
const sendSuccessToast = useCallback(
- (message: string, undo?: () => void) => {
+ (message: string, undo?: () => void, actionLabel?: string) => {
sendToast({
action: undo,
+ actionLabel,
icon: "check",
message,
});
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FieldSection.module.css b/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FieldSection.module.css
deleted file mode 100644
index 9f24aa68edd..00000000000
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FieldSection.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.header {
- z-index: 3;
-}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModel.module.css b/frontend/src/metabase/metadata/pages/DataModelV1/DataModel.module.css
new file mode 100644
index 00000000000..665373f8b30
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModel.module.css
@@ -0,0 +1,17 @@
+.resizing {
+ cursor: ew-resize;
+ user-select: none;
+}
+
+.column {
+ overflow: auto;
+ border-right: 1px solid var(--mb-color-border);
+}
+
+.footer {
+ border-top: 1px solid var(--mb-color-border);
+}
+
+.preview {
+ box-shadow: 0 10px 30px 0 hsla(0, 0%, 0%, 0.1);
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/DataModel.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
similarity index 98%
rename from frontend/src/metabase/metadata/pages/DataModel/DataModel.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
index 338f534a354..9f48818c8ab 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/DataModel.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
@@ -14,13 +14,16 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { Box, Flex, Stack, rem } from "metabase/ui";
-import S from "./DataModel.module.css";
import {
FieldSection,
FieldValuesModal,
NoDatabasesEmptyState,
PreviewSection,
type PreviewType,
+} from "../shared";
+
+import S from "./DataModel.module.css";
+import {
RouterTablePicker,
SegmentsLink,
SyncOptionsModal,
@@ -36,7 +39,7 @@ interface Props {
params: RouteParams;
}
-export const DataModel = ({ children, location, params }: Props) => {
+export const DataModelV1 = ({ children, location, params }: Props) => {
const { databaseId, fieldId, schemaName, tableId } = parseRouteParams(params);
const { data: databasesData, isLoading: isLoadingDatabases } =
useListDatabasesQuery({ include_editable_data_model: true });
@@ -201,7 +204,7 @@ export const DataModel = ({ children, location, params }: Props) => {
bg="accent-gray-light"
flex={COLUMN_CONFIG.preview.flex}
h="100%"
- p="xl"
+ p="lg"
maw={COLUMN_CONFIG.preview.max}
miw={COLUMN_CONFIG.preview.min}
>
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
new file mode 100644
index 00000000000..bb0d6bd5c6c
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
@@ -0,0 +1,1082 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+import { IndexRedirect, Link, Route } from "react-router";
+
+import {
+ setupCardDataset,
+ setupDatabaseIdFieldsEndpoints,
+ setupDatabasesEndpoints,
+ setupFieldsValuesEndpoints,
+ setupSearchEndpoints,
+ setupTableEndpoints,
+ setupUnauthorizedFieldEndpoint,
+ setupUnauthorizedFieldValuesEndpoints,
+} from "__support__/server-mocks";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+ waitFor,
+ waitForLoaderToBeRemoved,
+ within,
+} from "__support__/ui";
+import { getNextId } from "__support__/utils";
+import { checkNotNull } from "metabase/lib/types";
+import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import registerVisualizations from "metabase/visualizations/register";
+import type {
+ Database,
+ Field,
+ GetFieldValuesResponse,
+} from "metabase-types/api";
+import {
+ createMockDatabase,
+ createMockField,
+ createMockFieldDimension,
+ createMockFieldValues,
+ createMockSearchResult,
+ createMockTable,
+} from "metabase-types/api/mocks";
+import {
+ SAMPLE_DB_FIELD_VALUES,
+ createOrdersDiscountField,
+ createOrdersIdField,
+ createOrdersProductIdField,
+ createOrdersQuantityField,
+ createOrdersTable,
+ createOrdersUserIdField,
+ createPeopleTable,
+ createProductsIdField,
+ createProductsTable,
+ createReviewsTable,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
+
+import { DataModelV1 } from "./DataModelV1";
+import type { ParsedRouteParams } from "./types";
+import { getUrl } from "./utils";
+
+registerVisualizations();
+
+const DEFAULT_ROUTE_PARAMS: ParsedRouteParams = {
+ databaseId: undefined,
+ schemaName: undefined,
+ tableId: undefined,
+ fieldId: undefined,
+};
+
+const ORDERS_ID_FIELD = createOrdersIdField();
+
+const ORDERS_PRODUCT_ID_FIELD = createOrdersProductIdField();
+
+const ORDERS_USER_ID_FIELD = createOrdersUserIdField();
+
+const ORDERS_DISCOUNT_FIELD = createOrdersDiscountField();
+
+const ORDERS_QUANTITY_FIELD = createOrdersQuantityField({
+ dimensions: [
+ createMockFieldDimension({
+ type: "internal",
+ name: "Quantity",
+ }),
+ ],
+ remappings: [
+ [1, "1 remapped"],
+ [2, "2 remapped"],
+ ],
+});
+
+const ORDERS_TABLE = createOrdersTable({
+ fields: [
+ ORDERS_ID_FIELD,
+ ORDERS_PRODUCT_ID_FIELD,
+ ORDERS_USER_ID_FIELD,
+ ORDERS_DISCOUNT_FIELD,
+ ORDERS_QUANTITY_FIELD,
+ ],
+ visibility_type: "technical",
+});
+
+const PRODUCTS_ID_FIELD = createProductsIdField();
+
+const PRODUCTS_TABLE = createProductsTable({
+ fields: [PRODUCTS_ID_FIELD],
+});
+
+const SAMPLE_DB = createSampleDatabase({
+ tables: [ORDERS_TABLE, PRODUCTS_TABLE],
+});
+
+const PEOPLE_TABLE_MULTI_SCHEMA = createPeopleTable({
+ db_id: 2,
+});
+
+const REVIEWS_TABLE_MULTI_SCHEMA = createReviewsTable({
+ db_id: 2,
+ schema: "PRIVATE",
+});
+
+const SAMPLE_DB_MULTI_SCHEMA = createSampleDatabase({
+ id: 2,
+ name: "Multi schema",
+ tables: [PEOPLE_TABLE_MULTI_SCHEMA, REVIEWS_TABLE_MULTI_SCHEMA],
+});
+
+const ORDERS_TABLE_NO_SCHEMA = createOrdersTable({
+ schema: "",
+});
+
+const SAMPLE_DB_NO_SCHEMA = createSampleDatabase({
+ name: "No schema",
+ tables: [ORDERS_TABLE_NO_SCHEMA],
+});
+
+const ORDERS_TABLE_INITIAL_SYNC_INCOMPLETE = createOrdersTable({
+ initial_sync_status: "incomplete",
+});
+
+const SAMPLE_DB_WITH_INITIAL_SYNC_INCOMPLETE = createSampleDatabase({
+ name: "Initial sync incomplete",
+ tables: [ORDERS_TABLE_INITIAL_SYNC_INCOMPLETE],
+});
+
+const JSON_FIELD_ROOT = createMockField({
+ id: 1,
+ name: "JSON",
+ display_name: "Json",
+ base_type: "type/JSON",
+});
+
+const JSON_FIELD_NESTED = createMockField({
+ id: 2,
+ name: "version",
+ display_name: "Version",
+ parent_id: getRawTableFieldId(JSON_FIELD_ROOT),
+ nfc_path: ["JSON", "version"],
+});
+
+const JSON_TABLE = createMockTable({
+ fields: [JSON_FIELD_ROOT, JSON_FIELD_NESTED],
+});
+
+const JSON_DB = createMockDatabase({
+ tables: [JSON_TABLE],
+ features: ["nested-field-columns"],
+});
+
+interface SetupOpts {
+ databases?: Database[];
+ fieldValues?: GetFieldValuesResponse[];
+ hasFieldValuesAccess?: boolean;
+ initialRoute?: string;
+ params?: ParsedRouteParams;
+ unauthorizedField?: Field;
+ waitForDatabase?: boolean;
+ waitForTable?: boolean;
+ shouldSkipTableMocks?: boolean;
+}
+
+const OtherComponent = () => {
+ return (
+ <>
+ <span>Another route</span>
+ <Link to="admin/datamodel">Link to Data Model</Link>
+ </>
+ );
+};
+
+async function setup({
+ databases = [SAMPLE_DB],
+ fieldValues = SAMPLE_DB_FIELD_VALUES,
+ hasFieldValuesAccess = true,
+ initialRoute,
+ params = DEFAULT_ROUTE_PARAMS,
+ unauthorizedField,
+ waitForDatabase = true,
+ waitForTable = true,
+ shouldSkipTableMocks = false,
+}: SetupOpts = {}) {
+ setupDatabasesEndpoints(databases, { hasSavedQuestions: false });
+ setupCardDataset();
+
+ if (!shouldSkipTableMocks) {
+ setupTableEndpoints(createPeopleTable());
+ }
+
+ if (hasFieldValuesAccess) {
+ setupFieldsValuesEndpoints(fieldValues);
+ }
+
+ if (unauthorizedField) {
+ setupUnauthorizedFieldEndpoint(unauthorizedField);
+ setupUnauthorizedFieldValuesEndpoints(
+ getRawTableFieldId(unauthorizedField),
+ );
+ }
+
+ const { history } = renderWithProviders(
+ <>
+ <Route path="notAdmin" component={OtherComponent} />
+ <Route path="admin/datamodel">
+ <IndexRedirect to="database" />
+ <Route path="database" component={DataModelV1} />
+ <Route path="database/:databaseId" component={DataModelV1} />
+ <Route
+ path="database/:databaseId/schema/:schemaId"
+ component={DataModelV1}
+ />
+ <Route
+ path="database/:databaseId/schema/:schemaId/table/:tableId"
+ component={DataModelV1}
+ />
+ <Route
+ path="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId"
+ component={DataModelV1}
+ />
+ </Route>
+ </>,
+ {
+ withRouter: true,
+ initialRoute: initialRoute ?? getUrl(params),
+ },
+ );
+
+ if (waitForDatabase) {
+ expect(
+ await findTablePickerDatabase(databases[0].name),
+ ).toBeInTheDocument();
+ }
+
+ if (waitForTable) {
+ const tableName = checkNotNull(databases[0].tables)[0].display_name;
+ expect(await findTablePickerTable(tableName)).toBeInTheDocument();
+ }
+
+ await waitForLoaderToBeRemoved();
+
+ return { history };
+}
+
+describe("DataModelV1", () => {
+ beforeEach(() => {
+ // so the virtual list renders correctly in the tests
+ mockGetBoundingClientRect();
+ });
+
+ it("should show empty state by default", async () => {
+ await setup();
+
+ expect(screen.getByRole("link", { name: /Segments/ })).toBeInTheDocument();
+ expect(
+ screen.getByText("Start by selecting data to model"),
+ ).toBeInTheDocument();
+ });
+
+ describe("no schema database", () => {
+ it("should select the first database and skip schema selection by default", async () => {
+ setup({ databases: [SAMPLE_DB_NO_SCHEMA] });
+
+ await waitFor(async () => {
+ expect(
+ await findTablePickerDatabase(SAMPLE_DB_NO_SCHEMA.name),
+ ).toBeInTheDocument();
+ });
+
+ expect(
+ await findTablePickerTable(ORDERS_TABLE_NO_SCHEMA.display_name),
+ ).toBeInTheDocument();
+ });
+ });
+
+ describe("single schema database", () => {
+ it("should select the first database and the only schema by default", async () => {
+ await setup();
+
+ expect(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ ).toBeInTheDocument();
+ expect(screen.queryByText(ORDERS_TABLE.schema)).not.toBeInTheDocument();
+ });
+
+ it("should allow to search for a table", async () => {
+ await setup();
+ setupSearchEndpoints([
+ createMockSearchResult({
+ id: getNextId(),
+ model: "table",
+ name: ORDERS_TABLE.display_name,
+ table_name: ORDERS_TABLE.display_name,
+ table_schema: "public",
+ database_name: SAMPLE_DB.name,
+ }),
+ ]);
+
+ const searchValue = ORDERS_TABLE.name.substring(0, 3);
+ await userEvent.type(getTableSearchInput(), searchValue);
+
+ expect(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ ).toBeInTheDocument();
+ expect(
+ screen.queryByText(PRODUCTS_TABLE.display_name),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should not allow to enter an empty table name", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await userEvent.clear(getTableNameInput());
+ await userEvent.tab();
+
+ expect(getTableNameInput()).toHaveValue(ORDERS_TABLE.display_name);
+ });
+
+ it("should not allow to enter an empty field name in table section", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_DISCOUNT_FIELD.display_name);
+ await userEvent.clear(
+ getTableSectionFieldNameInput(ORDERS_DISCOUNT_FIELD.display_name),
+ );
+ await userEvent.tab();
+
+ expect(
+ getTableSectionFieldNameInput(ORDERS_DISCOUNT_FIELD.display_name),
+ ).toHaveValue(ORDERS_DISCOUNT_FIELD.display_name);
+ });
+
+ it("should not allow to enter an empty field name in field section", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_DISCOUNT_FIELD.display_name);
+ await userEvent.clear(getFieldNameInput());
+ await userEvent.tab();
+
+ expect(getFieldNameInput()).toHaveValue(
+ ORDERS_DISCOUNT_FIELD.display_name,
+ );
+ });
+
+ it("should display visible tables", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(PRODUCTS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+
+ expect(
+ await getHideTableButton(PRODUCTS_TABLE.display_name),
+ ).toBeInTheDocument();
+ });
+
+ it("should display hidden tables", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+
+ expect(
+ await getUnhideTableButton(ORDERS_TABLE.display_name),
+ ).toBeInTheDocument();
+ });
+
+ it("clicking on tables with initial_sync_status='incomplete' should not navigate to the table", async () => {
+ await setup({ databases: [SAMPLE_DB_WITH_INITIAL_SYNC_INCOMPLETE] });
+
+ expect(
+ screen.getByText("Start by selecting data to model"),
+ ).toBeInTheDocument();
+
+ expect(
+ within(
+ await findTablePickerTable(
+ ORDERS_TABLE_INITIAL_SYNC_INCOMPLETE.display_name,
+ ),
+ ).queryByRole("button", {
+ name: "Hide table",
+ }),
+ ).not.toBeInTheDocument();
+
+ // This click should not cause a change, as the table should be disabled
+ await expect(
+ userEvent.click(
+ await findTablePickerTable(
+ ORDERS_TABLE_INITIAL_SYNC_INCOMPLETE.display_name,
+ ),
+ ),
+ ).rejects.toThrow(/pointer-events: none/);
+
+ expect(
+ screen.getByText("Start by selecting data to model"),
+ ).toBeInTheDocument();
+ });
+
+ it("should display sort options", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await userEvent.click(screen.getByRole("button", { name: /Sorting/ }));
+
+ expect(screen.getByLabelText("Database order")).toBeInTheDocument();
+ expect(screen.getByLabelText("Alphabetical order")).toBeInTheDocument();
+ expect(screen.getByLabelText("Custom order")).toBeInTheDocument();
+ expect(screen.getByLabelText("Auto order")).toBeInTheDocument();
+ });
+
+ it("should display field visibility options", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_DISCOUNT_FIELD.display_name);
+
+ await userEvent.click(getFieldVisibilityInput());
+
+ const popover = within(await screen.findByRole("listbox"));
+ expect(popover.getByText("Everywhere")).toBeInTheDocument();
+ expect(popover.getByText("Only in detail views")).toBeInTheDocument();
+ expect(popover.getByText("Do not include")).toBeInTheDocument();
+ });
+
+ it("should allow to search for field semantic types", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_DISCOUNT_FIELD.display_name);
+
+ const input = getFieldSemanticTypeInput();
+ await userEvent.click(input);
+
+ const popover = within(await screen.findByRole("listbox"));
+ expect(popover.getByText("Currency")).toBeInTheDocument();
+
+ await userEvent.clear(input);
+ await userEvent.type(input, "In");
+
+ expect(popover.getByText("Income")).toBeInTheDocument();
+ expect(popover.queryByText("Currency")).not.toBeInTheDocument();
+ });
+
+ it("should show the foreign key target for foreign keys", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_PRODUCT_ID_FIELD.display_name);
+
+ const input = getFieldSemanticTypeFkTargetInput();
+ expect(input).toHaveValue("Products → ID");
+
+ await userEvent.click(input);
+ const popover = within(await screen.findByRole("listbox"));
+
+ expect(popover.getByText("Products → ID")).toBeInTheDocument();
+ expect(popover.getByText("Orders → ID")).toBeInTheDocument();
+
+ await userEvent.clear(input);
+ await userEvent.type(input, "Products");
+ expect(popover.getByText("Products → ID")).toBeInTheDocument();
+ });
+
+ it("should show an access denied error if the foreign key field has an inaccessible target", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_USER_ID_FIELD.display_name);
+
+ const input = getFieldSemanticTypeFkTargetInput();
+ expect(input).toBeInTheDocument();
+ expect(input).toHaveValue("");
+ expect(input).toHaveAttribute("placeholder", "Field access denied");
+ });
+
+ it("should not show the foreign key target for non-foreign keys", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_ID_FIELD.display_name);
+
+ expect(
+ within(getFieldSection()).queryByLabelText("Foreign key target"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should show currency settings for currency fields", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_DISCOUNT_FIELD.display_name);
+
+ const currencyInput = within(getFieldSection()).getByPlaceholderText(
+ "Select a currency type",
+ );
+ await userEvent.click(currencyInput);
+
+ const popover = within(await screen.findByRole("listbox"));
+ expect(popover.getByText("Canadian Dollar")).toBeInTheDocument();
+ expect(popover.getByText("Euro")).toBeInTheDocument();
+
+ await userEvent.clear(currencyInput);
+ await userEvent.type(currencyInput, "Dollar");
+
+ expect(popover.getByText("US Dollar")).toBeInTheDocument();
+ expect(popover.getByText("Canadian Dollar")).toBeInTheDocument();
+ expect(popover.queryByText("Euro")).not.toBeInTheDocument();
+ });
+
+ it("should not show currency settings for non-currency fields", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await clickTableSectionField(ORDERS_ID_FIELD.display_name);
+
+ expect(
+ within(getFieldSection()).queryByPlaceholderText(
+ "Select a currency type",
+ ),
+ ).not.toBeInTheDocument();
+ });
+ });
+
+ describe("multi schema database", () => {
+ it("should not select the first schema if there are multiple schemas", async () => {
+ await setup({
+ databases: [SAMPLE_DB_MULTI_SCHEMA],
+ waitForTable: false,
+ shouldSkipTableMocks: true,
+ });
+
+ expect(
+ await findTablePickerDatabase(SAMPLE_DB_MULTI_SCHEMA.name),
+ ).toBeInTheDocument();
+ expect(
+ await findTablePickerSchema(PEOPLE_TABLE_MULTI_SCHEMA.schema),
+ ).toBeInTheDocument();
+ expect(
+ await findTablePickerSchema(REVIEWS_TABLE_MULTI_SCHEMA.schema),
+ ).toBeInTheDocument();
+ expect(
+ screen.queryByText(PEOPLE_TABLE_MULTI_SCHEMA.display_name),
+ ).not.toBeInTheDocument();
+ });
+ });
+
+ describe("multiple databases", () => {
+ it("should be able to switch databases", async () => {
+ await setup({
+ databases: [SAMPLE_DB, SAMPLE_DB_MULTI_SCHEMA],
+ waitForTable: false,
+ shouldSkipTableMocks: true,
+ });
+
+ expect(
+ screen.queryByText(ORDERS_TABLE.display_name),
+ ).not.toBeInTheDocument();
+ await userEvent.click(await findTablePickerDatabase(SAMPLE_DB.name));
+ expect(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ ).toBeInTheDocument();
+
+ await userEvent.click(
+ await findTablePickerDatabase(SAMPLE_DB_MULTI_SCHEMA.name),
+ );
+
+ expect(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ ).toBeInTheDocument();
+
+ await userEvent.click(
+ await findTablePickerSchema(PEOPLE_TABLE_MULTI_SCHEMA.schema),
+ );
+ expect(
+ await findTablePickerTable(PEOPLE_TABLE_MULTI_SCHEMA.display_name),
+ ).toBeInTheDocument();
+ });
+ });
+
+ describe("no databases", () => {
+ // TODO: https://linear.app/metabase/issue/SEM-459/empty-state-when-there-are-no-databases
+ // eslint-disable-next-line jest/no-disabled-tests
+ it.skip("should display an empty state", async () => {
+ await setup({
+ databases: [],
+ waitForDatabase: false,
+ waitForTable: false,
+ });
+
+ expect(
+ screen.getByText("The page you asked for couldn't be found."),
+ ).toBeInTheDocument();
+ });
+ });
+
+ describe("databases with json fields", () => {
+ it("should display unfolded json fields", async () => {
+ await setup({ databases: [JSON_DB] });
+
+ await userEvent.click(
+ await findTablePickerTable(JSON_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+
+ expect(getTableNameInput()).toBeInTheDocument();
+ expect(getTableNameInput()).toHaveValue(JSON_TABLE.display_name);
+
+ expect(
+ getTableSectionFieldNameInput(JSON_FIELD_ROOT.display_name),
+ ).toBeInTheDocument();
+ expect(
+ getTableSectionFieldNameInput(JSON_FIELD_NESTED.display_name),
+ ).toBeInTheDocument();
+
+ expect(
+ getTableSectionField(JSON_FIELD_NESTED.display_name),
+ ).toHaveTextContent(`${JSON_FIELD_ROOT.display_name}:`);
+ });
+
+ describe("navigation", () => {
+ it("should replace locations in history stack when being routed automatically", async () => {
+ const { history } = await setup({
+ initialRoute: "notAdmin",
+ waitForDatabase: false,
+ waitForTable: false,
+ });
+
+ expect(screen.getByText("Link to Data Model")).toBeInTheDocument();
+ await userEvent.click(
+ screen.getByRole("link", { name: "Link to Data Model" }),
+ );
+
+ await waitForLoaderToBeRemoved();
+ expect(screen.getByText("Sample Database")).toBeInTheDocument();
+
+ history?.goBack();
+
+ await waitFor(() => {
+ expect(
+ screen.getByRole("link", { name: "Link to Data Model" }),
+ ).toBeInTheDocument();
+ });
+ });
+ });
+ });
+
+ describe("table section", () => {
+ it("should allow to rescan field values", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await userEvent.click(
+ screen.getByRole("button", { name: /Sync options/ }),
+ );
+ await userEvent.click(
+ screen.getByRole("button", { name: "Re-scan table" }),
+ );
+
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/table/${ORDERS_TABLE.id}/rescan_values`,
+ {
+ method: "POST",
+ },
+ );
+
+ await waitFor(() => {
+ expect(calls.length).toBeGreaterThan(0);
+ });
+
+ const lastCall = calls[calls.length - 1];
+ expect(JSON.parse(lastCall.options.body as string)).toEqual({});
+ });
+
+ it("should allow to discard field values", async () => {
+ await setup();
+
+ await userEvent.click(
+ await findTablePickerTable(ORDERS_TABLE.display_name),
+ );
+ await waitForLoaderToBeRemoved();
+ await userEvent.click(
+ screen.getByRole("button", { name: /Sync options/ }),
+ );
+ await userEvent.click(
+ screen.getByRole("button", {
+ name: "Discard cached field values",
+ }),
+ );
+
+ const calls = fetchMock.callHistory.calls(
+ `path:/api/table/${ORDERS_TABLE.id}/discard_values`,
+ {
+ method: "POST",
+ },
+ );
+
+ await waitFor(() => {
+ expect(calls.length).toBeGreaterThan(0);
+ });
+
+ const lastCall = calls[calls.length - 1];
+ expect(JSON.parse(lastCall.options.body as string)).toEqual({});
+ });
+ });
+
+ describe("field section", () => {
+ it("should display json unfolding settings for json fields", async () => {
+ await setup({
+ databases: [JSON_DB],
+ params: {
+ databaseId: JSON_DB.id,
+ schemaName: JSON_TABLE.schema,
+ tableId: JSON_TABLE.id,
+ fieldId: getRawTableFieldId(JSON_FIELD_ROOT),
+ },
+ });
+
+ expect(screen.getByText("Unfold JSON")).toBeInTheDocument();
+ });
+
+ it("should not display json unfolding settings for non-json fields", async () => {
+ await setup({
+ params: {
+ databaseId: SAMPLE_DB.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_DISCOUNT_FIELD),
+ },
+ });
+
+ expect(screen.queryByText("Unfold JSON")).not.toBeInTheDocument();
+ });
+
+ it("should display type casting settings for supported fields", async () => {
+ await setup({
+ params: {
+ databaseId: SAMPLE_DB.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_ID_FIELD),
+ },
+ });
+
+ expect(getFieldCoercionToggle()).toBeInTheDocument();
+ await userEvent.click(getFieldCoercionToggle());
+
+ await userEvent.type(getFieldCoercionInput(), "Micro");
+ expect(
+ screen.getByText("UNIX microseconds → Datetime"),
+ ).toBeInTheDocument();
+ });
+
+ it("should display type casting settings for float fields", async () => {
+ await setup({
+ params: {
+ databaseId: SAMPLE_DB.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_DISCOUNT_FIELD),
+ },
+ });
+
+ expect(getFieldCoercionToggle()).toBeInTheDocument();
+ await userEvent.click(getFieldCoercionToggle());
+
+ await userEvent.type(getFieldCoercionInput(), "Float");
+ expect(screen.getByText("Float → Integer")).toBeInTheDocument();
+ });
+
+ it("should show an access denied error if the foreign key field has an inaccessible target", async () => {
+ const productsTable = createProductsTable({
+ fields: [
+ /* no PRODUCTS_ID_FIELD */
+ ],
+ });
+
+ const database = createSampleDatabase({
+ tables: [ORDERS_TABLE, productsTable],
+ });
+
+ await setup({
+ databases: [database],
+ params: {
+ databaseId: database.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_PRODUCT_ID_FIELD),
+ },
+ unauthorizedField: PRODUCTS_ID_FIELD,
+ });
+
+ const input = getFieldSemanticTypeFkTargetInput();
+ expect(input).toBeInTheDocument();
+ expect(input).toHaveValue("");
+ expect(input).toHaveAttribute("placeholder", "Field access denied");
+ });
+
+ it("should show custom mapping if has data access", async () => {
+ await setup({
+ fieldValues: [
+ createMockFieldValues({
+ field_id: getRawTableFieldId(ORDERS_QUANTITY_FIELD),
+ values: [
+ [1, "1 remapped"],
+ [2, "2 remapped"],
+ ],
+ }),
+ ],
+ params: {
+ databaseId: SAMPLE_DB.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_QUANTITY_FIELD),
+ },
+ });
+
+ expect(getFieldDisplayValuesInput()).toHaveValue("Custom mapping");
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "Edit mapping" }),
+ );
+
+ await waitFor(() => {
+ expect(screen.getByRole("dialog")).toBeInTheDocument();
+ });
+
+ const modal = screen.getByRole("dialog");
+ expect(modal).toHaveTextContent("Custom mapping");
+ expect(within(modal).getByDisplayValue("1 remapped")).toBeInTheDocument();
+ expect(within(modal).getByDisplayValue("2 remapped")).toBeInTheDocument();
+ });
+
+ it("should show an access denied error if is custom mapping without data permissions", async () => {
+ await setup({
+ params: {
+ databaseId: SAMPLE_DB.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_QUANTITY_FIELD),
+ },
+ hasFieldValuesAccess: false,
+ unauthorizedField: ORDERS_QUANTITY_FIELD,
+ });
+ setupDatabaseIdFieldsEndpoints({
+ database: SAMPLE_DB,
+ });
+
+ expect(screen.getByText("Custom mapping")).toBeInTheDocument();
+ expect(
+ await screen.findByText(
+ "You need unrestricted data access on this table to map custom display values.",
+ ),
+ ).toBeInTheDocument();
+ });
+
+ it("should allow to rescan field values", async () => {
+ await setup({
+ params: {
+ databaseId: SAMPLE_DB.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_ID_FIELD),
+ },
+ });
+
+ await userEvent.click(
+ screen.getByRole("button", { name: /Field values/ }),
+ );
+ await userEvent.click(
+ screen.getByRole("button", { name: "Re-scan field" }),
+ );
+
+ await waitFor(() => {
+ const path = `path:/api/field/${ORDERS_ID_FIELD.id}/rescan_values`;
+ expect(
+ fetchMock.callHistory.called(path, { method: "POST" }),
+ ).toBeTruthy();
+ });
+ });
+
+ it("should allow to discard field values", async () => {
+ await setup({
+ params: {
+ databaseId: SAMPLE_DB.id,
+ schemaName: ORDERS_TABLE.schema,
+ tableId: ORDERS_TABLE.id,
+ fieldId: getRawTableFieldId(ORDERS_ID_FIELD),
+ },
+ });
+
+ await userEvent.click(
+ screen.getByRole("button", { name: /Field values/ }),
+ );
+ await userEvent.click(
+ screen.getByRole("button", { name: "Discard cached field values" }),
+ );
+
+ await waitFor(() => {
+ const path = `path:/api/field/${ORDERS_ID_FIELD.id}/discard_values`;
+ expect(
+ fetchMock.callHistory.called(path, { method: "POST" }),
+ ).toBeTruthy();
+ });
+ });
+ });
+});
+
+function getTableSearchInput() {
+ return screen.getByPlaceholderText("Search tables");
+}
+
+function getTableNameInput() {
+ return screen.getByPlaceholderText("Give this table a name");
+}
+
+/** table picker helpers */
+
+async function findTablePickerDatabase(name: string) {
+ return await findTablePickerItem("database", name);
+}
+
+async function findTablePickerSchema(name: string) {
+ return await findTablePickerItem("schema", name);
+}
+
+async function findTablePickerTable(name: string) {
+ return await findTablePickerItem("table", name);
+}
+
+async function findTablePickerItem(
+ type: "table" | "schema" | "database",
+ name: string,
+) {
+ let items: HTMLElement[] = [];
+
+ await waitFor(() => {
+ const allItems = screen.queryAllByTestId("tree-item");
+ items = allItems.filter(
+ (el) =>
+ el.getAttribute("data-type") === type && el.textContent?.includes(name),
+ );
+
+ if (items.length !== 1) {
+ throw new Error(`Cannot find ${type} in table picker`); // trigger retry
+ }
+ });
+
+ return items[0];
+}
+
+async function getHideTableButton(name: string) {
+ return within(await findTablePickerTable(name)).getByRole("button", {
+ name: "Hide table",
+ });
+}
+
+async function getUnhideTableButton(name: string) {
+ return within(await findTablePickerTable(name)).getByRole("button", {
+ name: "Unhide table",
+ });
+}
+
+/** table section helpers */
+
+function getTableSection() {
+ return screen.getByTestId("table-section");
+}
+
+function getTableSectionField(name: string) {
+ return within(getTableSection()).getByLabelText(name);
+}
+
+function getTableSectionFieldNameInput(name: string) {
+ return within(getTableSectionField(name)).getByPlaceholderText(
+ "Give this field a name",
+ );
+}
+
+async function clickTableSectionField(name: string) {
+ await userEvent.click(within(getTableSectionField(name)).getByRole("img"));
+}
+
+/** field section helpers */
+
+function getFieldSection() {
+ return screen.getByTestId("field-section");
+}
+
+function getFieldNameInput() {
+ return within(getFieldSection()).getByPlaceholderText(
+ "Give this field a name",
+ );
+}
+
+function getFieldCoercionToggle() {
+ return within(getFieldSection()).getByLabelText(
+ "Cast to a specific data type",
+ );
+}
+
+function getFieldCoercionInput() {
+ return within(getFieldSection()).getByPlaceholderText("Select data type");
+}
+
+function getFieldSemanticTypeInput() {
+ return within(getFieldSection()).getByPlaceholderText(
+ "Select a semantic type",
+ );
+}
+
+function getFieldSemanticTypeFkTargetInput() {
+ return within(getFieldSection()).getByLabelText("Foreign key target");
+}
+
+function getFieldVisibilityInput() {
+ return within(getFieldSection()).getByPlaceholderText(
+ "Select a field visibility",
+ );
+}
+
+function getFieldDisplayValuesInput() {
+ return within(getFieldSection()).getByPlaceholderText(
+ "Select display values",
+ );
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/SyncOptionsModal.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/SyncOptionsModal.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/SyncOptionsModal.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/SyncOptionsModal.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
new file mode 100644
index 00000000000..c609f2e4c95
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
@@ -0,0 +1,109 @@
+import type { MouseEvent } from "react";
+import { useLatest } from "react-use";
+import { t } from "ttag";
+
+import { useUpdateTableListMutation } from "metabase/api";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { ActionIcon, Icon, Loader, Tooltip } from "metabase/ui";
+import type { Table } from "metabase-types/api";
+
+interface Props {
+ className?: string;
+ tables: Table[];
+ onUpdate: () => void;
+}
+
+export function BulkTableVisibilityToggle({
+ className,
+ tables,
+ onUpdate,
+}: Props) {
+ const [updateTables, { isLoading }] = useUpdateTableListMutation();
+ const { sendErrorToast, sendSuccessToast, sendUndoToast } =
+ useMetadataToasts();
+ const areAllHidden = tables.every((table) => table.visibility_type != null);
+ const onUpdateRef = useLatest(onUpdate);
+
+ const hide = async () => {
+ const ids = tables
+ .filter((table) => table.visibility_type == null)
+ .map((table) => table.id);
+ const { error } = await updateTables({
+ ids,
+ visibility_type: "hidden",
+ });
+
+ onUpdateRef.current();
+
+ if (error) {
+ sendErrorToast(t`Failed to hide tables`);
+ } else {
+ sendSuccessToast(t`Tables hidden`, async () => {
+ const { error } = await updateTables({
+ ids,
+ visibility_type: null,
+ });
+
+ onUpdateRef.current();
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const unhide = async () => {
+ const ids = tables.map((table) => table.id);
+ const { error } = await updateTables({
+ ids,
+ visibility_type: null,
+ });
+
+ onUpdateRef.current();
+
+ if (error) {
+ sendErrorToast(t`Failed to unhide`);
+ } else {
+ sendSuccessToast(t`Tables unhidden`, async () => {
+ const { error } = await updateTables({
+ ids,
+ visibility_type: "hidden",
+ });
+
+ onUpdateRef.current();
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
+ event.stopPropagation();
+ event.preventDefault();
+
+ if (areAllHidden) {
+ unhide();
+ } else {
+ hide();
+ }
+ };
+
+ if (isLoading) {
+ return (
+ <ActionIcon disabled variant="transparent">
+ <Loader data-testid="loading-indicator" size="xs" />
+ </ActionIcon>
+ );
+ }
+
+ return (
+ <Tooltip label={areAllHidden ? t`Unhide all tables` : t`Hide all tables`}>
+ <ActionIcon
+ aria-label={areAllHidden ? t`Unhide all tables` : t`Hide all tables`}
+ className={className}
+ disabled={isLoading}
+ variant="transparent"
+ onClick={handleClick}
+ >
+ <Icon name={areAllHidden ? "eye_crossed_out" : "eye"} />
+ </ActionIcon>
+ </Tooltip>
+ );
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.module.css b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.module.css
new file mode 100644
index 00000000000..44a13de2ba6
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.module.css
@@ -0,0 +1,8 @@
+.emptyState {
+ color: var(--mb-color-text-secondary);
+}
+
+.empyIcon {
+ background-color: var(--mb-color-bg-medium);
+ border-radius: 100%;
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.tsx
new file mode 100644
index 00000000000..9f1607309fe
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.tsx
@@ -0,0 +1,18 @@
+import { Box, Flex, Icon, Stack } from "metabase/ui";
+
+import S from "./EmptyState.module.css";
+
+interface Props {
+ title: string;
+}
+
+export function EmptyState({ title }: Props) {
+ return (
+ <Stack py="xl" align="center" className={S.emptyState} gap="md">
+ <Flex className={S.empyIcon} p="lg" align="center" justify="center">
+ <Icon name="table2" />
+ </Flex>
+ <Box>{title}</Box>
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Results.module.css b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Results.module.css
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Results.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx
similarity index 98%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Results.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx
index 2791aa1a822..1f02e06d04f 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Results.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx
@@ -1,6 +1,12 @@
import { useVirtualizer } from "@tanstack/react-virtual";
import cx from "classnames";
-import { type KeyboardEvent, useEffect, useRef, useState } from "react";
+import {
+ type KeyboardEvent,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from "react";
import { Link } from "react-router";
import { Box, Flex, Icon, Skeleton, rem } from "metabase/ui";
@@ -316,13 +322,13 @@ export function Results({
}
function Loading() {
- const w = 20 + Math.random() * 80;
+ const width = useMemo(() => 20 + Math.random() * 80, []);
return (
<Skeleton
data-testid="loading-placeholder"
- height={rem(12)}
- width={`${w}%`}
+ height={rem(16)}
+ width={`${width}%`}
radius="sm"
/>
);
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Search.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Search.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Search.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Search.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TablePicker.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TablePicker.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TablePicker.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TablePicker.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TablePicker.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TablePicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/TablePicker.unit.spec.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TablePicker.unit.spec.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
new file mode 100644
index 00000000000..21ecdd4352b
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
@@ -0,0 +1,102 @@
+import type { MouseEvent } from "react";
+import { useLatest } from "react-use";
+import { t } from "ttag";
+
+import { useUpdateTableMutation } from "metabase/api";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { ActionIcon, Icon, Loader, Tooltip } from "metabase/ui";
+import type { Table } from "metabase-types/api";
+
+interface Props {
+ className?: string;
+ table: Table;
+ onUpdate: () => void;
+}
+
+export function TableVisibilityToggle({ className, table, onUpdate }: Props) {
+ const [updateTable, { isLoading }] = useUpdateTableMutation();
+ const { sendErrorToast, sendSuccessToast, sendUndoToast } =
+ useMetadataToasts();
+ const isHidden = table.visibility_type != null;
+ const onUpdateRef = useLatest(onUpdate);
+
+ const hide = async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ visibility_type: "hidden",
+ });
+
+ onUpdateRef.current();
+
+ if (error) {
+ sendErrorToast(t`Failed to hide ${table.display_name}`);
+ } else {
+ sendSuccessToast(t`Hid ${table.display_name}`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ visibility_type: null,
+ });
+
+ onUpdateRef.current();
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const unhide = async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ visibility_type: null,
+ });
+
+ onUpdateRef.current();
+
+ if (error) {
+ sendErrorToast(t`Failed to unhide ${table.display_name}`);
+ } else {
+ sendSuccessToast(t`Unhid ${table.display_name}`, async () => {
+ const { error } = await updateTable({
+ id: table.id,
+ visibility_type: "hidden",
+ });
+
+ onUpdateRef.current();
+ sendUndoToast(error);
+ });
+ }
+ };
+
+ const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
+ event.stopPropagation();
+ event.preventDefault();
+
+ if (isHidden) {
+ unhide();
+ } else {
+ hide();
+ }
+ };
+
+ if (isLoading) {
+ return (
+ <ActionIcon disabled variant="transparent">
+ <Loader data-testid="loading-indicator" size="xs" />
+ </ActionIcon>
+ );
+ }
+
+ return (
+ <Tooltip label={isHidden ? t`Unhide table` : t`Hide table`}>
+ <ActionIcon
+ aria-label={isHidden ? t`Unhide table` : t`Hide table`}
+ c={table.visibility_type != null ? "text-secondary" : undefined}
+ className={className}
+ disabled={isLoading}
+ variant="transparent"
+ onClick={handleClick}
+ >
+ <Icon name={isHidden ? "eye_crossed_out" : "eye"} />
+ </ActionIcon>
+ </Tooltip>
+ );
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
new file mode 100644
index 00000000000..ca24ac1a99e
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
@@ -0,0 +1,178 @@
+import userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
+
+import { setupTableEndpoints } from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
+import { UndoListing } from "metabase/common/components/UndoListing";
+import type { Table } from "metabase-types/api";
+import { createMockTable } from "metabase-types/api/mocks";
+
+import { TableVisibilityToggle } from "./TableVisibilityToggle";
+
+function setup({ table }: { table: Table }) {
+ setupTableEndpoints(table);
+
+ renderWithProviders(
+ <>
+ <TableVisibilityToggle table={table} onUpdate={jest.fn()} />
+ <UndoListing />
+ </>,
+ );
+}
+
+describe("TableVisibilityToggle", () => {
+ describe("visible table", () => {
+ const VISIBLE_TABLE = createMockTable({
+ visibility_type: null,
+ });
+
+ it("should have a tooltip that says 'Hide table' when a visible table is hovered", async () => {
+ setup({
+ table: VISIBLE_TABLE,
+ });
+
+ const toggle = screen.getByLabelText("eye icon");
+ expect(toggle).toBeInTheDocument();
+
+ await userEvent.hover(toggle);
+ expect(await screen.findByText("Hide table")).toBeInTheDocument();
+ });
+
+ it("should hide the table when a visible table is clicked", async () => {
+ setup({
+ table: VISIBLE_TABLE,
+ });
+
+ const toggle = screen.getByLabelText("eye icon");
+ expect(toggle).toBeInTheDocument();
+ await userEvent.click(toggle);
+
+ expect(
+ fetchMock.callHistory.calls(`path:/api/table/${VISIBLE_TABLE.id}`, {
+ method: "PUT",
+ }),
+ ).toHaveLength(1);
+
+ const call = fetchMock.callHistory.calls(
+ `path:/api/table/${VISIBLE_TABLE.id}`,
+ {
+ method: "PUT",
+ },
+ )[0];
+ const body = await (call.options?.body as unknown as Promise<string>);
+
+ expect(JSON.parse(body)).toEqual({ visibility_type: "hidden" });
+
+ await waitFor(() => {
+ const undo = screen.getByTestId("undo-list");
+ expect(within(undo).getByText("Hid Table")).toBeInTheDocument();
+ });
+ });
+
+ it("should show an error when hiding fails", async () => {
+ setup({
+ table: VISIBLE_TABLE,
+ });
+
+ fetchMock.modifyRoute(`table-${VISIBLE_TABLE.id}-put`, {
+ response: { status: 500 },
+ });
+
+ const toggle = screen.getByLabelText("eye icon");
+ expect(toggle).toBeInTheDocument();
+ await userEvent.click(toggle);
+
+ expect(
+ fetchMock.callHistory.calls(`path:/api/table/${VISIBLE_TABLE.id}`, {
+ method: "PUT",
+ }),
+ ).toHaveLength(1);
+
+ await waitFor(() => {
+ const undo = screen.getByTestId("undo-list");
+ expect(
+ within(undo).getByText("Failed to hide Table"),
+ ).toBeInTheDocument();
+ });
+ });
+ });
+
+ describe("hidden table", () => {
+ const HIDDEN_TABLE = createMockTable({
+ visibility_type: "hidden",
+ });
+
+ it("should have a tooltip that says 'Unhide table' when a visible table is hovered", async () => {
+ setup({
+ table: HIDDEN_TABLE,
+ });
+
+ const toggle = screen.getByLabelText("eye_crossed_out icon");
+ expect(toggle).toBeInTheDocument();
+
+ await userEvent.hover(toggle);
+ expect(await screen.findByText("Unhide table")).toBeInTheDocument();
+ });
+
+ it("should unhide the table when a visible table is clicked", async () => {
+ setup({
+ table: HIDDEN_TABLE,
+ });
+
+ const toggle = screen.getByLabelText("eye_crossed_out icon");
+ expect(toggle).toBeInTheDocument();
+ await userEvent.click(toggle);
+
+ expect(
+ fetchMock.callHistory.calls(`path:/api/table/${HIDDEN_TABLE.id}`, {
+ method: "PUT",
+ }),
+ ).toHaveLength(1);
+
+ const call = fetchMock.callHistory.calls(
+ `path:/api/table/${HIDDEN_TABLE.id}`,
+ {
+ method: "PUT",
+ },
+ )[0];
+ const body = await (call.options?.body as unknown as Promise<string>);
+
+ expect(JSON.parse(body)).toEqual({ visibility_type: null });
+
+ await waitFor(() => {
+ const undo = screen.getByTestId("undo-list");
+ expect(within(undo).getByText("Unhid Table")).toBeInTheDocument();
+ });
+ });
+
+ it("should show an error when unhiding fails", async () => {
+ setup({
+ table: HIDDEN_TABLE,
+ });
+
+ fetchMock.removeRoute(`table-${HIDDEN_TABLE.id}-put`);
+ fetchMock.put(
+ `path:/api/table/${HIDDEN_TABLE.id}`,
+ { status: 500 },
+ { name: `table-${HIDDEN_TABLE.id}-put` },
+ );
+
+ const toggle = screen.getByLabelText("eye_crossed_out icon");
+ expect(toggle).toBeInTheDocument();
+ await userEvent.click(toggle);
+
+ expect(
+ fetchMock.callHistory.calls(`path:/api/table/${HIDDEN_TABLE.id}`, {
+ method: "PUT",
+ }),
+ ).toHaveLength(1);
+
+ await waitFor(() => {
+ const undo = screen.getByTestId("undo-list");
+ expect(
+ within(undo).getByText("Failed to unhide Table"),
+ ).toBeInTheDocument();
+ });
+ });
+ });
+});
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Tree.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Tree.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/components/Tree.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Tree.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/index.ts
new file mode 100644
index 00000000000..0be6cdf2bd9
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/index.ts
@@ -0,0 +1 @@
+export * from "./TablePicker";
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/constants.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/constants.ts
new file mode 100644
index 00000000000..414a10d38c0
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/constants.ts
@@ -0,0 +1,17 @@
+import type { IconName } from "metabase/ui";
+
+import type { ItemType } from "./types";
+
+export const UNNAMED_SCHEMA_NAME = "";
+
+export const CHILD_TYPES = {
+ database: "schema",
+ schema: "table",
+ table: null,
+} as const;
+
+export const TYPE_ICONS: Record<ItemType, IconName> = {
+ table: "table2",
+ schema: "folder",
+ database: "database",
+};
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/index.ts
new file mode 100644
index 00000000000..198d9c570ff
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/index.ts
@@ -0,0 +1,3 @@
+export * from "./useExpandedState";
+export * from "./useSearch";
+export * from "./useTableLoader";
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useExpandedState.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useExpandedState.ts
new file mode 100644
index 00000000000..4a9eb7f7d98
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useExpandedState.ts
@@ -0,0 +1,39 @@
+import { useCallback, useEffect, useState } from "react";
+
+import type { TreePath } from "../types";
+import { expandPath, toKey } from "../utils";
+
+/**
+ * Returns a state object that indicates which nodes are expanded in the tree.
+ */
+export function useExpandedState(path: TreePath) {
+ const [state, setState] = useState(expandPath({}, path));
+
+ const { databaseId, schemaName, tableId } = path;
+
+ useEffect(() => {
+ // When the path changes, this means a user has navigated throught the browser back
+ // button, ensure the path is completely expanded.
+ setState((state) => expandPath(state, { databaseId, schemaName, tableId }));
+ }, [databaseId, schemaName, tableId]);
+
+ const isExpanded = useCallback(
+ (path: string | TreePath) => {
+ const key = typeof path === "string" ? path : toKey(path);
+ return Boolean(state[key]);
+ },
+ [state],
+ );
+
+ const toggle = useCallback((key: string, value?: boolean) => {
+ setState((current) => ({
+ ...current,
+ [key]: value ?? !current[key],
+ }));
+ }, []);
+
+ return {
+ isExpanded,
+ toggle,
+ };
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useSearch.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useSearch.ts
new file mode 100644
index 00000000000..832e2da0d2b
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useSearch.ts
@@ -0,0 +1,89 @@
+import { useMemo } from "react";
+
+import { skipToken, useSearchQuery } from "metabase/api";
+import { isSyncCompleted } from "metabase/lib/syncing";
+
+import type { DatabaseNode, SchemaNode, TableNode, TreeNode } from "../types";
+import { node, rootNode } from "../utils";
+
+/**
+ * Fetch items from the search API and renders them as a TreeNode so we can use the same
+ * data structure for the tree and the search results and render them in a consistent way.
+ */
+export function useSearch(query: string) {
+ const { data, isLoading } = useSearchQuery(
+ query === ""
+ ? skipToken
+ : {
+ q: query,
+ models: ["table"],
+ },
+ );
+
+ const tree = useMemo(() => {
+ const tree: TreeNode = rootNode();
+
+ data?.data.forEach((result) => {
+ const { model, database_name, database_id, table_schema, id, name } =
+ result;
+ const tableSchema = table_schema ?? "";
+
+ if (model !== "table" || database_name === null) {
+ return;
+ }
+
+ let databaseNode = tree.children.find(
+ (node) =>
+ node.type === "database" && node.value.databaseId === database_id,
+ );
+ if (!databaseNode) {
+ databaseNode = node<DatabaseNode>({
+ type: "database",
+ label: database_name,
+ value: {
+ databaseId: database_id,
+ },
+ });
+ tree.children.push(databaseNode);
+ }
+
+ let schemaNode = databaseNode.children.find((node) => {
+ return node.type === "schema" && node.value.schemaName === tableSchema;
+ });
+ if (!schemaNode) {
+ schemaNode = node<SchemaNode>({
+ type: "schema",
+ label: tableSchema,
+ value: {
+ databaseId: database_id,
+ schemaName: tableSchema,
+ },
+ });
+ databaseNode.children.push(schemaNode);
+ }
+
+ let tableNode = schemaNode.children.find(
+ (node) => node.type === "table" && node.value.tableId === id,
+ );
+ if (!tableNode) {
+ tableNode = node<TableNode>({
+ type: "table",
+ label: name,
+ value: {
+ databaseId: database_id,
+ schemaName: tableSchema,
+ tableId: id,
+ },
+ disabled: !isSyncCompleted(result),
+ });
+ schemaNode.children.push(tableNode);
+ }
+ });
+ return tree;
+ }, [data]);
+
+ return {
+ isLoading,
+ tree,
+ };
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/useTableLoader.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useTableLoader.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/hooks/useTableLoader.ts
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useTableLoader.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/index.ts
new file mode 100644
index 00000000000..c383cef74b7
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/index.ts
@@ -0,0 +1,2 @@
+export { TablePicker } from "./components";
+export * from "./wrappers";
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/types.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/types.ts
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/types.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/utils.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/utils.ts
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/utils.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/wrappers.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/wrappers.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/FieldItem.module.css b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/FieldItem.module.css
new file mode 100644
index 00000000000..e9e36ead8cf
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/FieldItem.module.css
@@ -0,0 +1,62 @@
+.card {
+ box-shadow: 0 2px 4px 0 hsla(0, 0%, 0%, 0.05) !important;
+ overflow: visible; /* so that outline from focus state of inner <a /> is not cut off */
+
+ &:hover {
+ &:not(.active) {
+ background-color: var(--mb-color-brand-lighter) !important;
+ }
+ }
+}
+
+.active {
+ border-color: var(--mb-color-brand) !important;
+}
+
+.link {
+ border-radius: inherit;
+}
+
+.icon {
+ color: var(--mb-color-brand);
+}
+
+.input {
+ overflow: hidden;
+ line-height: var(--mantine-line-height) !important;
+
+ &:focus-within {
+ border-color: var(--mb-color-brand) !important;
+ }
+
+ textarea {
+ cursor: text;
+
+ &:focus {
+ color: var(--mb-color-text-secondary);
+ background-color: var(--mb-color-brand-lighter);
+ }
+ }
+
+ .active & {
+ textarea {
+ &:focus,
+ &:hover {
+ background-color: var(--mb-color-bg-white);
+ }
+ }
+ }
+}
+
+.description {
+ line-height: var(--mantine-line-height-lg) !important;
+}
+
+.name {
+ line-clamp: 1;
+ -webkit-line-clamp: 1;
+
+ textarea {
+ white-space: nowrap;
+ }
+}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldItem/FieldItem.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/FieldItem.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldItem/FieldItem.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/FieldItem.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/index.ts
new file mode 100644
index 00000000000..8432734e678
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldItem/index.ts
@@ -0,0 +1 @@
+export * from "./FieldItem";
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldList.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldList.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/FieldList/FieldList.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/FieldList.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/index.ts
new file mode 100644
index 00000000000..cd5026f9b2c
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/FieldList/index.ts
@@ -0,0 +1 @@
+export * from "./FieldList";
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.module.css b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/TableSection.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.module.css
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/TableSection.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/TableSection.tsx
similarity index 95%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/TableSection.tsx
index 95aad63df1f..a8d22545406 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/TableSection.tsx
@@ -14,6 +14,7 @@ import {
SortableFieldList,
} from "metabase/metadata/components";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { ResponsiveButton } from "metabase/metadata/pages/shared/ResponsiveButton";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import {
ActionIcon,
@@ -28,7 +29,6 @@ import type { FieldId, Table, TableFieldOrder } from "metabase-types/api";
import type { RouteParams } from "../../types";
import { getUrl, parseRouteParams } from "../../utils";
-import { ResponsiveButton } from "../ResponsiveButton";
import { FieldList } from "./FieldList";
import S from "./TableSection.module.css";
@@ -145,15 +145,15 @@ const TableSectionBase = ({ params, table, onSyncOptionsClick }: Props) => {
};
return (
- <Stack data-testid="table-section" gap={0} pb="xl">
+ <Stack data-testid="table-section" gap={0} pb="lg">
<Stack
bg="accent-gray-light"
className={S.header}
gap="lg"
pb={12}
pos="sticky"
- pt="xl"
- px="xl"
+ pt="lg"
+ px="lg"
top={0}
>
<NameDescriptionInput
@@ -243,14 +243,15 @@ const TableSectionBase = ({ params, table, onSyncOptionsClick }: Props) => {
</Group>
</Stack>
- <Stack gap="lg" px="xl">
+ <Stack gap="lg" px="lg">
<Stack gap={12}>
{!hasFields && <EmptyState message={t`This table has no fields`} />}
{isSorting && hasFields && (
<SortableFieldList
- activeFieldId={fieldId}
- table={table}
+ activeFieldKey={fieldId}
+ fields={table.fields ?? []}
+ getFieldKey={getRawTableFieldId}
onChange={handleCustomFieldOrderChange}
/>
)}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/TableSection.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/TableSection/TableSection.unit.spec.tsx
rename to frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/TableSection.unit.spec.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/hooks.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/hooks.ts
new file mode 100644
index 00000000000..94639c06143
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/hooks.ts
@@ -0,0 +1,58 @@
+import { useElementSize } from "@mantine/hooks";
+import { useState } from "react";
+
+const BUTTONS_GAP = 16;
+const LOADER_WIDTH = 16;
+const FIELD_ORDER_PICKER_WIDTH = 136;
+
+export const useResponsiveButtons = ({
+ hasFields,
+ isSorting,
+ isUpdatingSorting,
+}: {
+ hasFields: boolean;
+ isSorting: boolean;
+ isUpdatingSorting: boolean;
+}) => {
+ const { ref: buttonsContainerRef, width: buttonsContainerWidth } =
+ useElementSize();
+ const [sortingButtonWidth, setSortingButtonWidth] = useState(0);
+ const [syncButtonWidth, setSyncButtonWidth] = useState(0);
+ const [doneButtonWidth, setDoneButtonWidth] = useState(0);
+ const requiredWidth = getRequiredWidth();
+ const isWidthInitialized =
+ sortingButtonWidth + syncButtonWidth + doneButtonWidth > 0;
+ const showButtonLabel = isWidthInitialized
+ ? buttonsContainerWidth >= requiredWidth
+ : true;
+
+ function getRequiredWidth() {
+ /* keep these conditions in sync with JSX in TableSection */
+
+ let width = 0;
+
+ if (isUpdatingSorting) {
+ width += LOADER_WIDTH + BUTTONS_GAP;
+ }
+
+ if (isSorting) {
+ width += FIELD_ORDER_PICKER_WIDTH + BUTTONS_GAP + doneButtonWidth;
+ } else {
+ width += syncButtonWidth;
+
+ if (hasFields) {
+ width += sortingButtonWidth + BUTTONS_GAP;
+ }
+ }
+
+ return width;
+ }
+
+ return {
+ buttonsContainerRef,
+ showButtonLabel,
+ setDoneButtonWidth,
+ setSortingButtonWidth,
+ setSyncButtonWidth,
+ };
+};
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/index.ts
new file mode 100644
index 00000000000..44647cc0b20
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TableSection/index.ts
@@ -0,0 +1 @@
+export * from "./TableSection";
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/index.ts
new file mode 100644
index 00000000000..8a8f3b5bc44
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/index.ts
@@ -0,0 +1,4 @@
+export * from "../../shared/SegmentsLink";
+export * from "./SyncOptionsModal";
+export * from "./TablePicker";
+export * from "./TableSection";
diff --git a/frontend/src/metabase/metadata/pages/DataModel/constants.ts b/frontend/src/metabase/metadata/pages/DataModelV1/constants.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/constants.ts
rename to frontend/src/metabase/metadata/pages/DataModelV1/constants.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/index.ts b/frontend/src/metabase/metadata/pages/DataModelV1/index.ts
new file mode 100644
index 00000000000..369dc61739c
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/index.ts
@@ -0,0 +1 @@
+export * from "./DataModelV1";
diff --git a/frontend/src/metabase/metadata/pages/DataModel/types.ts b/frontend/src/metabase/metadata/pages/DataModelV1/types.ts
similarity index 95%
rename from frontend/src/metabase/metadata/pages/DataModel/types.ts
rename to frontend/src/metabase/metadata/pages/DataModelV1/types.ts
index 743e3314c03..64bf04bb48c 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/types.ts
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/types.ts
@@ -15,7 +15,7 @@ export type RouteParams = {
export type ParsedRouteParams = {
databaseId: DatabaseId | undefined;
- fieldId: FieldId | undefined;
+ fieldId?: FieldId;
schemaName: SchemaName | undefined;
tableId: TableId | undefined;
};
diff --git a/frontend/src/metabase/metadata/pages/DataModel/utils.ts b/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/utils.ts
rename to frontend/src/metabase/metadata/pages/DataModelV1/utils.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/utils.unit.spec.ts b/frontend/src/metabase/metadata/pages/DataModelV1/utils.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/utils.unit.spec.ts
rename to frontend/src/metabase/metadata/pages/DataModelV1/utils.unit.spec.ts
diff --git a/frontend/src/metabase/metadata/pages/shared/DataModelContext.tsx b/frontend/src/metabase/metadata/pages/shared/DataModelContext.tsx
new file mode 100644
index 00000000000..e81f3f451bc
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/shared/DataModelContext.tsx
@@ -0,0 +1,10 @@
+import { createContext } from "react";
+
+export type DataModelContextType = {
+ baseUrl: string;
+};
+
+// should be removed once we don't need to render the page in two different places
+export const DataModelContext = createContext<DataModelContextType>({
+ baseUrl: "/admin/datamodel",
+});
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/BehaviorSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/BehaviorSection.tsx
similarity index 96%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/BehaviorSection.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/BehaviorSection.tsx
index dfc8eeb4927..e8c0b409c58 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/BehaviorSection.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/BehaviorSection.tsx
@@ -7,6 +7,7 @@ import {
FieldVisibilityPicker,
UnfoldJsonPicker,
} from "metabase/metadata/components";
+import { TitledSection } from "metabase/metadata/components/TitledSection";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
canFieldUnfoldJson,
@@ -21,8 +22,7 @@ import type {
FieldVisibilityType,
} from "metabase-types/api";
-import { trackMetadataChange } from "../../../analytics";
-import { TitledSection } from "../../TitledSection";
+import { trackMetadataChange } from "../../analytics";
import { RemappingPicker } from "./RemappingPicker";
@@ -124,7 +124,7 @@ const BehaviorSectionBase = ({ databaseId, field }: Props) => {
};
return (
- <TitledSection title={t`Behavior`}>
+ <TitledSection>
<FieldVisibilityPicker
description={t`Where this field should be displayed`}
label={t`Visibility`}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.module.css b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.module.css
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.unit.spec.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.unit.spec.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.unit.spec.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/index.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/index.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/types.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/types.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/types.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/types.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/utils.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/utils.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/utils.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/utils.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.css b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.css
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.unit.spec.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.unit.spec.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.unit.spec.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/index.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/index.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/types.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/types.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/types.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/NamingTip.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/NamingTip.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/NamingTip.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/NamingTip.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
similarity index 99%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
index 59e8e3b0e61..08dee1d96cd 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
@@ -11,7 +11,6 @@ import {
useUpdateFieldValuesMutation,
} from "metabase/api";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import { trackMetadataChange } from "metabase/metadata/pages/DataModel/analytics";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import { FieldDataSelector } from "metabase/query_builder/components/DataSelector";
@@ -27,6 +26,8 @@ import {
} from "metabase/ui";
import type { Database, Field, FieldId } from "metabase-types/api";
+import { trackMetadataChange } from "../../../analytics";
+
import {
type ChangeOptions,
CustomMappingModal,
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/illustrations/sub-input.svg b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/illustrations/sub-input.svg
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/illustrations/sub-input.svg
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/illustrations/sub-input.svg
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/index.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/index.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/utils.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/index.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/BehaviorSection/index.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/DataSection.module.css b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/DataSection.module.css
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/DataSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.tsx
similarity index 63%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/DataSection.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.tsx
index f14a588ef05..c4f0ca4c36e 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/DataSection.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.tsx
@@ -2,21 +2,23 @@ import { type ChangeEvent, memo, useEffect, useState } from "react";
import { t } from "ttag";
import { useUpdateFieldMutation } from "metabase/api";
-import { CoercionStrategyPicker } from "metabase/metadata/components";
+import {
+ CoercionStrategyPicker,
+ LabeledValue,
+ TitledSection,
+} from "metabase/metadata/components";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
canCoerceFieldType,
getFieldRawName,
getRawTableFieldId,
} from "metabase/metadata/utils/field";
-import { Flex, Stack, Switch, rem } from "metabase/ui";
+import { Box, Flex, Group, Stack, Switch, rem } from "metabase/ui";
import type { Field } from "metabase-types/api";
-import { trackMetadataChange } from "../../../analytics";
-import { TitledSection } from "../../TitledSection";
+import { trackMetadataChange } from "../../analytics";
import S from "./DataSection.module.css";
-import { LabeledValue } from "./LabeledValue";
import SubInputFollowIllustration from "./illustrations/sub-input-follow.svg?component";
import SubInputIllustration from "./illustrations/sub-input.svg?component";
@@ -106,50 +108,55 @@ const DataSectionBase = ({ field }: Props) => {
};
return (
- <TitledSection title={t`Data`}>
- <LabeledValue label={t`Field name`}>
- {getFieldRawName(field)}
- </LabeledValue>
-
- <Stack gap={0}>
- <LabeledValue label={t`Data type`}>{field.database_type}</LabeledValue>
-
- {canCoerceFieldType(field) && (
- <>
- <Flex gap="xs" ml={rem(12)} wrap="nowrap">
- {isCasting ? (
- <SubInputFollowIllustration />
- ) : (
- <SubInputIllustration />
+ <TitledSection>
+ <Group align="start">
+ <Box flex={1}>
+ <LabeledValue label={t`Field name`}>
+ {getFieldRawName(field)}
+ </LabeledValue>
+ </Box>
+ <Stack gap={0} flex={1}>
+ <LabeledValue label={t`Data type`}>
+ {field.database_type}
+ </LabeledValue>
+
+ {canCoerceFieldType(field) && (
+ <>
+ <Flex gap="xs" ml={rem(12)} wrap="nowrap">
+ {isCasting ? (
+ <SubInputFollowIllustration />
+ ) : (
+ <SubInputIllustration />
+ )}
+
+ <Switch
+ checked={isCasting}
+ classNames={{
+ body: S.switchBody,
+ }}
+ flex="1"
+ label={t`Cast to a specific data type`}
+ mt="md"
+ size="xs"
+ onChange={handleCastingChange}
+ />
+ </Flex>
+
+ {isCasting && (
+ <CoercionStrategyPicker
+ autoFocus={autoFocusCoercionPicker}
+ baseType={field.base_type}
+ dropdownOpened={isCoercionPickerOpen}
+ value={field.coercion_strategy ?? undefined}
+ onChange={handleCoercionStrategyChange}
+ onDropdownClose={() => setIsCoercionPickerOpen(false)}
+ onDropdownOpen={() => setIsCoercionPickerOpen(true)}
+ />
)}
-
- <Switch
- checked={isCasting}
- classNames={{
- body: S.switchBody,
- }}
- flex="1"
- label={t`Cast to a specific data type`}
- mt="md"
- size="xs"
- onChange={handleCastingChange}
- />
- </Flex>
-
- {isCasting && (
- <CoercionStrategyPicker
- autoFocus={autoFocusCoercionPicker}
- baseType={field.base_type}
- dropdownOpened={isCoercionPickerOpen}
- value={field.coercion_strategy ?? undefined}
- onChange={handleCoercionStrategyChange}
- onDropdownClose={() => setIsCoercionPickerOpen(false)}
- onDropdownOpen={() => setIsCoercionPickerOpen(true)}
- />
- )}
- </>
- )}
- </Stack>
+ </>
+ )}
+ </Stack>
+ </Group>
</TitledSection>
);
};
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/illustrations/sub-input-follow.svg b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/illustrations/sub-input-follow.svg
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/illustrations/sub-input-follow.svg
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/illustrations/sub-input-follow.svg
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/illustrations/sub-input.svg b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/illustrations/sub-input.svg
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/illustrations/sub-input.svg
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/illustrations/sub-input.svg
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/index.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/DataSection/index.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FieldSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/FieldSection.tsx
similarity index 93%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FieldSection.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/FieldSection.tsx
index 74e7164b73c..f23458f3ea3 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FieldSection.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/FieldSection.tsx
@@ -14,7 +14,6 @@ import { ResponsiveButton } from "../ResponsiveButton";
import { BehaviorSection } from "./BehaviorSection";
import { DataSection } from "./DataSection";
-import S from "./FieldSection.module.css";
import { FormattingSection } from "./FormattingSection";
import { MetadataSection } from "./MetadataSection";
import { useResponsiveButtons } from "./hooks";
@@ -87,17 +86,8 @@ const FieldSectionBase = ({
};
return (
- <Stack data-testid="field-section" gap={0} pb="xl">
- <Stack
- bg="accent-gray-light"
- className={S.header}
- gap="lg"
- pb={12}
- pos="sticky"
- pt="xl"
- px="xl"
- top={0}
- >
+ <Stack data-testid="field-section" gap={0} pb="lg" bg="bg-white">
+ <Stack gap="md" pb="md" pt="lg" px="lg">
<NameDescriptionInput
description={field.description ?? ""}
descriptionPlaceholder={t`Give this field a description`}
@@ -146,7 +136,7 @@ const FieldSectionBase = ({
</Group>
</Stack>
- <Stack gap="xl" px="xl">
+ <Stack gap="xl" px="lg">
<DataSection field={field} />
<MetadataSection databaseId={databaseId} field={field} table={table} />
<BehaviorSection databaseId={databaseId} field={field} />
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FormattingSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/FormattingSection.tsx
similarity index 93%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FormattingSection.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/FormattingSection.tsx
index d2d23632c66..26f08cfcf4d 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/FormattingSection.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/FormattingSection.tsx
@@ -2,6 +2,7 @@ import { memo, useMemo } from "react";
import { t } from "ttag";
import { useUpdateFieldMutation } from "metabase/api";
+import { TitledSection } from "metabase/metadata/components/TitledSection";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import ColumnSettings from "metabase/visualizations/components/ColumnSettings";
@@ -12,8 +13,7 @@ import type {
FieldFormattingSettings as FieldSettings,
} from "metabase-types/api";
-import { trackMetadataChange } from "../../analytics";
-import { TitledSection } from "../TitledSection";
+import { trackMetadataChange } from "../analytics";
interface Props {
field: Field;
@@ -53,7 +53,7 @@ const FormattingSectionBase = ({ field }: Props) => {
};
return (
- <TitledSection title={t`Formatting`}>
+ <TitledSection>
<ColumnSettings
column={field}
denylist={denyList}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/MetadataSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/MetadataSection.tsx
similarity index 84%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/MetadataSection.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/MetadataSection.tsx
index cb3215d494f..aa5856bb943 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/MetadataSection.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/MetadataSection.tsx
@@ -1,4 +1,4 @@
-import { memo, useMemo } from "react";
+import { memo, useContext, useMemo } from "react";
import { t } from "ttag";
import {
@@ -6,13 +6,14 @@ import {
useUpdateFieldMutation,
} from "metabase/api";
import { SemanticTypeAndTargetPicker } from "metabase/metadata/components";
+import { TitledSection } from "metabase/metadata/components/TitledSection";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import type { DatabaseId, Field, Table } from "metabase-types/api";
-import { trackMetadataChange } from "../../analytics";
-import { TitledSection } from "../TitledSection";
+import { DataModelContext } from "../DataModelContext";
+import { trackMetadataChange } from "../analytics";
import { getSemanticTypeError } from "./utils";
@@ -33,9 +34,10 @@ const MetadataSectionBase = ({ databaseId, field, table }: Props) => {
...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,
});
const [updateField] = useUpdateFieldMutation();
+ const { baseUrl } = useContext(DataModelContext);
const semanticTypeError = useMemo(() => {
- return getSemanticTypeError(table, field);
- }, [table, field]);
+ return getSemanticTypeError(table, field, baseUrl);
+ }, [table, field, baseUrl]);
const { sendErrorToast, sendSuccessToast, sendUndoToast } =
useMetadataToasts();
@@ -65,7 +67,7 @@ const MetadataSectionBase = ({ databaseId, field, table }: Props) => {
};
return (
- <TitledSection title={t`Metadata`}>
+ <TitledSection>
<SemanticTypeAndTargetPicker
description={t`What this data represents`}
field={field}
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/hooks.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/hooks.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/hooks.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/index.ts b/frontend/src/metabase/metadata/pages/shared/FieldSection/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/index.ts
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/utils.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/utils.tsx
similarity index 94%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/utils.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldSection/utils.tsx
index 19b6e8bc69f..c9e69b233a8 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/FieldSection/utils.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/utils.tsx
@@ -7,11 +7,12 @@ import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { isEntityName } from "metabase-lib/v1/types/utils/isa";
import type { Field, Table } from "metabase-types/api";
-import { getUrl } from "../../utils";
+import { getUrl } from "../utils";
export function getSemanticTypeError(
table: Table,
field: Field,
+ baseUrl: string,
): ReactNode | undefined {
if (!isEntityName(field)) {
return undefined;
@@ -37,7 +38,7 @@ export function getSemanticTypeError(
{entityNameFields.map((field, index) => {
const parentName = field.nfc_path?.[0] ?? "";
const parentField = fieldsByName[parentName];
- const href = getUrl({
+ const href = getUrl(baseUrl, {
databaseId: table.db_id,
schemaName: table.schema,
tableId: table.id,
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/FieldValuesModal.tsx b/frontend/src/metabase/metadata/pages/shared/FieldValuesModal.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/FieldValuesModal.tsx
rename to frontend/src/metabase/metadata/pages/shared/FieldValuesModal.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/NoDatabasesEmptyState.tsx b/frontend/src/metabase/metadata/pages/shared/NoDatabasesEmptyState.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/NoDatabasesEmptyState.tsx
rename to frontend/src/metabase/metadata/pages/shared/NoDatabasesEmptyState.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/EmptyStateBlock.tsx b/frontend/src/metabase/metadata/pages/shared/PreviewSection/EmptyStateBlock.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/EmptyStateBlock.tsx
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/EmptyStateBlock.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/Error/Error.module.css b/frontend/src/metabase/metadata/pages/shared/PreviewSection/Error/Error.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/Error/Error.module.css
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/Error/Error.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/Error/Error.tsx b/frontend/src/metabase/metadata/pages/shared/PreviewSection/Error/Error.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/Error/Error.tsx
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/Error/Error.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/Error/index.ts b/frontend/src/metabase/metadata/pages/shared/PreviewSection/Error/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/Error/index.ts
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/Error/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/FilteringPreview.tsx b/frontend/src/metabase/metadata/pages/shared/PreviewSection/FilteringPreview.tsx
similarity index 95%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/FilteringPreview.tsx
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/FilteringPreview.tsx
index e5dbe4fcc6f..a2299b477d3 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/FilteringPreview.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/PreviewSection/FilteringPreview.tsx
@@ -2,7 +2,6 @@ import { memo, useMemo } from "react";
import _ from "underscore";
import { createMockMetadata } from "__support__/metadata";
-import { isFieldHidden } from "metabase/metadata/pages/DataModel/components/PreviewSection/utils";
import { FilterPickerBody } from "metabase/querying/filters/components/FilterPicker/FilterPickerBody";
import * as Lib from "metabase-lib";
import type {
@@ -14,6 +13,7 @@ import type {
} from "metabase-types/api";
import { HiddenFieldEmptyStateBlock } from "./EmptyStateBlock";
+import { isFieldHidden } from "./utils";
interface Props {
databaseId: DatabaseId;
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/ObjectDetailPreview.tsx b/frontend/src/metabase/metadata/pages/shared/PreviewSection/ObjectDetailPreview.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/ObjectDetailPreview.tsx
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/ObjectDetailPreview.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/PreviewSection.module.css b/frontend/src/metabase/metadata/pages/shared/PreviewSection/PreviewSection.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/PreviewSection.module.css
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/PreviewSection.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/PreviewSection.tsx b/frontend/src/metabase/metadata/pages/shared/PreviewSection/PreviewSection.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/PreviewSection.tsx
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/PreviewSection.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/PreviewSection.unit.spec.tsx b/frontend/src/metabase/metadata/pages/shared/PreviewSection/PreviewSection.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/PreviewSection.unit.spec.tsx
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/PreviewSection.unit.spec.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/TablePreview.tsx b/frontend/src/metabase/metadata/pages/shared/PreviewSection/TablePreview.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/TablePreview.tsx
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/TablePreview.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/index.ts b/frontend/src/metabase/metadata/pages/shared/PreviewSection/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/index.ts
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/types.ts b/frontend/src/metabase/metadata/pages/shared/PreviewSection/types.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/types.ts
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/types.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/utils.ts b/frontend/src/metabase/metadata/pages/shared/PreviewSection/utils.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/PreviewSection/utils.ts
rename to frontend/src/metabase/metadata/pages/shared/PreviewSection/utils.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/ResponsiveButton.tsx b/frontend/src/metabase/metadata/pages/shared/ResponsiveButton.tsx
similarity index 95%
rename from frontend/src/metabase/metadata/pages/DataModel/components/ResponsiveButton.tsx
rename to frontend/src/metabase/metadata/pages/shared/ResponsiveButton.tsx
index d06526cd0ff..b7288d98e13 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/ResponsiveButton.tsx
+++ b/frontend/src/metabase/metadata/pages/shared/ResponsiveButton.tsx
@@ -1,5 +1,6 @@
import { useElementSize } from "@mantine/hooks";
import { useLayoutEffect } from "react";
+import _ from "underscore";
import {
Button,
@@ -15,7 +16,7 @@ interface Props extends Omit<ButtonProps, "leftSection"> {
icon: IconName;
showLabel: boolean;
showIconWithLabel?: boolean;
- onRequestWidth: (width: number) => void;
+ onRequestWidth?: (width: number) => void;
}
export const ResponsiveButton = ({
@@ -23,7 +24,7 @@ export const ResponsiveButton = ({
icon,
showLabel,
showIconWithLabel = true,
- onRequestWidth,
+ onRequestWidth = _.noop,
...props
}: Props) => {
const { ref: measureRef, width: desiredWidth } = useElementSize();
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/SegmentsLink/SegmentsLink.module.css b/frontend/src/metabase/metadata/pages/shared/SegmentsLink/SegmentsLink.module.css
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/SegmentsLink/SegmentsLink.module.css
rename to frontend/src/metabase/metadata/pages/shared/SegmentsLink/SegmentsLink.module.css
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/SegmentsLink/SegmentsLink.tsx b/frontend/src/metabase/metadata/pages/shared/SegmentsLink/SegmentsLink.tsx
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/SegmentsLink/SegmentsLink.tsx
rename to frontend/src/metabase/metadata/pages/shared/SegmentsLink/SegmentsLink.tsx
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/SegmentsLink/index.ts b/frontend/src/metabase/metadata/pages/shared/SegmentsLink/index.ts
similarity index 100%
rename from frontend/src/metabase/metadata/pages/DataModel/components/SegmentsLink/index.ts
rename to frontend/src/metabase/metadata/pages/shared/SegmentsLink/index.ts
diff --git a/frontend/src/metabase/metadata/pages/DataModel/analytics.ts b/frontend/src/metabase/metadata/pages/shared/analytics.ts
similarity index 77%
rename from frontend/src/metabase/metadata/pages/DataModel/analytics.ts
rename to frontend/src/metabase/metadata/pages/shared/analytics.ts
index 2c699972e42..4a8a157fc08 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/analytics.ts
+++ b/frontend/src/metabase/metadata/pages/shared/analytics.ts
@@ -1,6 +1,6 @@
import { trackSimpleEvent } from "metabase/lib/analytics";
-import type { MetadataEditAnalyticsDetail } from "./types";
+import type { MetadataEditAnalyticsDetail } from "../DataModelV1/types";
export const trackMetadataChange = (detail: MetadataEditAnalyticsDetail) => {
trackSimpleEvent({
diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/index.ts b/frontend/src/metabase/metadata/pages/shared/index.ts
similarity index 68%
rename from frontend/src/metabase/metadata/pages/DataModel/components/index.ts
rename to frontend/src/metabase/metadata/pages/shared/index.ts
index bf53700f72e..447ce2a34ab 100644
--- a/frontend/src/metabase/metadata/pages/DataModel/components/index.ts
+++ b/frontend/src/metabase/metadata/pages/shared/index.ts
@@ -1,9 +1,9 @@
+export * from "./analytics";
+export * from "./DataModelContext";
export * from "./FieldSection";
export * from "./FieldValuesModal";
export * from "./NoDatabasesEmptyState";
export * from "./PreviewSection";
export * from "./ResponsiveButton";
export * from "./SegmentsLink";
-export * from "./SyncOptionsModal";
-export * from "./TablePicker";
-export * from "./TableSection";
+export * from "./utils";
diff --git a/frontend/src/metabase/metadata/pages/shared/utils.ts b/frontend/src/metabase/metadata/pages/shared/utils.ts
new file mode 100644
index 00000000000..7fcc8c2fc26
--- /dev/null
+++ b/frontend/src/metabase/metadata/pages/shared/utils.ts
@@ -0,0 +1,67 @@
+import { skipToken } from "metabase/api";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
+import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
+import type { GetTableQueryMetadataRequest, TableId } from "metabase-types/api";
+
+import type { ParsedRouteParams, RouteParams } from "../DataModelV1/types";
+
+export function parseRouteParams(params: RouteParams): ParsedRouteParams {
+ return {
+ databaseId: Urls.extractEntityId(params.databaseId),
+ schemaName: params.schemaId
+ ? getSchemaName(params.schemaId)
+ : params.schemaId,
+ tableId: Urls.extractEntityId(params.tableId),
+ fieldId: Urls.extractEntityId(params.fieldId),
+ };
+}
+
+export function getUrl(baseUrl: string, params: ParsedRouteParams): string {
+ const { databaseId, schemaName, tableId, fieldId } = params;
+ const schemaId = `${databaseId}:${schemaName}`;
+
+ if (
+ databaseId != null &&
+ schemaName != null &&
+ tableId != null &&
+ fieldId != null
+ ) {
+ return `${baseUrl}/database/${databaseId}/schema/${schemaId}/table/${tableId}/field/${fieldId}`;
+ }
+
+ if (databaseId != null && schemaName != null && tableId != null) {
+ return `${baseUrl}/database/${databaseId}/schema/${schemaId}/table/${tableId}`;
+ }
+
+ if (databaseId != null && schemaName != null) {
+ return `${baseUrl}/database/${databaseId}/schema/${schemaId}`;
+ }
+
+ if (databaseId != null) {
+ return `${baseUrl}/database/${databaseId}`;
+ }
+
+ return baseUrl;
+}
+
+export function getTableMetadataQuery(
+ tableId: TableId | undefined,
+): GetTableQueryMetadataRequest | typeof skipToken {
+ if (tableId == null) {
+ return skipToken;
+ }
+
+ return {
+ id: tableId,
+ include_sensitive_fields: true,
+ ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,
+ };
+}
+
+export function clamp(
+ value: number,
+ { min, max }: { min: number; max: number },
+): number {
+ return Math.max(min, Math.min(max, value));
+}
diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
index d0c8673f4e9..99f094af0a1 100644
--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
@@ -210,7 +210,7 @@ async function setup({
createMockTable({
id: `card__${card.id}`,
name: card.name,
- fields: card.result_metadata,
+ fields: card.result_metadata ?? [],
}),
],
}),
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
index e47501ab943..9bf1e874107 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
@@ -11,6 +11,7 @@ import Databases from "metabase/entities/databases";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import NewModelOption from "metabase/models/components/NewModelOption";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { NoDatabasesEmptyState } from "metabase/reference/databases/NoDatabasesEmptyState";
import { getHasDataAccess, getHasNativeWrite } from "metabase/selectors/data";
import { getLearnUrl, getSetting } from "metabase/selectors/settings";
@@ -38,10 +39,17 @@ const NewModelOptions = ({ location }: NewModelOptionsProps) => {
getSetting(state, "last-used-native-database-id"),
);
- const collectionId = Urls.extractEntityId(
+ const urlCollectionId = Urls.extractEntityId(
location.query.collectionId as string,
);
+ const libraryModelsCollection =
+ PLUGIN_DATA_STUDIO.useGetLibraryChildCollectionByType({
+ type: "library-models",
+ });
+
+ const collectionId = urlCollectionId || libraryModelsCollection?.id;
+
const showMetabaseLinks = useSelector(getShowMetabaseLinks);
if (isFetching) {
diff --git a/frontend/src/metabase/models/routes.tsx b/frontend/src/metabase/models/routes.tsx
index ffd87f64680..e482a8f302f 100644
--- a/frontend/src/metabase/models/routes.tsx
+++ b/frontend/src/metabase/models/routes.tsx
@@ -5,7 +5,6 @@ import { ModelDetailPage } from "metabase/detail-view/pages/ModelDetailPage/Mode
import { ModalRoute } from "metabase/hoc/ModalRoute";
import ModelActions from "metabase/models/containers/ModelActions/ModelActions";
-Intl.Collator("en");
export const getRoutes = () => (
<Route path="/model/:slug/detail">
<Route path="actions" component={ModelActions}>
diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
index 0773405366d..b87080ea55f 100644
--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
@@ -8,7 +8,6 @@ import LogoIcon from "metabase/common/components/LogoIcon";
import CS from "metabase/css/core/index.css";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
-import { PLUGIN_METABOT } from "metabase/plugins";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Button, Icon } from "metabase/ui";
@@ -96,8 +95,6 @@ export const AdminNavbar = ({
{!isPaidPlan && isAdmin && <StoreLink />}
<AdminButtons>
- <PLUGIN_METABOT.MetabotAdminAppBarButton />
-
<AdminExitLink
to="/"
data-testid="exit-admin"
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx b/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
index 4978a727e70..57b41ea2b1f 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
@@ -27,7 +27,6 @@ export interface AppBarProps {
isQuestionLineageVisible?: boolean;
onToggleNavbar: () => void;
onCloseNavbar: () => void;
- onLogout: () => void;
}
const AppBar = (props: AppBarProps): JSX.Element => {
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBar.unit.spec.tsx b/frontend/src/metabase/nav/components/AppBar/AppBar.unit.spec.tsx
index adee35b6f34..8d6c1ffadfa 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBar.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBar.unit.spec.tsx
@@ -167,6 +167,5 @@ const getProps = (opts?: Partial<AppBarProps>): AppBarProps => ({
currentUser: createMockUser(),
onToggleNavbar: jest.fn(),
onCloseNavbar: jest.fn(),
- onLogout: jest.fn(),
...opts,
});
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx
index 5c5a19b8d3d..f878010371c 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx
@@ -34,7 +34,6 @@ export interface AppBarLargeProps {
isCollectionPathVisible?: boolean;
isQuestionLineageVisible?: boolean;
onToggleNavbar: () => void;
- onLogout: () => void;
}
const AppBarLarge = ({
@@ -53,7 +52,6 @@ const AppBarLarge = ({
isCollectionPathVisible,
isQuestionLineageVisible,
onToggleNavbar,
- onLogout,
}: AppBarLargeProps): JSX.Element => {
const isNavBarVisible = isNavBarOpen && isNavBarEnabled;
@@ -106,7 +104,7 @@ const AppBarLarge = ({
{!isEmbeddingIframe && <PLUGIN_METABOT.MetabotAppBarButton />}
{isProfileLinkVisible && (
<Box c="var(--mb-color-text-primary)" aria-label={t`Settings menu`}>
- <ProfileLink onLogout={onLogout} />
+ <ProfileLink />
</Box>
)}
</Flex>
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx
index d743a659167..2190da9932a 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx
@@ -34,7 +34,6 @@ export interface AppBarSmallProps {
isQuestionLineageVisible?: boolean;
onToggleNavbar: () => void;
onCloseNavbar: () => void;
- onLogout: () => void;
}
const AppBarSmall = ({
@@ -49,7 +48,6 @@ const AppBarSmall = ({
isQuestionLineageVisible,
onToggleNavbar,
onCloseNavbar,
- onLogout,
}: AppBarSmallProps): JSX.Element => {
const isNavBarVisible = isNavBarOpen && isNavBarEnabled;
@@ -97,7 +95,7 @@ const AppBarSmall = ({
{!isEmbeddingIframe && <PLUGIN_METABOT.MetabotAppBarButton />}
{isProfileLinkVisible && (
<AppBarProfileLinkContainer>
- <ProfileLink onLogout={onLogout} />
+ <ProfileLink />
</AppBarProfileLinkContainer>
)}
</Flex>
diff --git a/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsx b/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsx
index 015ed62e688..e5c5741eb11 100644
--- a/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsx
+++ b/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsx
@@ -4,6 +4,7 @@ import { t } from "ttag";
import _ from "underscore";
import { getAdminPaths } from "metabase/admin/app/selectors";
+import { logout } from "metabase/auth/actions";
import { ErrorDiagnosticModalWrapper } from "metabase/common/components/ErrorPages/ErrorDiagnosticModal";
import { trackErrorDiagnosticModalOpened } from "metabase/common/components/ErrorPages/analytics";
import { ForwardRefLink } from "metabase/common/components/Link";
@@ -18,6 +19,7 @@ import {
import { capitalize } from "metabase/lib/formatting";
import { connect, useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { openDiagnostics } from "metabase/redux/app";
import { setOpenModal } from "metabase/redux/ui";
import {
@@ -35,19 +37,22 @@ import { useHelpLink } from "./useHelpLink";
const mapStateToProps = (state: State) => ({
adminItems: getAdminPaths(state),
canAccessOnboardingPage: getCanAccessOnboardingPage(state),
+ canAccessDataStudio: PLUGIN_DATA_STUDIO.canAccessDataStudio(state),
isNewInstance: getIsNewInstance(state),
});
const mapDispatchToProps = {
- openDiagnostics,
+ onOpenDiagnostics: openDiagnostics,
+ onLogout: logout,
};
interface ProfileLinkProps {
adminItems: AdminPath[];
canAccessOnboardingPage: boolean;
+ canAccessDataStudio: boolean;
isNewInstance: boolean;
+ onOpenDiagnostics: () => void;
onLogout: () => void;
- openDiagnostics: () => void;
}
interface MenuItem {
@@ -57,15 +62,15 @@ interface MenuItem {
link?: string;
action?: () => void;
separator?: boolean;
- event?: string;
}
function ProfileLinkInner({
adminItems,
canAccessOnboardingPage,
+ canAccessDataStudio,
isNewInstance,
onLogout,
- openDiagnostics,
+ onOpenDiagnostics,
}: ProfileLinkProps) {
const [modalOpen, setModalOpen] = useState<string | null>(null);
const version = useSetting("version") as MetabaseInfo["version"];
@@ -84,59 +89,64 @@ function ProfileLinkInner({
const generateOptionsForUser = (): MenuItem[] => {
const showAdminSettingsItem = adminItems?.length > 0;
-
// If the instance is not new, we remove the link from the sidebar automatically and show it here instead!
const showOnboardingLink = !isNewInstance && canAccessOnboardingPage;
- return [
- {
- title: t`Account settings`,
- icon: null,
- link: Urls.accountSettings(),
- event: `Navbar;Profile Dropdown;Edit Profile`,
- },
- showAdminSettingsItem && {
+ const menuItems: MenuItem[] = [];
+ menuItems.push({
+ title: t`Account settings`,
+ icon: null,
+ link: Urls.accountSettings(),
+ });
+ if (showAdminSettingsItem) {
+ menuItems.push({
title: t`Admin settings`,
icon: null,
link: "/admin",
- event: `Navbar;Profile Dropdown;Enter Admin`,
- },
- {
- title: t`Keyboard shortcuts`,
+ });
+ }
+ if (canAccessDataStudio) {
+ menuItems.push({
+ title: t`Data studio`,
icon: null,
- action: () => dispatch(setOpenModal("help")),
- },
- {
- separator: true,
- },
- helpLink.visible && {
+ link: Urls.dataStudio(),
+ });
+ }
+ menuItems.push({ separator: true });
+ if (helpLink.visible) {
+ menuItems.push({
title: t`Help`,
icon: null,
link: helpLink.href,
externalLink: true,
- event: `Navbar;Profile Dropdown;About ${tag}`,
- },
- showOnboardingLink && {
+ });
+ }
+ if (showOnboardingLink) {
+ menuItems.push({
// eslint-disable-next-line no-literal-metabase-strings -- This string only shows for non-whitelabeled instances
title: t`How to use Metabase`,
icon: null,
link: "/getting-started",
- event: `Navbar;Profile Dropdown;Getting Started`,
+ });
+ }
+ menuItems.push(
+ {
+ title: t`Keyboard shortcuts`,
+ icon: null,
+ action: () => dispatch(setOpenModal("help")),
},
{
title: t`Report an issue`,
icon: null,
action: () => {
trackErrorDiagnosticModalOpened("profile-menu");
- openDiagnostics();
+ onOpenDiagnostics();
},
- event: `Navbar;Profile Dropdown;Report Bug`,
},
{
title: t`About ${applicationName}`,
icon: null,
action: () => openModal("about"),
- event: `Navbar;Profile Dropdown;About ${tag}`,
},
{
separator: true,
@@ -145,15 +155,15 @@ function ProfileLinkInner({
title: t`Sign out`,
icon: null,
action: () => onLogout(),
- event: `Navbar;Profile Dropdown;Logout`,
},
- ].filter((item) => !!item);
+ );
+
+ return menuItems;
};
// show trademark if application name is not whitelabeled
const isWhiteLabeling = useSelector(getIsWhiteLabeling);
const showTrademark = !isWhiteLabeling;
-
const menuItems = generateOptionsForUser();
return (
diff --git a/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.unit.spec.tsx b/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.unit.spec.tsx
index 7331a29be8b..f7c64bf0c75 100644
--- a/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.unit.spec.tsx
@@ -60,7 +60,7 @@ function setup({
}),
});
- return renderWithProviders(<ProfileLink onLogout={jest.fn()} />, {
+ return renderWithProviders(<ProfileLink />, {
storeInitialState: {
admin,
settings,
diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx
index 95cbb5c9cab..dc22eb5c1e3 100644
--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx
@@ -40,6 +40,7 @@ export const SearchInputContainer = styled.div<{
}
return css`
background-color: var(--mb-color-bg-white);
+
&:hover {
background-color: var(--mb-color-bg-light);
}
diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx
index e71d8890775..1842f3d5714 100644
--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
import { Route } from "react-router";
diff --git a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
index fba5bef6e64..291277f32ba 100644
--- a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
+++ b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
@@ -1,7 +1,6 @@
import { withRouter } from "react-router";
import _ from "underscore";
-import { logout } from "metabase/auth/actions";
import Collections from "metabase/entities/collections";
import { connect } from "metabase/lib/redux";
import { PLUGIN_DOCUMENTS, PLUGIN_METABOT } from "metabase/plugins";
@@ -45,7 +44,6 @@ const mapStateToProps = (state: State, props: RouterProps) => ({
const mapDispatchToProps = {
onToggleNavbar: toggleNavbar,
onCloseNavbar: closeNavbar,
- onLogout: logout,
};
// eslint-disable-next-line import/no-default-export -- deprecated usage
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
index 907c8efccd1..2b75b41906c 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
@@ -300,6 +300,7 @@ export const CSVUpload = ({
confirmButtonText: t`Select this collection`,
}}
models={["collection"]}
+ entityType="dataset"
recentFilter={(items) =>
items.filter((item) => {
return item.model !== "table" && item.can_write;
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx
index a0a6ec61518..2482fdb0694 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx
@@ -14,7 +14,6 @@ import { t } from "ttag";
import CollapseSection from "metabase/common/components/CollapseSection";
import { Sortable } from "metabase/common/components/Sortable";
import GrabberS from "metabase/css/components/grabber.module.css";
-import CS from "metabase/css/core/index.css";
import Bookmarks from "metabase/entities/bookmarks";
import { connect } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
@@ -149,16 +148,14 @@ const BookmarkList = ({
const bookmarkIds = bookmarks.map((b) => b.id);
- const headerId = "headingForBookmarksSectionOfSidebar";
-
return (
<CollapseSection
- aria-labelledby={headerId}
- header={<SidebarHeading id={headerId}>{t`Bookmarks`}</SidebarHeading>}
+ header={<SidebarHeading>{t`Bookmarks`}</SidebarHeading>}
initialState={initialState}
iconPosition="right"
iconSize={8}
- headerClass={CS.mb1}
+ role="section"
+ aria-label={t`Bookmarks`}
onToggle={onToggle}
>
<DndContext
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
index 3098f4e3b04..90b08070883 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
@@ -1,20 +1,11 @@
-import { useDisclosure } from "@mantine/hooks";
import { c, t } from "ttag";
+import CollapseSection from "metabase/common/components/CollapseSection";
import { useUserSetting } from "metabase/common/hooks";
-import CS from "metabase/css/core/index.css";
import { useSelector } from "metabase/lib/redux";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { getEntityTypes } from "metabase/selectors/embedding-data-picker";
-import {
- ActionIcon,
- Collapse,
- Flex,
- Group,
- Icon,
- Tooltip,
- UnstyledButton,
-} from "metabase/ui";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import { PaddedSidebarLink, SidebarHeading } from "../MainNavbar.styled";
import { trackAddDataModalOpened } from "../analytics";
@@ -42,34 +33,24 @@ export const BrowseNavSection = ({
);
const { canPerformMeaningfulActions } = useAddDataPermissions();
- const [opened, { toggle }] = useDisclosure(expandBrowse);
const entityTypes = useSelector(getEntityTypes);
const isEmbeddingIframe = useSelector(getIsEmbeddingIframe);
- const handleToggle = () => {
- toggle();
- setExpandBrowse(!opened);
- };
-
const showAddDataButton = canPerformMeaningfulActions && !isEmbeddingIframe;
return (
- <div aria-selected={opened} role="tab">
- <Flex align="center" justify="space-between" mb="sm">
- <Group
- align="center"
- gap="sm"
- onClick={handleToggle}
- component={UnstyledButton}
- c="text-medium"
- className={CS.cursorPointer}
- >
- <SidebarHeading>
- {c("A noun, shown in the sidebar as a navigation link").t`Data`}
- </SidebarHeading>
- <Icon name={opened ? "chevrondown" : "chevronright"} size={8} />
- </Group>
- {showAddDataButton && (
+ <CollapseSection
+ header={
+ <SidebarHeading>
+ {c("A noun, shown in the sidebar as a navigation link").t`Data`}
+ </SidebarHeading>
+ }
+ initialState={expandBrowse ? "expanded" : "collapsed"}
+ iconPosition="right"
+ iconSize={8}
+ onToggle={setExpandBrowse}
+ rightAction={
+ showAddDataButton ? (
<Tooltip label={t`Add data`}>
<ActionIcon
aria-label={t`Add data`}
@@ -82,52 +63,47 @@ export const BrowseNavSection = ({
<Icon name="add" />
</ActionIcon>
</Tooltip>
- )}
- </Flex>
-
- <Collapse
- in={opened}
- transitionDuration={0}
- role="tabpanel"
- aria-expanded={opened}
- >
- {hasDataAccess &&
- (!isEmbeddingIframe || entityTypes.includes("table")) && (
- <PaddedSidebarLink
- icon="database"
- url={BROWSE_DATA_URL}
- isSelected={nonEntityItem?.url?.startsWith(BROWSE_DATA_URL)}
- onClick={onItemSelect}
- aria-label={t`Browse databases`}
- >
- {t`Databases`}
- </PaddedSidebarLink>
- )}
-
- {(!isEmbeddingIframe || entityTypes.includes("model")) && (
+ ) : undefined
+ }
+ role="section"
+ aria-label={t`Data`}
+ >
+ {hasDataAccess &&
+ (!isEmbeddingIframe || entityTypes.includes("table")) && (
<PaddedSidebarLink
- icon="model"
- url={BROWSE_MODELS_URL}
- isSelected={nonEntityItem?.url?.startsWith(BROWSE_MODELS_URL)}
+ icon="database"
+ url={BROWSE_DATA_URL}
+ isSelected={nonEntityItem?.url?.startsWith(BROWSE_DATA_URL)}
onClick={onItemSelect}
- aria-label={t`Browse models`}
+ aria-label={t`Browse databases`}
>
- {t`Models`}
+ {t`Databases`}
</PaddedSidebarLink>
)}
- {!isEmbeddingIframe && (
- <PaddedSidebarLink
- icon="metric"
- url={BROWSE_METRICS_URL}
- isSelected={nonEntityItem?.url?.startsWith(BROWSE_METRICS_URL)}
- onClick={onItemSelect}
- aria-label={t`Browse metrics`}
- >
- {t`Metrics`}
- </PaddedSidebarLink>
- )}
- </Collapse>
- </div>
+ {(!isEmbeddingIframe || entityTypes.includes("model")) && (
+ <PaddedSidebarLink
+ icon="model"
+ url={BROWSE_MODELS_URL}
+ isSelected={nonEntityItem?.url?.startsWith(BROWSE_MODELS_URL)}
+ onClick={onItemSelect}
+ aria-label={t`Browse models`}
+ >
+ {t`Models`}
+ </PaddedSidebarLink>
+ )}
+
+ {!isEmbeddingIframe && (
+ <PaddedSidebarLink
+ icon="metric"
+ url={BROWSE_METRICS_URL}
+ isSelected={nonEntityItem?.url?.startsWith(BROWSE_METRICS_URL)}
+ onClick={onItemSelect}
+ aria-label={t`Browse metrics`}
+ >
+ {t`Metrics`}
+ </PaddedSidebarLink>
+ )}
+ </CollapseSection>
);
};
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
index 03fa3622647..0be847a14d8 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
@@ -4,7 +4,13 @@ import {
setupDatabaseListEndpoint,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
-import { getIcon, renderWithProviders, screen, within } from "__support__/ui";
+import {
+ getIcon,
+ renderWithProviders,
+ screen,
+ waitFor,
+ within,
+} from "__support__/ui";
import * as domUtils from "metabase/lib/dom";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
import type { EmbeddingEntityType } from "metabase-types/store/embedding-data-picker";
@@ -20,55 +26,56 @@ describe("BrowseNavSection", () => {
it("should render a section title and an 'Add data' button", async () => {
setup({ isAdmin: true });
- const tab = screen.getByRole("tab");
+ const section = screen.getByRole("section", { name: "Data" });
- expect(tab).toBeInTheDocument();
+ expect(section).toBeInTheDocument();
expect(
- within(tab).getByRole("heading", { name: "Data" }),
+ within(section).getByRole("heading", { name: "Data" }),
).toBeInTheDocument();
expect(
- await within(tab).findByRole("button", { name: "Add data" }),
+ await within(section).findByRole("button", { name: "Add data" }),
).toBeInTheDocument();
});
it("should not render a section title and an 'Add data' button for users without enough permissions", async () => {
setup({ isAdmin: false });
- const tab = screen.getByRole("tab");
+ const section = screen.getByRole("section", { name: "Data" });
- expect(tab).toBeInTheDocument();
+ expect(section).toBeInTheDocument();
expect(
- within(tab).getByRole("heading", { name: "Data" }),
+ within(section).getByRole("heading", { name: "Data" }),
).toBeInTheDocument();
expect(
- within(tab).queryByRole("button", { name: "Add data" }),
+ within(section).queryByRole("button", { name: "Add data" }),
).not.toBeInTheDocument();
});
it("should not render the 'Add data' button for full app embedding", () => {
setup({ isEmbeddingIframe: true });
- const tab = screen.getByRole("tab");
+ const section = screen.getByRole("section", { name: "Data" });
- expect(tab).toBeInTheDocument();
+ expect(section).toBeInTheDocument();
expect(
- within(tab).getByRole("heading", { name: "Data" }),
+ within(section).getByRole("heading", { name: "Data" }),
).toBeInTheDocument();
expect(
- within(tab).queryByRole("button", { name: "Add data" }),
+ within(section).queryByRole("button", { name: "Add data" }),
).not.toBeInTheDocument();
});
it("should be expanded by default but collapsible", async () => {
setup();
- const addDataButton = screen.getByRole("button", { name: "Add data" });
+ const section = screen.getByRole("section", { name: "Data" });
+ const addDataButton = within(section).getByRole("button", {
+ name: "Add data",
+ });
+ const toggle = within(section).getByRole("button", { name: /Data/ });
- expect(screen.getByRole("tab")).toHaveAttribute("aria-selected", "true");
- expect(screen.getByRole("tabpanel")).toHaveAttribute(
- "aria-expanded",
- "true",
- );
+ expect(toggle).toHaveAttribute("aria-expanded", "true");
+ expect(within(section).getByRole("region")).toBeInTheDocument();
expect(addDataButton).toBeInTheDocument();
expect(getIcon("chevrondown")).toBeInTheDocument();
@@ -76,9 +83,9 @@ describe("BrowseNavSection", () => {
expect(screen.getByText("Databases")).toBeInTheDocument();
expect(screen.getByText("Metrics")).toBeInTheDocument();
- await userEvent.click(screen.getByText("Data"));
- expect(screen.getByRole("tab")).toHaveAttribute("aria-selected", "false");
- expect(screen.queryByRole("tabpanel")).not.toBeInTheDocument();
+ await userEvent.click(toggle);
+ expect(toggle).toHaveAttribute("aria-expanded", "false");
+ expect(within(section).queryByRole("region")).not.toBeInTheDocument();
expect(addDataButton).toBeInTheDocument();
expect(getIcon("chevronright")).toBeInTheDocument();
@@ -88,7 +95,7 @@ describe("BrowseNavSection", () => {
});
it("clicking the 'Add data' button triggers the modal", async () => {
- const { onAddDataModalOpen } = setup();
+ const { onAddDataModalOpen } = await setup();
await userEvent.click(screen.getByRole("button", { name: "Add data" }));
expect(onAddDataModalOpen).toHaveBeenCalledTimes(1);
@@ -173,7 +180,7 @@ interface SetupOpts {
isAdmin?: boolean;
}
-function setup({
+async function setup({
isEmbeddingIframe,
entityTypes,
isAdmin = true,
@@ -221,5 +228,9 @@ function setup({
{ storeInitialState },
);
+ await waitFor(() =>
+ expect(screen.queryByRole("tooltip")).not.toBeInTheDocument(),
+ );
+
return { onAddDataModalOpen };
}
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
index 58677c187ea..08e1d2d0456 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
@@ -98,6 +98,7 @@ function MainNavbarContainer({
const { data: collections = [] } = useListCollectionsTreeQuery({
"exclude-other-user-collections": true,
"exclude-archived": true,
+ "include-library": true,
});
const collectionTree = useMemo<CollectionTreeItem[]>(() => {
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
index 6c3d913e7ac..36a3a5a9205 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
@@ -7,9 +7,11 @@ import _ from "underscore";
import ErrorBoundary from "metabase/ErrorBoundary";
import {
isExamplesCollection,
+ isLibraryCollection,
isRootTrashCollection,
isSyncedCollection,
} from "metabase/collections/utils";
+import CollapseSection from "metabase/common/components/CollapseSection";
import { Tree } from "metabase/common/components/tree";
import { useSetting, useUserSetting } from "metabase/common/hooks";
import { useIsAtHomepageDashboard } from "metabase/common/hooks/use-is-at-homepage-dashboard";
@@ -22,8 +24,8 @@ import { isSmallScreen } from "metabase/lib/dom";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { WhatsNewNotification } from "metabase/nav/components/WhatsNewNotification";
-import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
-import { ActionIcon, Flex, Icon, Tooltip } from "metabase/ui";
+import { PLUGIN_DATA_STUDIO, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import type { Bookmark } from "metabase-types/api";
import {
@@ -78,6 +80,9 @@ export function MainNavbarView({
const [expandBookmarks = true, setExpandBookmarks] = useUserSetting(
"expand-bookmarks-in-nav",
);
+ const [expandCollections = true, setExpandCollections] = useUserSetting(
+ "expand-collections-in-nav",
+ );
const isAtHomepageDashboard = useIsAtHomepageDashboard();
const showSyncGroup = useSetting("remote-sync-type") === "read-write";
@@ -112,38 +117,49 @@ export function MainNavbarView({
[isAtHomepageDashboard, onItemSelect],
);
- const [
+ const {
regularCollections,
trashCollection,
examplesCollection,
syncedCollections,
- ] = useMemo(() => {
- const synced = collections.filter(isSyncedCollection);
+ } = useMemo(() => {
+ const syncedCollections = collections.filter(isSyncedCollection);
+ const trashCollection = collections.find(isRootTrashCollection);
+ const examplesCollection = collections.find(isExamplesCollection);
- const normalCollections = collections.filter((c) => {
+ const regularCollections = collections.filter((c) => {
const isNormalCollection =
!isRootTrashCollection(c) && !isExamplesCollection(c);
- return isNormalCollection && !isSyncedCollection(c);
+ return (
+ isNormalCollection && !isSyncedCollection(c) && !isLibraryCollection(c)
+ );
});
- if (!showSyncGroup && synced.length > 0 && normalCollections.length > 0) {
- const [root, ...rest] = normalCollections;
- const reordered = [root, ...synced, ...rest];
+ const shouldMoveSyncedCollectionToTop =
+ !showSyncGroup &&
+ syncedCollections.length > 0 &&
+ regularCollections.length > 0;
+
+ const collectionsByCategory = {
+ trashCollection,
+ examplesCollection,
+ syncedCollections,
+ };
- return [
- reordered,
- collections.find(isRootTrashCollection),
- collections.find(isExamplesCollection),
- synced,
- ];
+ if (shouldMoveSyncedCollectionToTop) {
+ const [root, ...rest] = regularCollections;
+ const reordered = [root, ...syncedCollections, ...rest];
+
+ return {
+ ...collectionsByCategory,
+ regularCollections: reordered,
+ };
}
- return [
- normalCollections,
- collections.find(isRootTrashCollection),
- collections.find(isExamplesCollection),
- synced,
- ];
+ return {
+ ...collectionsByCategory,
+ regularCollections,
+ };
}, [collections, showSyncGroup]);
const isNewInstance = useSelector(getIsNewInstance);
@@ -217,28 +233,56 @@ export function MainNavbarView({
/>
)}
+ {PLUGIN_DATA_STUDIO.isEnabled && (
+ <PLUGIN_DATA_STUDIO.NavbarLibrarySection
+ collections={collections}
+ selectedId={collectionItem?.id}
+ onItemSelect={onItemSelect}
+ />
+ )}
+
<SidebarSection>
<ErrorBoundary>
- <CollectionSectionHeading
- handleCreateNewCollection={handleCreateNewCollection}
- />
-
- <Tree
- data={regularCollections}
- selectedId={collectionItem?.id}
- onSelect={onItemSelect}
- TreeNode={SidebarCollectionLink}
- role="tree"
- aria-label="collection-tree"
- />
- {showOtherUsersCollections && (
- <PaddedSidebarLink
- icon="group"
- url={OTHER_USERS_COLLECTIONS_URL}
- >
- {t`Other users' personal collections`}
- </PaddedSidebarLink>
- )}
+ <CollapseSection
+ header={<SidebarHeading>{t`Collections`}</SidebarHeading>}
+ initialState={expandCollections ? "expanded" : "collapsed"}
+ iconPosition="right"
+ iconSize={8}
+ onToggle={setExpandCollections}
+ rightAction={
+ <Tooltip label={t`Create a new collection`}>
+ <ActionIcon
+ aria-label={t`Create a new collection`}
+ color="var(--mb-color-text-medium)"
+ onClick={() => {
+ trackNewCollectionFromNavInitiated();
+ handleCreateNewCollection();
+ }}
+ >
+ <Icon name="add" />
+ </ActionIcon>
+ </Tooltip>
+ }
+ role="section"
+ aria-label={t`Collections`}
+ >
+ <Tree
+ data={regularCollections}
+ selectedId={collectionItem?.id}
+ onSelect={onItemSelect}
+ TreeNode={SidebarCollectionLink}
+ role="tree"
+ aria-label="collection-tree"
+ />
+ {showOtherUsersCollections && (
+ <PaddedSidebarLink
+ icon="group"
+ url={OTHER_USERS_COLLECTIONS_URL}
+ >
+ {t`Other users' personal collections`}
+ </PaddedSidebarLink>
+ )}
+ </CollapseSection>
</ErrorBoundary>
</SidebarSection>
@@ -276,28 +320,3 @@ export function MainNavbarView({
</ErrorBoundary>
);
}
-interface CollectionSectionHeadingProps {
- handleCreateNewCollection: () => void;
-}
-
-function CollectionSectionHeading({
- handleCreateNewCollection,
-}: CollectionSectionHeadingProps) {
- return (
- <Flex align="center" justify="space-between">
- <SidebarHeading>{t`Collections`}</SidebarHeading>
- <Tooltip label={t`Create a new collection`}>
- <ActionIcon
- aria-label={t`Create a new collection`}
- color="var(--mb-color-text-medium)"
- onClick={() => {
- trackNewCollectionFromNavInitiated();
- handleCreateNewCollection();
- }}
- >
- <Icon name="add" />
- </ActionIcon>
- </Tooltip>
- </Flex>
- );
-}
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
index 91ff838c981..2fc25d42018 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
@@ -787,7 +787,7 @@ const setup = async ({
setupTableQueryMetadataEndpoint(
createMockTable({
id: `card__${card.id}`,
- fields: card.result_metadata,
+ fields: card.result_metadata ?? [],
}),
),
);
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx
index 665ff15b23c..92ce872fa4a 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx
@@ -83,7 +83,7 @@ export const setup = async ({
setupTableQueryMetadataEndpoint(
createMockTable({
id: `card__${card.id}`,
- fields: card.result_metadata,
+ fields: card.result_metadata ?? [],
}),
),
);
diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.ts
index e2b6219d8ba..c8fd6afff35 100644
--- a/frontend/src/metabase/plugins/index.ts
+++ b/frontend/src/metabase/plugins/index.ts
@@ -60,6 +60,12 @@ export {
PLUGIN_DASHCARD_MENU,
type PluginDashcardMenu,
} from "./oss/dashcard-menu";
+export {
+ PLUGIN_DATA_STUDIO,
+ type DataStudioToolbarButtonProps,
+ type LibraryCollectionType,
+ type NavbarLibrarySectionProps,
+} from "./oss/data-studio";
export {
PLUGIN_DB_ROUTING,
PLUGIN_DATABASE_REPLICATION,
@@ -107,6 +113,14 @@ export { PLUGIN_RESOURCE_DOWNLOADS } from "./oss/resource-downloads";
export { PLUGIN_SEMANTIC_SEARCH } from "./oss/semantic-search";
export { PLUGIN_ADMIN_SETTINGS } from "./oss/settings";
export { PLUGIN_SMTP_OVERRIDE } from "./oss/smtp-override";
+export {
+ PLUGIN_SNIPPET_FOLDERS,
+ type MoveSnippetModalProps,
+ type SnippetFormModalProps,
+ type SnippetCollectionMenuProps,
+ type SnippetCollectionPermissionsModalProps,
+ type SnippetCollectionPickerModalProps,
+} from "./oss/snippets";
export {
PLUGIN_TRANSFORMS,
PLUGIN_TRANSFORMS_PYTHON,
@@ -116,6 +130,7 @@ export {
type TransformsPlugin,
type PythonTransformEditorProps,
type PythonTransformSourceSectionProps,
+ type PythonTransformSourceValidationResult,
type PythonTransformsPlugin,
type DependencyGraphPageContextType,
type CheckDependenciesFormProps,
@@ -145,6 +160,7 @@ import { reinitialize as reinitializeContentTranslation } from "./oss/content-tr
import { reinitialize as reinitializeContentVerification } from "./oss/content-verification";
import { reinitialize as reinitializeCore } from "./oss/core";
import { reinitialize as reinitializeDashcardMenu } from "./oss/dashcard-menu";
+import { reinitialize as reinitializeDatastudio } from "./oss/data-studio";
import { reinitialize as reinitializeDatabase } from "./oss/database";
import { reinitialize as reinitializeDocuments } from "./oss/documents";
import { reinitialize as reinitializeEmbedding } from "./oss/embedding";
@@ -161,6 +177,7 @@ import { reinitialize as reinitializeResourceDownloads } from "./oss/resource-do
import { reinitialize as reinitializeSemanticSearch } from "./oss/semantic-search";
import { reinitialize as reinitializeSettings } from "./oss/settings";
import { reinitialize as reinitializeSmtpOverride } from "./oss/smtp-override";
+import { reinitialize as reinitializeSnippets } from "./oss/snippets";
import { reinitialize as reinitializeSupport } from "./oss/support";
import { reinitialize as reinitializeTransforms } from "./oss/transforms";
import { reinitialize as reinitializeUploadManagement } from "./oss/upload-management";
@@ -183,6 +200,7 @@ export function reinitialize() {
reinitializeCore();
reinitializeDashcardMenu();
reinitializeDatabase();
+ reinitializeDatastudio();
reinitializeDocuments();
reinitializeEmbedding();
reinitializeEmbeddingIframeSdk();
@@ -198,6 +216,7 @@ export function reinitialize() {
reinitializeSemanticSearch();
reinitializeSettings();
reinitializeSmtpOverride();
+ reinitializeSnippets();
reinitializeSupport();
reinitializeTransforms();
reinitializeUploadManagement();
diff --git a/frontend/src/metabase/plugins/oss/ai.ts b/frontend/src/metabase/plugins/oss/ai.ts
index 65f5309b950..98a2070dcb5 100644
--- a/frontend/src/metabase/plugins/oss/ai.ts
+++ b/frontend/src/metabase/plugins/oss/ai.ts
@@ -65,6 +65,8 @@ type PluginMetabotType = {
MetabotToggleButton: ComponentType<{ className?: string }>;
MetabotAppBarButton: ComponentType;
MetabotAdminAppBarButton: ComponentType;
+ MetabotDataStudioButton: ComponentType;
+ MetabotDataStudioSidebar: ComponentType;
};
const getDefaultMetabotContextValue = (): MetabotContext => ({
@@ -116,6 +118,8 @@ const getDefaultPluginMetabot = (): PluginMetabotType => ({
MetabotToggleButton: PluginPlaceholder,
MetabotAppBarButton: PluginPlaceholder,
MetabotAdminAppBarButton: PluginPlaceholder,
+ MetabotDataStudioButton: PluginPlaceholder,
+ MetabotDataStudioSidebar: PluginPlaceholder,
});
export const PLUGIN_METABOT: PluginMetabotType = getDefaultPluginMetabot();
diff --git a/frontend/src/metabase/plugins/oss/data-studio.ts b/frontend/src/metabase/plugins/oss/data-studio.ts
new file mode 100644
index 00000000000..69e4b5889e6
--- /dev/null
+++ b/frontend/src/metabase/plugins/oss/data-studio.ts
@@ -0,0 +1,84 @@
+import type { Store } from "@reduxjs/toolkit";
+import type { ComponentType, ReactNode } from "react";
+
+import type { MiniPickerCollectionItem } from "metabase/common/components/Pickers/MiniPicker/types";
+import type Question from "metabase-lib/v1/Question";
+import type {
+ Collection,
+ CollectionItem,
+ CollectionItemModel,
+ CollectionType,
+} from "metabase-types/api";
+import type { State } from "metabase-types/store";
+
+import { PluginPlaceholder } from "../components/PluginPlaceholder";
+
+export type NavbarLibrarySectionProps = {
+ collections: Collection[];
+ selectedId?: string | number;
+ onItemSelect: () => void;
+};
+
+export type LibraryCollectionType = "root" | "models" | "metrics";
+
+export type DataStudioToolbarButtonProps = {
+ question: Question;
+};
+
+type DataStudioPlugin = {
+ isEnabled: boolean;
+ canAccessDataStudio: (state: State) => boolean;
+ getDataStudioRoutes: (
+ store: Store<State>,
+ CanAccessDataStudio: ComponentType,
+ CanAccessDataModel: ComponentType,
+ CanAccessTransforms: ComponentType,
+ ) => ReactNode;
+ DataStudioToolbarButton: ComponentType<DataStudioToolbarButtonProps>;
+ NavbarLibrarySection: ComponentType<NavbarLibrarySectionProps>;
+ getLibraryCollectionType: (
+ collectionType: CollectionType | null | undefined,
+ ) => LibraryCollectionType | undefined;
+ canPlaceEntityInCollection: (
+ entityType: CollectionItemModel,
+ collectionType: CollectionType | null | undefined,
+ ) => boolean;
+ canPlaceEntityInCollectionOrDescendants: (
+ entityType: CollectionItemModel,
+ collectionType: CollectionType | null | undefined,
+ ) => boolean;
+ useGetLibraryChildCollectionByType: ({
+ skip,
+ type,
+ }: {
+ skip?: boolean;
+ type: CollectionType;
+ }) => CollectionItem | undefined;
+ useGetLibraryCollection: (props?: { skip?: boolean }) => {
+ data: undefined | MiniPickerCollectionItem;
+ isLoading: boolean;
+ };
+};
+
+const getDefaultPluginDataStudio = (): DataStudioPlugin => ({
+ isEnabled: false,
+ canAccessDataStudio: () => false,
+ getDataStudioRoutes: () => null,
+ DataStudioToolbarButton: PluginPlaceholder,
+ NavbarLibrarySection: PluginPlaceholder,
+ getLibraryCollectionType: () => undefined,
+ canPlaceEntityInCollection: () => true,
+ canPlaceEntityInCollectionOrDescendants: () => true,
+ useGetLibraryChildCollectionByType: ({ skip: _skip, type: _type }) =>
+ undefined,
+ useGetLibraryCollection: (_props) => ({ data: undefined, isLoading: false }),
+});
+
+export const PLUGIN_DATA_STUDIO = getDefaultPluginDataStudio();
+
+/**
+ * @internal Do not call directly. Use the main reinitialize function from metabase/plugins instead.
+ */
+export function reinitialize() {
+ Object.assign(PLUGIN_DATA_STUDIO, getDefaultPluginDataStudio());
+}
diff --git a/frontend/src/metabase/plugins/oss/moderation.ts b/frontend/src/metabase/plugins/oss/moderation.ts
index 06d205ebaae..5a629e74b93 100644
--- a/frontend/src/metabase/plugins/oss/moderation.ts
+++ b/frontend/src/metabase/plugins/oss/moderation.ts
@@ -2,7 +2,7 @@ import type { ColorName } from "metabase/lib/colors/types";
import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
import type { IconName, IconProps } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
-import type { BaseUser, Dashboard } from "metabase-types/api";
+import type { BaseUser, Card, Dashboard } from "metabase-types/api";
export type RevisionOrModerationEvent = {
title: string;
@@ -27,6 +27,7 @@ const getDefaultPluginModeration = () => ({
[] as RevisionOrModerationEvent[],
useDashboardMenuItems: (_model?: Dashboard, _reload?: () => void) => [],
useQuestionMenuItems: (_model?: Question, _reload?: () => void) => [],
+ useCardMenuItems: (_model?: Card, _reload?: () => void) => [],
});
export const PLUGIN_MODERATION = getDefaultPluginModeration();
diff --git a/frontend/src/metabase/plugins/oss/permissions.ts b/frontend/src/metabase/plugins/oss/permissions.ts
index a98e254a504..fb1eddb9ab2 100644
--- a/frontend/src/metabase/plugins/oss/permissions.ts
+++ b/frontend/src/metabase/plugins/oss/permissions.ts
@@ -7,6 +7,7 @@ import {
type EntityId,
type PermissionSubject,
} from "metabase/admin/permissions/types";
+import { getUserIsAdmin } from "metabase/selectors/user";
import type Database from "metabase-lib/v1/metadata/Database";
import type {
Dataset,
@@ -153,6 +154,7 @@ const getDefaultFeatureLevelPermissions = () => ({
getDataColumns: (_subject: PermissionSubject) => [] as any,
getDownloadWidgetMessageOverride: (_result: Dataset): string | null => null,
canDownloadResults: (_result: Dataset): boolean => true,
+ canAccessDataModel: (state: State): boolean => getUserIsAdmin(state),
dataModelQueryProps: {} as any,
databaseDetailsQueryProps: {} as any,
});
diff --git a/frontend/src/metabase/plugins/oss/snippets.ts b/frontend/src/metabase/plugins/oss/snippets.ts
new file mode 100644
index 00000000000..e821597fe64
--- /dev/null
+++ b/frontend/src/metabase/plugins/oss/snippets.ts
@@ -0,0 +1,87 @@
+import type { Component, ComponentType } from "react";
+
+import type { IconName } from "metabase/ui";
+import type {
+ Collection,
+ CollectionId,
+ NativeQuerySnippet,
+} from "metabase-types/api";
+
+import { PluginPlaceholder } from "../components/PluginPlaceholder";
+
+export type SnippetSidebarMenuOption = {
+ icon: IconName;
+ name?: string;
+ label?: string;
+ onClick: () => void;
+};
+
+export type SnippetSidebarState = {
+ modalSnippetCollection?: Partial<Collection> | null;
+ permissionsModalCollectionId?: CollectionId | null;
+};
+
+export type SnippetSidebarProps = {
+ snippetCollection: { id: CollectionId | null };
+};
+
+export type SnippetSidebarComponent = Component<
+ SnippetSidebarProps,
+ SnippetSidebarState
+>;
+
+export type SnippetCollectionPickerModalProps = {
+ isOpen: boolean;
+ onSelect: (collectionId: CollectionId | null) => void;
+ onClose: () => void;
+};
+
+export type SnippetFormModalProps = {
+ collection: Partial<Collection>;
+ onClose: () => void;
+ onSaved?: () => void;
+};
+
+export type SnippetCollectionMenuProps = {
+ collection: Collection;
+ onEditDetails: (collection: Collection) => void;
+ onChangePermissions: (collectionId: CollectionId) => void;
+};
+
+export type SnippetCollectionPermissionsModalProps = {
+ collectionId: CollectionId;
+ onClose: () => void;
+};
+
+export type MoveSnippetModalProps = {
+ snippet: NativeQuerySnippet;
+ onClose: () => void;
+};
+
+export type SnippetFoldersPlugin = {
+ isEnabled: boolean;
+ CollectionPickerModal: ComponentType<SnippetCollectionPickerModalProps>;
+ CollectionFormModal: ComponentType<SnippetFormModalProps>;
+ CollectionMenu: ComponentType<SnippetCollectionMenuProps>;
+ CollectionPermissionsModal: ComponentType<SnippetCollectionPermissionsModalProps>;
+ MoveSnippetModal: ComponentType<MoveSnippetModalProps>;
+};
+
+export const getDefaultPluiginSnippetFolders = () => ({
+ isEnabled: false,
+ CollectionPickerModal:
+ PluginPlaceholder as ComponentType<SnippetCollectionPickerModalProps>,
+ CollectionFormModal:
+ PluginPlaceholder as ComponentType<SnippetFormModalProps>,
+ CollectionMenu:
+ PluginPlaceholder as ComponentType<SnippetCollectionMenuProps>,
+ CollectionPermissionsModal:
+ PluginPlaceholder as ComponentType<SnippetCollectionPermissionsModalProps>,
+ MoveSnippetModal: PluginPlaceholder as ComponentType<MoveSnippetModalProps>,
+});
+
+export const PLUGIN_SNIPPET_FOLDERS = getDefaultPluiginSnippetFolders();
+
+export function reinitialize() {
+ Object.assign(PLUGIN_SNIPPET_FOLDERS, getDefaultPluiginSnippetFolders());
+}
diff --git a/frontend/src/metabase/plugins/oss/transforms.ts b/frontend/src/metabase/plugins/oss/transforms.ts
index 1464bbe3580..467398406c4 100644
--- a/frontend/src/metabase/plugins/oss/transforms.ts
+++ b/frontend/src/metabase/plugins/oss/transforms.ts
@@ -8,13 +8,14 @@ import {
import type Question from "metabase-lib/v1/Question";
import type {
CheckDependenciesResponse,
+ GetDependencyGraphRequest,
PythonTransformSourceDraft,
Transform,
TransformId,
UpdateSnippetRequest,
UpdateTransformRequest,
} from "metabase-types/api";
-import type { AdminPath } from "metabase-types/store";
+import type { State } from "metabase-types/store";
// Types
export type TransformPickerItem = {
@@ -29,21 +30,17 @@ export type TransformPickerProps = {
};
export type TransformsPlugin = {
+ isEnabled: boolean;
+ canAccessTransforms: (state: State) => boolean;
+ getDataStudioTransformRoutes(): ReactNode;
TransformPicker: ComponentType<TransformPickerProps>;
- getAdminPaths(): AdminPath[];
- getAdminRoutes(): ReactNode;
};
export type PythonTransformEditorProps = {
- name?: string;
source: PythonTransformSourceDraft;
proposedSource?: PythonTransformSourceDraft;
- isNew: boolean;
isDirty: boolean;
- isSaving: boolean;
onChangeSource: (source: PythonTransformSourceDraft) => void;
- onSave: () => void;
- onCancel: () => void;
onAcceptProposed: () => void;
onRejectProposed: () => void;
};
@@ -52,8 +49,17 @@ export type PythonTransformSourceSectionProps = {
transform: Transform;
};
+export type PythonTransformSourceValidationResult = {
+ isValid: boolean;
+ errorMessage?: string;
+};
+
export type PythonTransformsPlugin = {
isEnabled: boolean;
+ getPythonLibraryRoutes: () => ReactNode;
+ getPythonSourceValidationResult: (
+ source: PythonTransformSourceDraft,
+ ) => PythonTransformSourceValidationResult;
TransformEditor: ComponentType<PythonTransformEditorProps>;
SourceSection: ComponentType<PythonTransformSourceSectionProps>;
PythonRunnerSettingsPage: ComponentType;
@@ -63,6 +69,7 @@ export type PythonTransformsPlugin = {
type DependenciesPlugin = {
isEnabled: boolean;
+ getDataStudioDependencyRoutes: () => ReactNode;
DependencyGraphPage: ComponentType;
DependencyGraphPageContext: Context<DependencyGraphPageContextType>;
CheckDependenciesForm: ComponentType<CheckDependenciesFormProps>;
@@ -77,6 +84,10 @@ type DependenciesPlugin = {
useCheckTransformDependencies: (
props: UseCheckDependenciesProps<UpdateTransformRequest>,
) => UseCheckDependenciesResult<UpdateTransformRequest>;
+ useGetDependenciesCount: (args: GetDependencyGraphRequest) => {
+ dependenciesCount: number;
+ dependentsCount: number;
+ };
};
export type DependencyGraphPageContextType = {
@@ -123,15 +134,18 @@ function useCheckDependencies<TChange>({
}
const getDefaultPluginTransforms = (): TransformsPlugin => ({
+ isEnabled: false,
+ canAccessTransforms: () => false,
+ getDataStudioTransformRoutes: () => null,
TransformPicker: PluginPlaceholder,
- getAdminPaths: () => [],
- getAdminRoutes: () => null,
});
export const PLUGIN_TRANSFORMS = getDefaultPluginTransforms();
const getDefaultPluginTransformsPython = (): PythonTransformsPlugin => ({
isEnabled: false,
+ getPythonLibraryRoutes: () => null,
+ getPythonSourceValidationResult: () => ({ isValid: true }),
TransformEditor: PluginPlaceholder,
SourceSection: PluginPlaceholder,
PythonRunnerSettingsPage: NotFoundPlaceholder,
@@ -143,6 +157,7 @@ export const PLUGIN_TRANSFORMS_PYTHON = getDefaultPluginTransformsPython();
const getDefaultPluginDependencies = (): DependenciesPlugin => ({
isEnabled: false,
+ getDataStudioDependencyRoutes: () => null,
DependencyGraphPage: PluginPlaceholder,
DependencyGraphPageContext: createContext({}),
CheckDependenciesForm: PluginPlaceholder,
@@ -151,6 +166,10 @@ const getDefaultPluginDependencies = (): DependenciesPlugin => ({
useCheckCardDependencies: useCheckDependencies,
useCheckSnippetDependencies: useCheckDependencies,
useCheckTransformDependencies: useCheckDependencies,
+ useGetDependenciesCount: () => ({
+ dependenciesCount: 0,
+ dependentsCount: 0,
+ }),
});
export const PLUGIN_DEPENDENCIES = getDefaultPluginDependencies();
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
index 7feb7f317d0..bfd41f0bdb2 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
@@ -278,7 +278,7 @@ async function handleQBInit(
if (uiControls.queryBuilderMode === "notebook") {
const databases = await loadDatabases(dispatch);
if (!getHasDataAccess(databases)) {
- dispatch(replace("/unauthorized"));
+ dispatch(replace(Urls.unauthorized()));
return;
}
}
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
index 08add65f7b2..e6aa4ddbb51 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
@@ -1,14 +1,11 @@
import _ from "underscore";
-import { getTrashUndoMessage } from "metabase/archive/utils";
-import Questions from "metabase/entities/questions";
import { createThunkAction } from "metabase/lib/redux";
import { loadMetadataForCard } from "metabase/questions/actions";
-import { addUndo } from "metabase/redux/undo";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
-import type { Card, Series } from "metabase-types/api";
+import type { Series } from "metabase-types/api";
import type {
Dispatch,
GetState,
@@ -181,14 +178,10 @@ export const updateQuestion = (
export const SET_ARCHIVED_QUESTION = "metabase/question/SET_ARCHIVED_QUESTION";
export const setArchivedQuestion = createThunkAction(
SET_ARCHIVED_QUESTION,
- function (question, archived = true, undoing = false) {
+ function (question, archived = true) {
return async function (dispatch) {
- const result = (await dispatch(
- Questions.actions.update({ id: question.card().id }, { archived }),
- )) as { payload: { object: Card } };
-
await dispatch(
- updateQuestion(question.setCard(result.payload.object), {
+ updateQuestion(question.setArchived(archived), {
shouldUpdateUrl: false,
shouldStartAdHocQuestion: false,
// results can change after entering/leaving the trash
@@ -200,16 +193,6 @@ export const setArchivedQuestion = createThunkAction(
if (archived) {
dispatch(setUIControls({ isNativeEditorOpen: false }));
}
-
- if (!undoing) {
- dispatch(
- addUndo({
- message: getTrashUndoMessage(question.card().name, archived),
- action: () =>
- dispatch(setArchivedQuestion(question, !archived, true)),
- }),
- );
- }
};
},
);
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
index 378faeb1f06..05ffdd9d5d3 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
@@ -105,7 +105,7 @@ function getModelVirtualTable(card: Card) {
db_id: SAVED_QUESTIONS_DB.id,
name: card.name,
display_name: card.name,
- fields: card.result_metadata,
+ fields: card.result_metadata ?? [],
});
}
diff --git a/frontend/src/metabase/query_builder/components/MoveQuestionModal/index.tsx b/frontend/src/metabase/query_builder/components/MoveQuestionModal/index.tsx
deleted file mode 100644
index 5ea6209cf93..00000000000
--- a/frontend/src/metabase/query_builder/components/MoveQuestionModal/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./MoveQuestionModal";
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.tsx
index 50e38023caa..d8d41f0bbc3 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.tsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.tsx
@@ -235,7 +235,7 @@ export function useReferencedCardCompletion({
.map((item) => item.data)
.filter(isNotNull)
.flatMap((card) =>
- card.result_metadata.map((field) => ({
+ (card.result_metadata ?? []).map((field) => ({
card,
field,
})),
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
index bf394e6f646..e28fd6c9932 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
@@ -74,7 +74,7 @@ const DataSourceSelectors = ({
const allDatabases = query
.metadata()
.databasesList({ savedQuestions: false })
- .filter((db) => db.canWrite());
+ .filter((db) => db.canWrite() && !db.is_audit);
if (editorContext === "action") {
return allDatabases.filter((database) => database.hasActionsEnabled());
diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
index c21dd0b3200..1b29b445031 100644
--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
@@ -12,6 +12,7 @@ import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { QuestionAlertListModal } from "metabase/notifications/modals";
+import { setArchivedQuestion } from "metabase/query_builder/actions";
import { ImpossibleToCreateModelModal } from "metabase/query_builder/components/ImpossibleToCreateModelModal";
import { NewDatasetModal } from "metabase/query_builder/components/NewDatasetModal";
import { QuestionEmbedWidget } from "metabase/query_builder/components/QuestionEmbedWidget";
@@ -19,17 +20,17 @@ import { PreviewQueryModal } from "metabase/query_builder/components/view/Previe
import type { QueryModalType } from "metabase/query_builder/constants";
import { MODAL_TYPES } from "metabase/query_builder/constants";
import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";
-import ArchiveQuestionModal from "metabase/questions/containers/ArchiveQuestionModal";
+import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";
+import { MoveCardModal } from "metabase/questions/components/MoveCardModal";
import EditEventModal from "metabase/timelines/questions/containers/EditEventModal";
import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";
import NewEventModal from "metabase/timelines/questions/containers/NewEventModal";
import { Text } from "metabase/ui";
-import type Question from "metabase-lib/v1/Question";
+import Question from "metabase-lib/v1/Question";
import type { Card, DashboardTabId } from "metabase-types/api";
import type { QueryBuilderMode } from "metabase-types/store";
import { AddToDashSelectDashModal } from "../AddToDashSelectDashModal";
-import { MoveQuestionModal } from "../MoveQuestionModal";
type OnCreateOptions = { dashboardTabId?: DashboardTabId | undefined };
@@ -154,11 +155,12 @@ export function QueryModals({
const handleCopySaved = useCallback(
(
- newQuestion: Question,
+ newCard: Card,
options?: {
dashboardTabId?: DashboardTabId | undefined;
},
) => {
+ const newQuestion = new Question(newCard, question.metadata());
const isDashboardQuestion = _.isNumber(newQuestion.dashboardId());
const isModel = newQuestion.type() === "model";
@@ -178,6 +180,7 @@ export function QueryModals({
}
},
[
+ question,
navigateToDashboardQuestionDashboard,
onCloseModal,
setQueryBuilderMode,
@@ -225,45 +228,46 @@ export function QueryModals({
/>
);
case MODAL_TYPES.MOVE:
- return <MoveQuestionModal question={question} onClose={onCloseModal} />;
+ return <MoveCardModal card={question.card()} onClose={onCloseModal} />;
case MODAL_TYPES.ARCHIVE:
return (
- <Modal onClose={onCloseModal}>
- <ArchiveQuestionModal question={question} onClose={onCloseModal} />
- </Modal>
+ <ArchiveCardModal
+ card={question.card()}
+ onArchive={() => dispatch(setArchivedQuestion(question, true))}
+ onUnarchive={() => dispatch(setArchivedQuestion(question, false))}
+ onClose={onCloseModal}
+ />
);
case MODAL_TYPES.CLONE:
return (
- <Modal onClose={onCloseModal}>
- <EntityCopyModal
- entityType="questions"
- entityObject={{
- ...question.card(),
- collection_id: question.canWrite()
- ? question.collectionId()
- : initialCollectionId,
- }}
- copy={async (formValues) => {
- if (!underlyingQuestion) {
- return;
- }
+ <EntityCopyModal
+ entityType="cards"
+ entityObject={{
+ ...question.card(),
+ collection_id: question.canWrite()
+ ? question.collectionId()
+ : initialCollectionId,
+ }}
+ copy={async (formValues) => {
+ if (!underlyingQuestion) {
+ return;
+ }
- const question = underlyingQuestion
- .setDisplayName(formValues.name)
- .setCollectionId(formValues.collection_id)
- .setDashboardId(formValues.dashboard_id)
- .setDescription(formValues.description || null);
+ const question = underlyingQuestion
+ .setDisplayName(formValues.name)
+ .setCollectionId(formValues.collection_id)
+ .setDashboardId(formValues.dashboard_id)
+ .setDescription(formValues.description || null);
- const object = await onCreate(question, {
- dashboardTabId: formValues.dashboard_tab_id,
- });
+ const object = await onCreate(question, {
+ dashboardTabId: formValues.dashboard_tab_id,
+ });
- return object;
- }}
- onClose={onCloseModal}
- onSaved={handleCopySaved}
- />
- </Modal>
+ return object.card();
+ }}
+ onClose={onCloseModal}
+ onSaved={handleCopySaved}
+ />
);
case MODAL_TYPES.TURN_INTO_DATASET:
return (
diff --git a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx b/frontend/src/metabase/query_builder/components/QueryVisualization.jsx
index 583e90df0a9..eb43ce8239f 100644
--- a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx
+++ b/frontend/src/metabase/query_builder/components/QueryVisualization.jsx
@@ -32,12 +32,22 @@ export default function QueryVisualization(props) {
isObjectDetail,
isResultDirty,
isNativeEditorOpen,
+ isDirtyStateShownForError,
result,
maxTableRows = HARD_ROW_LIMIT,
} = props;
const canRun = Lib.canRun(question.query(), question.type());
const [warnings, setWarnings] = useState([]);
+ const isDirtyStateShown =
+ canRun &&
+ isResultDirty &&
+ isRunnable &&
+ !isRunning &&
+ !isNativeEditorOpen &&
+ (result?.error == null ||
+ isDirtyStateShownForError ||
+ result.error_type === SERVER_ERROR_TYPES.missingRequiredParameter);
return (
<div
@@ -48,16 +58,7 @@ export default function QueryVisualization(props) {
) : null}
<VisualizationDirtyState
{...props}
- hidden={
- !canRun ||
- !isResultDirty ||
- !isRunnable ||
- isRunning ||
- isNativeEditorOpen ||
- (result?.error &&
- // This error should not prevent showing a dirty-state overlay with the `run` button
- result.error_type !== SERVER_ERROR_TYPES.missingRequiredParameter)
- }
+ hidden={!isDirtyStateShown}
className={cx(CS.spread, CS.z2)}
/>
{!isObjectDetail && (
@@ -94,7 +95,7 @@ export default function QueryVisualization(props) {
className={CS.spread}
onUpdateWarnings={setWarnings}
/>
- ) : !isRunning ? (
+ ) : !isRunning && !isDirtyStateShown ? (
<VisualizationEmptyState
className={CS.spread}
isCompact={isNativeEditorOpen}
diff --git a/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/CollectionIcon.tsx b/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/CollectionIcon.tsx
index 49e28e58c36..42338bfae3d 100644
--- a/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/CollectionIcon.tsx
+++ b/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/CollectionIcon.tsx
@@ -15,7 +15,11 @@ export const CollectionIcon = ({
question: Question;
}) => {
if (!collection?.type) {
- return <PLUGIN_MODERATION.EntityModerationIcon question={question} />;
+ return (
+ <PLUGIN_MODERATION.EntityModerationIcon
+ moderationReviews={question.getModerationReviews()}
+ />
+ );
}
return (
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx
index 807ca6e4f31..c8f52d580fa 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx
@@ -27,6 +27,14 @@ import { SnippetSidebarEmptyState } from "./SnippetSidebarEmptyState";
const MIN_SNIPPETS_FOR_SEARCH = 1;
+/**
+ * @typedef {import("metabase/plugins").SnippetSidebarProps} SnippetSidebarProps
+ * @typedef {import("metabase/plugins").SnippetSidebarState} SnippetSidebarState
+ */
+
+/**
+ * @extends {React.Component<SnippetSidebarProps, SnippetSidebarState>}
+ */
class SnippetSidebarInner extends React.Component {
state = {
showSearch: false,
diff --git a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx b/frontend/src/metabase/query_builder/components/view/View/View/View.jsx
index 4616ea00aed..c82b61956bf 100644
--- a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx
+++ b/frontend/src/metabase/query_builder/components/view/View/View/View.jsx
@@ -275,6 +275,9 @@ const ViewInner = forwardRef(function _ViewInner(props, ref) {
const mapDispatchToProps = (dispatch) => ({
onSetDatabaseId: (id) => dispatch(rememberLastUsedDatabase(id)),
onUnarchive: async (question) => {
+ await dispatch(
+ Questions.actions.update({ id: question.id() }, { archived: false }),
+ );
await dispatch(setArchivedQuestion(question, false));
await dispatch(Bookmarks.actions.invalidateLists());
},
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
index 7ccd9963792..fb700cbf939 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
@@ -7,6 +7,7 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { UploadInput } from "metabase/common/components/upload";
import { useDispatch } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
+import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";
import type { QueryModalType } from "metabase/query_builder/constants";
import { uploadFile } from "metabase/redux/uploads";
@@ -99,6 +100,11 @@ export const QuestionActions = ({
}
};
+ const shouldShowDataStudioLink =
+ PLUGIN_DATA_STUDIO.isEnabled &&
+ PLUGIN_DATA_STUDIO.getLibraryCollectionType(question.collection()?.type) !=
+ null;
+
return (
<>
<Divider orientation="vertical" my="xs" />
@@ -160,13 +166,16 @@ export const QuestionActions = ({
</Box>
</>
)}
- {!question.isArchived() && (
+ {!question.isArchived() && !shouldShowDataStudioLink && (
<QuestionMoreActionsMenu
question={question}
onOpenModal={onOpenModal}
onSetQueryBuilderMode={onSetQueryBuilderMode}
/>
)}
+ {shouldShowDataStudioLink && (
+ <PLUGIN_DATA_STUDIO.DataStudioToolbarButton question={question} />
+ )}
</>
);
};
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
index ec89e68dd2a..46f36f72f52 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
@@ -135,7 +135,7 @@ export const QuestionMoreActionsMenu = ({
onClick={() => onOpenModal(MODAL_TYPES.CREATE_ALERT)}
/>
),
- ...PLUGIN_MODERATION.useQuestionMenuItems(question, reload),
+ ...PLUGIN_MODERATION.useCardMenuItems(question.card(), reload),
hasCollectionPermissions && isModelOrMetric && hasDataPermissions && (
<Menu.Item
key="edit_definition"
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
index 633dcaa5f73..2431f7c9291 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
@@ -162,7 +162,7 @@ async function setup({
createMockTable({
id: `card__${card.id}`,
name: card.name,
- fields: card.result_metadata,
+ fields: card.result_metadata ?? [],
}),
],
}),
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx
index dacdb2d75c4..921b5ace0ed 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx
@@ -10,6 +10,7 @@ import {
createMockCard,
createMockCollection,
createMockModerationReview,
+ createMockUserInfo,
} from "metabase-types/api/mocks";
import { PRODUCTS_ID } from "metabase-types/api/mocks/presets";
@@ -114,13 +115,13 @@ describe("QuestionInfoSidebar", () => {
it("should show creation information", () => {
const card = createMockCard({
name: "Question",
- creator: {
+ creator: createMockUserInfo({
first_name: "Ash",
last_name: "Ketchum",
common_name: "Ash Ketchum",
id: 19,
- },
+ }),
created_at: "2024-04-13T00:00:00Z",
});
setup({ card });
diff --git a/frontend/src/metabase/query_builder/containers/test-utils.tsx b/frontend/src/metabase/query_builder/containers/test-utils.tsx
index 23cb2520768..5356648fa7e 100644
--- a/frontend/src/metabase/query_builder/containers/test-utils.tsx
+++ b/frontend/src/metabase/query_builder/containers/test-utils.tsx
@@ -342,8 +342,9 @@ export const startNewNotebookModel = async () => {
await userEvent.click(screen.getByText("Use the notebook editor"));
await waitForLoaderToBeRemoved();
- const modal = await screen.findByTestId("entity-picker-modal");
+ const modal = await screen.findByTestId("mini-picker");
await waitForLoaderToBeRemoved();
+ await userEvent.click(await within(modal).findByText("Sample Database"));
await userEvent.click(await within(modal).findByText("Orders"));
expect(screen.getByRole("button", { name: "Get Answer" })).toBeEnabled();
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
index 603366e2459..d67320cbd1c 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
@@ -57,10 +57,10 @@ export function NativeQueryPreviewSidebarToggle({
isNativeQueryPreviewSidebarOpen,
onToggleNativeQueryPreviewSidebar,
}: NativeQueryPreviewSidebarToggleProps) {
+ const label = isNativeQueryPreviewSidebarOpen ? t`Hide SQL` : t`View SQL`;
+
return (
- <Tooltip
- label={isNativeQueryPreviewSidebarOpen ? t`Hide SQL` : t`View SQL`}
- >
+ <Tooltip label={label}>
<ActionIcon
key="view-sql"
onClick={onToggleNativeQueryPreviewSidebar}
@@ -68,6 +68,7 @@ export function NativeQueryPreviewSidebarToggle({
className={S.nativeSidebarToggle}
color="text"
variant="subtle"
+ aria-label={label}
>
<Icon name="sql" color="text" />
</ActionIcon>
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx
index d9c1b1558fc..727be62801c 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditor.tsx
@@ -13,8 +13,8 @@ import {
NativeQueryPreviewSidebarToggle,
} from "./NativeQueryPreviewSidebar";
import { NativeQuerySidebar } from "./NativeQuerySidebar";
-import { QuerySection } from "./QuerySection";
-import { VisualizationSection } from "./VisualizationSection";
+import { QueryEditorBody } from "./QueryEditorBody";
+import { QueryEditorVisualization } from "./QueryEditorVisualization";
type QueryEditorProps = {
query: Lib.Query;
@@ -65,6 +65,7 @@ export function QueryEditor({
} = useQueryEditor({
query,
uiState,
+ uiOptions,
proposedQuery,
onChangeQuery,
onChangeUiState,
@@ -80,13 +81,14 @@ export function QueryEditor({
return (
<>
- <Flex flex={1} h="100%">
- <Flex flex="2 1 0" direction="column" pos="relative">
- <QuerySection
+ <Flex flex={1} h="100%" mih={0}>
+ <Flex flex="2 1 0" miw={0} direction="column" pos="relative">
+ <QueryEditorBody
question={question}
proposedQuestion={proposedQuestion}
modalSnippet={uiState.modalSnippet}
nativeEditorSelectedText={selectedText}
+ readOnly={uiOptions?.readOnly}
isNative={isNative}
isRunnable={isRunnable}
isRunning={isRunning}
@@ -107,7 +109,7 @@ export function QueryEditor({
onAcceptProposed={onAcceptProposed}
onRejectProposed={onRejectProposed}
/>
- <VisualizationSection
+ <QueryEditorVisualization
question={question}
result={result}
rawSeries={rawSeries}
@@ -118,7 +120,7 @@ export function QueryEditor({
onRunQuery={runQuery}
onCancelQuery={cancelQuery}
/>
- {!isNative && (
+ {!isNative && uiOptions?.canConvertToNative && (
<NativeQueryPreviewSidebarToggle
isNativeQueryPreviewSidebarOpen={
uiState.sidebarType === "native-query"
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.module.css b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.module.css
similarity index 100%
rename from frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.module.css
rename to frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.module.css
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
similarity index 90%
rename from frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.tsx
rename to frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
index d9274f65bcd..34073614c03 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/QuerySection.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
@@ -9,10 +9,10 @@ import NativeQueryEditor, {
type SelectionRange,
} from "metabase/query_builder/components/NativeQueryEditor";
import type { QueryModalType } from "metabase/query_builder/constants";
+import type { QueryEditorDatabasePickerItem } from "metabase/querying/editor/types";
import { Notebook } from "metabase/querying/notebook/components/Notebook";
import { Box } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
-import type Database from "metabase-lib/v1/metadata/Database";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import type {
NativeQuerySnippet,
@@ -21,7 +21,7 @@ import type {
import { ResizeHandle } from "../ResizeHandle";
-import S from "./QuerySection.module.css";
+import S from "./QueryEditorBody.module.css";
const EDITOR_HEIGHT = 550;
const NATIVE_HEADER_HEIGHT = 55;
@@ -36,7 +36,7 @@ const NATIVE_EDITOR_SIDEBAR_FEATURES = {
aiGeneration: false,
};
-type QuerySectionProps = {
+type QueryEditorBodyProps = {
question: Question;
proposedQuestion: Question | undefined;
modalSnippet?:
@@ -44,13 +44,14 @@ type QuerySectionProps = {
| Partial<Omit<NativeQuerySnippet, "id">>
| null;
nativeEditorSelectedText?: string | null;
+ readOnly?: boolean;
isNative: boolean;
isRunnable: boolean;
isRunning: boolean;
isResultDirty: boolean;
isShowingDataReference: boolean;
isShowingSnippetSidebar: boolean;
- shouldDisableDatabase?: (database: Database) => boolean;
+ shouldDisableDatabase?: (database: QueryEditorDatabasePickerItem) => boolean;
shouldDisableItem?: (
item: DataPickerItem | CollectionPickerItem | RecentCollectionItem,
) => boolean;
@@ -67,11 +68,12 @@ type QuerySectionProps = {
onRejectProposed?: () => void;
};
-export function QuerySection({
+export function QueryEditorBody({
question,
proposedQuestion,
modalSnippet,
nativeEditorSelectedText,
+ readOnly,
isNative,
isRunnable,
isRunning,
@@ -91,14 +93,14 @@ export function QuerySection({
onOpenModal,
onAcceptProposed,
onRejectProposed,
-}: QuerySectionProps) {
+}: QueryEditorBodyProps) {
const [isResizing, setIsResizing] = useState(false);
const reportTimezone = useSetting("report-timezone-long");
const editorHeight = useInitialEditorHeight(isNative);
const dataPickerOptions = useMemo(
- () => ({ shouldDisableItem }),
- [shouldDisableItem],
+ () => ({ shouldDisableItem, shouldDisableDatabase }),
+ [shouldDisableItem, shouldDisableDatabase],
);
const resizableBoxProps: Partial<ResizableBoxProps> = useMemo(
@@ -133,7 +135,7 @@ export function QuerySection({
hasRunButton
isInitiallyOpen
isNativeEditorOpen
- readOnly={false}
+ readOnly={readOnly}
hasParametersList={false}
isRunnable={isRunnable}
isRunning={isRunning}
@@ -166,9 +168,10 @@ export function QuerySection({
onResizeStart={() => setIsResizing(true)}
onResizeStop={() => setIsResizing(false)}
>
- <Box w="100%" style={{ overflowY: isResizing ? "hidden" : "auto" }}>
+ <Box w="100%" style={{ overflow: isResizing ? "hidden" : "auto" }}>
<Notebook
question={question}
+ readOnly={readOnly}
isDirty={false}
isRunnable={false}
isResultDirty={false}
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/index.ts
new file mode 100644
index 00000000000..9e321ff5666
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/index.ts
@@ -0,0 +1 @@
+export * from "./QueryEditorBody";
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.module.css b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.module.css
new file mode 100644
index 00000000000..9c5f5ebe751
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.module.css
@@ -0,0 +1,3 @@
+.root {
+ flex: 1 0 auto;
+}
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.tsx
similarity index 82%
rename from frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.tsx
rename to frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.tsx
index 8040cf163ed..750abbae82b 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/VisualizationSection.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.tsx
@@ -3,9 +3,9 @@ import QueryVisualization from "metabase/query_builder/components/QueryVisualiza
import type Question from "metabase-lib/v1/Question";
import type { Dataset, RawSeries } from "metabase-types/api";
-import S from "./VisualizationSection.module.css";
+import S from "./QueryEditorVisualization.module.css";
-type VisualizationSectionProps = {
+type QueryEditorVisualizationProps = {
question: Question;
result: Dataset | null;
rawSeries: RawSeries | null;
@@ -17,7 +17,7 @@ type VisualizationSectionProps = {
onCancelQuery: () => void;
};
-export function VisualizationSection({
+export function QueryEditorVisualization({
question,
result,
rawSeries,
@@ -27,7 +27,7 @@ export function VisualizationSection({
isResultDirty,
onRunQuery,
onCancelQuery,
-}: VisualizationSectionProps) {
+}: QueryEditorVisualizationProps) {
return (
<DebouncedFrame className={S.root}>
<QueryVisualization
@@ -39,6 +39,7 @@ export function VisualizationSection({
isDirty
isResultDirty={isResultDirty}
isNativeEditorOpen={isNative}
+ isDirtyStateShownForError={!isNative}
runQuestionQuery={onRunQuery}
cancelQuery={onCancelQuery}
/>
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/index.ts
new file mode 100644
index 00000000000..600de5a121f
--- /dev/null
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/index.ts
@@ -0,0 +1 @@
+export * from "./QueryEditorVisualization";
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/index.ts
deleted file mode 100644
index 168aad143a9..00000000000
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QuerySection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./QuerySection";
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/index.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/index.ts
deleted file mode 100644
index 93607d85049..00000000000
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/VisualizationSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./VisualizationSection";
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/utils.ts b/frontend/src/metabase/querying/editor/components/QueryEditor/utils.ts
index d01175e8795..da4cf8a0061 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/utils.ts
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/utils.ts
@@ -2,6 +2,7 @@ import type { QueryEditorUiState } from "../../types";
export function getInitialUiState(): QueryEditorUiState {
return {
+ lastRunResult: null,
lastRunQuery: null,
selectionRange: [],
modalSnippet: null,
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
index f04aff3d6c8..b25d069fa25 100644
--- a/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
@@ -24,7 +24,7 @@ export function useQueryControls(
question: Question,
uiState: QueryEditorUiState,
setQuestion: (newQuestion: Question) => void,
- setUiState: (newUiState: QueryEditorUiState) => void,
+ onChangeUiState: (newUiState: QueryEditorUiState) => void,
) {
const selectedText = useMemo(() => {
const query = question.query();
@@ -34,20 +34,20 @@ export function useQueryControls(
}, [question, uiState.selectionRange]);
const setSelectionRange = (selectionRange: SelectionRange[]) => {
- setUiState({ ...uiState, selectionRange });
+ onChangeUiState({ ...uiState, selectionRange });
};
const setModalSnippet = (modalSnippet: NativeQuerySnippet | null) => {
- setUiState({ ...uiState, modalSnippet });
+ onChangeUiState({ ...uiState, modalSnippet });
};
const openSnippetModalWithSelectedText = () => {
- setUiState({ ...uiState, modalSnippet: { content: selectedText } });
+ onChangeUiState({ ...uiState, modalSnippet: { content: selectedText } });
};
const openModal = (type: QueryModalType) => {
if (type === "preview-query") {
- setUiState({
+ onChangeUiState({
...uiState,
modalType: "preview-query",
});
@@ -68,12 +68,12 @@ export function useQueryControls(
};
const convertToNative = (newQuestion: Question) => {
- setUiState({ ...uiState, sidebarType: null });
+ onChangeUiState({ ...uiState, sidebarType: null });
setQuestion(newQuestion);
};
const toggleSidebar = (sidebarType: QueryEditorSidebarType) => {
- setUiState({
+ onChangeUiState({
...uiState,
sidebarType: uiState.sidebarType === sidebarType ? null : sidebarType,
});
@@ -92,7 +92,7 @@ export function useQueryControls(
};
const toggleModal = (modalType: QueryEditorModalType) => {
- setUiState({
+ onChangeUiState({
...uiState,
modalType: uiState.modalType === modalType ? null : modalType,
});
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-editor/use-query-editor.ts b/frontend/src/metabase/querying/editor/hooks/use-query-editor/use-query-editor.ts
index 93136517f06..63fec324183 100644
--- a/frontend/src/metabase/querying/editor/hooks/use-query-editor/use-query-editor.ts
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-editor/use-query-editor.ts
@@ -1,6 +1,6 @@
import * as Lib from "metabase-lib";
-import type { QueryEditorUiState } from "../../types";
+import type { QueryEditorUiOptions, QueryEditorUiState } from "../../types";
import { useQueryControls } from "../use-query-controls";
import { useQueryMetadata } from "../use-query-metadata";
import { useQueryQuestion } from "../use-query-question";
@@ -9,6 +9,7 @@ import { useQueryResults } from "../use-query-results";
type UseQueryEditorProps = {
query: Lib.Query;
uiState: QueryEditorUiState;
+ uiOptions?: QueryEditorUiOptions;
proposedQuery?: Lib.Query;
onChangeQuery: (newQuery: Lib.Query) => void;
onChangeUiState: (newUiState: QueryEditorUiState) => void;
@@ -17,6 +18,7 @@ type UseQueryEditorProps = {
export function useQueryEditor({
query,
uiState,
+ uiOptions,
proposedQuery,
onChangeQuery,
onChangeUiState,
@@ -24,6 +26,7 @@ export function useQueryEditor({
const { question, proposedQuestion, setQuestion } = useQueryQuestion(
query,
proposedQuery,
+ uiOptions,
onChangeQuery,
);
const { isLoading, error } = useQueryMetadata(question);
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
index 3cf0268e255..caa4ace7f30 100644
--- a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
@@ -6,6 +6,8 @@ import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { VisualizationSettings } from "metabase-types/api";
+import type { QueryEditorUiOptions } from "../../types";
+
const DEFAULT_VIZ_SETTINGS: VisualizationSettings = {
"table.pivot": false,
};
@@ -13,7 +15,12 @@ const DEFAULT_VIZ_SETTINGS: VisualizationSettings = {
export function useQueryQuestion(
query: Lib.Query,
proposedQuery: Lib.Query | undefined,
- setQuery: (newQuery: Lib.Query) => void,
+ {
+ cardType,
+ cardDisplay,
+ cardVizSettings = DEFAULT_VIZ_SETTINGS,
+ }: QueryEditorUiOptions = {},
+ onChangeQuery: (newQuery: Lib.Query) => void,
) {
const metadata = useSelector(getMetadata);
@@ -22,7 +29,9 @@ export function useQueryQuestion(
question: Question.create({
dataset_query: Lib.toJsQuery(query),
metadata,
- visualization_settings: DEFAULT_VIZ_SETTINGS,
+ cardType,
+ display: cardDisplay,
+ visualization_settings: cardVizSettings,
}),
proposedQuestion:
proposedQuery != null
@@ -33,11 +42,11 @@ export function useQueryQuestion(
})
: undefined,
}),
- [query, proposedQuery, metadata],
+ [query, proposedQuery, metadata, cardType, cardDisplay, cardVizSettings],
);
const setQuestion = (newQuestion: Question) => {
- setQuery(newQuestion.query());
+ onChangeQuery(newQuestion.query());
};
return { question, proposedQuestion, setQuestion };
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-results/use-query-results.ts b/frontend/src/metabase/querying/editor/hooks/use-query-results/use-query-results.ts
index 3506ac77278..5290f644447 100644
--- a/frontend/src/metabase/querying/editor/hooks/use-query-results/use-query-results.ts
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-results/use-query-results.ts
@@ -1,4 +1,4 @@
-import { useMemo, useRef } from "react";
+import { useEffect, useMemo, useRef } from "react";
import { useLazyGetAdhocQueryQuery } from "metabase/api";
import * as Lib from "metabase-lib";
@@ -10,24 +10,26 @@ import type { QueryEditorUiState } from "../../types";
export function useQueryResults(
question: Question,
uiState: QueryEditorUiState,
- setUiState: (newUiState: QueryEditorUiState) => void,
+ onChangeUiState: (newUiState: QueryEditorUiState) => void,
) {
- const { lastRunQuery } = uiState;
- const [runAdhocQuery, { data = null, isFetching: isRunning = false }] =
+ const { lastRunResult, lastRunQuery } = uiState;
+ const [runAdhocQuery, { isFetching: isRunning = false }] =
useLazyGetAdhocQueryQuery();
const abortRef = useRef<() => void>();
- const { result, rawSeries, isRunnable, isResultDirty } = useMemo(() => {
+ const { rawSeries, isRunnable, isResultDirty } = useMemo(() => {
const lastRunQuestion = lastRunQuery
? Question.create({
dataset_query: lastRunQuery,
metadata: question.metadata(),
+ cardType: question.type(),
+ display: question.display(),
visualization_settings: question.settings(),
})
: null;
const rawSeries =
- lastRunQuestion && data
- ? [{ card: lastRunQuestion.card(), data: data.data }]
+ lastRunQuestion && lastRunResult
+ ? [{ card: lastRunQuestion.card(), data: lastRunResult.data }]
: null;
const isRunnable = Lib.canRun(question.query(), question.type());
const isResultDirty =
@@ -38,21 +40,23 @@ export function useQueryResults(
);
return {
- result: data,
rawSeries,
isRunnable,
isResultDirty,
};
- }, [question, data, lastRunQuery]);
+ }, [question, lastRunResult, lastRunQuery]);
const runQuery = async () => {
- const result = runAdhocQuery({
- ...question.datasetQuery(),
+ const lastRunQuery = question.datasetQuery();
+ const action = runAdhocQuery({
+ ...lastRunQuery,
parameters: normalizeParameters(question.parameters()),
});
- abortRef.current = result.abort;
- await result;
- setUiState({ ...uiState, lastRunQuery: question.datasetQuery() });
+ abortRef.current = action.abort;
+ const { data: lastRunResult = null } = await action;
+ abortRef.current = undefined;
+
+ onChangeUiState({ ...uiState, lastRunResult, lastRunQuery });
};
const cancelQuery = () => {
@@ -60,8 +64,12 @@ export function useQueryResults(
abortRef.current = undefined;
};
+ useEffect(() => {
+ return () => abortRef.current?.();
+ }, []);
+
return {
- result,
+ result: lastRunResult,
rawSeries,
isRunnable,
isRunning,
diff --git a/frontend/src/metabase/querying/editor/types.ts b/frontend/src/metabase/querying/editor/types.ts
index a1a7b14e275..b19c0944b2f 100644
--- a/frontend/src/metabase/querying/editor/types.ts
+++ b/frontend/src/metabase/querying/editor/types.ts
@@ -1,11 +1,16 @@
import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker/types";
import type { DataPickerItem } from "metabase/common/components/Pickers/DataPicker/types";
+import type { MiniPickerTableItem } from "metabase/common/components/Pickers/MiniPicker/types";
import type { SelectionRange } from "metabase/query_builder/components/NativeQueryEditor/types";
import type {
+ CardDisplayType,
+ CardType,
Database,
+ Dataset,
DatasetQuery,
NativeQuerySnippet,
RecentCollectionItem,
+ VisualizationSettings,
} from "metabase-types/api";
export type QueryEditorSidebarType =
@@ -18,25 +23,30 @@ export type QueryEditorModalType = "preview-query";
export type QueryEditorDataPickerItem =
| DataPickerItem
| CollectionPickerItem
- | RecentCollectionItem;
+ | RecentCollectionItem
+ | MiniPickerTableItem;
-export type QueryEditorDatabasePickerItem = Omit<
- Database,
- "tables" | "schemas"
->;
+export type QueryEditorDatabasePickerItem = Pick<Database, "id">;
+
+export type QueryEditorModalSnippet =
+ | NativeQuerySnippet
+ | Partial<Omit<NativeQuerySnippet, "id">>;
export type QueryEditorUiState = {
+ lastRunResult: Dataset | null;
lastRunQuery: DatasetQuery | null;
selectionRange: SelectionRange[];
- modalSnippet:
- | NativeQuerySnippet
- | Partial<Omit<NativeQuerySnippet, "id">>
- | null;
+ modalSnippet: QueryEditorModalSnippet | null;
modalType: QueryEditorModalType | null;
sidebarType: QueryEditorSidebarType | null;
};
export type QueryEditorUiOptions = {
+ cardType?: CardType;
+ cardDisplay?: CardDisplayType;
+ cardVizSettings?: VisualizationSettings;
+ readOnly?: boolean;
+ canConvertToNative?: boolean;
convertToNativeTitle?: string;
convertToNativeButtonLabel?: string;
shouldDisableDataPickerItem?: (item: QueryEditorDataPickerItem) => boolean;
diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx
index fc7d2bfa5e4..b72df9777a6 100644
--- a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx
@@ -1,7 +1,10 @@
-import { type CSSProperties, useMemo } from "react";
+import { type CSSProperties, useMemo, useState } from "react";
import { t } from "ttag";
import IconButtonWrapper from "metabase/common/components/IconButtonWrapper";
+import { METAKEY } from "metabase/lib/browser";
+import { useSelector } from "metabase/lib/redux";
+import { getIsEmbedding } from "metabase/selectors/embed";
import { Icon, Popover, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -10,6 +13,7 @@ import { FieldPicker, type FieldPickerItem } from "../FieldPicker";
import { NotebookCell, NotebookCellItem } from "../NotebookCell";
import { CONTAINER_PADDING } from "../NotebookCell/constants";
import { NotebookDataPicker } from "../NotebookDataPicker";
+import { DataPickerTarget } from "../NotebookDataPicker/DataPickerTarget";
import S from "./DataStep.module.css";
@@ -26,6 +30,7 @@ export const DataStep = ({
const table = tableId
? (Lib.tableOrCardMetadata(query, tableId) ?? undefined)
: undefined;
+ const [isOpened, setIsOpened] = useState(() => !table);
const isMetric = question.type() === "metric";
const isRaw = useMemo(() => {
@@ -36,6 +41,7 @@ export const DataStep = ({
}, [query, stageIndex]);
const canSelectTableColumns = table && isRaw && !readOnly;
+ const isEmbedding = useSelector(getIsEmbedding);
const handleTableChange = async (
table: Lib.TableMetadata | Lib.CardMetadata,
@@ -52,23 +58,7 @@ export const DataStep = ({
return (
<NotebookCell color={color}>
- <NotebookCellItem
- color={color}
- inactive={!table}
- right={
- canSelectTableColumns && (
- <DataFieldPopover
- query={query}
- stageIndex={stageIndex}
- updateQuery={updateQuery}
- />
- )
- }
- containerStyle={{ padding: 0 }}
- rightContainerStyle={{ width: 37, padding: 0 }}
- data-testid="data-step-cell"
- disabled={readOnly}
- >
+ {isOpened || !table || isEmbedding ? (
<NotebookDataPicker
query={query}
stageIndex={stageIndex}
@@ -76,11 +66,52 @@ export const DataStep = ({
title={t`Pick your starting data`}
canChangeDatabase
hasMetrics
+ isOpened={isOpened}
+ setIsOpened={setIsOpened}
isDisabled={readOnly}
onChange={handleTableChange}
+ columnPicker={
+ <DataFieldPopover
+ query={query}
+ stageIndex={stageIndex}
+ updateQuery={updateQuery}
+ />
+ }
{...dataPickerOptions}
/>
- </NotebookCellItem>
+ ) : (
+ <NotebookCellItem
+ color={color}
+ inactive={!table}
+ right={
+ canSelectTableColumns && (
+ <DataFieldPopover
+ query={query}
+ stageIndex={stageIndex}
+ updateQuery={updateQuery}
+ />
+ )
+ }
+ containerStyle={{ padding: 0 }}
+ rightContainerStyle={{ width: 37, padding: 0 }}
+ data-testid="data-step-cell"
+ disabled={readOnly}
+ >
+ <Tooltip
+ label={t`${METAKEY}+click to open in new tab`}
+ hidden={!table || readOnly}
+ events={{ hover: true, focus: false, touch: false }}
+ >
+ <DataPickerTarget
+ table={table}
+ query={query}
+ setIsOpened={setIsOpened}
+ stageIndex={stageIndex}
+ isDisabled={readOnly}
+ />
+ </Tooltip>
+ </NotebookCellItem>
+ )}
</NotebookCell>
);
};
@@ -91,7 +122,7 @@ interface DataFieldPopoverProps {
updateQuery: (query: Lib.Query) => Promise<void>;
}
-function DataFieldPopover({
+export function DataFieldPopover({
query,
stageIndex,
updateQuery,
diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx
index b47d807d1da..9c29319ef83 100644
--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { createMockMetadata } from "__support__/metadata";
-import { fireEvent, getIcon, screen, within } from "__support__/ui";
+import { fireEvent, getIcon, screen } from "__support__/ui";
import { METAKEY } from "metabase/lib/browser";
import { checkNotNull } from "metabase/lib/types";
import type { IconName } from "metabase/ui";
@@ -82,15 +82,10 @@ describe("DataStep", () => {
it("should render without a table selected", async () => {
setupEmptyQuery();
- const modal = await screen.findByTestId("entity-picker-modal");
+ expect(await screen.findByTestId("mini-picker")).toBeInTheDocument(); // popover
expect(
- await within(modal).findByText("Pick your starting data"),
- ).toBeInTheDocument();
-
- // Ensure the table picker not open
- expect(await within(modal).findByText("Orders")).toBeInTheDocument();
- expect(await within(modal).findByText("Products")).toBeInTheDocument();
- expect(await within(modal).findByText("People")).toBeInTheDocument();
+ await screen.findByPlaceholderText(/search for tables and more/i),
+ ).toBeInTheDocument(); // search input
});
it("should render with a selected table", () => {
@@ -264,17 +259,12 @@ describe("DataStep", () => {
);
});
- it("should not show the tooltip when there is no table selected", async () => {
+ it("should show a search input when no data is selected", async () => {
setupEmptyQuery();
- const modal = await screen.findByTestId("entity-picker-modal");
- const closeButton = await screen.findByRole("button", { name: /close/i });
-
- await userEvent.click(closeButton);
- expect(modal).not.toBeInTheDocument();
-
- await userEvent.hover(screen.getByText("Pick your starting data"));
- expect(screen.queryByRole("tooltip")).not.toBeInTheDocument();
+ expect(
+ await screen.findByPlaceholderText(/search for tables and more/i),
+ ).toBeInTheDocument();
});
it("meta click should open the data source in a new window", () => {
@@ -312,16 +302,14 @@ describe("DataStep", () => {
mockWindowOpen.mockClear();
});
- it("regular click should open the entity picker", async () => {
+ it("regular click should open the mini picker", async () => {
const { mockWindowOpen } = setup();
const dataSource = screen.getByText("Orders");
fireEvent.click(dataSource);
- expect(
- await screen.findByTestId("entity-picker-modal"),
- ).toBeInTheDocument();
+ expect(await screen.findByTestId("mini-picker")).toBeInTheDocument();
expect(mockWindowOpen).not.toHaveBeenCalled();
});
});
diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsx
index c648e54e5fb..1718480f494 100644
--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsx
@@ -54,7 +54,7 @@ describe("DataStep", () => {
const dataSource = await screen.findByText("Orders");
fireEvent.click(dataSource, clickConfig);
- expect(await screen.findByText("Products")).toBeInTheDocument();
+ expect(await screen.findByText("Orders")).toBeInTheDocument();
expect(mockWindowOpen).not.toHaveBeenCalled();
mockWindowOpen.mockClear();
},
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
index 63f631981eb..fc721d7cc6d 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
@@ -103,7 +103,7 @@ export function JoinComplete({
return (
<Flex direction={{ base: "column", md: "row" }} gap="sm">
<NotebookCell className={S.JoinConditionCell} color={color}>
- <Flex gap={6}>
+ <Flex gap={6} align="center">
<NotebookCellItem color={color} disabled aria-label={t`Left table`}>
{lhsTableName}
</NotebookCellItem>
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
index b5558a5a3eb..2811e843c9a 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
@@ -107,7 +107,7 @@ export function JoinDraft({
return (
<Flex miw="100%" gap="sm">
<NotebookCell className={S.JoinCell} color={color}>
- <Flex direction="row" gap={6}>
+ <Flex gap={6} align="center">
<NotebookCellItem color={color} disabled aria-label={t`Left table`}>
{lhsTableName}
</NotebookCellItem>
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
index 20ae5a464e8..aa870e3be31 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
@@ -3,6 +3,8 @@ import { useState } from "react";
import { createMockMetadata } from "__support__/metadata";
import {
+ setupCollectionByIdEndpoint,
+ setupCollectionItemsEndpoint,
setupDatabasesEndpoints,
setupRecentViewsAndSelectionsEndpoints,
setupSearchEndpoints,
@@ -22,6 +24,7 @@ import * as Lib from "metabase-lib";
import { createQuery, getJoinQueryHelpers } from "metabase-lib/test-helpers";
import type { CollectionItem, RecentItem } from "metabase-types/api";
import {
+ createMockCollection,
createMockCollectionItem,
createMockDatabase,
createMockRecentCollectionItem,
@@ -53,6 +56,12 @@ const QUESTION = createSavedStructuredCard({
database_id: ANOTHER_DATABASE.id,
});
+const ROOT_COLLECTION = createMockCollection({
+ id: "root",
+ name: "Our Analytics",
+});
+const PERSONAL_COLLECTION = createMockCollection({ id: 1, name: "Personal" });
+
const STATE = createMockState({
entities: createMockEntitiesState({
databases: DATABASES,
@@ -168,6 +177,17 @@ function setup({
setupDatabasesEndpoints(DATABASES);
setupSearchEndpoints(searchItems);
setupRecentViewsAndSelectionsEndpoints(recentItems, ["selections"]);
+ setupCollectionByIdEndpoint({
+ collections: [ROOT_COLLECTION, PERSONAL_COLLECTION],
+ });
+ setupCollectionItemsEndpoint({
+ collection: ROOT_COLLECTION,
+ collectionItems: [],
+ });
+ setupCollectionItemsEndpoint({
+ collection: PERSONAL_COLLECTION,
+ collectionItems: [],
+ });
function Wrapper() {
const [query, setQuery] = useState(step.query);
@@ -270,12 +290,16 @@ describe("Notebook Editor > Join Step", () => {
setup();
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
);
await waitForLoaderToBeRemoved();
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
expect(await within(modal).findByText("Products")).toBeInTheDocument();
expect(await within(modal).findByText("People")).toBeInTheDocument();
@@ -286,16 +310,22 @@ describe("Notebook Editor > Join Step", () => {
setup();
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
);
await waitForLoaderToBeRemoved();
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
expect(
- within(modal).queryByText(ANOTHER_DATABASE.name),
- ).not.toBeInTheDocument();
+ within(modal).queryByRole("link", {
+ name: new RegExp(ANOTHER_DATABASE.name),
+ }),
+ ).toHaveAttribute("data-disabled", "true");
});
it("questions from another database should not appear in recents (Metabase#44974)", async () => {
@@ -322,10 +352,13 @@ describe("Notebook Editor > Join Step", () => {
});
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
);
await waitForLoaderToBeRemoved();
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const modal = await screen.findByTestId("entity-picker-modal");
@@ -342,9 +375,14 @@ describe("Notebook Editor > Join Step", () => {
setup();
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
+ );
+
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
);
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Reviews"));
const lhsColumnPicker = await screen.findByTestId("lhs-column-picker");
@@ -371,6 +409,12 @@ describe("Notebook Editor > Join Step", () => {
const rhsTablePicker = screen.getByLabelText("Right table");
const pickerButton = within(rhsTablePicker).getByText("Products");
await userEvent.click(pickerButton);
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Sample Database/ }),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const modal = await screen.findByTestId("entity-picker-modal");
await userEvent.click(await within(modal).findByText("People"));
@@ -392,6 +436,12 @@ describe("Notebook Editor > Join Step", () => {
const pickerButton = within(rhsTablePicker).getByText("Products");
await userEvent.click(pickerButton);
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Sample Database/ }),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const modal = await screen.findByTestId("entity-picker-modal");
await userEvent.click(await within(modal).findByText("Reviews"));
@@ -443,21 +493,27 @@ describe("Notebook Editor > Join Step", () => {
it("should automatically open RHS table picker", async () => {
setup();
-
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const modal = await screen.findByTestId("entity-picker-modal");
-
+ await userEvent.click(await within(modal).findByText("Databases"));
expect(await within(modal).findByText("Products")).toBeInTheDocument();
expect(within(modal).getByText("People")).toBeInTheDocument();
expect(within(modal).getByText("Reviews")).toBeInTheDocument();
- expect(screen.getByLabelText("Right table")).toHaveTextContent(
- "Pick data…",
- );
+ // There is no longer a button with a display value, but a textbox with no value until something is selected
+ expect(
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
+ ).toHaveDisplayValue("");
});
it("should apply a suggested condition when table is selected", async () => {
const { getRecentJoin } = setup();
-
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Products"));
expect(await screen.findByLabelText("Left column")).toHaveTextContent(
@@ -510,9 +566,13 @@ describe("Notebook Editor > Join Step", () => {
setup();
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
);
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Reviews"));
expect(screen.queryByLabelText("Remove condition")).not.toBeInTheDocument();
@@ -567,9 +627,16 @@ describe("Notebook Editor > Join Step", () => {
it("should reset the draft join condition state when the rhs table is changed", async () => {
setup();
const rhsTablePicker = screen.getByLabelText("Right table");
- await userEvent.click(within(rhsTablePicker).getByRole("button"));
+ await userEvent.click(within(rhsTablePicker).getByRole("textbox"));
+
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const entityPickerModal = await screen.findByTestId("entity-picker-modal");
await waitForLoaderToBeRemoved();
+ await userEvent.click(
+ await within(entityPickerModal).findByText("Databases"),
+ );
await userEvent.click(
await within(entityPickerModal).findByText("Reviews"),
);
@@ -579,6 +646,12 @@ describe("Notebook Editor > Join Step", () => {
await userEvent.click(
await within(newRhsTablePicker).findByText("Reviews"),
);
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Sample Database/ }),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const newEntityPickerModal = await screen.findByTestId(
"entity-picker-modal",
);
@@ -598,9 +671,16 @@ describe("Notebook Editor > Join Step", () => {
const { getRecentJoin } = setup();
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
+ );
+
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
);
const lhsTableModal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(
+ await within(lhsTableModal).findByText("Databases"),
+ );
await userEvent.click(await within(lhsTableModal).findByText("Reviews"));
await userEvent.click(screen.getByLabelText("Change join type"));
@@ -666,7 +746,17 @@ describe("Notebook Editor > Join Step", () => {
name: /Products/,
}),
);
+
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Sample Database/ }),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
+ );
const lhsTableModal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(
+ await within(lhsTableModal).findByText("Databases"),
+ );
await userEvent.click(await within(lhsTableModal).findByText("Reviews"));
const lhsColumnPopover = await screen.findByTestId("lhs-column-picker");
@@ -684,7 +774,9 @@ describe("Notebook Editor > Join Step", () => {
it("should be 'all' by default", async () => {
const { getRecentJoin } = setup();
+ await userEvent.click(await screen.findByText("Browse all"));
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Products"));
await waitFor(() => {
@@ -696,7 +788,9 @@ describe("Notebook Editor > Join Step", () => {
it("should select a few columns when adding a join", async () => {
const { getRecentJoin } = setup();
+ await userEvent.click(await screen.findByText("Browse all"));
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Reviews"));
await userEvent.click(await screen.findByLabelText("Pick columns"));
@@ -744,7 +838,9 @@ describe("Notebook Editor > Join Step", () => {
it("should allow deselecting the last join column", async () => {
setup();
+ await userEvent.click(await screen.findByText("Browse all"));
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Reviews"));
await userEvent.click(await screen.findByLabelText("Pick columns"));
const joinColumnsPicker = await screen.findByTestId(
@@ -765,7 +861,10 @@ describe("Notebook Editor > Join Step", () => {
it("should be able to select no columns when adding a new join", async () => {
const { getRecentJoin } = setup();
+ await userEvent.click(await screen.findByText("Browse all"));
+
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Reviews"));
await userEvent.click(await screen.findByLabelText("Pick columns"));
@@ -881,9 +980,14 @@ describe("Notebook Editor > Join Step", () => {
expect(screen.queryByLabelText("Add condition")).not.toBeInTheDocument();
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
);
+
+ await userEvent.click(await screen.findByText("Browse all"));
+
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
+
await userEvent.click(await within(modal).findByText("Reviews"));
expect(screen.queryByLabelText("Add condition")).not.toBeInTheDocument();
@@ -1054,7 +1158,12 @@ describe("Notebook Editor > Join Step", () => {
async ({ lhsBucketName, rhsBucketName, expectedColumnName }) => {
const { getRecentJoin } = setup({ step: createMockNotebookStep() });
+ await userEvent.click(await screen.findByText("Browse all"));
+
const picketModal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(
+ await within(picketModal).findByText("Databases"),
+ );
await userEvent.click(await within(picketModal).findByText("Reviews"));
await selectColumnWithBucket(lhsBucketName);
await selectColumnWithBucket(rhsBucketName);
@@ -1131,7 +1240,12 @@ describe("Notebook Editor > Join Step", () => {
}) => {
const { getRecentJoin } = setup({ step: createMockNotebookStep() });
+ await userEvent.click(await screen.findByText("Browse all"));
+
const picketModal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(
+ await within(picketModal).findByText("Databases"),
+ );
await userEvent.click(await within(picketModal).findByText("Reviews"));
await selectColumnWithBucket(oldBucketName);
await selectColumnWithBucket(oldBucketName);
@@ -1157,10 +1271,14 @@ describe("Notebook Editor > Join Step", () => {
it("should allow to create a new join condition with custom expressions", async () => {
const { getRecentJoin } = setup();
await userEvent.click(
- within(screen.getByLabelText("Right table")).getByRole("button"),
+ within(screen.getByLabelText("Right table")).getByRole("textbox"),
+ );
+ await userEvent.click(
+ await screen.findByRole("menuitem", { name: /Browse all/ }),
);
await waitForLoaderToBeRemoved();
const modal = await screen.findByTestId("entity-picker-modal");
+ await userEvent.click(await within(modal).findByText("Databases"));
await userEvent.click(await within(modal).findByText("Reviews"));
const lhsPicker = await screen.findByTestId("lhs-column-picker");
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx
index 93e68987b03..17512fcb344 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx
@@ -3,12 +3,16 @@ import { useState } from "react";
import { t } from "ttag";
import IconButtonWrapper from "metabase/common/components/IconButtonWrapper";
-import { Icon, Popover, Tooltip } from "metabase/ui";
+import { METAKEY } from "metabase/lib/browser";
+import { useSelector } from "metabase/lib/redux";
+import { getIsEmbedding } from "metabase/selectors/embed";
+import { Box, Icon, Popover, Tooltip } from "metabase/ui";
import type * as Lib from "metabase-lib";
import { NotebookCellItem } from "../../NotebookCell";
import { CONTAINER_PADDING } from "../../NotebookCell/constants";
import { NotebookDataPicker } from "../../NotebookDataPicker";
+import { DataPickerTarget } from "../../NotebookDataPicker/DataPickerTarget";
import S from "./JoinTablePicker.module.css";
@@ -31,35 +35,60 @@ export function JoinTablePicker({
columnPicker,
onChange,
}: JoinTablePickerProps) {
- const isDisabled = isReadOnly;
+ const [isOpened, setIsOpened] = useState(!table);
+ const isEmbedding = useSelector(getIsEmbedding);
return (
- <NotebookCellItem
- inactive={!table}
- readOnly={isReadOnly}
- disabled={isDisabled}
- color={color}
- right={
- table != null && !isReadOnly ? (
- <JoinTableColumnPicker columnPicker={columnPicker} />
- ) : null
- }
- containerStyle={CONTAINER_STYLE}
- rightContainerStyle={RIGHT_CONTAINER_STYLE}
- aria-label={t`Right table`}
- >
- <NotebookDataPicker
- title={t`Pick data to join`}
- query={query}
- stageIndex={stageIndex}
- table={table}
- placeholder={t`Pick data…`}
- canChangeDatabase={false}
- hasMetrics={false}
- isDisabled={isDisabled}
- onChange={onChange}
- />
- </NotebookCellItem>
+ <Box aria-label={t`Right table`}>
+ {isOpened || !table || isEmbedding ? (
+ <NotebookDataPicker
+ title={t`Pick data to join`}
+ query={query}
+ stageIndex={stageIndex}
+ table={table}
+ placeholder={t`Pick data…`}
+ isOpened={isOpened}
+ setIsOpened={setIsOpened}
+ canChangeDatabase={false}
+ hasMetrics={false}
+ isDisabled={isReadOnly}
+ onChange={onChange}
+ columnPicker={
+ table != null && !isReadOnly ? (
+ <JoinTableColumnPicker columnPicker={columnPicker} />
+ ) : null
+ }
+ />
+ ) : (
+ <NotebookCellItem
+ inactive={!table}
+ readOnly={isReadOnly}
+ disabled={isReadOnly}
+ color={color}
+ right={
+ table != null && !isReadOnly ? (
+ <JoinTableColumnPicker columnPicker={columnPicker} />
+ ) : null
+ }
+ containerStyle={CONTAINER_STYLE}
+ rightContainerStyle={RIGHT_CONTAINER_STYLE}
+ >
+ <Tooltip
+ label={t`${METAKEY}+click to open in new tab`}
+ hidden={!table || isReadOnly}
+ events={{ hover: true, focus: false, touch: false }}
+ >
+ <DataPickerTarget
+ table={table}
+ query={query}
+ setIsOpened={setIsOpened}
+ stageIndex={stageIndex}
+ isDisabled={isReadOnly}
+ />
+ </Tooltip>
+ </NotebookCellItem>
+ )}
+ </Box>
);
}
@@ -100,6 +129,5 @@ const CONTAINER_STYLE = {
const RIGHT_CONTAINER_STYLE = {
width: 37,
- height: "100%",
padding: 0,
};
diff --git a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsx
index 12a3be4ba33..f222a1d71fd 100644
--- a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsx
@@ -99,29 +99,29 @@ const dataPickerValueMap: Record<
}
> = {
table: {
- tabIcon: "table",
- tabDisplayName: "Tables",
+ tabIcon: "folder",
+ tabDisplayName: "Data",
recentItem: TEST_RECENT_TABLE,
itemPickerData: checkNotNull(MOCK_DATABASE.tables).map(
(table) => table.display_name,
),
- pickerColIdx: 2, // tables are always level 2 in the data picker
+ pickerColIdx: 3, // tables are always level 3 in the data picker
},
card: {
tabIcon: "folder",
- tabDisplayName: "Collections",
+ tabDisplayName: "Data",
recentItem: TEST_RECENT_CARD,
itemPickerData: ["card"],
},
dataset: {
tabIcon: "folder",
- tabDisplayName: "Collections",
+ tabDisplayName: "Data",
recentItem: TEST_RECENT_MODEL,
itemPickerData: ["dataset"],
},
metric: {
tabIcon: "folder",
- tabDisplayName: "Collections",
+ tabDisplayName: "Data",
recentItem: TEST_RECENT_METRIC,
itemPickerData: ["metric"],
},
@@ -339,14 +339,14 @@ describe("Notebook", () => {
expect(await screen.findByTestId("tabs-view")).toBeInTheDocument();
- for (const model of TEST_ENTITY_TYPES) {
- const { tabDisplayName, tabIcon } = dataPickerValueMap[model];
-
- await goToDataPickerTab({
- name: tabDisplayName,
- iconName: tabIcon,
- });
- }
+ await goToDataPickerTab({
+ name: "Data",
+ iconName: "folder",
+ });
+ await goToDataPickerTab({
+ name: "Recents",
+ iconName: "clock",
+ });
});
});
@@ -398,6 +398,9 @@ describe("Notebook", () => {
const goToEntityModal = async () => {
await userEvent.click(screen.getByText("Orders"));
+ const popover = await screen.findByTestId("mini-picker");
+ await userEvent.click(await within(popover).findByText("Sample Database"));
+ await userEvent.click(await within(popover).findByText("Browse all"));
expect(screen.getByTestId("entity-picker-modal")).toBeInTheDocument();
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
index b97b3c084ec..6ccaba14104 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
@@ -1,31 +1,76 @@
+import type React from "react";
import { type MouseEvent, type Ref, forwardRef } from "react";
+import { t } from "ttag";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getIsEmbedding } from "metabase/selectors/embed";
import type { IconName } from "metabase/ui";
import { Flex, Icon, UnstyledButton } from "metabase/ui";
-import type * as Lib from "metabase-lib";
+import * as Lib from "metabase-lib";
import { NotebookCell } from "../NotebookCell";
+import { getUrl } from "./utils";
+
type DataPickerTargetProps = {
- tableInfo?: Lib.TableDisplayInfo;
- placeholder: string;
+ table?: Lib.TableMetadata | Lib.CardMetadata;
+ query: Lib.Query;
+ stageIndex: number;
+ placeholder?: React.ReactNode;
isDisabled?: boolean;
onClick?: (event: MouseEvent<HTMLButtonElement>) => void;
onAuxClick?: (event: MouseEvent<HTMLButtonElement>) => void;
getTableIcon?: (tableInfo: Lib.TableDisplayInfo) => IconName;
+ setIsOpened: (isOpened: boolean) => void;
};
export const DataPickerTarget = forwardRef(function DataPickerTarget(
{
- tableInfo,
- placeholder,
+ table,
+ query,
+ stageIndex,
+ placeholder = t`Select data`,
isDisabled,
- onClick,
- onAuxClick,
getTableIcon = defaultGetTableIcon,
+ setIsOpened,
}: DataPickerTargetProps,
ref: Ref<HTMLButtonElement>,
) {
+ const tableInfo =
+ table != null ? Lib.displayInfo(query, stageIndex, table) : undefined;
+ const isEmbedding = useSelector(getIsEmbedding);
+
+ const openDataSourceInNewTab = () => {
+ if (isEmbedding) {
+ return;
+ }
+ const url = getUrl({ query, table, stageIndex });
+ if (url) {
+ const subpathSafeUrl = Urls.getSubpathSafeUrl(url);
+ Urls.openInNewTab(subpathSafeUrl);
+ }
+ };
+
+ const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
+ const isCtrlOrMetaClick =
+ (event.ctrlKey || event.metaKey) && event.button === 0;
+ if (isCtrlOrMetaClick) {
+ openDataSourceInNewTab();
+ } else {
+ setIsOpened(true);
+ }
+ };
+
+ const handleAuxClick = (event: MouseEvent<HTMLButtonElement>) => {
+ const isMiddleClick = event.button === 1;
+ if (isMiddleClick) {
+ openDataSourceInNewTab();
+ } else {
+ setIsOpened(true);
+ }
+ };
+
return (
<UnstyledButton
ref={ref}
@@ -34,8 +79,8 @@ export const DataPickerTarget = forwardRef(function DataPickerTarget(
fw="inherit"
p={NotebookCell.CONTAINER_PADDING}
disabled={isDisabled}
- onClick={onClick}
- onAuxClick={onAuxClick}
+ onClick={handleClick}
+ onAuxClick={handleAuxClick}
>
<Flex align="center" gap="xs">
{tableInfo && (
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx
index 22e83be0ab9..0c129d8d75a 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx
@@ -37,8 +37,6 @@ export function EmbeddingDataPicker({
});
const databaseId = Lib.databaseID(query);
- const tableInfo =
- table != null ? Lib.displayInfo(query, stageIndex, table) : undefined;
const pickerInfo = table != null ? Lib.pickerInfo(query, table) : undefined;
const { data: card } = useGetCardQuery(
pickerInfo?.cardId != null ? { id: pickerInfo.cardId } : skipToken,
@@ -95,7 +93,10 @@ export function EmbeddingDataPicker({
* so we need to remove it. Treating it as a table.
*/
getTableIcon={() => "table"}
- tableInfo={tableInfo}
+ table={table}
+ query={query}
+ stageIndex={stageIndex}
+ setIsOpened={() => {}}
placeholder={placeholder}
isDisabled={isDisabled}
/>
@@ -127,7 +128,12 @@ export function EmbeddingDataPicker({
canSelectQuestion={entityTypes.includes("question")}
triggerElement={
<DataPickerTarget
- tableInfo={tableInfo}
+ table={table}
+ query={query}
+ stageIndex={stageIndex}
+ setIsOpened={() => {
+ /* intentionally empty */
+ }}
placeholder={placeholder}
isDisabled={isDisabled}
/>
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
index a3a6787032c..58981ea3254 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
@@ -1,4 +1,4 @@
-import { type MouseEvent, useState } from "react";
+import { useMemo, useState } from "react";
import { useLatest } from "react-use";
import { t } from "ttag";
@@ -6,27 +6,33 @@ import type { CollectionPickerItem } from "metabase/common/components/Pickers/Co
import {
type DataPickerItem,
DataPickerModal,
+ createShouldShowItem,
getDataPickerValue,
} from "metabase/common/components/Pickers/DataPicker";
-import { METAKEY } from "metabase/lib/browser";
+import { MiniPicker } from "metabase/common/components/Pickers/MiniPicker";
+import type {
+ MiniPickerItem,
+ MiniPickerPickableItem,
+} from "metabase/common/components/Pickers/MiniPicker/types";
import { useDispatch, useSelector, useStore } from "metabase/lib/redux";
import { checkNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
+import type { QueryEditorDatabasePickerItem } from "metabase/querying/editor/types";
import { loadMetadataForTable } from "metabase/questions/actions";
import { getIsEmbedding } from "metabase/selectors/embed";
import { getMetadata } from "metabase/selectors/metadata";
-import { Tooltip } from "metabase/ui";
+import { Icon, TextInput } from "metabase/ui";
import * as Lib from "metabase-lib";
+import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { RecentCollectionItem, TableId } from "metabase-types/api";
import {
type NotebookContextType,
useNotebookContext,
} from "../Notebook/context";
+import { NotebookCellItem } from "../NotebookCell";
-import { DataPickerTarget } from "./DataPickerTarget";
import { EmbeddingDataPicker } from "./EmbeddingDataPicker";
-import { getUrl } from "./utils";
+import { isObjectWithModel } from "./utils";
export interface NotebookDataPickerProps {
title: string;
@@ -37,6 +43,8 @@ export interface NotebookDataPickerProps {
canChangeDatabase: boolean;
hasMetrics: boolean;
isDisabled: boolean;
+ isOpened: boolean;
+ setIsOpened: (isOpened: boolean) => void;
onChange: (
table: Lib.TableMetadata | Lib.CardMetadata,
metadataProvider: Lib.MetadataProvider,
@@ -44,6 +52,8 @@ export interface NotebookDataPickerProps {
shouldDisableItem?: (
item: DataPickerItem | CollectionPickerItem | RecentCollectionItem,
) => boolean;
+ shouldDisableDatabase?: (item: QueryEditorDatabasePickerItem) => boolean;
+ columnPicker: React.ReactNode;
}
export function NotebookDataPicker({
@@ -55,8 +65,12 @@ export function NotebookDataPicker({
canChangeDatabase,
hasMetrics,
isDisabled,
+ isOpened,
+ setIsOpened,
onChange,
shouldDisableItem,
+ shouldDisableDatabase,
+ columnPicker,
}: NotebookDataPickerProps) {
const store = useStore();
const dispatch = useDispatch();
@@ -73,18 +87,35 @@ export function NotebookDataPicker({
onChangeRef.current?.(table, metadataProvider);
}
};
+ const isRaw = useMemo(() => {
+ return (
+ Lib.aggregations(query, stageIndex).length === 0 &&
+ Lib.breakouts(query, stageIndex).length === 0
+ );
+ }, [query, stageIndex]);
if (isEmbedding) {
+ const canSelectTableColumns = table && isRaw && !isDisabled;
return (
- <EmbeddingDataPicker
- query={query}
- stageIndex={stageIndex}
- table={table}
- placeholder={placeholder}
- canChangeDatabase={canChangeDatabase}
- isDisabled={isDisabled}
- onChange={handleChange}
- />
+ <NotebookCellItem
+ color="var(--mb-color-brand)"
+ inactive={!table}
+ right={canSelectTableColumns && columnPicker}
+ containerStyle={{ padding: 0 }}
+ rightContainerStyle={{ width: 37, padding: 0 }}
+ data-testid="data-step-cell"
+ disabled={isDisabled}
+ >
+ <EmbeddingDataPicker
+ query={query}
+ stageIndex={stageIndex}
+ table={table}
+ placeholder={placeholder}
+ canChangeDatabase={canChangeDatabase}
+ isDisabled={isDisabled}
+ onChange={handleChange}
+ />
+ </NotebookCellItem>
);
} else {
return (
@@ -96,9 +127,12 @@ export function NotebookDataPicker({
placeholder={placeholder}
canChangeDatabase={canChangeDatabase}
hasMetrics={hasMetrics}
+ isOpened={isOpened}
+ setIsOpened={setIsOpened}
isDisabled={isDisabled}
onChange={handleChange}
shouldDisableItem={shouldDisableItem}
+ shouldDisableDatabase={shouldDisableDatabase}
/>
);
}
@@ -110,6 +144,8 @@ type ModernDataPickerProps = {
table: Lib.TableMetadata | Lib.CardMetadata | undefined;
title: string;
placeholder: string;
+ isOpened: boolean;
+ setIsOpened: (isOpened: boolean) => void;
canChangeDatabase: boolean;
hasMetrics: boolean;
isDisabled: boolean;
@@ -117,6 +153,7 @@ type ModernDataPickerProps = {
shouldDisableItem?: (
item: DataPickerItem | CollectionPickerItem | RecentCollectionItem,
) => boolean;
+ shouldDisableDatabase?: (database: QueryEditorDatabasePickerItem) => boolean;
};
function ModernDataPicker({
@@ -124,76 +161,121 @@ function ModernDataPicker({
stageIndex,
table,
title,
- placeholder,
+ isOpened,
+ setIsOpened,
canChangeDatabase,
hasMetrics,
isDisabled,
onChange,
shouldDisableItem,
+ shouldDisableDatabase,
}: ModernDataPickerProps) {
- const [isOpened, setIsOpened] = useState(!table);
const context = useNotebookContext();
const modelList = getModelFilterList(context, hasMetrics);
const databaseId = Lib.databaseID(query) ?? undefined;
- const tableInfo =
- table != null ? Lib.displayInfo(query, stageIndex, table) : undefined;
+
const tableValue =
table != null ? getDataPickerValue(query, stageIndex, table) : undefined;
+ const [dataSourceSearchQuery, setDataSourceSearchQuery] = useState("");
+ const [isBrowsing, setIsBrowsing] = useState(false);
+ const [focusPicker, setFocusPicker] = useState(false);
- const openDataSourceInNewTab = () => {
- const url = getUrl({ query, table, stageIndex });
- if (url) {
- const subpathSafeUrl = Urls.getSubpathSafeUrl(url);
- Urls.openInNewTab(subpathSafeUrl);
- }
- };
+ const shouldHide = useMemo(() => {
+ const shouldShow = !canChangeDatabase
+ ? createShouldShowItem(modelList, databaseId)
+ : () => true;
- const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
- const isCtrlOrMetaClick =
- (event.ctrlKey || event.metaKey) && event.button === 0;
- if (isCtrlOrMetaClick) {
- openDataSourceInNewTab();
- } else {
- setIsOpened(true);
- }
- };
-
- const handleAuxClick = (event: MouseEvent<HTMLButtonElement>) => {
- const isMiddleClick = event.button === 1;
- if (isMiddleClick) {
- openDataSourceInNewTab();
- } else {
- setIsOpened(true);
- }
- };
+ return (
+ item: MiniPickerItem | QueryEditorDatabasePickerItem | unknown,
+ ): item is MiniPickerPickableItem => {
+ return Boolean(
+ !shouldShow(item as DataPickerItem) ||
+ shouldDisableItem?.(item as DataPickerItem) ||
+ (isObjectWithModel(item) &&
+ item.model === "database" &&
+ shouldDisableDatabase?.(item as QueryEditorDatabasePickerItem)),
+ );
+ };
+ }, [
+ databaseId,
+ canChangeDatabase,
+ modelList,
+ shouldDisableItem,
+ shouldDisableDatabase,
+ ]);
return (
<>
- <Tooltip
- label={t`${METAKEY}+click to open in new tab`}
- hidden={!table || isDisabled}
- events={{ hover: true, focus: false, touch: false }}
- >
- <DataPickerTarget
- tableInfo={tableInfo}
- placeholder={placeholder}
- isDisabled={isDisabled}
- onClick={handleClick}
- onAuxClick={handleAuxClick}
- />
- </Tooltip>
- {isOpened && (
+ <MiniPicker
+ value={tableValue}
+ opened={isOpened && !isBrowsing}
+ onClose={() => setIsOpened(false)}
+ models={modelList}
+ searchQuery={dataSourceSearchQuery}
+ onBrowseAll={() => setIsBrowsing(true)}
+ trapFocus={focusPicker}
+ onChange={(value: MiniPickerPickableItem) => {
+ const id =
+ value.model === "table"
+ ? value.id
+ : getQuestionVirtualTableId(value.id);
+ onChange(id);
+ setDataSourceSearchQuery("");
+ setIsOpened(false);
+ }}
+ shouldHide={shouldHide}
+ />
+ {isOpened && isBrowsing && (
<DataPickerModal
title={title}
value={tableValue}
databaseId={canChangeDatabase ? undefined : databaseId}
models={modelList}
- onChange={onChange}
- onClose={() => setIsOpened(false)}
- shouldDisableItem={shouldDisableItem}
+ onChange={(i) => {
+ onChange(i);
+ }}
+ onClose={() => {
+ setIsBrowsing(false);
+ setIsOpened(false);
+ }}
+ shouldDisableItem={(i) => {
+ return Boolean(
+ shouldDisableItem?.(i) ||
+ ("model" in i &&
+ i.model === "database" &&
+ shouldDisableDatabase?.(i)),
+ );
+ }}
/>
)}
+ {isOpened || !table ? (
+ <TextInput
+ placeholder={t`Search for tables and more...`}
+ value={dataSourceSearchQuery}
+ variant="unstyled"
+ styles={{
+ input: { background: "transparent ", border: "none", p: 0 },
+ }}
+ leftSection={<Icon name="search" />}
+ onChange={(e) => setDataSourceSearchQuery(e.currentTarget.value)}
+ onKeyDown={(e) => {
+ if (e.key === "ArrowDown" || e.key === "tab") {
+ e.preventDefault();
+ e.stopPropagation();
+ setFocusPicker(true);
+ }
+ }}
+ onClickCapture={(e) => {
+ e.stopPropagation();
+ setIsOpened(true);
+ setFocusPicker(false);
+ }}
+ miw="20rem"
+ autoFocus={isOpened}
+ disabled={isDisabled}
+ />
+ ) : null}
</>
);
}
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts
index 4a5d8f79154..bfc3dc4e61e 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts
@@ -36,3 +36,16 @@ export const getUrl = ({
return Urls.tableRowsQuery(databaseId, tableId);
}
};
+
+export const isObjectWithModel = (
+ item: unknown,
+): item is { model: string; id: number } => {
+ return (
+ typeof item === "object" &&
+ item !== null &&
+ "model" in item &&
+ "id" in item &&
+ typeof (item as any).model === "string" &&
+ typeof (item as any).id === "number"
+ );
+};
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
index 340f3e3fd93..46818ffcaf6 100644
--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
@@ -5,6 +5,7 @@ import {
DataPickerModal,
getDataPickerValue,
} from "metabase/common/components/Pickers/DataPicker";
+import type { TablePickerValue } from "metabase/common/components/Pickers/TablePicker";
import Tables from "metabase/entities/tables";
import { useDispatch, useStore } from "metabase/lib/redux";
import { checkNotNull } from "metabase/lib/types";
@@ -36,7 +37,9 @@ export function DataStep({
const tableInfo =
query && table ? Lib.displayInfo(query, stageIndex, table) : undefined;
const tableValue =
- query && table ? getDataPickerValue(query, stageIndex, table) : undefined;
+ query && table
+ ? getDataPickerValue(query, stageIndex, table)
+ : { model: "table", id: null };
const store = useStore();
const dispatch = useDispatch();
@@ -89,9 +92,14 @@ export function DataStep({
<DataPickerModal
title={t`Select a table`}
models={["table"]}
- value={tableValue}
+ value={tableValue as TablePickerValue}
onChange={handleChange}
onClose={() => setIsOpened(false)}
+ options={{
+ showLibrary: false,
+ showRootCollection: false,
+ showPersonalCollections: false,
+ }}
/>
)}
</ClauseStep>
diff --git a/frontend/src/metabase/questions/components/ArchiveCardModal/ArchiveCardModal.tsx b/frontend/src/metabase/questions/components/ArchiveCardModal/ArchiveCardModal.tsx
new file mode 100644
index 00000000000..bb42f1cdc37
--- /dev/null
+++ b/frontend/src/metabase/questions/components/ArchiveCardModal/ArchiveCardModal.tsx
@@ -0,0 +1,122 @@
+import { msgid, ngettext, t } from "ttag";
+
+import { useUpdateCardMutation } from "metabase/api";
+import { getTrashUndoMessage } from "metabase/archive/utils";
+import { ArchiveModal } from "metabase/common/components/ArchiveModal";
+import { useToast } from "metabase/common/hooks";
+import type { Card } from "metabase-types/api";
+
+type ArchiveCardModalProps = {
+ card: Card;
+ onArchive?: () => void;
+ onUnarchive?: () => void;
+ onClose: () => void;
+};
+
+export function ArchiveCardModal({
+ card,
+ onArchive,
+ onUnarchive,
+ onClose,
+}: ArchiveCardModalProps) {
+ const { title, message } = getLabels(card);
+ const additionalWarning = getWarningMessage(card);
+ const [updateCard] = useUpdateCardMutation();
+ const [sendToast] = useToast();
+
+ const handleArchive = async () => {
+ const action = updateCard({
+ id: card.id,
+ archived: true,
+ });
+ await action.unwrap();
+
+ sendToast({
+ message: getTrashUndoMessage(card.name, true),
+ icon: "check",
+ action: async () => {
+ const action = updateCard({
+ id: card.id,
+ archived: false,
+ });
+ await action.unwrap();
+ sendToast({
+ message: getTrashUndoMessage(card.name, false),
+ icon: "check",
+ });
+ onUnarchive?.();
+ },
+ });
+
+ onArchive?.();
+ onClose();
+ };
+
+ return (
+ <ArchiveModal
+ title={title}
+ model={getModel(card)}
+ modelId={card.id}
+ message={`${message}${additionalWarning}`}
+ onArchive={handleArchive}
+ onClose={onClose}
+ />
+ );
+}
+
+function getLabels(card: Card) {
+ const type = card.type;
+
+ if (type === "question") {
+ const message =
+ card.dashboard_id != null
+ ? t`This question will be removed from its dashboard and any alerts using it.`
+ : t`This question will be removed from any dashboards or alerts using it.`;
+
+ return {
+ title: t`Move this question to trash?`,
+ message,
+ };
+ }
+
+ if (type === "model") {
+ return {
+ title: t`Move this model to trash?`,
+ message: t`This model will be removed from any dashboards or alerts using it.`,
+ };
+ }
+
+ if (type === "metric") {
+ return {
+ title: t`Archive this metric?`,
+ message: t`This metric will be removed from any dashboards or pulses using it.`,
+ };
+ }
+
+ throw new Error(`Unknown question.type(): ${type}`);
+}
+
+function getWarningMessage(card: Card) {
+ const widgetCount = card.parameter_usage_count;
+ if (widgetCount == null || widgetCount === 0) {
+ return "";
+ }
+
+ return (
+ " " +
+ ngettext(
+ msgid`It will also be removed from the filter that uses it to populate values.`,
+ `It will also be removed from the ${widgetCount} filters that use it to populate values.`,
+ widgetCount,
+ )
+ );
+}
+
+function getModel(card: Card) {
+ switch (card.type) {
+ case "question":
+ return "card";
+ default:
+ return card.type;
+ }
+}
diff --git a/frontend/src/metabase/questions/components/ArchiveCardModal/index.ts b/frontend/src/metabase/questions/components/ArchiveCardModal/index.ts
new file mode 100644
index 00000000000..45188b9e7af
--- /dev/null
+++ b/frontend/src/metabase/questions/components/ArchiveCardModal/index.ts
@@ -0,0 +1 @@
+export * from "./ArchiveCardModal";
diff --git a/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx
new file mode 100644
index 00000000000..1b9169db7a5
--- /dev/null
+++ b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx
@@ -0,0 +1,51 @@
+import { useMemo } from "react";
+
+import { useCreateCardMutation } from "metabase/api";
+import { useGetDefaultCollectionId } from "metabase/collections/hooks";
+import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";
+import type { CopyCardProperties } from "metabase/questions/components/CopyCardForm";
+import type { Card } from "metabase-types/api";
+
+type CardCopyModalProps = {
+ card: Card;
+ onCopy?: (newCard: Card) => void;
+ onClose: () => void;
+};
+
+export function CardCopyModal({ card, onCopy, onClose }: CardCopyModalProps) {
+ const [createCard] = useCreateCardMutation();
+ const initialCollectionId = useGetDefaultCollectionId();
+
+ const initialValues = useMemo(
+ () => ({
+ ...card,
+ collection_id: card.can_write ? card.collection_id : initialCollectionId,
+ }),
+ [card, initialCollectionId],
+ );
+
+ const handleCopy = async (values: CopyCardProperties) => {
+ const action = createCard({
+ ...card,
+ name: values.name,
+ description: values.description || null,
+ collection_id: values.collection_id ?? null,
+ dashboard_id: values.dashboard_id,
+ });
+ return await action.unwrap();
+ };
+
+ const handleCopySucceeded = (newCard: Card) => {
+ onCopy?.(newCard);
+ };
+
+ return (
+ <EntityCopyModal
+ entityType="cards"
+ entityObject={initialValues}
+ copy={handleCopy}
+ onSaved={handleCopySucceeded}
+ onClose={onClose}
+ />
+ );
+}
diff --git a/frontend/src/metabase/questions/components/CardCopyModal/index.ts b/frontend/src/metabase/questions/components/CardCopyModal/index.ts
new file mode 100644
index 00000000000..24da291dae1
--- /dev/null
+++ b/frontend/src/metabase/questions/components/CardCopyModal/index.ts
@@ -0,0 +1 @@
+export * from "./CardCopyModal";
diff --git a/frontend/src/metabase/questions/components/CardMoreMenu/CardMoreMenu.tsx b/frontend/src/metabase/questions/components/CardMoreMenu/CardMoreMenu.tsx
new file mode 100644
index 00000000000..3ee38d4a044
--- /dev/null
+++ b/frontend/src/metabase/questions/components/CardMoreMenu/CardMoreMenu.tsx
@@ -0,0 +1,158 @@
+import { type ReactNode, useState } from "react";
+import { c, t } from "ttag";
+
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { getMetadata } from "metabase/selectors/metadata";
+import { ActionIcon, Icon, Menu } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { Card } from "metabase-types/api";
+
+import { ArchiveCardModal } from "../ArchiveCardModal";
+import { CardCopyModal } from "../CardCopyModal";
+import { MoveCardModal } from "../MoveCardModal";
+
+type CardModalType = "move" | "copy" | "archive";
+
+type CardMoreMenuProps = {
+ card: Card;
+ onCopy?: (newCard: Card) => void;
+ onArchive?: () => void;
+ onUnarchive?: () => void;
+};
+
+export function CardMoreMenu({
+ card,
+ onCopy,
+ onArchive,
+ onUnarchive,
+}: CardMoreMenuProps) {
+ const [modalType, setModalType] = useState<CardModalType>();
+ return (
+ <>
+ <CardMenu card={card} onOpenModal={setModalType} />
+ {modalType != null && (
+ <CardModal
+ card={card}
+ modalType={modalType}
+ onCopy={onCopy}
+ onArchive={onArchive}
+ onUnarchive={onUnarchive}
+ onClose={() => setModalType(undefined)}
+ />
+ )}
+ </>
+ );
+}
+
+type CardMenuProps = {
+ card: Card;
+ onOpenModal: (modalType: CardModalType) => void;
+};
+
+function CardMenu({ card, onOpenModal }: CardMenuProps) {
+ const menuItems: ReactNode[] = [];
+ const metadata = useSelector(getMetadata);
+ const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
+ const queryInfo = Lib.queryDisplayInfo(query);
+
+ menuItems.push(
+ <Menu.Item
+ key="view"
+ leftSection={<Icon name="external" />}
+ component={ForwardRefLink}
+ to={Urls.question(card)}
+ target="_blank"
+ >
+ {c("A verb, not a noun").t`View`}
+ </Menu.Item>,
+ );
+
+ if (card.can_write) {
+ menuItems.push(
+ <Menu.Item
+ key="move"
+ leftSection={<Icon name="move" />}
+ onClick={() => onOpenModal("move")}
+ >
+ {c("A verb, not a noun").t`Move`}
+ </Menu.Item>,
+ );
+ }
+
+ if (queryInfo.isEditable) {
+ menuItems.push(
+ <Menu.Item
+ key="duplicate"
+ leftSection={<Icon name="clone" />}
+ onClick={() => onOpenModal("copy")}
+ >
+ {c("A verb, not a noun").t`Duplicate`}
+ </Menu.Item>,
+ );
+ }
+
+ if (card.can_write) {
+ menuItems.push(
+ <Menu.Item
+ key="archive"
+ leftSection={<Icon name="trash" />}
+ onClick={() => onOpenModal("archive")}
+ >
+ {t`Move to trash`}
+ </Menu.Item>,
+ );
+ }
+
+ if (menuItems.length === 0) {
+ return null;
+ }
+
+ return (
+ <Menu>
+ <Menu.Target>
+ <ActionIcon>
+ <Icon name="ellipsis" />
+ </ActionIcon>
+ </Menu.Target>
+ <Menu.Dropdown>{menuItems}</Menu.Dropdown>
+ </Menu>
+ );
+}
+
+type CardModalProps = {
+ card: Card;
+ modalType: CardModalType;
+ onCopy?: (newCard: Card) => void;
+ onArchive?: () => void;
+ onUnarchive?: () => void;
+ onClose: () => void;
+};
+
+function CardModal({
+ card,
+ modalType,
+ onCopy,
+ onArchive,
+ onUnarchive,
+ onClose,
+}: CardModalProps) {
+ switch (modalType) {
+ case "move":
+ return <MoveCardModal card={card} onClose={onClose} />;
+ case "copy":
+ return <CardCopyModal card={card} onCopy={onCopy} onClose={onClose} />;
+ case "archive":
+ return (
+ <ArchiveCardModal
+ card={card}
+ onArchive={onArchive}
+ onUnarchive={onUnarchive}
+ onClose={onClose}
+ />
+ );
+ default:
+ return null;
+ }
+}
diff --git a/frontend/src/metabase/questions/components/CardMoreMenu/index.ts b/frontend/src/metabase/questions/components/CardMoreMenu/index.ts
new file mode 100644
index 00000000000..f153f552f0c
--- /dev/null
+++ b/frontend/src/metabase/questions/components/CardMoreMenu/index.ts
@@ -0,0 +1 @@
+export * from "./CardMoreMenu";
diff --git a/frontend/src/metabase/questions/components/CopyQuestionForm.tsx b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx
similarity index 88%
rename from frontend/src/metabase/questions/components/CopyQuestionForm.tsx
rename to frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx
index 61b9dcf8d08..a1817f298b0 100644
--- a/frontend/src/metabase/questions/components/CopyQuestionForm.tsx
+++ b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx
@@ -4,6 +4,7 @@ import _ from "underscore";
import * as Yup from "yup";
import { FormCollectionAndDashboardPicker } from "metabase/collections/containers/FormCollectionAndDashboardPicker";
+import { getEntityTypeFromCardType } from "metabase/collections/utils";
import { FormFooter } from "metabase/common/components/FormFooter";
import type { CollectionPickerModel } from "metabase/common/components/Pickers/CollectionPicker";
import { FormDashboardTabSelect } from "metabase/dashboard/components/FormDashboardTabSelect";
@@ -18,8 +19,8 @@ import {
import * as Errors from "metabase/lib/errors";
import { QUESTION_NAME_MAX_LENGTH } from "metabase/questions/constants";
import { Button, Stack } from "metabase/ui";
-import type Question from "metabase-lib/v1/Question";
import type {
+ Card,
CardType,
CollectionId,
DashboardId,
@@ -40,7 +41,7 @@ const MAYBE_DASHBOARD_QUESTION_SCHEMA = QUESTION_SCHEMA.shape({
dashboard_tab_id: Yup.number().default(undefined),
});
-export type CopyQuestionProperties = {
+export type CopyCardProperties = {
name: string;
description: string | null;
collection_id: CollectionId | null;
@@ -48,24 +49,24 @@ export type CopyQuestionProperties = {
dashboard_tab_id?: DashboardTabId | undefined;
};
-type CopyQuestionFormProps = {
- initialValues: Partial<CopyQuestionProperties>;
- onCancel: () => void;
- onSubmit: (vals: CopyQuestionProperties) => Promise<Question>;
+type CopyCardFormProps = {
+ initialValues: Partial<CopyCardProperties>;
+ model?: CardType;
+ onSubmit: (vals: CopyCardProperties) => Promise<Card>;
onSaved: (
- newQuestion: Question,
+ newCard: Card,
options?: { dashboardTabId: DashboardTabId | undefined },
) => void;
- model?: CardType;
+ onCancel: () => void;
};
-export const CopyQuestionForm = ({
+export const CopyCardForm = ({
initialValues,
onCancel,
onSubmit,
onSaved,
model,
-}: CopyQuestionFormProps) => {
+}: CopyCardFormProps) => {
const formProviderProps = useMemo(() => {
return model === "question"
? {
@@ -84,16 +85,16 @@ export const CopyQuestionForm = ({
};
}, [initialValues, model]);
- const handleDuplicate = async (vals: CopyQuestionProperties) => {
+ const handleDuplicate = async (vals: CopyCardProperties) => {
const dashboardTabId = _.isString(vals.dashboard_tab_id)
? parseInt(vals.dashboard_tab_id, 10)
: vals.dashboard_tab_id;
- const newQuestion = await onSubmit({
+ const newCard = await onSubmit({
...vals,
dashboard_tab_id: dashboardTabId,
});
- onSaved?.(newQuestion, { dashboardTabId });
+ onSaved?.(newCard, { dashboardTabId });
};
const models: CollectionPickerModel[] =
@@ -129,6 +130,9 @@ export const CopyQuestionForm = ({
dashboardIdFieldName="dashboard_id"
dashboardTabIdFieldName="dashboard_tab_id"
title={t`Where do you want to save this?`}
+ entityType={
+ model ? getEntityTypeFromCardType(model) : undefined
+ }
collectionPickerModalProps={{
models,
recentFilter: (items) =>
diff --git a/frontend/src/metabase/questions/components/CopyQuestionForm.unit.spec.tsx b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.unit.spec.tsx
similarity index 94%
rename from frontend/src/metabase/questions/components/CopyQuestionForm.unit.spec.tsx
rename to frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.unit.spec.tsx
index be82dbcce0f..6d017214a1c 100644
--- a/frontend/src/metabase/questions/components/CopyQuestionForm.unit.spec.tsx
+++ b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.unit.spec.tsx
@@ -8,10 +8,7 @@ import {
createMockDashboardTab,
} from "metabase-types/api/mocks";
-import {
- CopyQuestionForm,
- type CopyQuestionProperties,
-} from "./CopyQuestionForm";
+import { CopyCardForm, type CopyCardProperties } from "./CopyCardForm";
const FOO_DASH = createMockDashboard({
id: 1,
@@ -24,7 +21,7 @@ const FOO_DASH = createMockDashboard({
});
type SetupOpts = {
- initialValues?: Partial<CopyQuestionProperties>;
+ initialValues?: Partial<CopyCardProperties>;
model?: CardType;
};
@@ -36,7 +33,7 @@ function setup({ initialValues = {}, model = "question" }: SetupOpts = {}) {
setupDashboardEndpoints(FOO_DASH);
renderWithProviders(
- <CopyQuestionForm
+ <CopyCardForm
model={model}
initialValues={initialValues}
onSubmit={onSubmit}
diff --git a/frontend/src/metabase/questions/components/CopyCardForm/index.ts b/frontend/src/metabase/questions/components/CopyCardForm/index.ts
new file mode 100644
index 00000000000..e151aa38dd0
--- /dev/null
+++ b/frontend/src/metabase/questions/components/CopyCardForm/index.ts
@@ -0,0 +1 @@
+export * from "./CopyCardForm";
diff --git a/frontend/src/metabase/query_builder/components/MoveQuestionModal/MoveQuestionModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
similarity index 85%
rename from frontend/src/metabase/query_builder/components/MoveQuestionModal/MoveQuestionModal.tsx
rename to frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
index 19767548a16..f5a7a16c296 100644
--- a/frontend/src/metabase/query_builder/components/MoveQuestionModal/MoveQuestionModal.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
@@ -7,7 +7,10 @@ import { getDashboard, useUpdateCardMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { QuestionMoveConfirmModal } from "metabase/collections/components/CollectionBulkActions/QuestionMoveConfirmModal";
import type { MoveDestination } from "metabase/collections/types";
-import { canonicalCollectionId } from "metabase/collections/utils";
+import {
+ canonicalCollectionId,
+ getEntityTypeFromCardType,
+} from "metabase/collections/utils";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { MoveModal } from "metabase/common/components/MoveModal";
import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";
@@ -16,13 +19,14 @@ import { INJECT_RTK_QUERY_QUESTION_VALUE } from "metabase/entities/questions";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { API_UPDATE_QUESTION } from "metabase/query_builder/actions";
-import QuestionMoveToast from "metabase/questions/components/QuestionMoveToast";
import { addUndo } from "metabase/redux/undo";
import { Box, Icon, Radio, Title } from "metabase/ui";
-import type Question from "metabase-lib/v1/Question";
+import type { Card } from "metabase-types/api";
-interface MoveQuestionModalProps {
- question: Question;
+import MoveCardToast from "./MoveCardToast";
+
+interface MoveCardModalProps {
+ card: Card;
onClose: () => void;
}
@@ -31,13 +35,10 @@ type ConfirmationTypes =
| "dashboard-to-collection"
| "collection-to-dashboard";
-export const MoveQuestionModal = ({
- question,
- onClose,
-}: MoveQuestionModalProps) => {
+export const MoveCardModal = ({ card, onClose }: MoveCardModalProps) => {
const dispatch = useDispatch();
- const [updateQuestion] = useUpdateCardMutation();
+ const [updateCard] = useUpdateCardMutation();
const [confirmMoveState, setConfirmMoveState] = useState<{
type: ConfirmationTypes;
@@ -63,8 +64,8 @@ export const MoveQuestionModal = ({
collection_id: canonicalCollectionId(destination.id),
};
- return updateQuestion({
- id: question.id(),
+ return updateCard({
+ id: card.id,
delete_old_dashcards: deleteOldDashcards,
...update,
})
@@ -80,12 +81,7 @@ export const MoveQuestionModal = ({
dispatch(
addUndo({
- message: (
- <QuestionMoveToast
- destination={destination}
- question={question}
- />
- ),
+ message: <MoveCardToast card={card} destination={destination} />,
undo: false,
}),
);
@@ -97,7 +93,7 @@ export const MoveQuestionModal = ({
.unwrap()
.catch(() => undefined); // we can fallback to navigation w/o this info
const dashcard = dashboard?.dashcards.find(
- (c) => c.card_id === question.id(),
+ (c) => c.card_id === card.id,
);
if (!dashboard || !dashcard) {
@@ -132,9 +128,9 @@ export const MoveQuestionModal = ({
};
const handleChooseMoveLocation = async (destination: MoveDestination) => {
- const wasDq = _.isNumber(question.dashboardId());
+ const wasDq = _.isNumber(card.dashboard_id);
const isDq = destination.model === "dashboard";
- const dashCount = question.dashboardCount();
+ const dashCount = card.dashboard_count ?? 0;
if (wasDq && !isDq) {
setConfirmMoveState({ type: "dashboard-to-collection", destination });
@@ -173,7 +169,7 @@ export const MoveQuestionModal = ({
style={{ marginBottom: -2 }}
size={20}
/>{" "}
- <Dashboards.Name key="name" id={question.dashboardId()} />
+ <Dashboards.Name key="name" id={card.dashboard_id} />
</>
)}?`}
</Title>
@@ -224,7 +220,7 @@ export const MoveQuestionModal = ({
style={{ marginBottom: -2 }}
size={20}
/>{" "}
- <Dashboards.Name key="name" id={question.dashboardId()} />
+ <Dashboards.Name key="name" id={card.dashboard_id} />
</>
)}`}
</Title>
@@ -241,8 +237,8 @@ export const MoveQuestionModal = ({
<QuestionMoveConfirmModal
selectedItems={[
{
- name: question.displayName() as string,
- id: question.id(),
+ name: card.name,
+ id: card.id,
model: "card",
},
]}
@@ -255,22 +251,23 @@ export const MoveQuestionModal = ({
}
const recentAndSearchFilter = (item: CollectionPickerItem) => {
- const dashboardId = question.dashboardId();
+ const dashboardId = card.dashboard_id;
if (dashboardId) {
return item.model === "dashboard" && item.id === dashboardId;
} else {
- return item.model === "collection" && item.id === question.collectionId();
+ return item.model === "collection" && item.id === card.collection_id;
}
};
return (
<MoveModal
title={t`Where do you want to save this?`}
- initialCollectionId={question.collectionId() ?? "root"}
+ initialCollectionId={card.collection_id ?? "root"}
onClose={onClose}
onMove={handleChooseMoveLocation}
- canMoveToDashboard={question.type() === "question"}
+ canMoveToDashboard={card.type === "question"}
+ entityType={getEntityTypeFromCardType(card.type)}
recentAndSearchFilter={recentAndSearchFilter}
/>
);
diff --git a/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx
similarity index 100%
rename from frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx
rename to frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx
diff --git a/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
similarity index 81%
rename from frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx
rename to frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
index 04543954800..96e0f19e6b8 100644
--- a/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
@@ -9,22 +9,17 @@ import {
import type { MoveDestination } from "metabase/collections/types";
import { coerceCollectionId } from "metabase/collections/utils";
import * as Urls from "metabase/lib/urls";
-import type Question from "metabase-lib/v1/Question";
-import type { CollectionId, DashboardId } from "metabase-types/api";
+import type { Card, CollectionId, DashboardId } from "metabase-types/api";
-import {
- DestinationLink,
- StyledIcon,
- ToastRoot,
-} from "./QuestionMoveToast.styled";
+import { DestinationLink, StyledIcon, ToastRoot } from "./MoveCardToast.styled";
-type QuestionMoveToastProps = {
+type MoveCardToastProps = {
+ card: Card;
destination?: MoveDestination;
- question: Question;
};
-function QuestionMoveToast({ destination, question }: QuestionMoveToastProps) {
- const type = question.type();
+function MoveCardToast({ card, destination }: MoveCardToastProps) {
+ const type = card.type;
if (!destination) {
return (
@@ -46,7 +41,7 @@ function QuestionMoveToast({ destination, question }: QuestionMoveToastProps) {
);
return (
- <ToastRoot>
+ <ToastRoot data-testid="move-card-toast">
<StyledIcon name="collection" />
{match(type)
.with("question", () => jt`Question moved to ${link}`)
@@ -90,4 +85,4 @@ const CollectionLink = ({ collectionId }: { collectionId: CollectionId }) => {
};
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default QuestionMoveToast;
+export default MoveCardToast;
diff --git a/frontend/src/metabase/questions/components/QuestionMoveToast/index.ts b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/index.ts
similarity index 60%
rename from frontend/src/metabase/questions/components/QuestionMoveToast/index.ts
rename to frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/index.ts
index b3429643962..e7909200227 100644
--- a/frontend/src/metabase/questions/components/QuestionMoveToast/index.ts
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/index.ts
@@ -1,2 +1,2 @@
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./QuestionMoveToast";
+export { default } from "./MoveCardToast";
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/index.tsx b/frontend/src/metabase/questions/components/MoveCardModal/index.tsx
new file mode 100644
index 00000000000..ae23961985d
--- /dev/null
+++ b/frontend/src/metabase/questions/components/MoveCardModal/index.tsx
@@ -0,0 +1 @@
+export * from "./MoveCardModal";
diff --git a/frontend/src/metabase/questions/containers/ArchiveQuestionModal.jsx b/frontend/src/metabase/questions/containers/ArchiveQuestionModal.jsx
deleted file mode 100644
index ed15fdca0a2..00000000000
--- a/frontend/src/metabase/questions/containers/ArchiveQuestionModal.jsx
+++ /dev/null
@@ -1,79 +0,0 @@
-/* eslint-disable react/prop-types */
-import { Component } from "react";
-import { msgid, ngettext, t } from "ttag";
-import _ from "underscore";
-
-import { ArchiveModal } from "metabase/common/components/ArchiveModal";
-import { connect } from "metabase/lib/redux";
-import { setArchivedQuestion } from "metabase/query_builder/actions";
-
-const mapDispatchToProps = (dispatch) => ({
- archive: (question) => dispatch(setArchivedQuestion(question, true)),
-});
-
-const getLabels = (question) => {
- const type = question.type();
-
- if (type === "question") {
- const message = _.isNumber(question.dashboardId())
- ? t`This question will be removed from its dashboard and any alerts using it.`
- : t`This question will be removed from any dashboards or alerts using it.`;
-
- return {
- title: t`Move this question to trash?`,
- message,
- };
- }
-
- if (type === "model") {
- return {
- title: t`Move this model to trash?`,
- message: t`This model will be removed from any dashboards or alerts using it.`,
- };
- }
-
- if (type === "metric") {
- return {
- title: t`Archive this metric?`,
- message: t`This metric will be removed from any dashboards or pulses using it.`,
- };
- }
-
- throw new Error(`Unknown question.type(): ${type}`);
-};
-
-class ArchiveQuestionModal extends Component {
- onArchive = () => {
- const { question, archive } = this.props;
- return archive(question);
- };
-
- render() {
- const { onClose, question } = this.props;
-
- const { title, message } = getLabels(question);
- const widgetCount = question.getParameterUsageCount();
- const additionalWarning =
- widgetCount > 0
- ? " " +
- ngettext(
- msgid`It will also be removed from the filter that uses it to populate values.`,
- `It will also be removed from the ${widgetCount} filters that use it to populate values.`,
- widgetCount,
- )
- : "";
-
- return (
- <ArchiveModal
- title={title}
- model={question.card().model}
- modelId={question.id()}
- message={`${message}${additionalWarning}`}
- onArchive={this.onArchive}
- onClose={onClose}
- />
- );
- }
-}
-
-export default connect(null, mapDispatchToProps)(ArchiveQuestionModal);
diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsx
index b629a98f78c..a950968443d 100644
--- a/frontend/src/metabase/route-guards.tsx
+++ b/frontend/src/metabase/route-guards.tsx
@@ -4,10 +4,15 @@ import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
import { getAdminPaths } from "metabase/admin/app/selectors";
import { isSameOrSiteUrlOrigin } from "metabase/lib/dom";
import { MetabaseReduxContext } from "metabase/lib/redux";
+import {
+ PLUGIN_FEATURE_LEVEL_PERMISSIONS,
+ PLUGIN_TRANSFORMS,
+} from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import type { State } from "metabase-types/store";
import { getCanAccessOnboardingPage } from "./home/selectors";
+import { getIsEmbeddingIframe } from "./selectors/embed";
type Props = { children: React.ReactElement };
@@ -30,6 +35,15 @@ const MetabaseIsSetup = connectedReduxRedirect<Props, State>({
context: MetabaseReduxContext,
});
+const AvailableInEmbedding = connectedReduxRedirect<Props, State>({
+ wrapperDisplayName: "AvailableInEmbedding",
+ redirectPath: "/unauthorized",
+ allowRedirectBack: false,
+ authenticatedSelector: (state) => !getIsEmbeddingIframe(state),
+ redirectAction: routerActions.replace,
+ context: MetabaseReduxContext,
+});
+
const UserIsAuthenticated = connectedReduxRedirect<Props, State>({
wrapperDisplayName: "UserIsAuthenticated",
redirectPath: "/auth/login",
@@ -68,7 +82,7 @@ const UserCanAccessSettings = connectedReduxRedirect<Props, State>({
context: MetabaseReduxContext,
});
-export const UserCanAccessOnboarding = connectedReduxRedirect<Props, State>({
+const UserCanAccessOnboarding = connectedReduxRedirect<Props, State>({
wrapperDisplayName: "UserCanAccessOnboarding",
redirectPath: "/",
allowRedirectBack: false,
@@ -77,6 +91,26 @@ export const UserCanAccessOnboarding = connectedReduxRedirect<Props, State>({
context: MetabaseReduxContext,
});
+const UserCanAccessDataModel = connectedReduxRedirect<Props, State>({
+ wrapperDisplayName: "UserCanAccessDataModel",
+ redirectPath: "/unauthorized",
+ allowRedirectBack: false,
+ authenticatedSelector: (state) =>
+ PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel(state),
+ redirectAction: routerActions.replace,
+ context: MetabaseReduxContext,
+});
+
+const UserCanAccessTransforms = connectedReduxRedirect<Props, State>({
+ wrapperDisplayName: "UserCanAccessTransforms",
+ redirectPath: "/unauthorized",
+ allowRedirectBack: false,
+ authenticatedSelector: (state) =>
+ PLUGIN_TRANSFORMS.canAccessTransforms(state),
+ redirectAction: routerActions.replace,
+ context: MetabaseReduxContext,
+});
+
export const IsAuthenticated = MetabaseIsSetup(
UserIsAuthenticated(({ children }) => children),
);
@@ -95,3 +129,18 @@ export const CanAccessSettings = MetabaseIsSetup(
export const CanAccessOnboarding = UserCanAccessOnboarding(
({ children }) => children,
);
+
+// Must be in sync with canAccessDataStudio in enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
+export const CanAccessDataStudio = MetabaseIsSetup(
+ UserIsAuthenticated(
+ UserIsAdmin(AvailableInEmbedding(({ children }) => children)),
+ ),
+);
+
+export const CanAccessDataModel = UserCanAccessDataModel(
+ ({ children }) => children,
+);
+
+export const CanAccessTransforms = UserCanAccessTransforms(
+ ({ children }) => children,
+);
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index f31bd512abf..391baec7e7c 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -38,6 +38,7 @@ import NewModelOptions from "metabase/models/containers/NewModelOptions";
import { getRoutes as getModelRoutes } from "metabase/models/routes";
import {
PLUGIN_COLLECTIONS,
+ PLUGIN_DATA_STUDIO,
PLUGIN_DOCUMENTS,
PLUGIN_LANDING_PAGE,
PLUGIN_METABOT,
@@ -64,8 +65,11 @@ import { Setup } from "metabase/setup/components/Setup";
import getCollectionTimelineRoutes from "metabase/timelines/collections/routes";
import {
+ CanAccessDataModel,
+ CanAccessDataStudio,
CanAccessOnboarding,
CanAccessSettings,
+ CanAccessTransforms,
IsAdmin,
IsAuthenticated,
IsNotAuthenticated,
@@ -171,7 +175,7 @@ export const getRoutes = (store) => {
<Route path="collection/:slug" component={CollectionLanding}>
<ModalRoute path="move" modal={MoveCollectionModal} noWrap />
- <ModalRoute path="archive" modal={ArchiveCollectionModal} />
+ <ModalRoute path="archive" modal={ArchiveCollectionModal} noWrap />
<ModalRoute path="permissions" modal={CollectionPermissionsModal} />
<ModalRoute
path="move-questions-dashboard"
@@ -205,8 +209,16 @@ export const getRoutes = (store) => {
modal={DashboardMoveModalConnected}
noWrap
/>
- <ModalRoute path="copy" modal={DashboardCopyModalConnected} />
- <ModalRoute path="archive" modal={ArchiveDashboardModalConnected} />
+ <ModalRoute
+ path="copy"
+ modal={DashboardCopyModalConnected}
+ noWrap
+ />
+ <ModalRoute
+ path="archive"
+ modal={ArchiveDashboardModalConnected}
+ noWrap
+ />
</Route>
<Route path="/question">
@@ -343,6 +355,14 @@ export const getRoutes = (store) => {
{/* ADMIN */}
{getAdminRoutes(store, CanAccessSettings, IsAdmin)}
+
+ {/* DATA STUDIO */}
+ {PLUGIN_DATA_STUDIO.getDataStudioRoutes(
+ store,
+ CanAccessDataStudio,
+ CanAccessDataModel,
+ CanAccessTransforms,
+ )}
</Route>
</Route>
diff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
index d2c0ace0ebb..563841c3176 100644
--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import type { MouseEvent } from "react";
import { useLayoutEffect, useRef, useState } from "react";
import { isEmpty } from "underscore";
diff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsx
index ef5169f8330..aa882584456 100644
--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsx
+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import userEvent, {
PointerEventsCheckLevel,
} from "@testing-library/user-event";
diff --git a/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsx b/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsx
index f565285c82b..2a2ac89233c 100644
--- a/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsx
+++ b/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import { t } from "ttag";
import { SearchFilterDateDisplay } from "metabase/search/components/SearchFilterDateDisplay";
diff --git a/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx b/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx
index 910802a2fa2..a17687672a0 100644
--- a/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx
+++ b/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import { t } from "ttag";
import {
diff --git a/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsx b/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsx
index eb5975845c2..d7e65a5a0f0 100644
--- a/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsx
+++ b/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import { t } from "ttag";
import { SearchFilterDateDisplay } from "metabase/search/components/SearchFilterDateDisplay";
diff --git a/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx b/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx
index 9a70ded68e4..c1c2b798796 100644
--- a/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx
+++ b/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import { t } from "ttag";
import { SearchUserPicker } from "metabase/search/components/SearchUserPicker/SearchUserPicker";
diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx
index e13bd63048f..b9ee1c8b204 100644
--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx
+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import { useState } from "react";
import { useSearchListQuery } from "metabase/common/hooks";
diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsx
index 4fbf0649bc0..5877a550b6d 100644
--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsx
+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
import { t } from "ttag";
import { getTranslatedEntityName } from "metabase/common/utils/model-names";
diff --git a/frontend/src/metabase/selectors/app.ts b/frontend/src/metabase/selectors/app.ts
index 37bcf3f00a4..a9e79b20662 100644
--- a/frontend/src/metabase/selectors/app.ts
+++ b/frontend/src/metabase/selectors/app.ts
@@ -28,6 +28,7 @@ export interface RouterProps {
const PATHS_WITHOUT_NAVBAR = [
/^\/setup/,
/^\/auth/,
+ /^\/data-studio/,
/\/model\/.*\/query/,
/\/model\/.*\/columns/,
/\/model\/.*\/metadata/,
@@ -62,6 +63,10 @@ export const getIsAdminApp = createSelector([getRouterPath], (path) => {
return path.startsWith("/admin/");
});
+export const getIsDataStudioApp = createSelector([getRouterPath], (path) => {
+ return path.startsWith("/data-studio");
+});
+
export const getIsCollectionPathVisible = createSelector(
[
getQuestion,
@@ -147,6 +152,7 @@ export const getIsAppBarVisible = createSelector(
getRouterPath,
getRouterHash,
getIsAdminApp,
+ getIsDataStudioApp,
getIsEditingDashboard,
getIsEmbeddingIframe,
getIsEmbeddedAppBarVisible,
@@ -156,6 +162,7 @@ export const getIsAppBarVisible = createSelector(
path,
hash,
isAdminApp,
+ isDataStudioApp,
isEditingDashboard,
isEmbedded,
isEmbeddedAppBarVisible,
@@ -166,6 +173,7 @@ export const getIsAppBarVisible = createSelector(
!currentUser ||
(isEmbedded && !isEmbeddedAppBarVisible) ||
isAdminApp ||
+ isDataStudioApp ||
isEditingDashboard ||
isFullscreen
) {
diff --git a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx
index 3b4038595d2..9b4a78f69aa 100644
--- a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx
+++ b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx
@@ -290,7 +290,9 @@ describe("FileUploadStatus", () => {
});
// only appendable model should be pre-selected
- await screen.findByText("my uploaded model");
+ expect(
+ await screen.findByRole("textbox", { name: "Select a model" }),
+ ).toHaveValue("my uploaded model");
await waitFor(() => expect(submitButton).toBeEnabled());
await userEvent.click(submitButton);
diff --git a/frontend/src/metabase/ui/components/data-display/index.ts b/frontend/src/metabase/ui/components/data-display/index.ts
index f71263ae8e2..54ef31d7bf2 100644
--- a/frontend/src/metabase/ui/components/data-display/index.ts
+++ b/frontend/src/metabase/ui/components/data-display/index.ts
@@ -5,5 +5,5 @@ export * from "./Card";
export * from "./Image";
export * from "./Indicator";
export * from "./Kbd";
-export * from "./Timeline";
export * from "./Stepper";
+export * from "./Timeline";
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/book_open.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/book_open.svg
new file mode 100644
index 00000000000..4ae7676b16d
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/book_open.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <path d="M8 4.667v9.333"/>
+ <path d="M2 12a0.667 0.667 0 0 1-0.667-0.667V2.667a0.667 0.667 0 0 1 0.667-0.667h3.333a2.667 2.667 0 0 1 2.667 2.667 2.667 2.667 0 0 1 2.667-2.667h3.333a0.667 0.667 0 0 1 0.667 0.667v8.667a0.667 0.667 0 0 1-0.667 0.667h-4a2 2 0 0 0-2 2 2 2 0 0 0-2-2z"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/collection2.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/collection2.svg
new file mode 100644
index 00000000000..2b2138ebba6
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/collection2.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.66457 1.32895C7.87572 1.22336 8.12428 1.22336 8.33543 1.32895L14.3354 4.32922C14.5895 4.45627 14.75 4.71597 14.75 5.00004C14.75 5.28412 14.5895 5.54381 14.3354 5.67085L8.33541 8.67085C8.12426 8.77642 7.87574 8.77642 7.66459 8.67085L1.66459 5.67085C1.41051 5.54381 1.25001 5.28412 1.25 5.00004C1.24999 4.71597 1.41049 4.45627 1.66457 4.32922L7.66457 1.32895ZM3.67699 5L8 7.1615L12.323 5L8 2.8383L3.67699 5Z" fill="currentColor" />
+<path d="M1.32934 10.6647C1.51459 10.2942 1.96509 10.144 2.33557 10.3293L8.00016 13.1616L13.6648 10.3293C14.0352 10.144 14.4857 10.2942 14.671 10.6647C14.8562 11.0352 14.7061 11.4857 14.3356 11.6709L8.33557 14.6709C8.12443 14.7765 7.8759 14.7765 7.66475 14.6709L1.66475 11.6709C1.29427 11.4857 1.1441 11.0352 1.32934 10.6647Z" fill="currentColor" />
+<path d="M2.33557 7.32922C1.96509 7.14398 1.51459 7.29415 1.32934 7.66463C1.1441 8.03511 1.29427 8.48562 1.66475 8.67086L7.66475 11.6709C7.8759 11.7765 8.12443 11.7765 8.33557 11.6709L14.3356 8.67086C14.7061 8.48562 14.8562 8.03511 14.671 7.66463C14.4857 7.29415 14.0352 7.14398 13.6648 7.32922L8.00016 10.1616L2.33557 7.32922Z" fill="currentColor" />
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/data_studio.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/data_studio.svg
new file mode 100644
index 00000000000..a1ecd6630be
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/data_studio.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 16 16" fill="none" stroke="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M10 14V10.6667C10 10.4899 9.92976 10.3203 9.80474 10.1953C9.67971 10.0702 9.51014 10 9.33333 10H6.66667C6.48986 10 6.32029 10.0702 6.19526 10.1953C6.07024 10.3203 6 10.4899 6 10.6667V14" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M11.8494 6.87331C11.7104 6.74027 11.5254 6.66601 11.3331 6.66601C11.1407 6.66601 10.9557 6.74027 10.8167 6.87331C10.5067 7.16899 10.0948 7.33395 9.66638 7.33395C9.23799 7.33395 8.82604 7.16899 8.51605 6.87331C8.37711 6.74047 8.19228 6.66633 8.00005 6.66633C7.80782 6.66633 7.62299 6.74047 7.48405 6.87331C7.17402 7.16919 6.76194 7.33427 6.33338 7.33427C5.90483 7.33427 5.49274 7.16919 5.18272 6.87331C5.04374 6.74027 4.85877 6.66601 4.66638 6.66601C4.47399 6.66601 4.28903 6.74027 4.15005 6.87331C3.85061 7.15906 3.45556 7.32316 3.0418 7.33368C2.62804 7.3442 2.22516 7.20039 1.91159 6.93023C1.59801 6.66008 1.39618 6.28291 1.34537 5.87214C1.29457 5.46137 1.39842 5.0464 1.63672 4.70798L3.56272 1.91865C3.68492 1.73832 3.84945 1.59068 4.0419 1.48864C4.23436 1.3866 4.44888 1.33327 4.66672 1.33331H11.3334C11.5506 1.33323 11.7645 1.38621 11.9566 1.48764C12.1486 1.58907 12.313 1.73588 12.4354 1.91531L14.3654 4.70998C14.6037 5.04866 14.7075 5.46396 14.6563 5.87494C14.6052 6.28592 14.4029 6.66314 14.0888 6.93311C13.7748 7.20307 13.3714 7.34643 12.9574 7.33525C12.5434 7.32408 12.1484 7.15916 11.8494 6.87265" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M2.66663 7.29999V12.6667C2.66663 13.0203 2.8071 13.3594 3.05715 13.6095C3.3072 13.8595 3.64634 14 3.99996 14H12C12.3536 14 12.6927 13.8595 12.9428 13.6095C13.1928 13.3594 13.3333 13.0203 13.3333 12.6667V7.29999" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
index d8bd3850744..680bdc3ab20 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -60,6 +60,8 @@ import bolt_component from "./bolt.svg?component";
import bolt_source from "./bolt.svg?source";
import bolt_filled_component from "./bolt_filled.svg?component";
import bolt_filled_source from "./bolt_filled.svg?source";
+import book_open_component from "./book_open.svg?component";
+import book_open_source from "./book_open.svg?source";
import bookmark_component from "./bookmark.svg?component";
import bookmark_source from "./bookmark.svg?source";
import bookmark_filled_component from "./bookmark_filled.svg?component";
@@ -104,6 +106,8 @@ import cloud_filled_component from "./cloud_filled.svg?component";
import cloud_filled_source from "./cloud_filled.svg?source";
import code_block_component from "./code_block.svg?component";
import code_block_source from "./code_block.svg?source";
+import collection2_component from "./collection2.svg?component";
+import collection2_source from "./collection2.svg?source";
import combine_component from "./combine.svg?component";
import combine_source from "./combine.svg?source";
import comment_component from "./comment.svg?component";
@@ -128,6 +132,8 @@ import dash_component from "./dash.svg?component";
import dash_source from "./dash.svg?source";
import dashboard_component from "./dashboard.svg?component";
import dashboard_source from "./dashboard.svg?source";
+import data_studio_component from "./data_studio.svg?component";
+import data_studio_source from "./data_studio.svg?source";
import database_component from "./database.svg?component";
import database_source from "./database.svg?source";
import document_component from "./document.svg?component";
@@ -278,6 +284,8 @@ import mail_component from "./mail.svg?component";
import mail_source from "./mail.svg?source";
import mail_filled_component from "./mail_filled.svg?component";
import mail_filled_source from "./mail_filled.svg?source";
+import medallion_component from "./medallion.svg?component";
+import medallion_source from "./medallion.svg?source";
import message_circle_component from "./message_circle.svg?component";
import message_circle_source from "./message_circle.svg?source";
import metabot_component from "./metabot.svg?component";
@@ -296,6 +304,8 @@ import move_component from "./move.svg?component";
import move_source from "./move.svg?source";
import move_card_component from "./move_card.svg?component";
import move_card_source from "./move_card.svg?source";
+import network_component from "./network.svg?component";
+import network_source from "./network.svg?source";
import new_folder_component from "./new_folder.svg?component";
import new_folder_source from "./new_folder.svg?source";
import notebook_component from "./notebook.svg?component";
@@ -380,6 +390,8 @@ import segment_component from "./segment.svg?component";
import segment_source from "./segment.svg?source";
import send_component from "./send.svg?component";
import send_source from "./send.svg?source";
+import settings_component from "./settings.svg?component";
+import settings_source from "./settings.svg?source";
import share_component from "./share.svg?component";
import share_source from "./share.svg?source";
import shield_component from "./shield.svg?component";
@@ -460,6 +472,8 @@ import thumbs_up_component from "./thumbs_up.svg?component";
import thumbs_up_source from "./thumbs_up.svg?source";
import time_history_component from "./time_history.svg?component";
import time_history_source from "./time_history.svg?source";
+import transform_component from "./transform.svg?component";
+import transform_source from "./transform.svg?source";
import trash_component from "./trash.svg?component";
import trash_source from "./trash.svg?source";
import trash_filled_component from "./trash_filled.svg?component";
@@ -486,6 +500,8 @@ import verified_component from "./verified.svg?component";
import verified_source from "./verified.svg?source";
import verified_filled_component from "./verified_filled.svg?component";
import verified_filled_source from "./verified_filled.svg?source";
+import verified_round_component from "./verified_round.svg?component";
+import verified_round_source from "./verified_round.svg?source";
import view_archive_component from "./view_archive.svg?component";
import view_archive_source from "./view_archive.svg?source";
import warning_component from "./warning.svg?component";
@@ -623,6 +639,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: bookmark_filled_component,
source: bookmark_filled_source,
},
+ book_open: {
+ component: book_open_component,
+ source: book_open_source,
+ },
bolt: {
component: bolt_component,
source: bolt_source,
@@ -747,6 +767,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: database_component,
source: database_source,
},
+ data_studio: {
+ component: data_studio_component,
+ source: data_studio_source,
+ },
dash: {
component: dash_component,
source: dash_source,
@@ -1047,6 +1071,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: mail_filled_component,
source: mail_filled_source,
},
+ medallion: {
+ component: medallion_component,
+ source: medallion_source,
+ },
message_circle: {
component: message_circle_component,
source: message_circle_source,
@@ -1083,6 +1111,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: move_card_component,
source: move_card_source,
},
+ network: {
+ component: network_component,
+ source: network_source,
+ },
new_folder: {
component: new_folder_component,
source: new_folder_source,
@@ -1195,6 +1227,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: sankey_component,
source: sankey_source,
},
+ settings: {
+ component: settings_component,
+ source: settings_source,
+ },
share: {
component: share_component,
source: share_source,
@@ -1409,6 +1445,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: time_history_component,
source: time_history_source,
},
+ transform: {
+ component: transform_component,
+ source: transform_source,
+ },
trash: {
component: trash_component,
source: trash_source,
@@ -1473,6 +1513,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: verified_filled_component,
source: verified_filled_source,
},
+ verified_round: {
+ component: verified_round_component,
+ source: verified_round_source,
+ },
view_archive: {
component: view_archive_component,
source: view_archive_source,
@@ -1525,6 +1569,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
external: { component: share_component, source: share_source },
table_spaced: { component: table_component, source: table_source },
collection: { component: folder_component, source: folder_source },
+ collection2: {
+ component: collection2_component,
+ source: collection2_source,
+ },
beaker: { component: formula_component, source: formula_source },
test_tube: { component: test_tube_component, source: test_tube_source },
eye_filled: { component: eye_component, source: eye_source },
@@ -1561,6 +1609,7 @@ export type IconName =
| "bar"
| "bell"
| "birthday"
+ | "book_open"
| "bookmark"
| "bookmark_filled"
| "bolt"
@@ -1584,6 +1633,7 @@ export type IconName =
| "close"
| "cloud"
| "cloud_filled"
+ | "collection2"
| "compare"
| "combine"
| "company"
@@ -1594,6 +1644,7 @@ export type IconName =
| "copy"
| "curved"
| "database"
+ | "data_studio"
| "dash"
| "dashboard"
| "curve"
@@ -1672,6 +1723,7 @@ export type IconName =
| "lock_filled"
| "mail"
| "mail_filled"
+ | "medallion"
| "message_circle"
| "metabot"
| "metabot_sad"
@@ -1681,6 +1733,7 @@ export type IconName =
| "moon"
| "move"
| "move_card"
+ | "network"
| "new_folder"
| "notebook"
| "number"
@@ -1708,6 +1761,7 @@ export type IconName =
| "sankey"
| "share"
| "send"
+ | "settings"
| "smile"
| "split"
| "sql"
@@ -1720,6 +1774,7 @@ export type IconName =
| "sum"
| "sync"
| "synced_collection"
+ | "transform"
| "question"
| "quote"
| "redo"
@@ -1775,6 +1830,7 @@ export type IconName =
| "official_collection"
| "ordered_list"
| "verified_filled"
+ | "verified_round"
| "view_archive"
| "warning"
| "warning_round_filled"
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/medallion.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/medallion.svg
new file mode 100644
index 00000000000..27ad5ccc4a3
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/medallion.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M8 1.25a6.751 6.751 0 1 1-.002 13.502A6.751 6.751 0 0 1 8 1.25zm0 1.365a5.385 5.385 0 1 0-.001 10.769A5.385 5.385 0 0 0 8 2.615zm.12 1.63a1.292 1.292 0 0 1 1.09.842l.41.805.922.144a1.29 1.29 0 0 1 1.114.792l.035.095.028.098a1.289 1.289 0 0 1-.43 1.292l-.667.664.145.896a1.288 1.288 0 0 1-1.949 1.429L8 10.882l-.82.42a1.288 1.288 0 0 1-1.947-1.43l.144-.895-.64-.64a1.29 1.29 0 0 1-.426-.596 1.29 1.29 0 0 1-.01-.804l.034-.097c.09-.222.24-.416.434-.558l.086-.057a1.29 1.29 0 0 1 .605-.19l.919-.143.422-.83a1.29 1.29 0 0 1 .45-.582l.086-.056c.205-.123.441-.188.682-.185l.101.005zm-.543 2.3a1.29 1.29 0 0 1-.8.657l-.15.033-.922.143.662.66.1.112a1.293 1.293 0 0 1 .263 1.004l-.147.92.828-.424.14-.061a1.292 1.292 0 0 1 .896 0l.14.061.829.424-.147-.92a1.29 1.29 0 0 1 .046-.602l.057-.143a1.29 1.29 0 0 1 .26-.372l.66-.66-.92-.142a1.293 1.293 0 0 1-.951-.69l-.422-.831-.422.832z" />
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/network.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/network.svg
new file mode 100644
index 00000000000..26c6802a85c
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/network.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <path d="M9.346 1.256a1.29 1.29 0 0 1 1.157 1.284v2.426a1.29 1.29 0 0 1-1.29 1.29h-.53v1.061h2.958a1.29 1.29 0 0 1 1.289 1.29v1.138h.53l.133.006a1.29 1.29 0 0 1 1.157 1.283v2.426a1.29 1.29 0 0 1-1.29 1.29h-2.426a1.29 1.29 0 0 1-1.283-1.157l-.006-.133v-2.426c0-.712.577-1.29 1.29-1.29h.53V8.684H4.436v1.062h.53l.133.006a1.29 1.29 0 0 1 1.157 1.283v2.426a1.29 1.29 0 0 1-1.29 1.29H2.54a1.29 1.29 0 0 1-1.283-1.157l-.007-.133v-2.426c0-.712.578-1.29 1.29-1.29h.531V8.608a1.29 1.29 0 0 1 1.29-1.29h2.956V6.255h-.53a1.29 1.29 0 0 1-1.283-1.157l-.007-.132V2.54c0-.712.578-1.29 1.29-1.29h2.426l.133.006zm-6.73 12.129h2.275V11.11H2.616v2.275zm8.494 0h2.275V11.11H11.11v2.275zM6.862 4.89h2.276V2.615H6.862V4.89z" />
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/settings.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/settings.svg
new file mode 100644
index 00000000000..8f2c764c1f5
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/settings.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor">
+ <path d="M2 4.66667V3.33333C2 2.97971 2.14048 2.64057 2.39052 2.39052C2.64057 2.14048 2.97971 2 3.33333 2H4.66667" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M11.3333 2H12.6667C13.0203 2 13.3594 2.14048 13.6095 2.39052C13.8595 2.64057 14 2.97971 14 3.33333V4.66667" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M14 11.3334V12.6667C14 13.0203 13.8595 13.3595 13.6095 13.6095C13.3594 13.8596 13.0203 14 12.6667 14H11.3333" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M4.66667 14H3.33333C2.97971 14 2.64057 13.8596 2.39052 13.6095C2.14048 13.3595 2 13.0203 2 12.6667V11.3334" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M4.66666 5.33337H9.99999" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M4.66666 8H11.3333" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="M4.66666 10.6666H8.66666" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/transform.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/transform.svg
new file mode 100644
index 00000000000..6db7817c17d
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/transform.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M7.24999 13V3C7.24999 2.58579 7.58578 2.25 7.99999 2.25C8.41421 2.25 8.74999 2.58579 8.74999 3V13C8.74999 13.4142 8.41421 13.75 7.99999 13.75C7.58578 13.75 7.24999 13.4142 7.24999 13Z" />
+ <path d="M4.05237 4.84615L12.7126 9.84615C13.0713 10.0533 13.1943 10.5119 12.9871 10.8707C12.78 11.2294 12.3213 11.3523 11.9626 11.1452L3.30237 6.14518C2.94365 5.93808 2.82075 5.47939 3.02785 5.12067C3.23496 4.76195 3.69365 4.63904 4.05237 4.84615Z" />
+ <path d="M12.7126 6.15385L4.05238 11.1539C3.69366 11.361 3.23497 11.2381 3.02786 10.8793C2.82075 10.5206 2.94366 10.0619 3.30238 9.85481L11.9626 4.85482C12.3214 4.64771 12.78 4.77061 12.9872 5.12933C13.1943 5.48805 13.0714 5.94675 12.7126 6.15385Z" />
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/verified_round.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/verified_round.svg
new file mode 100644
index 00000000000..7f4baba1ede
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/verified_round.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.5303 6.53033C11.8232 6.23744 11.8232 5.76256 11.5303 5.46967C11.2374 5.17678 10.7626 5.17678 10.4697 5.46967L7 8.93934L5.53033 7.46967C5.23744 7.17678 4.76256 7.17678 4.46967 7.46967C4.17678 7.76256 4.17678 8.23744 4.46967 8.53033L6.46967 10.5303C6.76256 10.8232 7.23744 10.8232 7.53033 10.5303L11.5303 6.53033Z" fill="#071722" fill-opacity="0.51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1.25C4.27208 1.25 1.25 4.27208 1.25 8C1.25 11.7279 4.27208 14.75 8 14.75C11.7279 14.75 14.75 11.7279 14.75 8C14.75 4.27208 11.7279 1.25 8 1.25ZM2.75 8C2.75 5.10051 5.10051 2.75 8 2.75C10.8995 2.75 13.25 5.10051 13.25 8C13.25 10.8995 10.8995 13.25 8 13.25C5.10051 13.25 2.75 10.8995 2.75 8Z" fill="#071722" fill-opacity="0.51"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css b/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css
index 6f1a16f9d94..6c041235199 100644
--- a/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css
+++ b/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css
@@ -28,6 +28,13 @@
}
.input {
+ /* Mantine compatibility: supports old and new data-indeterminate. See: https://github.com/mantinedev/mantine/pull/8385 */
+ &[data-indeterminate],
+ &[data-indeterminate="true"] {
+ border-color: var(--mb-color-border);
+ background-color: var(--mb-color-background);
+ }
+
&:after {
content: "";
border: rem(1) solid var(--mb-color-border);
@@ -65,8 +72,8 @@
/* Mantine compatibility: supports old and new data-indeterminate. See: https://github.com/mantinedev/mantine/pull/8385 */
&[data-indeterminate],
&[data-indeterminate="true"] {
- border-color: var(--mb-color-border);
- background-color: var(--mb-color-background);
+ border-color: var(--mb-color-brand);
+ background-color: var(--mb-color-brand);
}
&:checked {
diff --git a/frontend/src/metabase/ui/components/inputs/Checkbox/CheckboxIcon.tsx b/frontend/src/metabase/ui/components/inputs/Checkbox/CheckboxIcon.tsx
index 7f371d743de..c34259f3429 100644
--- a/frontend/src/metabase/ui/components/inputs/Checkbox/CheckboxIcon.tsx
+++ b/frontend/src/metabase/ui/components/inputs/Checkbox/CheckboxIcon.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable react/prop-types */
-
import type { CheckboxProps } from "@mantine/core";
import { Icon } from "metabase/ui";
diff --git a/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.css b/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.css
index 4c2c633f79e..7bb27f61260 100644
--- a/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.css
+++ b/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.css
@@ -33,7 +33,7 @@
&[data-variant="mb-light"] {
&:hover {
- background-color: var(--mb-color-brand-lighter);
+ background-color: var(--mb-color-background-hover);
}
&[data-active] {
diff --git a/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.css b/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.css
index e0aa31d48a7..900f023f21f 100644
--- a/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.css
+++ b/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.css
@@ -1,7 +1,7 @@
.dropdown {
padding: 0.75rem;
min-width: 11.5rem;
- overflow: auto;
+ overflow: visible;
background-color: var(--mb-color-background);
border-color: var(--mb-color-border);
}
@@ -20,6 +20,12 @@
&:hover:not([data-disabled="true"]) {
background-color: var(--mb-color-background-hover);
}
+
+ &:focus {
+ outline: none;
+ background-color: var(--mb-color-background-hover);
+ border: none;
+ }
}
.itemSection {
diff --git a/frontend/src/metabase/ui/components/overlays/Menu/Menu.tsx b/frontend/src/metabase/ui/components/overlays/Menu/Menu.tsx
index 1d9956552da..e1e6265bd49 100644
--- a/frontend/src/metabase/ui/components/overlays/Menu/Menu.tsx
+++ b/frontend/src/metabase/ui/components/overlays/Menu/Menu.tsx
@@ -13,3 +13,4 @@ Menu.Dropdown = MenuDropdown;
Menu.Item = MenuItem;
Menu.Label = MantineMenu.Label;
Menu.Divider = MantineMenu.Divider;
+Menu.Sub = MantineMenu.Sub;
diff --git a/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css b/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css
index 0baf0e39297..e1ecbb9108b 100644
--- a/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css
+++ b/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css
@@ -6,6 +6,9 @@
font-size: var(--mantine-font-size-xl);
font-weight: var(--mantine-heading-font-weight);
line-height: var(--mantine-line-height-md);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.overlay {
diff --git a/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.css b/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.css
index cf4c6ea6b2b..030d4b93a9b 100644
--- a/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.css
+++ b/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.css
@@ -5,3 +5,8 @@
border-color: var(--mb-color-border);
color: var(--mb-color-text-primary);
}
+
+.dropdown[data-menu-dropdown="true"] {
+ padding: 0.75rem;
+ overflow: visible;
+}
diff --git a/frontend/src/metabase/visualizer/utils/merge-data.ts b/frontend/src/metabase/visualizer/utils/merge-data.ts
index 6edb290ccc1..d0099022230 100644
--- a/frontend/src/metabase/visualizer/utils/merge-data.ts
+++ b/frontend/src/metabase/visualizer/utils/merge-data.ts
@@ -3,6 +3,7 @@ import _ from "underscore";
import type {
Dataset,
DatasetColumn,
+ Field,
RowValues,
VisualizerColumnValueSource,
VisualizerDataSource,
@@ -80,6 +81,7 @@ export function mergeVisualizerData({
return {
cols: columns,
rows: _.zip(...unzippedRows),
- results_metadata: { columns },
+ // this is incorrect - `data.cols` are not the same as `data.results_metadata.columns`
+ results_metadata: { columns: columns as unknown as Field[] },
};
}
diff --git a/frontend/src/metabase/visualizer/utils/split-series.ts b/frontend/src/metabase/visualizer/utils/split-series.ts
index 91135374e9b..1a33dd71746 100644
--- a/frontend/src/metabase/visualizer/utils/split-series.ts
+++ b/frontend/src/metabase/visualizer/utils/split-series.ts
@@ -65,6 +65,9 @@ export function splitVisualizerSeries(
const cols = series[0].data.cols.filter((col) =>
columnNames.includes(col.name),
);
+ const resultMetadataCols = series[0].data.results_metadata.columns.filter(
+ (col) => columnNames.includes(col.name),
+ );
if (cols.length === 0) {
return null;
@@ -100,7 +103,7 @@ export function splitVisualizerSeries(
data: {
cols,
rows,
- results_metadata: { columns: cols },
+ results_metadata: { columns: resultMetadataCols },
},
started_at: new Date().toISOString(),
};
diff --git a/frontend/test/__support__/server-mocks/collection.ts b/frontend/test/__support__/server-mocks/collection.ts
index 6d12b967691..79c2c33add5 100644
--- a/frontend/test/__support__/server-mocks/collection.ts
+++ b/frontend/test/__support__/server-mocks/collection.ts
@@ -104,9 +104,9 @@ export function setupCollectionItemsEndpoint({
(call) => {
const url = new URL(call.url);
const models = modelsParam ?? url.searchParams.getAll("models");
- const matchedItems = collectionItems.filter(({ model }) =>
- models.includes(model),
- );
+ const matchedItems = models?.length
+ ? collectionItems.filter(({ model }) => models.includes(model))
+ : collectionItems;
const limit =
Number(url.searchParams.get("limit")) || matchedItems.length;
diff --git a/frontend/test/__support__/server-mocks/index.ts b/frontend/test/__support__/server-mocks/index.ts
index 0c662dcad1c..6a9144091be 100644
--- a/frontend/test/__support__/server-mocks/index.ts
+++ b/frontend/test/__support__/server-mocks/index.ts
@@ -24,6 +24,7 @@ export * from "./geojson";
export * from "./google";
export * from "./group";
export * from "./impersonation";
+export * from "./library";
export * from "./logger";
export * from "./model-indexes";
export * from "./native-query-snippet";
diff --git a/frontend/test/__support__/server-mocks/library.ts b/frontend/test/__support__/server-mocks/library.ts
new file mode 100644
index 00000000000..818b4beda49
--- /dev/null
+++ b/frontend/test/__support__/server-mocks/library.ts
@@ -0,0 +1,25 @@
+import fetchMock from "fetch-mock";
+
+import { createMockCollectionItem } from "metabase-types/api/mocks";
+
+export const setupLibraryEndpoints = (hasLibrary?: boolean) => {
+ if (hasLibrary) {
+ fetchMock.get(
+ "path:/api/ee/library",
+ createMockCollectionItem({
+ id: 6464,
+ name: "Library",
+ type: "library",
+ model: "collection",
+ location: "/",
+ here: ["collection"],
+ below: ["dataset", "metric"],
+ }),
+ );
+ } else {
+ // yep, a 200 with a not found message
+ fetchMock.get("path:/api/ee/library", {
+ message: "not found",
+ });
+ }
+};
diff --git a/frontend/test/__support__/server-mocks/table.ts b/frontend/test/__support__/server-mocks/table.ts
index 5c9389906f1..3363797f7fd 100644
--- a/frontend/test/__support__/server-mocks/table.ts
+++ b/frontend/test/__support__/server-mocks/table.ts
@@ -21,14 +21,14 @@ export function setupTableEndpoints(
{ name: `table-${table.id}-rescan-values` },
);
fetchMock.post(
- `path:/api/table/${table.id}/sync_schema`,
+ `path:/api/table/${table.id}/discard_values`,
{},
- { name: `table-${table.id}-sync-schema` },
+ { name: `table-${table.id}-discard-values` },
);
fetchMock.post(
- `path:/api/table/${table.id}/discard_values`,
+ `path:/api/table/${table.id}/sync_schema`,
{},
- { name: `table-${table.id}-discard-values` },
+ { name: `table-${table.id}-sync-schema` },
);
setupTableQueryMetadataEndpoint(table);
table.fields?.forEach((field) => setupFieldEndpoints({ ...field, table }));
@@ -41,6 +41,49 @@ export function setupTableQueryMetadataEndpoint(table: Table) {
export function setupTablesEndpoints(tables: Table[]) {
fetchMock.get("path:/api/table", tables);
tables.forEach((table) => setupTableEndpoints(table));
+ setupTablesBulkEndpoints();
+}
+
+export function setupTableSearchEndpoint(tables: Table[]) {
+ const name = "table-search";
+ fetchMock.removeRoute(name);
+ fetchMock.get({
+ url: "path:/api/table?term*",
+ name,
+ response: (call) => {
+ const url = new URL(call.url);
+ const term = url.searchParams.get("term");
+
+ // Convert wildcard pattern to regex (support * as wildcard)
+ const searchPattern = term?.toLowerCase().replace(/\*/g, ".*"); // Convert \* back to .* for wildcard matching
+
+ const regex = new RegExp(searchPattern ?? "");
+
+ return tables.filter(
+ (table) =>
+ regex.test(table.name.toLowerCase()) ||
+ regex.test(table.display_name?.toLowerCase() ?? ""),
+ );
+ },
+ });
+}
+
+export function setupTablesBulkEndpoints() {
+ fetchMock.post(
+ "path:/api/ee/data-studio/table/rescan-values",
+ {},
+ { name: "tables-rescan-values" },
+ );
+ fetchMock.post(
+ "path:/api/ee/data-studio/table/sync-schema",
+ {},
+ { name: "tables-sync-schema" },
+ );
+ fetchMock.post(
+ "path:/api/ee/data-studio/table/discard-values",
+ {},
+ { name: "tables-discard-values" },
+ );
}
export function setupUploadManagementEndpoint(tables: Table[]) {
diff --git a/resources/migrations/058_update_migrations.yaml b/resources/migrations/058_update_migrations.yaml
index 4cbc56cb004..725ce91b4ae 100644
--- a/resources/migrations/058_update_migrations.yaml
+++ b/resources/migrations/058_update_migrations.yaml
@@ -309,6 +309,46 @@ databaseChangeLog:
name: revoked_at
where: revoked_at IS NULL
+ - changeSet:
+ id: v58.2025-11-10T14:39:00
+ author: wotbrew
+ comment: Add published_table_id to report_card
+ changes:
+ - addColumn:
+ tableName: report_card
+ columns:
+ - column:
+ name: published_table_id
+ type: int
+ remarks: The table id that is 'published' by this model
+ constraints:
+ nullable: true
+
+ - changeSet:
+ id: v58.2025-11-10T14:39:01
+ author: wotbrew
+ comment: Add index for report_card.published_table_id
+ changes:
+ - createIndex:
+ tableName: report_card
+ indexName: idx_report_card_published_table_id
+ columns:
+ - column:
+ name: published_table_id
+
+ - changeSet:
+ id: v58.2025-11-10T14:39:02
+ author: wotbrew
+ comment: Add foreign key report_card(published_table_id) to metabase_table(id)
+ changes:
+ - addForeignKeyConstraint:
+ baseTableName: report_card
+ baseColumnNames: published_table_id
+ referencedTableName: metabase_table
+ referencedColumnNames: id
+ constraintName: fk_report_card_published_table
+ onDelete: SET NULL
+
- changeSet:
id: v58.2025-11-12T00:00:00
author: edpaget
@@ -387,7 +427,7 @@ databaseChangeLog:
- addColumn:
tableName: core_session
columns:
- - column:
+ - column:
name: expires_at
type: ${timestamp_type}
remarks: Timestamp when this session expires (from auth_identity or calculated)
@@ -651,6 +691,88 @@ databaseChangeLog:
rollback:
- sql: DELETE FROM auth_identity WHERE provider IN ('saml', 'jwt');
+ - changeSet:
+ id: v58.2025-11-12T11:57:00
+ author: wotbrew
+ comment: Add data_source column to metabase_table
+ changes:
+ - addColumn:
+ tableName: metabase_table
+ columns:
+ - column:
+ name: data_source
+ type: varchar(254)
+ remarks: The origin type of the data (e.g. metabase-transform)
+ constraints:
+ nullable: true
+
+ - changeSet:
+ id: v58.2025-11-12T11:57:02
+ author: wotbrew
+ comment: Add data_layer column to metabase_table
+ changes:
+ - addColumn:
+ tableName: metabase_table
+ columns:
+ - column:
+ name: data_layer
+ type: varchar(254)
+ remarks: The (new) enum for visibility class
+ constraints:
+ nullable: true
+
+ - changeSet:
+ id: v58.2025-11-12T11:57:03
+ author: wotbrew
+ comment: Add owner_email column to metabase_table
+ changes:
+ - addColumn:
+ tableName: metabase_table
+ columns:
+ - column:
+ name: owner_email
+ type: ${text.type}
+ remarks: An optional email address of the 'owner' of this table, exclusive with owner_user_id.
+ constraints:
+ nullable: true
+
+ - changeSet:
+ id: v58.2025-11-12T11:57:04
+ author: wotbrew
+ comment: Add owner_user_id column to metabase_table
+ changes:
+ - addColumn:
+ tableName: metabase_table
+ columns:
+ - column:
+ name: owner_user_id
+ type: int
+ remarks: An (metabase) user id of the 'owner' of this table, exclusive with owner_email.
+ constraints:
+ nullable: true
+
+ - changeSet:
+ id: v58.2025-11-13T10:00:00
+ author: qnkhuat
+ comment: Backfill data_layer from visibility_type
+ changes:
+ - sql: >-
+ UPDATE metabase_table
+ SET data_layer = CASE
+ WHEN visibility_type IN ('hidden', 'retired', 'sensitive', 'technical', 'cruft') THEN 'copper'
+ ELSE 'bronze'
+ END
+ rollback:
+ - sql: >-
+ UPDATE metabase_table
+ SET visibility_type = CASE
+ WHEN data_layer = 'copper' THEN 'hidden'
+ ELSE NULL
+ END
+ - sql: >-
+ UPDATE metabase_table
+ SET data_layer = NULL
+
- changeSet:
id: v58.2025-11-19T00:00:00
author: edpaget
@@ -693,6 +815,7 @@ databaseChangeLog:
- sql:
sql: UPDATE collection SET type = 'remote-synced' WHERE is_remote_synced = true
+
# >>>>>>>>>> DO NOT ADD NEW MIGRATIONS BELOW THIS LINE! ADD THEM ABOVE <<<<<<<<<<
########################################################################################################################
diff --git a/resources/user_key_value_types/transforms.edn b/resources/user_key_value_types/transforms.edn
new file mode 100644
index 00000000000..ad34f4ecd79
--- /dev/null
+++ b/resources/user_key_value_types/transforms.edn
@@ -0,0 +1,2 @@
+[:map
+ [:value [:enum "tree" "alphabetical" "last-modified"]]]
diff --git a/src/metabase/bookmarks/models/bookmark.clj b/src/metabase/bookmarks/models/bookmark.clj
index 0448213f374..390ce9f8ad5 100644
--- a/src/metabase/bookmarks/models/bookmark.clj
+++ b/src/metabase/bookmarks/models/bookmark.clj
@@ -2,6 +2,7 @@
(:require
[clojure.string :as str]
[metabase.app-db.core :as mdb]
+ [metabase.collections.models.collection :as collection]
[metabase.config.core :as config]
[metabase.premium-features.core :as premium-features]
[metabase.queries.schema :as queries.schema]
@@ -169,3 +170,11 @@
(t2/insert! :model/BookmarkOrdering (->> orderings
(map #(select-keys % [:type :item_id]))
(map-indexed #(assoc %2 :user_id user-id :ordering %1)))))
+
+(t2/define-before-insert :model/CollectionBookmark [bookmark]
+ (collection/check-allowed-content :model/CollectionBookmark (:collection_id bookmark))
+ bookmark)
+
+(t2/define-before-update :model/CollectionBookmark [model]
+ (collection/check-allowed-content :model/CollectionBookmark (:collection_id (t2/changes model)))
+ model)
diff --git a/src/metabase/collections/core.clj b/src/metabase/collections/core.clj
index a67a9c38d67..4824db8ac86 100644
--- a/src/metabase/collections/core.clj
+++ b/src/metabase/collections/core.clj
@@ -9,10 +9,13 @@
(p/import-vars
[metabase.collections.models.collection
+ remote-synced-collection
remote-synced-collection?
check-for-remote-sync-update
check-non-remote-synced-dependencies
check-remote-synced-dependents
+ library-collection
+ create-library-collection!
moving-into-remote-synced?
moving-from-remote-synced?
non-remote-synced-dependencies])
diff --git a/src/metabase/collections/models/collection.clj b/src/metabase/collections/models/collection.clj
index 385989e4557..6e22c788514 100644
--- a/src/metabase/collections/models/collection.clj
+++ b/src/metabase/collections/models/collection.clj
@@ -18,7 +18,7 @@
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
[metabase.permissions.core :as perms]
- [metabase.premium-features.core :as premium-features]
+ [metabase.premium-features.core :as premium-features :refer [defenterprise]]
[metabase.remote-sync.core :as remote-sync]
;; Trying to use metabase.search would cause a circular reference ;_;
[metabase.search.spec :as search.spec]
@@ -64,6 +64,22 @@
"The value of the `:type` field for the Trash collection that holds archived items."
"trash")
+(def ^:constant remote-synced-collection-type
+ "The value of the `:type` field for remote-synced collections."
+ "remote-synced")
+
+(def ^:constant library-collection-type
+ "The value of the `:type` field for library collections."
+ "library")
+
+(def ^:constant library-models-collection-type
+ "The value of the `:type` field for collections that only allow models."
+ "library-models")
+
+(def ^:constant library-metrics-collection-type
+ "The value of the `:type` field for collections that only allow models."
+ "library-metrics")
+
(defn- trash-collection* []
(t2/select-one :model/Collection :type trash-collection-type))
@@ -112,8 +128,23 @@
(map? collection-or-id) (:is_remote_synced collection-or-id)
:else (t2/select-one-fn :is_remote_synced :model/Collection :id (u/the-id collection-or-id))))
+(defn- is-library?
+ "Is this the Library collection?"
+ [collection]
+ (= (:type collection) library-collection-type))
+
+(defn- is-library-models-collection?
+ "Is this the library-models (named 'Data') collection?"
+ [collection]
+ (= (:type collection) library-models-collection-type))
+
+(defn- is-library-metrics-collection?
+ "Is this the Metrics collection?"
+ [collection]
+ (= (:type collection) library-metrics-collection-type))
+
(defn remote-synced-collection
- "Get the remote-synced collection, if it exists."
+ "Get the remote-synced collection if it exists."
[]
(t2/select-one :model/Collection :is_remote_synced true :location "/"))
@@ -134,6 +165,31 @@
(binding [*clearing-remote-sync* true]
(t2/update! :model/Collection :is_remote_synced true {:is_remote_synced false})))
+(defn library-collection
+ "Get the 'library' collection, if it exists."
+ []
+ (t2/select-one :model/Collection :type library-collection-type))
+
+(defn create-library-collection!
+ "Create the Library collection. Returns Created collection. Throws if it already exists."
+ []
+ (when-not (nil? (library-collection))
+ (throw (ex-info "Library already exists" {})))
+ (let [library (t2/insert-returning-instance! :model/Collection {:name "Library"
+ :type library-collection-type
+ :location "/"})
+ base-location (str "/" (:id library) "/")
+ models (t2/insert-returning-instance! :model/Collection {:name "Data"
+ :type library-models-collection-type
+ :location base-location})
+ metrics (t2/insert-returning-instance! :model/Collection {:name "Metrics"
+ :type library-metrics-collection-type
+ :location base-location})]
+ (doseq [col [library models metrics]]
+ (t2/delete! :model/Permissions :collection_id (:id col))
+ (perms/grant-collection-read-permissions! (perms/all-users-group) col))
+ library))
+
(methodical/defmethod t2/table-name :model/Collection [_model] :collection)
(methodical/defmethod t2/model-for-automagic-hydration [#_model :default #_k :collection]
@@ -144,16 +200,19 @@
{:namespace mi/transform-keyword
:authority_level mi/transform-keyword})
-(defn maybe-localize-trash-name
- "If the collection is the Trash, translate the `name`. This is a public function because we can't rely on
- `define-after-select` in all circumstances, e.g. when searching or listing collection items (where we do a direct DB
- query without `:model/Collection`)."
+(defn maybe-localize-system-collection-name
+ "If the collection is a system-defined collection (Trash, Library, Data, or Metrics), translate the `name`.
+ This is a public function because we can't rely on `define-after-select` in all circumstances, e.g. when searching
+ or listing collection items (where we do a direct DB query without `:model/Collection`)."
[collection]
(cond-> collection
- (is-trash? collection) (assoc :name (tru "Trash"))))
+ (is-trash? collection) (assoc :name (tru "Trash"))
+ (is-library? collection) (assoc :name (tru "Library"))
+ (is-library-models-collection? collection) (assoc :name (tru "Data"))
+ (is-library-metrics-collection? collection) (assoc :name (tru "Metrics"))))
(t2/define-after-select :model/Collection [collection]
- (maybe-localize-trash-name collection))
+ (maybe-localize-system-collection-name collection))
(doto :model/Collection
(derive :metabase/model)
@@ -326,6 +385,18 @@
(tru "A Collection placed in a remote-synced Collection must also be remote-synced."))]
(throw (ex-info msg {:status-code 400, :errors {:location msg}})))))))
+(defenterprise check-allowed-content
+ "Checks contents of a collection before saving it. The OSS implementation is a no-op."
+ metabase-enterprise.library.validation
+ [_model-type _collection-id]
+ true)
+
+(defenterprise check-library-update
+ "Checks that a collection of type `:library` only contains allowed changes."
+ metabase-enterprise.library.validation
+ [_collection]
+ true)
+
;; This function is defined later after children-location is available
(def ^:private CollectionWithLocationOrRoot
@@ -1458,6 +1529,7 @@
(assert-not-personal-collection-for-api-key collection)
(assert-valid-namespace (merge {:namespace nil} collection))
(assert-valid-remote-synced-parent collection)
+ (check-allowed-content (:type collection) (when-let [location (:location (t2/changes collection))] (location-path->parent-id location)))
;; Inherit is_remote_synced from parent if not explicitly set
(let [parent-is-remote-synced? (when-let [parent-id (and location (location-path->parent-id location))]
(t2/select-one-fn :is_remote_synced :model/Collection :id parent-id))]
@@ -1640,6 +1712,10 @@
(when-not *clearing-remote-sync*
(let [merged-collection (merge collection-before-updates collection-updates)]
(assert-valid-remote-synced-parent merged-collection)))
+ ;; (3.6) Check that the parent collection allows this collection to be there
+ (check-allowed-content (:type collection) (when-let [location (:location collection)] (location-path->parent-id location)))
+ ;; (3.7) Check if it's a semantic-library collection that can't be updated
+ (check-library-update collection)
;; (4) If we're moving a Collection from a location on a Personal Collection hierarchy to a location not on one,
;; or vice versa, we need to grant/revoke permissions as appropriate (see above for more details)
(when (api/column-will-change? :location collection-before-updates collection-updates)
@@ -2101,3 +2177,11 @@
[:= :bookmark.collection_id :this.id]
;; a magical alias, or perhaps this clause can be implicit
[:= :bookmark.user_id :current_user/id]]]})
+
+(defn is-library-collection?
+ "Return true if the given collection ID corresponds to a collection in the library."
+ [collection-id]
+ (when collection-id
+ (pos-int? (t2/count :model/Collection :id collection-id :type [:in [library-collection-type
+ library-models-collection-type
+ library-metrics-collection-type]]))))
diff --git a/src/metabase/collections_rest/api.clj b/src/metabase/collections_rest/api.clj
index 189d7a7b9d3..b3a42cb2d16 100644
--- a/src/metabase/collections_rest/api.clj
+++ b/src/metabase/collections_rest/api.clj
@@ -76,8 +76,11 @@
The Trash Collection itself (the container for archived items) is *always* included.
To select only personal collections, pass in `personal-only` as `true`.
- This will select only collections where `personal_owner_id` is not `nil`."
- [{:keys [archived exclude-other-user-collections namespace shallow collection-id personal-only]}]
+ This will select only collections where `personal_owner_id` is not `nil`.
+
+ To include library collections and their descendants, pass in `include-library?` as `true`.
+ By default, library-type collections are excluded."
+ [{:keys [archived exclude-other-user-collections namespace shallow collection-id personal-only include-library?]}]
(cond->>
(t2/select :model/Collection
{:where [:and
@@ -95,15 +98,20 @@
[:!= :personal_owner_id nil])
(when exclude-other-user-collections
[:or [:= :personal_owner_id nil] [:= :personal_owner_id api/*current-user-id*]])
+ (when-not include-library?
+ [:or [:= nil :type]
+ [:not-in :type [collection/library-collection-type
+ collection/library-models-collection-type
+ collection/library-metrics-collection-type]]])
(perms/audit-namespace-clause :namespace namespace)
(collection/visible-collection-filter-clause
:id
- {:include-archived-items (if archived
- :only
- :exclude)
+ {:include-archived-items (if archived
+ :only
+ :exclude)
:include-trash-collection? true
- :permission-level :read
- :archive-operation-id nil})]
+ :permission-level :read
+ :archive-operation-id nil})]
;; Order NULL collection types first so that audit collections are last
:order-by [[[[:case [:= :authority_level "official"] 0 :else 1]] :asc]
[[[:case
@@ -136,7 +144,8 @@
:exclude-other-user-collections exclude-other-user-collections
:namespace namespace
:shallow false
- :personal-only personal-only}) collections
+ :personal-only personal-only
+ :include-library? true}) collections
;; include Root Collection at beginning or results if archived or personal-only isn't `true`
(if (or archived personal-only)
collections
@@ -144,7 +153,7 @@
(cond->> collections
(mi/can-read? root)
(cons root))))
- (t2/hydrate collections :can_write :is_personal :can_delete :is_remote_synced)
+ (t2/hydrate collections :can_write :is_personal :can_delete :is_remote_synced :parent_id)
;; remove the :metabase.collection.models.collection.root/is-root? tag since FE doesn't need it
;; and for personal collections we translate the name to user's locale
(collection/personal-collections-with-ui-details (for [collection collections]
@@ -195,19 +204,22 @@
TODO: for historical reasons this returns Saved Questions AS 'card' AND Models as 'dataset'; we should fix this at
some point in the future."
[_route-params
- {:keys [exclude-archived exclude-other-user-collections
+ {:keys [exclude-archived exclude-other-user-collections include-library
namespace shallow collection-id]} :- [:map
[:exclude-archived {:default false} [:maybe :boolean]]
[:exclude-other-user-collections {:default false} [:maybe :boolean]]
+ [:include-library {:default false} [:maybe :boolean]]
[:namespace {:optional true} [:maybe ms/NonBlankString]]
[:shallow {:default false} [:maybe :boolean]]
[:collection-id {:optional true} [:maybe ms/PositiveInt]]]]
(let [archived (if exclude-archived false nil)
- collections (select-collections {:archived archived
- :exclude-other-user-collections exclude-other-user-collections
- :namespace namespace
- :shallow shallow
- :collection-id collection-id})]
+ collections (-> (select-collections {:archived archived
+ :exclude-other-user-collections exclude-other-user-collections
+ :namespace namespace
+ :shallow shallow
+ :collection-id collection-id
+ :include-library? include-library})
+ (t2/hydrate :can_write))]
(if shallow
(shallow-tree-from-collection-id collections)
(let [collection-type-ids (reduce (fn [acc {collection-id :collection_id, card-type :type, :as _card}]
@@ -264,6 +276,7 @@
[:show-dashboard-questions? :boolean]
[:collection-type {:optional true} [:maybe CollectionType]]
[:archived? :boolean]
+ [:include-library? {:optional true} [:maybe :boolean]]
[:pinned-state {:optional true} [:maybe (into [:enum] (map keyword) valid-pinned-state-values)]]
;; when specified, only return results of this type.
[:models {:optional true} [:maybe [:set (into [:enum] (map keyword) valid-model-param-values)]]]
@@ -628,7 +641,7 @@
[:not= :namespace (u/qualified-name "snippets")]])
(defn- collection-query
- [collection {:keys [archived? collection-namespace pinned-state collection-type]}]
+ [collection {:keys [archived? collection-namespace pinned-state collection-type include-library?]}]
(-> (assoc
(collection/effective-children-query
collection
@@ -642,6 +655,11 @@
(if (= collection-type "remote-synced")
[:= :is_remote_synced true]
[:= :type collection-type]))
+ (when-not include-library?
+ [:or [:= nil :type]
+ [:not [:in :type [collection/library-collection-type
+ collection/library-metrics-collection-type
+ collection/library-models-collection-type]]]])
(perms/audit-namespace-clause :namespace (u/qualified-name collection-namespace))
(snippets-collection-filter-clause))
;; We get from the effective-children-query a normal set of columns selected:
@@ -734,7 +752,7 @@
(for [row (annotate-collections parent-collection rows options)]
(let [type-value (:type row)]
(-> (t2/instance :model/Collection row)
- collection/maybe-localize-trash-name
+ collection/maybe-localize-system-collection-name
(update :archived api/bit->boolean)
(update :is_remote_synced api/bit->boolean)
(t2/hydrate :can_write :effective_location :can_restore :can_delete)
@@ -1148,17 +1166,20 @@
By default, this will show the 'normal' Collections namespace; to view a different Collections namespace, such as
`snippets`, you can pass the `?namespace=` parameter.
+ By default, library collections are excluded from the results; to include them, pass `?include_library=true`.
+
Note that this endpoint should return results in a similar shape to `/api/dashboard/:id/items`, so if this is
changed, that should too."
[_route-params
{:keys [models archived namespace pinned_state sort_column sort_direction official_collections_first
- include_can_run_adhoc_query collection_type
+ include_can_run_adhoc_query include_library collection_type
show_dashboard_questions]} :- [:map
[:models {:optional true} [:maybe Models]]
[:collection_type {:optional true} CollectionType]
[:include_can_run_adhoc_query {:default false} [:maybe ms/BooleanValue]]
[:archived {:default false} [:maybe ms/BooleanValue]]
[:namespace {:optional true} [:maybe ms/NonBlankString]]
+ [:include_library {:default false} [:maybe ms/BooleanValue]]
[:pinned_state {:optional true} [:maybe (into [:enum] valid-pinned-state-values)]]
[:sort_column {:optional true} [:maybe (into [:enum] valid-sort-columns)]]
[:sort_direction {:optional true} [:maybe (into [:enum] valid-sort-directions)]]
@@ -1175,6 +1196,7 @@
:include-can-run-adhoc-query include_can_run_adhoc_query
:show-dashboard-questions? (boolean show_dashboard_questions)
:collection-type collection_type
+ :include-library? include_library
:models model-kwds
:pinned-state (keyword pinned_state)
:sort-info {:sort-column (or (some-> sort_column normalize-sort-choice) :name)
@@ -1473,6 +1495,7 @@
(u/prog1 (collection-children collection
{:show-dashboard-questions? show_dashboard_questions
:models model-kwds
+ :include-library? true
:archived? (or archived (:archived collection) (collection/is-trash? collection))
:pinned-state (keyword pinned_state)
:include-can-run-adhoc-query include_can_run_adhoc_query
diff --git a/src/metabase/dashboards/models/dashboard.clj b/src/metabase/dashboards/models/dashboard.clj
index 72be6996fbd..d82530a3359 100644
--- a/src/metabase/dashboards/models/dashboard.clj
+++ b/src/metabase/dashboards/models/dashboard.clj
@@ -83,6 +83,7 @@
(let [defaults {:parameters []}
dashboard (lib/normalize ::dashboards.schema/dashboard (merge defaults dashboard))]
(u/prog1 dashboard
+ (collection/check-allowed-content :model/Dashboard (:collection_id dashboard))
(params/assert-valid-parameters dashboard)
(collection/check-collection-namespace :model/Dashboard (:collection_id dashboard)))))
@@ -96,6 +97,8 @@
(let [changes (t2/changes dashboard)
dashboard (lib/normalize ::dashboards.schema/dashboard dashboard)
changes (lib/normalize ::dashboards.schema/dashboard changes)]
+ (collection/check-allowed-content :model/Dashboard (:collection_id changes))
+
(u/prog1 (maybe-populate-initially-published-at dashboard)
(params/assert-valid-parameters dashboard)
(when (:parameters changes)
diff --git a/src/metabase/models/interface.clj b/src/metabase/models/interface.clj
index ba06f382ec0..46d32a1b309 100644
--- a/src/metabase/models/interface.clj
+++ b/src/metabase/models/interface.clj
@@ -259,6 +259,13 @@
(throw (ex-info (format "Invalid value %s. Must be one of %s" value (str/join ", " enum)) {:status-code 400
:value value}))))
+(mu/defn assert-optional-enum
+ "Assert that a value is one of the values in `enum` or `nil`."
+ [enum :- [:set :any]
+ value :- :any]
+ (when (some? value)
+ (assert-enum enum value)))
+
(mu/defn assert-namespaced
"Assert that a value is a namespaced keyword under `qualified-ns`."
[qualified-ns :- string?
diff --git a/src/metabase/models/serialization.clj b/src/metabase/models/serialization.clj
index dd705b7bb3b..7f878aa5ccf 100644
--- a/src/metabase/models/serialization.clj
+++ b/src/metabase/models/serialization.clj
@@ -1791,6 +1791,12 @@
(constantly
{:export name :import keyword}))
+(def optional-kw "Transformer for optional keywordized values.
+
+ Used so various comparisons in hooks work, like `t2/changes` will not indicate a changed property."
+ (constantly
+ {:export #(when % (name %)) :import #(when % (keyword %))}))
+
(defn as
"Serialize this field under the given key instead, typically because it has been logically transformed."
[k xform]
diff --git a/src/metabase/native_query_snippets/models/native_query_snippet.clj b/src/metabase/native_query_snippets/models/native_query_snippet.clj
index b0e1d793de1..f7d3d3c0372 100644
--- a/src/metabase/native_query_snippets/models/native_query_snippet.clj
+++ b/src/metabase/native_query_snippets/models/native_query_snippet.clj
@@ -74,6 +74,7 @@
(t2/define-before-insert :model/NativeQuerySnippet [snippet]
(u/prog1 (add-template-tags snippet)
+ (collection/check-allowed-content :model/NativeQuerySnippet (:collection_id snippet))
(collection/check-collection-namespace :model/NativeQuerySnippet (:collection_id snippet))))
(t2/define-after-insert :model/NativeQuerySnippet
@@ -83,6 +84,7 @@
(t2/define-before-update :model/NativeQuerySnippet
[snippet]
+ (collection/check-allowed-content :model/NativeQuerySnippet (:collection_id (t2/changes snippet)))
(u/prog1 (cond-> snippet
(:content snippet) add-template-tags)
;; throw an Exception if someone tries to update creator_id
diff --git a/src/metabase/premium_features/settings.clj b/src/metabase/premium_features/settings.clj
index 1aa5a9f5758..bf666299ad9 100644
--- a/src/metabase/premium_features/settings.clj
+++ b/src/metabase/premium_features/settings.clj
@@ -315,6 +315,10 @@
"Should users be allowed to enable support users in-app?"
:support-users)
+(define-premium-feature ^{:added "0.58.0"} enable-data-studio?
+ "Should we enable the Data Studio?"
+ :data-studio)
+
(defn- -token-features []
{:advanced_permissions (enable-advanced-permissions?)
:ai_sql_fixer (enable-ai-sql-fixer?)
@@ -332,6 +336,7 @@
:dashboard_subscription_filters (enable-dashboard-subscription-filters?)
:database_auth_providers (enable-database-auth-providers?)
:database_routing (enable-database-routing?)
+ :data_studio (enable-data-studio?)
:dependencies (enable-dependencies?)
:development_mode (development-mode?)
:disable_password_login (can-disable-password-login?)
diff --git a/src/metabase/pulse/models/pulse.clj b/src/metabase/pulse/models/pulse.clj
index 6bcdb1cdd54..20c34c89e32 100644
--- a/src/metabase/pulse/models/pulse.clj
+++ b/src/metabase/pulse/models/pulse.clj
@@ -71,6 +71,7 @@
(apply merge defaults {:collection_id collection-id}))]
(u/prog1 notification
(assert-valid-parameters notification)
+ (collection/check-allowed-content :model/Pulse (:collection_id notification))
(collection/check-collection-namespace :model/Pulse (:collection_id notification)))))
(def ^:dynamic *allow-moving-dashboard-subscriptions*
@@ -82,6 +83,7 @@
[notification]
(let [{:keys [collection_id dashboard_id]} (t2/original notification)
changes (t2/changes notification)]
+ (collection/check-allowed-content :model/Pulse (:collection_id changes))
(when (and dashboard_id
(contains? notification :collection_id)
(not= (:collection_id notification) collection_id)
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 0f13b472e5d..5617a9badf2 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -710,16 +710,18 @@
(t2/define-before-insert :model/Card
[card]
- (-> card
- (assoc :metabase_version config/mb-version-string
- :card_schema current-schema-version)
- queries.schema/normalize-card
+ (u/prog1
+ (-> card
+ (assoc :metabase_version config/mb-version-string
+ :card_schema current-schema-version)
+ queries.schema/normalize-card
;; Must have an entity_id before populating the metadata. TODO (Cam 7/11/25) -- actually, this is no longer true,
;; since we're removing `:ident`s; we can probably remove this now.
- (u/assoc-default :entity_id (u/generate-nano-id))
- card.metadata/populate-result-metadata
- pre-insert
- populate-query-fields))
+ (u/assoc-default :entity_id (u/generate-nano-id))
+ card.metadata/populate-result-metadata
+ pre-insert
+ populate-query-fields)
+ (collection/check-allowed-content (:type <>) (:collection_id <>))))
(t2/define-after-insert :model/Card
[card]
@@ -753,6 +755,7 @@
[{:keys [verified-result-metadata?] :as card}]
(let [changes (some-> card t2/changes queries.schema/normalize-card)
card (queries.schema/normalize-card card)]
+ (collection/check-allowed-content (:type card) (:collection_id changes))
(-> card
(dissoc :verified-result-metadata?)
(assoc :card_schema current-schema-version)
@@ -897,7 +900,7 @@
(not (:dashboard_id input-card-data)))))
(let [data-keys [:dataset_query :description :display :name :visualization_settings
:parameters :parameter_mappings :collection_id :collection_position
- :cache_ttl :type :dashboard_id :document_id]
+ :cache_ttl :type :dashboard_id :document_id :published_table_id]
position-info {:collection_id (:collection_id input-card-data)
:collection_position (:collection_position input-card-data)}
card-data (-> (select-keys input-card-data data-keys)
@@ -1212,6 +1215,7 @@
:document_id (serdes/fk :model/Document)
:creator_id (serdes/fk :model/User)
:made_public_by_id (serdes/fk :model/User)
+ :published_table_id (serdes/fk :model/Table)
:dataset_query {:export serdes/export-mbql :import serdes/import-mbql}
:parameters {:export serdes/export-parameters :import serdes/import-parameters}
:parameter_mappings {:export serdes/export-parameter-mappings :import serdes/import-parameter-mappings}
diff --git a/src/metabase/search/api.clj b/src/metabase/search/api.clj
index a36b87b7fbf..016179120e9 100644
--- a/src/metabase/search/api.clj
+++ b/src/metabase/search/api.clj
@@ -165,6 +165,7 @@
[_route-params
{:keys [q context archived models verified ids]
calculate-available-models :calculate_available_models
+ collection :collection
created-at :created_at
created-by :created_by
filter-items-in-personal-collection :filter_items_in_personal_collection
@@ -183,6 +184,7 @@
[:q {:optional true} [:maybe :string]]
[:context {:optional true} [:maybe :keyword]]
[:archived {:default false} [:maybe :boolean]]
+ [:collection {:optional true} [:maybe ms/PositiveInt]]
[:table_db_id {:optional true} [:maybe ms/PositiveInt]]
[:models {:optional true} [:maybe (ms/QueryVectorOf search/SearchableModel)]]
[:filter_items_in_personal_collection {:optional true} [:maybe [:enum "all" "only" "only-mine" "exclude" "exclude-others"]]]
@@ -206,6 +208,7 @@
(u/prog1 (search/search
(search/search-context
{:archived archived
+ :collection collection
:context context
:created-at created-at
:created-by (set created-by)
diff --git a/src/metabase/search/config.clj b/src/metabase/search/config.clj
index bc2192f99f1..8193f8eeb94 100644
--- a/src/metabase/search/config.clj
+++ b/src/metabase/search/config.clj
@@ -155,6 +155,7 @@
"Specifications for the optional search filters."
(build-filters
{:archived {:type :single-value, :context-key :archived?}
+ :collection-id {:type :collection-hierarchy, :context-key :collection}
;; TODO dry this alias up with the index hydration code
:created-at {:type :date-range, :field "model_created_at"}
:creator-id {:type :list, :context-key :created-by}
@@ -256,6 +257,7 @@
;;
;; optional
;;
+ [:collection {:optional true} [:maybe ms/PositiveInt]]
[:created-at {:optional true} ms/NonBlankString]
[:created-by {:optional true} [:set {:min 1} ms/PositiveInt]]
[:display-type {:optional true} [:set {:min 1} ms/NonBlankString]]
diff --git a/src/metabase/search/filter.clj b/src/metabase/search/filter.clj
index 15434ddd451..db3d7353807 100644
--- a/src/metabase/search/filter.clj
+++ b/src/metabase/search/filter.clj
@@ -1,6 +1,7 @@
(ns metabase.search.filter
(:require
[honey.sql.helpers :as sql.helpers]
+ [metabase.collections.models.collection :as collection]
[metabase.premium-features.core :as premium-features]
[metabase.query-processor.parameters.dates :as qp.parameters.dates]
[metabase.search.config :as search.config]
@@ -87,6 +88,13 @@
(defmethod where-clause* ::list [_ k v] [:in k v])
+(defmethod where-clause* ::collection-hierarchy [_ k v]
+ ;; Filter by collection and all descendants
+ ;; Match items directly in the collection OR in descendant collections
+ [:or
+ [:= k v]
+ [:like :collection.location (str "%" (collection/location-path v) "%")]])
+
(defn personal-collections-where-clause
"Build a clause limiting the entries to those (not) within or within personal collections, if relevant.
WARNING: this method queries the appdb, and its approach will get very slow when there are many users!"
diff --git a/src/metabase/search/impl.clj b/src/metabase/search/impl.clj
index bdc83fe0b04..843d4e264d0 100644
--- a/src/metabase/search/impl.clj
+++ b/src/metabase/search/impl.clj
@@ -264,6 +264,7 @@
[:created-at {:optional true} [:maybe ms/NonBlankString]]
[:created-by {:optional true} [:maybe [:set ms/PositiveInt]]]
[:filter-items-in-personal-collection {:optional true} [:maybe [:enum "all" "only" "only-mine" "exclude" "exclude-others"]]]
+ [:collection {:optional true} [:maybe ms/PositiveInt]]
[:last-edited-at {:optional true} [:maybe ms/NonBlankString]]
[:last-edited-by {:optional true} [:maybe [:set ms/PositiveInt]]]
[:limit {:optional true} [:maybe ms/Int]]
@@ -285,6 +286,7 @@
(mu/defn search-context :- SearchContext
"Create a new search context that you can pass to other functions like [[search]]."
[{:keys [archived
+ collection
context
calculate-available-models?
created-at
@@ -337,6 +339,7 @@
:search-engine engine
:search-string search-string
:weights weights}
+ (some? collection) (assoc :collection collection)
(some? created-at) (assoc :created-at created-at)
(seq created-by) (assoc :created-by created-by)
(some? filter-items-in-personal-collection) (assoc :filter-items-in-personal-collection filter-items-in-personal-collection)
@@ -372,7 +375,7 @@
:always
(assoc :type (:collection_type collection))
:always
- collection/maybe-localize-trash-name))
+ collection/maybe-localize-system-collection-name))
(defn- normalize-result [result]
(let [instance (to-toucan-instance (t2.realize/realize result))]
diff --git a/src/metabase/search/in_place/filter.clj b/src/metabase/search/in_place/filter.clj
index 2b0e6f7a0cb..480ae3c95f1 100644
--- a/src/metabase/search/in_place/filter.clj
+++ b/src/metabase/search/in_place/filter.clj
@@ -14,6 +14,7 @@
[clojure.string :as str]
[honey.sql.helpers :as sql.helpers]
[metabase.audit-app.core :as audit]
+ [metabase.collections.models.collection :as collection]
[metabase.premium-features.core :as premium-features]
[metabase.query-processor.parameters.dates :as params.dates]
[metabase.search.config :as search.config :refer [SearchableModel SearchContext]]
@@ -265,6 +266,31 @@
[_filter model query display-types]
(sql.helpers/where query [:in (search.config/column-with-model-alias model :display) display-types])))
+;; Collection filter - filters by collection and all descendants
+(doseq [model ["card" "dataset" "metric" "dashboard" "collection" "document"]]
+ (defmethod build-optional-filter-query [:collection model]
+ [_filter model query collection-id]
+ (let [collection-col (search.config/column-with-model-alias model :collection_id)]
+ ;; Join with collection table if not already joined to get location for descendant filtering
+ ;; Filter by direct match (collection_id = ?) OR descendants (collection.location LIKE '/collection_id/%')
+ (cond-> query
+ (not= "collection" model)
+ (sql.helpers/where [:or
+ [:= collection-col collection-id]
+ [:like :collection.location (str "%" (collection/location-path collection-id) "%")]])
+
+ (= "collection" model)
+ (sql.helpers/where [:or
+ [:= :collection.id collection-id]
+ [:like :collection.location (str "%" (collection/location-path collection-id) "%")]])))))
+
+;; Things that don't belong to collections
+(doseq [model ["table" "database" "action" "indexed-entity"]]
+ (defmethod build-optional-filter-query [:collection model]
+ [_filter _model query _collection-id]
+ ;; These models don't have collection_id, so they never match
+ (sql.helpers/where query false-clause)))
+
(defn- feature->supported-models
"Return A map of filter to its support models.
@@ -272,19 +298,21 @@
This is function instead of a def so that optional-filter-clause can be defined anywhere in the codebase."
[]
- (merge
- ;; models support search-native-query if there are additional columns to search when the `search-native-query`
- ;; argument is true
- {:search-native-query (->> (dissoc (methods @(requiring-resolve 'metabase.search.in-place.legacy/searchable-columns)) :default)
- (filter (fn [[model f]]
- (seq (set/difference (set (f model true)) (set (f model false))))))
- (map first)
- set)}
- (->> (dissoc (methods build-optional-filter-query) :default)
- keys
- (reduce (fn [acc [filter model]]
- (update acc filter set/union #{model}))
- {}))))
+ (-> (merge
+ ;; models support search-native-query if there are additional columns to search when the `search-native-query`
+ ;; argument is true
+ {:search-native-query (->> (dissoc (methods @(requiring-resolve 'metabase.search.in-place.legacy/searchable-columns)) :default)
+ (filter (fn [[model f]]
+ (seq (set/difference (set (f model true)) (set (f model false))))))
+ (map first)
+ set)}
+ (->> (dissoc (methods build-optional-filter-query) :default)
+ keys
+ (reduce (fn [acc [filter model]]
+ (update acc filter set/union #{model}))
+ {})))
+ (update :collection disj "table" "database")
+ (update :collection conj "indexed-entity")))
;; ------------------------------------------------------------------------------------------------;;
;; Public functions ;;
@@ -295,7 +323,8 @@
If the context has optional filters, the models will be restricted for the set of supported models only."
[search-context]
- (let [{:keys [created-at
+ (let [{:keys [collection
+ created-at
created-by
last-edited-at
last-edited-by
@@ -309,6 +338,7 @@
feature->supported-models (feature->supported-models)]
(cond-> models
(not is-superuser?) (disj "transform")
+ (some? collection) (set/intersection (:collection feature->supported-models))
(some? created-at) (set/intersection (:created-at feature->supported-models))
(some? created-by) (set/intersection (:created-by feature->supported-models))
(some? last-edited-at) (set/intersection (:last-edited-at feature->supported-models))
@@ -326,6 +356,7 @@
search-context :- SearchContext]
(let [{:keys [models
archived?
+ collection
created-at
created-by
last-edited-at
@@ -373,6 +404,9 @@
(seq display-type)
(#(build-optional-filter-query :display-type model % display-type))
+ (some? collection)
+ (#(build-optional-filter-query :collection model % collection))
+
(= "table" model)
(sql.helpers/where
[:not [:= (search.config/column-with-model-alias "table" :db_id) audit/audit-db-id]]))))
diff --git a/src/metabase/sync/sync_metadata/tables.clj b/src/metabase/sync/sync_metadata/tables.clj
index fedb0f95378..701f24e5c97 100644
--- a/src/metabase/sync/sync_metadata/tables.clj
+++ b/src/metabase/sync/sync_metadata/tables.clj
@@ -142,8 +142,13 @@
(humanization/name->human-readable-name (:name table)))
:name (:name table)
:is_writable (:is_writable table)}
+ (when (:data_source table)
+ {:data_source (:data_source table)})
+ (when (:data_authority table)
+ {:data_authority (:data_authority table)})
(when (:is_sample database)
- {:data_authority :ingested}))))
+ {:data_authority :ingested
+ :data_source :ingested}))))
(defn create-or-reactivate-table!
"Create a single new table in the database, or mark it as active if it already exists."
@@ -165,7 +170,8 @@
(assoc :active true)
(:is_sample database)
- (assoc :data_authority :ingested))))
+ (assoc :data_authority :ingested
+ :data_source :ingested))))
;; otherwise create a new Table
(create-table! database table)))
diff --git a/src/metabase/sync/util.clj b/src/metabase/sync/util.clj
index 03141fdf1aa..dfa1c4f5aff 100644
--- a/src/metabase/sync/util.clj
+++ b/src/metabase/sync/util.clj
@@ -333,6 +333,8 @@
(def ^:private sync-tables-kv-args
{:active true
+ ;; TODO (Ngoc 2025-11-13) replace this with `metabase_table.data_layer = copper` see the docstring of
+ ;; [[metabase.warehouse-schema.models.table/data-layer-types]]
:visibility_type nil})
(def ^:dynamic *batch-size*
diff --git a/src/metabase/timeline/models/timeline.clj b/src/metabase/timeline/models/timeline.clj
index 4dbbc5c8727..77c3ca80a76 100644
--- a/src/metabase/timeline/models/timeline.clj
+++ b/src/metabase/timeline/models/timeline.clj
@@ -1,5 +1,6 @@
(ns metabase.timeline.models.timeline
(:require
+ [metabase.collections.models.collection :as collection]
[metabase.collections.models.collection.root :as collection.root]
[metabase.models.serialization :as serdes]
[metabase.timeline.models.timeline-event :as timeline-event]
@@ -23,6 +24,14 @@
(update timeline :icon (fn [icon]
(if (= icon "balloons") timeline-event/default-icon icon))))
+(t2/define-before-insert :model/Timeline [model]
+ (collection/check-allowed-content :model/Timeline (:collection_id model))
+ model)
+
+(t2/define-before-update :model/Timeline [model]
+ (collection/check-allowed-content :model/Timeline (:collection_id (t2/changes model)))
+ model)
+
;;;; functions
(defn timelines-for-collection
diff --git a/src/metabase/upload/impl.clj b/src/metabase/upload/impl.clj
index 1e797dafbd4..16f8d694df0 100644
--- a/src/metabase/upload/impl.clj
+++ b/src/metabase/upload/impl.clj
@@ -536,7 +536,10 @@
table (sync/create-table! db {:name table-name
:schema (not-empty schema)
:display_name display-name})
- _set_is_upload (t2/update! :model/Table (:id table) {:is_upload true, :data_authority :authoritative, :is_writable true})
+ _set_is_upload (t2/update! :model/Table (:id table) {:is_upload true
+ :data_authority :authoritative
+ :data_source :upload
+ :is_writable true})
_sync (scan-and-sync-table! db table)
_set_names (set-display-names! (:id table) columns)
;; Set the display_name of the auto-generated primary key column to the same as its name, so that if users
diff --git a/src/metabase/users/settings.clj b/src/metabase/users/settings.clj
index 18475e40ffc..089d81355e3 100644
--- a/src/metabase/users/settings.clj
+++ b/src/metabase/users/settings.clj
@@ -77,6 +77,22 @@
:type :boolean
:default true)
+(defsetting expand-collections-in-nav
+ (deferred-tru "User preference for whether the ''Collections'' section of the nav is expanded.")
+ :user-local :only
+ :export? false
+ :visibility :authenticated
+ :type :boolean
+ :default true)
+
+(defsetting expand-library-in-nav
+ (deferred-tru "User preference for whether the ''Library'' section of the nav is expanded.")
+ :user-local :only
+ :export? false
+ :visibility :authenticated
+ :type :boolean
+ :default true)
+
(defsetting browse-filter-only-verified-models
(deferred-tru "User preference for whether the ''Browse models'' page should be filtered to show only verified models.")
:user-local :only
diff --git a/src/metabase/util/malli/schema.clj b/src/metabase/util/malli/schema.clj
index 81c3f63e162..a43c8117815 100644
--- a/src/metabase/util/malli/schema.clj
+++ b/src/metabase/util/malli/schema.clj
@@ -4,6 +4,7 @@
For example the PositiveInt can be defined as (mr/def ::positive-int pos-int?)"
(:require
[clojure.string :as str]
+ [malli.util :as mut]
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
[metabase.util.i18n :as i18n :refer [deferred-tru]]
@@ -70,6 +71,17 @@
maps-schema]
(deferred-tru "value must be seq of maps in which {0}s are unique" (name k))))))
+#_{:clj-kondo/ignore [:unused-private-var]}
+(def ^{:arglists '([map-schema])
+ :private true}
+ ->kebab-keys-map
+ "Transform all keys of a map schema to kebab keys."
+ (memoize
+ (fn [map-schema]
+ (mut/transform-entries map-schema
+ (partial map (fn [[k opts s]]
+ [(u/->kebab-case-en k) opts s]))))))
+
(defn enum-keywords-and-strings
"Returns an enum schema that accept both keywords and strings.
(enum-keywords-and-strings :foo :bar)
diff --git a/src/metabase/warehouse_schema/models/table.clj b/src/metabase/warehouse_schema/models/table.clj
index ca3aec87180..315943da642 100644
--- a/src/metabase/warehouse_schema/models/table.clj
+++ b/src/metabase/warehouse_schema/models/table.clj
@@ -3,6 +3,7 @@
[metabase.api.common :as api]
[metabase.app-db.core :as app-db]
[metabase.audit-app.core :as audit]
+ [metabase.config.core :as config]
[metabase.driver :as driver]
[metabase.models.humanization :as humanization]
[metabase.models.interface :as mi]
@@ -20,9 +21,40 @@
(def visibility-types
"Valid values for `Table.visibility_type` (field may also be `nil`).
- (Basically any non-nil value is a reason for hiding the table.)"
+ (Basically any non-nil value is a reason for hiding the table.)
+
+ Deprecated and will eventually be replaced by data-layer"
#{:hidden :technical :cruft})
+(def data-sources
+ "Valid values for data source"
+ #{:unknown :ingested :metabase-transform :transform :source-data :upload})
+
+(def data-layers
+ "Valid values for `Table.data_layer`.
+ :gold - highest quality, fully visible, synced
+ :silver - high quality, visible, synced
+ :bronze - acceptable quality, visible, synced
+ :copper - low quality, hidden, not synced"
+ #{:gold :silver :bronze :copper})
+
+(defn- visibility-type->data-layer
+ "Convert legacy visibility_type to data_layer.
+ Used when updating via the legacy field."
+ [visibility-type]
+ (if (contains? #{:hidden :retired :sensitive :technical :cruft} visibility-type)
+ :copper
+ :gold))
+
+(defn- data-layer->visibility-type
+ "Convert data_layer back to legacy visibility_type.
+ Used for rollback compatibility to v56."
+ [data-layer]
+ (case data-layer
+ :copper :hidden
+ ;; gold, silver, bronze all map to visible (nil)
+ nil))
+
(def field-orderings
"Valid values for `Table.field_order`.
`:database` - use the same order as in the table definition in the DB;
@@ -82,7 +114,9 @@
(t2/deftransforms :model/Table
{:entity_type mi/transform-keyword
:visibility_type mi/transform-keyword
+ :data_layer (mi/transform-validator mi/transform-keyword (partial mi/assert-optional-enum data-layers))
:field_order mi/transform-keyword
+ :data_source (mi/transform-validator mi/transform-keyword (partial mi/assert-optional-enum data-sources))
;; Warning: by using a transform to handle unexpected enum values, serialization becomes lossy
:data_authority transform-data-authority})
@@ -94,10 +128,39 @@
[table]
(dissoc table :is_defective_duplicate :unique_table_helper))
+(defn- sync-visibility-fields
+ "Sync visibility_type and data_layer fields, ensuring only one is updated at a time.
+ Returns updated changes map with both fields in sync for rollback compatibility."
+ [{:keys [visibility_type data_layer] :as changes}
+ {original-v1 :visibility_type, original-v2 :data_layer}]
+ (let [v1-changing? (and (contains? changes :visibility_type)
+ (not= (keyword visibility_type)
+ (keyword original-v1)))
+ v2-changing? (and (contains? changes :data_layer)
+ (not= (keyword data_layer)
+ (keyword original-v2)))]
+ (cond
+ ;; Error: don't allow updating both at once
+ (and v1-changing? v2-changing?)
+ (throw (ex-info "Cannot update both visibility_type and data_layer"
+ {:status-code 400}))
+
+ ;; Legacy field update -> convert to new field and sync back
+ v1-changing?
+ (assoc changes :data_layer (visibility-type->data-layer (keyword visibility_type)))
+
+ ;; New field update -> sync back to legacy field for rollback
+ v2-changing?
+ (assoc changes :visibility_type
+ (data-layer->visibility-type (keyword data_layer)))
+
+ :else changes)))
+
(t2/define-before-insert :model/Table
[table]
(let [defaults {:display_name (humanization/name->human-readable-name (:name table))
- :field_order (driver/default-field-order (t2/select-one-fn :engine :model/Database :id (:db_id table)))}]
+ :field_order (driver/default-field-order (t2/select-one-fn :engine :model/Database :id (:db_id table)))
+ :data_layer :bronze}]
(merge defaults table)))
(t2/define-before-delete :model/Table
@@ -119,18 +182,33 @@
(throw (ex-info "Cannot set data_authority back to unconfigured once it has been configured"
{:status-code 400})))
- (cond
- ;; active: true -> false (table being deactivated)
- (and (true? current-active) (false? new-active))
- (assoc changes :deactivated_at (mi/now))
-
- ;; active: false -> true (table being reactivated)
- (and (false? current-active) (true? new-active))
- (assoc changes
- :deactivated_at nil
- :archived_at nil)
-
- :else table)))
+ ;; Prevent changing data_source to/from metabase-transform
+ (when (contains? changes :data_source)
+ (let [original-data-source (:data_source original-table)
+ new-data-source (:data_source changes)]
+ (when (and (= original-data-source :metabase-transform)
+ (not= new-data-source :metabase-transform))
+ (throw (ex-info "Cannot change data_source from metabase-transform"
+ {:status-code 400})))
+ (when (and (not= original-data-source :metabase-transform)
+ (= new-data-source :metabase-transform))
+ (throw (ex-info "Cannot set data_source to metabase-transform"
+ {:status-code 400})))))
+
+ ;; Sync visibility_type and data_layer fields
+ (let [changes (sync-visibility-fields changes original-table)]
+ (cond
+ ;; active: true -> false (table being deactivated)
+ (and (true? current-active) (false? new-active))
+ (assoc changes :deactivated_at (mi/now))
+
+ ;; active: false -> true (table being reactivated)
+ (and (false? current-active) (true? new-active))
+ (assoc changes
+ :deactivated_at nil
+ :archived_at nil)
+
+ :else (merge table changes)))))
(defn- set-new-table-permissions!
[table]
@@ -268,6 +346,25 @@
(update-vals (fn [fvs] (->> fvs (map (juxt :field_id :values)) (into {})))))
:id))
+(methodical/defmethod t2/batched-hydrate [:model/Table :transform]
+ "Hydrate transforms that created the tables."
+ [_model k tables]
+ (if config/ee-available?
+ (mi/instances-with-hydrated-data
+ tables k
+ #(let [table-ids (map :id tables)
+ table-id->transform-id (t2/select-fn->fn :from_entity_id :to_entity_id :model/Dependency
+ :from_entity_type "table"
+ :from_entity_id [:in table-ids]
+ :to_entity_type "transform")
+ transform-id->transform (when-let [transform-ids (seq (vals table-id->transform-id))]
+ (t2/select-fn->fn :id identity :model/Transform :id [:in transform-ids]))]
+ (update-vals table-id->transform-id transform-id->transform))
+ :id
+ {:default nil})
+ ;; EE not available, so no transforms
+ tables))
+
(methodical/defmethod t2/batched-hydrate [:model/Table :pk_field]
[_model k tables]
(mi/instances-with-hydrated-data
@@ -327,6 +424,36 @@
[tables]
(with-fields tables))
+(methodical/defmethod t2/batched-hydrate [:model/Table :published_as_model]
+ [_model k tables]
+ (mi/instances-with-hydrated-data
+ tables k
+ (fn []
+ (let [table-ids (map :id tables)
+ published-as-model (t2/select-fn-set :published_table_id [:model/Card :published_table_id]
+ :published_table_id [:in table-ids]
+ :type :model
+ :archived false
+ :archived_directly false)]
+ (u/index-by identity #(contains? published-as-model %) table-ids)))
+ :id
+ {:default nil}))
+
+(methodical/defmethod t2/batched-hydrate [:model/Table :published_models]
+ [_model k tables]
+ (mi/instances-with-hydrated-data
+ tables k
+ (fn []
+ (let [table-ids (map :id tables)
+ models (t2/select :model/Card
+ :published_table_id [:in table-ids]
+ :type :model
+ :archived false
+ :archived_directly false)]
+ (group-by :published_table_id models)))
+ :id
+ {:default nil}))
+
;;; ------------------------------------------------ Convenience Fns -------------------------------------------------
(defn database
@@ -360,11 +487,13 @@
(defmethod serdes/make-spec "Table" [_model-name _opts]
{:copy [:name :description :entity_type :active :display_name :visibility_type :schema
:points_of_interest :caveats :show_in_getting_started :field_order :initial_sync_status :is_upload
- :database_require_filter :is_defective_duplicate :unique_table_helper :is_writable :data_authority]
+ :database_require_filter :is_defective_duplicate :unique_table_helper :is_writable :data_authority
+ :data_source :owner_email :owner_user_id]
:skip [:estimated_row_count :view_count]
:transform {:created_at (serdes/date)
:archived_at (serdes/date)
:deactivated_at (serdes/date)
+ :data_layer (serdes/optional-kw)
:db_id (serdes/fk :model/Database :name)}})
(defmethod serdes/storage-path "Table" [table _ctx]
diff --git a/src/metabase/warehouse_schema/table.clj b/src/metabase/warehouse_schema/table.clj
index 7d61a985a17..d9c497934eb 100644
--- a/src/metabase/warehouse_schema/table.clj
+++ b/src/metabase/warehouse_schema/table.clj
@@ -3,7 +3,7 @@
[medley.core :as m]
[metabase.api.common :as api]
[metabase.models.interface :as mi]
- [metabase.premium-features.core :refer [defenterprise]]
+ [metabase.premium-features.core :as premium-features :refer [defenterprise]]
[metabase.util :as u]
[metabase.warehouse-schema.models.field-values :as field-values]
[toucan2.core :as t2]))
@@ -32,16 +32,19 @@
(if include-editable-data-model?
(api/write-check table)
(api/read-check table))
- (-> table
- (t2/hydrate :db [:fields [:target :has_field_values] :has_field_values :dimensions :name_field] :segments :metrics)
- (m/dissoc-in [:db :details])
- format-fields-for-response
- present-table
- (update :fields (partial filter (fn [{visibility-type :visibility_type}]
- (case (keyword visibility-type)
- :hidden include-hidden-fields?
- :sensitive include-sensitive-fields?
- true))))))
+ (let [hydration-keys (cond-> [:db [:fields [:target :has_field_values] :has_field_values :dimensions :name_field] :segments :metrics]
+ (premium-features/has-feature? :transforms) (conj :transform)
+ api/*is-superuser?* (conj :published_models))]
+ (-> table
+ (#(apply t2/hydrate % hydration-keys))
+ (m/dissoc-in [:db :details])
+ format-fields-for-response
+ present-table
+ (update :fields (partial filter (fn [{visibility-type :visibility_type}]
+ (case (keyword visibility-type)
+ :hidden include-hidden-fields?
+ :sensitive include-sensitive-fields?
+ true)))))))
(defn batch-fetch-query-metadatas*
"Returns the query metadata used to power the Query Builder for the `table`s specified by `ids`."
diff --git a/src/metabase/warehouse_schema_rest/api/table.clj b/src/metabase/warehouse_schema_rest/api/table.clj
index f95a820e384..54df9abb61c 100644
--- a/src/metabase/warehouse_schema_rest/api/table.clj
+++ b/src/metabase/warehouse_schema_rest/api/table.clj
@@ -2,8 +2,10 @@
"/api/table endpoints."
(:require
[clojure.java.io :as io]
+ [clojure.string :as str]
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
+ [metabase.app-db.core :as app-db]
[metabase.database-routing.core :as database-routing]
[metabase.driver.settings :as driver.settings]
[metabase.driver.util :as driver.u]
@@ -12,9 +14,11 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.models.interface :as mi]
+ [metabase.premium-features.core :as premium-features]
[metabase.query-processor :as qp]
;; legacy usage -- don't do things like this going forward
- ^{:clj-kondo/ignore [:deprecated-namespace :discouraged-namespace]} [metabase.query-processor.store :as qp.store]
+ ^{:clj-kondo/ignore [:deprecated-namespace :discouraged-namespace]}
+ [metabase.query-processor.store :as qp.store]
[metabase.query-processor.streaming :as qp.streaming]
[metabase.request.core :as request]
[metabase.sync.core :as sync]
@@ -45,20 +49,55 @@
(mr/def ::data-authority-write
"Schema for writing a valid table data authority."
- (into [:enum] (map name table/writable-data-authority-types)))
+ (into [:enum {:decode/string keyword}] table/writable-data-authority-types))
(mr/def ::data-authority-read
"Schema for returning a table data authority type."
(into [:enum] table/readable-data-authority-types))
+(mr/def ::data-layers
+ (into [:enum {:decode/string keyword}] table/data-layers))
+
+(mr/def ::data-sources
+ (into [:enum {:decode/string keyword}] table/data-sources))
+
(api.macros/defendpoint :get "/"
"Get all `Tables`."
- []
- (as-> (t2/select :model/Table, :active true, {:order-by [[:name :asc]]}) tables
- (t2/hydrate tables :db)
- (into [] (comp (filter mi/can-read?)
- (map schema.table/present-table))
- tables)))
+ [_
+ {:keys [term visibility-type data-layer data-source owner-user-id owner-email orphan-only unused-only]}
+ :- [:map
+ [:term {:optional true} :string]
+ [:visibility-type {:optional true} :string]
+ [:data-layer {:optional true} ::data-layers]
+ [:data-source {:optional true} ::data-sources]
+ [:owner-user-id {:optional true} [:maybe :int]]
+ [:owner-email {:optional true} :string]
+ [:orphan-only {:optional true} [:maybe ms/BooleanValue]]
+ [:unused-only {:optional true} [:maybe ms/BooleanValue]]]]
+ (let [like (case (app-db/db-type) (:h2 :postgres) :ilike :like)
+ pattern (some-> term (str/replace "*" "%") (cond-> (not (str/ends-with? term "%")) (str "%")))
+ where (cond-> [:and [:= :active true]]
+ (not (str/blank? term)) (conj [like :name pattern])
+ visibility-type (conj [:= :visibility_type visibility-type])
+ data-layer (conj [:= :data_layer (name data-layer)])
+ data-source (conj [:= :data_source (name data-source)])
+ owner-user-id (conj [:= :owner_user_id owner-user-id])
+ owner-email (conj [:= :owner_email owner-email])
+ orphan-only (conj [:and [:= :owner_email nil] [:= :owner_user_id nil]])
+ (and unused-only (premium-features/has-feature? :dependencies))
+ (conj [:not-exists {:select [:*]
+ :from [[:dependency :d]]
+ :where [:and
+ [:= :d.to_entity_id :metabase_table.id]
+ [:= :d.to_entity_type "table"]]}]))
+ query {:where where, :order-by [[:name :asc]]}
+ hydrations (cond-> [:db :published_as_model]
+ (premium-features/has-feature? :transforms) (conj :transform))]
+ (as-> (t2/select :model/Table query) tables
+ (apply t2/hydrate tables hydrations)
+ (into [] (comp (filter mi/can-read?)
+ (map schema.table/present-table))
+ tables))))
;; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest
;; of the REST API
@@ -113,9 +152,14 @@
if field positions have changed."
[{:keys [id] :as existing-table} :- [:map [:id ::lib.schema.id/table]]
body]
- (when-let [changes (not-empty (u/select-keys-when body
- :non-nil [:display_name :show_in_getting_started :entity_type :field_order]
- :present [:description :caveats :points_of_interest :visibility_type :data_authority]))]
+ (when-let [changes (-> body
+ (u/select-keys-when
+ :non-nil [:display_name :show_in_getting_started :entity_type :field_order]
+ :present [:description :caveats :points_of_interest :visibility_type
+ :data_layer :data_authority :data_source :owner_email :owner_user_id])
+ (u/update-some :data_layer keyword)
+ (u/update-some :data_source keyword)
+ not-empty)]
(t2/update! :model/Table id changes))
(let [updated-table (t2/select-one :model/Table :id id)
changed-field-order? (not= (:field_order updated-table) (:field_order existing-table))]
@@ -125,23 +169,25 @@
(t2/hydrate updated-table [:fields [:target :has_field_values] :dimensions :has_field_values]))
updated-table)))
-;; TODO -- this seems like it belongs in the `sync` module... right?
+;; TODO (Cam 2015/01/16) this seems like it belongs in the `sync` module... right?
(defn- sync-unhidden-tables
- "Function to call on newly unhidden tables. Starts a thread to sync all tables."
+ "Function to call on newly unhidden tables. Starts a thread to sync all tables. Groups tables by database to
+ efficiently sync tables from different databases."
[newly-unhidden]
(when (seq newly-unhidden)
(quick-task/submit-task!
(fn []
- (let [database (table/database (first newly-unhidden))]
- ;; it's okay to allow testing H2 connections during sync. We only want to disallow you from testing them for the
- ;; purposes of creating a new H2 database.
- (if (binding [driver.settings/*allow-testing-h2-connections* true]
- (driver.u/can-connect-with-details? (:engine database) (:details database)))
- (doseq [table newly-unhidden]
- (log/info (u/format-color :green "Table '%s' is now visible. Resyncing." (:name table)))
- (sync/sync-table! table))
- (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync unhidden tables"
- (:name database)))))))))
+ (doseq [[db-id tables] (group-by :db_id newly-unhidden)]
+ (let [database (t2/select-one :model/Database db-id)]
+ ;; it's okay to allow testing H2 connections during sync. We only want to disallow you from testing them for the
+ ;; purposes of creating a new H2 database.
+ (if (binding [driver.settings/*allow-testing-h2-connections* true]
+ (driver.u/can-connect-with-details? (:engine database) (:details database)))
+ (doseq [table tables]
+ (log/info (u/format-color :green "Table '%s' is now visible. Resyncing." (:name table)))
+ (sync/sync-table! table))
+ (log/warn (u/format-color :red "Cannot connect to database '%s' in order to sync unhidden tables"
+ (:name database))))))))))
(defn- update-tables!
[ids {:keys [visibility_type] :as body}]
@@ -168,15 +214,21 @@
[:points_of_interest {:optional true} [:maybe :string]]
[:show_in_getting_started {:optional true} [:maybe :boolean]]
[:field_order {:optional true} [:maybe FieldOrder]]
- [:data_authority {:optional true} [:maybe ::data-authority-write]]]]
+ [:data_authority {:optional true} [:maybe ::data-authority-write]]
+ [:data_source {:optional true} [:maybe :string]]
+ [:data_layer {:optional true} [:maybe :string]]
+ [:owner_email {:optional true} [:maybe :string]]
+ [:owner_user_id {:optional true} [:maybe :int]]]]
(first (update-tables! [id] body)))
(api.macros/defendpoint :put "/"
- "Update all `Table` in `ids`."
+ "Update all `Table` in `ids`.
+
+ Deprecated, should use PUT /table/edit from now on."
[_route-params
_query-params
{:keys [ids], :as body} :- [:map
- [:ids [:sequential ms/PositiveInt]]
+ [:ids [:sequential ms/PositiveInt]]
[:display_name {:optional true} [:maybe ms/NonBlankString]]
[:entity_type {:optional true} [:maybe ms/EntityTypeKeywordOrString]]
[:visibility_type {:optional true} [:maybe TableVisibilityType]]
@@ -184,11 +236,13 @@
[:caveats {:optional true} [:maybe :string]]
[:points_of_interest {:optional true} [:maybe :string]]
[:show_in_getting_started {:optional true} [:maybe :boolean]]
- [:data_authority {:optional true} [:maybe ::data-authority-write]]]]
+ [:data_authority {:optional true} [:maybe ::data-authority-write]]
+ [:data_source {:optional true} [:maybe :string]]
+ [:data_layer {:optional true} [:maybe :string]]
+ [:owner_email {:optional true} [:maybe :string]]
+ [:owner_user_id {:optional true} [:maybe :int]]]]
(update-tables! ids body))
-;; TODO (Cam 10/28/25) -- fix this endpoint route to use kebab-case for consistency with the rest of our REST API
-;;
;; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest
;; of the REST API
#_{:clj-kondo/ignore [:metabase/validate-defendpoint-route-uses-kebab-case
@@ -353,6 +407,11 @@
:file (get-in multipart-params ["file" :tempfile])
:action :metabase.upload/replace}))
+(defn- sync-schema-async!
+ [table user-id]
+ (events/publish-event! :event/table-manual-sync {:object table :user-id user-id})
+ (quick-task/submit-task! #(database-routing/with-database-routing-off (sync/sync-table! table))))
+
;; TODO (Cam 10/28/25) -- fix this endpoint route to use kebab-case for consistency with the rest of our REST API
#_{:clj-kondo/ignore [:metabase/validate-defendpoint-route-uses-kebab-case]}
(api.macros/defendpoint :post "/:id/sync_schema"
@@ -361,7 +420,6 @@
[:id ms/PositiveInt]]]
(let [table (api/write-check (t2/select-one :model/Table :id id))
database (api/write-check (warehouses/get-database (:db_id table) {:exclude-uneditable-details? true}))]
- (events/publish-event! :event/table-manual-sync {:object table :user-id api/*current-user-id*})
;; it's okay to allow testing H2 connections during sync. We only want to disallow you from testing them for the
;; purposes of creating a new H2 database.
(if-let [ex (try
@@ -374,5 +432,5 @@
e))]
(throw (ex-info (ex-message ex) {:status-code 422}))
(do
- (quick-task/submit-task! #(database-routing/with-database-routing-off (sync/sync-table! table)))
+ (sync-schema-async! table api/*current-user-id*)
{:status :ok}))))
diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.clj
index e95d9c0a0b6..9a81c59948a 100644
--- a/src/metabase/warehouses_rest/api.clj
+++ b/src/metabase/warehouses_rest/api.clj
@@ -1250,25 +1250,30 @@
(when-not include_editable_data_model
(api/read-check :model/Database db-id)
(api/check-403 (can-read-schema? db-id schema)))
- (let [tables (if include_hidden
- (t2/select :model/Table
- :db_id db-id
- :schema schema
- :active true
- {:order-by [[:display_name :asc]]})
- (t2/select :model/Table
- :db_id db-id
- :schema schema
- :active true
- :visibility_type nil
- {:order-by [[:display_name :asc]]}))]
- (if include_editable_data_model
- (if-let [f (when config/ee-available?
- (classloader/require 'metabase-enterprise.advanced-permissions.common)
- (resolve 'metabase-enterprise.advanced-permissions.common/filter-tables-by-data-model-perms))]
- (f tables)
- tables)
- (filter mi/can-read? tables)))))
+ (let [candidate-tables (if include_hidden
+ (t2/select :model/Table
+ :db_id db-id
+ :schema schema
+ :active true
+ {:order-by [[:display_name :asc]]})
+ (t2/select :model/Table
+ :db_id db-id
+ :schema schema
+ :active true
+ :visibility_type nil
+ {:order-by [[:display_name :asc]]}))
+ filtered-tables (if include_editable_data_model
+ (if-let [f (when config/ee-available?
+ (classloader/require 'metabase-enterprise.advanced-permissions.common)
+ (resolve 'metabase-enterprise.advanced-permissions.common/filter-tables-by-data-model-perms))]
+ (f candidate-tables)
+ candidate-tables)
+ (filter mi/can-read? candidate-tables))
+ hydration-keys (cond-> [:published_as_model]
+ (premium-features/has-feature? :transforms) (conj :transform))]
+ (if (seq hydration-keys)
+ (apply t2/hydrate filtered-tables hydration-keys)
+ filtered-tables))))
;; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest
;; of the REST API
diff --git a/test/metabase/analytics/stats_test.clj b/test/metabase/analytics/stats_test.clj
index 40da59cdaa6..3a0dbb3d49b 100644
--- a/test/metabase/analytics/stats_test.clj
+++ b/test/metabase/analytics/stats_test.clj
@@ -558,6 +558,7 @@
#{:audit-app ;; tracked under :mb-analytics
:collection-cleanup
:development-mode
+ :data-studio
:embedding
:embedding-sdk
:embedding-simple
diff --git a/test/metabase/collections/models/collection_test.clj b/test/metabase/collections/models/collection_test.clj
index 7fe7ae9f2d1..2a40692ce99 100644
--- a/test/metabase/collections/models/collection_test.clj
+++ b/test/metabase/collections/models/collection_test.clj
@@ -6,6 +6,7 @@
[clojure.string :as str]
[clojure.test :refer :all]
[clojure.walk :as walk]
+ [metabase.api.common :as api]
[metabase.audit-app.impl :as audit]
[metabase.collections.models.collection :as collection]
[metabase.models.interface :as mi]
@@ -3307,6 +3308,40 @@
non-archived-dash
non-archived-card]))))))))
+(deftest create-library
+ (mt/with-discard-model-updates! [:model/Collection]
+ (testing "Can create a library if none exist"
+ (t2/update! :model/Collection :type collection/library-collection-type {:type nil})
+ (t2/update! :model/Collection :type collection/library-models-collection-type {:type nil})
+ (t2/update! :model/Collection :type collection/library-metrics-collection-type {:type nil})
+ (let [library (collection/create-library-collection!)]
+ (is (= "Library" (:name library)))
+ (is (= ["Data" "Metrics"] (sort (map :name (collection/descendants library)))))
+ (testing "Only admins can write to the library, all users can read"
+ (binding [api/*current-user* (mt/user->id :rasta)
+ api/*current-user-permissions-set* (-> :rasta mt/user->id perms/user-permissions-set atom)]
+ (is (true? (mi/can-read? library)))
+ (is (false? (mi/can-write? library)))
+ (doseq [sub (collection/descendants library)]
+ (is (true? (mi/can-read? sub)))
+ (is (false? (mi/can-write? sub))))))))
+ (testing "Creating a Layer when one already exists throws an exception"
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Library already exists" (collection/create-library-collection!))))
+ ;;cleanup created libraries
+ (t2/delete! :model/Collection :type [:in [collection/library-collection-type
+ collection/library-models-collection-type
+ collection/library-metrics-collection-type]])))
+
+(deftest is-library-collection?
+ (mt/with-temp [:model/Collection {library-id :id} {:name "Test Library" :type collection/library-collection-type}
+ :model/Collection {models-id :id} {:name "Test Semantic Model Layer" :type collection/library-models-collection-type}
+ :model/Collection {metrics-id :id} {:name "Test Semantic Metrics Layer" :type collection/library-metrics-collection-type}
+ :model/Collection {regular-collection-id :id} {:name "Regular Collection" :type nil}]
+ (testing "Correctly identifies library collections"
+ (is (true? (collection/is-library-collection? library-id)))
+ (is (true? (collection/is-library-collection? models-id)))
+ (is (true? (collection/is-library-collection? metrics-id)))
+ (is (false? (collection/is-library-collection? regular-collection-id))))))
(deftest insert-sets-remote-sync-test
(mt/with-model-cleanup [:model/Collection]
(let [collection (t2/insert-returning-instance! :model/Collection
diff --git a/test/metabase/collections/test_helpers.clj b/test/metabase/collections/test_helpers.clj
new file mode 100644
index 00000000000..8556a56ee4b
--- /dev/null
+++ b/test/metabase/collections/test_helpers.clj
@@ -0,0 +1,39 @@
+(ns metabase.collections.test-helpers
+ "Test utilities and macros for collection-related tests."
+ (:require
+ [metabase.collections.models.collection :as collection]
+ [toucan2.core :as t2]))
+
+(defmacro without-library
+ "Macro that clears existing library collections, executes body, then cleans up any created library collections.
+
+ This is useful for tests that need to work with library collections in isolation without
+ interference from any existing library collections in the test database.
+
+ Example:
+ ```clojure
+ (without-library
+ (let [lib (collection/create-library-collection!)]
+ ...))
+ ```"
+ [& body]
+ `(do
+ ;; Clear existing library collections
+ (t2/update! (t2/table-name :model/Collection)
+ :type collection/library-collection-type
+ {:type nil})
+ (t2/update! (t2/table-name :model/Collection)
+ :type collection/library-models-collection-type
+ {:type nil})
+ (t2/update! (t2/table-name :model/Collection)
+ :type collection/library-metrics-collection-type
+ {:type nil})
+
+ (try
+ ~@body
+ (finally
+ ;; Clean up any created library collections
+ (t2/delete! :model/Collection
+ :type [:in [collection/library-collection-type
+ collection/library-models-collection-type
+ collection/library-metrics-collection-type]])))))
diff --git a/test/metabase/collections_rest/api_test.clj b/test/metabase/collections_rest/api_test.clj
index a58753fdc4f..dea648921da 100644
--- a/test/metabase/collections_rest/api_test.clj
+++ b/test/metabase/collections_rest/api_test.clj
@@ -7,6 +7,7 @@
[metabase.collections-rest.api :as api.collection]
[metabase.collections.models.collection :as collection]
[metabase.collections.models.collection-test :as collection-test]
+ [metabase.collections.test-helpers :refer [without-library]]
[metabase.notification.api.notification-test :as api.notification-test]
[metabase.notification.test-util :as notification.tu]
[metabase.permissions.core :as perms]
@@ -80,7 +81,8 @@
(assoc (into {:is_personal false} collection)
:can_write true
:can_delete false
- :is_remote_synced false)]
+ :is_remote_synced false
+ :parent_id nil)]
(filter #(#{(:id collection) "root"} (:id %))
(mt/user-http-request :crowberto :get 200 "collection"))))))))
@@ -532,6 +534,32 @@
(select-keys collection [:name :children]))))
(mt/user-http-request :rasta :get 200 "collection/tree"))))))))
+(defn- flatten-tree-types
+ "Extract all collection types from a tree structure, including nested children."
+ [collections]
+ (mapcat (fn [collection]
+ (cons (:type collection)
+ (when-let [children (:children collection)]
+ (flatten-tree-types children))))
+ collections))
+
+(deftest collection-tree-library-test
+ (testing "GET /api/collection/tree"
+ (without-library
+ (let [_ (collection/create-library-collection!)]
+ (testing "By default it does not include library items"
+ (let [response (mt/user-http-request :rasta :get 200 "collection/tree")
+ all-types (flatten-tree-types response)]
+ (is (not-any? #{collection/library-collection-type} all-types))
+ (is (not-any? #{collection/library-metrics-collection-type} all-types))
+ (is (not-any? #{collection/library-models-collection-type} all-types))))
+ (testing "Can choose to include include library items"
+ (let [response (mt/user-http-request :rasta :get 200 "collection/tree" :include-library true)
+ all-types (flatten-tree-types response)]
+ (is (some #{collection/library-collection-type} all-types))
+ (is (some #{collection/library-metrics-collection-type} all-types))
+ (is (some #{collection/library-models-collection-type} all-types))))))))
+
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | GET /collection/:id |
;;; +----------------------------------------------------------------------------------------------------------------+
@@ -1542,6 +1570,19 @@
remove-non-personal-collections
mt/boolean-ids-and-timestamps)))))))
+(deftest collection-root-items-library-test
+ (testing "GET /api/collection/root/items"
+ (without-library
+ (let [_ (collection/create-library-collection!)]
+ (testing "By default it does not include library items"
+ (let [response (mt/user-http-request :rasta :get 200 "collection/root/items")
+ all-types (map :type (:data response))]
+ (is (not-any? #{collection/library-collection-type} all-types))))
+ (testing "Can choose to include include library items"
+ (let [response (mt/user-http-request :rasta :get 200 "collection/root/items" :include_library true)
+ all-types (map :type (:data response))]
+ (is (some #{collection/library-collection-type} all-types))))))))
+
(deftest dashboard-question-candidates-simple-test
(testing "GET /api/collection/:id/dashboard-question-candidates"
(testing "Card is in single dashboard"
diff --git a/test/metabase/pulse/send_test.clj b/test/metabase/pulse/send_test.clj
index 8b280e0a8b1..763b70b994c 100644
--- a/test/metabase/pulse/send_test.clj
+++ b/test/metabase/pulse/send_test.clj
@@ -573,10 +573,10 @@
(with-pulse-for-card [{pulse-id :id} {:card card-id, :pulse {:alert_condition "goal"
:alert_first_only false
:alert_above_goal true}}]
- (let [channel-messsages (pulse.test-util/with-captured-channel-send-messages!
- (pulse.send/send-pulse! (models.pulse/retrieve-notification pulse-id)))]
+ (let [channel-messages (pulse.test-util/with-captured-channel-send-messages!
+ (pulse.send/send-pulse! (models.pulse/retrieve-notification pulse-id)))]
(is (= (rasta-alert-message {:subject "Alert: Test card has reached its goal"})
- (mt/summarize-multipart-single-email (-> channel-messsages :channel/email first) test-card-regex))))))))
+ (mt/summarize-multipart-single-email (-> channel-messages :channel/email first) test-card-regex))))))))
(deftest nonuser-email-test
(testing "Both users and Nonusers get an email, with unsubscribe text for nonusers"
diff --git a/test/metabase/revisions/impl/card_test.clj b/test/metabase/revisions/impl/card_test.clj
index f54990d8fb2..e37c9027f0c 100644
--- a/test/metabase/revisions/impl/card_test.clj
+++ b/test/metabase/revisions/impl/card_test.clj
@@ -126,7 +126,7 @@
(is (= 1 (t2/count :model/Revision :model "Card" :model_id (:id card)))))
(when-not (#{;; these columns are expected to not have a description because it's always
;; comes with a dataset_query changes
- :table_id :database_id :query_type :source_card_id
+ :table_id :database_id :query_type :source_card_id :published_table_id
;; we don't need a description for made_public_by_id because whenever this field changes
;; public_uuid will change and we have a description for it.
:made_public_by_id
diff --git a/test/metabase/search/api_test.clj b/test/metabase/search/api_test.clj
index 6e97cfbc5ec..f5a8a92c999 100644
--- a/test/metabase/search/api_test.clj
+++ b/test/metabase/search/api_test.clj
@@ -1881,3 +1881,52 @@
(is (not (some #{card-id}
(mapv :id (:data search-results))))
"Card should not be found in search results after database deletion")))))))
+
+(deftest collection-filter-test
+ (mt/with-temp
+ [:model/Collection {parent-coll :id} {:name "Parent Collection"
+ :location "/"}
+ :model/Collection {child-coll :id} {:name "Child Collection"
+ :location (collection/location-path parent-coll)}
+ :model/Collection {grandchild-coll :id} {:name "Grandchild Collection"
+ :location (collection/location-path parent-coll child-coll)}
+ :model/Card {parent-card :id} {:collection_id parent-coll :name "Parent Card"}
+ :model/Card {child-card :id} {:collection_id child-coll :name "Child Card"}
+ :model/Card {grandchild-card :id} {:collection_id grandchild-coll :name "Grandchild Card"}
+ :model/Dashboard {parent-dash :id} {:collection_id parent-coll :name "Parent Dashboard"}
+ :model/Card {other-card :id} {:collection_id nil :name "No Collection Card"}]
+ (testing "Filter by parent collection returns parent and all descendants"
+ (let [results (mt/user-http-request :crowberto :get 200 "search" :collection parent-coll)]
+ (is (= #{parent-card parent-dash child-card grandchild-card parent-coll child-coll grandchild-coll}
+ (set (map :id (:data results)))))))
+
+ (testing "Filter by child collection returns child and descendants only"
+ (let [results (mt/user-http-request :crowberto :get 200 "search" :collection child-coll)]
+ (is (= #{child-card grandchild-card child-coll grandchild-coll}
+ (set (map :id (:data results)))))))
+
+ (testing "Filter by leaf collection returns only that collection's items"
+ (let [results (mt/user-http-request :crowberto :get 200 "search" :collection grandchild-coll)]
+ (is (= #{grandchild-card grandchild-coll}
+ (set (map :id (:data results)))))))
+
+ (testing "Filter by non-existent collection returns no results"
+ (let [results (mt/user-http-request :crowberto :get 200 "search" :collection 99999)]
+ (is (empty? (:data results)))))
+
+ (testing "Items with no collection are not included when filtering by collection"
+ (let [results (mt/user-http-request :crowberto :get 200 "search" :collection parent-coll)]
+ (is (not (some #{other-card} (map :id (:data results)))))))))
+
+(deftest collection-filter-with-search-string-test
+ (mt/with-temp
+ [:model/Collection {coll-1 :id} {:name "Collection 1"}
+ :model/Collection _ {:name "Collection 2"}
+ :model/Card {card-1 :id} {:collection_id coll-1 :name "Test Card"}
+ :model/Card _ {:collection_id coll-1 :name "Other Card"}]
+ (testing "Search string filters results within the specified collection"
+ (let [results (mt/user-http-request :crowberto :get 200 "search"
+ :q "Test"
+ :collection coll-1)]
+ (is (= #{card-1}
+ (set (map :id (:data results)))))))))
diff --git a/test/metabase/search/filter_test.clj b/test/metabase/search/filter_test.clj
index 3219390ed7d..6f15bdd5511 100644
--- a/test/metabase/search/filter_test.clj
+++ b/test/metabase/search/filter_test.clj
@@ -6,7 +6,12 @@
[metabase.models.resolution]
[metabase.search.config :as search.config]
[metabase.search.filter :as search.filter]
- [metabase.search.in-place.filter :as search.in-place.filter]))
+ [metabase.search.in-place.filter :as search.in-place.filter]
+ [metabase.search.ingestion :as search.ingestion]
+ [metabase.search.test-util :as search.tu]))
+
+(use-fixtures :each (fn [thunk] (binding [search.ingestion/*force-sync* true]
+ (search.tu/with-new-search-if-available (thunk)))))
(defn- filter-keys []
(remove #{:ids} (map :context-key (vals search.config/filters))))
@@ -78,6 +83,7 @@
(def kitchen-sink-filter-context
{:archived? true
+ :collection 5
:created-at "2024-10-01"
:created-by [123]
:include-dashboard-questions? true
@@ -134,6 +140,7 @@
[:in :search_index.last_editor_id [321]]
[:= :search_index.non_temporal_dim_ids "[1]"]
[:= :search_index.has_temporal_dim true]
- [:in :search_index.display_type ["line"]]}}
+ [:in :search_index.display_type ["line"]]
+ [:or [:= :search_index.collection_id 5] [:like :collection.location "%/5/%"]]}}
(-> (search.filter/with-filters kitchen-sink-filter-context {:select [:some :stuff], :from :somewhere})
(update :where set))))))
diff --git a/test/metabase/sync/sync_test.clj b/test/metabase/sync/sync_test.clj
index 0963c360c9d..7a34994214a 100644
--- a/test/metabase/sync/sync_test.clj
+++ b/test/metabase/sync/sync_test.clj
@@ -125,7 +125,8 @@
:id true
:archived_at false
:deactivated_at false
- :updated_at true}))
+ :updated_at true
+ :owner_user_id false}))
(defn- field-defaults []
(merge
diff --git a/test/metabase/warehouse_schema/models/table_test.clj b/test/metabase/warehouse_schema/models/table_test.clj
index 6990016318a..9a0b0d2c840 100644
--- a/test/metabase/warehouse_schema/models/table_test.clj
+++ b/test/metabase/warehouse_schema/models/table_test.clj
@@ -365,3 +365,57 @@
(is (= #{table-id-1 table-id-2 table-id-3}
(fetch-visible-ids user-info permission-map :id))
"Clause should filter correctly when requiring :blocked level")))))))
+
+(deftest prevent-metabase-transform-data-source-change-test
+ (testing "Cannot change data_source from metabase-transform"
+ (mt/with-temp [:model/Table {table-id :id} {:data_source :metabase-transform}]
+ (testing "to another value"
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"Cannot change data_source from metabase-transform"
+ (t2/update! :model/Table table-id {:data_source :transform}))))
+ (testing "to nil"
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"Cannot change data_source from metabase-transform"
+ (t2/update! :model/Table table-id {:data_source nil}))))))
+
+ (testing "Cannot change data_source to metabase-transform"
+ (mt/with-temp [:model/Table {table-id :id} {:data_source :ingested}]
+ (testing "from another value"
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"Cannot set data_source to metabase-transform"
+ (t2/update! :model/Table table-id {:data_source :metabase-transform}))))
+ (testing "but can change to other non-metabase-transform values"
+ (is (some? (t2/update! :model/Table table-id {:data_source :ingested})))
+ (is (= :ingested (t2/select-one-fn :data_source :model/Table :id table-id))))
+ (testing "can also change it to nil"
+ (is (some? (t2/update! :model/Table table-id {:data_source nil})))
+ (is (nil? (t2/select-one-fn :data_source :model/Table :id table-id)))))))
+
+(deftest published-as-model-test
+ (testing "hydrating :published_as_model"
+ (mt/with-temp [:model/Table {t1 :id :as table1} {}
+ :model/Table {t2 :id :as table2} {}
+ :model/Card {_c1 :id} {:type :model :published_table_id t1}
+ :model/Card {_c2 :id} {:type :model :published_table_id t1 :archived true}
+ :model/Card {_c3 :id} {:type :model :published_table_id t1}
+ :model/Card {_c4 :id} {:type :model :published_table_id t2 :archived_directly true}
+ :model/Card {_c5 :id} {:type :metric :published_table_id t2}]
+ (is (= {t1 true, t2 false}
+ (->> (t2/hydrate [table1 table2] :published_as_model)
+ (u/index-by :id :published_as_model)))))))
+
+(deftest published-models-test
+ (testing "hydrating :published_models"
+ (mt/with-temp [:model/Table {t1 :id :as table1} {}
+ :model/Table {t2 :id :as table2} {}
+ :model/Card {c1 :id} {:type :model :published_table_id t1}
+ :model/Card {_c2 :id} {:type :model :published_table_id t1 :archived true}
+ :model/Card {c3 :id} {:type :model :published_table_id t1}
+ :model/Card {_c4 :id} {:type :model :published_table_id t2 :archived_directly true}
+ :model/Card {_c5 :id} {:type :metric :published_table_id t2}]
+ (is (= {t1 [c1 c3], t2 []}
+ (->> (t2/hydrate [table1 table2] :published_models)
+ (u/index-by :id (comp (partial mapv :id) :published_models))))))))
diff --git a/test/metabase/warehouse_schema_rest/api/table_test.clj b/test/metabase/warehouse_schema_rest/api/table_test.clj
index 06a3b246c12..2b33d83c6ce 100644
--- a/test/metabase/warehouse_schema_rest/api/table_test.clj
+++ b/test/metabase/warehouse_schema_rest/api/table_test.clj
@@ -5,12 +5,14 @@
[clojure.test :refer :all]
[metabase.api.response :as api.response]
[metabase.api.test-util :as api.test-util]
+ [metabase.app-db.core :as mdb]
[metabase.driver :as driver]
[metabase.driver.util :as driver.u]
[metabase.events.core :as events]
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
+ [metabase.sync.core :as sync]
[metabase.test :as mt]
[metabase.test.http-client :as client]
[metabase.upload.impl-test :as upload-test]
@@ -57,7 +59,9 @@
(table-defaults (or driver/*driver* :h2)))
([driver]
(merge
- (update (mt/object-defaults :model/Table) :data_authority name)
+ (-> (mt/object-defaults :model/Table)
+ (update :data_authority name)
+ (update :data_layer name))
{:db (db-details)
:db_id (mt/id)
:entity_type "entity/GenericTable"
@@ -126,7 +130,7 @@
(map #(select-keys % [:name :display_name :id :entity_type]))
set))))))
-(deftest ^:parallel list-table-test-2
+(deftest list-table-test-2
(testing "GET /api/table"
(testing "Schema is \"\" rather than nil, if not set"
(mt/with-temp [:model/Database {database-id :id} {}
@@ -405,9 +409,12 @@
(testing "PUT /api/table/:id"
(mt/with-temp [:model/Table table]
(mt/user-http-request :crowberto :put 200 (format "table/%d" (u/the-id table))
- {:display_name "Userz"
- :visibility_type "hidden"
- :description "What a nice table!"})
+ {:display_name "Userz"
+ :description "What a nice table!"
+ :data_source "transform"
+ :data_layer "copper"
+ :owner_email "[email protected]"
+ :owner_user_id (mt/user->id :crowberto)})
(is (= (merge
(-> (table-defaults)
(dissoc :segments :field_values :metrics :updated_at)
@@ -418,7 +425,12 @@
:schema ""
:visibility_type "hidden"
:display_name "Userz"
- :is_writable nil})
+ :is_writable nil
+ :data_source "transform"
+ :data_layer "copper"
+ ;; exclusive later (not now)
+ :owner_email "[email protected]"
+ :owner_user_id (mt/user->id :crowberto)})
(dissoc (mt/user-http-request :crowberto :get 200 (format "table/%d" (u/the-id table)))
:updated_at))))))
@@ -1154,21 +1166,150 @@
(is (= "You don't have permissions to do that."
(mt/user-http-request :rasta :post 403 (format "table/%d/sync_schema" (u/the-id table))))))))
-;; The following are commented out temporarily due to starburst failures
-#_(defn- deliver-when-tbl [promise-to-deliver expected-tbl]
- (fn [tbl]
- (when (= (u/the-id tbl) (u/the-id expected-tbl))
- (deliver promise-to-deliver true))))
-
-#_(deftest trigger-metadata-sync-for-table-test
- (testing "Can we trigger a metadata sync for a table?"
- (let [sync-called? (promise)
- timeout (* 10 60)]
- (mt/with-premium-features #{:audit-app}
- (mt/with-temp [:model/Database {db-id :id} {:engine "h2", :details (:details (mt/db))}
- :model/Table table {:db_id db-id :schema "PUBLIC"}]
- (with-redefs [sync/sync-table! (deliver-when-tbl sync-called? table)]
- (mt/user-http-request :crowberto :post 200 (format "table/%d/sync_schema" (u/the-id table))))))
- (testing "sync called?"
- (is (true?
- (deref sync-called? timeout :sync-never-called)))))))
+(defn- deliver-when-tbl [promise-to-deliver expected-tbl]
+ (fn [tbl]
+ (when (= (u/the-id tbl) (u/the-id expected-tbl))
+ (deliver promise-to-deliver true))))
+
+(deftest trigger-metadata-sync-for-table-test
+ (testing "Can we trigger a metadata sync for a table?"
+ (let [sync-called? (promise)
+ timeout (* 10 60)]
+ (mt/with-premium-features #{:audit-app}
+ (mt/with-temp [:model/Database {db-id :id} {:engine "h2", :details (:details (mt/db))}
+ :model/Table table {:db_id db-id :schema "PUBLIC"}]
+ (with-redefs [sync/sync-table! (deliver-when-tbl sync-called? table)]
+ (mt/user-http-request :crowberto :post 200 (format "table/%d/sync_schema" (u/the-id table))))))
+ (testing "sync called?"
+ (is (true?
+ (deref sync-called? timeout :sync-never-called)))))))
+
+;; DEMOWARE bulk-editing APIS
+(deftest ^:parallel list-table-filtering-test
+ (testing "term filtering"
+
+ (is (=? [{:display_name "Users"}]
+ (->> (mt/user-http-request :crowberto :get 200 "table" :term (if (contains? #{:mysql :mariadb} (mdb/db-type)) "USE" "Use"))
+ (filter #(= (:db_id %) (mt/id))) ; prevent stray tables from affecting unit test results
+ (map #(select-keys % [:display_name])))))
+
+ (testing "wildcard"
+ (is (=? [{:display_name "Users"}]
+ (->> (mt/user-http-request :crowberto :get 200 "table" :term (if (contains? #{:mysql :mariadb} (mdb/db-type)) "*S*RS" "*S*rs"))
+ (filter #(= (:db_id %) (mt/id))) ; prevent stray tables from affecting unit test results1
+ (map #(select-keys % [:display_name])))))))
+ (testing "filter composition"
+ (mt/with-temp [:model/Table {products2-id :id} {:name "PrOdUcTs2"
+ :display_name "Products2"
+ :db_id (mt/id)
+ :active true}]
+ (is (=? [{:display_name "People"}
+ {:display_name "Products"}
+ {:display_name "Products2"}]
+ (->> (mt/user-http-request :crowberto :get 200 "table" :term "P")
+ (filter #(= (:db_id %) (mt/id))) ; prevent stray tables from affecting unit test results
+ (map #(select-keys % [:display_name])))))
+
+ (mt/user-http-request :crowberto :put 200 (format "table/%d" products2-id) {:data_layer "gold"})
+ (is (=? [{:display_name "Products2"}]
+ (->> (mt/user-http-request :crowberto :get 200 "table" :term "P" :data-layer "gold")
+ (filter #(= (:db_id %) (mt/id))) ; prevent stray tables from affecting unit test results
+ (map #(select-keys % [:display_name])))))
+
+ (testing "empty filter"
+ (is (=? [{:display_name "People"}
+ {:display_name "Products"}]
+ (->> (mt/user-http-request :crowberto :get 200 "table" :term "P" :data-layer "bronze")
+ (filter #(= (:db_id %) (mt/id))) ; prevent stray tables from affecting unit test results
+ (map #(select-keys % [:display_name])))))))))
+
+(deftest ^:parallel update-table-visibility-sync-test
+ (testing "PUT /api/table/:id visibility field synchronization"
+ (mt/with-temp [:model/Table table {}]
+ (testing "updating visibility_type syncs to data_layer"
+ (mt/user-http-request :crowberto :put 200 (format "table/%d" (u/the-id table))
+ {:visibility_type "hidden"})
+ (is (= :copper (t2/select-one-fn :data_layer :model/Table :id (u/the-id table))))
+ (is (= :hidden (t2/select-one-fn :visibility_type :model/Table :id (u/the-id table)))))
+
+ (testing "updating data_layer syncs to visibility_type"
+ (mt/user-http-request :crowberto :put 200 (format "table/%d" (u/the-id table))
+ {:data_layer "gold"})
+ (is (= :gold (t2/select-one-fn :data_layer :model/Table :id (u/the-id table))))
+ (is (= nil (t2/select-one-fn :visibility_type :model/Table :id (u/the-id table)))))
+
+ (testing "cannot update both visibility_type and data_layer at once"
+ (is (= "Cannot update both visibility_type and data_layer"
+ (mt/user-http-request :crowberto :put 400 (format "table/%d" (u/the-id table))
+ {:visibility_type "hidden"
+ :data_layer "copper"})))))))
+
+(deftest unused-only-filter-test
+ (mt/with-premium-features #{:dependencies}
+ (testing "GET /api/table?unused-only=true"
+ (testing "filters tables that have no non-transform dependents"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {table-1-id :id} {:db_id db-id, :name "table_1", :active true}
+ :model/Table {table-2-id :id} {:db_id db-id, :name "table_2", :active true}]
+ (testing "both tables returned without filter"
+ (is (= #{table-1-id table-2-id}
+ (->> (mt/user-http-request :crowberto :get 200 "table")
+ (filter #(= (:db_id %) db-id))
+ (map :id)
+ set))))
+
+ (testing "both tables returned with unused_only=false"
+ (is (= #{table-1-id table-2-id}
+ (->> (mt/user-http-request :crowberto :get 200 "table" :unused-only false)
+ (filter #(= (:db_id %) db-id))
+ (map :id)
+ set))))
+
+ (mt/with-temp [:model/Card card {:database_id db-id
+ :table_id table-1-id
+ :dataset_query {:database db-id
+ :type :query
+ :query {:source-table table-1-id}}}]
+ (events/publish-event! :event/card-create {:object card :user-id (:creator_id card)})
+ (testing "after creating card that depends on table-1, only table-2 is unuseded"
+ (is (= #{table-2-id}
+ (->> (mt/user-http-request :crowberto :get 200 "table" :unused-only true)
+ (filter #(= (:db_id %) db-id))
+ (map :id)
+ set))))))))))
+
+(deftest orphan-only-filter-test
+ (testing "GET /api/table?orphan-only=true"
+ (testing "filters tables that have no owner"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/User {user-id :id} {:email "[email protected]"}
+ :model/Table {table-1-id :id} {:db_id db-id
+ :name "table_1"
+ :active true
+ :owner_user_id user-id
+ :owner_email "[email protected]"}
+ :model/Table {table-2-id :id} {:db_id db-id
+ :name "table_2"
+ :active true
+ :owner_user_id nil
+ :owner_email nil}]
+ (testing "both tables returned without filter"
+ (is (= #{table-1-id table-2-id}
+ (->> (mt/user-http-request :crowberto :get 200 "table")
+ (filter #(= (:db_id %) db-id))
+ (map :id)
+ set))))
+
+ (testing "both tables returned with orphan-only=false"
+ (is (= #{table-1-id table-2-id}
+ (->> (mt/user-http-request :crowberto :get 200 "table" :orphan-only false)
+ (filter #(= (:db_id %) db-id))
+ (map :id)
+ set))))
+
+ (testing "only table-2 is returned with orphan-only=true"
+ (is (= #{table-2-id}
+ (->> (mt/user-http-request :crowberto :get 200 "table" :orphan-only true)
+ (filter #(= (:db_id %) db-id))
+ (map :id)
+ set))))))))
diff --git a/test/metabase/warehouses_rest/api_test.clj b/test/metabase/warehouses_rest/api_test.clj
index 7ec7afb9930..4f4803e2008 100644
--- a/test/metabase/warehouses_rest/api_test.clj
+++ b/test/metabase/warehouses_rest/api_test.clj
@@ -673,6 +673,7 @@
:display_name "Categories"
:entity_type "entity/GenericTable"
:initial_sync_status "complete"
+ :data_layer "copper"
:fields [(merge
(field-details (t2/select-one :model/Field :id (mt/id :categories :id)))
{:table_id (mt/id :categories)
diff --git a/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml b/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml
index 9ee2d3b764d..3796de47aaf 100644
--- a/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml
+++ b/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,8 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-document_id: FLTBqagEX0mNl33ZZvFDa
-metabase_version: v0.55.1-SNAPSHOT (29786d3)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/documents/FLTBqagEX0mNl33ZZvFDa_test_document.yaml b/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/documents/FLTBqagEX0mNl33ZZvFDa_test_document.yaml
index 9caf7008f92..b323df792c5 100644
--- a/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/documents/FLTBqagEX0mNl33ZZvFDa_test_document.yaml
+++ b/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/documents/FLTBqagEX0mNl33ZZvFDa_test_document.yaml
@@ -1,6 +1,7 @@
archived: false
archived_directly: false
collection_id: JS5JHDitDkWEtTt1-N7zr
+collection_position: null
content_type: application/json+vnd.prose-mirror
created_at: '2025-08-11T16:53:06.890467Z'
creator_id: [email protected]
@@ -35,7 +36,6 @@ document:
entity_id: FLTBqagEX0mNl33ZZvFDa
name: Test Document
updated_at: '2025-08-11T16:53:06.454259Z'
-collection_position: null
serdes/meta:
- id: FLTBqagEX0mNl33ZZvFDa
label: test_document
diff --git a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml
index c949051d29e..6f4adfca36a 100644
--- a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml
+++ b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml
index 5964dd18888..a7cb32758b3 100644
--- a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml
+++ b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml
index 5683b9fb918..1305872e019 100644
--- a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml
+++ b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/dashboards/Q_jD-f-9clKLFZ2TfUG2h_shared_dashboard.yaml b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/dashboards/Q_jD-f-9clKLFZ2TfUG2h_shared_dashboard.yaml
index d0e3538d225..81b3067536c 100644
--- a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/dashboards/Q_jD-f-9clKLFZ2TfUG2h_shared_dashboard.yaml
+++ b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/dashboards/Q_jD-f-9clKLFZ2TfUG2h_shared_dashboard.yaml
@@ -10,7 +10,6 @@ collection_position: null
position: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
show_in_getting_started: false
@@ -65,6 +64,7 @@ dashcards:
model: Dashboard
- id: AlYMOYAhCXhr1VIiH5umt
model: DashboardCard
+embedding_type: null
initially_published_at: null
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml b/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml
index 1075a5333d1..e1478384957 100644
--- a/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml
+++ b/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -30,6 +29,8 @@ serdes/meta:
archived_directly: false
dashboard_id: null
document_id: null
-metabase_version: v0.55.1-SNAPSHOT (29786d3)
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml b/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml
index f8d43f18ace..1a10da2c18d 100644
--- a/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (4bc6d7c)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: model
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml b/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml
index 4c3a56e3718..0e929e143ee 100644
--- a/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.52.2-SNAPSHOT (f309296)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: model
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml b/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml
index 2c457344fbc..e27ecb8e521 100644
--- a/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml
+++ b/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml
@@ -13,7 +13,6 @@ database_id: My Database
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -33,7 +32,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: model
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml b/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml
index 8dde2eca903..9eea146d929 100644
--- a/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.52.2-SNAPSHOT (f309296)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: model
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml b/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml
index 15e1c9d435a..2abd9948465 100644
--- a/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml
+++ b/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/dashboards/ziLZTiwSdz6aJaB9VhGiO_smart_linked_dashboard.yaml b/test_resources/serialization_baseline/collections/dashboards/ziLZTiwSdz6aJaB9VhGiO_smart_linked_dashboard.yaml
index f0b11164919..53daff9e599 100644
--- a/test_resources/serialization_baseline/collections/dashboards/ziLZTiwSdz6aJaB9VhGiO_smart_linked_dashboard.yaml
+++ b/test_resources/serialization_baseline/collections/dashboards/ziLZTiwSdz6aJaB9VhGiO_smart_linked_dashboard.yaml
@@ -10,7 +10,6 @@ collection_position: null
position: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
show_in_getting_started: false
@@ -23,6 +22,7 @@ serdes/meta:
model: Dashboard
archived_directly: false
dashcards: []
+embedding_type: null
initially_published_at: null
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml b/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml
index c24e227b0c8..95fa9d12d00 100644
--- a/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (4bc6d7c)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: model
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/metabots/gr1EkP92whbdA_TKQljLU.yaml b/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/metabots/gr1EkP92whbdA_TKQljLU.yaml
index f7abd09bdfd..dbf1da8a685 100644
--- a/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/metabots/gr1EkP92whbdA_TKQljLU.yaml
+++ b/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/metabots/gr1EkP92whbdA_TKQljLU.yaml
@@ -3,7 +3,9 @@ description: A test metabot
created_at: '2025-06-09T20:12:13.816701Z'
entity_id: gr1EkP92whbdA_TKQljLU
updated_at: '2025-06-09T20:12:13.816701Z'
-use_verified_content: false
+serdes/meta:
+- id: gr1EkP92whbdA_TKQljLU
+ model: Metabot
collection_id: gQuHAIM4C-7fToHzHyNNQ
prompts:
- card_id: Mr5p0TE2FSxGeUFaWd9yu
@@ -17,6 +19,4 @@ prompts:
model: Metabot
- id: U4V5PzzpaMasl1Kt9BvNy
model: MetabotPrompt
-serdes/meta:
-- id: gr1EkP92whbdA_TKQljLU
- model: Metabot
+use_verified_content: false
diff --git a/test_resources/serialization_baseline/collections/metabots/CyLr7tYRKiOoTWlcbl36q.yaml b/test_resources/serialization_baseline/collections/metabots/CyLr7tYRKiOoTWlcbl36q.yaml
index 7d464b33951..0df80bf204a 100644
--- a/test_resources/serialization_baseline/collections/metabots/CyLr7tYRKiOoTWlcbl36q.yaml
+++ b/test_resources/serialization_baseline/collections/metabots/CyLr7tYRKiOoTWlcbl36q.yaml
@@ -3,9 +3,9 @@ description: A test metabot
created_at: '2025-05-21T13:50:15.894507Z'
entity_id: CyLr7tYRKiOoTWlcbl36q
updated_at: '2025-05-21T13:50:15.894507Z'
-use_verified_content: false
-collection_id: null
-prompts: []
serdes/meta:
- id: CyLr7tYRKiOoTWlcbl36q
model: Metabot
+collection_id: null
+prompts: []
+use_verified_content: false
diff --git a/test_resources/serialization_baseline/collections/metabots/OYeHvLi8mMGwwMwJpetYw.yaml b/test_resources/serialization_baseline/collections/metabots/OYeHvLi8mMGwwMwJpetYw.yaml
index bb73792daeb..ad0c551c368 100644
--- a/test_resources/serialization_baseline/collections/metabots/OYeHvLi8mMGwwMwJpetYw.yaml
+++ b/test_resources/serialization_baseline/collections/metabots/OYeHvLi8mMGwwMwJpetYw.yaml
@@ -3,7 +3,9 @@ description: A test metabot
created_at: '2025-06-09T20:12:07.978442Z'
entity_id: OYeHvLi8mMGwwMwJpetYw
updated_at: '2025-06-09T20:12:07.978442Z'
-use_verified_content: false
+serdes/meta:
+- id: OYeHvLi8mMGwwMwJpetYw
+ model: Metabot
collection_id: null
prompts:
- card_id: 4ahdpFn43jybRFVQTRjX_
@@ -17,6 +19,4 @@ prompts:
model: Metabot
- id: SNoFh7dZXzjvgeNp5aJJY
model: MetabotPrompt
-serdes/meta:
-- id: OYeHvLi8mMGwwMwJpetYw
- model: Metabot
+use_verified_content: false
diff --git a/test_resources/serialization_baseline/collections/metabots/zXxMBaxni6nRGRhD7vmPc.yaml b/test_resources/serialization_baseline/collections/metabots/zXxMBaxni6nRGRhD7vmPc.yaml
index bb8aff694b6..f8bfaa8c5a3 100644
--- a/test_resources/serialization_baseline/collections/metabots/zXxMBaxni6nRGRhD7vmPc.yaml
+++ b/test_resources/serialization_baseline/collections/metabots/zXxMBaxni6nRGRhD7vmPc.yaml
@@ -3,9 +3,9 @@ description: A test metabot
created_at: '2025-05-28T17:49:20.813848Z'
entity_id: zXxMBaxni6nRGRhD7vmPc
updated_at: '2025-05-28T17:49:20.813848Z'
-use_verified_content: false
-collection_id: null
-prompts: []
serdes/meta:
- id: zXxMBaxni6nRGRhD7vmPc
model: Metabot
+collection_id: null
+prompts: []
+use_verified_content: false
diff --git a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml
index 9f644abcc66..0590fe99af3 100644
--- a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml
+++ b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml
index fc6a1efd886..74b3d43129d 100644
--- a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml
+++ b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/dashboards/JT3BKJwNCfhUHnd9oqQ_1_parent_dash.yaml b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/dashboards/JT3BKJwNCfhUHnd9oqQ_1_parent_dash.yaml
index 5db37154e71..9af519d1923 100644
--- a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/dashboards/JT3BKJwNCfhUHnd9oqQ_1_parent_dash.yaml
+++ b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/dashboards/JT3BKJwNCfhUHnd9oqQ_1_parent_dash.yaml
@@ -10,7 +10,6 @@ collection_position: null
position: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
show_in_getting_started: false
@@ -23,6 +22,7 @@ serdes/meta:
model: Dashboard
archived_directly: false
dashcards: []
+embedding_type: null
initially_published_at: null
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml
index 6b370a7986b..e31415ba648 100644
--- a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml
+++ b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml
@@ -13,7 +13,6 @@ database_id: test-data (h2)
table_id: null
enable_embedding: false
embedding_params: null
-embedding_type: null
made_public_by_id: null
public_uuid: null
parameters: []
@@ -29,7 +28,9 @@ serdes/meta:
model: Card
archived_directly: false
dashboard_id: null
-metabase_version: v1.54.4-SNAPSHOT (c6780bb)
+document_id: null
+embedding_type: null
+metabase_version: v1.57.1-SNAPSHOT (d027b42)
+published_table_id: null
source_card_id: null
type: question
-document_id: null
diff --git a/test_resources/serialization_baseline/databases/My Database/My Database.yaml b/test_resources/serialization_baseline/databases/My Database/My Database.yaml
index fb39094af5e..a46d17d8089 100644
--- a/test_resources/serialization_baseline/databases/My Database/My Database.yaml
+++ b/test_resources/serialization_baseline/databases/My Database/My Database.yaml
@@ -12,8 +12,8 @@ is_on_demand: false
is_sample: false
is_audit: false
is_attached_dwh: false
-metadata_sync_schedule: 0 57 * * * ? *
-cache_field_values_schedule: 0 0 7 * * ? *
+metadata_sync_schedule: 0 54 * * * ? *
+cache_field_values_schedule: 0 0 5 * * ? *
settings:
database-source-dataset-name: test-data
caveats: null
@@ -22,8 +22,8 @@ initial_sync_status: complete
serdes/meta:
- id: My Database
model: Database
+provider_name: null
router_database_id: null
uploads_enabled: false
uploads_schema_name: null
uploads_table_prefix: null
-provider_name: null
diff --git a/test_resources/serialization_baseline/databases/My Database/tables/Schemaless Table/Schemaless Table.yaml b/test_resources/serialization_baseline/databases/My Database/tables/Schemaless Table/Schemaless Table.yaml
index f87f5a2e442..ce28cd2100e 100644
--- a/test_resources/serialization_baseline/databases/My Database/tables/Schemaless Table/Schemaless Table.yaml
+++ b/test_resources/serialization_baseline/databases/My Database/tables/Schemaless Table/Schemaless Table.yaml
@@ -19,7 +19,11 @@ serdes/meta:
- id: Schemaless Table
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CATEGORIES/CATEGORIES.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CATEGORIES/CATEGORIES.yaml
index a8f2bd0217b..729d106ed21 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CATEGORIES/CATEGORIES.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CATEGORIES/CATEGORIES.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: CATEGORIES
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CHECKINS/CHECKINS.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CHECKINS/CHECKINS.yaml
index b6262fe068c..4f5d0b2b5fc 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CHECKINS/CHECKINS.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/CHECKINS/CHECKINS.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: CHECKINS
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/ORDERS/ORDERS.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/ORDERS/ORDERS.yaml
index 1e6769c5b34..3d830d18f4e 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/ORDERS/ORDERS.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/ORDERS/ORDERS.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: ORDERS
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PEOPLE/PEOPLE.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PEOPLE/PEOPLE.yaml
index 920c3c8f212..1f80f12972e 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PEOPLE/PEOPLE.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PEOPLE/PEOPLE.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: PEOPLE
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PRODUCTS/PRODUCTS.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PRODUCTS/PRODUCTS.yaml
index 77c32e04b6b..28e534e3f0b 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PRODUCTS/PRODUCTS.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/PRODUCTS/PRODUCTS.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: PRODUCTS
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/REVIEWS/REVIEWS.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/REVIEWS/REVIEWS.yaml
index e6fc982b86b..641f15d2a1e 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/REVIEWS/REVIEWS.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/REVIEWS/REVIEWS.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: REVIEWS
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/USERS/USERS.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/USERS/USERS.yaml
index 54437270a56..0c009f6f0d6 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/USERS/USERS.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/USERS/USERS.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: USERS
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/VENUES/VENUES.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/VENUES/VENUES.yaml
index 9ff2270c3a1..9fd12de75bc 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/VENUES/VENUES.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/schemas/PUBLIC/tables/VENUES/VENUES.yaml
@@ -21,7 +21,11 @@ serdes/meta:
- id: VENUES
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/tables/linked_table/linked_table.yaml b/test_resources/serialization_baseline/databases/test-data (h2)/tables/linked_table/linked_table.yaml
index 3ce8eae7830..74015a1fa34 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/tables/linked_table/linked_table.yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/tables/linked_table/linked_table.yaml
@@ -19,7 +19,11 @@ serdes/meta:
- id: linked_table
model: Table
archived_at: null
+data_authority: unconfigured
+data_layer: null
+data_source: null
database_require_filter: null
deactivated_at: null
is_writable: null
-data_authority: unconfigured
+owner_email: null
+owner_user_id: null
diff --git a/test_resources/serialization_baseline/databases/test-data (h2)/test-data (h2).yaml b/test_resources/serialization_baseline/databases/test-data (h2)/test-data (h2).yaml
index c1c269ba26d..cf8eee78173 100644
--- a/test_resources/serialization_baseline/databases/test-data (h2)/test-data (h2).yaml
+++ b/test_resources/serialization_baseline/databases/test-data (h2)/test-data (h2).yaml
@@ -17,8 +17,8 @@ is_on_demand: false
is_sample: false
is_audit: false
is_attached_dwh: false
-metadata_sync_schedule: 0 9 * * * ? *
-cache_field_values_schedule: 0 0 9 * * ? *
+metadata_sync_schedule: 0 18 * * * ? *
+cache_field_values_schedule: 0 0 17 * * ? *
settings:
database-source-dataset-name: test-data
caveats: null
@@ -27,8 +27,8 @@ initial_sync_status: complete
serdes/meta:
- id: test-data (h2)
model: Database
+provider_name: null
router_database_id: null
uploads_enabled: false
uploads_schema_name: null
uploads_table_prefix: null
-provider_name: null
diff --git a/test_resources/serialization_baseline/snippets/WyQWnT23PF-SfbYLROllJ_snippet_2.yaml b/test_resources/serialization_baseline/snippets/WyQWnT23PF-SfbYLROllJ_snippet_2.yaml
index 32034a0a16a..11ccadc022d 100644
--- a/test_resources/serialization_baseline/snippets/WyQWnT23PF-SfbYLROllJ_snippet_2.yaml
+++ b/test_resources/serialization_baseline/snippets/WyQWnT23PF-SfbYLROllJ_snippet_2.yaml
@@ -5,8 +5,8 @@ created_at: '2024-08-28T14:36:15.328717Z'
archived: false
collection_id: null
content: 1 = 1
-template_tags: {}
creator_id: [email protected]
+template_tags: {}
serdes/meta:
- id: WyQWnT23PF-SfbYLROllJ
label: snippet_2
diff --git a/test_resources/serialization_baseline/snippets/Y6d4QwJgGKw-X1tRh3ir2_shared_collection/hcSr4xgVEd8AyElRRLu9w_snippet_1.yaml b/test_resources/serialization_baseline/snippets/Y6d4QwJgGKw-X1tRh3ir2_shared_collection/hcSr4xgVEd8AyElRRLu9w_snippet_1.yaml
index 541b45dd911..f310da51831 100644
--- a/test_resources/serialization_baseline/snippets/Y6d4QwJgGKw-X1tRh3ir2_shared_collection/hcSr4xgVEd8AyElRRLu9w_snippet_1.yaml
+++ b/test_resources/serialization_baseline/snippets/Y6d4QwJgGKw-X1tRh3ir2_shared_collection/hcSr4xgVEd8AyElRRLu9w_snippet_1.yaml
@@ -5,8 +5,8 @@ created_at: '2024-08-28T14:36:15.324887Z'
archived: false
collection_id: Y6d4QwJgGKw-X1tRh3ir2
content: 1 = 1
-template_tags: {}
creator_id: [email protected]
+template_tags: {}
serdes/meta:
- id: hcSr4xgVEd8AyElRRLu9w
label: snippet_1
diff --git a/test_resources/serialization_baseline/transforms/2HzIFwJ6720JAx07UMavl_test_transform.yaml b/test_resources/serialization_baseline/transforms/2HzIFwJ6720JAx07UMavl_test_transform.yaml
index e2620ecbcf9..d342af853c5 100644
--- a/test_resources/serialization_baseline/transforms/2HzIFwJ6720JAx07UMavl_test_transform.yaml
+++ b/test_resources/serialization_baseline/transforms/2HzIFwJ6720JAx07UMavl_test_transform.yaml
@@ -1,10 +1,9 @@
created_at: '2025-10-06T20:41:45.536727Z'
-creator_id: '[email protected]'
+creator_id: [email protected]
description: A test transform for serialization
entity_id: 2HzIFwJ6720JAx07UMavl
name: Test Transform
source:
- type: query
query:
database: My Database
query:
@@ -13,6 +12,7 @@ source:
- null
- Schemaless Table
type: query
+ type: query
tags:
- entity_id: TUtH6I5SqautNtUZoZ6Ti
position: 0