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 UX (#66612)

Nick Fitzpatrick542861c88e46
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.ts
index 01e14d135cf..a0a5058fcfc 100644
--- a/e2e/support/helpers/e2e-data-studio-helpers.ts
+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts
@@ -3,30 +3,17 @@ import type { TableId } from "metabase-types/api";
import { codeMirrorHelpers } from "./e2e-codemirror-helpers";
import { popover } from "./e2e-ui-elements-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 libraryPage = () => cy.findByTestId("library-page");
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");
export const DataStudio = {
- header: () => cy.findByTestId("data-studio-header"),
nav: () => cy.findByTestId("data-studio-nav"),
- 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"),
+ list: () => cy.findByTestId("transforms-list"),
saveChangesButton: () => DataStudio.Transforms.queryEditor().button("Save"),
queryEditor: () => cy.findByTestId("transform-query-editor"),
runTab: () => DataStudio.Transforms.header().findByText("Run"),
@@ -36,32 +23,19 @@ export const DataStudio = {
},
Jobs: {
header: () => cy.findByTestId("jobs-header"),
- content: () => cy.findByTestId("transforms-content"),
- sidebar: () => cy.findByTestId("jobs-sidebar"),
+ list: () => cy.findByTestId("transforms-job-list"),
+ editor: () => cy.findByTestId("transforms-job-editor"),
+ },
+ Runs: {
+ list: () => cy.findByTestId("transforms-run-list"),
+ content: () => cy.findByTestId("transforms-run-content"),
+ },
+ Dependencies: {
+ content: () => cy.findByTestId("transforms-dependencies-content"),
},
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 metric"),
- createSnippetButton: () =>
- snippetsSection().findByLabelText("Create snippet"),
- snippetCollectionOptionsButton: () =>
- snippetsSection().findByLabelText("Snippet collection options"),
- },
Snippets: {
newPage: newSnippetPage,
editPage: editSnippetPage,
@@ -86,22 +60,6 @@ export const DataStudio = {
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"),
- },
Tables: {
overviewPage: () => cy.findByTestId("table-overview-page"),
fieldsPage: () => cy.findByTestId("table-fields-page"),
@@ -114,7 +72,7 @@ export const DataStudio = {
dependenciesTab: () =>
DataStudio.Tables.header().findByText("Dependencies"),
visitOverviewPage: (tableId: TableId) =>
- cy.visit(`/data-studio/modeling/tables/${tableId}`),
+ cy.visit(`/data-studio/library/tables/${tableId}`),
moreMenuViewTable: () =>
popover()
.findByRole("menuitem", { name: /View/ })
@@ -132,15 +90,17 @@ export const DataStudio = {
.findByPlaceholderText("No description"),
},
},
- Modeling: {
- emptyPage: () => cy.findByTestId("modeling-empty-page"),
- collectionPage: collectionPage,
- collectionTitle: () => collectionPage().findByRole("heading"),
+ Library: {
+ emptyPage: () =>
+ libraryPage().findByText("No tables, metrics, or snippets yet"),
+ libraryPage,
metricItem: (name: string) =>
cy.findAllByTestId("metric-name").contains(name),
- modelItem: (name: string) =>
- cy.findAllByTestId("dataset-name").contains(name),
tableItem: (name: string) =>
- cy.findAllByTestId("table-name").contains(name),
+ libraryPage().findAllByTestId("table-name").contains(name),
+ result: (name: string) => libraryPage().findByText(name).closest("tr"),
+ newButton: () => libraryPage().findByRole("button", { name: /New/ }),
+ collectionItem: (name: string) =>
+ libraryPage().findAllByTestId("collection-name").contains(name),
},
};
diff --git a/e2e/test/scenarios/data-reference/glossary.cy.spec.ts b/e2e/test/scenarios/data-reference/glossary.cy.spec.ts
index da4883953ba..9da2c688495 100644
--- a/e2e/test/scenarios/data-reference/glossary.cy.spec.ts
+++ b/e2e/test/scenarios/data-reference/glossary.cy.spec.ts
@@ -140,8 +140,7 @@ describe("data studio > glossary", () => {
function visitDataStudioGlossary() {
H.DataModel.visitDataStudio();
- cy.findByRole("img", { name: "model icon" }).click();
- cy.findByRole("link", { name: /Glossary/ }).click();
+ H.DataStudio.nav().findByLabelText("Glossary").click();
cy.findByRole("heading", { name: "Glossary" }).should("be.visible");
}
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
index 36cdd4ab259..2f47d429f63 100644
--- 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
@@ -124,8 +124,8 @@ describe("bulk table operations", () => {
cy.findByText("Published").should("be.visible");
cy.findByRole("button", { name: /Go to Data/ }).click();
});
- H.DataStudio.Modeling.tableItem("Orders").should("be.visible");
- H.DataStudio.Modeling.tableItem("Products").should("be.visible");
+ H.DataStudio.Library.tableItem("Orders").should("be.visible");
+ H.DataStudio.Library.tableItem("Products").should("be.visible");
cy.go("back");
cy.log("unpublish some tables and verify they are unpublished");
@@ -134,9 +134,9 @@ describe("bulk table operations", () => {
cy.findByRole("button", { name: /Unpublish/ }).click();
H.modal().findByText("Unpublish these tables").click();
cy.wait("@unpublishTables");
- H.DataStudio.nav().findByLabelText("Modeling").click();
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage().within(() => {
+ H.DataStudio.nav().findByLabelText("Library").click();
+
+ H.DataStudio.Library.libraryPage().within(() => {
cy.findByText("Reviews").should("be.visible");
cy.findByText("Orders").should("not.exist");
cy.findByText("Products").should("not.exist");
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
index 45910bd3162..cab41e7f771 100644
--- 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
@@ -87,17 +87,16 @@ describe("Table editing", () => {
H.expectUnstructuredSnowplowEvent({
event: "data_studio_table_published",
});
- H.DataStudio.Modeling.tableItem("Orders").should("be.visible");
+ H.DataStudio.Library.tableItem("Orders").should("be.visible");
cy.go("back");
cy.log("unpublish the table and verify it's unpublished");
cy.findByRole("button", { name: /Unpublish/ }).click();
H.modal().findByText("Unpublish this table").click();
cy.wait("@unpublishTables");
- H.DataStudio.nav().findByLabelText("Modeling").click();
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage()
- .findByText("No published tables yet")
+ H.DataStudio.nav().findByLabelText("Library").click();
+ H.DataStudio.Library.libraryPage()
+ .findByText("No tables, metrics, or snippets yet")
.should("be.visible");
},
);
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
index 36d5ed23d1e..e044f77638b 100644
--- 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
@@ -97,7 +97,10 @@ describe("scenarios > data studio > datamodel", () => {
TablePicker.getDatabases().should("have.length", 1);
TablePicker.getTables().should("have.length", 8);
- H.DataModel.get().findByText("Not found.").should("be.visible");
+ H.DataModel.get()
+ .findByText("Not found.")
+ .scrollIntoView()
+ .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`,
@@ -926,6 +929,9 @@ describe("scenarios > data studio > datamodel", () => {
TablePicker.getTables().should("have.length", 8);
TableSection.clickField("ID");
+
+ // Navbar expansion causes these panels to be off screen
+ FieldSection.get().scrollIntoView();
FieldSection.getDataType()
.should("be.visible")
.and("have.text", "BIGINT");
@@ -1928,6 +1934,8 @@ describe("scenarios > data studio > datamodel", () => {
verifyAndCloseToast("Semantic type of Quantity updated");
cy.log("verify preview");
+ // Navbar expansion causes these panels to be off screen
+ FieldSection.get().scrollIntoView();
FieldSection.getPreviewButton().click();
cy.wait("@dataset");
PreviewSection.get()
@@ -1959,6 +1967,9 @@ describe("scenarios > data studio > datamodel", () => {
cy.reload();
cy.wait(["@metadata", "@metadata"]);
+ // Navbar expansion causes these panels to be off screen
+ FieldSection.get().scrollIntoView();
+
FieldSection.getSemanticTypeFkTarget()
.should("be.visible")
.and("have.value", "Products → ID");
diff --git a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts
index febccf8fde4..077729c8c57 100644
--- a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts
@@ -33,7 +33,7 @@ describe("scenarios > data studio > data model > segments", () => {
cy.url().should(
"include",
- `/data-studio/modeling/segments/new?tableId=${ORDERS_ID}`,
+ `/data-studio/library/segments/new?tableId=${ORDERS_ID}`,
);
});
@@ -57,7 +57,7 @@ describe("scenarios > data studio > data model > segments", () => {
cy.get<number>("@segmentId").then((segmentId) => {
cy.url().should(
"include",
- `/data-studio/modeling/segments/${segmentId}`,
+ `/data-studio/library/segments/${segmentId}`,
);
});
});
@@ -121,7 +121,7 @@ describe("scenarios > data studio > data model > segments", () => {
cy.log("verify redirect to edit page and toast");
H.undoToast().should("contain.text", "Segment created");
- cy.url().should("match", /\/data-studio\/modeling\/segments\/\d+$/);
+ cy.url().should("match", /\/data-studio\/library\/segments\/\d+$/);
cy.log("verify segment in query builder");
verifySegmentInQueryBuilder("Premium Orders");
@@ -151,7 +151,7 @@ describe("scenarios > data studio > data model > segments", () => {
description: "Test description",
});
cy.get<number>("@segmentId").then((segmentId) => {
- cy.visit(`/data-studio/modeling/segments/${segmentId}`);
+ cy.visit(`/data-studio/library/segments/${segmentId}`);
});
cy.log("verify existing data displayed");
@@ -181,7 +181,7 @@ describe("scenarios > data studio > data model > segments", () => {
it("should navigate back to segments tab via breadcrumb", () => {
createTestSegment({ name: "Breadcrumb Test Segment" });
cy.get<number>("@segmentId").then((segmentId) => {
- cy.visit(`/data-studio/modeling/segments/${segmentId}`);
+ cy.visit(`/data-studio/library/segments/${segmentId}`);
});
SegmentEditor.getBreadcrumb("Orders").click();
@@ -200,7 +200,7 @@ describe("scenarios > data studio > data model > segments", () => {
it("should remove segment via more menu", () => {
createTestSegment({ name: "Segment to Delete" });
cy.get<number>("@segmentId").then((segmentId) => {
- cy.visit(`/data-studio/modeling/segments/${segmentId}`);
+ cy.visit(`/data-studio/library/segments/${segmentId}`);
});
cy.log("delete via more menu");
diff --git a/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
similarity index 70%
rename from e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts
rename to e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
index ea47a2eff88..109066e04bb 100644
--- a/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
@@ -6,7 +6,7 @@ import {
createLibraryWithTable,
} from "e2e/support/test-library-data";
-describe("scenarios > data studio > modeling > library", () => {
+describe("scenarios > data studio > library", () => {
beforeEach(() => {
H.restore();
H.resetSnowplow();
@@ -18,16 +18,16 @@ describe("scenarios > data studio > modeling > library", () => {
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("Navigate to Data Studio Library");
+ H.DataModel.visitDataStudio();
+ H.DataStudio.nav().findByLabelText("Library").click();
- cy.log("Click Library sidebar section to open modal");
- H.DataStudio.ModelingSidebar.root()
- .findByText("Library")
- .should("be.visible")
- .click();
+ cy.log("Closing the modal should send you back");
+ H.modal().button("Cancel").click();
+ H.DataModel.get().should("exist");
cy.log("Create library via modal");
+ H.DataStudio.nav().findByLabelText("Library").click();
H.modal().within(() => {
cy.findByText("Create your Library").should("be.visible");
cy.findByText("Create my Library").click();
@@ -36,32 +36,25 @@ describe("scenarios > data studio > modeling > library", () => {
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 tracking event is triggered");
H.expectUnstructuredSnowplowEvent({
event: "data_studio_library_created",
});
cy.log("Verify empty state shows on library root");
- H.DataStudio.Modeling.collectionPage().within(() => {
- cy.findByText("No tables or metrics yet").should("be.visible");
- cy.findByText(
- "Tables and metrics in this collection will appear here.",
- ).should("be.visible");
- });
+ H.DataStudio.Library.emptyPage().should("be.visible");
- cy.log("Select Data collection and verify it's empty");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
-
- cy.log("Verify No published tables yet message");
- H.DataStudio.Modeling.collectionPage().within(() => {
- cy.findByText("No published tables yet").should("be.visible");
+ H.DataStudio.Library.libraryPage().button(/New/).click();
+ H.popover().findByText("New snippet folder").click();
+ H.modal().within(() => {
+ cy.findByLabelText("Give your folder a name").type("My Snippets");
+ cy.button("Create").click();
});
+
+ cy.log("Verify library collections appear in the library table");
+ H.DataStudio.Library.collectionItem("Data").should("be.visible");
+ H.DataStudio.Library.collectionItem("Metrics").should("be.visible");
+ H.DataStudio.Library.collectionItem("SQL snippets").should("be.visible");
});
it("should be available in the data picker", () => {
diff --git a/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
similarity index 68%
rename from e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
rename to e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
index 254df17a417..bb92d8b458a 100644
--- a/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
@@ -1,7 +1,7 @@
const { H } = cy;
import { createLibraryWithItems } from "e2e/support/test-library-data";
-describe("scenarios > data studio > modeling > metrics", () => {
+describe("scenarios > data studio > library > metrics", () => {
beforeEach(() => {
H.restore();
H.resetSnowplow();
@@ -16,22 +16,11 @@ describe("scenarios > data studio > modeling > metrics", () => {
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 tables and metrics.")
- .should("be.visible");
- });
- });
-
it("should create a new metric with proper validation and save to collection", () => {
- visitModelingPage();
+ visitLibraryPage();
cy.log("Create a new metric");
- H.DataStudio.ModelingSidebar.createCardMenuButton().click();
+ H.DataStudio.Library.newButton().click();
H.popover().findByText("Metric").click();
H.DataStudio.Metrics.queryEditor().should("be.visible");
@@ -64,10 +53,10 @@ describe("scenarios > data studio > modeling > metrics", () => {
cy.wait("@createCard");
cy.log("Verify metric overview page");
- cy.url().should("match", /\/data-studio\/modeling\/metrics\/\d+$/);
+ cy.url().should("match", /\/data-studio\/library\/metrics\/\d+$/);
H.DataStudio.Metrics.overviewPage().within(() => {
- cy.findByText("Total Revenue").should("be.visible");
+ cy.findAllByText("Total Revenue").should("have.length", 2); // breadcrumbs + header
cy.findByText("Sum of all order totals across the store").should(
"be.visible",
);
@@ -104,16 +93,10 @@ describe("scenarios > data studio > modeling > metrics", () => {
});
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("Navigate to Data Studio Library");
+ cy.visit("/data-studio/library");
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");
@@ -135,27 +118,17 @@ describe("scenarios > data studio > modeling > metrics", () => {
.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(
+ cy.visit("/data-studio/library");
+ H.DataStudio.Library.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("Navigate to Data Studio Library");
+ cy.visit("/data-studio/library");
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");
@@ -175,16 +148,10 @@ describe("scenarios > data studio > modeling > metrics", () => {
});
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("Navigate to Data Studio Library");
+ cy.visit("/data-studio/library");
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");
@@ -197,7 +164,7 @@ describe("scenarios > data studio > modeling > metrics", () => {
H.popover().findByText("Total").click();
cy.log("Try to navigate away");
- H.DataStudio.ModelingSidebar.glossaryLink().click();
+ H.DataStudio.nav().findByRole("link", { name: "Glossary" }).click();
cy.log("Verify unsaved changes modal appears");
H.modal().within(() => {
@@ -210,16 +177,8 @@ describe("scenarios > data studio > modeling > metrics", () => {
});
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("Navigate to Data Studio Library");
+ cy.visit("/data-studio/library");
cy.log("Click on the metric from the collection view");
cy.findByRole("table").findByText("Trusted Orders Metric").click();
@@ -238,18 +197,14 @@ describe("scenarios > data studio > modeling > metrics", () => {
cy.wait("@updateCard");
- cy.log("Verify redirected to modeling page");
- cy.url().should("include", "/data-studio/modeling");
+ cy.log("Verify redirected to library page");
+ cy.url().should("include", "/data-studio/library");
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.visit("/data-studio/library");
+ cy.findByRole("table")
+ .findByText("Trusted Orders Metric")
+ .should("not.exist");
cy.log("Navigate to trash");
cy.visit("/trash");
@@ -266,27 +221,17 @@ describe("scenarios > data studio > modeling > metrics", () => {
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.visit("/data-studio/library");
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("Navigate to Data Studio Library");
+ cy.visit("/data-studio/library");
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");
@@ -305,16 +250,10 @@ describe("scenarios > data studio > modeling > metrics", () => {
});
it("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("Navigate to Data Studio Library");
+ cy.visit("/data-studio/library");
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");
@@ -350,15 +289,11 @@ describe("scenarios > data studio > modeling > metrics", () => {
cy.log("Verify duplicate metric is created");
H.DataStudio.Metrics.overviewPage()
- .findByText("Trusted Orders Metric - Duplicate")
- .should("be.visible");
+ .findAllByText("Trusted Orders Metric - Duplicate")
+ .should("have.length", 2); // breadcrumbs + header
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");
+ H.DataStudio.nav().findByRole("link", { name: "Library" }).click();
cy.findByRole("table").within(() => {
cy.findByText("Trusted Orders Metric").should("be.visible");
cy.findByText("Trusted Orders Metric - Duplicate").should("be.visible");
@@ -366,16 +301,10 @@ describe("scenarios > data studio > modeling > metrics", () => {
});
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("Navigate to Data Studio Library");
+ cy.visit("/data-studio/library");
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");
@@ -397,18 +326,14 @@ describe("scenarios > data studio > modeling > metrics", () => {
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");
+ cy.visit("/data-studio/library");
+ cy.findByRole("table")
+ .findByText("Trusted Orders Metric")
+ .should("not.exist");
});
});
-function visitModelingPage() {
- cy.visit("/data-studio/modeling");
- H.DataStudio.ModelingSidebar.root().should("be.visible");
+function visitLibraryPage() {
+ cy.visit("/data-studio/library");
+ H.DataStudio.Library.libraryPage().should("be.visible");
}
diff --git a/e2e/test/scenarios/data-studio/modeling-tables.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-tables.cy.spec.ts
similarity index 90%
rename from e2e/test/scenarios/data-studio/modeling-tables.cy.spec.ts
rename to e2e/test/scenarios/data-studio/data-studio-tables.cy.spec.ts
index e26dd27b091..3f6ef16ac65 100644
--- a/e2e/test/scenarios/data-studio/modeling-tables.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-tables.cy.spec.ts
@@ -4,7 +4,7 @@ import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
const { ORDERS_ID } = SAMPLE_DATABASE;
-describe("scenarios > data studio > modeling > tables", () => {
+describe("scenarios > data studio > library > tables", () => {
beforeEach(() => {
H.restore();
cy.signInAsAdmin();
@@ -45,11 +45,7 @@ describe("scenarios > data studio > modeling > tables", () => {
H.DataStudio.Tables.moreMenu().click();
H.popover().findByText("Unpublish").click();
H.modal().findByText("Unpublish this table").click();
- H.DataStudio.Modeling.emptyPage().should("be.visible");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage()
- .findByText("No published tables yet")
- .should("be.visible");
+ H.DataStudio.Library.emptyPage().should("be.visible");
});
});
@@ -61,7 +57,7 @@ describe("scenarios > data studio > modeling > tables", () => {
H.DataStudio.Tables.visitOverviewPage(ORDERS_ID);
H.queryVisualizationRoot().within(() => {
cy.findByText("Subtotal").should("be.visible");
- cy.findByText("109.22").should("be.visible");
+ cy.findByText("110.93").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
index a3d100fa12d..552551d1586 100644
--- a/e2e/test/scenarios/data-studio/snippets.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/snippets.cy.spec.ts
@@ -7,15 +7,18 @@ describe("scenarios > data studio > snippets", () => {
cy.signInAsAdmin();
H.activateToken("bleeding-edge");
+ // TODO: We likely shouldn't need to do this to access the data studio library page
+ H.createLibrary();
+
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();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.createSnippetButton().click();
+ H.DataStudio.Library.newButton().click();
H.popover().findByText("New snippet").click();
H.DataStudio.Snippets.newPage().should("be.visible");
@@ -45,11 +48,10 @@ describe("scenarios > data studio > snippets", () => {
cy.findByText(/by Bobby Tables/).should("be.visible");
});
- H.DataStudio.ModelingSidebar.snippetsTree()
+ H.DataStudio.nav().findByRole("link", { name: "Library" }).click();
+ H.DataStudio.Library.libraryPage()
.findByText("Test snippet")
- .should("be.visible")
- .closest("[role='menuitem']")
- .should("have.attr", "data-selected", "true");
+ .should("be.visible");
});
});
@@ -60,15 +62,9 @@ describe("scenarios > data studio > snippets", () => {
content: "SELECT * FROM orders",
});
- visitModelingPage();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("SQL snippets")
- .click();
-
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("Test snippet")
- .click();
+ H.DataStudio.Library.libraryPage().findByText("Test snippet").click();
H.DataStudio.Snippets.editPage().should("be.visible");
@@ -89,15 +85,9 @@ describe("scenarios > data studio > snippets", () => {
content: "SELECT * FROM orders",
});
- visitModelingPage();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("SQL snippets")
- .click();
-
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("Test snippet")
- .click();
+ H.DataStudio.Library.libraryPage().findByText("Test snippet").click();
H.DataStudio.Snippets.editor.type(" WHERE id = 1");
@@ -116,19 +106,13 @@ describe("scenarios > data studio > snippets", () => {
content: "SELECT * FROM orders",
});
- visitModelingPage();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("SQL snippets")
- .click();
-
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("Test snippet")
- .click();
+ H.DataStudio.Library.libraryPage().findByText("Test snippet").click();
H.DataStudio.Snippets.editor.type(" WHERE id = 1");
- H.DataStudio.ModelingSidebar.glossaryLink().click();
+ H.DataStudio.nav().findByRole("link", { name: "Glossary" }).click();
H.modal().within(() => {
cy.findByText("Discard your changes?").should("be.visible");
@@ -147,15 +131,9 @@ describe("scenarios > data studio > snippets", () => {
description: "**Bold text** and *italic text*",
});
- visitModelingPage();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("SQL snippets")
- .click();
-
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("Test snippet")
- .click();
+ H.DataStudio.Library.libraryPage().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");
@@ -170,15 +148,9 @@ describe("scenarios > data studio > snippets", () => {
content: "SELECT * FROM orders",
});
- visitModelingPage();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("SQL snippets")
- .click();
-
- H.DataStudio.ModelingSidebar.snippetsTree()
- .findByText("Test snippet")
- .click();
+ H.DataStudio.Library.libraryPage().findByText("Test snippet").click();
cy.findByTestId("snippet-header").findByRole("button").click();
H.popover().findByText("Delete").click();
@@ -189,7 +161,7 @@ describe("scenarios > data studio > snippets", () => {
cy.wait("@updateSnippet");
});
- H.DataStudio.ModelingSidebar.snippetsTree()
+ H.DataStudio.Library.libraryPage()
.findByText("Test snippet")
.should("not.exist");
});
@@ -203,10 +175,10 @@ describe("scenarios > data studio > snippets", () => {
});
it("should be able to create a folder and snippet inside it", () => {
- visitModelingPage();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.createSnippetButton().click();
- H.popover().findByText("New folder").click();
+ H.DataStudio.Library.newButton().click();
+ H.popover().findByText("New snippet folder").click();
H.modal().within(() => {
cy.findByLabelText("Give your folder a name").type("Test Folder");
@@ -217,12 +189,11 @@ describe("scenarios > data studio > snippets", () => {
cy.wait("@createCollection");
});
- H.DataStudio.ModelingSidebar.snippetsTree()
- .click()
+ H.DataStudio.Library.libraryPage()
.findByText("Test Folder")
.should("be.visible");
- H.DataStudio.ModelingSidebar.createSnippetButton().click();
+ H.DataStudio.Library.newButton().click();
H.popover().findByText("New snippet").click();
H.DataStudio.Snippets.nameInput().type("Folder snippet");
@@ -236,7 +207,8 @@ describe("scenarios > data studio > snippets", () => {
cy.wait("@createSnippet");
- H.DataStudio.ModelingSidebar.snippetsTree()
+ H.DataStudio.nav().findByRole("link", { name: "Library" }).click();
+ H.DataStudio.Library.libraryPage()
.findByText("Folder snippet")
.should("be.visible");
});
@@ -246,13 +218,9 @@ describe("scenarios > data studio > snippets", () => {
name: "Test Folder",
});
- visitModelingPage();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.snippetsTreeItem("SQL snippets").click();
-
- H.DataStudio.ModelingSidebar.snippetsTreeItem("Test Folder")
- .findByLabelText("Collection options")
- .click();
+ H.DataStudio.Library.result("Test Folder").icon("ellipsis").click();
H.popover().findByText("Edit folder details").click();
@@ -264,7 +232,7 @@ describe("scenarios > data studio > snippets", () => {
cy.wait("@updateCollection");
});
- H.DataStudio.ModelingSidebar.snippetsTree()
+ H.DataStudio.Library.libraryPage()
.findByText("Updated Folder")
.should("be.visible");
});
@@ -274,28 +242,22 @@ describe("scenarios > data studio > snippets", () => {
name: "Test Folder",
});
- visitModelingPage();
-
- H.DataStudio.ModelingSidebar.snippetsTreeItem("SQL snippets").click();
+ visitLibraryPage();
- H.DataStudio.ModelingSidebar.snippetsTreeItem("Test Folder")
- .findByLabelText("Collection options")
- .click();
+ H.DataStudio.Library.result("Test Folder").icon("ellipsis").click();
H.popover().findByText("Archive").click();
cy.wait("@updateCollection");
- H.DataStudio.ModelingSidebar.snippetsTreeItem("SQL snippets").click();
-
- H.DataStudio.ModelingSidebar.snippetsTree()
+ H.DataStudio.Library.libraryPage()
.findByText("Test Folder")
.should("not.exist");
});
});
});
-function visitModelingPage() {
- cy.visit("/data-studio/modeling");
- H.DataStudio.ModelingSidebar.root().should("be.visible");
+function visitLibraryPage() {
+ cy.visit("/data-studio/library");
+ H.DataStudio.Library.libraryPage().should("be.visible");
}
diff --git a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
index 8bf93b75447..3c93afebca2 100644
--- a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
@@ -50,7 +50,7 @@ describe("scenarios > admin > transforms", () => {
it("should be able to create and run an mbql transform", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.expectUnstructuredSnowplowEvent({
@@ -91,7 +91,7 @@ describe("scenarios > admin > transforms", () => {
createLibraryWithItems();
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.miniPicker().within(() => {
cy.findByText(DB_NAME).should("exist");
@@ -100,7 +100,7 @@ describe("scenarios > admin > transforms", () => {
cy.findByText("Data").should("not.exist");
});
- cy.findByRole("link", { name: "Exit data studio" }).click();
+ cy.findByRole("link", { name: "Exit" }).click();
H.modal().button("Discard changes").click();
H.newButton("Question").click();
@@ -115,7 +115,7 @@ describe("scenarios > admin > transforms", () => {
it("should be able to create and run a SQL transform", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("SQL query").click();
H.expectUnstructuredSnowplowEvent({
event: "transform_create",
@@ -155,7 +155,7 @@ describe("scenarios > admin > transforms", () => {
});
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("SQL query").click();
H.popover().findByText(DB_NAME).click();
@@ -218,7 +218,7 @@ describe("scenarios > admin > transforms", () => {
setPythonRunnerSettings();
cy.log("create a new transform");
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Python script").click();
H.expectUnstructuredSnowplowEvent({
event: "transform_create",
@@ -317,7 +317,7 @@ describe("scenarios > admin > transforms", () => {
H.expectUnstructuredSnowplowEvent({
event: "transform_trigger_manual_run",
});
- H.DataStudio.Transforms.content().should(
+ H.DataStudio.Runs.content().should(
"contain",
"Executing Python transform",
);
@@ -354,7 +354,7 @@ describe("scenarios > admin > transforms", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Copy of a saved question").click();
H.expectUnstructuredSnowplowEvent({
event: "transform_create",
@@ -413,7 +413,6 @@ LIMIT
H.NativeEditor.value().should("eq", EXPECTED_QUERY);
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();
@@ -431,7 +430,7 @@ LIMIT
it("should not allow to overwrite an existing table when creating a transform", () => {
cy.log("open the new transform page");
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
cy.log("set the query");
@@ -454,7 +453,7 @@ LIMIT
it("should be able to create a new schema when saving a transform", () => {
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.miniPicker().within(() => {
@@ -505,7 +504,7 @@ LIMIT
it("should be able to create a new table in an existing when saving a transform", () => {
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.miniPicker().within(() => {
cy.findByText(DB_NAME).click();
@@ -540,7 +539,7 @@ LIMIT
it("should not be possible to create an mbql transform from a table from an unsupported database", () => {
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.miniPicker().within(() => {
@@ -575,7 +574,7 @@ LIMIT
);
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.miniPicker().within(() => {
@@ -594,7 +593,7 @@ LIMIT
it("should not be possible to create a sql transform from a table from an unsupported database", () => {
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("SQL query").click();
H.popover()
.findByRole("option", { name: "Sample Database" })
@@ -625,7 +624,7 @@ LIMIT
cy.log("create a new transform");
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Copy of a saved question").click();
H.entityPickerModal().within(() => {
H.entityPickerModalTab(label);
@@ -642,7 +641,7 @@ LIMIT
it("should not auto-pivot query results for MBQL transforms", () => {
cy.log("create a new transform");
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Query builder").click();
cy.log("build a query with 1 aggregation and 2 breakouts");
@@ -678,13 +677,13 @@ LIMIT
describe("name", () => {
it("should be able to edit the name after creation", () => {
createMbqlTransform({ visitTransform: true });
- getTransformsContent()
+ H.DataStudio.Transforms.header()
.findByPlaceholderText("Name")
.clear()
.type("New name")
.blur();
H.undoToast().findByText("Transform name updated").should("be.visible");
- getTransformsContent()
+ H.DataStudio.Transforms.header()
.findByPlaceholderText("Name")
.should("have.value", "New name");
});
@@ -775,7 +774,8 @@ LIMIT
cy.wait("@createTag");
cy.log("Navigate to transform B");
- getTransformsSidebar().findByText("Transform B").click();
+ H.DataStudio.nav().findByRole("link", { name: "Transforms" }).click();
+ cy.findByRole("table").findByText("Transform B").click();
cy.log("Remove the new tag from transform B");
H.DataStudio.Transforms.runTab().click();
@@ -791,7 +791,8 @@ LIMIT
});
cy.log("Navigate to transform A");
- getTransformsSidebar().findByText("Transform A").click();
+ getTransformsNavLink().click();
+ cy.findByRole("table").findByText("Transform A").click();
cy.log("The tag should be gone");
H.DataStudio.Transforms.runTab().click();
@@ -810,7 +811,7 @@ LIMIT
cy.log("modify the transform before running");
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().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);
@@ -851,7 +852,7 @@ LIMIT
cy.log("modify the transform before running");
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().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);
@@ -894,7 +895,7 @@ LIMIT
cy.log("modify the transform after running");
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().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);
@@ -940,7 +941,7 @@ LIMIT
cy.log("modify the transform after running");
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().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);
@@ -987,7 +988,7 @@ LIMIT
cy.log("delete the old target without creating the new one");
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").clear().type(TARGET_TABLE_2);
cy.findByLabelText("Delete transform_table").click();
@@ -997,7 +998,7 @@ LIMIT
});
cy.log("change the target back to the original one");
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").clear().type(TARGET_TABLE);
cy.button("Change target").click();
@@ -1020,7 +1021,7 @@ LIMIT
cy.log("change the target to an existing table");
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().button("Change target").click();
H.modal().within(() => {
cy.findByLabelText("New table name").clear().type(SOURCE_TABLE);
cy.button("Change target").click();
@@ -1037,7 +1038,7 @@ LIMIT
cy.log("before table creation");
createMbqlTransform({ visitTransform: true });
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent()
+ getTransformsTargetContent()
.findByText("Edit this table's metadata")
.should("not.exist");
@@ -1045,7 +1046,9 @@ LIMIT
H.DataStudio.Transforms.runTab().click();
runTransformAndWaitForSuccess();
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().findByText("Edit this table's metadata").click();
+ getTransformsTargetContent()
+ .findByText("Edit this table's metadata")
+ .click();
H.DataModel.TableSection.clickField("Name");
H.DataModel.FieldSection.getNameInput().clear().type("New name").blur();
cy.wait("@updateField");
@@ -1241,8 +1244,9 @@ LIMIT
cy.button("Delete transform").click();
cy.wait("@deleteTransform");
});
- getTransformsSidebar().should("be.visible");
- getTransformsSidebar().findByText("MBQL transform").should("not.exist");
+ getTransformsNavLink().click();
+ getTransformsList().should("be.visible");
+ getTransformsList().findByText("MBQL transform").should("not.exist");
});
it("should be able to delete a transform and keep the table", () => {
@@ -1261,7 +1265,7 @@ LIMIT
cy.button("Delete transform only").click();
cy.wait("@deleteTransform");
});
- getTransformsSidebar().should("be.visible");
+ getTransformsList().should("be.visible");
cy.log("make sure the table still exists");
visitTableQuestion();
@@ -1285,7 +1289,7 @@ LIMIT
cy.wait("@deleteTransformTable");
cy.wait("@deleteTransform");
});
- getTransformsSidebar().should("be.visible");
+ getTransformsList().should("be.visible");
cy.log("make sure the table is deleted");
visitTableQuestion();
@@ -1346,7 +1350,7 @@ LIMIT
getRunButton().should("have.text", "Running now…");
getRunStatus().should("have.text", "Run in progress…");
- H.DataStudio.runsButton().click();
+ getRunsNavLink().click();
getContentTable().within(() => {
cy.findByText("In progress").should("be.visible");
cy.findByLabelText("Cancel run").click();
@@ -1380,7 +1384,7 @@ LIMIT
"contain",
"Last ran a few seconds ago successfully.",
);
- H.DataStudio.Transforms.content().should(
+ H.DataStudio.Runs.content().should(
"contain",
"This run succeeded before it had a chance to cancel.",
);
@@ -1428,7 +1432,7 @@ LIMIT
});
H.DataStudio.Transforms.dependenciesTab().click();
- H.DataStudio.Transforms.content()
+ H.DataStudio.Dependencies.content()
.should("contain", "Transform B")
.and("contain", "Transform A");
});
@@ -1436,7 +1440,10 @@ LIMIT
it("should show if the transform has no dependencies", () => {
createMbqlTransform({ name: "Transform A", visitTransform: true });
H.DataStudio.Transforms.dependenciesTab().click();
- H.DataStudio.Transforms.content().should("contain", "Nothing uses this");
+ H.DataStudio.Dependencies.content().should(
+ "contain",
+ "Nothing uses this",
+ );
});
});
@@ -1493,7 +1500,7 @@ LIMIT
);
visitTransformListPage();
- getTransformsSidebar().button("Create a transform").click();
+ cy.button("Create a transform").click();
H.popover().findByText("Python script").click();
H.PythonEditor.clear().type(
@@ -1604,7 +1611,7 @@ describe("scenarios > admin > transforms > databases without :schemas", () => {
});
H.DataStudio.Transforms.targetTab().click();
- getTransformsContent().button("Change target").click();
+ getTransformsTargetContent().button("Change target").click();
H.modal().findByLabelText("Schema").should("not.exist");
});
@@ -1612,7 +1619,7 @@ 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();
- getTransformsSidebar().button("Create a transform").click();
+ getTransformsList().button("Create a transform").click();
H.popover().findByText("Query builder").click();
H.miniPicker().within(() => {
@@ -1640,13 +1647,13 @@ describe("scenarios > admin > transforms > jobs", () => {
describe("creation", () => {
it("should be able to create a job with default properties", () => {
visitJobListPage();
- getJobsSidebar().button("Create a job").click();
+ H.DataStudio.Jobs.list().findByRole("link", { name: /New/ }).click();
- getJobPage().button("Save").click();
+ H.DataStudio.Jobs.editor().button("Save").click();
cy.wait("@createJob");
H.undoToast().findByText("New job created").should("be.visible");
- getJobPage().within(() => {
+ H.DataStudio.Jobs.editor().within(() => {
cy.findByPlaceholderText("Name").should("have.value", "New job");
getScheduleFrequencyInput().should("have.value", "daily");
getScheduleTimeInput().should("have.value", "12:00");
@@ -1655,23 +1662,23 @@ describe("scenarios > admin > transforms > jobs", () => {
it("should be able to create a job with custom property values", () => {
visitJobListPage();
- getJobsSidebar().button("Create a job").click();
+ H.DataStudio.Jobs.list().findByRole("link", { name: /New/ }).click();
- getJobPage().within(() => {
+ H.DataStudio.Jobs.editor().within(() => {
cy.findByPlaceholderText("Name").clear().type("Job");
getScheduleFrequencyInput().click();
});
H.popover().findByText("custom").click();
- getJobPage().within(() => {
+ H.DataStudio.Jobs.editor().within(() => {
getCronInput().clear().type("0 * * * ?");
getTagsInput().click();
});
H.popover().findByText("daily").click();
- getJobPage().button("Save").click();
+ H.DataStudio.Jobs.editor().button("Save").click();
cy.wait("@createJob");
H.undoToast().findByText("New job created").should("be.visible");
- getJobPage().within(() => {
+ H.DataStudio.Jobs.editor().within(() => {
cy.findByPlaceholderText("Name").should("have.value", "Job");
getCronInput().should("have.value", "0 * * * ?");
cy.findByText(/This job will run every hour/).should("be.visible");
@@ -1684,13 +1691,13 @@ describe("scenarios > admin > transforms > jobs", () => {
it("should be able to edit the name after creation", () => {
H.createTransformJob({ name: "New job" }, { visitTransformJob: true });
- getJobPage()
+ H.DataStudio.Jobs.editor()
.findByPlaceholderText("Name")
.clear()
.type("New name")
.blur();
H.undoToast().findByText("Job name updated").should("be.visible");
- getJobPage()
+ H.DataStudio.Jobs.editor()
.findByPlaceholderText("Name")
.should("have.value", "New name");
});
@@ -1719,12 +1726,12 @@ describe("scenarios > admin > transforms > jobs", () => {
it("should be able to change the schedule after creation", () => {
H.createTransformJob({ name: "New job" }, { visitTransformJob: true });
- getJobPage().within(() => {
+ H.DataStudio.Jobs.editor().within(() => {
getScheduleFrequencyInput().click();
});
H.popover().findByText("weekly").click();
H.undoToast().findByText("Job schedule updated").should("be.visible");
- getJobPage().within(() => {
+ H.DataStudio.Jobs.editor().within(() => {
getScheduleFrequencyInput().should("have.value", "weekly");
});
});
@@ -1739,8 +1746,8 @@ describe("scenarios > admin > transforms > jobs", () => {
"Monthly job": "monthly",
};
Object.entries(jobNameToFrequency).forEach(([jobName, frequency]) => {
- getJobsSidebar().findByText(jobName).click();
- getJobPage().within(() => {
+ H.DataStudio.Jobs.list().findByText(jobName).click();
+ H.DataStudio.Jobs.editor().within(() => {
getScheduleFrequencyInput().should("have.value", frequency);
});
cy.go("back");
@@ -1789,11 +1796,11 @@ describe("scenarios > admin > transforms > jobs", () => {
event: "transform_job_trigger_manual_run",
});
- getJobPage()
+ H.DataStudio.Jobs.editor()
.findByText("Last ran a few seconds ago successfully.")
.should("be.visible");
- H.DataStudio.runsButton().click();
+ getRunsNavLink().click();
getContentTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("Success").should("be.visible");
@@ -1813,7 +1820,9 @@ describe("scenarios > admin > transforms > jobs", () => {
);
});
runJobAndWaitForFailure();
- getJobPage().findByText("Last run failed a few seconds ago.");
+ H.DataStudio.Jobs.editor().findByText(
+ "Last run failed a few seconds ago.",
+ );
getRunErrorInfoButton().click();
H.modal().should("contain.text", 'relation "abc" does not exist');
});
@@ -1836,8 +1845,8 @@ describe("scenarios > admin > transforms > jobs", () => {
cy.button("Delete job").click();
cy.wait("@deleteJob");
});
- getJobsSidebar().should("be.visible");
- getJobsSidebar().findByText("New job").should("not.exist");
+ H.DataStudio.Jobs.list().should("be.visible");
+ H.DataStudio.Jobs.list().findByText("New job").should("not.exist");
});
});
@@ -1848,14 +1857,14 @@ describe("scenarios > admin > transforms > jobs", () => {
cy.log("make sure that default jobs are created");
visitJobListPage();
- H.DataStudio.Jobs.sidebar().within(() => {
+ H.DataStudio.Jobs.list().within(() => {
jobNames.forEach((jobName) =>
cy.findByText(jobName).should("be.visible"),
);
});
cy.log("make sure that default tags are available for selection");
- getJobsSidebar().button("Create a job").click();
+ H.DataStudio.Jobs.list().findByRole("link", { name: /New/ }).click();
getTagsInput().click();
H.popover().within(() => {
tagNames.forEach((tagName) =>
@@ -1880,7 +1889,7 @@ describe("scenarios > admin > transforms > jobs", () => {
);
});
- H.DataStudio.Jobs.content()
+ H.DataStudio.Jobs.editor()
.findByText("Transforms")
.scrollIntoView()
.should("be.visible");
@@ -1895,7 +1904,11 @@ describe("scenarios > admin > transforms > jobs", () => {
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");
+ H.DataStudio.Jobs.editor()
+ .findByText(/There are no transforms for this job/)
+ .scrollIntoView()
+ .should("be.visible");
+ getContentTable().should("not.exist");
});
});
});
@@ -2241,7 +2254,7 @@ describe("scenarios > admin > transforms > runs", () => {
}
createInitialData();
- H.DataStudio.runsButton().click();
+ getRunsNavLink().click();
testTransformFilter();
testStatusFilter();
testTagFilter();
@@ -2251,20 +2264,20 @@ describe("scenarios > admin > transforms > runs", () => {
});
});
-function getTransformsSidebar() {
- return cy.findByTestId("transforms-sidebar");
+function getTransformsNavLink() {
+ return H.DataStudio.nav().findByRole("link", { name: "Transforms" });
}
-function getTransformsContent() {
- return cy.findByTestId("transforms-content");
+function getRunsNavLink() {
+ return H.DataStudio.nav().findByRole("link", { name: "Runs" });
}
-function getJobsSidebar() {
- return cy.findByTestId("jobs-sidebar");
+function getTransformsList() {
+ return cy.findByTestId("transforms-list");
}
-function getJobPage() {
- return cy.findByTestId("jobs-editor");
+function getTransformsTargetContent() {
+ return cy.findByTestId("transforms-target-content");
}
function getQueryEditor() {
diff --git a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
index 561dbcc7e1b..e702e52c8cd 100644
--- a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
+++ b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts
@@ -37,6 +37,9 @@ const assertEditorContent = (editorType: EditorType, content: string) => {
const makeManualEdit = (editorType: EditorType, newContent: string) =>
editor(editorType).clear().paste(newContent);
+const getMetabotButton = () =>
+ cy.findByRole("button", { name: /Chat with Metabot/ });
+
const assertSuggestionInSidebar = (values: {
oldSourcePartial?: string;
newSourcePartial: string;
@@ -49,10 +52,10 @@ const assertSuggestionInSidebar = (values: {
const assertEditorDiffState = (opts: { exists: boolean }) => {
const should = opts.exists ? "exist" : "not.exist";
- H.DataStudio.Transforms.content()
+ H.DataStudio.Transforms.queryEditor()
.findByRole("button", { name: /apply|create/i })
.should(should);
- H.DataStudio.Transforms.content()
+ H.DataStudio.Transforms.queryEditor()
.findByRole("button", { name: /reject/i })
.should(should);
};
@@ -84,7 +87,7 @@ describe(
describe("create new transform", () => {
it("should create SQL transform via metabot", () => {
visitTransformListPage();
- H.openMetabotViaSearchButton(true);
+ getMetabotButton().click();
cy.log("Ask metabot for a new transform");
H.mockMetabotResponse({
@@ -149,7 +152,7 @@ describe(
it("should create Python transform via metabot", () => {
visitTransformListPage();
- H.openMetabotViaSearchButton(true);
+ getMetabotButton().click();
cy.log("Ask metabot for a new transform");
H.mockMetabotResponse({
@@ -255,7 +258,7 @@ describe(
cy.get("@model").then(({ body: model }) => {
visitTransformListPage();
- H.openMetabotViaSearchButton(true);
+ getMetabotButton().click();
cy.log("Ask metabot for a new transform that references the model");
const modelTagName = `#${model.id}-test-model`;
@@ -301,7 +304,7 @@ describe(
}).as("transformId");
visitTransformListPage();
- H.openMetabotViaSearchButton(true);
+ getMetabotButton().click();
// Ask metabot for a change to existing transform
cy.get("@transformId").then((transformId) => {
@@ -377,7 +380,7 @@ describe(
sourceTables: { foo: tableId },
}).then((transformId) => {
visitTransformListPage();
- H.openMetabotViaSearchButton(true);
+ getMetabotButton().click();
// Ask metabot for a change to existing transform
cy.get("@transformId").then((transformId) => {
diff --git a/enterprise/frontend/src/metabase-enterprise/api/library.ts b/enterprise/frontend/src/metabase-enterprise/api/library.ts
index 393c4544e38..272338c809e 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/library.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/library.ts
@@ -1,4 +1,7 @@
-import type { Collection, CollectionItem } from "metabase-types/api";
+import type {
+ Collection,
+ GetLibraryCollectionResponse,
+} from "metabase-types/api";
import { EnterpriseApi } from "./api";
import { idTag, listTag, tag } from "./tags";
@@ -12,7 +15,7 @@ export const libraryApi = EnterpriseApi.injectEndpoints({
}),
invalidatesTags: [listTag("collection"), tag("library-collection")],
}),
- getLibraryCollection: builder.query<CollectionItem | { data: null }, void>({
+ getLibraryCollection: builder.query<GetLibraryCollectionResponse, void>({
query: () => ({
url: `/api/ee/library`,
method: "GET",
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
deleted file mode 100644
index 65a01cf5f86..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.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
index 8a21543711a..5ea5131c018 100644
--- 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
@@ -1,41 +1,15 @@
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";
+import { Box, Flex, Stack } from "metabase/ui";
type SectionLayoutProps = {
- title?: ReactNode;
- tabs?: ReactNode;
children?: ReactNode;
};
-export function SectionLayout({ title, tabs, children }: SectionLayoutProps) {
+export function SectionLayout({ 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}
@@ -45,11 +19,3 @@ export function SectionLayout({ title, tabs, children }: SectionLayoutProps) {
</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/pages/DataSectionLayout/DataSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
index 9320232aad3..4cc8ff16139 100644
--- 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
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { SectionLayout, SectionTitle } from "../../components/SectionLayout";
+import { SectionLayout } from "../../components/SectionLayout";
type DataSectionLayoutProps = {
children?: ReactNode;
@@ -12,9 +12,5 @@ type DataSectionLayoutProps = {
export function DataSectionLayout({ children }: DataSectionLayoutProps) {
usePageTitle(t`Data`);
- return (
- <SectionLayout title={<SectionTitle title={t`Data`} />}>
- {children}
- </SectionLayout>
- );
+ return <SectionLayout>{children}</SectionLayout>;
}
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
index 26fda041233..f9d4eda4a0b 100644
--- 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
@@ -2,8 +2,18 @@
border-right: 1px solid var(--mb-color-border);
}
+.opened {
+ width: 300px;
+}
+
+.icon {
+ color: var(--mb-color-text-secondary);
+}
+
.tab {
- background-color: var(--mb-color-bg-secondary);
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
&:hover,
&.selected {
@@ -13,10 +23,44 @@
.tab,
.toggle {
+ position: relative;
color: var(--mb-color-text-primary);
&:hover,
&.selected {
color: var(--mb-color-brand);
+
+ .icon {
+ color: inherit;
+ }
}
}
+
+.hoverButton {
+ &:hover {
+ .showOnHover {
+ opacity: 1;
+ }
+
+ .hideOnHover {
+ opacity: 0;
+ }
+ }
+}
+
+.showOnHover {
+ position: absolute;
+ left: 0.5rem;
+ top: 0.75rem;
+ opacity: 0;
+ transition: opacity 400ms ease;
+}
+
+.hideOnHover {
+ opacity: 1;
+ transition: opacity 400ms ease;
+}
+
+.disablePointer {
+ cursor: default;
+}
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
index 0d6800de373..020198a4149 100644
--- 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
@@ -1,8 +1,9 @@
import cx from "classnames";
-import { type ReactNode, useMemo, useState } from "react";
+import type { ReactNode } from "react";
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
+import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import {
@@ -13,61 +14,58 @@ import {
import { getLocation } from "metabase/selectors/routing";
import {
Box,
+ Center,
FixedSizeIcon,
Flex,
type IconName,
+ Loader,
Stack,
+ Text,
Tooltip,
UnstyledButton,
} from "metabase/ui";
-import { DataStudioContext } from "metabase-enterprise/data-studio/common/contexts/DataStudioContext";
import S from "./DataStudioLayout.module.css";
+import { getCurrentTab } from "./utils";
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],
- );
+ const {
+ value: _isNavbarOpened,
+ setValue: setIsNavbarOpened,
+ isLoading,
+ } = useUserKeyValue({
+ namespace: "data_studio",
+ key: "isNavbarOpened",
+ });
+ const isNavbarOpened = _isNavbarOpened !== false;
- 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>
+ return isLoading ? (
+ <Center h="100%">
+ <Loader />
+ </Center>
+ ) : (
+ <Flex h="100%">
+ <DataStudioNav
+ isNavbarOpened={isNavbarOpened}
+ onNavbarToggle={setIsNavbarOpened}
+ />
+ <Box h="100%" flex={1} miw={0}>
+ {children}
+ </Box>
+ </Flex>
);
}
type DataStudioNavProps = {
- isSidebarOpened: boolean;
- isSidebarAvailable: boolean;
- onSidebarToggle: (isOpened: boolean) => void;
+ isNavbarOpened: boolean;
+ onNavbarToggle: (isOpened: boolean) => void;
};
-function DataStudioNav({
- isSidebarOpened,
- isSidebarAvailable,
- onSidebarToggle,
-}: DataStudioNavProps) {
+function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {
const { pathname } = useSelector(getLocation);
const canAccessDataModel = useSelector(
PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel,
@@ -75,57 +73,93 @@ function DataStudioNav({
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());
+
+ const currentTab = getCurrentTab(pathname);
return (
<Stack
- className={S.nav}
+ className={cx(S.nav, { [S.opened]: isNavbarOpened })}
h="100%"
p="0.75rem"
justify="space-between"
data-testid="data-studio-nav"
>
<Stack gap="0.75rem">
+ <DataStudioNavbarToggle
+ isNavbarOpened={isNavbarOpened}
+ onNavbarToggle={onNavbarToggle}
+ />
+ <DataStudioTab
+ label={t`Library`}
+ icon="repository"
+ to={Urls.dataStudioLibrary()}
+ isSelected={currentTab === "library"}
+ showLabel={isNavbarOpened}
+ />
+
{canAccessDataModel && (
<DataStudioTab
- label={t`Data`}
- icon="database"
+ label={t`Data structure`}
+ icon="open_folder"
to={Urls.dataStudioData()}
- isSelected={isDataTab}
+ isSelected={currentTab === "data"}
+ showLabel={isNavbarOpened}
/>
)}
- {canAccessTransforms && (
+ {canAccessDataModel && (
<DataStudioTab
- label={t`Transforms`}
- icon="transform"
- to={Urls.transformList()}
- isSelected={isTransformsTab}
+ label={t`Glossary`}
+ icon="glossary"
+ to={Urls.dataStudioGlossary()}
+ isSelected={currentTab === "glossary"}
+ showLabel={isNavbarOpened}
/>
)}
- <DataStudioTab
- label={t`Modeling`}
- icon="model"
- to={Urls.dataStudioModeling()}
- isSelected={isModelingTab}
- />
{PLUGIN_DEPENDENCIES.isEnabled && (
<DataStudioTab
label={t`Dependency graph`}
- icon="schema"
+ icon="dependencies"
to={Urls.dependencyGraph()}
- isSelected={isDependenciesTab}
+ isSelected={currentTab === "dependencies"}
+ showLabel={isNavbarOpened}
+ />
+ )}
+ {canAccessTransforms && (
+ <DataStudioTab
+ label={t`Transforms`}
+ icon="transform"
+ to={Urls.transformList()}
+ isSelected={currentTab === "transforms"}
+ showLabel={isNavbarOpened}
/>
)}
</Stack>
- {isSidebarAvailable && (
- <DataStudioSidebarToggle
- isSidebarOpened={isSidebarOpened}
- onSidebarToggle={onSidebarToggle}
+ <Stack gap="0.75rem">
+ {canAccessTransforms && (
+ <DataStudioTab
+ label={t`Jobs`}
+ icon="clock"
+ to={Urls.transformJobList()}
+ isSelected={currentTab === "jobs"}
+ showLabel={isNavbarOpened}
+ />
+ )}
+ {canAccessTransforms && (
+ <DataStudioTab
+ label={t`Runs`}
+ icon="play_outlined"
+ to={Urls.transformRunList()}
+ isSelected={currentTab === "runs"}
+ showLabel={isNavbarOpened}
+ />
+ )}
+ <DataStudioTab
+ label={t`Exit`}
+ icon="exit"
+ to={"/"}
+ showLabel={isNavbarOpened}
/>
- )}
+ </Stack>
</Stack>
);
}
@@ -134,52 +168,83 @@ type DataStudioTabProps = {
label: string;
icon: IconName;
to: string;
- isSelected: boolean;
+ isSelected?: boolean;
+ showLabel: boolean;
};
const TOOLTIP_OPEN_DELAY = 1000;
-function DataStudioTab({ label, icon, to, isSelected }: DataStudioTabProps) {
+function DataStudioTab({
+ label,
+ icon,
+ to,
+ isSelected,
+ showLabel,
+}: DataStudioTabProps) {
return (
- <Tooltip label={label} position="right" openDelay={TOOLTIP_OPEN_DELAY}>
+ <Tooltip
+ label={label}
+ position="right"
+ openDelay={TOOLTIP_OPEN_DELAY}
+ disabled={showLabel}
+ >
<Box
className={cx(S.tab, { [S.selected]: isSelected })}
component={ForwardRefLink}
to={to}
- p="0.75rem"
+ p="0.5rem"
bdrs="md"
aria-label={label}
>
- <FixedSizeIcon name={icon} display="block" />
+ <FixedSizeIcon name={icon} display="block" className={S.icon} />
+ {showLabel && <Text lh="sm">{label}</Text>}
</Box>
</Tooltip>
);
}
-type DataStudioSidebarToggleProps = {
- isSidebarOpened: boolean;
- onSidebarToggle: (isOpened: boolean) => void;
+type DataStudioNavbarToggleProps = {
+ isNavbarOpened: boolean;
+ onNavbarToggle: (isOpened: boolean) => void;
};
-function DataStudioSidebarToggle({
- isSidebarOpened,
- onSidebarToggle,
-}: DataStudioSidebarToggleProps) {
+function DataStudioNavbarToggle({
+ isNavbarOpened,
+ onNavbarToggle,
+}: DataStudioNavbarToggleProps) {
return (
- <Tooltip
- label={isSidebarOpened ? t`Close sidebar` : t`Open sidebar`}
- openDelay={TOOLTIP_OPEN_DELAY}
- >
+ <Flex justify="space-between">
<UnstyledButton
- className={S.toggle}
- p="0.75rem"
+ className={cx(S.toggle, {
+ [S.hoverButton]: !isNavbarOpened,
+ [S.disablePointer]: isNavbarOpened,
+ })}
+ p="0.5rem"
bdrs="md"
- onClick={() => onSidebarToggle(!isSidebarOpened)}
+ onClick={() => !isNavbarOpened && onNavbarToggle(true)}
>
<FixedSizeIcon
- name={isSidebarOpened ? "sidebar_closed" : "sidebar_open"}
+ name="data_studio"
+ size={27}
+ mx="-5px"
+ className={cx(S.hideOnHover)}
+ />
+ <FixedSizeIcon
+ name="sidebar_open"
+ className={S.showOnHover}
+ c="text-secondary"
/>
</UnstyledButton>
- </Tooltip>
+ {isNavbarOpened && (
+ <UnstyledButton
+ className={S.toggle}
+ p="0.5rem"
+ bdrs="md"
+ onClick={() => onNavbarToggle(false)}
+ >
+ <FixedSizeIcon name="sidebar_closed" c="text-secondary" />
+ </UnstyledButton>
+ )}
+ </Flex>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts
new file mode 100644
index 00000000000..277e56f18cd
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts
@@ -0,0 +1,29 @@
+import * as Urls from "metabase/lib/urls";
+
+type TabName =
+ | "data"
+ | "library"
+ | "transforms"
+ | "jobs"
+ | "runs"
+ | "dependencies"
+ | "glossary";
+
+export const getCurrentTab = (pathname: string): TabName => {
+ switch (true) {
+ case pathname.startsWith(Urls.dataStudioGlossary()):
+ return "glossary";
+ case pathname.startsWith(Urls.transformJobList()):
+ return "jobs";
+ case pathname.startsWith(Urls.dependencyGraph()):
+ return "dependencies";
+ case pathname.startsWith(Urls.dataStudioLibrary()):
+ return "library";
+ case pathname.startsWith(Urls.transformRunList()):
+ return "runs";
+ case pathname.startsWith(Urls.transformList()):
+ return "transforms";
+ default:
+ return "data";
+ }
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
new file mode 100644
index 00000000000..1c6f3b1b80d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
@@ -0,0 +1,30 @@
+import { getCurrentTab } from "./utils";
+
+describe("getCurrentTab", () => {
+ it.each`
+ pathname | expectedTab
+ ${"/data-studio/glossary"} | ${"glossary"}
+ ${"/data-studio/glossary/some-path"} | ${"glossary"}
+ ${"/data-studio/transforms/jobs"} | ${"jobs"}
+ ${"/data-studio/transforms/jobs/123"} | ${"jobs"}
+ ${"/data-studio/transforms/jobs/new"} | ${"jobs"}
+ ${"/data-studio/dependencies"} | ${"dependencies"}
+ ${"/data-studio/dependencies?id=1&type=card"} | ${"dependencies"}
+ ${"/data-studio/library"} | ${"library"}
+ ${"/data-studio/library/collections/123"} | ${"library"}
+ ${"/data-studio/library/metrics/456"} | ${"library"}
+ ${"/data-studio/transforms/runs"} | ${"runs"}
+ ${"/data-studio/transforms/runs?page=2"} | ${"runs"}
+ ${"/data-studio/transforms"} | ${"transforms"}
+ ${"/data-studio/transforms/123"} | ${"transforms"}
+ ${"/data-studio/transforms/new/query"} | ${"transforms"}
+ ${"/data-studio/data"} | ${"data"}
+ ${"/data-studio/data/database/1"} | ${"data"}
+ ${"/data-studio"} | ${"data"}
+ `(
+ "should return '$expectedTab' for pathname '$pathname'",
+ ({ pathname, expectedTab }) => {
+ expect(getCurrentTab(pathname)).toBe(expectedTab);
+ },
+ );
+});
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
index 57ff629486b..722812d8996 100644
--- 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
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { SectionLayout, SectionTitle } from "../../components/SectionLayout";
+import { SectionLayout } from "../../components/SectionLayout";
type DependenciesSectionLayoutProps = {
children?: ReactNode;
@@ -14,9 +14,5 @@ export function DependenciesSectionLayout({
}: DependenciesSectionLayoutProps) {
usePageTitle(t`Dependency graph`);
- return (
- <SectionLayout title={<SectionTitle title={t`Dependency graph`} />}>
- {children}
- </SectionLayout>
- );
+ return <SectionLayout>{children}</SectionLayout>;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx
new file mode 100644
index 00000000000..7ce7f1d7cdb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx
@@ -0,0 +1,71 @@
+import { 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_SNIPPET_FOLDERS } from "metabase/plugins";
+import { canUserCreateQueries } from "metabase/selectors/user";
+import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
+import type { CollectionId } from "metabase-types/api";
+
+export const CreateMenu = ({
+ metricCollectionId,
+}: {
+ modelCollectionId?: CollectionId;
+ metricCollectionId?: CollectionId;
+}) => {
+ const [creatingSnippetFolder, setCreatingSnippetFolder] = useState(false);
+
+ const hasDataAccess = useSelector(canUserCreateQueries);
+
+ const canCreateMetric = hasDataAccess && metricCollectionId;
+
+ return (
+ <>
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Button leftSection={<Icon name="add" />}>{t`New`}</Button>
+ </Menu.Target>
+ <Menu.Dropdown>
+ {canCreateMetric && (
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioMetric({
+ collectionId: metricCollectionId,
+ })}
+ leftSection={<FixedSizeIcon name="metric" />}
+ >
+ {t`Metric`}
+ </Menu.Item>
+ )}
+ <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={() => setCreatingSnippetFolder(true)}
+ >
+ {t`New snippet folder`}
+ </Menu.Item>
+ )}
+ </Menu.Dropdown>
+ </Menu>
+ <PLUGIN_SNIPPET_FOLDERS.CollectionFormModal
+ opened={creatingSnippetFolder}
+ collection={{
+ name: "",
+ description: null,
+ }}
+ onClose={() => setCreatingSnippetFolder(false)}
+ onSaved={() => setCreatingSnippetFolder(false)}
+ />
+ </>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
new file mode 100644
index 00000000000..0ac40a92618
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
@@ -0,0 +1,267 @@
+import dayjs from "dayjs";
+import { useCallback, useState } from "react";
+import { goBack, push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useListCollectionsTreeQuery } from "metabase/api";
+import { isLibraryCollection } from "metabase/collections/utils";
+import { usePageTitle } from "metabase/hooks/use-page-title";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
+import {
+ Button,
+ Card,
+ FixedSizeIcon,
+ Flex,
+ Group,
+ Icon,
+ Menu,
+ Stack,
+ TextInput,
+} from "metabase/ui";
+import { CreateLibraryModal } from "metabase-enterprise/data-studio/common/components/CreateLibraryModal";
+import { Table } from "metabase-enterprise/data-studio/common/components/Table";
+import { useTreeFilter } from "metabase-enterprise/data-studio/common/components/Table/useTreeFilter";
+import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";
+import { ListLoadingState } from "metabase-enterprise/transforms/components/ListLoadingState";
+import type { Collection, CollectionId } from "metabase-types/api";
+
+import { SectionLayout } from "../../components/SectionLayout";
+
+import { CreateMenu } from "./CreateMenu";
+import {
+ useBuildSnippetTree,
+ useBuildTreeForCollection,
+ useErrorHandling,
+} from "./hooks";
+import { type TreeItem, isCollection } from "./types";
+import { getWritableCollection } from "./utils";
+
+export function LibrarySectionLayout() {
+ usePageTitle(t`Library`);
+ const dispatch = useDispatch();
+ const [editingCollection, setEditingCollection] = useState<Collection | null>(
+ null,
+ );
+ const [permissionsCollectionId, setPermissionsCollectionId] =
+ useState<CollectionId | null>(null);
+ const [searchQuery, setSearchQuery] = useState<string>();
+
+ const { data: collections = [], isLoading: isLoadingCollections } =
+ useListCollectionsTreeQuery({
+ "exclude-other-user-collections": true,
+ "exclude-archived": true,
+ "include-library": true,
+ });
+
+ const libraryCollection = collections.find(isLibraryCollection);
+
+ const tableCollection =
+ libraryCollection &&
+ getWritableCollection(libraryCollection, "library-data");
+
+ const metricCollection =
+ libraryCollection &&
+ getWritableCollection(libraryCollection, "library-metrics");
+
+ const handleItemSelect = useCallback(
+ (item: TreeItem) => {
+ // Casting because these should not be collections, but collection items with
+ // numbers for IDs
+ if (item.model === "metric") {
+ dispatch(push(Urls.dataStudioMetric(item.id as number)));
+ } else if (item.model === "snippet") {
+ dispatch(push(Urls.dataStudioSnippet(item.id as number)));
+ } else if (item.model === "table") {
+ dispatch(push(Urls.dataStudioTable(item.id as number)));
+ }
+ },
+ [dispatch],
+ );
+ const {
+ tree: tablesTree,
+ hasChildren: hasTables,
+ isLoading: loadingTables,
+ error: tablesError,
+ } = useBuildTreeForCollection(tableCollection);
+ const {
+ tree: metricsTree,
+ hasChildren: hasMetrics,
+ isLoading: loadingMetrics,
+ error: metricsError,
+ } = useBuildTreeForCollection(metricCollection);
+ const {
+ tree: snippetTree,
+ hasChildren: hasSnippets,
+ isLoading: loadingSnippets,
+ error: snippetsError,
+ } = useBuildSnippetTree();
+
+ const filteredTree = useTreeFilter({
+ data: [...tablesTree, ...metricsTree, ...snippetTree],
+ searchQuery,
+ searchProps: ["name"],
+ });
+
+ const libraryHasContent = hasTables || hasMetrics || hasSnippets;
+ const isLoading = loadingTables || loadingMetrics || loadingSnippets;
+ useErrorHandling(tablesError || metricsError || snippetsError);
+ const filterReturnedEmpty =
+ !!searchQuery && filteredTree.length === 0 && libraryHasContent;
+
+ return (
+ <>
+ <SectionLayout>
+ <Stack
+ px="3.5rem"
+ pt="4rem"
+ bg="background-light"
+ mih="100%"
+ data-testid="library-page"
+ >
+ <Flex gap="0.5rem">
+ <TextInput
+ placeholder={t`Search...`}
+ leftSection={<Icon name="search" />}
+ bdrs="md"
+ flex="1"
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ />
+ <CreateMenu metricCollectionId={metricCollection?.id} />
+ </Flex>
+ <Card withBorder p={0}>
+ {isLoading ? (
+ <ListLoadingState />
+ ) : !libraryHasContent || filterReturnedEmpty ? (
+ <ListEmptyState
+ label={
+ filterReturnedEmpty
+ ? t`No results for "${searchQuery}"`
+ : t`No tables, metrics, or snippets yet`
+ }
+ />
+ ) : (
+ <Table
+ data={filteredTree}
+ columns={[
+ {
+ accessorKey: "name",
+ header: t`Name`,
+ meta: { width: "auto" },
+ cell: ({ getValue, row }) => {
+ const data = row.original;
+ return (
+ <Group data-testid={`${data.model}-name`} gap="sm">
+ {data.icon && <Icon name={data.icon} c="brand" />}
+ {getValue()}
+ </Group>
+ );
+ },
+ },
+ {
+ accessorKey: "updatedAt",
+ header: t`Updated At`,
+ cell: ({ getValue }) => {
+ const value = getValue() as string;
+
+ return value && dayjs(value).format("lll");
+ },
+ },
+ {
+ id: "actions",
+ header: "",
+ size: 24,
+ cell: ({ row: { original } }) => {
+ const { data } = original;
+ if (
+ isCollection(data) &&
+ data.model === "collection" &&
+ data.namespace === "snippets"
+ ) {
+ if (data.id === "root") {
+ return (
+ <RootSnippetsCollectionMenu
+ setPermissionsCollectionId={
+ setPermissionsCollectionId
+ }
+ />
+ );
+ } else {
+ return (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionMenu
+ collection={data}
+ onEditDetails={setEditingCollection}
+ onChangePermissions={setPermissionsCollectionId}
+ />
+ );
+ }
+ }
+
+ return null;
+ },
+ },
+ ]}
+ onSelect={handleItemSelect}
+ />
+ )}
+ </Card>
+ </Stack>
+ </SectionLayout>
+ {editingCollection && (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionFormModal
+ collection={editingCollection}
+ onClose={() => setEditingCollection(null)}
+ onSaved={() => setEditingCollection(null)}
+ />
+ )}
+ {permissionsCollectionId !== null && (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionPermissionsModal
+ collectionId={permissionsCollectionId}
+ onClose={() => setPermissionsCollectionId(null)}
+ />
+ )}
+ <CreateLibraryModal
+ isOpened={!isLoadingCollections && !libraryCollection}
+ onClose={() => {
+ dispatch(goBack());
+ }}
+ />
+ </>
+ );
+}
+
+const RootSnippetsCollectionMenu = ({
+ setPermissionsCollectionId,
+}: {
+ setPermissionsCollectionId: (id: CollectionId) => void;
+}) => {
+ return (
+ <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`}
+ onClick={(e) => e.stopPropagation()}
+ />
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="lock" />}
+ onClick={(e) => {
+ e.stopPropagation();
+ setPermissionsCollectionId("root");
+ }}
+ >
+ {t`Change permissions`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/hooks.ts
new file mode 100644
index 00000000000..2985d461075
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/hooks.ts
@@ -0,0 +1,124 @@
+import { useEffect, useMemo } from "react";
+import { t } from "ttag";
+import _ from "underscore";
+
+import {
+ skipToken,
+ useListCollectionItemsQuery,
+ useListCollectionsQuery,
+ useListSnippetsQuery,
+} from "metabase/api";
+import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
+import { getIcon } from "metabase/lib/icon";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import type { Collection } from "metabase-types/api";
+
+import type { TreeItem } from "./types";
+import { buildSnippetTree } from "./utils";
+
+export const useBuildTreeForCollection = (
+ collection?: Collection,
+): {
+ isLoading: boolean;
+ hasChildren?: boolean;
+ tree: TreeItem[];
+ error?: unknown;
+} => {
+ const {
+ data: items,
+ isLoading,
+ error,
+ } = useListCollectionItemsQuery(
+ collection ? { id: collection.id, models: ["metric", "table"] } : skipToken,
+ );
+
+ return useMemo(() => {
+ if (isLoading || !items || !collection) {
+ return {
+ isLoading,
+ tree: [],
+ error,
+ };
+ }
+ return {
+ isLoading,
+ error,
+ hasChildren: items.data.length > 0,
+ tree: [
+ {
+ name: collection.name,
+ id: collection.id,
+ icon: getIcon({ ...collection, model: "collection" }).name,
+ data: { ...collection, model: "collection" },
+ model: "collection",
+ children: items.data.map((item) => ({
+ name: item.name,
+ updatedAt: item["last-edit-info"]?.timestamp,
+ icon: getIcon({ model: item.model }).name,
+ data: item,
+ id: item.id,
+ model: item.model,
+ })),
+ },
+ ],
+ };
+ }, [isLoading, items, collection, error]);
+};
+
+export const useBuildSnippetTree = (): {
+ isLoading: boolean;
+ tree: TreeItem[];
+ hasChildren?: boolean;
+ error?: unknown;
+} => {
+ const {
+ data: snippets,
+ isLoading: loadingSnippets,
+ error,
+ } = useListSnippetsQuery();
+ const { data: snippetCollections, isLoading: loadingCollections } =
+ useListCollectionsQuery({
+ namespace: "snippets",
+ });
+
+ return useMemo(() => {
+ if (
+ loadingSnippets ||
+ loadingCollections ||
+ !snippets ||
+ !snippetCollections
+ ) {
+ return {
+ isLoading: true,
+ tree: [],
+ error,
+ };
+ }
+
+ return {
+ isLoading: false,
+ error,
+ tree: buildSnippetTree(snippetCollections, snippets),
+ hasChildren: snippets.length > 0 || snippetCollections.length > 1,
+ };
+ }, [
+ loadingSnippets,
+ loadingCollections,
+ snippets,
+ snippetCollections,
+ error,
+ ]);
+};
+
+export const useErrorHandling = (_error: unknown) => {
+ const error = useDebouncedValue(_error, 1000);
+ const { sendErrorToast } = useMetadataToasts();
+
+ useEffect(() => {
+ if (_.isObject(error) && typeof error?.data?.message === "string") {
+ sendErrorToast(
+ t`Data couldn't be fetched properly: ${error.data.message}`,
+ );
+ }
+ }, [error, sendErrorToast]);
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/index.ts
new file mode 100644
index 00000000000..a008ab29de2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/index.ts
@@ -0,0 +1 @@
+export * from "./LibrarySectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/types.ts
new file mode 100644
index 00000000000..4f9b8100050
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/types.ts
@@ -0,0 +1,26 @@
+import type { IconName } from "metabase/ui";
+import type {
+ Collection,
+ CollectionItem,
+ CollectionItemModel,
+ CollectionNamespace,
+} from "metabase-types/api";
+
+export type TreeItem = {
+ name: string;
+ icon: IconName;
+ updatedAt?: string;
+ model: CollectionItemModel;
+ data: (Collection | Omit<CollectionItem, "getUrl">) & {
+ model: CollectionItem["model"];
+ namespace?: CollectionNamespace;
+ };
+ children?: TreeItem[];
+ id: number | string;
+};
+
+export const isCollection = (
+ c: Collection | Omit<CollectionItem, "getUrl">,
+): c is Collection => {
+ return Object.keys(c).includes("namespace");
+};
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/LibrarySectionLayout/utils.ts
similarity index 69%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/utils.ts
index 6d59745d2f5..71160d7ab6a 100644
--- 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/LibrarySectionLayout/utils.ts
@@ -1,29 +1,22 @@
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";
+import type {
+ Collection,
+ CollectionType,
+ NativeQuerySnippet,
+} from "metabase-types/api";
-type SnippetTreeItem = NativeQuerySnippet & { model: "snippet" };
-type CollectionTreeItem = Collection & { model: "collection" };
+import type { TreeItem } from "./types";
-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> {
+function createSnippetNode(snippet: NativeQuerySnippet): TreeItem {
return {
id: snippet.id,
name: snippet.name,
icon: "snippet",
+ model: "snippet",
data: { ...snippet, model: "snippet" },
+ updatedAt: snippet.updated_at,
};
}
@@ -31,7 +24,7 @@ function buildCollectionNode(
collection: Collection,
allCollections: Collection[],
allSnippets: NativeQuerySnippet[],
-): ITreeNodeItem<TreeItem> {
+): TreeItem {
const isRoot = isRootCollection(collection);
const parentIdToMatch = isRoot ? null : collection.id;
@@ -52,6 +45,7 @@ function buildCollectionNode(
return {
id: collection.id,
name: collection.name,
+ model: "collection",
icon: isRoot ? "snippet" : "folder",
data: { ...collection, model: "collection" },
children: children.length > 0 ? children : undefined,
@@ -61,7 +55,7 @@ function buildCollectionNode(
export function buildSnippetTree(
snippetCollections: Collection[],
snippets: NativeQuerySnippet[],
-): ITreeNodeItem<TreeItem>[] {
+): TreeItem[] {
const collections = snippetCollections.filter((c) => !c.archived);
const activeSnippets = snippets.filter((s) => !s.archived);
@@ -79,3 +73,13 @@ export function buildSnippetTree(
return [{ ...rootNode, name: t`SQL snippets` }];
}
+
+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/ModelingSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSectionLayout.tsx
deleted file mode 100644
index 0af492d58dc..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSectionLayout.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-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/LibraryCollectionTree/LibraryCollectionTree.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx
deleted file mode 100644
index 0b2356aa59e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-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;
-};
-
-export function LibraryCollectionTree({
- rootCollection,
- selectedCollectionId,
- hasDataAccess,
-}: LibraryCollectionTreeProps) {
- const collectionTree = useMemo(
- () => buildCollectionTree([rootCollection]),
- [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 canCreateMetric = hasDataAccess && metricCollection != null;
- if (!canCreateMetric) {
- return null;
- }
-
- return <CreateCardMenu metricCollectionId={metricCollection?.id} />;
- }}
- 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
deleted file mode 100644
index 9bc5cd07304..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index bb11a7d2843..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/utils.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 66cca6b8377..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-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 { CreateLibraryModal } from "metabase-enterprise/data-studio/common/components/CreateLibraryModal";
-import type { Collection, CollectionId } from "metabase-types/api";
-
-import { ModelingSidebarSection } from "../ModelingSidebarSection";
-
-import { LibraryCollectionTree } from "./LibraryCollectionTree";
-
-export type LibrarySectionProps = {
- collections: Collection[];
- selectedCollectionId: CollectionId | undefined;
- hasDataAccess: boolean;
- hasNativeWrite: boolean;
-};
-
-export function LibrarySection({
- collections,
- selectedCollectionId,
- hasDataAccess,
-}: 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}
- />
- );
- }
-
- if (isAdmin) {
- return (
- <>
- <ModelingSidebarSection
- title={t`Library`}
- icon="repository"
- onClick={openModal}
- />
- <CreateLibraryModal
- isOpened={isModalOpened}
- 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
deleted file mode 100644
index 94f580053c2..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index a5a847c52b9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebar.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { useListCollectionsTreeQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
-import {
- canUserCreateNativeQueries,
- canUserCreateQueries,
-} from "metabase/selectors/user";
-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: collections = [], isLoading } = useListCollectionsTreeQuery({
- "exclude-other-user-collections": true,
- "exclude-archived": true,
- "include-library": true,
- });
- const hasDataAccess = useSelector(canUserCreateQueries);
- const hasNativeWrite = useSelector(canUserCreateNativeQueries);
-
- 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
deleted file mode 100644
index 388e8fd90db..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.module.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.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
deleted file mode 100644
index ec0ddc96ebb..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/ModelingSidebarSection.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index d3fa8e93377..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index be912f2f327..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.module.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.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
deleted file mode 100644
index 79398ab2a11..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/ModelingSidebarTreeNode.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 718b695b4d2..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarTreeNode/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 72a33c00477..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-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 = {
- metricCollectionId?: CollectionId;
-};
-
-export function CreateCardMenu({ metricCollectionId }: CreateCardMenuProps) {
- const handleClick = (event: MouseEvent) => {
- event.stopPropagation();
- };
-
- return (
- <Menu position="bottom-end">
- <Tooltip label={t`Create metric`}>
- <Menu.Target>
- <Button
- w={24}
- h={24}
- size="compact-xs"
- variant="subtle"
- c="text-medium"
- aria-label={t`Create metric`}
- leftSection={<FixedSizeIcon name="add" size={16} />}
- onClick={handleClick}
- />
- </Menu.Target>
- </Tooltip>
- <Menu.Dropdown>
- <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
deleted file mode 100644
index 2b7cfebb85b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 24ba1e5a92e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.module.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.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
deleted file mode 100644
index 48838a13c90..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/ModelingSidebarView.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index c99c5b57571..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/SnippetsSection.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-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
deleted file mode 100644
index 9e0b08c38f8..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/SnippetsSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SnippetsSection } from "./SnippetsSection";
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
deleted file mode 100644
index 9ece1a91122..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 55eb947d9cd..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 0a1f4cbe023..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelingSectionLayout";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader.tsx
new file mode 100644
index 00000000000..0368bb94db3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader.tsx
@@ -0,0 +1,21 @@
+import type { ReactNode } from "react";
+
+import { PLUGIN_METABOT } from "metabase/plugins";
+import { Box, Flex } from "metabase/ui";
+
+interface TransformsSectionHeaderProps {
+ leftSection?: ReactNode;
+}
+
+export const TransformsSectionHeader = ({
+ leftSection: breadcrumbs,
+}: TransformsSectionHeaderProps) => {
+ return (
+ <Flex px="3.5rem" my="md">
+ {breadcrumbs}
+ <Box ml="auto">
+ <PLUGIN_METABOT.MetabotDataStudioButton />
+ </Box>
+ </Flex>
+ );
+};
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
index 0ad222f3bfe..5235e85dd74 100644
--- 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
@@ -3,12 +3,6 @@ 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";
@@ -18,53 +12,9 @@ type TransformsSectionLayoutProps = {
};
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,
- },
- ];
+ return <SectionLayout>{children}</SectionLayout>;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.tsx
index cc59e477072..5b049360ebd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CreateLibraryModal/CreateLibraryModal.tsx
@@ -28,7 +28,7 @@ type CreateLibraryModalProps = {
title?: string;
explanatorySentence?: string;
isOpened: boolean;
- onCreate: (collection: Collection) => void;
+ onCreate?: (collection: Collection) => void;
onClose: () => void;
};
@@ -72,7 +72,7 @@ function ModalTitle({ title }: ModalTitleProps) {
type ModalBodyProps = {
explanatorySentence?: string;
- onCreate: (collection: Collection) => void;
+ onCreate?: (collection: Collection) => void;
onClose: () => void;
};
@@ -84,7 +84,7 @@ function ModalBody({ explanatorySentence, onCreate, onClose }: ModalBodyProps) {
const collection = await createLibrary().unwrap();
sendSuccessToast(t`Library created`);
trackDataStudioLibraryCreated(collection.id);
- onCreate(collection);
+ onCreate?.(collection);
};
return (
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
new file mode 100644
index 00000000000..dc35f6eb271
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
@@ -0,0 +1,18 @@
+import { Breadcrumbs, type BreadcrumbsProps, Icon } from "metabase/ui";
+
+interface DataStudioBreadcrumbs extends BreadcrumbsProps {
+ loading?: boolean;
+}
+
+export const DataStudioBreadcrumbs = ({
+ loading,
+ ...rest
+}: DataStudioBreadcrumbs) => (
+ <Breadcrumbs
+ separator={<Icon size={12} name="chevronright" />}
+ fz="sm"
+ c="text-secondary"
+ style={{ visibility: loading ? "hidden" : undefined }}
+ {...rest}
+ />
+);
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
index 11594b70a3e..0c556301bc5 100644
--- 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
@@ -18,6 +18,7 @@ interface PaneHeaderProps extends Omit<GroupProps, "title"> {
menu?: ReactNode;
tabs?: ReactNode;
actions?: ReactNode;
+ breadcrumbs?: ReactNode;
}
export const PaneHeader = ({
@@ -27,6 +28,7 @@ export const PaneHeader = ({
menu,
tabs,
actions,
+ breadcrumbs,
...rest
}: PaneHeaderProps) => {
return (
@@ -40,6 +42,11 @@ export const PaneHeader = ({
{...rest}
>
<Stack gap="sm">
+ {breadcrumbs && (
+ <Box mb="lg" mt="sm">
+ {breadcrumbs}
+ </Box>
+ )}
<Group align="center" gap="xs" wrap="nowrap">
{icon && <FixedSizeIcon name={icon} c="brand" size={20} />}
{title}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.tsx
index 19f14929970..665d6114a95 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PublishTablesModal/PublishTablesModal.tsx
@@ -134,7 +134,7 @@ function ModalBody({
if (collection != null) {
sendSuccessToast(
t`Published`,
- () => dispatch(push(Urls.dataStudioCollection(collection.id))),
+ () => dispatch(push(Urls.dataStudioLibrary())),
t`Go to ${collection.name}`,
);
} else {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.module.css
new file mode 100644
index 00000000000..31f0277ff2c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.module.css
@@ -0,0 +1,56 @@
+.Row {
+ display: flex;
+ width: 100%;
+ border-bottom: 1px solid var(--mb-color-border);
+ color: var(--mb-color-text-dark);
+ padding-top: 0.75rem;
+ padding-bottom: 0.75rem;
+ padding-left: calc(var(--depth, 0rem) + 1.5rem);
+ padding-right: 1rem;
+ font-size: 14px;
+ line-height: 20px;
+ background: inherit;
+ cursor: pointer;
+
+ &:hover {
+ background-color: var(--mb-color-brand-light);
+ }
+}
+
+.Cell {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+}
+
+.Table {
+ background: inherit;
+ display: grid;
+}
+
+.Header {
+ background: inherit;
+ display: grid;
+ position: sticky;
+ top: 0;
+ z-index: 1;
+
+ .Row {
+ cursor: unset;
+
+ &:hover {
+ background-color: inherit;
+ }
+ }
+}
+
+.HeaderBadge {
+ cursor: pointer;
+ user-select: none;
+}
+
+.ScrollContainer {
+ background: inherit;
+ overflow: auto;
+ position: relative;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.tsx
new file mode 100644
index 00000000000..4f11a2cb611
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.tsx
@@ -0,0 +1,216 @@
+import {
+ type ColumnDef,
+ type Row,
+ type Table,
+ flexRender,
+ getCoreRowModel,
+ getExpandedRowModel,
+ getSortedRowModel,
+ useReactTable,
+} from "@tanstack/react-table";
+import {
+ type VirtualItem,
+ type Virtualizer,
+ useVirtualizer,
+} from "@tanstack/react-virtual";
+import { type CSSProperties, type ReactNode, useState } from "react";
+
+import { Badge, Icon } from "metabase/ui";
+
+import S from "./Table.module.css";
+
+export const TableComponent = <
+ T extends Record<string, any> & { children?: T[] },
+>({
+ data,
+ columns,
+ onSelect,
+}: {
+ data: T[];
+ columns: ColumnDef<T, ReactNode>[];
+ onSelect: (item: T) => void;
+}) => {
+ const [scrollRef, setScrollRef] = useState<HTMLDivElement | null>(null);
+
+ const table = useReactTable({
+ data,
+ columns,
+ getCoreRowModel: getCoreRowModel(),
+ getSortedRowModel: getSortedRowModel(),
+ getExpandedRowModel: getExpandedRowModel(),
+ getSubRows: (row) => row.children,
+ initialState: {
+ expanded: true,
+ },
+ });
+
+ return (
+ <div className={S.ScrollContainer} ref={(e) => setScrollRef(e)}>
+ {/* Even though we're still using semantic table tags, we must use CSS grid and flexbox for dynamic row heights */}
+ <table className={S.Table}>
+ <thead className={S.Header}>
+ {table.getHeaderGroups().map((headerGroup) => (
+ <tr key={headerGroup.id} className={S.Row}>
+ {headerGroup.headers.map((header) => {
+ const headerContent = flexRender(
+ header.column.columnDef.header,
+ header.getContext(),
+ );
+ return (
+ <th
+ key={header.id}
+ style={{
+ display: "flex",
+ ...getColumWidthStyle(header.column.columnDef),
+ }}
+ >
+ {headerContent && (
+ <Badge
+ onClick={header.column.getToggleSortingHandler()}
+ className={S.HeaderBadge}
+ rightSection={
+ {
+ asc: <Icon name="chevronup" size={10} />,
+ desc: <Icon name="chevrondown" size={10} />,
+ }[header.column.getIsSorted() as string] ?? null
+ }
+ >
+ {headerContent}
+ </Badge>
+ )}
+ </th>
+ );
+ })}
+ </tr>
+ ))}
+ </thead>
+ {scrollRef && (
+ <TableBody
+ table={table}
+ tableContainerRef={scrollRef}
+ onSelect={onSelect}
+ />
+ )}
+ </table>
+ </div>
+ );
+};
+
+interface TableBodyProps<T> {
+ table: Table<T>;
+ tableContainerRef: HTMLDivElement;
+ onSelect: (item: T) => void;
+}
+
+function TableBody<T>({
+ table,
+ tableContainerRef,
+ onSelect,
+}: TableBodyProps<T>) {
+ const { rows } = table.getRowModel();
+
+ // Important: Keep the row virtualizer in the lowest component possible to avoid unnecessary re-renders.
+ const rowVirtualizer = useVirtualizer<HTMLDivElement, HTMLTableRowElement>({
+ count: rows.length,
+ estimateSize: () => 33, //estimate row height for accurate scrollbar dragging
+ getScrollElement: () => tableContainerRef,
+ //measure dynamic row height, except in firefox because it measures table border height incorrectly
+ measureElement:
+ typeof window !== "undefined" &&
+ navigator.userAgent.indexOf("Firefox") === -1
+ ? (element) => element?.getBoundingClientRect().height
+ : undefined,
+ overscan: 5,
+ });
+
+ return (
+ <tbody
+ style={{
+ display: "grid",
+ height: `${rowVirtualizer.getTotalSize()}px`, //tells scrollbar how big the table is
+ position: "relative", //needed for absolute positioning of rows
+ }}
+ >
+ {rowVirtualizer.getVirtualItems().map((virtualRow) => {
+ const row = rows[virtualRow.index] as Row<T>;
+ return (
+ <TableBodyRow
+ key={row.id}
+ row={row}
+ virtualRow={virtualRow}
+ rowVirtualizer={rowVirtualizer}
+ onSelect={onSelect}
+ />
+ );
+ })}
+ </tbody>
+ );
+}
+
+interface TableBodyRowProps<T> {
+ row: Row<T>;
+ virtualRow: VirtualItem;
+ rowVirtualizer: Virtualizer<HTMLDivElement, HTMLTableRowElement>;
+ onSelect: (item: T) => void;
+}
+
+function TableBodyRow<T>({
+ row,
+ virtualRow,
+ rowVirtualizer,
+ onSelect,
+}: TableBodyRowProps<T>) {
+ const { depth } = row;
+
+ const canExpand = row.getCanExpand();
+
+ return (
+ <tr
+ data-index={virtualRow.index} //needed for dynamic row height measurement
+ ref={(node) => rowVirtualizer.measureElement(node)} //measure dynamic row height
+ key={row.id}
+ className={S.Row}
+ style={{
+ position: "absolute",
+ transform: `translateY(${virtualRow.start}px)`, //this should always be a `style` as it changes on scroll
+ paddingLeft: `${depth + 1}rem`,
+ }}
+ onClick={
+ canExpand
+ ? row.getToggleExpandedHandler()
+ : () => onSelect?.(row.original)
+ }
+ >
+ {row.getVisibleCells().map((cell, index) => {
+ return (
+ <td
+ key={cell.id}
+ className={S.Cell}
+ style={{
+ ...getColumWidthStyle(cell.column.columnDef),
+ }}
+ >
+ {canExpand && index === 0 && (
+ <Icon
+ size={10}
+ name={row.getIsExpanded() ? "chevrondown" : "chevronright"}
+ />
+ )}
+ {flexRender(cell.column.columnDef.cell, cell.getContext())}
+ </td>
+ );
+ })}
+ </tr>
+ );
+}
+
+const getColumWidthStyle = <T,>(column: ColumnDef<T>): CSSProperties => {
+ if (column.meta?.width === "auto") {
+ return {
+ flexGrow: 1,
+ };
+ }
+ return {
+ width: column.size,
+ };
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/index.ts
new file mode 100644
index 00000000000..973e41951f3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/index.ts
@@ -0,0 +1 @@
+export { TableComponent as Table } from "./Table";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/useTreeFilter.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/useTreeFilter.ts
new file mode 100644
index 00000000000..83394e7f884
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/useTreeFilter.ts
@@ -0,0 +1,50 @@
+export const useTreeFilter = <
+ T extends Record<string, any> & { children?: T[] },
+ K extends keyof T,
+>({
+ data,
+ searchQuery,
+ searchProps,
+}: {
+ data: T[];
+ searchQuery: string | undefined;
+ searchProps: K[];
+}): T[] => {
+ const filterLevel = (nodes: T[]): T[] => {
+ return nodes
+ .map((node) => {
+ if (node.children) {
+ const filteredChildren = filterLevel(node.children);
+ if (filteredChildren.length > 0) {
+ return { ...node, children: filteredChildren };
+ } else {
+ return null;
+ }
+ }
+
+ // Dealing with leaf nodes
+
+ if (
+ searchProps.some((s) => {
+ if (typeof node[s] !== "string") {
+ return false;
+ }
+ if (node[s].includes(searchQuery)) {
+ return true;
+ }
+ return false;
+ })
+ ) {
+ return node;
+ }
+
+ return null;
+ })
+ .filter((x) => !!x);
+ };
+
+ if (!searchQuery) {
+ return data;
+ }
+ return filterLevel(data);
+};
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
deleted file mode 100644
index 1e0cd0995fa..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/DataStudioContext.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index dba94019899..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/contexts/DataStudioContext/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DataStudioContext";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
new file mode 100644
index 00000000000..d1e625372d4
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
@@ -0,0 +1,24 @@
+import { skipToken } from "metabase/api/api";
+import { useGetCollectionQuery } from "metabase/api/collection";
+import { isRootCollection } from "metabase/collections/utils";
+import type { CollectionId } from "metabase-types/api/collection";
+
+interface UseCollectionPathOptions {
+ collectionId: CollectionId | null;
+}
+
+export const useCollectionPath = ({
+ collectionId,
+}: UseCollectionPathOptions) => {
+ const { data: collection, isLoading: isLoadingPath } = useGetCollectionQuery(
+ !collectionId ? skipToken : { id: collectionId },
+ );
+
+ const ancestors =
+ collection?.effective_ancestors?.filter((c) => !isRootCollection(c)) ?? [];
+
+ return {
+ isLoadingPath,
+ path: collection ? [...ancestors, collection] : null,
+ };
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts
index 377aae48f25..bdc5217bc93 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils.ts
@@ -1,5 +1,9 @@
import * as Lib from "metabase-lib";
-import type { Dataset, DatasetQuery } from "metabase-types/api";
+import type {
+ Dataset,
+ DatasetQuery,
+ GetLibraryCollectionResponse,
+} from "metabase-types/api";
export function getResultMetadata(
currentQuery: DatasetQuery,
@@ -15,3 +19,8 @@ export function getResultMetadata(
}
return null;
}
+
+// TODO Alex P 12/05/2025 Fix the endpoint to return sensible data
+export const hasLibraryCollection = (
+ libraryCollection?: GetLibraryCollectionResponse,
+) => libraryCollection != null && "name" in libraryCollection;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.unit.spec.tsx
index b9e7a171875..ade82688481 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentItem.unit.spec.tsx
@@ -18,7 +18,7 @@ describe("SegmentItem", () => {
component={() => (
<SegmentItem
segment={segment}
- href="/data-studio/modeling/segments/42"
+ href="/data-studio/library/segments/42"
/>
)}
/>,
@@ -30,7 +30,7 @@ describe("SegmentItem", () => {
const item = screen.getByRole("listitem");
expect(item).toBeInTheDocument();
- expect(item).toHaveAttribute("href", "/data-studio/modeling/segments/42");
+ expect(item).toHaveAttribute("href", "/data-studio/library/segments/42");
expect(item).toHaveAttribute("aria-label", "Premium Customers");
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
index 38f75a24e18..831635e29d6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
@@ -51,6 +51,6 @@ describe("SegmentList", () => {
expect(screen.getByText("Active Users")).toBeInTheDocument();
expect(
screen.getByRole("listitem", { name: "High Value" }),
- ).toHaveAttribute("href", "/data-studio/modeling/segments/1");
+ ).toHaveAttribute("href", "/data-studio/library/segments/1");
});
});
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
index 304b6edf91d..d234e85dbf3 100644
--- 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
@@ -20,6 +20,7 @@ import { getTableMetadataQuery } from "metabase/metadata/pages/shared/utils";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { Box, Flex, Stack, rem } from "metabase/ui";
import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
+import { hasLibraryCollection } from "metabase-enterprise/data-studio/common/utils";
import { trackMetadataChange } from "../../analytics";
import {
@@ -105,8 +106,8 @@ function DataModelContent({ params }: Props) {
const [previewType, setPreviewType] = useState<PreviewType>("table");
const isLoading = isLoadingDatabases || isLoadingTables || isLoadingLibrary;
const error = databasesError ?? tableError ?? libraryError;
- // TODO Alex P 12/05/2025 Fix the endpoint to return sensible data
- const hasLibrary = libraryCollection != null && "name" in libraryCollection;
+
+ const hasLibrary = hasLibraryCollection(libraryCollection);
const [onUpdateCallback, setOnUpdateCallback] = useState<(() => void) | null>(
null,
@@ -158,7 +159,6 @@ function DataModelContent({ params }: Props) {
style={{ overflow: "auto" }}
>
<Stack
- bg="bg-white"
className={S.column}
flex={COLUMN_CONFIG.nav.flex}
gap={0}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
index 8baea55b90f..0e83475d643 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
@@ -275,7 +275,7 @@ async function setup({
component={DataModel}
/>
</Route>
- <Route path="data-studio/modeling/segments/new" />
+ <Route path="data-studio/library/segments/new" />
</>,
{
withRouter: true,
@@ -1040,7 +1040,7 @@ describe("DataModel", () => {
await userEvent.click(screen.getByRole("link", { name: /New segment/i }));
expect(history?.getCurrentLocation().pathname).toBe(
- "/data-studio/modeling/segments/new",
+ "/data-studio/library/segments/new",
);
expect(history?.getCurrentLocation().search).toContain(
`tableId=${ORDERS_TABLE.id}`,
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
index cc973694ff0..80a2da84b11 100644
--- 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
@@ -1,9 +1,13 @@
import type { ReactNode } from "react";
+import Link from "metabase/common/components/Link";
+import * as Urls from "metabase/lib/urls";
+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
import {
PaneHeader,
PanelHeaderTitle,
} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";
import type { Card } from "metabase-types/api";
import { MetricMoreMenu } from "./MetricMoreMenu";
@@ -16,6 +20,10 @@ type MetricHeaderProps = {
};
export function MetricHeader({ card, actions }: MetricHeaderProps) {
+ const { path, isLoadingPath } = useCollectionPath({
+ collectionId: card.collection_id,
+ });
+
return (
<PaneHeader
data-testid="metric-header"
@@ -30,6 +38,21 @@ export function MetricHeader({ card, actions }: MetricHeaderProps) {
menu={<MetricMoreMenu card={card} />}
tabs={<MetricTabs card={card} />}
actions={actions}
+ breadcrumbs={
+ <DataStudioBreadcrumbs loading={isLoadingPath}>
+ {path?.map((collection, i) => (
+ <Link
+ key={collection.id}
+ to={Urls.dataStudioLibrary({
+ expandedIds: path.slice(1, i + 1).map((c) => c.id),
+ })}
+ >
+ {collection.name}
+ </Link>
+ ))}
+ <span>{card.name}</span>
+ </DataStudioBreadcrumbs>
+ }
/>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
index 6c5fa2c688b..886c01c5c4e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
@@ -125,7 +125,7 @@ function MetricModal({ card, modalType, onClose }: MetricModalProps) {
};
const handleArchive = () => {
- dispatch(push(Urls.dataStudioModeling()));
+ dispatch(push(Urls.dataStudioLibrary()));
};
const handleUnarchive = () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
index ab71726e13f..12fccb20437 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
@@ -17,7 +17,7 @@ export function MetricOverview({ card }: MetricOverviewProps) {
<Flex direction="column" flex={1} mah={700}>
<OverviewVisualization card={card} />
</Flex>
- <Stack maw={300} ml="lg" gap="lg" className={S.sidebar}>
+ <Stack w={300} ml="lg" gap="lg" className={S.sidebar}>
<DescriptionSection card={card} />
<QuerySourceSection card={card} />
<EntityCreationInfo
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
index 5edbfe6903c..6b069a253e7 100644
--- 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
@@ -85,7 +85,7 @@ export function NewMetricPage({ location, route }: NewMetricPageProps) {
};
const handleCancel = () => {
- dispatch(push(Urls.dataStudioModeling()));
+ dispatch(push(Urls.dataStudioLibrary()));
};
return (
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
deleted file mode 100644
index 2f89fbae8eb..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-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 "data":
- return {
- title: t`No published tables yet`,
- message: t`Publish tables 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 tables or metrics yet`,
- message: t`Tables 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
deleted file mode 100644
index eefde6fe4f2..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6046c71d5c8..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-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 type { CollectionItem } from "metabase-types/api";
-
-import { ItemRow } from "./ItemRow";
-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: CollectionItem[];
- 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 tables 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
deleted file mode 100644
index 2a908c8a67c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/DescriptionCell.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Cell } from "metabase/browse/components/BrowseTable.styled";
-import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";
-import { Skeleton } from "metabase/ui";
-import type { CollectionItem } from "metabase-types/api";
-
-import { getItemDescription } from "../utils";
-
-interface DescriptionCellProps {
- item?: CollectionItem;
-}
-
-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
deleted file mode 100644
index accba76d184..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/DescriptionCell/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ff97a251d89..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/ItemRow.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-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 type { CollectionItem } from "metabase-types/api";
-
-import { getItemUrl } from "../../../../utils";
-import { DescriptionCell } from "../DescriptionCell";
-import { MenuCell } from "../MenuCell";
-import { NameCell } from "../NameCell";
-
-interface ItemRowProps {
- item?: CollectionItem;
-}
-
-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 url = getItemUrl(item);
- 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
deleted file mode 100644
index e9c0ecf2c1b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/ItemRow/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 513848250dd..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.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
deleted file mode 100644
index fd767d0ee28..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-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 { CollectionItem } from "metabase-types/api";
-
-import S from "./MenuCell.module.css";
-
-interface MenuCellProps {
- item?: CollectionItem;
-}
-
-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`;
-
- 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
deleted file mode 100644
index 92626b58b71..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 887cacfd9df..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.module.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.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
deleted file mode 100644
index abe7297bd32..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/NameCell.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { MouseEvent } from "react";
-
-import EntityItem from "metabase/common/components/EntityItem";
-import {
- ItemNameCell,
- MaybeItemLink,
-} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";
-import { getIcon } from "metabase/lib/icon";
-import { FixedSizeIcon, type IconName, Skeleton } from "metabase/ui";
-import type { CollectionItem } from "metabase-types/api";
-
-import { getItemUrl } from "../../../../utils";
-
-import S from "./NameCell.module.css";
-
-interface NameCellProps {
- item?: CollectionItem;
-}
-
-const CONTAINER_NAME = "ItemsTableContainer";
-
-const sharedProps = {
- containerName: CONTAINER_NAME,
-};
-
-function preventDefault(event: MouseEvent) {
- event.preventDefault();
-}
-
-export function NameCell({ item }: NameCellProps) {
- const headingId = item ? `${item.model}-${item.id}-heading` : "dummy-heading";
- const icon = item ? getIcon(item) : { name: "folder" as IconName };
- const itemUrl = item ? getItemUrl(item) : 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
deleted file mode 100644
index a3df8b11b65..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/NameCell/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 063cfe01b95..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./CollectionItemsTable";
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
deleted file mode 100644
index 9acea0ad8fa..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { IconName } from "metabase/ui";
-
-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
deleted file mode 100644
index ade6b707f13..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/utils.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { CollectionItem } from "metabase-types/api";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
-
-import type { SortColumn } from "./types";
-
-export const DEFAULT_SORTING_OPTIONS: SortingOptions<SortColumn> = {
- sort_column: "name",
- sort_direction: SortDirection.Asc,
-};
-
-export function getItemDescription(item: CollectionItem): string {
- return item.description ?? "";
-}
-
-export function sortItems(
- items: CollectionItem[],
- sortingOptions: SortingOptions<SortColumn>,
-): CollectionItem[] {
- 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
deleted file mode 100644
index 6c501d14c20..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.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
deleted file mode 100644
index a31b9e7dcfd..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-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 } 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: ["table", "metric"],
- });
- const items = data?.data ?? [];
- const isLoading = isLoadingCollection || isLoadingItems;
- const error = collectionError ?? itemsError;
-
- 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/CollectionPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.unit.spec.tsx
deleted file mode 100644
index 7bef266b673..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.unit.spec.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-import fetchMock from "fetch-mock";
-
-import {
- findRequests,
- setupCollectionByIdEndpoint,
- setupCollectionItemsEndpoint,
-} from "__support__/server-mocks";
-import {
- renderWithProviders,
- screen,
- waitForLoaderToBeRemoved,
-} from "__support__/ui";
-import {
- createMockCollection,
- createMockCollectionItem,
-} from "metabase-types/api/mocks";
-
-import { CollectionPage } from "./CollectionPage";
-
-const TEST_COLLECTION = createMockCollection({
- id: 1,
- name: "Test Collection",
-});
-
-const TEST_TABLE_ITEM = createMockCollectionItem({
- id: 1,
- name: "Test Table",
- model: "table",
- collection_id: TEST_COLLECTION.id,
-});
-
-const TEST_METRIC_ITEM = createMockCollectionItem({
- id: 2,
- name: "Test Metric",
- model: "metric",
- collection_id: TEST_COLLECTION.id,
-});
-
-const TEST_CARD_ITEM = createMockCollectionItem({
- id: 3,
- name: "Test Question",
- model: "card",
- collection_id: TEST_COLLECTION.id,
-});
-
-interface SetupOpts {
- collection?: typeof TEST_COLLECTION;
- collectionItems?: (typeof TEST_TABLE_ITEM)[];
- collectionError?: string;
- itemsError?: string;
-}
-
-const setup = async ({
- collection = TEST_COLLECTION,
- collectionItems = [],
- collectionError,
- itemsError,
-}: SetupOpts = {}) => {
- setupCollectionByIdEndpoint({
- collections: [collection],
- error: collectionError,
- });
-
- if (itemsError) {
- fetchMock.get(`path:/api/collection/${collection.id}/items`, {
- status: 500,
- body: itemsError,
- });
- } else {
- setupCollectionItemsEndpoint({
- collection,
- collectionItems,
- models: ["table", "metric"],
- });
- }
-
- renderWithProviders(
- <CollectionPage params={{ collectionId: String(collection.id) }} />,
- );
-};
-
-describe("CollectionPage", () => {
- it("should show loading state initially", async () => {
- await setup();
- expect(screen.getByTestId("loading-indicator")).toBeInTheDocument();
- });
-
- it("should render collection name in header", async () => {
- await setup({
- collectionItems: [TEST_TABLE_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- expect(screen.getByText(TEST_COLLECTION.name)).toBeInTheDocument();
- });
-
- it("should display empty state when collection has no items", async () => {
- await setup({
- collectionItems: [],
- });
-
- await waitForLoaderToBeRemoved();
- expect(
- await screen.findByText("No tables or metrics yet"),
- ).toBeInTheDocument();
- });
-
- it("should display items table when collection has tables", async () => {
- await setup({
- collectionItems: [TEST_TABLE_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- expect(screen.getByTestId("collection-page")).toBeInTheDocument();
- expect(screen.getByText(TEST_TABLE_ITEM.name)).toBeInTheDocument();
- });
-
- it("should display items table when collection has metrics", async () => {
- await setup({
- collectionItems: [TEST_METRIC_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- expect(screen.getByTestId("collection-page")).toBeInTheDocument();
- expect(screen.getByText(TEST_METRIC_ITEM.name)).toBeInTheDocument();
- });
-
- it("should display both tables and metrics in items table", async () => {
- await setup({
- collectionItems: [TEST_TABLE_ITEM, TEST_METRIC_ITEM, TEST_CARD_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- expect(screen.getByText(TEST_TABLE_ITEM.name)).toBeInTheDocument();
- expect(screen.getByText(TEST_METRIC_ITEM.name)).toBeInTheDocument();
- // should filter out cards
- expect(screen.queryByText(TEST_CARD_ITEM.name)).not.toBeInTheDocument();
- });
-
- it("should show table icons", async () => {
- await setup({
- collectionItems: [TEST_TABLE_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- expect(await screen.findByLabelText("table icon")).toBeInTheDocument();
- });
-
- it("should show metric icons", async () => {
- await setup({
- collectionItems: [TEST_METRIC_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- expect(await screen.findByLabelText("metric icon")).toBeInTheDocument();
- });
-
- it("should display error when collection fails to load", async () => {
- const errorMessage = "Failed to load collection";
- await setup({
- collectionError: errorMessage,
- });
- await waitForLoaderToBeRemoved();
- expect(await screen.findByText(errorMessage)).toBeInTheDocument();
- });
-
- it("should display error when items fail to load", async () => {
- const errorMessage = "Failed to load items";
- await setup({
- itemsError: errorMessage,
- });
- await waitForLoaderToBeRemoved();
- expect(screen.getByText(errorMessage)).toBeInTheDocument();
- });
-
- it("should request only tables and metrics from API", async () => {
- await setup({
- collectionItems: [TEST_TABLE_ITEM, TEST_METRIC_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- const calls = await findRequests("GET");
- expect(calls).toHaveLength(2);
- const [collectionCall, itemsCall] = calls;
- expect(collectionCall.url).toContain(`/collection/${TEST_COLLECTION.id}`);
- expect(itemsCall.url).toContain("/items");
-
- const url = new URL(itemsCall.url);
- const models = url.searchParams.getAll("models");
- expect(models).toEqual(["table", "metric"]);
- });
-
- it("should show collection name in page header", async () => {
- await setup({
- collectionItems: [TEST_TABLE_ITEM],
- });
-
- await waitForLoaderToBeRemoved();
-
- const page = screen.getByTestId("collection-page");
- expect(page).toBeInTheDocument();
-
- expect(screen.getByText(TEST_COLLECTION.name)).toBeInTheDocument();
- });
-});
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
deleted file mode 100644
index c85f7eb9942..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 995da4b0bc2..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-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" data-testid="modeling-empty-page">
- <EmptyState
- illustrationElement={<img src={EmptyDashboardBot} />}
- title={t`Pick a collection or create a new metric`}
- message={t`Build your semantic layer with tables 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
deleted file mode 100644
index 2491855598f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ec180fa467c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/routes.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-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/modeling/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/utils.ts
deleted file mode 100644
index 42e508ad4bf..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/utils.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as Urls from "metabase/lib/urls";
-import type { CollectionItem } from "metabase-types/api";
-
-export function getItemUrl(item: CollectionItem) {
- switch (item.model) {
- case "table":
- return Urls.dataStudioTable(item.id);
- case "metric":
- return Urls.dataStudioMetric(item.id);
- default:
- throw new TypeError(`Unsupported item: ${item.model}`);
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
index a21de32f3a2..60f6e29f868 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
@@ -13,12 +13,11 @@ 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 { LibrarySectionLayout } from "./app/pages/LibrarySectionLayout";
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 { getDataStudioSegmentRoutes } from "./segments/routes";
import { getDataStudioSnippetRoutes } from "./snippets/routes";
import { getDataStudioTableRoutes } from "./tables/routes";
@@ -49,13 +48,13 @@ export function getDataStudioRoutes(
</Route>
</Route>
)}
- <Route path="modeling" component={ModelingSectionLayout}>
- {getDataStudioModelingRoutes()}
+ {getDataStudioGlossaryRoutes()}
+ <Route path="library">
+ <IndexRoute component={LibrarySectionLayout} />
{getDataStudioTableRoutes()}
{getDataStudioMetricRoutes()}
{getDataStudioSegmentRoutes()}
{getDataStudioSnippetRoutes()}
- {getDataStudioGlossaryRoutes()}
</Route>
{PLUGIN_DEPENDENCIES.isEnabled && (
<Route path="dependencies" component={DependenciesSectionLayout}>
@@ -74,5 +73,5 @@ function getIndexPath(state: State) {
if (PLUGIN_TRANSFORMS.canAccessTransforms(state)) {
return Urls.transformList();
}
- return Urls.dataStudioModeling();
+ return Urls.dataStudioLibrary();
}
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
index 19e18e83906..e9b7a9c5a92 100644
--- 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
@@ -29,7 +29,7 @@ export function SnippetHeader({ snippet, actions }: SnippetHeaderProps) {
const dispatch = useDispatch();
const handleDelete = () => {
- dispatch(push(Urls.dataStudioModeling()));
+ dispatch(push(Urls.dataStudioLibrary()));
};
return (
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
index cf27c1fc1c9..fa0c0ac42ec 100644
--- 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
@@ -68,7 +68,7 @@ export function NewSnippetPage({ route }: NewSnippetPageProps) {
};
const handleCancel = () => {
- dispatch(push(Urls.dataStudioModeling()));
+ dispatch(push(Urls.dataStudioLibrary()));
};
const handleCollectionSelected = async (
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
index c9820395748..4055f6190e0 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
@@ -21,7 +21,7 @@ export function TableMoreMenu({ table }: TableMoreMenuProps) {
const handleUnpublish = () => {
setModalType(undefined);
- dispatch(push(Urls.dataStudioModeling()));
+ dispatch(push(Urls.dataStudioLibrary()));
};
return (
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
index 2dbdb6607ad..2a27d921abe 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
@@ -25,7 +25,7 @@ export function TableOverview({ table }: TableOverviewProps) {
<Flex direction="column" flex={1} mah={700}>
{card && <OverviewVisualization card={card} />}
</Flex>
- <Stack maw={300} ml="lg" gap="lg" className={S.sidebar}>
+ <Stack w={300} ml="lg" gap="lg" className={S.sidebar}>
<DescriptionSection table={table} />
</Stack>
</Flex>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx
index 30bf15b1c9a..06108578604 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx
@@ -1,8 +1,11 @@
import type { Location } from "history";
import { useContext } from "react";
+import { t } from "ttag";
+import S from "metabase/css/core/index.css";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { Box, Stack, Title } from "metabase/ui";
import { DependencyGraph } from "../../components/DependencyGraph";
import { isSameNode } from "../../components/DependencyGraph/utils";
@@ -27,10 +30,15 @@ export function DependencyGraphPage({ location }: DependencyGraphPageProps) {
defaultEntry == null || (entry != null && !isSameNode(entry, defaultEntry));
return (
- <DependencyGraph
- entry={entry ?? defaultEntry}
- getGraphUrl={(entry) => Urls.dependencyGraph({ entry, baseUrl })}
- withEntryPicker={withEntryPicker}
- />
+ <Stack h="100%">
+ <Box p="lg" className={S.borderBottom}>
+ <Title order={4}>{t`Dependency graph`}</Title>
+ </Box>
+ <DependencyGraph
+ entry={entry ?? defaultEntry}
+ getGraphUrl={(entry) => Urls.dependencyGraph({ entry, baseUrl })}
+ withEntryPicker={withEntryPicker}
+ />
+ </Stack>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx
index 807cd110c23..f85d5f99194 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx
@@ -29,8 +29,6 @@ export const MetabotDataStudioButton = () => {
return (
<Tooltip label={label}>
<ActionIcon
- variant="subtle"
- bd="1px solid var(--mb-color-border)"
p="sm"
h="2.25rem"
w="2.25rem"
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx
index bb790c40448..70e515b99a5 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionFormModal.tsx
@@ -9,6 +9,7 @@ function SnippetFormModal({
collection,
onSaved,
onClose,
+ opened = true,
}: SnippetFormModalProps) {
const isEditing = collection.id != null;
const title = isEditing
@@ -21,7 +22,7 @@ function SnippetFormModal({
};
return (
- <Modal opened onClose={onClose} title={title}>
+ <Modal opened={opened} onClose={onClose} title={title}>
<SnippetCollectionForm
collection={collection}
onSave={handleSave}
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
index 6a3eb226fa6..e69de29bb2d 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.module.css
@@ -1,12 +0,0 @@
-.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
index 418e9828565..4f96f2e8ff5 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
@@ -6,9 +6,7 @@ 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";
+import { Box, Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
export function SnippetCollectionMenu({
collection,
@@ -54,19 +52,19 @@ export function SnippetCollectionMenu({
};
return (
- <Box onClick={(e) => e.stopPropagation()} className={S.root}>
+ <Box onClick={(e) => e.stopPropagation()}>
<Menu position="bottom-end">
<Menu.Target>
<Button
- variant="subtle"
- p={0}
- h={20}
- w={20}
+ w={24}
+ h={24}
c="text-medium"
- aria-label={t`Collection options`}
- >
- <Icon name="ellipsis" size={16} />
- </Button>
+ size="compact-xs"
+ variant="subtle"
+ leftSection={<FixedSizeIcon name="ellipsis" size={16} />}
+ aria-label={t`Snippet collection options`}
+ onClick={(e) => e.stopPropagation()}
+ />
</Menu.Target>
<Menu.Dropdown>
{isArchived ? (
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 19a03551c59..e8a69884a59 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
@@ -3,15 +3,18 @@ import type { Route } from "react-router";
import { t } from "ttag";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import Link from "metabase/common/components/Link/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { isResourceNotFoundError } from "metabase/lib/errors";
-import type * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Button, Flex, Group } from "metabase/ui";
import {
useGetPythonLibraryQuery,
useUpdatePythonLibraryMutation,
} from "metabase-enterprise/api/python-transform-library";
+import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";
+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
import {
PaneHeader,
PanelHeaderTitle,
@@ -93,6 +96,14 @@ export function PythonLibraryEditorPage({
return (
<>
<Flex h="100%" w="100%" gap={0} direction="column">
+ <TransformsSectionHeader
+ leftSection={
+ <DataStudioBreadcrumbs>
+ <Link to={Urls.transformList()}>{t`Transforms`}</Link>
+ {t`Python library`}
+ </DataStudioBreadcrumbs>
+ }
+ />
<LibraryEditorHeader
onSave={handleSave}
onRevert={handleRevert}
@@ -125,6 +136,7 @@ export function LibraryEditorHeader({
}) {
return (
<PaneHeader
+ pt={0}
title={<PanelHeaderTitle>{t`Python library`}</PanelHeaderTitle>}
actions={
(isDirty || isSaving) && (
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.module.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
index 022e80cf23a..f92fe1d0896 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/CreateTransformMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx
@@ -9,9 +9,8 @@ import * as Urls from "metabase/lib/urls";
import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";
-import { trackTransformCreate } from "../../../analytics";
+import { trackTransformCreate } from "../../analytics";
-import S from "./CreateTransformMenu.module.css";
import { shouldDisableItem } from "./utils";
export const CreateTransformMenu = () => {
@@ -30,13 +29,8 @@ export const CreateTransformMenu = () => {
<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 }}
- />
+ >{t`New`}</Button>
</Tooltip>
</Menu.Target>
<Menu.Dropdown>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/utils.ts
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/utils.ts
index 7d5a8f8b069..89fad99fe17 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/CreateTransformMenu/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/utils.ts
@@ -1,7 +1,7 @@
import type { QuestionPickerItem } from "metabase/common/components/Pickers/QuestionPicker";
import type { Database } from "metabase-types/api";
-import { doesDatabaseSupportTransforms } from "../../../utils";
+import { doesDatabaseSupportTransforms } from "../../utils";
export function shouldDisableItem(
item: QuestionPickerItem,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
index 5accb5e9bf6..f7ca56b0d09 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
@@ -35,7 +35,7 @@ export function JobEditor({
onTagListChange,
}: JobEditorProps) {
return (
- <ColumnLayout data-testid="jobs-editor">
+ <ColumnLayout data-testid="transforms-job-editor">
<PaneHeader
title={
<PaneHeaderInput
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.module.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.tsx
similarity index 55%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.tsx
index 41c71b7f77f..5adb5a6f66f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/SidebarLoadingState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/ListLoadingState.tsx
@@ -1,10 +1,10 @@
import { Box, Repeat, Skeleton } from "metabase/ui";
-import S from "./SidebarLoadingState.module.css";
+import S from "./ListLoadingState.module.css";
-export const SidebarLoadingState = () => {
+export const ListLoadingState = () => {
return (
- <Box className={S.container} px="md">
+ <Box className={S.container} px="md" pt="md">
<Repeat times={8}>
<Skeleton h={40} mb="md" radius="sm" />
</Repeat>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/index.ts
new file mode 100644
index 00000000000..f699dc9cfc3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ListLoadingState/index.ts
@@ -0,0 +1 @@
+export { ListLoadingState } from "./ListLoadingState";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx
index 29beacf0c67..72af4417557 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformHeader/TransformHeader.tsx
@@ -1,10 +1,13 @@
import type { ReactNode } from "react";
import { t } from "ttag";
+import Link from "metabase/common/components/Link/Link";
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 { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";
+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
import {
PaneHeader,
PaneHeaderInput,
@@ -29,13 +32,23 @@ export function TransformHeader({
hasMenu = true,
}: TransformHeaderProps) {
return (
- <PaneHeader
- title={<TransformNameInput transform={transform} />}
- menu={hasMenu && <TransformMoreMenu transform={transform} />}
- tabs={<TransformTabs transform={transform} />}
- actions={actions}
- data-testid="transforms-header"
- />
+ <>
+ <TransformsSectionHeader
+ leftSection={
+ <DataStudioBreadcrumbs>
+ <Link to={Urls.transformList()}>{t`Transforms`}</Link>
+ {transform.name}
+ </DataStudioBreadcrumbs>
+ }
+ />
+ <PaneHeader
+ title={<TransformNameInput transform={transform} />}
+ menu={hasMenu && <TransformMoreMenu transform={transform} />}
+ tabs={<TransformTabs transform={transform} />}
+ actions={actions}
+ data-testid="transforms-header"
+ />
+ </>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx
new file mode 100644
index 00000000000..816d8cc65a5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx
@@ -0,0 +1,111 @@
+import { useDebouncedValue } from "@mantine/hooks";
+import dayjs from "dayjs";
+import { useMemo, useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { Button, Card, Flex, Icon, Stack, TextInput } from "metabase/ui";
+import { useListTransformJobsQuery } from "metabase-enterprise/api";
+import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";
+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
+import { Table } from "metabase-enterprise/data-studio/common/components/Table";
+import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";
+import { ListLoadingState } from "metabase-enterprise/transforms/components/ListLoadingState";
+import type { TransformJob } from "metabase-types/api";
+
+export const JobListPage = () => {
+ const dispatch = useDispatch();
+ const [searchQuery, setSearchQuery] = useState("");
+ const [debouncedSearchQuery] = useDebouncedValue(searchQuery, 300);
+
+ 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 handleSelect = (item: TransformJob) => {
+ dispatch(push(Urls.transformJob(item.id)));
+ };
+
+ if (error) {
+ return <LoadingAndErrorWrapper loading={false} error={error} />;
+ }
+
+ return (
+ <>
+ <TransformsSectionHeader
+ leftSection={<DataStudioBreadcrumbs>{t`Jobs`}</DataStudioBreadcrumbs>}
+ />
+ <Stack px="3.5rem" data-testid="transforms-job-list">
+ <Flex gap="0.5rem">
+ <TextInput
+ placeholder={t`Search...`}
+ leftSection={<Icon name="search" />}
+ bdrs="md"
+ flex="1"
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ />
+ <Button
+ leftSection={<Icon name="add" />}
+ component={ForwardRefLink}
+ to={Urls.newTransformJob()}
+ >{t`New`}</Button>
+ </Flex>
+
+ <Flex direction="column" flex={1} mih={0}>
+ {isLoading ? (
+ <ListLoadingState />
+ ) : filteredJobs.length === 0 ? (
+ <ListEmptyState
+ label={debouncedSearchQuery ? t`No jobs found` : t`No jobs yet`}
+ />
+ ) : (
+ <Card withBorder p={0}>
+ <Table
+ data={filteredJobs}
+ columns={[
+ {
+ accessorKey: "name",
+ header: t`Name`,
+ meta: {
+ width: "auto",
+ },
+ },
+ {
+ accessorFn: (job) => job.last_run?.start_time,
+ header: t`Last Run`,
+ size: 200,
+ cell: ({ row: { original: job } }) => {
+ if (job.last_run) {
+ const formattedDate = dayjs(
+ job.last_run.start_time,
+ ).format("lll");
+ return `${job.last_run.status === "failed" ? t`Failed` : t`Last run`} ${formattedDate}`;
+ }
+ },
+ },
+ ]}
+ onSelect={handleSelect}
+ />
+ </Card>
+ )}
+ </Flex>
+ </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
new file mode 100644
index 00000000000..54c6cfc7b3b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/index.ts
@@ -0,0 +1 @@
+export * from "./JobListPage";
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 8526a0fdec9..d72b51068b2 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
@@ -10,6 +10,8 @@ import {
useListTransformTagsQuery,
useListTransformsQuery,
} from "metabase-enterprise/api";
+import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";
+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
import { POLLING_INTERVAL } from "metabase-enterprise/transforms/constants";
import type { TransformRun } from "metabase-types/api";
@@ -27,9 +29,20 @@ export function RunListPage({ location }: RunListPageProps) {
const params = getParsedParams(location);
return (
- <Stack className={S.body} p="lg" h="100%" bg="bg-light">
- <Box>{t`A list of when each transform ran.`}</Box>
- <RunListPageBody params={params} />
+ <Stack
+ bg="bg-light"
+ className={S.body}
+ data-testid="transforms-run-list"
+ gap={0}
+ h="100%"
+ >
+ <TransformsSectionHeader
+ leftSection={<DataStudioBreadcrumbs>{t`Runs`}</DataStudioBreadcrumbs>}
+ />
+ <Stack p="lg" pt={0} h="100%">
+ <Box>{t`A list of when each transform ran.`}</Box>
+ <RunListPageBody params={params} />
+ </Stack>
</Stack>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
index 971df4094ed..224e892c011 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
@@ -38,7 +38,11 @@ export function TransformDependenciesPage({
}
return (
- <Flex direction="column" h="100%">
+ <Flex
+ direction="column"
+ h="100%"
+ data-testid="transforms-dependencies-content"
+ >
<TransformHeader transform={transform} />
<PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider
value={{
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx
new file mode 100644
index 00000000000..e6315158d0d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx
@@ -0,0 +1,120 @@
+import { useDebouncedValue } from "@mantine/hooks";
+import dayjs from "dayjs";
+import { useMemo, useState } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { Card, Flex, Icon, Stack, TextInput } from "metabase/ui";
+import { useListTransformsQuery } from "metabase-enterprise/api";
+import { TransformsSectionHeader } from "metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionHeader";
+import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
+import { Table } from "metabase-enterprise/data-studio/common/components/Table";
+import { CreateTransformMenu } from "metabase-enterprise/transforms/components/CreateTransformMenu";
+import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";
+import { ListLoadingState } from "metabase-enterprise/transforms/components/ListLoadingState";
+import type { Transform } from "metabase-types/api";
+
+export const TransformListPage = () => {
+ const dispatch = useDispatch();
+ const [searchQuery, setSearchQuery] = useState("");
+ const [debouncedSearchQuery] = useDebouncedValue(searchQuery, 300);
+
+ const { data: transforms, error, isLoading } = useListTransformsQuery({});
+
+ 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]);
+
+ if (error) {
+ return <LoadingAndErrorWrapper loading={false} error={error} />;
+ }
+
+ const handleSelect = (item: Transform) => {
+ if (typeof item.id === "number") {
+ dispatch(push(Urls.transform(item.id)));
+ }
+ };
+
+ return (
+ <>
+ <TransformsSectionHeader
+ leftSection={
+ <DataStudioBreadcrumbs>{t`Transforms`}</DataStudioBreadcrumbs>
+ }
+ />
+ <Stack px="3.5rem" data-testid="transforms-list">
+ <Flex gap="md">
+ <TextInput
+ placeholder={t`Search...`}
+ leftSection={<Icon name="search" />}
+ bdrs="md"
+ flex="1"
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ />
+ <CreateTransformMenu />
+ </Flex>
+
+ <Card withBorder p={0}>
+ {isLoading ? (
+ <ListLoadingState />
+ ) : filteredTransforms.length === 0 ? (
+ <ListEmptyState
+ label={
+ debouncedSearchQuery
+ ? t`No transforms found`
+ : t`No transforms yet`
+ }
+ />
+ ) : (
+ <Table
+ data={filteredTransforms.map((t) => ({
+ ...t,
+ out_table: t.target.name,
+ last_modified: new Date(t.updated_at).toDateString(),
+ }))}
+ columns={[
+ {
+ accessorKey: "name",
+ meta: {
+ width: "auto",
+ },
+ header: t`Name`,
+ },
+ {
+ accessorKey: "updated_at",
+ cell: ({ getValue }) => {
+ const value = getValue() as string;
+ return value && dayjs(value).format("lll");
+ },
+ header: t`Last Modified`,
+ },
+ {
+ accessorFn: (transform) => transform.target.name,
+ header: t`Output table`,
+ },
+ ]}
+ onSelect={handleSelect}
+ />
+ )}
+ </Card>
+ </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
new file mode 100644
index 00000000000..57d16dd3fdb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/index.ts
@@ -0,0 +1 @@
+export * from "./TransformListPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx
index 4076dfc4d4b..225b20bd17c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/TransformRunPage.tsx
@@ -50,7 +50,7 @@ export function TransformRunPage({ params }: TransformRunPageProps) {
}
return (
- <ColumnLayout>
+ <ColumnLayout data-testid="transforms-run-content">
<TransformHeader transform={transform} />
<ColumnLayoutBody>
<RunSection transform={transform} />
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
deleted file mode 100644
index e57981867fe..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.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
deleted file mode 100644
index 5951c3dd564..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/JobsSidebar.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-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
deleted file mode 100644
index 7eab02a9cf0..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/JobsSidebar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index df21f172240..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.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
deleted file mode 100644
index d6d9095914b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/SidebarContainer.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 56668f51a73..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarContainer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 17a6d987047..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/SidebarList.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index b421a046f55..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index cafd51c171f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.module.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 37f41383f8d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/SidebarListItem.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-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
deleted file mode 100644
index 7494e354047..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarListItem/TransformListItem.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-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/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/index.ts
deleted file mode 100644
index 4e7b536fa04..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarLoadingState/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3faf2fa9a61..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/SidebarSearch.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index becf74ecaf9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearch/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 468197abbd3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.module.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.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
deleted file mode 100644
index 4aa19773e12..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/SidebarSearchAndControls.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-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
deleted file mode 100644
index e47ca5d7e94..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSearchAndControls/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 94e5a2aa83a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/SidebarSortControl.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-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
deleted file mode 100644
index 6b14e064932..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/SidebarSortControl/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 2611f466cb9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformSidebarLayout.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-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/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.module.css
deleted file mode 100644
index 7de7bd2846f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.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
deleted file mode 100644
index b8b99cc9e7a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsSidebar.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-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
deleted file mode 100644
index fadf0a7ea24..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.module.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.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
deleted file mode 100644
index 02fb6faf7cf..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/TransformsTreeNode.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-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
deleted file mode 100644
index 4270386663f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3ef2bf5285a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/TransformsSidebar/utils.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index 51460a8cc44..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/hooks.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 86c5b9c8b52..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3ff85d4ec74..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformSidebarLayout/utils.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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/TransformTargetPage/TransformTargetPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx
index 7d03e0d8b02..9d449db3011 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformTargetPage/TransformTargetPage.tsx
@@ -50,7 +50,7 @@ export function TransformTargetPage({ params }: TransformTargetPageProps) {
}
return (
- <ColumnLayout>
+ <ColumnLayout data-testid="transforms-target-content">
<TransformHeader transform={transform} />
<ColumnLayoutBody>
<TargetSection transform={transform} />
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx
index a0f89f72dbc..8388e280423 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/routes.tsx
@@ -5,7 +5,7 @@ import {
PLUGIN_TRANSFORMS_PYTHON,
} from "metabase/plugins";
-import { JobEmptyPage } from "./pages/JobEmptyPage";
+import { JobListPage } from "./pages/JobListPage";
import { JobPage } from "./pages/JobPage";
import { NewJobPage } from "./pages/NewJobPage";
import {
@@ -16,10 +16,9 @@ import {
} from "./pages/NewTransformPage";
import { RunListPage } from "./pages/RunListPage";
import { TransformDependenciesPage } from "./pages/TransformDependenciesPage";
-import { TransformEmptyPage } from "./pages/TransformEmptyPage";
+import { TransformListPage } from "./pages/TransformListPage";
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";
@@ -29,9 +28,9 @@ export function getDataStudioTransformRoutes() {
<Route path="runs" component={TransformTopNavLayout}>
<IndexRoute component={RunListPage} />
</Route>
- <Route component={TransformSidebarLayout}>
- <IndexRoute component={TransformEmptyPage} />
- <Route path="jobs" component={JobEmptyPage} />
+ <Route>
+ <IndexRoute component={TransformListPage} />
+ <Route path="jobs" component={JobListPage} />
<Route path="jobs/new" component={NewJobPage} />
<Route path="jobs/:jobId" component={JobPage} />
<Route path="new/query" component={NewQueryTransformPage} />
diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.ts
index 9e876ee713a..64086145abe 100644
--- a/frontend/src/metabase-types/api/collection.ts
+++ b/frontend/src/metabase-types/api/collection.ts
@@ -16,6 +16,8 @@ import type { SortingOptions } from "./sorting";
import type { TableId } from "./table";
import type { UserId, UserInfo } from "./user";
+export type CollectionNamespace = null | "snippets";
+
// Collection ID can be either a numeric or entity id
export type RegularCollectionId = number | string;
@@ -77,6 +79,7 @@ export interface Collection {
authority_level?: CollectionAuthorityLevel;
type?: CollectionType;
is_remote_synced?: boolean;
+ namespace: CollectionNamespace;
parent_id?: CollectionId | null;
personal_owner_id?: UserId;
@@ -141,7 +144,7 @@ export interface CollectionItem {
effective_location?: string;
authority_level?: CollectionAuthorityLevel;
dashboard_count?: number | null;
- getIcon: () => IconProps;
+ getIcon?: () => IconProps;
getUrl: (opts?: Record<string, unknown>) => string;
setArchived?: (
isArchived: boolean,
@@ -258,3 +261,13 @@ export interface MoveCollectionDashboardCandidatesRequest {
export interface MoveCollectionDashboardCandidatesResult {
moved: CardId[];
}
+
+type LibraryChild = {
+ description: string;
+ id: number;
+ name: string;
+};
+
+export type GetLibraryCollectionResponse =
+ | (CollectionItem & { effective_children: LibraryChild[] })
+ | { data: null };
diff --git a/frontend/src/metabase-types/api/mocks/collection.ts b/frontend/src/metabase-types/api/mocks/collection.ts
index 6b362c1f1fc..adcc4cb7352 100644
--- a/frontend/src/metabase-types/api/mocks/collection.ts
+++ b/frontend/src/metabase-types/api/mocks/collection.ts
@@ -20,6 +20,7 @@ export const createMockCollection = (
archived: false,
is_personal: false,
authority_level: null,
+ namespace: null,
entity_id: createMockEntityId(),
...opts,
});
diff --git a/frontend/src/metabase-types/api/user.ts b/frontend/src/metabase-types/api/user.ts
index 9ff6cdb93a3..9c54886e6a5 100644
--- a/frontend/src/metabase-types/api/user.ts
+++ b/frontend/src/metabase-types/api/user.ts
@@ -173,6 +173,11 @@ export type UserKeyValue =
namespace: "transforms";
key: string;
value: "tree" | "alphabetical" | "last-modified";
+ }
+ | {
+ namespace: "data_studio";
+ key: string;
+ value: boolean;
};
export type UserKeyValueKey = Pick<UserKeyValue, "namespace" | "key">;
diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
index 5777add3c56..ba50cd480c8 100644
--- a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
@@ -52,6 +52,7 @@ const ItemLinkComponent = ({
if (isEmbeddingSdk()) {
return <ItemButton onClick={() => onClick?.(item)}>{children}</ItemButton>;
}
+
return (
<ItemLink to={modelToUrl(item)} onClick={() => onClick?.(item)}>
{children}
diff --git a/frontend/src/metabase/data-grid/types.ts b/frontend/src/metabase/data-grid/types.ts
index 09d7750b1e1..32771212ebc 100644
--- a/frontend/src/metabase/data-grid/types.ts
+++ b/frontend/src/metabase/data-grid/types.ts
@@ -29,6 +29,7 @@ declare module "@tanstack/react-table" {
headerClickTargetSelector?: string;
formatter?: CellFormatter<TValue>;
clipboardFormatter?: PlainCellFormatter<TValue>;
+ width?: "auto";
}
}
diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/lib/urls/data-studio.ts
index 2c8d2467b4e..79affacaae2 100644
--- a/frontend/src/metabase/lib/urls/data-studio.ts
+++ b/frontend/src/metabase/lib/urls/data-studio.ts
@@ -81,16 +81,24 @@ export function dataStudioData({
return parts.join("/");
}
-export function dataStudioModeling() {
- return `${ROOT_URL}/modeling`;
+export function dataStudioLibrary({
+ expandedIds,
+}: { expandedIds?: CollectionId[] } = {}) {
+ let query = "";
+ if (expandedIds?.length) {
+ const params = new URLSearchParams();
+ expandedIds.forEach((id) => params.append("expandedId", String(id)));
+ query = `?${params.toString()}`;
+ }
+ return `${ROOT_URL}/library${query}`;
}
export function dataStudioTable(tableId: TableId) {
- return `${dataStudioModeling()}/tables/${tableId}`;
+ return `${dataStudioLibrary()}/tables/${tableId}`;
}
export function dataStudioTableFields(tableId: TableId, fieldId?: FieldId) {
- const baseUrl = `${dataStudioModeling()}/tables/${tableId}/fields`;
+ const baseUrl = `${dataStudioLibrary()}/tables/${tableId}/fields`;
return fieldId != null ? `${baseUrl}/${fieldId}` : baseUrl;
}
@@ -103,11 +111,11 @@ export function dataStudioTableSegments(tableId: TableId) {
}
export function dataStudioSegment(segmentId: SegmentId) {
- return `${dataStudioModeling()}/segments/${segmentId}`;
+ return `${dataStudioLibrary()}/segments/${segmentId}`;
}
export function newDataStudioSegment(tableId: TableId) {
- return `${dataStudioModeling()}/segments/new?tableId=${tableId}`;
+ return `${dataStudioLibrary()}/segments/new?tableId=${tableId}`;
}
export type NewDataStudioQueryModelParams = {
@@ -117,7 +125,7 @@ export type NewDataStudioQueryModelParams = {
export function newDataStudioQueryModel(
params: NewDataStudioQueryModelParams = {},
) {
- return `${dataStudioModeling()}/models/new/query${getQueryString(params)}`;
+ return `${dataStudioLibrary()}/models/new/query${getQueryString(params)}`;
}
export type NewDataStudioNativeModelParams = {
@@ -127,7 +135,7 @@ export type NewDataStudioNativeModelParams = {
export function newDataStudioNativeModel(
params: NewDataStudioNativeModelParams = {},
) {
- return `${dataStudioModeling()}/models/new/native${getQueryString(params)}`;
+ return `${dataStudioLibrary()}/models/new/native${getQueryString(params)}`;
}
export type NewDataStudioMetricProps = {
@@ -135,11 +143,11 @@ export type NewDataStudioMetricProps = {
};
export function newDataStudioMetric(params: NewDataStudioMetricProps = {}) {
- return `${dataStudioModeling()}/metrics/new${getQueryString(params)}`;
+ return `${dataStudioLibrary()}/metrics/new${getQueryString(params)}`;
}
export function dataStudioMetric(cardId: CardId) {
- return `${dataStudioModeling()}/metrics/${cardId}`;
+ return `${dataStudioLibrary()}/metrics/${cardId}`;
}
export function dataStudioMetricQuery(cardId: CardId) {
@@ -151,15 +159,15 @@ export function dataStudioMetricDependencies(cardId: CardId) {
}
export function dataStudioGlossary() {
- return `${dataStudioModeling()}/glossary`;
+ return `${dataStudio()}/glossary`;
}
export function dataStudioCollection(collectionId: CollectionId) {
- return `${dataStudioModeling()}/collections/${collectionId}`;
+ return `${dataStudioLibrary()}/collections/${collectionId}`;
}
export function dataStudioSnippet(snippetId: NativeQuerySnippetId) {
- return `${dataStudioModeling()}/snippets/${snippetId}`;
+ return `${dataStudioLibrary()}/snippets/${snippetId}`;
}
export function dataStudioSnippetDependencies(snippetId: NativeQuerySnippetId) {
@@ -167,5 +175,5 @@ export function dataStudioSnippetDependencies(snippetId: NativeQuerySnippetId) {
}
export function newDataStudioSnippet() {
- return `${dataStudioModeling()}/snippets/new`;
+ return `${dataStudioLibrary()}/snippets/new`;
}
diff --git a/frontend/src/metabase/lib/urls/data-studio.unit.spec.ts b/frontend/src/metabase/lib/urls/data-studio.unit.spec.ts
index 315e9a1065d..f1543b0cd85 100644
--- a/frontend/src/metabase/lib/urls/data-studio.unit.spec.ts
+++ b/frontend/src/metabase/lib/urls/data-studio.unit.spec.ts
@@ -1,7 +1,7 @@
import {
dataStudio,
dataStudioData,
- dataStudioModeling,
+ dataStudioLibrary,
dataStudioSegment,
dataStudioTable,
dataStudioTableFields,
@@ -92,28 +92,28 @@ describe("urls > data-studio", () => {
});
});
- describe("dataStudioModeling", () => {
- it("should return modeling URL", () => {
- expect(dataStudioModeling()).toBe("/data-studio/modeling");
+ describe("dataStudioLibrary", () => {
+ it("should return library URL", () => {
+ expect(dataStudioLibrary()).toBe("/data-studio/library");
});
});
describe("dataStudioTable", () => {
it("should return table URL", () => {
- expect(dataStudioTable(42)).toBe("/data-studio/modeling/tables/42");
+ expect(dataStudioTable(42)).toBe("/data-studio/library/tables/42");
});
});
describe("dataStudioTableFields", () => {
it("should return table fields URL without fieldId", () => {
expect(dataStudioTableFields(42)).toBe(
- "/data-studio/modeling/tables/42/fields",
+ "/data-studio/library/tables/42/fields",
);
});
it("should return table fields URL with fieldId", () => {
expect(dataStudioTableFields(42, 100)).toBe(
- "/data-studio/modeling/tables/42/fields/100",
+ "/data-studio/library/tables/42/fields/100",
);
});
});
@@ -121,21 +121,21 @@ describe("urls > data-studio", () => {
describe("dataStudioTableSegments", () => {
it("should return table segments URL", () => {
expect(dataStudioTableSegments(42)).toBe(
- "/data-studio/modeling/tables/42/segments",
+ "/data-studio/library/tables/42/segments",
);
});
});
describe("dataStudioSegment", () => {
it("should return segment edit URL", () => {
- expect(dataStudioSegment(123)).toBe("/data-studio/modeling/segments/123");
+ expect(dataStudioSegment(123)).toBe("/data-studio/library/segments/123");
});
});
describe("newDataStudioSegment", () => {
it("should return new segment URL with tableId", () => {
expect(newDataStudioSegment(42)).toBe(
- "/data-studio/modeling/segments/new?tableId=42",
+ "/data-studio/library/segments/new?tableId=42",
);
});
});
diff --git a/frontend/src/metabase/plugins/oss/snippets.ts b/frontend/src/metabase/plugins/oss/snippets.ts
index e821597fe64..10e6a675a6b 100644
--- a/frontend/src/metabase/plugins/oss/snippets.ts
+++ b/frontend/src/metabase/plugins/oss/snippets.ts
@@ -40,6 +40,7 @@ export type SnippetFormModalProps = {
collection: Partial<Collection>;
onClose: () => void;
onSaved?: () => void;
+ opened?: boolean;
};
export type SnippetCollectionMenuProps = {
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
index a1ecd6630be..5fd48da2c1d 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/data_studio.svg
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/data_studio.svg
@@ -1,5 +1,6 @@
-<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 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <circle cx="8" cy="3.8" r="1.8" fill="#358cd9" />
+ <circle opacity="0.7" cx="8" cy="12.2" r="1.8" fill="#358cd9" />
+ <circle opacity="0.7" cx="3.8" cy="8" r="1.8" fill="#358cd9" />
+ <circle opacity="0.7" cx="12.2" cy="8" r="1.8" fill="#358cd9" />
</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/dependencies.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/dependencies.svg
new file mode 100644
index 00000000000..f6d9861dc37
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/dependencies.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor">
+ <path d="M13.5 1.375C14.1213 1.375 14.625 1.87868 14.625 2.5V5.5C14.625 6.12132 14.1213 6.625 13.5 6.625H4.625V10C4.625 10.7594 5.24061 11.375 6 11.375H7.375V10.5C7.375 9.87868 7.87868 9.375 8.5 9.375H13.5C14.1213 9.375 14.625 9.87868 14.625 10.5V13.5C14.625 14.1213 14.1213 14.625 13.5 14.625H8.5C7.87868 14.625 7.375 14.1213 7.375 13.5V12.625H6C4.55025 12.625 3.375 11.4497 3.375 10V6.625H2.5C1.87868 6.625 1.375 6.12132 1.375 5.5V2.5C1.375 1.87868 1.87868 1.375 2.5 1.375H13.5ZM8.625 13.375H13.375V10.625H8.625V13.375ZM2.625 5.375H13.375V2.625H2.625V5.375Z"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/exit.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/exit.svg
new file mode 100644
index 00000000000..6cc8ce917a3
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/exit.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor">
+ <path d="M 7,2.25 C 7.41415,2.25007 7.75,2.58583 7.75,3 7.75,3.41417 7.41415,3.74993 7,3.75 H 3.75 v 8.5 H 7 c 0.41421,0 0.75001,0.3358 0.75,0.75 -10e-6,0.4142 -0.33579,0.75 -0.75,0.75 H 3 C 2.58583,13.75 2.25005,13.4143 2.25,13 V 3 C 2.25,2.58579 2.5858,2.25 3,2.25 Z m 3.4697,3.21973 c 0.2929,-0.29287 0.7677,-0.29288 1.0606,0 l 1.9873,1.9873 C 13.6609,7.59363 13.75,7.78642 13.75,8 c 0,0.21011 -0.0864,0.39997 -0.2256,0.53613 l -1.9941,1.99417 c -0.2929,0.2928 -0.7677,0.2928 -1.0606,0 -0.2929,-0.2929 -0.2929,-0.76768 0,-1.06057 L 11.1895,8.75 H 7 C 6.58579,8.75 6.25,8.41421 6.25,8 6.25,7.58579 6.58579,7.25 7,7.25 h 4.1895 L 10.4697,6.53027 c -0.2928,-0.2929 -0.2929,-0.76766 0,-1.06054 z"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/glossary.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/glossary.svg
new file mode 100644
index 00000000000..407f7dccdaa
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/glossary.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor">
+ <path d="M12 1.375C13.4497 1.375 14.625 2.55025 14.625 4V12C14.625 13.4497 13.4497 14.625 12 14.625H4C2.55025 14.625 1.375 13.4497 1.375 12V4C1.375 2.55025 2.55025 1.375 4 1.375H12ZM2.625 10.625V12C2.625 12.7594 3.24061 13.375 4 13.375H9.375V10.625H2.625ZM10.625 10.625V13.375H12C12.7594 13.375 13.375 12.7594 13.375 12V10.625H10.625ZM2.625 9.375H9.375V6.625H2.625V9.375ZM10.625 9.375H13.375V6.625H10.625V9.375ZM4 2.625C3.24061 2.625 2.625 3.24061 2.625 4V5.375H9.375V2.625H4ZM10.625 5.375H13.375V4C13.375 3.24061 12.7594 2.625 12 2.625H10.625V5.375Z"/>
+</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 7b370a185ef..ac51412adb8 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -136,6 +136,8 @@ 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 dependencies_component from "./dependencies.svg?component";
+import dependencies_source from "./dependencies.svg?source";
import document_component from "./document.svg?component";
import document_source from "./document.svg?source";
import download_component from "./download.svg?component";
@@ -160,6 +162,8 @@ import empty_component from "./empty.svg?component";
import empty_source from "./empty.svg?source";
import enter_or_return_component from "./enter_or_return.svg?component";
import enter_or_return_source from "./enter_or_return.svg?source";
+import exit_component from "./exit.svg?component";
+import exit_source from "./exit.svg?source";
import expand_component from "./expand.svg?component";
import expand_source from "./expand.svg?source";
import expand_arrow_component from "./expand_arrow.svg?component";
@@ -210,6 +214,8 @@ import git_branch_component from "./git_branch.svg?component";
import git_branch_source from "./git_branch.svg?source";
import globe_component from "./globe.svg?component";
import globe_source from "./globe.svg?source";
+import glossary_component from "./glossary.svg?component";
+import glossary_source from "./glossary.svg?source";
import google_component from "./google.svg?component";
import google_source from "./google.svg?source";
import google_drive_component from "./google_drive.svg?component";
@@ -318,6 +324,8 @@ import octagon_alert_component from "./octagon_alert.svg?component";
import octagon_alert_source from "./octagon_alert.svg?source";
import official_collection_component from "./official_collection.svg?component";
import official_collection_source from "./official_collection.svg?source";
+import open_folder_component from "./open_folder.svg?component";
+import open_folder_source from "./open_folder.svg?source";
import ordered_list_component from "./ordered_list.svg?component";
import ordered_list_source from "./ordered_list.svg?source";
import package_component from "./package.svg?component";
@@ -775,6 +783,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: database_component,
source: database_source,
},
+ dependencies: {
+ component: dependencies_component,
+ source: dependencies_source,
+ },
data_studio: {
component: data_studio_component,
source: data_studio_source,
@@ -827,6 +839,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: enter_or_return_component,
source: enter_or_return_source,
},
+ exit: {
+ component: exit_component,
+ source: exit_source,
+ },
expand: {
component: expand_component,
source: expand_source,
@@ -931,6 +947,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: globe_component,
source: globe_source,
},
+ glossary: {
+ component: glossary_component,
+ source: glossary_source,
+ },
grabber: {
component: grabber_component,
source: grabber_source,
@@ -1529,6 +1549,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: official_collection_component,
source: official_collection_source,
},
+ open_folder: {
+ component: open_folder_component,
+ source: open_folder_source,
+ },
ordered_list: {
component: ordered_list_component,
source: ordered_list_source,
@@ -1668,6 +1692,7 @@ export type IconName =
| "copy"
| "curved"
| "database"
+ | "dependencies"
| "data_studio"
| "dash"
| "dashboard"
@@ -1684,6 +1709,7 @@ export type IconName =
| "embed_static"
| "empty"
| "enter_or_return"
+ | "exit"
| "expand"
| "expand_arrow"
| "extract"
@@ -1709,6 +1735,7 @@ export type IconName =
| "gem"
| "ghost"
| "globe"
+ | "glossary"
| "git_branch"
| "grabber"
| "grid"
@@ -1856,6 +1883,7 @@ export type IconName =
| "variable"
| "verified"
| "official_collection"
+ | "open_folder"
| "ordered_list"
| "verified_filled"
| "verified_round"
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/open_folder.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/open_folder.svg
new file mode 100644
index 00000000000..53dc25c2f85
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/open_folder.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor">
+ <path d="M13.7578 7.23307C15.0527 7.23325 15.9068 8.58095 15.3555 9.7526L13.8112 13.0365C13.4099 13.8891 12.5518 14.4334 11.6094 14.4336H3C1.65611 14.4336 0.566406 13.3439 0.566406 12V3.66667C0.566406 2.50687 1.50687 1.56641 2.66667 1.56641H6C6.66082 1.56641 7.28308 1.87771 7.67969 2.40625L8.88021 4.00651C8.98723 4.1492 9.15497 4.23307 9.33333 4.23307H11C11.9757 4.23307 12.7669 5.0243 12.7669 6V6.66667H11.2331V6C11.2331 5.87113 11.1289 5.76693 11 5.76693H9.33333C8.67252 5.76693 8.05025 5.45562 7.65365 4.92708L6.45312 3.32682C6.34611 3.18413 6.17836 3.10026 6 3.10026H2.66667C2.35371 3.10026 2.10026 3.35371 2.10026 3.66667V12C2.10026 12.4971 2.50294 12.8997 3 12.8997H11.6094C11.9578 12.8996 12.2748 12.6981 12.4232 12.3828L13.9688 9.09896C14.0412 8.94436 13.9286 8.76711 13.7578 8.76693H6.76953C6.56727 8.76702 6.37986 8.87436 6.27865 9.04948L5.125 11.0495L3.79688 10.2839L4.95052 8.28385C5.3256 7.63419 6.01938 7.23317 6.76953 7.23307H13.7578Z"/>
+</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
index 6db7817c17d..ff58db454ef 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/transform.svg
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/transform.svg
@@ -1,5 +1,3 @@
-<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 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor">
+ <path d="M8.6748 6.83105L12.8584 4.41602L13.5332 5.58398L9.34863 7.99902L13.5332 10.416L12.8584 11.584L8.6748 9.16797V14H7.3252V9.16797L3.1416 11.584L2.4668 10.416L6.65137 7.99902L2.4668 5.58398L3.1416 4.41602L7.3252 6.83105V2H8.6748V6.83105Z"/>
</svg>
diff --git a/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.config.ts b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.config.ts
new file mode 100644
index 00000000000..3d1a18ad50d
--- /dev/null
+++ b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.config.ts
@@ -0,0 +1,11 @@
+import { Breadcrumbs, type MantineThemeOverride } from "@mantine/core";
+
+import S from "./Breadcrumbs.module.css";
+
+export const breadcrumbsOverrides: MantineThemeOverride["components"] = {
+ Breadcrumbs: Breadcrumbs.extend({
+ classNames: {
+ separator: S.separator,
+ },
+ }),
+};
diff --git a/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.module.css b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.module.css
new file mode 100644
index 00000000000..735d378fb28
--- /dev/null
+++ b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.module.css
@@ -0,0 +1,3 @@
+.separator {
+ color: var(--mb-color-icon-secondary);
+}
diff --git a/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.stories.tsx b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.stories.tsx
new file mode 100644
index 00000000000..097674b4b77
--- /dev/null
+++ b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.stories.tsx
@@ -0,0 +1,19 @@
+import Link from "metabase/common/components/Link";
+import { Breadcrumbs, Icon } from "metabase/ui";
+
+const DefaultTemplate = () => (
+ <Breadcrumbs separator={<Icon size={12} name="chevronright" />}>
+ <Link to="#">Root</Link>
+ <Link to="#">Nested</Link>
+ <span>Leaf</span>
+ </Breadcrumbs>
+);
+
+export default {
+ title: "Components/Navigation/Breadcrumbs",
+ component: Breadcrumbs,
+};
+
+export const Default = {
+ render: DefaultTemplate,
+};
diff --git a/frontend/src/metabase/ui/components/navigation/Breadcrumbs/index.tsx b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/index.tsx
new file mode 100644
index 00000000000..430536e4a5f
--- /dev/null
+++ b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/index.tsx
@@ -0,0 +1,3 @@
+export { Breadcrumbs, type BreadcrumbsProps } from "@mantine/core";
+
+export { breadcrumbsOverrides } from "./Breadcrumbs.config";
diff --git a/frontend/src/metabase/ui/components/navigation/index.ts b/frontend/src/metabase/ui/components/navigation/index.ts
index 77022afd3ec..f54f6b7b584 100644
--- a/frontend/src/metabase/ui/components/navigation/index.ts
+++ b/frontend/src/metabase/ui/components/navigation/index.ts
@@ -1,2 +1,3 @@
+export * from "./Breadcrumbs";
export * from "./NavLink";
export * from "./Tabs";
diff --git a/frontend/src/metabase/ui/theme.ts b/frontend/src/metabase/ui/theme.ts
index c52503f4477..e75fdb29549 100644
--- a/frontend/src/metabase/ui/theme.ts
+++ b/frontend/src/metabase/ui/theme.ts
@@ -12,6 +12,7 @@ import {
autocompleteOverrides,
avatarOverrides,
badgeOverrides,
+ breadcrumbsOverrides,
buttonOverrides,
calendarOverrides,
cardOverrides,
@@ -151,6 +152,7 @@ export const getThemeOverrides = (
...autocompleteOverrides,
...avatarOverrides,
...badgeOverrides,
+ ...breadcrumbsOverrides,
...buttonOverrides,
...calendarOverrides,
...cardOverrides,
diff --git a/resources/user_key_value_types/data_studio.edn b/resources/user_key_value_types/data_studio.edn
new file mode 100644
index 00000000000..349f7ef36a3
--- /dev/null
+++ b/resources/user_key_value_types/data_studio.edn
@@ -0,0 +1,2 @@
+[:map
+ [:value :boolean]]