Skip to content

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

Move SQL snippets and data actions into their own Data Studio tabs (#84052)

Alexander Polyankin82bf91cad7ca
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.ts
index ed6ffd9d9dc..ba08f682332 100644
--- a/e2e/support/helpers/e2e-data-studio-helpers.ts
+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts
@@ -92,6 +92,10 @@ export const DataStudio = {
editor: () => cy.findByTestId("python-editor"),
},
Snippets: {
+ visitList: () => {
+ cy.visit("/data-studio/snippets");
+ libraryPage().should("be.visible");
+ },
newPage: newSnippetPage,
editPage: editSnippetPage,
archivedPage: archivedSnippetsPage,
@@ -101,7 +105,7 @@ export const DataStudio = {
cancelButton: () => cy.findByRole("button", { name: "Cancel" }),
editor: codeMirrorHelpers("snippet-editor", {}),
visitSnippet: (snippetId: number) =>
- cy.visit(`/data-studio/library/snippets/${snippetId}`),
+ cy.visit(`/data-studio/snippets/${snippetId}`),
},
Metrics: MetricPage,
Tables: {
@@ -158,6 +162,12 @@ export const DataStudio = {
H.popover();
},
},
+ Actions: {
+ visitList: () => {
+ cy.visit("/data-studio/actions");
+ libraryPage().should("be.visible");
+ },
+ },
Library: {
visit: () => {
cy.visit("/data-studio/library");
@@ -167,14 +177,7 @@ export const DataStudio = {
DataStudio.Library.collectionItem("Dashboards")
.scrollIntoView()
.should("be.visible");
- DataStudio.Library.collectionItem("SQL snippets")
- .scrollIntoView()
- .should("be.visible");
},
- noResults: () =>
- libraryPage().findByText(
- "No tables, metrics, dashboards, or snippets yet",
- ),
libraryPage,
allTableItems: () => libraryPage().findAllByTestId("table-name"),
tableItem: (name: string) =>
diff --git a/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
index 5aad3280cb7..492650a8abe 100644
--- a/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
@@ -69,7 +69,7 @@ describe("scenarios > data studio > library", () => {
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");
+ H.DataStudio.Library.collectionItem("Dashboards").should("be.visible");
});
it("should let you move metrics into the library, even when empty", () => {
@@ -300,7 +300,6 @@ describe("scenarios > data studio > library", () => {
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");
cy.log("Verify Data section empty state");
H.DataStudio.Library.libraryPage()
@@ -318,14 +317,6 @@ describe("scenarios > data studio > library", () => {
.findByRole("link", { name: "New metric" })
.should("be.visible");
- cy.log("Verify SQL snippets section empty state");
- H.DataStudio.Library.libraryPage()
- .findByText("Reusable bits of code that save your time")
- .should("be.visible");
- H.DataStudio.Library.libraryPage()
- .findByRole("link", { name: "New snippet" })
- .should("be.visible");
-
cy.log("Click on 'Publish a table' button and verify modal opens");
H.DataStudio.Library.libraryPage()
.findByRole("button", { name: "Publish a table" })
@@ -395,14 +386,37 @@ describe("scenarios > data studio > library", () => {
H.DataStudio.Library.tableItem("Orders").should("be.visible");
cy.log(
- "Verify Metrics and SQL snippets still show empty states (always expanded behavior)",
+ "Verify Metrics still shows its empty state (always expanded behavior)",
);
H.DataStudio.Library.emptyStateRow(
"Standardized calculations with known dimensions",
).should("be.visible");
+ });
+
+ it("should show empty states on the SQL snippets and Data actions tabs", () => {
+ H.createLibrary();
+ H.DataStudio.Library.visit();
+
+ cy.log("Verify the semantic layer has no snippets or actions sections");
+ H.DataStudio.Library.collectionItem("SQL snippets").should("not.exist");
+ H.DataStudio.Library.collectionItem("Data actions").should("not.exist");
+
+ cy.log("Verify SQL snippets tab empty state");
+ H.DataStudio.nav().findByRole("link", { name: "SQL snippets" }).click();
+ H.DataStudio.Library.collectionItem("SQL snippets").should("be.visible");
H.DataStudio.Library.emptyStateRow(
"Reusable bits of code that save your time",
).should("be.visible");
+ H.DataStudio.Library.libraryPage()
+ .findByRole("link", { name: "New snippet" })
+ .should("be.visible");
+
+ cy.log("Verify Data actions tab empty state");
+ H.DataStudio.nav().findByRole("link", { name: "Data actions" }).click();
+ H.DataStudio.Library.collectionItem("Data actions").should("be.visible");
+ H.DataStudio.Library.emptyStateRow("Queries that change data").should(
+ "be.visible",
+ );
});
describe("read-only mode", () => {
@@ -436,10 +450,11 @@ describe("scenarios > data studio > library", () => {
.findByRole("link", { name: "New metric" })
.should("not.exist");
- cy.log("Verify SQL snippets section empty state action is not visible");
- H.DataStudio.Library.libraryPage()
- .findByText("Reusable bits of code that save your time")
- .should("be.visible");
+ cy.log("Verify SQL snippets tab empty state action is not visible");
+ H.DataStudio.Snippets.visitList();
+ H.DataStudio.Library.emptyStateRow(
+ "Reusable bits of code that save your time",
+ ).should("be.visible");
H.DataStudio.Library.libraryPage()
.findByRole("link", { name: "New snippet" })
.should("not.exist");
diff --git a/e2e/test/scenarios/data-studio/snippets.cy.spec.ts b/e2e/test/scenarios/data-studio/snippets.cy.spec.ts
index 2b3e771ddda..a82ff69b43e 100644
--- a/e2e/test/scenarios/data-studio/snippets.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/snippets.cy.spec.ts
@@ -20,7 +20,7 @@ describe("scenarios > data studio > snippets", () => {
content: "SELECT * FROM orders",
});
- H.DataStudio.Library.visit();
+ H.DataStudio.Snippets.visitList();
H.DataStudio.Library.libraryPage().findByText("Test snippet").click();
@@ -95,7 +95,7 @@ describe("scenarios > data studio > snippets", () => {
description: "**Bold text** and *italic text*",
});
- H.DataStudio.Library.visit();
+ H.DataStudio.Snippets.visitList();
H.DataStudio.Library.libraryPage().findByText("Test snippet").click();
@@ -149,7 +149,7 @@ describe("scenarios > data studio > snippets", () => {
.findByText("Test snippet")
.should("not.exist");
- H.DataStudio.Library.visit();
+ H.DataStudio.Snippets.visitList();
H.DataStudio.Library.libraryPage()
.findByText("Test snippet")
@@ -164,7 +164,7 @@ describe("scenarios > data studio > snippets", () => {
});
it("should create a snippet, then a folder and a snippet inside it", () => {
- H.DataStudio.Library.visit();
+ H.DataStudio.Snippets.visitList();
H.DataStudio.Library.newButton().click();
H.popover().findByText("Snippet").click();
@@ -196,14 +196,14 @@ describe("scenarios > data studio > snippets", () => {
cy.findByText(/by Bobby Tables/).should("be.visible");
});
- H.DataStudio.nav().findByRole("link", { name: "Semantic layer" }).click();
+ H.DataStudio.nav().findByRole("link", { name: "SQL snippets" }).click();
H.DataStudio.Library.libraryPage()
.findByText("Test snippet")
.should("be.visible");
cy.log("Create a folder and a snippet inside it");
H.DataStudio.Library.newButton().click();
- H.popover().findByText("Collection").click();
+ H.popover().findByText("Folder").click();
H.modal().within(() => {
cy.findByLabelText("Name").type("Test Folder");
@@ -219,7 +219,7 @@ describe("scenarios > data studio > snippets", () => {
cy.wait("@createCollection");
});
- H.DataStudio.Library.visit();
+ H.DataStudio.Snippets.visitList();
H.DataStudio.Library.libraryPage()
.findByText("Test Folder")
.should("be.visible");
@@ -251,7 +251,7 @@ describe("scenarios > data studio > snippets", () => {
name: "Test Folder",
});
- H.DataStudio.Library.visit();
+ H.DataStudio.Snippets.visitList();
H.DataStudio.Library.result("Test Folder").icon("ellipsis").click();
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
deleted file mode 100644
index 57e32744b97..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { match } from "ts-pattern";
-import { t } from "ttag";
-
-import { useListCollectionsTreeQuery } from "metabase/api";
-import { ListEmptyState } from "metabase/common/components/ListEmptyState";
-import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
-import { useHasTokenFeature } from "metabase/common/hooks";
-import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";
-import { LibraryUpsellPage } from "metabase/data-studio/upsells/pages";
-import { useSelector } from "metabase/redux";
-import {
- Card,
- Flex,
- Icon,
- Stack,
- TextInput,
- TreeTable,
- TreeTableSkeleton,
-} from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import type { CollectionId } from "metabase-types/api";
-
-import { LibraryEmptyState } from "../components/LibraryEmptyState";
-
-import { CreateLibraryDashboardModal } from "./components/CreateLibraryDashboardModal";
-import { CreateMenu } from "./components/CreateMenu";
-import { LibraryBulkActions } from "./components/LibraryBulkActions";
-import { PublishTableModal } from "./components/PublishTableModal";
-import { useLibraryCollections, useLibraryTreeTableInstance } from "./hooks";
-import type { LibrarySection } from "./hooks/library-bulk-selection.utils";
-import { useLibraryBulkSelection } from "./hooks/useLibraryBulkSelection";
-import { getWritableCollection } from "./utils";
-
-export function LibraryPage() {
- const hasLibraryFeature = useHasTokenFeature("library");
-
- if (!hasLibraryFeature) {
- return <LibraryUpsellPage />;
- }
-
- return <LibraryPageContent />;
-}
-
-function LibraryPageContent() {
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
- const [searchQuery, setSearchQuery] = useState("");
- const [
- showPublishTableModal,
- { open: openPublishTableModal, close: closePublishTableModal },
- ] = useDisclosure(false);
- const [
- showCreateDashboardModal,
- { open: openCreateDashboardModal, close: closeCreateDashboardModal },
- ] = useDisclosure(false);
- const { data: collections = [], isLoading: isLoadingCollections } =
- useListCollectionsTreeQuery({
- "exclude-other-user-collections": true,
- "exclude-archived": true,
- "include-library": true,
- });
- const {
- treeTableInstance,
- allRows,
- isChildrenLoading,
- isLoading,
- emptyMessage,
- refreshSection,
- } = useLibraryTreeTableInstance({
- collections,
- isLoadingCollections,
- searchQuery,
- onPublishTableClick: openPublishTableModal,
- onNewDashboardClick: openCreateDashboardModal,
- });
-
- const {
- libraryCollection,
- tableCollection,
- metricCollection,
- dashboardCollection,
- } = useLibraryCollections(collections);
- const writableMetricCollection = useMemo(
- () =>
- libraryCollection &&
- getWritableCollection(libraryCollection, "library-metrics"),
- [libraryCollection],
- );
-
- const {
- selectedItems,
- selectionSection,
- isAllTables,
- getSelectionState,
- getRowCovered,
- onCheckboxClick,
- clear: clearSelection,
- } = useLibraryBulkSelection(allRows);
-
- // Clear selection when changing search query
- const trimmedSearch = searchQuery.trim();
- useEffect(() => {
- clearSelection();
- }, [trimmedSearch, clearSelection]);
-
- const moveDefaultCollectionId = match(selectionSection)
- .with("data", () => tableCollection?.id)
- .with("metrics", () => metricCollection?.id)
- .with("dashboards", () => dashboardCollection?.id)
- .otherwise(() => undefined);
-
- const handleActionComplete = useCallback(
- (section: LibrarySection, affectedCollectionIds: CollectionId[]) => {
- refreshSection(section, affectedCollectionIds);
- // Snippet sections refetch via RTK tag invalidation.
- clearSelection();
- },
- [refreshSection, clearSelection],
- );
-
- return (
- <>
- <SectionLayout>
- <PaneHeader
- breadcrumbs={
- <DataStudioBreadcrumbs>{t`Semantic layer`}</DataStudioBreadcrumbs>
- }
- px="3.5rem"
- py={0}
- />
- <Stack
- bg="background_page-secondary"
- data-testid="library-page"
- pb="2rem"
- px="3.5rem"
- style={{ overflow: "hidden" }}
- >
- {!libraryCollection && !isLoadingCollections ? (
- <LibraryEmptyState />
- ) : (
- <>
- <Flex gap="lg">
- <TextInput
- placeholder={t`Search...`}
- leftSection={<Icon name="search" />}
- bdrs="sm"
- flex="1"
- value={searchQuery}
- onChange={(e) => setSearchQuery(e.target.value)}
- />
- <CreateMenu
- metricCollectionId={writableMetricCollection?.id}
- canWriteToMetricCollection={!!writableMetricCollection}
- dataCollectionId={tableCollection?.id}
- canWriteToDataCollection={!!tableCollection?.can_write}
- dashboardCollectionId={dashboardCollection?.id}
- canWriteToDashboardCollection={
- !!dashboardCollection?.can_write
- }
- onNewDashboardClick={openCreateDashboardModal}
- />
- </Flex>
- <Card withBorder p={0}>
- {isLoading ? (
- <TreeTableSkeleton columnWidths={[0.6, 0.2, 0.05]} />
- ) : (
- <TreeTable
- instance={treeTableInstance}
- showCheckboxes={!isRemoteSyncReadOnly}
- getSelectionState={getSelectionState}
- isRowDisabled={getRowCovered}
- onCheckboxClick={onCheckboxClick}
- emptyState={
- emptyMessage ? (
- <ListEmptyState label={emptyMessage} />
- ) : null
- }
- onRowClick={(row) => {
- if (row.original.model === "empty-state") {
- return;
- }
- if (row.getCanExpand()) {
- row.toggleExpanded();
- }
- // Leaf navigation is handled by the name link in the cell
- }}
- isChildrenLoading={isChildrenLoading}
- />
- )}
- </Card>
- </>
- )}
- </Stack>
- </SectionLayout>
- <PublishTableModal
- opened={showPublishTableModal}
- onClose={closePublishTableModal}
- onPublished={closePublishTableModal}
- />
- {dashboardCollection && (
- <CreateLibraryDashboardModal
- opened={showCreateDashboardModal}
- collectionId={dashboardCollection.id}
- onClose={closeCreateDashboardModal}
- />
- )}
- {!isRemoteSyncReadOnly && (
- <LibraryBulkActions
- selectedItems={selectedItems}
- selectionSection={selectionSection}
- isAllTables={isAllTables}
- defaultCollectionId={moveDefaultCollectionId}
- onActionComplete={handleActionComplete}
- onClear={clearSelection}
- />
- )}
- </>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/index.ts
deleted file mode 100644
index 8d36a866d5d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { useLibraryCollections } from "./useLibraryCollections";
-export { useLibraryTreeTableInstance } from "./useLibraryTreeTableInstance";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollections.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollections.ts
deleted file mode 100644
index 496d39aef8d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollections.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useMemo } from "react";
-
-import { isLibraryCollection } from "metabase/common/collections/utils";
-import type { Collection } from "metabase-types/api";
-
-import { getAccessibleCollection } from "../utils";
-
-export const useLibraryCollections = (collections: Collection[]) => {
- const libraryCollection = useMemo(
- () => collections.find(isLibraryCollection),
- [collections],
- );
-
- const tableCollection = useMemo(
- () =>
- libraryCollection &&
- getAccessibleCollection(libraryCollection, "library-data"),
- [libraryCollection],
- );
-
- const metricCollection = useMemo(
- () =>
- libraryCollection &&
- getAccessibleCollection(libraryCollection, "library-metrics"),
- [libraryCollection],
- );
-
- const dashboardCollection = useMemo(
- () =>
- libraryCollection &&
- getAccessibleCollection(libraryCollection, "library-dashboards"),
- [libraryCollection],
- );
-
- return {
- libraryCollection,
- tableCollection,
- metricCollection,
- dashboardCollection,
- };
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibrarySearch.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibrarySearch.ts
deleted file mode 100644
index ad2c21d6053..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibrarySearch.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { useMemo } from "react";
-import { t } from "ttag";
-
-import { skipToken, useSearchQuery } from "metabase/api";
-import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import type { TreeItem } from "metabase/data-studio/common/types";
-import { useGetIcon } from "metabase/hooks/use-icon";
-import type { CollectionId } from "metabase-types/api";
-
-const SEARCH_DEBOUNCE_MS = 300;
-
-export function useLibrarySearch(
- searchQuery: string,
- libraryCollectionId: CollectionId | undefined,
- localTree: TreeItem[],
-) {
- const debouncedQuery = useDebouncedValue(searchQuery, SEARCH_DEBOUNCE_MS);
- const isActive = debouncedQuery.trim().length > 0;
- const getIcon = useGetIcon();
-
- const {
- data: searchResponse,
- isLoading,
- isFetching,
- error,
- } = useSearchQuery(
- isActive && libraryCollectionId != null
- ? {
- q: debouncedQuery,
- collection: libraryCollectionId,
- models: ["table", "metric", "dashboard"],
- context: "library",
- }
- : skipToken,
- );
-
- const tree = useMemo((): TreeItem[] => {
- if (!isActive) {
- return [];
- }
-
- const sections: TreeItem[] = [];
-
- if (searchResponse) {
- const dataItems: TreeItem[] = [];
- const metricItems: TreeItem[] = [];
- const dashboardItems: TreeItem[] = [];
-
- for (const result of searchResponse.data) {
- if (
- result.model !== "table" &&
- result.model !== "metric" &&
- result.model !== "dashboard"
- ) {
- continue;
- }
-
- const item: TreeItem = {
- id: `${result.model}:${result.id}`,
- name: result.name,
- icon: getIcon({ model: result.model }).name,
- updatedAt: result.last_edited_at ?? result.updated_at,
- model: result.model,
- parentCollectionName: result.collection?.name,
- data: {
- id: Number(result.id),
- model: result.model,
- name: result.name,
- description: result.description,
- collection_id: result.collection_id ?? null,
- archived: result.archived ?? false,
- collection_position: result.collection_position,
- "last-edit-info": result["last-edit-info"],
- },
- };
-
- if (result.model === "table") {
- dataItems.push(item);
- } else if (result.model === "metric") {
- metricItems.push(item);
- } else {
- dashboardItems.push(item);
- }
- }
-
- if (dataItems.length > 0) {
- sections.push({
- id: "search-section:data",
- name: t`Data`,
- icon: "table",
- model: "collection",
- data: {
- model: "collection",
- name: t`Data`,
- },
- children: dataItems,
- });
- }
-
- if (metricItems.length > 0) {
- sections.push({
- id: "search-section:metrics",
- name: t`Metrics`,
- icon: "metric",
- model: "collection",
- data: {
- model: "collection",
- name: t`Metrics`,
- },
- children: metricItems,
- });
- }
-
- if (dashboardItems.length > 0) {
- sections.push({
- id: "search-section:dashboards",
- name: t`Dashboards`,
- icon: "dashboard",
- model: "collection",
- data: {
- model: "collection",
- name: t`Dashboards`,
- },
- children: dashboardItems,
- });
- }
- }
-
- // Client-side filter snippets and actions
- sections.push(...filterLocalTree(localTree, debouncedQuery));
-
- return sections;
- }, [isActive, searchResponse, localTree, debouncedQuery, getIcon]);
-
- return {
- tree,
- isActive,
- isLoading: isLoading || isFetching,
- error,
- };
-}
-
-function filterLocalTree(nodes: TreeItem[], query: string): TreeItem[] {
- const lowerQuery = query.toLowerCase();
-
- return nodes.flatMap((node) => {
- if (node.model === "snippet" || node.model === "action") {
- return node.name.toLowerCase().includes(lowerQuery) ? [node] : [];
- }
-
- if (node.children) {
- const filteredChildren = filterLocalTree(node.children, query);
- if (filteredChildren.length > 0) {
- return [{ ...node, children: filteredChildren }];
- }
- }
-
- return [];
- });
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryTreeTableInstance.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryTreeTableInstance.tsx
deleted file mode 100644
index e025d31510a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryTreeTableInstance.tsx
+++ /dev/null
@@ -1,429 +0,0 @@
-import type { ExpandedState } from "@tanstack/react-table";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { t } from "ttag";
-
-import { DateTime } from "metabase/common/components/DateTime";
-import { Link } from "metabase/common/components/Link";
-import { useBuildSnippetTree } from "metabase/data-studio/common/hooks/use-build-snippet-tree";
-import type { TreeItem } from "metabase/data-studio/common/types";
-import { isEmptyStateData } from "metabase/data-studio/common/utils";
-import { useSelector } from "metabase/redux";
-import { useSearchParams } from "metabase/router";
-import {
- EntityNameCell,
- Flex,
- Group,
- Icon,
- Text,
- type TreeTableColumnDef,
- useTreeTableInstance,
-} from "metabase/ui";
-import { useActionDatabases } from "metabase-enterprise/data-studio/library/actions/hooks/use-action-databases";
-import { useBuildActionTree } from "metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree";
-import { canCreateActions } from "metabase-enterprise/data-studio/library/actions/utils";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import type { Collection, CollectionId } from "metabase-types/api";
-
-import { ActionCell } from "../components/ActionCell";
-import { EmptyStateAction } from "../components/EmptyStateAction";
-import { getTreeRowHref } from "../utils";
-
-import type { LibrarySection } from "./library-bulk-selection.utils";
-import { useErrorHandling } from "./useErrorHandling";
-import { useLibraryCollectionTree } from "./useLibraryCollectionTree";
-import { useLibraryCollections } from "./useLibraryCollections";
-import { useLibrarySearch } from "./useLibrarySearch";
-
-type Params = {
- collections: Collection[];
- isLoadingCollections: boolean;
- searchQuery: string;
- onPublishTableClick: VoidFunction;
- onNewDashboardClick: VoidFunction;
-};
-
-export function useLibraryTreeTableInstance({
- collections,
- isLoadingCollections,
- searchQuery,
- onPublishTableClick,
- onNewDashboardClick,
-}: Params) {
- const [searchParams] = useSearchParams();
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
-
- const expandedIdsFromUrl = useMemo(
- (): Record<string, boolean> =>
- Object.fromEntries(
- searchParams
- .getAll("expandedId")
- .map((id) => [`collection:${id}`, true]),
- ),
- [searchParams],
- );
- const {
- libraryCollection,
- tableCollection,
- metricCollection,
- dashboardCollection,
- } = useLibraryCollections(collections);
-
- const {
- tree: tablesTree,
- isLoading: loadingTables,
- error: tablesError,
- watchRows: watchTableRows,
- isChildrenLoading: isTableChildrenLoading,
- refreshCollections: refreshTableCollections,
- } = useLibraryCollectionTree(tableCollection, "data");
- const {
- tree: metricsTree,
- isLoading: loadingMetrics,
- error: metricsError,
- watchRows: watchMetricRows,
- isChildrenLoading: isMetricChildrenLoading,
- refreshCollections: refreshMetricCollections,
- } = useLibraryCollectionTree(
- metricCollection,
- "metrics",
- metricCollection?.id,
- );
- const {
- tree: dashboardsTree,
- isLoading: loadingDashboards,
- error: dashboardsError,
- watchRows: watchDashboardRows,
- isChildrenLoading: isDashboardChildrenLoading,
- refreshCollections: refreshDashboardCollections,
- } = useLibraryCollectionTree(dashboardCollection, "dashboards");
- const {
- tree: snippetTree,
- isLoading: loadingSnippets,
- error: snippetsError,
- } = useBuildSnippetTree();
- const { databases: actionDatabases, isLoading: loadingActionDatabases } =
- useActionDatabases();
- const {
- tree: actionTree,
- isLoading: loadingActions,
- error: actionsError,
- } = useBuildActionTree({
- canCreateActions:
- !isRemoteSyncReadOnly && canCreateActions(actionDatabases),
- });
- const localTree = useMemo(
- () => [...snippetTree, ...actionTree],
- [snippetTree, actionTree],
- );
-
- const refreshSection = useCallback(
- (section: LibrarySection, collectionIds: CollectionId[]) => {
- const refreshCollections = {
- data: refreshTableCollections,
- metrics: refreshMetricCollections,
- dashboards: refreshDashboardCollections,
- snippets: undefined,
- actions: undefined,
- }[section];
- refreshCollections?.(collectionIds);
- },
- [
- refreshTableCollections,
- refreshMetricCollections,
- refreshDashboardCollections,
- ],
- );
-
- // Server-side search for tables, metrics, and dashboards, client-side for snippets and actions
- const {
- tree: searchTree,
- isActive: isSearchActive,
- isLoading: isSearchLoading,
- } = useLibrarySearch(searchQuery, libraryCollection?.id, localTree);
-
- const combinedTree = useMemo(
- () =>
- isSearchActive
- ? searchTree
- : [...tablesTree, ...metricsTree, ...dashboardsTree, ...localTree],
- [
- isSearchActive,
- searchTree,
- tablesTree,
- metricsTree,
- dashboardsTree,
- localTree,
- ],
- );
-
- const isLoading =
- isLoadingCollections ||
- loadingTables ||
- loadingMetrics ||
- loadingDashboards ||
- loadingSnippets ||
- loadingActions ||
- loadingActionDatabases ||
- isSearchLoading;
- useErrorHandling(
- tablesError ||
- metricsError ||
- dashboardsError ||
- snippetsError ||
- actionsError,
- );
-
- const libraryHasContent = useMemo(
- () =>
- combinedTree.some(
- (node) =>
- node.children &&
- node.children.length > 0 &&
- node.children.some((child) => child.model !== "empty-state"),
- ),
- [combinedTree],
- );
-
- const libraryColumnDef = useMemo<TreeTableColumnDef<TreeItem>[]>(
- () => [
- {
- id: "name",
- header: t`Name`,
- enableSorting: true,
- accessorKey: "name",
- minWidth: 200,
- cell: ({ row }) => {
- const { data } = row.original;
-
- if (isEmptyStateData(data)) {
- return (
- <Flex align="center" gap="0.25rem" data-testid="empty-state-row">
- <Text c="text-disabled" fz="inherit">
- {data.description}
- </Text>
- {!isRemoteSyncReadOnly && (
- <EmptyStateAction
- data={data}
- onPublishTableClick={onPublishTableClick}
- onNewDashboardClick={onNewDashboardClick}
- />
- )}
- </Flex>
- );
- }
-
- const nameCell = (
- <EntityNameCell
- data-testid={`${row.original.model}-name`}
- icon={row.original.icon}
- name={
- row.original.parentCollectionName ? (
- <Group gap="sm" miw={0} align="center">
- <Text truncate>{row.original.name}</Text>
- <Group gap="xxs">
- <Icon name="collection" size={12} c="text-disabled" />
- <Text fz="xs" c="text-disabled" truncate>
- {row.original.parentCollectionName}
- </Text>
- </Group>
- </Group>
- ) : (
- row.original.name
- )
- }
- />
- );
-
- const href = getTreeRowHref(row);
- if (href === null) {
- return nameCell;
- }
- return (
- <Link
- to={href}
- style={{
- display: "flex",
- flex: 1,
- minWidth: 0,
- textDecoration: "none",
- color: "inherit",
- }}
- >
- {nameCell}
- </Link>
- );
- },
- },
- {
- id: "updatedAt",
- header: t`Updated At`,
- accessorKey: "updatedAt",
- enableSorting: true,
- sortingFn: "datetime",
- width: "auto",
- widthPadding: 20,
- cell: ({ row, getValue }) => {
- if (row.original.model === "empty-state") {
- return null;
- }
- // Unjustified type cast. FIXME
- const dateValue = getValue() as string | undefined;
- return dateValue ? <DateTime value={dateValue} /> : null;
- },
- },
- {
- id: "actions",
- width: 48,
- cell: ({ row }) => (
- <ActionCell treeItem={row.original} refreshSection={refreshSection} />
- ),
- },
- ],
- [
- isRemoteSyncReadOnly,
- onPublishTableClick,
- onNewDashboardClick,
- refreshSection,
- ],
- );
-
- const snippetRootId = snippetTree[0]?.id;
- const actionRootId = actionTree[0]?.id;
-
- // Controlled expansion: expand all during search, preserve user state when browsing.
- // Expand Data, Metrics, Dashboards, SQL Snippets and Data actions, plus any IDs from the URL
- const defaultExpanded = useMemo<ExpandedState>(() => {
- const ids: ExpandedState = {};
- if (tableCollection) {
- ids[`collection:${tableCollection.id}`] = true;
- }
- if (metricCollection) {
- ids[`collection:${metricCollection.id}`] = true;
- }
- if (dashboardCollection) {
- ids[`collection:${dashboardCollection.id}`] = true;
- }
-
- if (snippetRootId) {
- ids[snippetRootId] = true;
- }
-
- if (actionRootId) {
- ids[actionRootId] = true;
- }
-
- return { ...ids, ...expandedIdsFromUrl };
- }, [
- expandedIdsFromUrl,
- tableCollection,
- metricCollection,
- dashboardCollection,
- snippetRootId,
- actionRootId,
- ]);
-
- const [browseExpanded, setBrowseExpanded] = useState<ExpandedState | null>(
- null,
- );
-
- // Lock browseExpanded once loading settles. isLoading now includes the collections fetch, so it
- // no longer fires early (section item queries are skipped until collections resolve).
- useEffect(() => {
- if (
- browseExpanded === null &&
- !isLoading &&
- Object.keys(defaultExpanded).length > 0
- ) {
- setBrowseExpanded(defaultExpanded);
- }
- }, [browseExpanded, defaultExpanded, isLoading]);
-
- const expanded = isSearchActive ? true : (browseExpanded ?? defaultExpanded);
- const onExpandedChange = useCallback(
- (updater: ExpandedState | ((old: ExpandedState) => ExpandedState)) => {
- if (!isSearchActive) {
- setBrowseExpanded((prev) => {
- const current = prev ?? defaultExpanded;
- return typeof updater === "function" ? updater(current) : updater;
- });
- }
- },
- [isSearchActive, defaultExpanded],
- );
-
- const treeTableInstance = useTreeTableInstance({
- data: combinedTree,
- columns: libraryColumnDef,
- getSubRows: (node) => node.children,
- getNodeId: (node) => node.id,
- getRowCanExpand: (row) => {
- const { model, data, children } = row.original;
- if (model !== "collection") {
- return false;
- }
- if (row.original.childrenLoaded) {
- return children != null && children.length > 0;
- }
- // Already has children populated
- if (children && children.length > 0) {
- return true;
- }
- // Not loaded yet — check here/below from the API to know if expandable
- if (!isEmptyStateData(data) && "here" in data) {
- // Unjustified type cast. FIXME
- const item = data as { here?: string[]; below?: string[] };
- return (
- (item.here != null && item.here.length > 0) ||
- (item.below != null && item.below.length > 0)
- );
- }
- return false;
- },
- expanded,
- onExpandedChange,
- isFilterable: (node) =>
- node.model !== "collection" && node.model !== "empty-state",
- });
-
- // Lazy-load subcollection items when expanded
- useEffect(() => {
- watchTableRows(treeTableInstance.rows);
- watchMetricRows(treeTableInstance.rows);
- watchDashboardRows(treeTableInstance.rows);
- }, [
- treeTableInstance.rows,
- watchTableRows,
- watchMetricRows,
- watchDashboardRows,
- ]);
-
- const isChildrenLoading = useCallback(
- (row: Parameters<typeof isTableChildrenLoading>[0]) =>
- isTableChildrenLoading(row) ||
- isMetricChildrenLoading(row) ||
- isDashboardChildrenLoading(row),
- [
- isTableChildrenLoading,
- isMetricChildrenLoading,
- isDashboardChildrenLoading,
- ],
- );
-
- let emptyMessage = null;
- if (!libraryHasContent) {
- emptyMessage = t`No tables, metrics, dashboards, or snippets yet`;
- } else if (searchQuery) {
- emptyMessage = t`No results for "${searchQuery}"`;
- }
-
- const allRows = treeTableInstance.table.getCoreRowModel().flatRows;
-
- return {
- treeTableInstance,
- allRows,
- isChildrenLoading,
- isLoading,
- emptyMessage,
- refreshSection,
- };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ArchivedActionsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ArchivedActionsPage/index.ts
deleted file mode 100644
index 84a2320b808..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ArchivedActionsPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ArchivedActionsPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/DataReferenceLibraryPane.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/DataReferenceLibraryPane.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/DataReferenceLibraryPane.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/DataReferenceLibraryPane.tsx
index 324e584906d..a3b564e7dbe 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/DataReferenceLibraryPane.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/DataReferenceLibraryPane.tsx
@@ -20,7 +20,7 @@ import type {
import { Box, Ellipsified, Text } from "metabase/ui";
import { type SearchResult, isConcreteTableId } from "metabase-types/api";
-import { useGetLibraryCollection } from "./utils";
+import { useGetLibraryCollection } from "../../hooks/use-get-library-collection";
type DataReferenceLibraryPaneProps =
DataReferencePaneProps<DataReferenceLibraryItem>;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/DataReferenceLibraryPane.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/DataReferenceLibraryPane.unit.spec.tsx
similarity index 99%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/DataReferenceLibraryPane.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/DataReferenceLibraryPane.unit.spec.tsx
index 198fb21875f..d2971adb424 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/DataReferenceLibraryPane.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/DataReferenceLibraryPane.unit.spec.tsx
@@ -13,7 +13,7 @@ import {
import type { DatabaseId, SearchResult } from "metabase-types/api";
import { createMockSearchResult } from "metabase-types/api/mocks";
-import { DataReferenceLibraryPane } from "./DataReferenceLibraryPane";
+import { DataReferenceLibraryPane } from ".";
const TARGET_DB_ID = 1;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/index.ts
new file mode 100644
index 00000000000..9b90312ab46
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/DataReferenceLibraryPane/index.ts
@@ -0,0 +1 @@
+export { DataReferenceLibraryPane } from "./DataReferenceLibraryPane";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-child-collection-by-type/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-child-collection-by-type/index.ts
new file mode 100644
index 00000000000..4434775caab
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-child-collection-by-type/index.ts
@@ -0,0 +1 @@
+export { useGetLibraryChildCollectionByType } from "./use-get-library-child-collection-by-type";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-child-collection-by-type/use-get-library-child-collection-by-type.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-child-collection-by-type/use-get-library-child-collection-by-type.ts
new file mode 100644
index 00000000000..bbb94dfec44
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-child-collection-by-type/use-get-library-child-collection-by-type.ts
@@ -0,0 +1,34 @@
+import { useMemo } from "react";
+
+import { skipToken, useListCollectionItemsQuery } from "metabase/api";
+import type { CollectionItem, CollectionType } from "metabase-types/api";
+
+import { useGetLibraryCollection } from "../use-get-library-collection";
+
+export const useGetLibraryChildCollectionByType = ({
+ skip,
+ type,
+}: {
+ skip?: boolean;
+ type: CollectionType;
+}) => {
+ const { data: rootLibraryCollection, isLoading: isLoadingLibrary } =
+ useGetLibraryCollection({ skip });
+ const { data: libraryCollections, isLoading: isLoadingItems } =
+ useListCollectionItemsQuery(
+ rootLibraryCollection ? { id: rootLibraryCollection.id } : skipToken,
+ );
+ const data = useMemo(
+ () =>
+ libraryCollections?.data.find(
+ (collection: CollectionItem) => collection.type === type,
+ ),
+ [libraryCollections, type],
+ );
+
+ return {
+ data,
+ isLoading:
+ isLoadingLibrary || (rootLibraryCollection != null && isLoadingItems),
+ };
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-collection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-collection/index.ts
new file mode 100644
index 00000000000..e6fe6fe99be
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-collection/index.ts
@@ -0,0 +1 @@
+export { useGetLibraryCollection } from "./use-get-library-collection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-collection/use-get-library-collection.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-collection/use-get-library-collection.ts
new file mode 100644
index 00000000000..b39fa63169c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-library-collection/use-get-library-collection.ts
@@ -0,0 +1,29 @@
+import { useMemo } from "react";
+
+import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
+import type { CollectionItem } from "metabase-types/api";
+
+const isLibrary = (
+ collection: CollectionItem | { data: null } | undefined,
+): collection is CollectionItem => !!collection && "name" in collection;
+
+export const useGetLibraryCollection = ({
+ skip = false,
+}: { skip?: boolean } = {}) => {
+ const {
+ data,
+ isLoading: isLoadingCollection,
+ error,
+ } = useGetLibraryCollectionQuery(undefined, { skip });
+
+ const maybeLibrary = useMemo(
+ () => (isLibrary(data) ? data : undefined),
+ [data],
+ );
+
+ return {
+ isLoading: isLoadingCollection,
+ data: maybeLibrary,
+ error,
+ };
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-resolved-library-collection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-resolved-library-collection/index.ts
new file mode 100644
index 00000000000..942c6e19db7
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-resolved-library-collection/index.ts
@@ -0,0 +1 @@
+export { useGetResolvedLibraryCollection } from "./use-get-resolved-library-collection";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-resolved-library-collection/use-get-resolved-library-collection.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-resolved-library-collection/use-get-resolved-library-collection.ts
new file mode 100644
index 00000000000..4b9fe1da05f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/hooks/use-get-resolved-library-collection/use-get-resolved-library-collection.ts
@@ -0,0 +1,50 @@
+import { match } from "ts-pattern";
+
+import { skipToken, useListCollectionItemsQuery } from "metabase/api";
+
+import { useGetLibraryCollection } from "../use-get-library-collection";
+
+// This hook will return the library collection if there are both metrics and models in the library,
+// the library-metrics collection if the library has no models, or the library-data collection
+// if the library has no metrics
+export const useGetResolvedLibraryCollection = ({
+ skip = false,
+}: { skip?: boolean } = {}) => {
+ const { data: libraryCollection, isLoading: isLoadingCollection } =
+ useGetLibraryCollection({ skip });
+
+ const hasStuff = Boolean(
+ libraryCollection &&
+ (libraryCollection?.below?.length || libraryCollection?.here?.length),
+ );
+ const { data: libraryItems, isLoading: isLoadingItems } =
+ useListCollectionItemsQuery(
+ libraryCollection && hasStuff ? { id: libraryCollection.id } : skipToken,
+ );
+
+ // The Dashboards section never holds data sources
+ const subcollectionsWithStuff =
+ libraryItems?.data.filter(
+ (item) =>
+ item.model === "collection" &&
+ item.type !== "library-dashboards" &&
+ (item.here?.length || item.below?.length),
+ ) ?? [];
+
+ const showableLibrary = match({ subcollectionsWithStuff, hasStuff })
+ .when(
+ // if there's only one subcollection with stuff, we want to go straight into it
+ ({ subcollectionsWithStuff }) => subcollectionsWithStuff?.length === 1,
+ () => subcollectionsWithStuff[0],
+ )
+ .when(
+ ({ subcollectionsWithStuff }) => subcollectionsWithStuff.length > 1,
+ () => libraryCollection,
+ )
+ .otherwise(() => undefined);
+
+ return {
+ isLoading: isLoadingCollection || isLoadingItems,
+ data: showableLibrary,
+ };
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/index.ts
index d9fe4ac94d4..7319984fc03 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/index.ts
@@ -3,11 +3,14 @@ import { PLUGIN_DATA_REFERENCE } from "metabase/querying/components/DataReferenc
import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
import { hasPremiumFeature } from "metabase-enterprise/settings";
-import { DataReferenceLibraryPane } from "./DataReferenceLibraryPane";
import { CollectionPermissionsModal } from "./components/CollectionPermissionsModal";
import { CreateLibraryModal } from "./components/CreateLibraryModal";
+import { DataReferenceLibraryPane } from "./components/DataReferenceLibraryPane";
import { PublishTablesModal } from "./components/PublishTablesModal";
import { UnpublishTablesModal } from "./components/UnpublishTablesModal";
+import { useGetLibraryChildCollectionByType } from "./hooks/use-get-library-child-collection-by-type";
+import { useGetLibraryCollection } from "./hooks/use-get-library-collection";
+import { useGetResolvedLibraryCollection } from "./hooks/use-get-resolved-library-collection";
import { getDataStudioLibraryRoutes } from "./routes";
import {
getCollectionPickerItems,
@@ -16,9 +19,6 @@ import {
isLibraryCollectionType,
isLibraryDataCollectionType,
isLibrarySubCollectionType,
- useGetLibraryChildCollectionByType,
- useGetLibraryCollection,
- useGetResolvedLibraryCollection,
} from "./utils";
export function initializePlugin() {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/ActionCell.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/ActionCell/ActionCell.tsx
similarity index 61%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/ActionCell.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/ActionCell/ActionCell.tsx
index c8325cc2399..0c9eb67f394 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/ActionCell.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/ActionCell/ActionCell.tsx
@@ -1,4 +1,7 @@
-import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";
+import {
+ type LibrarySection,
+ getItemSection,
+} from "metabase/data-studio/common/hooks/use-library-bulk-selection";
import type { TreeItem } from "metabase/data-studio/common/types";
import {
isCollectionData,
@@ -6,17 +9,10 @@ import {
isTableData,
} from "metabase/data-studio/common/utils";
import { PLUGIN_LIBRARY } from "metabase/plugins";
-import { RootDataActionsMenu } from "metabase-enterprise/data-studio/library/actions/components/RootDataActionsMenu";
import { TableMoreMenu } from "metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu";
import type { CollectionId } from "metabase-types/api";
-import {
- type LibrarySection,
- getItemSection,
-} from "../hooks/library-bulk-selection.utils";
-
-import { LibraryCollectionRowMenu } from "./LibraryCollectionRowMenu";
-import { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";
+import { LibraryCollectionRowMenu } from "../LibraryCollectionRowMenu";
type ActionCellProps = {
treeItem: TreeItem;
@@ -46,26 +42,6 @@ export function ActionCell({ treeItem, refreshSection }: ActionCellProps) {
return null;
}
- const isSnippetCollection = data.namespace === "snippets";
-
- if (isSnippetCollection && data.id === "root") {
- return <RootSnippetsCollectionMenu collectionId={data.id} />;
- }
-
- if (isSnippetCollection) {
- return <CollectionRowMenu collection={data} />;
- }
-
- const isDataActionCollection = data.namespace === "data-actions";
-
- if (isDataActionCollection && data.id === "root") {
- return <RootDataActionsMenu />;
- }
-
- if (isDataActionCollection) {
- return <CollectionRowMenu collection={data} />;
- }
-
const isLibraryCollection =
PLUGIN_LIBRARY.isLibrarySubCollectionType(data.type) &&
!data.is_library_root;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/ActionCell/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/ActionCell/index.ts
new file mode 100644
index 00000000000..5f0bf3e78d3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/ActionCell/index.ts
@@ -0,0 +1 @@
+export { ActionCell } from "./ActionCell";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateLibraryDashboardModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/CreateLibraryDashboardModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateLibraryDashboardModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/CreateLibraryDashboardModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateLibraryDashboardModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/CreateLibraryDashboardModal.unit.spec.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateLibraryDashboardModal.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/CreateLibraryDashboardModal.unit.spec.tsx
index 01f715e1d7b..114d93fcf04 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateLibraryDashboardModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/CreateLibraryDashboardModal.unit.spec.tsx
@@ -7,7 +7,7 @@ import {
createMockDashboard,
} from "metabase-types/api/mocks";
-import { CreateLibraryDashboardModal } from "./CreateLibraryDashboardModal";
+import { CreateLibraryDashboardModal } from ".";
const DASHBOARDS_COLLECTION = createMockCollection({
id: 3,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/index.ts
new file mode 100644
index 00000000000..2e08b94439a
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/index.ts
@@ -0,0 +1 @@
+export { CreateLibraryDashboardModal } from "./CreateLibraryDashboardModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/CreateMenu.tsx
similarity index 67%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/CreateMenu.tsx
index 60cbe12e715..7ca742f2007 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/CreateMenu.tsx
@@ -3,22 +3,15 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";
-import {
- canUserCreateNativeQueries,
- canUserCreateQueries,
-} from "metabase/current-user";
-import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
+import { canUserCreateQueries } from "metabase/current-user";
import { useDispatch, useSelector } from "metabase/redux";
import { setOpenModalWithProps } from "metabase/redux/ui";
import { useNavigate } from "metabase/router";
import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
import * as Urls from "metabase/urls";
-import { useActionDatabases } from "metabase-enterprise/data-studio/library/actions/hooks/use-action-databases";
-import { canCreateActions } from "metabase-enterprise/data-studio/library/actions/utils";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { CollectionId, CollectionNamespace } from "metabase-types/api";
-import { PublishTableModal } from "./PublishTableModal";
+import { PublishTableModal } from "../PublishTableModal";
export const CreateMenu = ({
metricCollectionId,
@@ -44,16 +37,7 @@ export const CreateMenu = ({
{ close: closePublishTableModal, open: openPublishTableModal },
] = useDisclosure(false);
- const hasNativeWrite = useSelector(canUserCreateNativeQueries);
const hasDataAccess = useSelector(canUserCreateQueries);
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
- const { databases: actionDatabases } = useActionDatabases();
- const canCreateDataActions = canCreateActions(actionDatabases);
-
- if (remoteSyncReadOnly) {
- return null;
- }
-
const canCreateMetric =
hasDataAccess && metricCollectionId && canWriteToMetricCollection;
@@ -65,24 +49,7 @@ export const CreateMenu = ({
(metricCollectionId && canWriteToMetricCollection) ||
canCreateDashboard;
- const canCreateCollection =
- canCreateLibraryCollection ||
- (hasNativeWrite && PLUGIN_SNIPPET_FOLDERS.isEnabled) ||
- canCreateDataActions;
-
- const collectionNamespaces: CollectionNamespace[] = [];
-
- if (canCreateLibraryCollection) {
- collectionNamespaces.push(null);
- }
-
- if (hasNativeWrite && PLUGIN_SNIPPET_FOLDERS.isEnabled) {
- collectionNamespaces.push("snippets");
- }
-
- if (canCreateDataActions) {
- collectionNamespaces.push("data-actions");
- }
+ const collectionNamespaces: CollectionNamespace[] = [null];
const initialCollectionId =
(dataCollectionId && canWriteToDataCollection && dataCollectionId) ||
@@ -120,28 +87,7 @@ export const CreateMenu = ({
{t`Dashboard`}
</Menu.Item>
),
- hasNativeWrite && (
- <Menu.Item
- key="snippet"
- component={ForwardRefLink}
- to={Urls.newDataStudioSnippet()}
- leftSection={<FixedSizeIcon name="snippet" />}
- aria-label={t`Create new snippet`}
- >
- {t`Snippet`}
- </Menu.Item>
- ),
- canCreateDataActions && (
- <Menu.Item
- key="data-action"
- component={ForwardRefLink}
- to={Urls.newDataStudioAction()}
- leftSection={<FixedSizeIcon name="bolt" />}
- >
- {t`Action`}
- </Menu.Item>
- ),
- canCreateCollection && (
+ canCreateLibraryCollection && (
<Menu.Item
key="collection"
leftSection={<FixedSizeIcon name="folder" />}
@@ -154,7 +100,6 @@ export const CreateMenu = ({
namespaces: collectionNamespaces,
pickerOptions: LIBRARY_COLLECTION_PICKER_OPTIONS,
showAuthorityLevelPicker: false,
- inDataStudio: true,
},
}),
)
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/CreateMenu.unit.spec.tsx
similarity index 66%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/CreateMenu.unit.spec.tsx
index df369ff8ce4..778b107f415 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/CreateMenu.unit.spec.tsx
@@ -1,19 +1,16 @@
import userEvent from "@testing-library/user-event";
import { setupEnterprisePlugins } from "__support__/enterprise";
-import { setupDatabasesEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { createMockState } from "__support__/state/state";
import { renderWithProviders, screen } from "__support__/ui";
-import type { Database, EnterpriseSettings } from "metabase-types/api";
import {
- createMockDatabase,
createMockTokenFeatures,
createMockUser,
} from "metabase-types/api/mocks";
import type { User } from "metabase-types/api/user";
-import { CreateMenu } from "./CreateMenu";
+import { CreateMenu } from ".";
interface SetupOptions {
user?: Partial<User>;
@@ -21,8 +18,6 @@ interface SetupOptions {
canWriteToDataCollection?: boolean;
canWriteToMetricCollection?: boolean;
canWriteToDashboardCollection?: boolean;
- remoteSyncType?: EnterpriseSettings["remote-sync-type"];
- databases?: Database[];
}
const fullPermissionsUser: Partial<User> = {
@@ -39,19 +34,11 @@ const setup = ({
canWriteToDataCollection = true,
canWriteToMetricCollection = true,
canWriteToDashboardCollection = false,
- remoteSyncType,
- databases = [],
}: SetupOptions = {}) => {
- setupDatabasesEndpoints(databases);
const onNewDashboardClick = jest.fn();
const state = createMockState({
settings: mockSettings({
- "token-features": createMockTokenFeatures({
- library: true,
- snippet_collections: true,
- }),
- "remote-sync-type": remoteSyncType,
- "remote-sync-enabled": !!remoteSyncType,
+ "token-features": createMockTokenFeatures({ library: true }),
}),
currentUser: createMockUser(user),
});
@@ -82,7 +69,7 @@ describe("CreateMenu", () => {
expect(
screen.getAllByRole("menuitem").map((item) => item.textContent),
- ).toEqual(["Published table", "Metric", "Snippet", "Collection"]);
+ ).toEqual(["Published table", "Metric", "Collection"]);
});
it("renders publish and collection options for data analysts", async () => {
@@ -121,7 +108,7 @@ describe("CreateMenu", () => {
expect(
screen.getAllByRole("menuitem").map((item) => item.textContent),
- ).toEqual(["Published table", "Snippet", "Collection"]);
+ ).toEqual(["Published table", "Collection"]);
});
it("renders Collection option when only Data collection is writable", async () => {
@@ -138,7 +125,7 @@ describe("CreateMenu", () => {
).toEqual(["Published table", "Collection"]);
});
- it("does not render Collection option without writable Library collections or native write", async () => {
+ it("does not render Collection option without writable Library collections", async () => {
setup({
user: {},
canWriteToDataCollection: false,
@@ -152,7 +139,7 @@ describe("CreateMenu", () => {
).toEqual(["Published table"]);
});
- it("opens the collection modal with Library and snippets picker options", async () => {
+ it("opens the collection modal with Library picker options", async () => {
const { store } = setup({
user: fullPermissionsUser,
dataCollectionId: 42,
@@ -164,9 +151,8 @@ describe("CreateMenu", () => {
expect(store.getState().modal).toEqual({
id: "collection",
props: {
- inDataStudio: true,
initialCollectionId: 42,
- namespaces: [null, "snippets"],
+ namespaces: [null],
pickerOptions: {
hasLibrary: true,
hasRootCollection: false,
@@ -181,22 +167,6 @@ describe("CreateMenu", () => {
});
});
- it("opens the collection modal scoped to snippets when only native write is available", async () => {
- const { store } = setup({
- user: { permissions: { can_create_native_queries: true } },
- canWriteToDataCollection: false,
- canWriteToMetricCollection: false,
- });
-
- await userEvent.click(screen.getByRole("button", { name: /New/ }));
- await userEvent.click(screen.getByRole("menuitem", { name: /Collection/ }));
-
- expect(store.getState().modal.props).toMatchObject({
- initialCollectionId: null,
- namespaces: ["snippets"],
- });
- });
-
it("renders the Dashboard option when the Dashboards collection is writable", async () => {
const { onNewDashboardClick } = setup({
user: fullPermissionsUser,
@@ -206,13 +176,7 @@ describe("CreateMenu", () => {
await userEvent.click(screen.getByRole("button", { name: /New/ }));
expect(
screen.getAllByRole("menuitem").map((item) => item.textContent),
- ).toEqual([
- "Published table",
- "Metric",
- "Dashboard",
- "Snippet",
- "Collection",
- ]);
+ ).toEqual(["Published table", "Metric", "Dashboard", "Collection"]);
await userEvent.click(screen.getByRole("menuitem", { name: /Dashboard/ }));
expect(onNewDashboardClick).toHaveBeenCalled();
@@ -234,48 +198,4 @@ describe("CreateMenu", () => {
namespaces: [null],
});
});
-
- it("renders nothing if remote sync is set to read-only", () => {
- setup({ user: fullPermissionsUser, remoteSyncType: "read-only" });
- expect(
- screen.queryByRole("button", { name: /New/ }),
- ).not.toBeInTheDocument();
- });
-
- it("renders the action option with native write on an actions-enabled database", async () => {
- setup({
- user: fullPermissionsUser,
- databases: [
- createMockDatabase({
- native_permissions: "write",
- settings: { "database-enable-actions": true },
- }),
- ],
- });
-
- await userEvent.click(screen.getByRole("button", { name: /New/ }));
-
- expect(
- await screen.findByRole("menuitem", { name: /Action/ }),
- ).toBeInTheDocument();
- });
-
- it("does not render the action option without an actions-enabled database", async () => {
- setup({
- user: fullPermissionsUser,
- databases: [
- createMockDatabase({
- native_permissions: "write",
- settings: { "database-enable-actions": false },
- }),
- ],
- });
-
- await userEvent.click(screen.getByRole("button", { name: /New/ }));
-
- expect(await screen.findByText("Snippet")).toBeInTheDocument();
- expect(
- screen.queryByRole("menuitem", { name: /Action/ }),
- ).not.toBeInTheDocument();
- });
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/index.ts
new file mode 100644
index 00000000000..4fbb1f9cbad
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateMenu/index.ts
@@ -0,0 +1 @@
+export { CreateMenu } from "./CreateMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/LibraryCollectionRowMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/LibraryCollectionRowMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/LibraryCollectionRowMenu.unit.spec.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/LibraryCollectionRowMenu.unit.spec.tsx
index 339a7aab87a..95ac54331ef 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/LibraryCollectionRowMenu.unit.spec.tsx
@@ -14,7 +14,7 @@ import {
createMockUser,
} from "metabase-types/api/mocks";
-import { LibraryCollectionRowMenu } from "./LibraryCollectionRowMenu";
+import { LibraryCollectionRowMenu } from ".";
function setup({
collection = createMockCollection({
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/index.ts
new file mode 100644
index 00000000000..48efacc4944
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryCollectionRowMenu/index.ts
@@ -0,0 +1 @@
+export { LibraryCollectionRowMenu } from "./LibraryCollectionRowMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryEmptyState/LibraryEmptyState.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryEmptyState/LibraryEmptyState.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryEmptyState/LibraryEmptyState.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryEmptyState/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryEmptyState/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryPage.tsx
new file mode 100644
index 00000000000..0f41e17f486
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/LibraryPage.tsx
@@ -0,0 +1,239 @@
+import { useDisclosure } from "@mantine/hooks";
+import type { Row } from "@tanstack/react-table";
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { useListCollectionsTreeQuery } from "metabase/api";
+import { useHasTokenFeature } from "metabase/common/hooks";
+import { LibraryTreePage } from "metabase/data-studio/common/components/LibraryTreePage";
+import { useErrorHandling } from "metabase/data-studio/common/hooks/use-error-handling";
+import type { LibrarySection } from "metabase/data-studio/common/hooks/use-library-bulk-selection";
+import type { TreeItem } from "metabase/data-studio/common/types";
+import { LibraryUpsellPage } from "metabase/data-studio/upsells/pages/LibraryUpsellPage";
+import type { CollectionId } from "metabase-types/api";
+
+import { ActionCell } from "./ActionCell";
+import { CreateLibraryDashboardModal } from "./CreateLibraryDashboardModal";
+import { CreateMenu } from "./CreateMenu";
+import { LibraryEmptyState } from "./LibraryEmptyState";
+import { PublishTableModal } from "./PublishTableModal";
+import {
+ useLibraryCollectionTree,
+ useLibraryCollections,
+ useLibrarySearch,
+} from "./hooks";
+import type { LibrarySearchModel } from "./hooks";
+import {
+ getArchiveLibraryCollectionsMessage,
+ getWritableCollection,
+} from "./utils";
+
+const SEARCH_MODELS: LibrarySearchModel[] = ["table", "metric", "dashboard"];
+
+function getTrashMessage(section: LibrarySection, count: number) {
+ return section === "data"
+ ? getArchiveLibraryCollectionsMessage(count)
+ : undefined;
+}
+
+export function LibraryPage() {
+ const hasLibraryFeature = useHasTokenFeature("library");
+
+ if (!hasLibraryFeature) {
+ return <LibraryUpsellPage />;
+ }
+
+ return <LibraryPageContent />;
+}
+
+function LibraryPageContent() {
+ const [searchQuery, setSearchQuery] = useState("");
+ const [
+ showPublishTableModal,
+ { open: openPublishTableModal, close: closePublishTableModal },
+ ] = useDisclosure(false);
+ const [
+ showCreateDashboardModal,
+ { open: openCreateDashboardModal, close: closeCreateDashboardModal },
+ ] = useDisclosure(false);
+ const { data: collections = [], isLoading: isLoadingCollections } =
+ useListCollectionsTreeQuery({
+ "exclude-other-user-collections": true,
+ "exclude-archived": true,
+ "include-library": true,
+ });
+ const {
+ libraryCollection,
+ tableCollection,
+ metricCollection,
+ dashboardCollection,
+ } = useLibraryCollections(collections);
+ const writableMetricCollection = useMemo(
+ () =>
+ libraryCollection &&
+ getWritableCollection(libraryCollection, "library-metrics"),
+ [libraryCollection],
+ );
+
+ const {
+ tree: tablesTree,
+ isLoading: isLoadingTables,
+ error: tablesError,
+ watchRows: watchTableRows,
+ isChildrenLoading: isTableChildrenLoading,
+ refreshCollections: refreshTableCollections,
+ } = useLibraryCollectionTree(tableCollection, "data");
+ const {
+ tree: metricsTree,
+ isLoading: isLoadingMetrics,
+ error: metricsError,
+ watchRows: watchMetricRows,
+ isChildrenLoading: isMetricChildrenLoading,
+ refreshCollections: refreshMetricCollections,
+ } = useLibraryCollectionTree(
+ metricCollection,
+ "metrics",
+ metricCollection?.id,
+ );
+ const {
+ tree: dashboardsTree,
+ isLoading: isLoadingDashboards,
+ error: dashboardsError,
+ watchRows: watchDashboardRows,
+ isChildrenLoading: isDashboardChildrenLoading,
+ refreshCollections: refreshDashboardCollections,
+ } = useLibraryCollectionTree(dashboardCollection, "dashboards");
+ const {
+ tree: searchTree,
+ isActive: isSearchActive,
+ isLoading: isSearchLoading,
+ } = useLibrarySearch(searchQuery, libraryCollection?.id, SEARCH_MODELS);
+ useErrorHandling(tablesError || metricsError || dashboardsError);
+
+ const tree = useMemo(
+ () =>
+ isSearchActive
+ ? searchTree
+ : [...tablesTree, ...metricsTree, ...dashboardsTree],
+ [isSearchActive, searchTree, tablesTree, metricsTree, dashboardsTree],
+ );
+ const defaultExpandedIds = useMemo(
+ () =>
+ [tableCollection, metricCollection, dashboardCollection].flatMap(
+ (collection) => (collection ? [`collection:${collection.id}`] : []),
+ ),
+ [tableCollection, metricCollection, dashboardCollection],
+ );
+ const defaultMoveCollectionIds = useMemo(
+ () => ({
+ data: tableCollection?.id,
+ metrics: metricCollection?.id,
+ dashboards: dashboardCollection?.id,
+ }),
+ [tableCollection, metricCollection, dashboardCollection],
+ );
+ const emptyStateActions = useMemo(
+ () => ({
+ data: openPublishTableModal,
+ dashboards: openCreateDashboardModal,
+ }),
+ [openPublishTableModal, openCreateDashboardModal],
+ );
+
+ const refreshSection = useCallback(
+ (section: LibrarySection, collectionIds: CollectionId[]) => {
+ if (section === "data") {
+ refreshTableCollections(collectionIds);
+ } else if (section === "metrics") {
+ refreshMetricCollections(collectionIds);
+ } else if (section === "dashboards") {
+ refreshDashboardCollections(collectionIds);
+ }
+ },
+ [
+ refreshTableCollections,
+ refreshMetricCollections,
+ refreshDashboardCollections,
+ ],
+ );
+ const renderRowMenu = useCallback(
+ (item: TreeItem) => (
+ <ActionCell treeItem={item} refreshSection={refreshSection} />
+ ),
+ [refreshSection],
+ );
+ const handleRowsChange = useCallback(
+ (rows: Row<TreeItem>[]) => {
+ watchTableRows(rows);
+ watchMetricRows(rows);
+ watchDashboardRows(rows);
+ },
+ [watchTableRows, watchMetricRows, watchDashboardRows],
+ );
+ const isChildrenLoading = useCallback(
+ (row: Row<TreeItem>) =>
+ isTableChildrenLoading(row) ||
+ isMetricChildrenLoading(row) ||
+ isDashboardChildrenLoading(row),
+ [
+ isTableChildrenLoading,
+ isMetricChildrenLoading,
+ isDashboardChildrenLoading,
+ ],
+ );
+
+ return (
+ <LibraryTreePage
+ title={t`Semantic layer`}
+ tree={tree}
+ isLoading={
+ isLoadingCollections ||
+ isLoadingTables ||
+ isLoadingMetrics ||
+ isLoadingDashboards ||
+ isSearchLoading
+ }
+ isSearchActive={isSearchActive}
+ searchQuery={searchQuery}
+ emptyMessage={t`No tables, metrics, or dashboards yet`}
+ defaultExpandedIds={defaultExpandedIds}
+ defaultMoveCollectionIds={defaultMoveCollectionIds}
+ emptyState={
+ !libraryCollection && !isLoadingCollections ? (
+ <LibraryEmptyState />
+ ) : undefined
+ }
+ createMenu={
+ <CreateMenu
+ metricCollectionId={writableMetricCollection?.id}
+ canWriteToMetricCollection={!!writableMetricCollection}
+ dataCollectionId={tableCollection?.id}
+ canWriteToDataCollection={!!tableCollection?.can_write}
+ dashboardCollectionId={dashboardCollection?.id}
+ canWriteToDashboardCollection={!!dashboardCollection?.can_write}
+ onNewDashboardClick={openCreateDashboardModal}
+ />
+ }
+ emptyStateActions={emptyStateActions}
+ renderRowMenu={renderRowMenu}
+ isChildrenLoading={isChildrenLoading}
+ onRowsChange={handleRowsChange}
+ onSearchQueryChange={setSearchQuery}
+ getTrashMessage={getTrashMessage}
+ onBulkActionComplete={refreshSection}
+ >
+ <PublishTableModal
+ opened={showPublishTableModal}
+ onClose={closePublishTableModal}
+ onPublished={closePublishTableModal}
+ />
+ {dashboardCollection && (
+ <CreateLibraryDashboardModal
+ opened={showCreateDashboardModal}
+ collectionId={dashboardCollection.id}
+ onClose={closeCreateDashboardModal}
+ />
+ )}
+ </LibraryTreePage>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/PublishTableModal.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/PublishTableModal.tsx
index d2f60d46923..9e32d276658 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/PublishTableModal.tsx
@@ -7,7 +7,7 @@ import {
type OmniPickerTableItem,
} from "metabase/common/components/Pickers";
-import { PublishTablesModal } from "../../components/PublishTablesModal";
+import { PublishTablesModal } from "../../../components/PublishTablesModal";
interface PublishTableModalProps {
opened: boolean;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/PublishTableModal.unit.spec.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/PublishTableModal.unit.spec.tsx
index 50624e5ddcc..9a76d9ad722 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/PublishTableModal.unit.spec.tsx
@@ -22,7 +22,7 @@ import {
createMockTokenFeatures,
} from "metabase-types/api/mocks";
-import { PublishTableModal } from "./PublishTableModal";
+import { PublishTableModal } from ".";
jest.mock("metabase/common/components/Pickers/EntityPicker", () => ({
...jest.requireActual(
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/index.ts
new file mode 100644
index 00000000000..9b2d2b7a6b3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/PublishTableModal/index.ts
@@ -0,0 +1 @@
+export { PublishTableModal } from "./PublishTableModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollectionTree.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/hooks.ts
similarity index 64%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollectionTree.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/hooks.ts
index 41b2701779b..4c6b49de9ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollectionTree.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/hooks.ts
@@ -1,11 +1,15 @@
import type { Row } from "@tanstack/react-table";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { t } from "ttag";
import {
collectionApi,
skipToken,
useListCollectionItemsQuery,
+ useSearchQuery,
} from "metabase/api";
+import { isLibraryCollection } from "metabase/common/collections/utils";
+import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import type {
LibrarySectionType,
TreeItem,
@@ -22,8 +26,47 @@ import type {
CollectionId,
CollectionItem,
CollectionItemModel,
+ IconName,
+ SearchResult,
} from "metabase-types/api";
+import { getAccessibleCollection } from "./utils";
+
+export const useLibraryCollections = (collections: Collection[]) => {
+ const libraryCollection = useMemo(
+ () => collections.find(isLibraryCollection),
+ [collections],
+ );
+
+ const tableCollection = useMemo(
+ () =>
+ libraryCollection &&
+ getAccessibleCollection(libraryCollection, "library-data"),
+ [libraryCollection],
+ );
+
+ const metricCollection = useMemo(
+ () =>
+ libraryCollection &&
+ getAccessibleCollection(libraryCollection, "library-metrics"),
+ [libraryCollection],
+ );
+
+ const dashboardCollection = useMemo(
+ () =>
+ libraryCollection &&
+ getAccessibleCollection(libraryCollection, "library-dashboards"),
+ [libraryCollection],
+ );
+
+ return {
+ libraryCollection,
+ tableCollection,
+ metricCollection,
+ dashboardCollection,
+ };
+};
+
const SECTION_ITEM_MODELS: Record<LibrarySectionType, CollectionItemModel[]> = {
data: ["table", "collection"],
metrics: ["metric", "collection"],
@@ -245,3 +288,108 @@ function hasContent(item: CollectionItem): boolean {
(item.below != null && item.below.length > 0)
);
}
+
+const SEARCH_DEBOUNCE_MS = 300;
+
+export type LibrarySearchModel = "table" | "metric" | "dashboard";
+
+type SearchSection = {
+ id: string;
+ name: string;
+ icon: IconName;
+};
+
+const getSearchSections = (): Record<LibrarySearchModel, SearchSection> => ({
+ table: { id: "search-section:data", name: t`Data`, icon: "table" },
+ metric: { id: "search-section:metrics", name: t`Metrics`, icon: "metric" },
+ dashboard: {
+ id: "search-section:dashboards",
+ name: t`Dashboards`,
+ icon: "dashboard",
+ },
+});
+
+export function useLibrarySearch(
+ searchQuery: string,
+ libraryCollectionId: CollectionId | undefined,
+ models: LibrarySearchModel[],
+) {
+ const debouncedQuery = useDebouncedValue(searchQuery, SEARCH_DEBOUNCE_MS);
+ const isActive = debouncedQuery.trim().length > 0;
+ const getIcon = useGetIcon();
+
+ const {
+ data: searchResponse,
+ isLoading,
+ isFetching,
+ error,
+ } = useSearchQuery(
+ isActive && libraryCollectionId != null
+ ? {
+ q: debouncedQuery,
+ collection: libraryCollectionId,
+ models,
+ context: "library",
+ }
+ : skipToken,
+ );
+
+ const tree = useMemo((): TreeItem[] => {
+ if (!isActive || !searchResponse) {
+ return [];
+ }
+
+ const sections = getSearchSections();
+ return models.flatMap((model): TreeItem[] => {
+ const children = searchResponse.data
+ .filter((result) => result.model === model)
+ .map((result) => createSearchResultItem(result, model, getIcon));
+ if (children.length === 0) {
+ return [];
+ }
+ const { id, name, icon } = sections[model];
+ return [
+ {
+ id,
+ name,
+ icon,
+ model: "collection",
+ data: { model: "collection", name },
+ children,
+ },
+ ];
+ });
+ }, [isActive, searchResponse, models, getIcon]);
+
+ return {
+ tree,
+ isActive,
+ isLoading: isLoading || isFetching,
+ error,
+ };
+}
+
+function createSearchResultItem(
+ result: SearchResult,
+ model: LibrarySearchModel,
+ getIcon: ReturnType<typeof useGetIcon>,
+): TreeItem {
+ return {
+ id: `${model}:${result.id}`,
+ name: result.name,
+ icon: getIcon({ model }).name,
+ updatedAt: result.last_edited_at ?? result.updated_at,
+ model,
+ parentCollectionName: result.collection?.name,
+ data: {
+ id: Number(result.id),
+ model,
+ name: result.name,
+ description: result.description,
+ collection_id: result.collection_id ?? null,
+ archived: result.archived ?? false,
+ collection_position: result.collection_position,
+ "last-edit-info": result["last-edit-info"],
+ },
+ };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/utils.ts
similarity index 50%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/utils.ts
index 19c3baea22e..28ff61227ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/utils.ts
@@ -1,8 +1,5 @@
import { msgid, ngettext } from "ttag";
-import type { TreeItem } from "metabase/data-studio/common/types";
-import { isEmptyStateData } from "metabase/data-studio/common/utils";
-import * as Urls from "metabase/urls";
import type { Collection, CollectionType } from "metabase-types/api";
export function getArchiveLibraryCollectionsMessage(count: number): string {
@@ -29,29 +26,3 @@ export function getWritableCollection(
const collection = getAccessibleCollection(rootCollection, type);
return collection?.can_write ? collection : undefined;
}
-
-export const getTreeRowHref = (row: { original: TreeItem }): string | null => {
- const treeItem = row.original;
-
- if (treeItem.model === "empty-state" || isEmptyStateData(treeItem.data)) {
- return null;
- }
- // Unjustified type cast. FIXME
- const entityId = treeItem.data.id as number;
- if (treeItem.model === "metric") {
- return Urls.dataStudioMetric(entityId);
- }
- if (treeItem.model === "snippet") {
- return Urls.dataStudioSnippet(entityId);
- }
- if (treeItem.model === "action") {
- return Urls.dataStudioAction(entityId);
- }
- if (treeItem.model === "table") {
- return Urls.dataStudioTable(entityId);
- }
- if (treeItem.model === "dashboard") {
- return Urls.dashboard({ id: entityId, name: treeItem.name });
- }
- return null;
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/utils.unit.spec.ts
similarity index 83%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.unit.spec.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/utils.unit.spec.ts
index 9c21ce25e2f..f933f20f59f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/utils.unit.spec.ts
@@ -1,13 +1,6 @@
-import {
- createMockCollection,
- createMockCollectionItem,
-} from "metabase-types/api/mocks";
+import { createMockCollection } from "metabase-types/api/mocks";
-import {
- getAccessibleCollection,
- getTreeRowHref,
- getWritableCollection,
-} from "./utils";
+import { getAccessibleCollection, getWritableCollection } from "./utils";
describe("getWritableCollection", () => {
it("returns collection when can_write is true", () => {
@@ -119,19 +112,3 @@ describe("getAccessibleCollection", () => {
expect(result).toBeUndefined();
});
});
-
-describe("getTreeRowHref", () => {
- it("links dashboards to the main app's dashboard page", () => {
- const href = getTreeRowHref({
- original: {
- id: "dashboard:7",
- name: "Sales",
- icon: "dashboard",
- model: "dashboard",
- data: createMockCollectionItem({ id: 7, model: "dashboard" }),
- },
- });
-
- expect(href).toBe("/dashboard/7-sales");
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibrarySectionLayout/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibrarySectionLayout/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
index e0347852672..f3fb23b27d3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
@@ -2,10 +2,8 @@ import type { ComponentType } from "react";
import { Route } from "metabase/router";
-import { LibrarySectionLayout } from "./LibrarySectionLayout";
-import { getDataStudioActionRoutes } from "./actions/routes";
import { getDataStudioMetricRoutes } from "./metrics/routes";
-import { getDataStudioSnippetRoutes } from "./snippets/routes";
+import { LibrarySectionLayout } from "./pages/LibrarySectionLayout";
import { getDataStudioTableRoutes } from "./tables/routes";
/**
@@ -13,9 +11,9 @@ import { getDataStudioTableRoutes } from "./tables/routes";
* screen before any of them arrive.
*/
const libraryPage = () =>
- import(/* webpackChunkName: "data-studio-library" */ "./LibraryPage").then(
- ({ LibraryPage }) => ({ Component: LibraryPage }),
- );
+ import(
+ /* webpackChunkName: "data-studio-library" */ "./pages/LibraryPage"
+ ).then(({ LibraryPage }) => ({ Component: LibraryPage }));
export const getDataStudioLibraryRoutes = (IsAdmin: ComponentType) => {
return (
@@ -23,8 +21,6 @@ export const getDataStudioLibraryRoutes = (IsAdmin: ComponentType) => {
<Route index lazy={libraryPage} />
{getDataStudioTableRoutes(IsAdmin)}
{getDataStudioMetricRoutes()}
- {getDataStudioSnippetRoutes()}
- {getDataStudioActionRoutes()}
</Route>
);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/index.ts
deleted file mode 100644
index 837fe8d2f99..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ArchivedSnippetsPage } from "./ArchivedSnippetsPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/TableMeasures.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/TableMeasures.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/TableMeasures.unit.spec.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/TableMeasures.unit.spec.tsx
index a768120db50..46a702accc2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/TableMeasures.unit.spec.tsx
@@ -15,7 +15,7 @@ import {
createMockUser,
} from "metabase-types/api/mocks";
-import { TableMeasures } from "./TableMeasures";
+import { TableMeasures } from ".";
type SetupOpts = {
isAdmin?: boolean;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/index.ts
new file mode 100644
index 00000000000..9e99cb6821f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures/index.ts
@@ -0,0 +1 @@
+export { TableMeasures } from "./TableMeasures";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/TableSegments.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/TableSegments.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/TableSegments.unit.spec.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/TableSegments.unit.spec.tsx
index c8e87beb43c..51e1f215f87 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/TableSegments.unit.spec.tsx
@@ -15,7 +15,7 @@ import {
createMockUser,
} from "metabase-types/api/mocks";
-import { TableSegments } from "./TableSegments";
+import { TableSegments } from ".";
type SetupOpts = {
isAdmin?: boolean;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/index.ts
new file mode 100644
index 00000000000..8e843f4f6ba
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments/index.ts
@@ -0,0 +1 @@
+export { TableSegments } from "./TableSegments";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/utils.ts
index 91d525f8bec..ce6323022c9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/utils.ts
@@ -1,8 +1,5 @@
-import { useMemo } from "react";
-import { match } from "ts-pattern";
import { t } from "ttag";
-import { skipToken, useListCollectionItemsQuery } from "metabase/api";
import type {
OmniPickerCollectionItem,
OmniPickerItem,
@@ -12,104 +9,7 @@ import type {
GetEntityPickerSyntheticLibraryItemFunction,
LibrarySubCollectionType,
} from "metabase/plugins/oss/library";
-import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
-import type { CollectionItem, CollectionType } from "metabase-types/api";
-
-const isLibrary = (
- collection: CollectionItem | { data: null } | undefined,
-): collection is CollectionItem => !!collection && "name" in collection;
-
-export const useGetLibraryCollection = ({
- skip = false,
-}: { skip?: boolean } = {}) => {
- const {
- data,
- isLoading: isLoadingCollection,
- error,
- } = useGetLibraryCollectionQuery(undefined, { skip });
-
- const maybeLibrary = useMemo(
- () => (isLibrary(data) ? data : undefined),
- [data],
- );
-
- return {
- isLoading: isLoadingCollection,
- data: maybeLibrary,
- error,
- };
-};
-export const useGetLibraryChildCollectionByType = ({
- skip,
- type,
-}: {
- skip?: boolean;
- type: CollectionType;
-}) => {
- const { data: rootLibraryCollection, isLoading: isLoadingLibrary } =
- useGetLibraryCollection({ skip });
- const { data: libraryCollections, isLoading: isLoadingItems } =
- useListCollectionItemsQuery(
- rootLibraryCollection ? { id: rootLibraryCollection.id } : skipToken,
- );
- const data = useMemo(
- () =>
- libraryCollections?.data.find(
- (collection: CollectionItem) => collection.type === type,
- ),
- [libraryCollections, type],
- );
-
- return {
- data,
- isLoading:
- isLoadingLibrary || (rootLibraryCollection != null && isLoadingItems),
- };
-};
-// This hook will return the library collection if there are both metrics and models in the library,
-// the library-metrics collection if the library has no models, or the library-data collection
-// if the library has no metrics
-export const useGetResolvedLibraryCollection = ({
- skip = false,
-}: { skip?: boolean } = {}) => {
- const { data: libraryCollection, isLoading: isLoadingCollection } =
- useGetLibraryCollection({ skip });
-
- const hasStuff = Boolean(
- libraryCollection &&
- (libraryCollection?.below?.length || libraryCollection?.here?.length),
- );
- const { data: libraryItems, isLoading: isLoadingItems } =
- useListCollectionItemsQuery(
- libraryCollection && hasStuff ? { id: libraryCollection.id } : skipToken,
- );
-
- // The Dashboards section never holds data sources
- const subcollectionsWithStuff =
- libraryItems?.data.filter(
- (item) =>
- item.model === "collection" &&
- item.type !== "library-dashboards" &&
- (item.here?.length || item.below?.length),
- ) ?? [];
-
- const showableLibrary = match({ subcollectionsWithStuff, hasStuff })
- .when(
- // if there's only one subcollection with stuff, we want to go straight into it
- ({ subcollectionsWithStuff }) => subcollectionsWithStuff?.length === 1,
- () => subcollectionsWithStuff[0],
- )
- .when(
- ({ subcollectionsWithStuff }) => subcollectionsWithStuff.length > 1,
- () => libraryCollection,
- )
- .otherwise(() => undefined);
-
- return {
- isLoading: isLoadingCollection || isLoadingItems,
- data: showableLibrary,
- };
-};
+import type { CollectionItem } from "metabase-types/api";
type LibrarySectionCollectionItem = CollectionItem &
OmniPickerCollectionItem & {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
index 8218d21d8ac..36a32b9e7ac 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
@@ -325,7 +325,7 @@ export function getNodeLocationInfo(
links: [
{
label: node.data.collection.name,
- url: Urls.dataStudioLibrary(),
+ url: Urls.dataStudioSnippets(),
},
],
};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
index ed8bec09b93..38268a11430 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
@@ -23,6 +23,7 @@ import {
createMockSegmentDependencyNode,
createMockSegmentDependencyNodeData,
createMockSnippetDependencyNode,
+ createMockSnippetDependencyNodeData,
createMockTable,
createMockTableDependencyNode,
createMockTableDependencyNodeData,
@@ -399,6 +400,19 @@ describe("getNodeLocationInfo", () => {
expect(result?.links[0].label).toBe("My Collection");
});
+ it("should link a snippet's folder to the SQL snippets tab", () => {
+ const node = createMockSnippetDependencyNode({
+ data: createMockSnippetDependencyNodeData({
+ collection: createMockCollection({ name: "My Folder" }),
+ }),
+ });
+ const result = getNodeLocationInfo(node);
+ expect(result?.links[0]).toEqual({
+ label: "My Folder",
+ url: "/data-studio/snippets",
+ });
+ });
+
it("should return database location for table", () => {
const node = createMockTableDependencyNode({
data: createMockTableDependencyNodeData({
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx
index 2f819521b35..6af0bb0506d 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx
@@ -267,12 +267,15 @@ describe("GitSyncControls", () => {
});
await userEvent.click(getBranchButton(/main/));
// Wait until the dirty state has settled (push disabled, since nothing is dirty) so the pull takes
- // the non-dirty direct-import path deterministically.
+ // the non-dirty direct-import path deterministically, and until the remote check enables the pull.
await waitFor(async () => {
expect(await findOption(/Push changes/)).toHaveAttribute(
"data-combobox-disabled",
"true",
);
+ expect(await findOption(/Pull changes/)).not.toHaveAttribute(
+ "data-combobox-disabled",
+ );
});
await userEvent.click(await findOption(/Pull changes/));
@@ -304,9 +307,13 @@ describe("GitSyncControls", () => {
expect(getBranchButton(/main/)).toBeInTheDocument();
});
await userEvent.click(getBranchButton(/main/));
- // Wait until the dirty state has settled (push enabled) so the pull takes the dirty/merge path.
+ // Wait until the dirty state has settled (push enabled) so the pull takes the dirty/merge path, and
+ // until the remote check enables the pull.
await waitFor(async () => {
expect(await findOption(/Push changes/)).toBeEnabled();
+ expect(await findOption(/Pull changes/)).not.toHaveAttribute(
+ "data-combobox-disabled",
+ );
});
await userEvent.click(await findOption(/Pull changes/));
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
index 2b9525e610a..4af61b943a5 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
@@ -9,7 +9,7 @@ import {
useGetBranchesQuery,
useUpdateRemoteSyncSettingsMutation,
} from "metabase-enterprise/api";
-import { useGetLibraryCollection } from "metabase-enterprise/data-studio/library/utils";
+import { useGetLibraryCollection } from "metabase-enterprise/data-studio/library/hooks/use-get-library-collection";
import {
COLLECTIONS_KEY,
REMOTE_SYNC_KEY,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.ts
index c204b0e4e0c..d0930da4eaf 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.ts
@@ -192,6 +192,14 @@ const getSpecForEntity = (
return displayGroupSpecs[displayGroupSpecs.length - 1];
};
+/**
+ * The id of the display group an entity belongs to.
+ */
+export const getDisplayGroupId = (
+ entity: RemoteSyncEntity,
+ namespaceCollectionMap: NamespaceCollectionMap,
+): string => getSpecForEntity(entity, namespaceCollectionMap).id;
+
/**
* Result of getGroupKeyInfo containing both the group key and the matched spec.
*/
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-display-group-dirty-changes.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-display-group-dirty-changes.ts
new file mode 100644
index 00000000000..ddc3a250fa8
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-display-group-dirty-changes.ts
@@ -0,0 +1,40 @@
+import { useMemo } from "react";
+
+import { useListCollectionsTreeQuery } from "metabase/api";
+
+import {
+ buildNamespaceCollectionMap,
+ getDisplayGroupId,
+} from "../displayGroups";
+
+import { useGitSyncVisible } from "./use-git-sync-visible";
+import { useRemoteSyncDirtyState } from "./use-remote-sync-dirty-state";
+
+export function useHasDisplayGroupDirtyChanges(
+ groupId: "snippets" | "data-actions",
+): boolean {
+ const { isVisible: isGitSyncVisible } = useGitSyncVisible();
+ const { dirty, isDirty } = useRemoteSyncDirtyState();
+ const { data: collections = [] } = useListCollectionsTreeQuery(
+ { namespace: groupId },
+ { skip: !isGitSyncVisible },
+ );
+
+ return useMemo(() => {
+ if (!isGitSyncVisible || !isDirty) {
+ return false;
+ }
+ const namespaceCollectionMap = buildNamespaceCollectionMap(collections);
+ return dirty.some(
+ (entity) => getDisplayGroupId(entity, namespaceCollectionMap) === groupId,
+ );
+ }, [isGitSyncVisible, isDirty, dirty, collections, groupId]);
+}
+
+export function useHasSnippetsDirtyChanges(): boolean {
+ return useHasDisplayGroupDirtyChanges("snippets");
+}
+
+export function useHasDataActionsDirtyChanges(): boolean {
+ return useHasDisplayGroupDirtyChanges("data-actions");
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-display-group-dirty-changes.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-display-group-dirty-changes.unit.spec.ts
new file mode 100644
index 00000000000..aae663665e3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-display-group-dirty-changes.unit.spec.ts
@@ -0,0 +1,228 @@
+import { setupEnterprisePlugins } from "__support__/enterprise";
+import {
+ setupCollectionsEndpoints,
+ setupPropertiesEndpoints,
+ setupRemoteSyncDirtyEndpoint,
+ setupSettingsEndpoints,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
+import { renderHookWithProviders, waitFor } from "__support__/ui";
+import type { Collection, RemoteSyncEntity } from "metabase-types/api";
+import {
+ createMockCollection,
+ createMockSettings,
+ createMockSnippetsCollection,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+
+import {
+ useHasDataActionsDirtyChanges,
+ useHasSnippetsDirtyChanges,
+} from "./use-has-display-group-dirty-changes";
+
+const createLibraryCollection = (
+ overrides: Partial<Collection> = {},
+): Collection =>
+ createMockCollection({
+ id: 1,
+ name: "Library",
+ type: "library",
+ ...overrides,
+ });
+
+const createMockDirtyEntity = (
+ overrides: Partial<RemoteSyncEntity> = {},
+): RemoteSyncEntity => ({
+ id: 1,
+ name: "Test Entity",
+ model: "card",
+ sync_status: "update",
+ collection_id: 1,
+ ...overrides,
+});
+
+interface SetupOptions {
+ hook: () => boolean;
+ isGitSyncVisible?: boolean;
+ collections?: Collection[];
+ dirty?: RemoteSyncEntity[];
+}
+
+/**
+ * Compute changedCollections map from dirty entities.
+ * This mirrors what the backend does - marking collections that contain dirty entities.
+ */
+const computeChangedCollections = (
+ dirty: RemoteSyncEntity[],
+): Record<number, boolean> => {
+ const changedCollections: Record<number, boolean> = {};
+ for (const entity of dirty) {
+ if (entity.collection_id != null) {
+ changedCollections[entity.collection_id] = true;
+ }
+ }
+ return changedCollections;
+};
+
+const setup = ({
+ hook,
+ isGitSyncVisible = true,
+ collections = [],
+ dirty = [],
+}: SetupOptions) => {
+ setupEnterprisePlugins();
+
+ const tokenFeatures = createMockTokenFeatures({ library: true });
+ const settings = createMockSettings({
+ "remote-sync-enabled": isGitSyncVisible,
+ "remote-sync-branch": isGitSyncVisible ? "main" : null,
+ "remote-sync-type": "read-write",
+ "token-features": tokenFeatures,
+ });
+
+ const changedCollections = computeChangedCollections(dirty);
+
+ setupPropertiesEndpoints(settings);
+ setupSettingsEndpoints([]);
+ setupRemoteSyncDirtyEndpoint({ dirty, changedCollections });
+ setupCollectionsEndpoints({ collections });
+
+ const storeInitialState = createMockState({
+ currentUser: createMockUser({ is_superuser: true }),
+ settings: mockSettings({
+ "remote-sync-enabled": isGitSyncVisible,
+ "remote-sync-branch": isGitSyncVisible ? "main" : null,
+ "remote-sync-type": "read-write",
+ "token-features": tokenFeatures,
+ }),
+ });
+
+ return renderHookWithProviders(hook, {
+ storeInitialState,
+ });
+};
+
+const createDataActionsCollection = (
+ overrides: Partial<Collection> = {},
+): Collection =>
+ createMockCollection({
+ id: 200,
+ name: "Data actions folder",
+ namespace: "data-actions",
+ ...overrides,
+ });
+
+describe("useHasSnippetsDirtyChanges", () => {
+ it("returns true for a dirty snippet", async () => {
+ const { result } = setup({
+ hook: useHasSnippetsDirtyChanges,
+ collections: [createMockSnippetsCollection({ id: 100 })],
+ dirty: [
+ createMockDirtyEntity({
+ id: 10,
+ model: "nativequerysnippet",
+ collection_id: undefined,
+ }),
+ ],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(true);
+ });
+ });
+
+ it("returns true for a dirty nested collection in the snippets namespace", async () => {
+ const parent = createMockSnippetsCollection({ id: 100 });
+ const child = createMockSnippetsCollection({ id: 101 });
+ parent.children = [child];
+
+ const { result } = setup({
+ hook: useHasSnippetsDirtyChanges,
+ collections: [parent, child],
+ dirty: [createMockDirtyEntity({ id: 101, model: "collection" })],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(true);
+ });
+ });
+
+ it("returns false for dirty Library items", async () => {
+ const { result } = setup({
+ hook: useHasSnippetsDirtyChanges,
+ collections: [createLibraryCollection({ id: 1 })],
+ dirty: [createMockDirtyEntity({ collection_id: 1 })],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(false);
+ });
+ });
+
+ it("returns false when git sync is not visible", async () => {
+ const { result } = setup({
+ hook: useHasSnippetsDirtyChanges,
+ isGitSyncVisible: false,
+ dirty: [createMockDirtyEntity({ model: "nativequerysnippet" })],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(false);
+ });
+ });
+});
+
+describe("useHasDataActionsDirtyChanges", () => {
+ it("returns true for a dirty action without a model", async () => {
+ const { result } = setup({
+ hook: useHasDataActionsDirtyChanges,
+ dirty: [
+ createMockDirtyEntity({
+ model: "action",
+ collection_id: undefined,
+ card_id: null,
+ }),
+ ],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(true);
+ });
+ });
+
+ it("returns true for a dirty collection in the data actions namespace", async () => {
+ const { result } = setup({
+ hook: useHasDataActionsDirtyChanges,
+ collections: [createDataActionsCollection({ id: 200 })],
+ dirty: [createMockDirtyEntity({ id: 200, model: "collection" })],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(true);
+ });
+ });
+
+ it("returns false for a dirty model action", async () => {
+ const { result } = setup({
+ hook: useHasDataActionsDirtyChanges,
+ dirty: [createMockDirtyEntity({ model: "action", card_id: 5 })],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(false);
+ });
+ });
+
+ it("returns false for a dirty snippet", async () => {
+ const { result } = setup({
+ hook: useHasDataActionsDirtyChanges,
+ dirty: [createMockDirtyEntity({ model: "nativequerysnippet" })],
+ });
+
+ await waitFor(() => {
+ expect(result.current).toBe(false);
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.ts
index 9303b536d88..29c453845bb 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.ts
@@ -8,14 +8,21 @@ import {
import { getAllDescendantIds } from "metabase/common/components/tree/utils";
import type { CollectionId } from "metabase-types/api";
+import {
+ buildNamespaceCollectionMap,
+ getDisplayGroupId,
+} from "../displayGroups";
+
import { useGitSyncVisible } from "./use-git-sync-visible";
import { useRemoteSyncDirtyState } from "./use-remote-sync-dirty-state";
const isNumericId = (id: CollectionId): id is number => typeof id === "number";
+const LIBRARY_DISPLAY_GROUP_IDS = new Set(["tables", "default"]);
+
export function useHasLibraryDirtyChanges(): boolean {
const { isVisible: isGitSyncVisible } = useGitSyncVisible();
- const { dirty, hasDirtyInCollectionTree, isDirty, hasRemovedItems } =
+ const { dirty, hasDirtyInCollectionTree, isDirty } =
useRemoteSyncDirtyState();
const { data: collections = [] } = useListCollectionsTreeQuery(
@@ -26,67 +33,52 @@ export function useHasLibraryDirtyChanges(): boolean {
},
{ skip: !isGitSyncVisible },
);
-
- // Fetch snippets-namespace collections to check for dirty snippet collections
const { data: snippetsCollections = [] } = useListCollectionsTreeQuery(
{ namespace: "snippets" },
{ skip: !isGitSyncVisible },
);
+ const { data: dataActionsCollections = [] } = useListCollectionsTreeQuery(
+ { namespace: "data-actions" },
+ { skip: !isGitSyncVisible },
+ );
return useMemo(() => {
- // Always show dirty if there are removed items
- if (hasRemovedItems) {
- return true;
- }
-
if (!isDirty) {
return false;
}
- // Check for dirty snippets or snippet collections
- const snippetsTree = buildCollectionTree(snippetsCollections);
- const snippetsCollectionIds = getAllDescendantIds(snippetsTree);
- const numericSnippetCollectionIds = new Set(
- [...snippetsCollectionIds].filter(isNumericId),
+ // Removed items have no collection to place them by, so any that no other tab owns show here
+ const namespaceCollectionMap = buildNamespaceCollectionMap([
+ ...snippetsCollections,
+ ...dataActionsCollections,
+ ]);
+ const hasRemovedLibraryItems = dirty.some(
+ (entity) =>
+ entity.sync_status === "removed" &&
+ LIBRARY_DISPLAY_GROUP_IDS.has(
+ getDisplayGroupId(entity, namespaceCollectionMap),
+ ),
);
-
- const hasSnippetDirtyChanges = dirty.some((entity) => {
- if (entity.model === "nativequerysnippet") {
- return true;
- }
- if (
- entity.model === "collection" &&
- numericSnippetCollectionIds.has(entity.id)
- ) {
- return true;
- }
- return false;
- });
-
- if (hasSnippetDirtyChanges) {
+ if (hasRemovedLibraryItems) {
return true;
}
- // Check for dirty items in the Library collection tree
const libraryCollection = collections.find(isLibraryCollection);
if (!libraryCollection) {
return false;
}
- // Build tree and get all descendant IDs (including Library itself)
const libraryTree = buildCollectionTree([libraryCollection]);
const libraryCollectionIds = getAllDescendantIds(libraryTree);
-
- // Filter to only numeric IDs for the dirty check
const numericIds = new Set([...libraryCollectionIds].filter(isNumericId));
return hasDirtyInCollectionTree(numericIds);
}, [
collections,
snippetsCollections,
+ dataActionsCollections,
dirty,
isDirty,
- hasRemovedItems,
hasDirtyInCollectionTree,
]);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts
index 9a0f2fa2a66..52da46f49d3 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts
@@ -191,78 +191,35 @@ describe("useHasLibraryDirtyChanges", () => {
});
});
- describe("snippet dirty state", () => {
- it("returns true when a dirty snippet exists", async () => {
+ describe("changes owned by other tabs", () => {
+ it("returns false for a dirty snippet because the SQL snippets tab carries its own badge", async () => {
const { result } = setup({
- collections: [
- createLibraryCollection({ id: 1 }),
- createMockSnippetsCollection({ id: 100 }),
- ],
+ collections: [createLibraryCollection({ id: 1 })],
dirty: [
createMockDirtyEntity({
id: 10,
model: "nativequerysnippet",
name: "My Snippet",
- collection_id: 100,
+ collection_id: undefined,
}),
],
});
await waitFor(() => {
- expect(result.current).toBe(true);
+ expect(result.current).toBe(false);
});
});
- it("returns true when a dirty snippet exists in root (no collection)", async () => {
+ it("returns false for a dirty data action because the Data actions tab carries its own badge", async () => {
const { result } = setup({
collections: [createLibraryCollection({ id: 1 })],
dirty: [
createMockDirtyEntity({
id: 10,
- model: "nativequerysnippet",
- name: "Root Snippet",
+ model: "action",
+ name: "Refund order",
collection_id: undefined,
- }),
- ],
- });
-
- await waitFor(() => {
- expect(result.current).toBe(true);
- });
- });
-
- it("returns true when a dirty collection in snippets namespace exists", async () => {
- const { result } = setup({
- collections: [
- createLibraryCollection({ id: 1 }),
- createMockSnippetsCollection({ id: 100 }),
- ],
- dirty: [
- createMockDirtyEntity({
- id: 100,
- model: "collection",
- name: "Snippets Folder",
- }),
- ],
- });
-
- await waitFor(() => {
- expect(result.current).toBe(true);
- });
- });
-
- it("returns false when dirty collection is not in snippets namespace", async () => {
- const { result } = setup({
- collections: [
- createLibraryCollection({ id: 1 }),
- createRegularCollection({ id: 2 }),
- createMockSnippetsCollection({ id: 100 }),
- ],
- dirty: [
- createMockDirtyEntity({
- id: 2,
- model: "collection",
- name: "Regular Collection",
+ card_id: null,
}),
],
});
@@ -272,19 +229,14 @@ describe("useHasLibraryDirtyChanges", () => {
});
});
- it("returns false when dirty snippets exist but git sync is not visible", async () => {
+ it("returns false for a removed snippet", async () => {
const { result } = setup({
- isGitSyncVisible: false,
- collections: [
- createLibraryCollection({ id: 1 }),
- createMockSnippetsCollection({ id: 100 }),
- ],
+ collections: [createLibraryCollection({ id: 1 })],
dirty: [
createMockDirtyEntity({
id: 10,
model: "nativequerysnippet",
- name: "My Snippet",
- collection_id: 100,
+ sync_status: "removed",
}),
],
});
@@ -294,35 +246,24 @@ describe("useHasLibraryDirtyChanges", () => {
});
});
- it("returns true when nested snippets collection is dirty", async () => {
- const parentSnippetsCollection = createMockSnippetsCollection({
- id: 100,
- name: "Parent Snippets Folder",
- });
- const childSnippetsCollection = createMockSnippetsCollection({
- id: 101,
- name: "Child Snippets Folder",
- });
- // Set up parent-child relationship
- parentSnippetsCollection.children = [childSnippetsCollection];
-
+ it("returns false for a removed collection in the snippets namespace", async () => {
const { result } = setup({
collections: [
createLibraryCollection({ id: 1 }),
- parentSnippetsCollection,
- childSnippetsCollection,
+ createMockSnippetsCollection({ id: 100 }),
],
dirty: [
createMockDirtyEntity({
- id: 101,
+ id: 100,
model: "collection",
- name: "Child Snippets Folder",
+ sync_status: "removed",
+ collection_id: undefined,
}),
],
});
await waitFor(() => {
- expect(result.current).toBe(true);
+ expect(result.current).toBe(false);
});
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts
index 2ac4624fa47..5454503dd24 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.ts
@@ -24,10 +24,6 @@ export function useRemoteSyncDirtyState(): RemoteSyncDirtyState {
[dirtyData?.changedCollections],
);
const isDirty = dirty.length > 0;
- const hasRemovedItems = useMemo(
- () => dirty.some((entity) => entity.sync_status === "removed"),
- [dirty],
- );
const isCollectionDirty = useCallback(
(collectionId: number | string | undefined) => {
@@ -76,7 +72,6 @@ export function useRemoteSyncDirtyState(): RemoteSyncDirtyState {
dirty,
changedCollections,
isDirty,
- hasRemovedItems,
isLoading,
isCollectionDirty,
hasAnyCollectionDirty,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts
index e581cb68a1f..89bdf615a10 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts
@@ -242,48 +242,6 @@ describe("useRemoteSyncDirtyState", () => {
});
});
- describe("hasRemovedItems", () => {
- it("returns false when no entities have removed status", async () => {
- const { result } = setup({
- dirty: [
- createMockDirtyEntity({ sync_status: "update" }),
- createMockDirtyEntity({ id: 2, sync_status: "create" }),
- ],
- });
-
- await waitFor(() => {
- expect(result.current.dirty.length).toBeGreaterThan(0);
- });
-
- expect(result.current.hasRemovedItems).toBe(false);
- });
-
- it("returns true when any entity has removed status", async () => {
- const { result } = setup({
- dirty: [
- createMockDirtyEntity({ sync_status: "update" }),
- createMockDirtyEntity({ id: 2, sync_status: "removed" }),
- ],
- });
-
- await waitFor(() => {
- expect(result.current.dirty.length).toBeGreaterThan(0);
- });
-
- expect(result.current.hasRemovedItems).toBe(true);
- });
-
- it("returns false when dirty list is empty", async () => {
- const { result } = setup({ dirty: [] });
-
- await waitFor(() => {
- expect(result.current.isLoading).toBe(false);
- });
-
- expect(result.current.hasRemovedItems).toBe(false);
- });
- });
-
describe("when git sync is not visible", () => {
it("returns empty dirty state", async () => {
const { result } = setup({
@@ -295,7 +253,6 @@ describe("useRemoteSyncDirtyState", () => {
expect(result.current.dirty).toEqual([]);
});
expect(result.current.isDirty).toBe(false);
- expect(result.current.hasRemovedItems).toBe(false);
});
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts
index 56dccc435d2..89b4a9f3684 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/index.ts
@@ -17,6 +17,10 @@ import {
} from "./components/SyncedCollectionsSidebarSection";
import { REMOTE_SYNC_INVALIDATION_TAGS } from "./constants";
import { useGitSyncVisible } from "./hooks/use-git-sync-visible";
+import {
+ useHasDataActionsDirtyChanges,
+ useHasSnippetsDirtyChanges,
+} from "./hooks/use-has-display-group-dirty-changes";
import { useHasGlossaryDirtyChanges } from "./hooks/use-has-glossary-dirty-changes";
import { useHasLibraryDirtyChanges } from "./hooks/use-has-library-dirty-changes";
import { useHasTransformDirtyChanges } from "./hooks/use-has-transform-dirty-changes";
@@ -46,6 +50,9 @@ export function initializePlugin() {
PLUGIN_REMOTE_SYNC.useGitSyncVisible = useGitSyncVisible;
PLUGIN_REMOTE_SYNC.GitSyncSetupMenuItem = GitSyncSetupMenuItem;
PLUGIN_REMOTE_SYNC.useHasLibraryDirtyChanges = useHasLibraryDirtyChanges;
+ PLUGIN_REMOTE_SYNC.useHasSnippetsDirtyChanges = useHasSnippetsDirtyChanges;
+ PLUGIN_REMOTE_SYNC.useHasDataActionsDirtyChanges =
+ useHasDataActionsDirtyChanges;
PLUGIN_REMOTE_SYNC.useHasTransformDirtyChanges =
useHasTransformDirtyChanges;
PLUGIN_REMOTE_SYNC.useHasGlossaryDirtyChanges = useHasGlossaryDirtyChanges;
diff --git a/frontend/lint/side-effect-files.json b/frontend/lint/side-effect-files.json
index 7c33c339ead..9977edadc63 100644
--- a/frontend/lint/side-effect-files.json
+++ b/frontend/lint/side-effect-files.json
@@ -50,7 +50,7 @@
"enterprise/frontend/src/metabase-enterprise/auth/index.ts": "global",
"enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/utils.ts": "self",
"enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx": "self",
- "enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateLibraryDashboardModal.tsx": "self",
+ "enterprise/frontend/src/metabase-enterprise/data-studio/library/pages/LibraryPage/CreateLibraryDashboardModal/CreateLibraryDashboardModal.tsx": "self",
"enterprise/frontend/src/metabase-enterprise/data_apps/runtime/app-data-app.tsx": "entry",
"enterprise/frontend/src/metabase-enterprise/data_apps/runtime/iframe-vendors.ts": "entry",
"enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx": "self",
diff --git a/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
index cd0de26b737..dc82e805ed7 100644
--- a/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
@@ -77,8 +77,11 @@ function CreateCollectionForm({
location,
params,
});
+ const isNamespacedOnly = namespaces != null && !namespaces.includes(null);
+ // The user's default collection is outside the namespace, so start from the namespace root
const initialCollectionId =
- explicitInitialCollectionId ?? defaultInitialCollectionId;
+ explicitInitialCollectionId ??
+ (isNamespacedOnly ? null : defaultInitialCollectionId);
const initialValues = useMemo(
() => ({
...COLLECTION_SCHEMA.getDefault(),
@@ -97,10 +100,11 @@ function CreateCollectionForm({
const handleSubmit = useCallback(
(values: CreateCollectionProperties) => {
const parentCollection = selectedParentCollection ?? initialCollection;
- const namespace =
+ const parentNamespace =
parentCollection && "namespace" in parentCollection
? parentCollection.namespace
- : namespaces?.[0];
+ : null;
+ const namespace = parentNamespace ?? namespaces?.[0];
onSubmit({
...values,
diff --git a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx
index 166b2a51f38..e98523c915a 100644
--- a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx
@@ -1,6 +1,7 @@
import userEvent from "@testing-library/user-event";
import { screen } from "__support__/ui";
+import { createMockUser } from "metabase-types/api/mocks";
import { setup } from "./setup";
@@ -58,4 +59,19 @@ describe("CreateCollectionForm", () => {
expect.objectContaining({ namespace: "snippets" }),
);
});
+
+ it("creates the collection in the namespace root when only that namespace is allowed", async () => {
+ const { onSubmit } = setup({
+ user: createMockUser({ personal_collection_id: 99 }),
+ canWriteRoot: false,
+ namespaces: ["snippets"],
+ });
+
+ await userEvent.type(screen.getByLabelText("Name"), "My snippets folder");
+ await userEvent.click(screen.getByRole("button", { name: "Create" }));
+
+ expect(onSubmit).toHaveBeenCalledWith(
+ expect.objectContaining({ parent_id: null, namespace: "snippets" }),
+ );
+ });
});
diff --git a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx
index 5c9773decc8..70e758b89aa 100644
--- a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx
+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx
@@ -22,12 +22,6 @@ import {
import CreateCollectionForm from "../CreateCollectionForm";
-const ROOT_COLLECTION = createMockCollection({
- id: "root",
- name: "Our analytics",
- can_write: true,
-});
-
export interface SetupOpts {
user?: User;
tokenFeatures?: TokenFeatures;
@@ -36,6 +30,7 @@ export interface SetupOpts {
parentCollectionNamespace?: CollectionNamespace | null;
initialCollectionId?: CollectionId;
namespaces?: CollectionNamespace[];
+ canWriteRoot?: boolean;
onSubmit?: jest.Mock;
}
@@ -47,8 +42,14 @@ export const setup = ({
parentCollectionNamespace,
initialCollectionId,
namespaces,
+ canWriteRoot = true,
onSubmit = jest.fn(),
}: SetupOpts = {}) => {
+ const rootCollection = createMockCollection({
+ id: "root",
+ name: "Our analytics",
+ can_write: canWriteRoot,
+ });
const settings = mockSettings({ "token-features": tokenFeatures });
const onCancel = jest.fn();
@@ -60,12 +61,12 @@ export const setup = ({
namespace: parentCollectionNamespace,
can_write: true,
})
- : ROOT_COLLECTION;
+ : rootCollection;
const collections =
parentCollectionNamespace !== undefined
- ? [ROOT_COLLECTION, parentCollection]
- : [ROOT_COLLECTION];
+ ? [rootCollection, parentCollection]
+ : [rootCollection];
const initialCollection = initialCollectionId
? createMockCollection({
@@ -85,7 +86,7 @@ export const setup = ({
setupCollectionsEndpoints({
collections:
parentCollectionNamespace !== undefined ? [parentCollection] : [],
- rootCollection: ROOT_COLLECTION,
+ rootCollection: rootCollection,
});
// Mock individual collection fetches
diff --git a/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx
index b48800d54aa..f92da1d1307 100644
--- a/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx
+++ b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx
@@ -73,14 +73,15 @@ function CreateCollectionModal({
export default CreateCollectionModal;
export function getCreatedCollectionUrl(collection: Collection): string {
- if (
- PLUGIN_LIBRARY.isLibraryCollectionType(collection.type) ||
- collection.namespace === "snippets" ||
- collection.namespace === "data-actions"
- ) {
- return Urls.dataStudioLibrary({
- expandedIds: getCollectionPathAsArray(collection),
- });
+ const expandedIds = getCollectionPathAsArray(collection);
+ if (collection.namespace === "snippets") {
+ return Urls.dataStudioSnippets({ expandedIds });
+ }
+ if (collection.namespace === "data-actions") {
+ return Urls.dataStudioActions({ expandedIds });
+ }
+ if (PLUGIN_LIBRARY.isLibraryCollectionType(collection.type)) {
+ return Urls.dataStudioLibrary({ expandedIds });
}
return Urls.collection(collection);
}
diff --git a/frontend/src/metabase/common/collections/containers/CreateCollectionModal.unit.spec.ts b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.unit.spec.ts
index 342c73ffbbe..4f16353ab4d 100644
--- a/frontend/src/metabase/common/collections/containers/CreateCollectionModal.unit.spec.ts
+++ b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.unit.spec.ts
@@ -3,7 +3,7 @@ import { createMockCollection } from "metabase-types/api/mocks";
import { getCreatedCollectionUrl } from "./CreateCollectionModal";
describe("getCreatedCollectionUrl", () => {
- it("opens a new data actions folder in the Library with its path expanded", () => {
+ it("opens a new data actions folder on the Data actions tab with its path expanded", () => {
const collection = createMockCollection({
id: 12,
namespace: "data-actions",
@@ -11,7 +11,19 @@ describe("getCreatedCollectionUrl", () => {
});
expect(getCreatedCollectionUrl(collection)).toBe(
- "/data-studio/library?expandedId=10&expandedId=12",
+ "/data-studio/actions?expandedId=10&expandedId=12",
+ );
+ });
+
+ it("opens a new snippet folder on the SQL snippets tab with its path expanded", () => {
+ const collection = createMockCollection({
+ id: 12,
+ namespace: "snippets",
+ location: "/10/",
+ });
+
+ expect(getCreatedCollectionUrl(collection)).toBe(
+ "/data-studio/snippets?expandedId=10&expandedId=12",
);
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditor/ActionEditor.tsx b/frontend/src/metabase/data-studio/actions/components/ActionEditor/ActionEditor.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditor/ActionEditor.tsx
rename to frontend/src/metabase/data-studio/actions/components/ActionEditor/ActionEditor.tsx
index 1dc13d052e5..2b4a9a99f95 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditor/ActionEditor.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionEditor/ActionEditor.tsx
@@ -8,7 +8,7 @@ import type {
import * as Lib from "metabase-lib";
import type { Database, DatasetQuery } from "metabase-types/api";
-import { useActionQuery } from "../../hooks/use-action-query";
+import { useActionQuery } from "./hooks";
type ActionEditorProps = {
datasetQuery: DatasetQuery;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-query.ts b/frontend/src/metabase/data-studio/actions/components/ActionEditor/hooks.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-query.ts
rename to frontend/src/metabase/data-studio/actions/components/ActionEditor/hooks.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditor/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionEditor/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditor/index.ts
rename to frontend/src/metabase/data-studio/actions/components/ActionEditor/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditorPane/ActionEditorPane.tsx b/frontend/src/metabase/data-studio/actions/components/ActionEditorPane/ActionEditorPane.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditorPane/ActionEditorPane.tsx
rename to frontend/src/metabase/data-studio/actions/components/ActionEditorPane/ActionEditorPane.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditorPane/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionEditorPane/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionEditorPane/index.ts
rename to frontend/src/metabase/data-studio/actions/components/ActionEditorPane/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionHeader.tsx b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionHeader.tsx
rename to frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.tsx
index 9899d1a0821..e0827a6ae8e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionHeader.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.tsx
@@ -54,12 +54,11 @@ export function ActionHeader({
data-testid="action-header"
breadcrumbs={
<DataStudioBreadcrumbs loading={isLoadingPath}>
- <Link to={Urls.dataStudioLibrary()}>{t`Semantic layer`}</Link>
- <Link to={Urls.dataStudioLibrary()}>{t`Data actions`}</Link>
+ <Link to={Urls.dataStudioActions()}>{t`Data actions`}</Link>
{folderPath.map((collection, index) => (
<Link
key={collection.id}
- to={Urls.dataStudioLibrary({
+ to={Urls.dataStudioActions({
expandedIds: folderPath.slice(0, index + 1).map(({ id }) => id),
})}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionHeader.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionHeader.unit.spec.tsx
rename to frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionHeader.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
rename to frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
index 0df2743463a..4ccbe2acdc5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
@@ -30,7 +30,7 @@ export function ActionMoreMenu({ action }: ActionMoreMenuProps) {
return;
}
sendSuccessToast(t`Action archived`);
- navigate(Urls.dataStudioLibrary());
+ navigate(Urls.dataStudioActions());
};
const handleArchiveClick = () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/MoveActionModal.tsx b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/MoveActionModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/MoveActionModal.tsx
rename to frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/MoveActionModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/index.ts
rename to frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/MoveActionModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/ActionMoreMenu/index.ts
rename to frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/index.ts b/frontend/src/metabase/data-studio/actions/components/ActionHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/ActionHeader/index.ts
rename to frontend/src/metabase/data-studio/actions/components/ActionHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/constants.ts b/frontend/src/metabase/data-studio/actions/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/constants.ts
rename to frontend/src/metabase/data-studio/actions/constants.ts
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-action-database/index.ts b/frontend/src/metabase/data-studio/actions/hooks/use-action-database/index.ts
new file mode 100644
index 00000000000..ffdcbebe22e
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-action-database/index.ts
@@ -0,0 +1 @@
+export { useActionDatabase } from "./use-action-database";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-database.ts b/frontend/src/metabase/data-studio/actions/hooks/use-action-database/use-action-database.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-database.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-action-database/use-action-database.ts
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-action-databases/index.ts b/frontend/src/metabase/data-studio/actions/hooks/use-action-databases/index.ts
new file mode 100644
index 00000000000..aca8e9bf62e
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-action-databases/index.ts
@@ -0,0 +1 @@
+export { useActionDatabases } from "./use-action-databases";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-databases.ts b/frontend/src/metabase/data-studio/actions/hooks/use-action-databases/use-action-databases.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-databases.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-action-databases/use-action-databases.ts
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/index.ts b/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/index.ts
new file mode 100644
index 00000000000..74fbcfb1314
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/index.ts
@@ -0,0 +1 @@
+export { useActionDraft } from "./use-action-draft";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-draft.ts b/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/use-action-draft.ts
similarity index 88%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-draft.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-action-draft/use-action-draft.ts
index 08acd137edf..9b8e90ee419 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-draft.ts
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-action-draft/use-action-draft.ts
@@ -4,9 +4,8 @@ import { getDefaultFormSettings } from "metabase/actions/utils";
import * as Lib from "metabase-lib";
import type { ActionFormSettings, DatasetQuery } from "metabase-types/api";
-import { type ActionDefinition, getActionDefinition } from "../utils";
-
-import { useActionQuery } from "./use-action-query";
+import { useActionQuery } from "../../components/ActionEditor/hooks";
+import { type ActionDefinition, getActionDefinition } from "../../utils";
type UseActionDraftOptions = {
initialDatasetQuery: DatasetQuery;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/index.ts b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/index.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/use-build-action-tree.ts b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/use-build-action-tree.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/use-build-action-tree.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/use-build-action-tree.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/utils.ts b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/utils.ts
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/utils.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/utils.ts
index a6d071526ef..eca6db093ba 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/utils.ts
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/utils.ts
@@ -74,7 +74,7 @@ function isDataAction(
/**
* The data actions root with its folders and the actions without a model under it, or nothing without a readable
- * root or when it is empty and no action can be created.
+ * root.
*/
export function buildActiveActionTree(
actionCollections: Collection[],
@@ -99,9 +99,6 @@ export function buildActiveActionTree(
dataActions,
);
const hasContent = dataActions.length > 0 || collections.length > 0;
- if (!hasContent && !canCreateActions) {
- return [];
- }
return [
{
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/utils.unit.spec.ts b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/utils.unit.spec.ts
similarity index 88%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/utils.unit.spec.ts
index 96fac5afc18..ade1f68f38c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-build-action-tree/utils.unit.spec.ts
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-build-action-tree/utils.unit.spec.ts
@@ -58,8 +58,13 @@ describe("buildActiveActionTree", () => {
]);
});
- it("should build no tree when it is empty and no action can be created", () => {
- expect(buildActiveActionTree([ROOT], [], false)).toEqual([]);
+ it("should keep the root with an empty state without an action when no action can be created", () => {
+ expect(buildActiveActionTree([ROOT], [], false)[0].children).toEqual([
+ expect.objectContaining({
+ model: "empty-state",
+ data: expect.objectContaining({ actionUrl: undefined }),
+ }),
+ ]);
});
it("should show the empty state when an action can be created", () => {
diff --git a/frontend/src/metabase/data-studio/actions/hooks/use-route-action/index.ts b/frontend/src/metabase/data-studio/actions/hooks/use-route-action/index.ts
new file mode 100644
index 00000000000..1677bb12412
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/hooks/use-route-action/index.ts
@@ -0,0 +1 @@
+export { useRouteAction } from "./use-route-action";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-route-action.ts b/frontend/src/metabase/data-studio/actions/hooks/use-route-action/use-route-action.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-route-action.ts
rename to frontend/src/metabase/data-studio/actions/hooks/use-route-action/use-route-action.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.tsx
index 4e62016b13f..27e86f4d104 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.tsx
@@ -18,8 +18,8 @@ import {
} from "metabase/ui";
import type { FieldSettings, FieldType } from "metabase-types/api";
-import type { ActionField } from "../../../hooks/use-action-fields";
import { getFieldSettingsForFieldType } from "../../../utils";
+import type { ActionField } from "../hooks";
import { getDefaultValueInputType, textToOptions } from "./utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/ActionFieldDetails.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.unit.spec.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldDetails/utils.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.module.css b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.module.css
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
index faa1a7587bf..5dcf7e428e3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/ActionFieldItem.tsx
@@ -4,7 +4,7 @@ import { Link } from "metabase/common/components/Link";
import { Sortable } from "metabase/common/components/Sortable";
import { Badge, Card, Code, Group, Icon, Stack, Text } from "metabase/ui";
-import type { ActionField } from "../../../../hooks/use-action-fields";
+import type { ActionField } from "../../hooks";
import S from "./ActionFieldItem.module.css";
import { getFieldIcon, getFieldSummary } from "./utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/utils.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/utils.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldItem/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldList.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldList.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldList.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldList.tsx
index 62e8dd57d45..475ee5667f7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldList.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/ActionFieldList.tsx
@@ -9,7 +9,7 @@ import { Stack, Text, Title } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { WritebackActionId } from "metabase-types/api";
-import type { ActionField } from "../../../hooks/use-action-fields";
+import type { ActionField } from "../hooks";
import { ActionFieldItem } from "./ActionFieldItem";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldList/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldList/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldsPage.module.css b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldsPage.module.css
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
index 3b4c358abfb..68bbbfe0e29 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.tsx
@@ -10,13 +10,13 @@ import type { WritebackQueryAction } from "metabase-types/api";
import { ActionHeader } from "../../components/ActionHeader";
import { useActionDatabases } from "../../hooks/use-action-databases";
-import { useActionFields } from "../../hooks/use-action-fields";
import { useRouteAction } from "../../hooks/use-route-action";
import { canEditActionQuery } from "../../utils";
import { ActionFieldDetails } from "./ActionFieldDetails";
import { ActionFieldList } from "./ActionFieldList";
import S from "./ActionFieldsPage.module.css";
+import { useActionFields } from "./hooks";
export function ActionFieldsPage() {
const {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/ActionFieldsPage.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-fields.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/hooks.ts
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-fields.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/hooks.ts
index a70dff95ccb..1160ac732f5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/hooks/use-action-fields.ts
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/hooks.ts
@@ -16,13 +16,12 @@ import type {
WritebackQueryAction,
} from "metabase-types/api";
+import { useActionQuery } from "../../components/ActionEditor/hooks";
import {
getFieldSettingsFromQuery,
getQueryParameters,
setTemplateTagFieldType,
-} from "../utils";
-
-import { useActionQuery } from "./use-action-query";
+} from "../../utils";
export type ActionField = {
parameter: WritebackParameter;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionFieldsPage/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionFieldsPage/index.ts
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.tsx
new file mode 100644
index 00000000000..94b67852a09
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.tsx
@@ -0,0 +1,124 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { LibraryTreePage } from "metabase/data-studio/common/components/LibraryTreePage";
+import { useErrorHandling } from "metabase/data-studio/common/hooks/use-error-handling";
+import type { TreeItem } from "metabase/data-studio/common/types";
+import {
+ filterTreeByName,
+ isCollectionData,
+} from "metabase/data-studio/common/utils";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import { useDispatch, useSelector } from "metabase/redux";
+import { setOpenModalWithProps } from "metabase/redux/ui";
+import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
+import * as Urls from "metabase/urls";
+
+import {
+ ACTION_COLLECTION_NAMESPACES,
+ ACTION_COLLECTION_PICKER_OPTIONS,
+} from "../../constants";
+import { useActionDatabases } from "../../hooks/use-action-databases";
+import { useBuildActionTree } from "../../hooks/use-build-action-tree";
+import { canCreateActions } from "../../utils";
+
+import { RootDataActionsMenu } from "./RootDataActionsMenu";
+
+export function ActionListPage() {
+ const [searchQuery, setSearchQuery] = useState("");
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
+ const {
+ databases,
+ isLoading: isLoadingDatabases,
+ error: databasesError,
+ } = useActionDatabases();
+ const canCreate = canCreateActions(databases);
+ const {
+ tree,
+ isLoading: isLoadingActions,
+ error: actionsError,
+ } = useBuildActionTree({
+ canCreateActions: !isRemoteSyncReadOnly && canCreate,
+ });
+ useErrorHandling(actionsError ?? databasesError);
+
+ const isSearchActive = searchQuery.trim().length > 0;
+ const visibleTree = useMemo(
+ () => (isSearchActive ? filterTreeByName(tree, searchQuery) : tree),
+ [isSearchActive, tree, searchQuery],
+ );
+ const defaultExpandedIds = useMemo(
+ () => tree.slice(0, 1).map((node) => node.id),
+ [tree],
+ );
+
+ return (
+ <LibraryTreePage
+ title={t`Data actions`}
+ tree={visibleTree}
+ isLoading={isLoadingActions || isLoadingDatabases}
+ isSearchActive={isSearchActive}
+ searchQuery={searchQuery}
+ emptyMessage={t`No actions yet`}
+ defaultExpandedIds={defaultExpandedIds}
+ createMenu={canCreate && <ActionsCreateMenu />}
+ renderRowMenu={renderActionRowMenu}
+ onSearchQueryChange={setSearchQuery}
+ />
+ );
+}
+
+function renderActionRowMenu({ data }: TreeItem) {
+ if (!isCollectionData(data)) {
+ return null;
+ }
+ if (data.id === "root") {
+ return <RootDataActionsMenu />;
+ }
+ return <CollectionRowMenu collection={data} />;
+}
+
+function ActionsCreateMenu() {
+ const dispatch = useDispatch();
+
+ const handleNewCollectionClick = useCallback(() => {
+ dispatch(
+ setOpenModalWithProps({
+ id: "collection",
+ props: {
+ initialCollectionId: null,
+ namespaces: ACTION_COLLECTION_NAMESPACES,
+ pickerOptions: ACTION_COLLECTION_PICKER_OPTIONS,
+ showAuthorityLevelPicker: false,
+ },
+ }),
+ );
+ }, [dispatch]);
+
+ return (
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Button size="lg" leftSection={<Icon name="add" />}>{t`New`}</Button>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioAction()}
+ leftSection={<FixedSizeIcon name="bolt" />}
+ >
+ {t`Action`}
+ </Menu.Item>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="folder" />}
+ onClick={handleNewCollectionClick}
+ >
+ {t`Collection`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.unit.spec.tsx
new file mode 100644
index 00000000000..6d6a3029da6
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/ActionListPage.unit.spec.tsx
@@ -0,0 +1,116 @@
+import userEvent from "@testing-library/user-event";
+
+import {
+ setupActionsEndpoints,
+ setupCollectionsEndpoints,
+ setupDatabasesEndpoints,
+} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+ within,
+} from "__support__/ui";
+import { Route } from "metabase/router";
+import type { Database, WritebackAction } from "metabase-types/api";
+import {
+ createMockCollection,
+ createMockDatabase,
+ createMockQueryAction,
+ createMockUser,
+} from "metabase-types/api/mocks";
+
+import { ActionListPage } from "./ActionListPage";
+
+type SetupOpts = {
+ databases?: Database[];
+ actions?: WritebackAction[];
+};
+
+const ACTIONS_DATABASE = createMockDatabase({
+ native_permissions: "write",
+ settings: { "database-enable-actions": true },
+});
+
+function setup({ databases = [ACTIONS_DATABASE], actions = [] }: SetupOpts) {
+ setupDatabasesEndpoints(databases);
+ setupActionsEndpoints(actions);
+ setupCollectionsEndpoints({
+ collections: [
+ createMockCollection({
+ id: "root",
+ name: "Root",
+ namespace: "data-actions",
+ }),
+ ],
+ });
+
+ renderWithProviders(<Route path="/" element={<ActionListPage />} />, {
+ withRouter: true,
+ storeInitialState: createMockState({
+ currentUser: createMockUser({ is_superuser: true }),
+ }),
+ });
+}
+
+describe("ActionListPage", () => {
+ beforeEach(() => {
+ mockGetBoundingClientRect({ width: 1000, height: 1000 });
+ });
+
+ it("lists actions without a model under the Data actions root", async () => {
+ setup({
+ actions: [
+ createMockQueryAction({
+ id: 1,
+ name: "Refund order",
+ collection_id: null,
+ }),
+ ],
+ });
+
+ expect(await screen.findByText("Refund order")).toBeInTheDocument();
+ expect(
+ within(screen.getByTestId("library-page")).getByText("Data actions"),
+ ).toBeInTheDocument();
+ });
+
+ it("offers new actions and collections with native write on an actions-enabled database", async () => {
+ setup({});
+
+ await userEvent.click(await screen.findByRole("button", { name: /New/ }));
+
+ expect(
+ screen.getAllByRole("menuitem").map((item) => item.textContent),
+ ).toEqual(["Action", "Collection"]);
+ });
+
+ it("does not offer to create anything without an actions-enabled database, but still links to the archive", async () => {
+ setup({
+ databases: [
+ createMockDatabase({
+ native_permissions: "write",
+ settings: { "database-enable-actions": false },
+ }),
+ ],
+ });
+
+ expect(
+ await screen.findByText("Queries that change data"),
+ ).toBeInTheDocument();
+ expect(
+ screen.queryByRole("button", { name: /New/ }),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.queryByRole("link", { name: "New action" }),
+ ).not.toBeInTheDocument();
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "Data action options" }),
+ );
+ expect(
+ screen.getByRole("menuitem", { name: /View archived actions/ }),
+ ).toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/RootDataActionsMenu/RootDataActionsMenu.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/RootDataActionsMenu/RootDataActionsMenu.tsx
similarity index 86%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/RootDataActionsMenu/RootDataActionsMenu.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionListPage/RootDataActionsMenu/RootDataActionsMenu.tsx
index 4902d1a4288..944904c186a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/RootDataActionsMenu/RootDataActionsMenu.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/RootDataActionsMenu/RootDataActionsMenu.tsx
@@ -3,16 +3,18 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
import { getUserIsAdmin } from "metabase/current-user";
-import { PLUGIN_LIBRARY } from "metabase/plugins";
+import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";
import * as Urls from "metabase/urls";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
export function RootDataActionsMenu() {
const isAdmin = useSelector(getUserIsAdmin);
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
- const canChangePermissions = isAdmin && !remoteSyncReadOnly;
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
+ const canChangePermissions =
+ PLUGIN_LIBRARY.isEnabled && isAdmin && !remoteSyncReadOnly;
const [isPermissionsModalOpen, { toggle: togglePermissionsModal }] =
useDisclosure(false);
const optionsLabel = t`Data action options`;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/RootDataActionsMenu/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/RootDataActionsMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/components/RootDataActionsMenu/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionListPage/RootDataActionsMenu/index.ts
diff --git a/frontend/src/metabase/data-studio/actions/pages/ActionListPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/index.ts
new file mode 100644
index 00000000000..17116fd9929
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/pages/ActionListPage/index.ts
@@ -0,0 +1 @@
+export { ActionListPage } from "./ActionListPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionQueryPage/ActionQueryPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/ActionQueryPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionQueryPage/ActionQueryPage.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/ActionQueryPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionQueryPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionQueryPage/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionQueryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/ActionRunPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionRunPage/ActionRunPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/ActionRunPage.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionRunPage/ActionRunPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/ActionRunPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionRunPage/ActionRunPage.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/ActionRunPage.unit.spec.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionRunPage/ActionRunPage.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionRunPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionRunPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/utils.ts b/frontend/src/metabase/data-studio/actions/pages/ActionRunPage/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionRunPage/utils.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionRunPage/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionSettingsPage/ActionSettingsPage.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionSettingsPage/ActionSettingsPage.unit.spec.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/ActionSettingsPage.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionSettingsPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ActionSettingsPage/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/ActionSettingsPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ArchivedActionsPage/ArchivedActionsPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/ArchivedActionListPage.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ArchivedActionsPage/ArchivedActionsPage.tsx
rename to frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/ArchivedActionListPage.tsx
index eada77a8f6f..746f5e63939 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/ArchivedActionsPage/ArchivedActionsPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/ArchivedActionListPage.tsx
@@ -15,6 +15,7 @@ import {
isCollectionData,
isEmptyStateData,
} from "metabase/data-studio/common/utils";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import {
ActionIcon,
@@ -31,16 +32,17 @@ import {
useTreeTableInstance,
} from "metabase/ui";
import * as Urls from "metabase/urls";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import { useBuildActionTree } from "../../hooks/use-build-action-tree";
-export function ArchivedActionsPage() {
+export function ArchivedActionListPage() {
const [searchQuery, setSearchQuery] = useState("");
const { tree, isLoading, error } = useBuildActionTree({ archived: true });
const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
const [updateAction] = useUpdateActionMutation();
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
const handleUnarchive = useCallback(
async ({ id, name }: { id: number; name: string }) => {
@@ -108,8 +110,7 @@ export function ArchivedActionsPage() {
<PaneHeader
breadcrumbs={
<DataStudioBreadcrumbs>
- <Link to={Urls.dataStudioLibrary()}>{t`Semantic layer`}</Link>
- <Link to={Urls.dataStudioLibrary()}>{t`Data actions`}</Link>
+ <Link to={Urls.dataStudioActions()}>{t`Data actions`}</Link>
{t`Archived actions`}
</DataStudioBreadcrumbs>
}
diff --git a/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/index.ts
new file mode 100644
index 00000000000..55c81734712
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/index.ts
@@ -0,0 +1 @@
+export * from "./ArchivedActionListPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
rename to frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/CreateActionModal/index.ts b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/CreateActionModal/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/NewActionPage.tsx b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/NewActionPage.tsx
rename to frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.tsx
index d628cb14b72..b51eed21756 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/NewActionPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/NewActionPage.tsx
@@ -107,13 +107,12 @@ function NewActionPageBody({ databases }: NewActionPageBodyProps) {
isValid={draft.isValid}
isDirty
onSave={openModal}
- onCancel={() => navigate(Urls.dataStudioLibrary())}
+ onCancel={() => navigate(Urls.dataStudioActions())}
/>
}
breadcrumbs={
<DataStudioBreadcrumbs>
- <Link to={Urls.dataStudioLibrary()}>{t`Semantic layer`}</Link>
- <Link to={Urls.dataStudioLibrary()}>{t`Data actions`}</Link>
+ <Link to={Urls.dataStudioActions()}>{t`Data actions`}</Link>
{t`New action`}
</DataStudioBreadcrumbs>
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/index.ts b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/pages/NewActionPage/index.ts
rename to frontend/src/metabase/data-studio/actions/pages/NewActionPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/routes.tsx b/frontend/src/metabase/data-studio/actions/routes.tsx
similarity index 53%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/routes.tsx
rename to frontend/src/metabase/data-studio/actions/routes.tsx
index dcab353b574..8a835664e77 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/routes.tsx
+++ b/frontend/src/metabase/data-studio/actions/routes.tsx
@@ -1,12 +1,20 @@
+import { ActionsSectionLayout } from "metabase/data-studio/app/pages/ActionsSectionLayout";
import { Route } from "metabase/router";
/**
* The action pages, in one chunk, so moving between an action's tabs costs no fetch.
*/
-const archivedActionsPage = () =>
+const actionsPage = () =>
+ import(/* webpackChunkName: "data-actions" */ "./pages/ActionListPage").then(
+ ({ ActionListPage }) => ({ Component: ActionListPage }),
+ );
+
+const archivedActionListPage = () =>
import(
- /* webpackChunkName: "data-actions" */ "./pages/ArchivedActionsPage"
- ).then(({ ArchivedActionsPage }) => ({ Component: ArchivedActionsPage }));
+ /* webpackChunkName: "data-actions" */ "./pages/ArchivedActionListPage"
+ ).then(({ ArchivedActionListPage }) => ({
+ Component: ArchivedActionListPage,
+ }));
const newActionPage = () =>
import(/* webpackChunkName: "data-actions" */ "./pages/NewActionPage").then(
@@ -35,15 +43,16 @@ const actionSettingsPage = () =>
export function getDataStudioActionRoutes() {
return (
- <>
- <Route path="actions/new" lazy={newActionPage} />
- <Route path="actions/archived" lazy={archivedActionsPage} />
- <Route path="actions/:actionId" lazy={actionQueryPage} />
- <Route path="actions/:actionId/edit" lazy={actionQueryPage} />
- <Route path="actions/:actionId/fields" lazy={actionFieldsPage} />
- <Route path="actions/:actionId/fields/:fieldId" lazy={actionFieldsPage} />
- <Route path="actions/:actionId/run" lazy={actionRunPage} />
- <Route path="actions/:actionId/settings" lazy={actionSettingsPage} />
- </>
+ <Route path="actions" element={<ActionsSectionLayout />}>
+ <Route index lazy={actionsPage} />
+ <Route path="new" lazy={newActionPage} />
+ <Route path="archived" lazy={archivedActionListPage} />
+ <Route path=":actionId" lazy={actionQueryPage} />
+ <Route path=":actionId/edit" lazy={actionQueryPage} />
+ <Route path=":actionId/fields" lazy={actionFieldsPage} />
+ <Route path=":actionId/fields/:fieldId" lazy={actionFieldsPage} />
+ <Route path=":actionId/run" lazy={actionRunPage} />
+ <Route path=":actionId/settings" lazy={actionSettingsPage} />
+ </Route>
);
}
diff --git a/frontend/src/metabase/data-studio/actions/routes.unit.spec.tsx b/frontend/src/metabase/data-studio/actions/routes.unit.spec.tsx
new file mode 100644
index 00000000000..a0c0b02596c
--- /dev/null
+++ b/frontend/src/metabase/data-studio/actions/routes.unit.spec.tsx
@@ -0,0 +1,15 @@
+import { lazyLoaders } from "__support__/lazy-routes";
+
+import { getDataStudioActionRoutes } from "./routes";
+
+describe("data studio action routes", () => {
+ it("resolves every page", async () => {
+ const loaders = lazyLoaders(getDataStudioActionRoutes());
+
+ expect(loaders).toHaveLength(9);
+
+ for (const load of loaders) {
+ expect((await load()).Component).toBeDefined();
+ }
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/utils.ts b/frontend/src/metabase/data-studio/actions/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/utils.ts
rename to frontend/src/metabase/data-studio/actions/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/utils.unit.spec.ts b/frontend/src/metabase/data-studio/actions/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/actions/utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/actions/utils.unit.spec.ts
diff --git a/frontend/src/metabase/data-studio/app/pages/ActionsSectionLayout/ActionsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/ActionsSectionLayout/ActionsSectionLayout.tsx
new file mode 100644
index 00000000000..f5e98429377
--- /dev/null
+++ b/frontend/src/metabase/data-studio/app/pages/ActionsSectionLayout/ActionsSectionLayout.tsx
@@ -0,0 +1,10 @@
+import { t } from "ttag";
+
+import { usePageTitle } from "metabase/hooks/use-page-title";
+import { Outlet } from "metabase/router";
+
+export function ActionsSectionLayout() {
+ usePageTitle(t`Data actions`);
+
+ return <Outlet />;
+}
diff --git a/frontend/src/metabase/data-studio/app/pages/ActionsSectionLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/ActionsSectionLayout/index.ts
new file mode 100644
index 00000000000..fbf7cf30c13
--- /dev/null
+++ b/frontend/src/metabase/data-studio/app/pages/ActionsSectionLayout/index.ts
@@ -0,0 +1 @@
+export { ActionsSectionLayout } from "./ActionsSectionLayout";
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
index 881983508c0..38ec69e086e 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
@@ -7,7 +7,7 @@ import {
canAccessDataModel as canAccessDataModelSelector,
useUserKeyValue,
} from "metabase/current-user";
-import { useDataStudioSettings } from "metabase/data-studio/settings/hooks";
+import { useDataStudioSettings } from "metabase/data-studio/settings/hooks/use-data-studio-settings";
import {
AreaLayout,
AreaTab,
@@ -39,6 +39,10 @@ export function DataStudioLayout() {
const hasDirtyChanges = PLUGIN_REMOTE_SYNC.useHasLibraryDirtyChanges();
const hasTransformDirtyChanges =
PLUGIN_REMOTE_SYNC.useHasTransformDirtyChanges();
+ const hasSnippetsDirtyChanges =
+ PLUGIN_REMOTE_SYNC.useHasSnippetsDirtyChanges();
+ const hasDataActionsDirtyChanges =
+ PLUGIN_REMOTE_SYNC.useHasDataActionsDirtyChanges();
const hasGlossaryDirtyChanges =
PLUGIN_REMOTE_SYNC.useHasGlossaryDirtyChanges();
const [isGitSettingsOpen, setIsGitSettingsOpen] = useState(false);
@@ -109,6 +113,32 @@ export function DataStudioLayout() {
) : null
}
/>
+ <AreaTab
+ label={t`SQL snippets`}
+ icon="snippet"
+ to={Urls.dataStudioSnippets()}
+ isSelected={currentTab === "snippets"}
+ showLabel={isNavbarOpened}
+ rightSection={
+ hasSnippetsDirtyChanges &&
+ PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge ? (
+ <PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge />
+ ) : null
+ }
+ />
+ <AreaTab
+ label={t`Data actions`}
+ icon="bolt"
+ to={Urls.dataStudioActions()}
+ isSelected={currentTab === "actions"}
+ showLabel={isNavbarOpened}
+ rightSection={
+ hasDataActionsDirtyChanges &&
+ PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge ? (
+ <PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge />
+ ) : null
+ }
+ />
<AreaTab
label={t`Glossary`}
icon="glossary"
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx
index 6db46d7d86d..7128aa205a9 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/common.unit.spec.tsx
@@ -1,6 +1,6 @@
import fetchMock from "fetch-mock";
-import { screen, waitFor } from "__support__/ui";
+import { screen, waitFor, within } from "__support__/ui";
import * as Urls from "metabase/urls";
import { setup } from "./setup";
@@ -27,6 +27,26 @@ describe("DataStudioLayout", () => {
expect(screen.getByText("Connected data")).toBeInTheDocument();
});
+ it("should render the library tabs", async () => {
+ setup({ remoteSyncBranch: "main" });
+
+ const nav = await screen.findByTestId("data-studio-nav");
+ for (const label of [
+ "Semantic layer",
+ "SQL snippets",
+ "Data actions",
+ "Glossary",
+ ]) {
+ expect(within(nav).getByText(label)).toBeInTheDocument();
+ }
+ expect(
+ within(nav).getByRole("link", { name: /SQL snippets/ }),
+ ).toHaveAttribute("href", "/data-studio/snippets");
+ expect(
+ within(nav).getByRole("link", { name: /Data actions/ }),
+ ).toHaveAttribute("href", "/data-studio/actions");
+ });
+
it("should render content area", async () => {
setup({ remoteSyncBranch: null });
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
index e5c40cad9c1..c8b746d27dc 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/enterprise.unit.spec.tsx
@@ -2,6 +2,11 @@ import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
import { screen, waitFor, within } from "__support__/ui";
+import {
+ createMockDirtyCardEntity,
+ createMockDirtyTransformEntity,
+ createMockRemoteSyncEntity,
+} from "metabase-types/api/mocks";
import { DEFAULT_EE_SETTINGS, setup } from "./setup";
@@ -146,13 +151,62 @@ describe("DataStudioLayout", () => {
});
});
+ describe("library tab dirty indicators", () => {
+ const LIBRARY_TABS = ["Semantic layer", "SQL snippets", "Data actions"];
+ const getTabStatus = (label: string) =>
+ within(screen.getByLabelText(label)).queryByTestId("remote-sync-status");
+
+ it.each([
+ {
+ name: "a dirty snippet",
+ entity: createMockRemoteSyncEntity({ model: "nativequerysnippet" }),
+ tab: "SQL snippets",
+ },
+ {
+ name: "a dirty data action",
+ entity: createMockRemoteSyncEntity({ model: "action", card_id: null }),
+ tab: "Data actions",
+ },
+ ])("shows $name only on the $tab tab", async ({ entity, tab }) => {
+ setup({
+ ...DEFAULT_EE_SETTINGS,
+ remoteSyncBranch: "main",
+ isNavbarOpened: true,
+ dirty: [entity],
+ });
+
+ await waitFor(() => {
+ expect(getTabStatus(tab)).toBeInTheDocument();
+ });
+ const otherTabs = LIBRARY_TABS.filter((otherTab) => otherTab !== tab);
+ for (const otherTab of otherTabs) {
+ expect(getTabStatus(otherTab)).not.toBeInTheDocument();
+ }
+ });
+
+ it("shows Library changes only on the Semantic layer tab", async () => {
+ setup({
+ ...DEFAULT_EE_SETTINGS,
+ remoteSyncBranch: "main",
+ isNavbarOpened: true,
+ dirty: [createMockDirtyCardEntity()],
+ });
+
+ await waitFor(() => {
+ expect(getTabStatus("Semantic layer")).toBeInTheDocument();
+ });
+ expect(getTabStatus("SQL snippets")).not.toBeInTheDocument();
+ expect(getTabStatus("Data actions")).not.toBeInTheDocument();
+ });
+ });
+
describe("transform dirty indicator", () => {
it("should show dirty indicator on Transforms tab when transforms have dirty changes", async () => {
setup({
...DEFAULT_EE_SETTINGS,
remoteSyncBranch: "main",
isNavbarOpened: true,
- hasTransformDirtyChanges: true,
+ dirty: [createMockDirtyTransformEntity()],
remoteSyncTransforms: true,
});
@@ -169,7 +223,6 @@ describe("DataStudioLayout", () => {
...DEFAULT_EE_SETTINGS,
remoteSyncBranch: "main",
isNavbarOpened: true,
- hasTransformDirtyChanges: false,
remoteSyncTransforms: true,
});
@@ -188,7 +241,7 @@ describe("DataStudioLayout", () => {
...DEFAULT_EE_SETTINGS,
remoteSyncBranch: "main",
isNavbarOpened: true,
- hasTransformDirtyChanges: true,
+ dirty: [createMockDirtyTransformEntity()],
remoteSyncTransforms: false,
});
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
index 9195d01b33c..9ce0dab2c16 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
@@ -17,8 +17,6 @@ import type {
TokenFeatures,
} from "metabase-types/api";
import {
- createMockDirtyCardEntity,
- createMockDirtyTransformEntity,
createMockLibraryCollection,
createMockSettings,
createMockTokenFeatures,
@@ -164,8 +162,7 @@ interface SetupOpts {
remoteSyncBranch?: string | null;
isAdmin?: boolean;
canAccessTransforms?: boolean;
- hasDirtyChanges?: boolean;
- hasTransformDirtyChanges?: boolean;
+ dirty?: RemoteSyncEntity[];
remoteSyncTransforms?: boolean;
isNavbarOpened?: boolean;
enterprisePlugins?: Parameters<typeof setupEnterpriseOnlyPlugin>[0][];
@@ -179,8 +176,7 @@ export const setup = ({
remoteSyncBranch = null,
isAdmin = true,
canAccessTransforms = false,
- hasDirtyChanges = false,
- hasTransformDirtyChanges = false,
+ dirty = [],
remoteSyncTransforms = false,
isNavbarOpened = true,
enterprisePlugins,
@@ -188,23 +184,10 @@ export const setup = ({
transformsEnabled = false,
transformsSetupComplete = false,
}: SetupOpts = {}) => {
- // Build collections list
- const collections: Collection[] = [];
- if (hasDirtyChanges) {
- collections.push(createMockLibraryCollection());
- }
- if (hasTransformDirtyChanges) {
- collections.push(createMockTransformsCollection());
- }
-
- // Build dirty entities list
- const dirty: RemoteSyncEntity[] = [];
- if (hasDirtyChanges) {
- dirty.push(createMockDirtyCardEntity());
- }
- if (hasTransformDirtyChanges) {
- dirty.push(createMockDirtyTransformEntity());
- }
+ const collections = [
+ createMockLibraryCollection(),
+ createMockTransformsCollection(),
+ ];
const remoteSyncSettings: Partial<RemoteSyncSettings> = {
enabled: remoteSyncEnabled,
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
index 7619c466892..08be54a77f2 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
@@ -4,6 +4,8 @@ type TabName =
| "guide"
| "data"
| "library"
+ | "snippets"
+ | "actions"
| "transforms"
| "dependencies"
| "schema-viewer"
@@ -23,6 +25,10 @@ export const getCurrentTab = (pathname: string): TabName => {
return "dependencies";
case pathname.startsWith(Urls.dataStudioSchemaViewer()):
return "schema-viewer";
+ case pathname.startsWith(Urls.dataStudioSnippets()):
+ return "snippets";
+ case pathname.startsWith(Urls.dataStudioActions()):
+ return "actions";
case pathname.startsWith(Urls.dataStudioLibrary()):
return "library";
case pathname.startsWith(Urls.transformList()):
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
index cd03901d2bf..764ef37cd19 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.unit.spec.ts
@@ -16,6 +16,10 @@ describe("getCurrentTab", () => {
${"/data-studio/library/metrics/456"} | ${"library"}
${"/data-studio/library/metrics/456/overview"} | ${"library"}
${"/data-studio/library/tables/42"} | ${"library"}
+ ${"/data-studio/snippets"} | ${"snippets"}
+ ${"/data-studio/snippets/12"} | ${"snippets"}
+ ${"/data-studio/actions"} | ${"actions"}
+ ${"/data-studio/actions/34/run"} | ${"actions"}
${"/data-studio/transforms/runs"} | ${"transforms"}
${"/data-studio/transforms/runs?page=2"} | ${"transforms"}
${"/data-studio/transforms"} | ${"transforms"}
diff --git a/frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
index 93b948f0150..657ca4d3535 100644
--- a/frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { RemoteSyncUpsellPage } from "metabase/data-studio/upsells/pages";
+import { RemoteSyncUpsellPage } from "metabase/data-studio/upsells/pages/RemoteSyncUpsellPage";
import { usePageTitle } from "metabase/hooks/use-page-title";
export function GitSyncSectionLayout() {
diff --git a/frontend/src/metabase/data-studio/app/pages/SnippetsSectionLayout/SnippetsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/SnippetsSectionLayout/SnippetsSectionLayout.tsx
new file mode 100644
index 00000000000..b68ca44b4c6
--- /dev/null
+++ b/frontend/src/metabase/data-studio/app/pages/SnippetsSectionLayout/SnippetsSectionLayout.tsx
@@ -0,0 +1,10 @@
+import { t } from "ttag";
+
+import { usePageTitle } from "metabase/hooks/use-page-title";
+import { Outlet } from "metabase/router";
+
+export function SnippetsSectionLayout() {
+ usePageTitle(t`SQL snippets`);
+
+ return <Outlet />;
+}
diff --git a/frontend/src/metabase/data-studio/app/pages/SnippetsSectionLayout/index.ts b/frontend/src/metabase/data-studio/app/pages/SnippetsSectionLayout/index.ts
new file mode 100644
index 00000000000..f72b371d32e
--- /dev/null
+++ b/frontend/src/metabase/data-studio/app/pages/SnippetsSectionLayout/index.ts
@@ -0,0 +1 @@
+export { SnippetsSectionLayout } from "./SnippetsSectionLayout";
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.css b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.css
deleted file mode 100644
index dc98720b729..00000000000
--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.link {
- color: inherit;
- text-decoration: none;
-}
-
-.link:hover {
- color: var(--mb-color-core-brand);
-}
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx
deleted file mode 100644
index 54b9f60de67..00000000000
--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Fragment } from "react";
-
-import { Link } from "metabase/common/components/Link";
-import { Ellipsified, Flex, Group, Text } from "metabase/ui";
-
-import S from "./Breadcrumbs.module.css";
-
-export type BreadcrumbItem = {
- label: string;
- to?: string;
-};
-
-type BreadcrumbsProps = {
- items: BreadcrumbItem[];
-};
-
-export function Breadcrumbs({ items }: BreadcrumbsProps) {
- return (
- <Group c="text-secondary" gap="sm" wrap="nowrap" px="xl" pt="lg">
- {items.map((item, index) => (
- <Fragment key={index}>
- {index > 0 && <Separator />}
- {item.to ? (
- <BreadcrumbLink to={item.to}>
- <Ellipsified>{item.label}</Ellipsified>
- </BreadcrumbLink>
- ) : (
- <BreadcrumbText>
- <Ellipsified>{item.label}</Ellipsified>
- </BreadcrumbText>
- )}
- </Fragment>
- ))}
- </Group>
- );
-}
-
-function BreadcrumbLink({
- to,
- children,
-}: {
- to: string;
- children: React.ReactNode;
-}) {
- return (
- <Link to={to} className={S.link}>
- <Flex align="center" gap="xxs" wrap="nowrap">
- {children}
- </Flex>
- </Link>
- );
-}
-
-function BreadcrumbText({ children }: { children: React.ReactNode }) {
- return (
- <Flex align="center" gap="xxs" wrap="nowrap">
- {children}
- </Flex>
- );
-}
-
-function Separator() {
- return <Text span>/</Text>;
-}
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/index.ts b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/index.ts
deleted file mode 100644
index 441842183aa..00000000000
--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { Breadcrumbs, type BreadcrumbItem } from "./Breadcrumbs";
-export { DataModelBreadcrumbs } from "./DataModelBreadcrumbs";
-export { PublishedTableBreadcrumbs } from "./PublishedTableBreadcrumbs";
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/DataModelBreadcrumbs/DataModelBreadcrumbs.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
rename to frontend/src/metabase/data-studio/common/components/DataModelBreadcrumbs/DataModelBreadcrumbs.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/DataModelBreadcrumbs/index.ts b/frontend/src/metabase/data-studio/common/components/DataModelBreadcrumbs/index.ts
new file mode 100644
index 00000000000..b82d6d6bea8
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/DataModelBreadcrumbs/index.ts
@@ -0,0 +1 @@
+export { DataModelBreadcrumbs } from "./DataModelBreadcrumbs";
diff --git a/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/index.ts b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/index.ts
new file mode 100644
index 00000000000..c1c8684e0e6
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/index.ts
@@ -0,0 +1,2 @@
+export { EntityDetailTabs } from "./EntityDetailTabs";
+export type { EntityDetailTabUrls } from "./EntityDetailTabs";
diff --git a/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.module.css b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem/EntityListItem.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.module.css
rename to frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem/EntityListItem.module.css
diff --git a/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem/EntityListItem.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx
rename to frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem/EntityListItem.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem/index.ts b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem/index.ts
new file mode 100644
index 00000000000..6323e7e1621
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem/index.ts
@@ -0,0 +1 @@
+export { EntityListItem } from "./EntityListItem";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/EmptyStateAction.tsx b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/EmptyStateAction/EmptyStateAction.tsx
similarity index 67%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/EmptyStateAction.tsx
rename to frontend/src/metabase/data-studio/common/components/LibraryTreePage/EmptyStateAction/EmptyStateAction.tsx
index 0bf9267294f..59cf9a29ef4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/EmptyStateAction.tsx
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/EmptyStateAction/EmptyStateAction.tsx
@@ -4,40 +4,33 @@ import { Anchor } from "metabase/ui";
interface EmptyStateActionProps {
data: EmptyStateData;
- onPublishTableClick: () => void;
- onNewDashboardClick: () => void;
+ onClick?: () => void;
}
-export function EmptyStateAction({
- data,
- onPublishTableClick,
- onNewDashboardClick,
-}: EmptyStateActionProps) {
- if (data.sectionType === "data" || data.sectionType === "dashboards") {
- const onClick =
- data.sectionType === "data" ? onPublishTableClick : onNewDashboardClick;
+export function EmptyStateAction({ data, onClick }: EmptyStateActionProps) {
+ if (data.actionUrl) {
return (
<Anchor
- component="button"
- type="button"
+ component={ForwardRefLink}
+ to={data.actionUrl}
fz="inherit"
- onClick={(e) => {
- e.stopPropagation();
- onClick();
- }}
+ onClick={(e) => e.stopPropagation()}
>
{data.actionLabel}
</Anchor>
);
}
- if (data.actionUrl) {
+ if (onClick) {
return (
<Anchor
- component={ForwardRefLink}
- to={data.actionUrl}
+ component="button"
+ type="button"
fz="inherit"
- onClick={(e) => e.stopPropagation()}
+ onClick={(e) => {
+ e.stopPropagation();
+ onClick();
+ }}
>
{data.actionLabel}
</Anchor>
diff --git a/frontend/src/metabase/data-studio/common/components/LibraryTreePage/EmptyStateAction/index.ts b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/EmptyStateAction/index.ts
new file mode 100644
index 00000000000..a4735ba61ae
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/EmptyStateAction/index.ts
@@ -0,0 +1 @@
+export { EmptyStateAction } from "./EmptyStateAction";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryBulkActions.tsx b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/LibraryBulkActions.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryBulkActions.tsx
rename to frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/LibraryBulkActions.tsx
index 6aa5d3c5b9d..d5886420e89 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryBulkActions.tsx
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/LibraryBulkActions.tsx
@@ -16,20 +16,19 @@ import {
useMetadataToasts,
useSetCollection,
} from "metabase/common/hooks";
-import type { CollectionId, RegularCollectionId } from "metabase-types/api";
-
-import { UnpublishTablesModal } from "../../components/UnpublishTablesModal";
import type {
LibrarySection,
SelectedItem,
-} from "../hooks/library-bulk-selection.utils";
+} from "metabase/data-studio/common/hooks/use-library-bulk-selection";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
+import type { CollectionId, RegularCollectionId } from "metabase-types/api";
+
import {
getAffectedCollectionIds,
runLibraryItemUpdates,
selectedItemToArchivable,
selectedItemToMovable,
-} from "../hooks/library-item-updates";
-import { getArchiveLibraryCollectionsMessage } from "../utils";
+} from "./utils";
type BulkAction = "move" | "unpublish";
@@ -42,6 +41,10 @@ type LibraryBulkActionsProps = {
section: LibrarySection,
affectedCollectionIds: CollectionId[],
) => void;
+ getTrashMessage?: (
+ section: LibrarySection,
+ count: number,
+ ) => string | undefined;
onClear: () => void;
};
@@ -51,6 +54,7 @@ export function LibraryBulkActions({
isAllTables,
defaultCollectionId,
onActionComplete,
+ getTrashMessage,
onClear,
}: LibraryBulkActionsProps) {
const [action, setAction] = useState<BulkAction>();
@@ -144,8 +148,8 @@ export function LibraryBulkActions({
showConfirm({
title: t`Move to trash?`,
message:
- selectionSection === "data"
- ? getArchiveLibraryCollectionsMessage(count)
+ selectionSection != null
+ ? getTrashMessage?.(selectionSection, count)
: undefined,
confirmButtonText: t`Move to trash`,
onConfirm: handleTrash,
@@ -182,7 +186,7 @@ export function LibraryBulkActions({
/>
)}
{action === "unpublish" && (
- <UnpublishTablesModal
+ <PLUGIN_LIBRARY.UnpublishTablesModal
isOpened
tableIds={selectedItems.map((item) => item.entityId)}
onUnpublish={handleUnpublished}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryBulkActions.unit.spec.tsx b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/LibraryBulkActions.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryBulkActions.unit.spec.tsx
rename to frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/LibraryBulkActions.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/index.ts b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/index.ts
new file mode 100644
index 00000000000..1862cef2a9c
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/index.ts
@@ -0,0 +1 @@
+export { LibraryBulkActions } from "./LibraryBulkActions";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-item-updates.ts b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/utils.ts
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-item-updates.ts
rename to frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/utils.ts
index 486120cccb8..aa9c23cb8d6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-item-updates.ts
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/utils.ts
@@ -2,10 +2,9 @@ import { match } from "ts-pattern";
import type { ArchivableItem } from "metabase/archive/hooks";
import type { MovableItem } from "metabase/common/hooks";
+import type { SelectedItem } from "metabase/data-studio/common/hooks/use-library-bulk-selection";
import type { CollectionId } from "metabase-types/api";
-import type { SelectedItem } from "./library-bulk-selection.utils";
-
export type LibraryItemUpdateResult = {
failedCount: number;
affectedCollectionIds: CollectionId[];
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-item-updates.unit.spec.ts b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/utils.unit.spec.ts
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-item-updates.unit.spec.ts
rename to frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/utils.unit.spec.ts
index 3402748332c..d882b3a75ef 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-item-updates.unit.spec.ts
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryBulkActions/utils.unit.spec.ts
@@ -1,12 +1,13 @@
import type {
LibrarySection,
SelectedItem,
-} from "./library-bulk-selection.utils";
+} from "metabase/data-studio/common/hooks/use-library-bulk-selection";
+
import {
getAffectedCollectionIds,
selectedItemToArchivable,
selectedItemToMovable,
-} from "./library-item-updates";
+} from "./utils";
function item(
model: SelectedItem["model"],
diff --git a/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryTreePage.tsx b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryTreePage.tsx
new file mode 100644
index 00000000000..7678b643440
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/LibraryTreePage.tsx
@@ -0,0 +1,196 @@
+import type { Row } from "@tanstack/react-table";
+import { type ReactNode, useCallback, useEffect } from "react";
+import { t } from "ttag";
+
+import { ListEmptyState } from "metabase/common/components/ListEmptyState";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
+import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";
+import {
+ type LibrarySection,
+ useLibraryBulkSelection,
+} from "metabase/data-studio/common/hooks/use-library-bulk-selection";
+import type {
+ LibrarySectionType,
+ TreeItem,
+} from "metabase/data-studio/common/types";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import { useSelector } from "metabase/redux";
+import {
+ Card,
+ Flex,
+ Icon,
+ Stack,
+ TextInput,
+ TreeTable,
+ TreeTableSkeleton,
+} from "metabase/ui";
+import type { CollectionId } from "metabase-types/api";
+
+import { LibraryBulkActions } from "./LibraryBulkActions";
+import { useLibraryTreeTableInstance } from "./hooks";
+
+type LibraryTreePageProps = {
+ title: string;
+ tree: TreeItem[];
+ isLoading: boolean;
+ isSearchActive: boolean;
+ searchQuery: string;
+ emptyMessage: string;
+ defaultExpandedIds: string[];
+ defaultMoveCollectionIds?: Partial<Record<LibrarySection, CollectionId>>;
+ createMenu?: ReactNode;
+ emptyState?: ReactNode;
+ children?: ReactNode;
+ renderRowMenu: (item: TreeItem) => ReactNode;
+ isChildrenLoading?: (row: Row<TreeItem>) => boolean;
+ onRowsChange?: (rows: Row<TreeItem>[]) => void;
+ onSearchQueryChange: (searchQuery: string) => void;
+ emptyStateActions?: Partial<Record<LibrarySectionType, () => void>>;
+ getTrashMessage?: (
+ section: LibrarySection,
+ count: number,
+ ) => string | undefined;
+ onBulkActionComplete?: (
+ section: LibrarySection,
+ affectedCollectionIds: CollectionId[],
+ ) => void;
+};
+
+export function LibraryTreePage({
+ title,
+ tree,
+ isLoading,
+ isSearchActive,
+ searchQuery,
+ emptyMessage: defaultEmptyMessage,
+ defaultExpandedIds,
+ defaultMoveCollectionIds,
+ createMenu,
+ emptyState,
+ children,
+ renderRowMenu,
+ isChildrenLoading,
+ onRowsChange,
+ onSearchQueryChange,
+ emptyStateActions,
+ getTrashMessage,
+ onBulkActionComplete,
+}: LibraryTreePageProps) {
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
+ const { treeTableInstance, allRows, emptyMessage } =
+ useLibraryTreeTableInstance({
+ tree,
+ isLoading,
+ isSearchActive,
+ searchQuery,
+ emptyMessage: defaultEmptyMessage,
+ defaultExpandedIds,
+ renderRowMenu,
+ emptyStateActions,
+ });
+
+ const {
+ selectedItems,
+ selectionSection,
+ isAllTables,
+ getSelectionState,
+ getRowCovered,
+ onCheckboxClick,
+ clear: clearSelection,
+ } = useLibraryBulkSelection(allRows);
+
+ const trimmedSearch = searchQuery.trim();
+ useEffect(() => {
+ clearSelection();
+ }, [trimmedSearch, clearSelection]);
+
+ useEffect(() => {
+ onRowsChange?.(treeTableInstance.rows);
+ }, [treeTableInstance.rows, onRowsChange]);
+
+ const handleBulkActionComplete = useCallback(
+ (section: LibrarySection, affectedCollectionIds: CollectionId[]) => {
+ onBulkActionComplete?.(section, affectedCollectionIds);
+ clearSelection();
+ },
+ [onBulkActionComplete, clearSelection],
+ );
+
+ return (
+ <>
+ <SectionLayout>
+ <PaneHeader
+ breadcrumbs={<DataStudioBreadcrumbs>{title}</DataStudioBreadcrumbs>}
+ px="3.5rem"
+ py={0}
+ />
+ <Stack
+ bg="background_page-secondary"
+ data-testid="library-page"
+ pb="2rem"
+ px="3.5rem"
+ style={{ overflow: "hidden" }}
+ >
+ {emptyState ?? (
+ <>
+ <Flex gap="lg">
+ <TextInput
+ placeholder={t`Search...`}
+ leftSection={<Icon name="search" />}
+ bdrs="sm"
+ flex="1"
+ value={searchQuery}
+ onChange={(e) => onSearchQueryChange(e.target.value)}
+ />
+ {!isRemoteSyncReadOnly && createMenu}
+ </Flex>
+ <Card withBorder p={0}>
+ {isLoading ? (
+ <TreeTableSkeleton columnWidths={[0.6, 0.2, 0.05]} />
+ ) : (
+ <TreeTable
+ instance={treeTableInstance}
+ showCheckboxes={!isRemoteSyncReadOnly}
+ getSelectionState={getSelectionState}
+ isRowDisabled={getRowCovered}
+ onCheckboxClick={onCheckboxClick}
+ emptyState={<ListEmptyState label={emptyMessage} />}
+ onRowClick={(row) => {
+ if (row.original.model === "empty-state") {
+ return;
+ }
+ if (row.getCanExpand()) {
+ row.toggleExpanded();
+ }
+ // Leaf navigation is handled by the name link in the cell
+ }}
+ isChildrenLoading={isChildrenLoading}
+ />
+ )}
+ </Card>
+ </>
+ )}
+ </Stack>
+ </SectionLayout>
+ {children}
+ {!isRemoteSyncReadOnly && (
+ <LibraryBulkActions
+ selectedItems={selectedItems}
+ selectionSection={selectionSection}
+ isAllTables={isAllTables}
+ defaultCollectionId={
+ selectionSection != null
+ ? defaultMoveCollectionIds?.[selectionSection]
+ : undefined
+ }
+ onActionComplete={handleBulkActionComplete}
+ getTrashMessage={getTrashMessage}
+ onClear={clearSelection}
+ />
+ )}
+ </>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/common/components/LibraryTreePage/hooks.tsx b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/hooks.tsx
new file mode 100644
index 00000000000..b7a6877f475
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/hooks.tsx
@@ -0,0 +1,237 @@
+import type { ExpandedState, Row } from "@tanstack/react-table";
+import {
+ type ReactNode,
+ useCallback,
+ useEffect,
+ useMemo,
+ useState,
+} from "react";
+import { t } from "ttag";
+
+import { DateTime } from "metabase/common/components/DateTime";
+import { Link } from "metabase/common/components/Link";
+import type {
+ LibrarySectionType,
+ TreeItem,
+} from "metabase/data-studio/common/types";
+import {
+ getTreeRowHref,
+ isEmptyStateData,
+} from "metabase/data-studio/common/utils";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import { useSelector } from "metabase/redux";
+import { useSearchParams } from "metabase/router";
+import {
+ EntityNameCell,
+ Flex,
+ Group,
+ Icon,
+ Text,
+ type TreeTableColumnDef,
+ useTreeTableInstance,
+} from "metabase/ui";
+
+import { EmptyStateAction } from "./EmptyStateAction";
+
+type Params = {
+ tree: TreeItem[];
+ isLoading: boolean;
+ isSearchActive: boolean;
+ searchQuery: string;
+ emptyMessage: string;
+ defaultExpandedIds: string[];
+ renderRowMenu: (item: TreeItem) => ReactNode;
+ emptyStateActions?: Partial<Record<LibrarySectionType, () => void>>;
+};
+
+export function useLibraryTreeTableInstance({
+ tree,
+ isLoading,
+ isSearchActive,
+ searchQuery,
+ emptyMessage,
+ defaultExpandedIds,
+ renderRowMenu,
+ emptyStateActions,
+}: Params) {
+ const [searchParams] = useSearchParams();
+ const isRemoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
+
+ const columns = useMemo<TreeTableColumnDef<TreeItem>[]>(
+ () => [
+ {
+ id: "name",
+ header: t`Name`,
+ enableSorting: true,
+ accessorKey: "name",
+ minWidth: 200,
+ cell: ({ row }) => {
+ const { data } = row.original;
+
+ if (isEmptyStateData(data)) {
+ return (
+ <Flex align="center" gap="0.25rem" data-testid="empty-state-row">
+ <Text c="text-disabled" fz="inherit">
+ {data.description}
+ </Text>
+ {!isRemoteSyncReadOnly && (
+ <EmptyStateAction
+ data={data}
+ onClick={emptyStateActions?.[data.sectionType]}
+ />
+ )}
+ </Flex>
+ );
+ }
+
+ const nameCell = (
+ <EntityNameCell
+ data-testid={`${row.original.model}-name`}
+ icon={row.original.icon}
+ name={
+ row.original.parentCollectionName ? (
+ <Group gap="sm" miw={0} align="center">
+ <Text truncate>{row.original.name}</Text>
+ <Group gap="xxs">
+ <Icon name="collection" size={12} c="text-disabled" />
+ <Text fz="xs" c="text-disabled" truncate>
+ {row.original.parentCollectionName}
+ </Text>
+ </Group>
+ </Group>
+ ) : (
+ row.original.name
+ )
+ }
+ />
+ );
+
+ const href = getTreeRowHref(row);
+ if (href === null) {
+ return nameCell;
+ }
+ return (
+ <Link
+ to={href}
+ style={{
+ display: "flex",
+ flex: 1,
+ minWidth: 0,
+ textDecoration: "none",
+ color: "inherit",
+ }}
+ >
+ {nameCell}
+ </Link>
+ );
+ },
+ },
+ {
+ id: "updatedAt",
+ header: t`Updated At`,
+ accessorKey: "updatedAt",
+ enableSorting: true,
+ sortingFn: "datetime",
+ width: "auto",
+ widthPadding: 20,
+ cell: ({ row }) => {
+ const { model, updatedAt } = row.original;
+ if (model === "empty-state" || !updatedAt) {
+ return null;
+ }
+ return <DateTime value={updatedAt} />;
+ },
+ },
+ {
+ id: "actions",
+ width: 48,
+ cell: ({ row }) => renderRowMenu(row.original),
+ },
+ ],
+ [isRemoteSyncReadOnly, emptyStateActions, renderRowMenu],
+ );
+
+ // Section roots and any IDs from the URL start expanded
+ const defaultExpanded = useMemo<ExpandedState>(
+ () =>
+ Object.fromEntries([
+ ...defaultExpandedIds.map((id) => [id, true]),
+ ...searchParams
+ .getAll("expandedId")
+ .map((id) => [`collection:${id}`, true]),
+ ]),
+ [defaultExpandedIds, searchParams],
+ );
+
+ const [browseExpanded, setBrowseExpanded] = useState<ExpandedState | null>(
+ null,
+ );
+
+ // Lock browseExpanded once loading settles, so later refetches keep the user's expansion
+ useEffect(() => {
+ if (
+ browseExpanded === null &&
+ !isLoading &&
+ Object.keys(defaultExpanded).length > 0
+ ) {
+ setBrowseExpanded(defaultExpanded);
+ }
+ }, [browseExpanded, defaultExpanded, isLoading]);
+
+ // Controlled expansion: expand all during search, preserve user state when browsing
+ const expanded = isSearchActive ? true : (browseExpanded ?? defaultExpanded);
+ const onExpandedChange = useCallback(
+ (updater: ExpandedState | ((old: ExpandedState) => ExpandedState)) => {
+ if (!isSearchActive) {
+ setBrowseExpanded((prev) => {
+ const current = prev ?? defaultExpanded;
+ return typeof updater === "function" ? updater(current) : updater;
+ });
+ }
+ },
+ [isSearchActive, defaultExpanded],
+ );
+
+ const treeTableInstance = useTreeTableInstance({
+ data: tree,
+ columns,
+ getSubRows: (node) => node.children,
+ getNodeId: (node) => node.id,
+ getRowCanExpand,
+ expanded,
+ onExpandedChange,
+ isFilterable: (node) =>
+ node.model !== "collection" && node.model !== "empty-state",
+ });
+
+ const allRows = treeTableInstance.table.getCoreRowModel().flatRows;
+
+ return {
+ treeTableInstance,
+ allRows,
+ emptyMessage: searchQuery
+ ? t`No results for "${searchQuery}"`
+ : emptyMessage,
+ };
+}
+
+function getRowCanExpand(row: Row<TreeItem>) {
+ const { model, data, children } = row.original;
+ if (model !== "collection") {
+ return false;
+ }
+ if (row.original.childrenLoaded) {
+ return children != null && children.length > 0;
+ }
+ // Already has children populated
+ if (children && children.length > 0) {
+ return true;
+ }
+ // Not loaded yet — check here/below from the API to know if expandable
+ if (data.model === "collection") {
+ return (data.here?.length ?? 0) > 0 || (data.below?.length ?? 0) > 0;
+ }
+ return false;
+}
diff --git a/frontend/src/metabase/data-studio/common/components/LibraryTreePage/index.ts b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/index.ts
new file mode 100644
index 00000000000..44d0d2a390f
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/LibraryTreePage/index.ts
@@ -0,0 +1 @@
+export { LibraryTreePage } from "./LibraryTreePage";
diff --git a/frontend/src/metabase/data-studio/common/components/MoreMenu/index.ts b/frontend/src/metabase/data-studio/common/components/MoreMenu/index.ts
new file mode 100644
index 00000000000..a7a7f3981fe
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/MoreMenu/index.ts
@@ -0,0 +1 @@
+export { MoreMenu } from "./MoreMenu";
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/PublishedTableBreadcrumbs/PublishedTableBreadcrumbs.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
rename to frontend/src/metabase/data-studio/common/components/PublishedTableBreadcrumbs/PublishedTableBreadcrumbs.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/PublishedTableBreadcrumbs/index.ts b/frontend/src/metabase/data-studio/common/components/PublishedTableBreadcrumbs/index.ts
new file mode 100644
index 00000000000..00e796ab230
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/components/PublishedTableBreadcrumbs/index.ts
@@ -0,0 +1 @@
+export { PublishedTableBreadcrumbs } from "./PublishedTableBreadcrumbs";
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.module.css b/frontend/src/metabase/data-studio/common/components/RevisionHistory/ClausePill.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.module.css
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/ClausePill.module.css
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.tsx b/frontend/src/metabase/data-studio/common/components/RevisionHistory/ClausePill.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/ClausePill.tsx
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/ClausePill.tsx
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx b/frontend/src/metabase/data-studio/common/components/RevisionHistory/QueryClauseDisplay.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/QueryClauseDisplay.tsx
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionDiff.tsx b/frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionDiff.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/RevisionDiff.tsx
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionDiff.tsx
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistory.module.css b/frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionHistory.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistory.module.css
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionHistory.module.css
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx b/frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionHistoryTimeline.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionHistoryTimeline.tsx
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx b/frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionItem.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/RevisionItem.tsx
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/index.ts b/frontend/src/metabase/data-studio/common/components/RevisionHistory/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/index.ts
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/index.ts
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/types.ts b/frontend/src/metabase/data-studio/common/components/RevisionHistory/types.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/components/RevisionHistory/types.ts
rename to frontend/src/metabase/data-studio/common/components/RevisionHistory/types.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-error-handling/index.ts b/frontend/src/metabase/data-studio/common/hooks/use-error-handling/index.ts
new file mode 100644
index 00000000000..d205a1e1b83
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/hooks/use-error-handling/index.ts
@@ -0,0 +1 @@
+export { useErrorHandling } from "./use-error-handling";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useErrorHandling.ts b/frontend/src/metabase/data-studio/common/hooks/use-error-handling/use-error-handling.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useErrorHandling.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-error-handling/use-error-handling.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/index.ts b/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/index.ts
new file mode 100644
index 00000000000..0232c0cc78b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/index.ts
@@ -0,0 +1,3 @@
+export { useLibraryBulkSelection } from "./use-library-bulk-selection";
+export type { LibrarySection, SelectedItem } from "./utils";
+export { getItemSection } from "./utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryBulkSelection.ts b/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/use-library-bulk-selection.ts
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryBulkSelection.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/use-library-bulk-selection.ts
index e6d1c7bf5df..87b2b5b84ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryBulkSelection.ts
+++ b/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/use-library-bulk-selection.ts
@@ -18,7 +18,7 @@ import {
isSelectableItem,
toggleItem,
toggleSectionRoot,
-} from "./library-bulk-selection.utils";
+} from "./utils";
export type UseLibraryBulkSelectionResult = {
selectedItems: SelectedItem[];
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-bulk-selection.utils.ts b/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-bulk-selection.utils.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-bulk-selection.utils.unit.spec.ts b/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/utils.unit.spec.ts
similarity index 99%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-bulk-selection.utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/utils.unit.spec.ts
index 1d3104ff017..e9c7247341d 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/library-bulk-selection.utils.unit.spec.ts
+++ b/frontend/src/metabase/data-studio/common/hooks/use-library-bulk-selection/utils.unit.spec.ts
@@ -23,7 +23,7 @@ import {
isSelectableItem,
toggleItem,
toggleSectionRoot,
-} from "./library-bulk-selection.utils";
+} from "./utils";
const SECTION_TYPE: Record<LibrarySection, CollectionType | null> = {
data: "library-data",
diff --git a/frontend/src/metabase/data-studio/common/types.ts b/frontend/src/metabase/data-studio/common/types.ts
index 7e3c8d0c371..3e52bcc9418 100644
--- a/frontend/src/metabase/data-studio/common/types.ts
+++ b/frontend/src/metabase/data-studio/common/types.ts
@@ -33,6 +33,8 @@ export type CollectionItemData = Pick<CollectionItem, "model" | "name"> &
| "last-edit-info"
| "namespace"
| "can_write"
+ | "here"
+ | "below"
>
>;
diff --git a/frontend/src/metabase/data-studio/common/utils/filter-tree-by-name.ts b/frontend/src/metabase/data-studio/common/utils/filter-tree-by-name.ts
new file mode 100644
index 00000000000..bfec3dcbcec
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/utils/filter-tree-by-name.ts
@@ -0,0 +1,20 @@
+import type { TreeItem } from "../types";
+
+export function filterTreeByName(nodes: TreeItem[], query: string): TreeItem[] {
+ const lowerQuery = query.trim().toLowerCase();
+
+ return nodes.flatMap((node) => {
+ if (node.model !== "collection" && node.model !== "empty-state") {
+ return node.name.toLowerCase().includes(lowerQuery) ? [node] : [];
+ }
+
+ if (node.children) {
+ const filteredChildren = filterTreeByName(node.children, query);
+ if (filteredChildren.length > 0) {
+ return [{ ...node, children: filteredChildren }];
+ }
+ }
+
+ return [];
+ });
+}
diff --git a/frontend/src/metabase/data-studio/common/utils/filter-tree-by-name.unit.spec.ts b/frontend/src/metabase/data-studio/common/utils/filter-tree-by-name.unit.spec.ts
new file mode 100644
index 00000000000..f79aff17cd8
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/utils/filter-tree-by-name.unit.spec.ts
@@ -0,0 +1,44 @@
+import type { TreeItem } from "../types";
+
+import { filterTreeByName } from "./filter-tree-by-name";
+
+const snippet = (id: number, name: string): TreeItem => ({
+ id: `snippet:${id}`,
+ name,
+ icon: "snippet",
+ model: "snippet",
+ data: { id, name, model: "snippet" },
+});
+
+const folder = (id: number, name: string, children: TreeItem[]): TreeItem => ({
+ id: `collection:${id}`,
+ name,
+ icon: "folder",
+ model: "collection",
+ data: { id, name, model: "collection" },
+ children,
+});
+
+describe("filterTreeByName", () => {
+ it("keeps matching leaves and the folders leading to them", () => {
+ const tree = [
+ folder(1, "Root", [
+ snippet(1, "Orders filter"),
+ folder(2, "Nested", [snippet(2, "Revenue"), snippet(3, "Orders sum")]),
+ ]),
+ ];
+
+ expect(filterTreeByName(tree, " orders ")).toEqual([
+ folder(1, "Root", [
+ snippet(1, "Orders filter"),
+ folder(2, "Nested", [snippet(3, "Orders sum")]),
+ ]),
+ ]);
+ });
+
+ it("drops folders whose names match but contain no matching leaves", () => {
+ const tree = [folder(1, "Orders", [snippet(1, "Revenue")])];
+
+ expect(filterTreeByName(tree, "orders")).toEqual([]);
+ });
+});
diff --git a/frontend/src/metabase/data-studio/common/utils/get-tree-row-href.ts b/frontend/src/metabase/data-studio/common/utils/get-tree-row-href.ts
new file mode 100644
index 00000000000..0d65d8f55d7
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/utils/get-tree-row-href.ts
@@ -0,0 +1,29 @@
+import * as Urls from "metabase/urls";
+
+import type { TreeItem } from "../types";
+
+export const getTreeRowHref = (row: { original: TreeItem }): string | null => {
+ const { data, name } = row.original;
+
+ if (data.model === "empty-state" || data.model === "collection") {
+ return null;
+ }
+ if (data.id == null) {
+ return null;
+ }
+
+ switch (data.model) {
+ case "table":
+ return Urls.dataStudioTable(data.id);
+ case "metric":
+ return Urls.dataStudioMetric(data.id);
+ case "snippet":
+ return Urls.dataStudioSnippet(data.id);
+ case "action":
+ return Urls.dataStudioAction(data.id);
+ case "dashboard":
+ return Urls.dashboard({ id: data.id, name });
+ default:
+ return null;
+ }
+};
diff --git a/frontend/src/metabase/data-studio/common/utils/get-tree-row-href.unit.spec.ts b/frontend/src/metabase/data-studio/common/utils/get-tree-row-href.unit.spec.ts
new file mode 100644
index 00000000000..c1ee1ce0d9d
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/utils/get-tree-row-href.unit.spec.ts
@@ -0,0 +1,51 @@
+import type { CollectionItemModel } from "metabase-types/api";
+import {
+ createMockCollection,
+ createMockCollectionItem,
+} from "metabase-types/api/mocks";
+
+import type { TreeItem } from "../types";
+
+import { createEmptyStateItem } from "./create-empty-space-item";
+import { getTreeRowHref } from "./get-tree-row-href";
+
+const createLeafItem = (model: CollectionItemModel, id: number): TreeItem => ({
+ id: `${model}:${id}`,
+ name: "Sales",
+ icon: "folder",
+ model,
+ data: createMockCollectionItem({ id, model, name: "Sales" }),
+});
+
+describe("getTreeRowHref", () => {
+ it.each<[CollectionItemModel, string]>([
+ ["table", "/data-studio/library/tables/7"],
+ ["metric", "/data-studio/library/metrics/7"],
+ ["snippet", "/data-studio/snippets/7"],
+ ["action", "/data-studio/actions/7"],
+ ["dashboard", "/dashboard/7-sales"],
+ ])("links a %s row to %s", (model, expectedHref) => {
+ expect(getTreeRowHref({ original: createLeafItem(model, 7) })).toBe(
+ expectedHref,
+ );
+ });
+
+ it("does not link collection rows", () => {
+ const collection = createMockCollection({ id: 3 });
+ const treeItem: TreeItem = {
+ id: "collection:3",
+ name: collection.name,
+ icon: "folder",
+ model: "collection",
+ data: { ...collection, model: "collection" },
+ };
+
+ expect(getTreeRowHref({ original: treeItem })).toBeNull();
+ });
+
+ it("does not link empty state rows", () => {
+ expect(
+ getTreeRowHref({ original: createEmptyStateItem("snippets") }),
+ ).toBeNull();
+ });
+});
diff --git a/frontend/src/metabase/data-studio/common/utils/index.ts b/frontend/src/metabase/data-studio/common/utils/index.ts
index 62972102bfb..91ea6741524 100644
--- a/frontend/src/metabase/data-studio/common/utils/index.ts
+++ b/frontend/src/metabase/data-studio/common/utils/index.ts
@@ -8,8 +8,10 @@ import type {
} from "../types";
export { createEmptyStateItem } from "./create-empty-space-item";
+export { filterTreeByName } from "./filter-tree-by-name";
export { getDatasetQueryPreviewUrl } from "./get-dataset-query-preview-url";
export { getLibraryCollectionDisplayName } from "./get-library-collection-display-name";
+export { getTreeRowHref } from "./get-tree-row-href";
export { getResultMetadata } from "metabase/common/data-studio/utils/get-result-metadata";
// TODO Alex P 12/05/2025 Fix the endpoint to return sensible data
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
deleted file mode 100644
index 81cbb57cf20..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import type { MouseEvent } from "react";
-import { useLatest } from "react-use";
-import { t } from "ttag";
-
-import { useUpdateTableListMutation } from "metabase/api";
-import { useMetadataToasts } from "metabase/common/hooks";
-import { ActionIcon, Icon, Loader, Tooltip } from "metabase/ui";
-import type { Table } from "metabase-types/api";
-
-interface Props {
- className?: string;
- tables: Table[];
- onUpdate: () => void;
-}
-
-export function BulkTableVisibilityToggle({
- className,
- tables,
- onUpdate,
-}: Props) {
- const [updateTables, { isLoading }] = useUpdateTableListMutation();
- const { sendErrorToast, sendSuccessToast, sendUndoToast } =
- useMetadataToasts();
- const areAllHidden = tables.every((table) => table.visibility_type != null);
- const onUpdateRef = useLatest(onUpdate);
-
- const hide = async () => {
- const ids = tables
- .filter((table) => table.visibility_type == null)
- .map((table) => table.id);
- const { error } = await updateTables({
- ids,
- visibility_type: "hidden",
- });
-
- onUpdateRef.current();
-
- if (error) {
- sendErrorToast(t`Failed to hide tables`);
- } else {
- sendSuccessToast(t`Tables hidden`, async () => {
- const { error } = await updateTables({
- ids,
- visibility_type: null,
- });
-
- onUpdateRef.current();
- sendUndoToast(error);
- });
- }
- };
-
- const unhide = async () => {
- const ids = tables.map((table) => table.id);
- const { error } = await updateTables({
- ids,
- visibility_type: null,
- });
-
- onUpdateRef.current();
-
- if (error) {
- sendErrorToast(t`Failed to unhide`);
- } else {
- sendSuccessToast(t`Tables unhidden`, async () => {
- const { error } = await updateTables({
- ids,
- visibility_type: "hidden",
- });
-
- onUpdateRef.current();
- sendUndoToast(error);
- });
- }
- };
-
- const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
- event.stopPropagation();
- event.preventDefault();
-
- if (areAllHidden) {
- unhide();
- } else {
- hide();
- }
- };
-
- if (isLoading) {
- return (
- <ActionIcon disabled variant="transparent">
- <Loader size="xs" />
- </ActionIcon>
- );
- }
-
- return (
- <Tooltip label={areAllHidden ? t`Unhide all tables` : t`Hide all tables`}>
- <ActionIcon
- aria-label={areAllHidden ? t`Unhide all tables` : t`Hide all tables`}
- className={className}
- disabled={isLoading}
- variant="transparent"
- onClick={handleClick}
- >
- <Icon name={areAllHidden ? "eye_crossed_out" : "eye"} />
- </ActionIcon>
- </Tooltip>
- );
-}
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
deleted file mode 100644
index 834171c0425..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import type { MouseEvent } from "react";
-import { useLatest } from "react-use";
-import { t } from "ttag";
-
-import { useUpdateTableMutation } from "metabase/api";
-import { useMetadataToasts } from "metabase/common/hooks";
-import { ActionIcon, Icon, Loader, Tooltip } from "metabase/ui";
-import type { Table } from "metabase-types/api";
-
-interface Props {
- className?: string;
- table: Table;
- onUpdate: () => void;
-}
-
-export function TableVisibilityToggle({ className, table, onUpdate }: Props) {
- const [updateTable, { isLoading }] = useUpdateTableMutation();
- const { sendErrorToast, sendSuccessToast, sendUndoToast } =
- useMetadataToasts();
- const isHidden = table.visibility_type != null;
- const onUpdateRef = useLatest(onUpdate);
-
- const hide = async () => {
- const { error } = await updateTable({
- id: table.id,
- visibility_type: "hidden",
- });
-
- onUpdateRef.current();
-
- if (error) {
- sendErrorToast(t`Failed to hide ${table.display_name}`);
- } else {
- sendSuccessToast(t`Hid ${table.display_name}`, async () => {
- const { error } = await updateTable({
- id: table.id,
- visibility_type: null,
- });
-
- onUpdateRef.current();
- sendUndoToast(error);
- });
- }
- };
-
- const unhide = async () => {
- const { error } = await updateTable({
- id: table.id,
- visibility_type: null,
- });
-
- onUpdateRef.current();
-
- if (error) {
- sendErrorToast(t`Failed to unhide ${table.display_name}`);
- } else {
- sendSuccessToast(t`Unhid ${table.display_name}`, async () => {
- const { error } = await updateTable({
- id: table.id,
- visibility_type: "hidden",
- });
-
- onUpdateRef.current();
- sendUndoToast(error);
- });
- }
- };
-
- const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
- event.stopPropagation();
- event.preventDefault();
-
- if (isHidden) {
- unhide();
- } else {
- hide();
- }
- };
-
- if (isLoading) {
- return (
- <ActionIcon disabled variant="transparent">
- <Loader size="xs" />
- </ActionIcon>
- );
- }
-
- return (
- <Tooltip label={isHidden ? t`Unhide table` : t`Hide table`}>
- <ActionIcon
- aria-label={isHidden ? t`Unhide table` : t`Hide table`}
- c={table.visibility_type != null ? "text-secondary" : undefined}
- className={className}
- disabled={isLoading}
- variant="transparent"
- onClick={handleClick}
- >
- <Icon name={isHidden ? "eye_crossed_out" : "eye"} />
- </ActionIcon>
- </Tooltip>
- );
-}
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
deleted file mode 100644
index ce406718307..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.unit.spec.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import fetchMock from "fetch-mock";
-
-import { setupTableEndpoints } from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { UndoListing } from "metabase/common/components/UndoListing";
-import type { Table } from "metabase-types/api";
-import { createMockTable } from "metabase-types/api/mocks";
-
-import { TableVisibilityToggle } from "./TableVisibilityToggle";
-
-function setup({ table }: { table: Table }) {
- setupTableEndpoints(table);
-
- renderWithProviders(
- <>
- <TableVisibilityToggle table={table} onUpdate={jest.fn()} />
- <UndoListing />
- </>,
- );
-}
-
-describe("TableVisibilityToggle", () => {
- describe("visible table", () => {
- const VISIBLE_TABLE = createMockTable({
- visibility_type: null,
- });
-
- it("should have a tooltip that says 'Hide table' when a visible table is hovered", async () => {
- setup({
- table: VISIBLE_TABLE,
- });
-
- const toggle = screen.getByLabelText("eye icon");
- expect(toggle).toBeInTheDocument();
-
- await userEvent.hover(toggle);
- expect(await screen.findByText("Hide table")).toBeInTheDocument();
- });
-
- it("should hide the table when a visible table is clicked", async () => {
- setup({
- table: VISIBLE_TABLE,
- });
-
- const toggle = screen.getByLabelText("eye icon");
- expect(toggle).toBeInTheDocument();
- await userEvent.click(toggle);
-
- expect(
- fetchMock.callHistory.calls(`path:/api/table/${VISIBLE_TABLE.id}`, {
- method: "PUT",
- }),
- ).toHaveLength(1);
-
- const call = fetchMock.callHistory.calls(
- `path:/api/table/${VISIBLE_TABLE.id}`,
- {
- method: "PUT",
- },
- )[0];
- // Unjustified type cast. FIXME
- const body = await (call.options?.body as unknown as Promise<string>);
-
- expect(JSON.parse(body)).toEqual({ visibility_type: "hidden" });
-
- await waitFor(() => {
- const undo = screen.getByTestId("undo-list");
- expect(within(undo).getByText("Hid Table")).toBeInTheDocument();
- });
- });
-
- it("should show an error when hiding fails", async () => {
- setup({
- table: VISIBLE_TABLE,
- });
-
- fetchMock.modifyRoute(`table-${VISIBLE_TABLE.id}-put`, {
- response: { status: 500 },
- });
-
- const toggle = screen.getByLabelText("eye icon");
- expect(toggle).toBeInTheDocument();
- await userEvent.click(toggle);
-
- expect(
- fetchMock.callHistory.calls(`path:/api/table/${VISIBLE_TABLE.id}`, {
- method: "PUT",
- }),
- ).toHaveLength(1);
-
- await waitFor(() => {
- const undo = screen.getByTestId("undo-list");
- expect(
- within(undo).getByText("Failed to hide Table"),
- ).toBeInTheDocument();
- });
- });
- });
-
- describe("hidden table", () => {
- const HIDDEN_TABLE = createMockTable({
- visibility_type: "hidden",
- });
-
- it("should have a tooltip that says 'Unhide table' when a visible table is hovered", async () => {
- setup({
- table: HIDDEN_TABLE,
- });
-
- const toggle = screen.getByLabelText("eye_crossed_out icon");
- expect(toggle).toBeInTheDocument();
-
- await userEvent.hover(toggle);
- expect(await screen.findByText("Unhide table")).toBeInTheDocument();
- });
-
- it("should unhide the table when a visible table is clicked", async () => {
- setup({
- table: HIDDEN_TABLE,
- });
-
- const toggle = screen.getByLabelText("eye_crossed_out icon");
- expect(toggle).toBeInTheDocument();
- await userEvent.click(toggle);
-
- expect(
- fetchMock.callHistory.calls(`path:/api/table/${HIDDEN_TABLE.id}`, {
- method: "PUT",
- }),
- ).toHaveLength(1);
-
- const call = fetchMock.callHistory.calls(
- `path:/api/table/${HIDDEN_TABLE.id}`,
- {
- method: "PUT",
- },
- )[0];
- // Unjustified type cast. FIXME
- const body = await (call.options?.body as unknown as Promise<string>);
-
- expect(JSON.parse(body)).toEqual({ visibility_type: null });
-
- await waitFor(() => {
- const undo = screen.getByTestId("undo-list");
- expect(within(undo).getByText("Unhid Table")).toBeInTheDocument();
- });
- });
-
- it("should show an error when unhiding fails", async () => {
- setup({
- table: HIDDEN_TABLE,
- });
-
- fetchMock.removeRoute(`table-${HIDDEN_TABLE.id}-put`);
- fetchMock.put(
- `path:/api/table/${HIDDEN_TABLE.id}`,
- { status: 500 },
- { name: `table-${HIDDEN_TABLE.id}-put` },
- );
-
- const toggle = screen.getByLabelText("eye_crossed_out icon");
- expect(toggle).toBeInTheDocument();
- await userEvent.click(toggle);
-
- expect(
- fetchMock.callHistory.calls(`path:/api/table/${HIDDEN_TABLE.id}`, {
- method: "PUT",
- }),
- ).toHaveLength(1);
-
- await waitFor(() => {
- const undo = screen.getByTestId("undo-list");
- expect(
- within(undo).getByText("Failed to unhide Table"),
- ).toBeInTheDocument();
- });
- });
- });
-});
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/index.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/index.ts
deleted file mode 100644
index 0be6cdf2bd9..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./TablePicker";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/index.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/index.ts
deleted file mode 100644
index 198d9c570ff..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./useExpandedState";
-export * from "./useSearch";
-export * from "./useTableLoader";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts
deleted file mode 100644
index 052177f759a..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useExpandedState.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-
-import type { TreePath } from "../types";
-import { expandPath, toKey } from "../utils";
-
-/**
- * Returns a state object that indicates which nodes are expanded in the tree.
- * State directly stores expanded status: true = expanded, false = collapsed.
- * Keys not in state fall back to defaultExpanded.
- */
-export function useExpandedState(
- path: TreePath,
- options: { defaultExpanded?: boolean } = {},
-) {
- const defaultExpanded = options.defaultExpanded ?? false;
- const [state, setState] = useState<Record<string, boolean>>(() =>
- expandPath({}, path),
- );
-
- const { databaseId, schemaName, tableId } = path;
-
- useEffect(() => {
- setState((state) => expandPath(state, { databaseId, schemaName, tableId }));
- }, [databaseId, schemaName, tableId]);
-
- const isExpanded = useCallback(
- (path: string | TreePath) => {
- const key = typeof path === "string" ? path : toKey(path);
- return state[key] ?? defaultExpanded;
- },
- [state, defaultExpanded],
- );
-
- const toggle = useCallback(
- (key: string, value?: boolean) => {
- setState((current) => ({
- ...current,
- [key]: value ?? !(current[key] ?? defaultExpanded),
- }));
- },
- [defaultExpanded],
- );
-
- return {
- isExpanded,
- toggle,
- };
-}
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
deleted file mode 100644
index 5bd477dde81..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useMemo } from "react";
-
-import { skipToken, useSearchQuery } from "metabase/api";
-import { isSyncCompleted } from "metabase/utils/syncing";
-
-import type { DatabaseNode, SchemaNode, TableNode, TreeNode } from "../types";
-import { node, rootNode } from "../utils";
-
-/**
- * Fetch items from the search API and renders them as a TreeNode so we can use the same
- * data structure for the tree and the search results and render them in a consistent way.
- */
-export function useSearch(query: string) {
- const { data, isLoading } = useSearchQuery(
- query === ""
- ? skipToken
- : {
- q: query,
- models: ["table"],
- context: "data-picker",
- },
- );
-
- const tree = useMemo(() => {
- const tree: TreeNode = rootNode();
-
- data?.data.forEach((result) => {
- const { model, database_name, database_id, table_schema, id, name } =
- result;
- const tableSchema = table_schema ?? "";
-
- if (model !== "table" || database_name === null) {
- return;
- }
-
- let databaseNode = tree.children.find(
- (node) =>
- node.type === "database" && node.value.databaseId === database_id,
- );
- if (!databaseNode) {
- databaseNode = node<DatabaseNode>({
- type: "database",
- label: database_name,
- value: {
- databaseId: database_id,
- },
- });
- tree.children.push(databaseNode);
- }
-
- let schemaNode = databaseNode.children.find((node) => {
- return node.type === "schema" && node.value.schemaName === tableSchema;
- });
- if (!schemaNode) {
- schemaNode = node<SchemaNode>({
- type: "schema",
- label: tableSchema,
- value: {
- databaseId: database_id,
- schemaName: tableSchema,
- },
- });
- databaseNode.children.push(schemaNode);
- }
-
- let tableNode = schemaNode.children.find(
- (node) => node.type === "table" && node.value.tableId === id,
- );
- if (!tableNode) {
- tableNode = node<TableNode>({
- type: "table",
- label: name,
- value: {
- databaseId: database_id,
- schemaName: tableSchema,
- tableId: id,
- },
- disabled: !isSyncCompleted(result),
- });
- schemaNode.children.push(tableNode);
- }
- });
- return tree;
- }, [data]);
-
- return {
- isLoading,
- tree,
- };
-}
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/index.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/index.ts
deleted file mode 100644
index c383cef74b7..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { TablePicker } from "./components";
-export * from "./wrappers";
diff --git a/frontend/src/metabase/data-studio/data-model/components/index.ts b/frontend/src/metabase/data-studio/data-model/components/index.ts
deleted file mode 100644
index b6dcb1dd72a..00000000000
--- a/frontend/src/metabase/data-studio/data-model/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./SyncOptionsModal";
-export * from "./TablePicker";
-export * from "./TableSection";
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
index ebf09c56666..7671f8eb3f8 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -39,11 +39,12 @@ import {
import * as Urls from "metabase/urls";
import { trackMetadataChange } from "../../analytics";
-import { RouterTablePicker, TableSection } from "../../components";
-import type { TreePath } from "../../components/TablePicker/types";
-import { TableAttributesEditBulk } from "../../components/TableSection/components/TableAttributesEditBulk";
import S from "./DataModel.module.css";
+import { RouterTablePicker } from "./TablePicker";
+import type { TreePath } from "./TablePicker/types";
+import { TableSection } from "./TableSection";
+import { TableAttributesEditBulk } from "./TableSection/TableAttributesEditBulk";
import { COLUMN_CONFIG } from "./constants";
import { SelectionProvider, useSelection } from "./contexts/SelectionContext";
import type { RouteParams } from "./types";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/FilterPopover/FilterPopover.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/FilterPopover/FilterPopover.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/FilterPopover/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/FilterPopover/index.ts
new file mode 100644
index 00000000000..1b4283a1b74
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/FilterPopover/index.ts
@@ -0,0 +1 @@
+export { FilterPopover } from "./FilterPopover";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/SearchNew/SearchNew.tsx
similarity index 96%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/SearchNew/SearchNew.tsx
index a2c3ae51305..b95c6d19464 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/SearchNew/SearchNew.tsx
@@ -9,8 +9,9 @@ import { parseRouteParams } from "metabase/metadata/pages/shared/utils";
import { Box, Flex, Loader, Text } from "metabase/ui";
import type { Table } from "metabase-types/api";
-import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
-import type { RouteParams } from "../../../pages/DataModel/types";
+import { useSelection } from "../../contexts/SelectionContext";
+import type { RouteParams } from "../../types";
+import { TablePickerTreeTable } from "../TablePickerTreeTable";
import { useExpandedState } from "../hooks";
import type {
DatabaseNode,
@@ -22,8 +23,6 @@ import type {
} from "../types";
import { rootNode, toKey } from "../utils";
-import { TablePickerTreeTable } from "./TablePickerTreeTable";
-
interface SearchNewProps {
query: string;
params: RouteParams;
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/SearchNew/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/SearchNew/index.ts
new file mode 100644
index 00000000000..1fd418d6582
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/SearchNew/index.ts
@@ -0,0 +1 @@
+export { SearchNew } from "./SearchNew";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.module.css
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.tsx
similarity index 94%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.tsx
index 8d7cc0e6311..b6ef23a14e1 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.tsx
@@ -20,15 +20,15 @@ import {
} from "metabase/ui";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
-import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
-import type { RouteParams } from "../../../pages/DataModel/types";
-import type { ChangeOptions, FilterState, TreePath } from "../types";
-import { getFiltersCount } from "../utils";
+import { useSelection } from "../contexts/SelectionContext";
+import type { RouteParams } from "../types";
import { FilterPopover } from "./FilterPopover";
import { SearchNew } from "./SearchNew";
import S from "./TablePicker.module.css";
import { Tree } from "./Tree";
+import type { ChangeOptions, FilterState, TreePath } from "./types";
+import { getFiltersCount } from "./utils";
interface TablePickerProps {
params: RouteParams;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.unit.spec.tsx
similarity index 99%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.unit.spec.tsx
index 52e889c31c7..0fbe0a12680 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePicker.unit.spec.tsx
@@ -31,8 +31,8 @@ import {
createMockUser,
} from "metabase-types/api/mocks";
-import type { TreePath } from "../types";
-import { UncontrolledTablePicker } from "../wrappers";
+import type { TreePath } from "./types";
+import { UncontrolledTablePicker } from "./wrappers";
// The search tests otherwise wait out a real 500ms debounce each, which is pure
// idling. The getter lets the one test that asserts keystrokes collapse into a
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/TablePickerTreeTable.tsx
similarity index 99%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/TablePickerTreeTable.tsx
index e0d65d48be8..d15b10a0848 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/TablePickerTreeTable.tsx
@@ -27,7 +27,7 @@ import {
} from "metabase/ui";
import type { UserId } from "metabase-types/api";
-import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
+import { useSelection } from "../../contexts/SelectionContext";
import {
type NodeSelection,
addDatabaseToSelection,
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/TablePickerTreeTable.unit.spec.tsx
similarity index 99%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/TablePickerTreeTable.unit.spec.tsx
index eea55cc5905..2f2bf2a5e71 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePickerTreeTable.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/TablePickerTreeTable.unit.spec.tsx
@@ -11,7 +11,7 @@ import type {
TreeNode,
} from "../types";
-import { changeCheckboxSelection } from "./TablePickerTreeTable";
+import { changeCheckboxSelection } from ".";
describe("handleCheckboxToggle", () => {
interface CheckboxRowParams {
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/index.ts
new file mode 100644
index 00000000000..5c6696f4aa9
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/TablePickerTreeTable/index.ts
@@ -0,0 +1,5 @@
+export {
+ TablePickerTreeTable,
+ changeCheckboxSelection,
+} from "./TablePickerTreeTable";
+export type { CheckboxToggleResult } from "./TablePickerTreeTable";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/EmptyState/EmptyState.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/EmptyState/EmptyState.module.css
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/EmptyState/EmptyState.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/EmptyState.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/EmptyState/EmptyState.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/EmptyState/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/EmptyState/index.ts
new file mode 100644
index 00000000000..aac2d4d6760
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/EmptyState/index.ts
@@ -0,0 +1 @@
+export { EmptyState } from "./EmptyState";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/Tree.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/Tree.tsx
similarity index 97%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/components/Tree.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/Tree.tsx
index caddb3066a9..f057fb4c104 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/Tree.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/Tree.tsx
@@ -3,7 +3,8 @@ import { t } from "ttag";
import { TreeTableSkeleton } from "metabase/ui";
-import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
+import { useSelection } from "../../contexts/SelectionContext";
+import { TablePickerTreeTable } from "../TablePickerTreeTable";
import {
getSchemaId,
noManuallySelectedDatabaseChildrenTables,
@@ -19,7 +20,6 @@ import {
} from "../utils";
import { EmptyState } from "./EmptyState";
-import { TablePickerTreeTable } from "./TablePickerTreeTable";
interface Props {
path: TreePath;
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/index.ts
new file mode 100644
index 00000000000..c8fa54d9974
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/Tree/index.ts
@@ -0,0 +1 @@
+export { Tree } from "./Tree";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/bulk-selection.utils.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/bulk-selection.utils.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/bulk-selection.utils.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/bulk-selection.utils.unit.spec.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/bulk-selection.utils.unit.spec.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/constants.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/constants.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/constants.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/hooks.ts
similarity index 63%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/hooks.ts
index c087f9f5f58..267eb5d53a1 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/hooks.ts
@@ -1,11 +1,13 @@
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useLatest } from "react-use";
import _ from "underscore";
import {
+ skipToken,
useLazyListDatabaseSchemaTablesQuery,
useLazyListDatabaseSchemasQuery,
useLazyListDatabasesQuery,
+ useSearchQuery,
} from "metabase/api";
import { isSyncCompleted } from "metabase/utils/syncing";
import { UNNAMED_SCHEMA_NAME } from "metabase-lib/v1/metadata/utils/schema";
@@ -16,9 +18,137 @@ import type {
RootNode,
SchemaNode,
TableNode,
+ TreeNode,
TreePath,
-} from "../types";
-import { merge, node, rootNode, toKey } from "../utils";
+} from "./types";
+import { expandPath, merge, node, rootNode, toKey } from "./utils";
+
+/**
+ * Returns a state object that indicates which nodes are expanded in the tree.
+ * State directly stores expanded status: true = expanded, false = collapsed.
+ * Keys not in state fall back to defaultExpanded.
+ */
+export function useExpandedState(
+ path: TreePath,
+ options: { defaultExpanded?: boolean } = {},
+) {
+ const defaultExpanded = options.defaultExpanded ?? false;
+ const [state, setState] = useState<Record<string, boolean>>(() =>
+ expandPath({}, path),
+ );
+
+ const { databaseId, schemaName, tableId } = path;
+
+ useEffect(() => {
+ setState((state) => expandPath(state, { databaseId, schemaName, tableId }));
+ }, [databaseId, schemaName, tableId]);
+
+ const isExpanded = useCallback(
+ (path: string | TreePath) => {
+ const key = typeof path === "string" ? path : toKey(path);
+ return state[key] ?? defaultExpanded;
+ },
+ [state, defaultExpanded],
+ );
+
+ const toggle = useCallback(
+ (key: string, value?: boolean) => {
+ setState((current) => ({
+ ...current,
+ [key]: value ?? !(current[key] ?? defaultExpanded),
+ }));
+ },
+ [defaultExpanded],
+ );
+
+ return {
+ isExpanded,
+ toggle,
+ };
+}
+
+/**
+ * Fetch items from the search API and renders them as a TreeNode so we can use the same
+ * data structure for the tree and the search results and render them in a consistent way.
+ */
+export function useSearch(query: string) {
+ const { data, isLoading } = useSearchQuery(
+ query === ""
+ ? skipToken
+ : {
+ q: query,
+ models: ["table"],
+ context: "data-picker",
+ },
+ );
+
+ const tree = useMemo(() => {
+ const tree: TreeNode = rootNode();
+
+ data?.data.forEach((result) => {
+ const { model, database_name, database_id, table_schema, id, name } =
+ result;
+ const tableSchema = table_schema ?? "";
+
+ if (model !== "table" || database_name === null) {
+ return;
+ }
+
+ let databaseNode = tree.children.find(
+ (node) =>
+ node.type === "database" && node.value.databaseId === database_id,
+ );
+ if (!databaseNode) {
+ databaseNode = node<DatabaseNode>({
+ type: "database",
+ label: database_name,
+ value: {
+ databaseId: database_id,
+ },
+ });
+ tree.children.push(databaseNode);
+ }
+
+ let schemaNode = databaseNode.children.find((node) => {
+ return node.type === "schema" && node.value.schemaName === tableSchema;
+ });
+ if (!schemaNode) {
+ schemaNode = node<SchemaNode>({
+ type: "schema",
+ label: tableSchema,
+ value: {
+ databaseId: database_id,
+ schemaName: tableSchema,
+ },
+ });
+ databaseNode.children.push(schemaNode);
+ }
+
+ let tableNode = schemaNode.children.find(
+ (node) => node.type === "table" && node.value.tableId === id,
+ );
+ if (!tableNode) {
+ tableNode = node<TableNode>({
+ type: "table",
+ label: name,
+ value: {
+ databaseId: database_id,
+ schemaName: tableSchema,
+ tableId: id,
+ },
+ disabled: !isSyncCompleted(result),
+ });
+ schemaNode.children.push(tableNode);
+ }
+ });
+ return tree;
+ }, [data]);
+
+ return {
+ isLoading,
+ tree,
+ };
+}
/**
* Provides a function that fetches for a specific path the database, schema and table (or any subset that applies to the path).
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/index.ts
new file mode 100644
index 00000000000..3cf389da8d2
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/index.ts
@@ -0,0 +1,2 @@
+export { TablePicker } from "./TablePicker";
+export * from "./wrappers";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/types.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/types.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/types.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/types.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/utils.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/utils.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/utils.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/wrappers.tsx
similarity index 96%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/wrappers.tsx
index 04aae6a966a..a36495d424a 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/wrappers.tsx
@@ -3,9 +3,9 @@ import { useCallback, useEffect, useState } from "react";
import { getIsNavigationPending, useNavigate } from "metabase/router";
import * as Urls from "metabase/urls";
-import type { RouteParams } from "../../pages/DataModel/types";
+import type { RouteParams } from "../types";
-import { TablePicker } from "./components";
+import { TablePicker } from "./TablePicker";
import type { ChangeOptions, TreePath } from "./types";
type Props = TreePath & {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/wrappers.unit.spec.tsx
similarity index 98%
rename from frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/wrappers.unit.spec.tsx
index 2ea4ae294f3..d435bb589c4 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TablePicker/wrappers.unit.spec.tsx
@@ -16,7 +16,7 @@ jest.mock("metabase/router", () => ({
const PICKED: TreePath = { databaseId: 1, schemaName: "PUBLIC" };
-jest.mock("./components", () => ({
+jest.mock("./TablePicker", () => ({
TablePicker: ({
onChange,
}: {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/MeasureItem.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/MeasureItem.module.css
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/MeasureItem.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/MeasureItem.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/MeasureItem.unit.spec.tsx
similarity index 97%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/MeasureItem.unit.spec.tsx
index 8887b61139b..0f1c49ce67d 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/MeasureItem.unit.spec.tsx
@@ -2,7 +2,7 @@ import { renderWithProviders, screen } from "__support__/ui";
import { Route } from "metabase/router";
import { createMockMeasure } from "metabase-types/api/mocks";
-import { MeasureItem } from "./MeasureItem";
+import { MeasureItem } from ".";
describe("MeasureItem", () => {
it("should render measure with name, description, link, and list role", () => {
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/index.ts
new file mode 100644
index 00000000000..7e51a349f07
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureItem/index.ts
@@ -0,0 +1 @@
+export { MeasureItem } from "./MeasureItem";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureList.tsx
similarity index 96%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureList.tsx
index a98b58192b0..2030b8e0f95 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/MeasureList.tsx
@@ -9,8 +9,9 @@ import { Button, Group, Icon, Stack } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { ConcreteTableId, Table } from "metabase-types/api";
-import S from "../../TableSection.module.css";
-import { MeasureItem } from "../MeasureItem";
+import S from "../TableSection.module.css";
+
+import { MeasureItem } from "./MeasureItem";
type MeasureListProps = {
table: Table;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/tests/enterprise.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/enterprise.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/tests/enterprise.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/tests/setup.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/MeasureList/tests/setup.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/SegmentItem.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/SegmentItem.module.css
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/SegmentItem.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/SegmentItem.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/SegmentItem.unit.spec.tsx
similarity index 97%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/SegmentItem.unit.spec.tsx
index 2e671a0afc7..947ad6abd82 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/SegmentItem.unit.spec.tsx
@@ -3,7 +3,7 @@ import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { createMockSegment } from "metabase-types/api/mocks";
-import { SegmentItem } from "./SegmentItem";
+import { SegmentItem } from ".";
describe("SegmentItem", () => {
it("should render segment with name, description, link, and list role", () => {
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/index.ts
new file mode 100644
index 00000000000..85341894503
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentItem/index.ts
@@ -0,0 +1 @@
+export { SegmentItem } from "./SegmentItem";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentList.tsx
similarity index 96%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentList.tsx
index e524851243b..fa3bce32141 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/SegmentList.tsx
@@ -9,8 +9,9 @@ import { Button, Group, Icon, Stack } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { Table } from "metabase-types/api";
-import S from "../../TableSection.module.css";
-import { SegmentItem } from "../SegmentItem";
+import S from "../TableSection.module.css";
+
+import { SegmentItem } from "./SegmentItem";
type SegmentListProps = {
table: Table;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/tests/enterprise.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/enterprise.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/tests/enterprise.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/tests/setup.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/SegmentList/tests/setup.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableActionsMenu/TableActionsMenu.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableActionsMenu/TableActionsMenu.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableActionsMenu/TableActionsMenu.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableActionsMenu/TableActionsMenu.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableActionsMenu/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableActionsMenu/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributes.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributes.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributes.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributes.module.css
diff --git a/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/DiscardTableFieldValuesButton/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/DiscardTableFieldValuesButton/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/RescanTableFieldsButton/RescanTableFieldsButton.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/RescanTableFieldsButton/RescanTableFieldsButton.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/RescanTableFieldsButton/RescanTableFieldsButton.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/RescanTableFieldsButton/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/RescanTableFieldsButton/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/SyncOptionsModal.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncOptionsModal.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/SyncOptionsModal.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncOptionsModal.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncTableSchemaButton/SyncTableSchemaButton.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncTableSchemaButton/SyncTableSchemaButton.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncTableSchemaButton/SyncTableSchemaButton.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncTableSchemaButton/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/SyncTableSchemaButton/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/index.ts
new file mode 100644
index 00000000000..a60fa24c5a1
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/SyncOptionsModal/index.ts
@@ -0,0 +1 @@
+export { SyncOptionsModal } from "./SyncOptionsModal";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/TableAttributesEditBulk.tsx
similarity index 97%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/TableAttributesEditBulk.tsx
index 23b3b4898c9..81e0d9d781f 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/TableAttributesEditBulk.tsx
@@ -23,11 +23,11 @@ import type {
UserId,
} from "metabase-types/api";
-import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
-import { SyncOptionsModal } from "../../SyncOptionsModal";
+import { useSelection } from "../../contexts/SelectionContext";
+import S from "../TableAttributes.module.css";
+import { TableSectionGroup } from "../TableSectionGroup";
-import S from "./TableAttributes.module.css";
-import { TableSectionGroup } from "./TableSectionGroup";
+import { SyncOptionsModal } from "./SyncOptionsModal";
type TableAttributesEditBulkProps = {
canPublish: boolean;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/TableAttributesEditBulk.unit.spec.tsx
similarity index 98%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/TableAttributesEditBulk.unit.spec.tsx
index e506e032374..a0072056a73 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/TableAttributesEditBulk.unit.spec.tsx
@@ -16,7 +16,7 @@ import {
import type { TableId } from "metabase-types/api";
import { createMockTable, createMockUser } from "metabase-types/api/mocks";
-import { TableAttributesEditBulk } from "./TableAttributesEditBulk";
+import { TableAttributesEditBulk } from ".";
// Component that allows controlling selection for testing
function SelectionController({
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/index.ts
new file mode 100644
index 00000000000..45fbcd1b88d
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditBulk/index.ts
@@ -0,0 +1 @@
+export { TableAttributesEditBulk } from "./TableAttributesEditBulk";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/TableAttributesEditSingle.tsx
similarity index 98%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/TableAttributesEditSingle.tsx
index b2061551026..9fa7aef84c6 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/TableAttributesEditSingle.tsx
@@ -19,8 +19,8 @@ import type {
UserId,
} from "metabase-types/api";
-import S from "./TableAttributes.module.css";
-import { TableSectionGroup } from "./TableSectionGroup";
+import S from "../TableAttributes.module.css";
+import { TableSectionGroup } from "../TableSectionGroup";
interface Props {
table: Table;
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/index.ts
new file mode 100644
index 00000000000..26de52c47eb
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/index.ts
@@ -0,0 +1 @@
+export { TableAttributesEditSingle } from "./TableAttributesEditSingle";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.module.css
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.tsx
similarity index 96%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.tsx
index 88ee76aaf79..f93980ba450 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.tsx
@@ -7,8 +7,9 @@ import { Box } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { Table } from "metabase-types/api";
+import { TableSectionGroup } from "../TableSectionGroup";
+
import S from "./TableCollection.module.css";
-import { TableSectionGroup } from "./TableSectionGroup";
type TableCollectionProps = {
table: Table;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.unit.spec.tsx
similarity index 97%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.unit.spec.tsx
index e33a98e7081..2a7fe7afdd6 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/TableCollection.unit.spec.tsx
@@ -7,7 +7,7 @@ import {
createMockTable,
} from "metabase-types/api/mocks";
-import { TableCollection } from "./TableCollection";
+import { TableCollection } from ".";
const ROOT_ANCESTOR = createMockCollection({
id: "root",
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/index.ts
new file mode 100644
index 00000000000..a0ad9a06c2f
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableCollection/index.ts
@@ -0,0 +1 @@
+export { TableCollection } from "./TableCollection";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/TableMetadata.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/TableMetadata.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/TableMetadata.unit.spec.tsx
similarity index 95%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/TableMetadata.unit.spec.tsx
index 232e214f253..3061765a0e7 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/TableMetadata.unit.spec.tsx
@@ -3,7 +3,7 @@ import { renderWithProviders, screen } from "__support__/ui";
import type { DateFormattingSettings } from "metabase-types/api";
import { createMockTable } from "metabase-types/api/mocks";
-import { TableMetadata } from "./TableMetadata";
+import { TableMetadata } from ".";
describe("TableMetadata", () => {
function setup(temporalFormatting: DateFormattingSettings) {
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/index.ts
new file mode 100644
index 00000000000..37eca35eacc
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableMetadata/index.ts
@@ -0,0 +1 @@
+export { TableMetadata } from "./TableMetadata";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.module.css b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSection.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.module.css
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSection.module.css
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSection.tsx
similarity index 95%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSection.tsx
index 81ea2607ba8..fa8b5e920d2 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSection.tsx
@@ -38,14 +38,14 @@ import {
isConcreteTableId,
} from "metabase-types/api";
+import { MeasureList } from "./MeasureList";
+import { SegmentList } from "./SegmentList";
+import { TableActionsMenu } from "./TableActionsMenu";
+import { TableAttributesEditSingle } from "./TableAttributesEditSingle";
+import { TableCollection } from "./TableCollection";
+import { TableMetadata } from "./TableMetadata";
import S from "./TableSection.module.css";
-import { MeasureList } from "./components/MeasureList";
-import { SegmentList } from "./components/SegmentList";
-import { TableActionsMenu } from "./components/TableActionsMenu";
-import { TableAttributesEditSingle } from "./components/TableAttributesEditSingle";
-import { TableCollection } from "./components/TableCollection";
-import { TableMetadata } from "./components/TableMetadata";
-import { TableSectionGroup } from "./components/TableSectionGroup";
+import { TableSectionGroup } from "./TableSectionGroup";
interface Props {
table: Table;
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableSectionGroup.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSectionGroup/TableSectionGroup.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableSectionGroup.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSectionGroup/TableSectionGroup.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSectionGroup/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSectionGroup/index.ts
new file mode 100644
index 00000000000..394e2ba20de
--- /dev/null
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableSectionGroup/index.ts
@@ -0,0 +1 @@
+export { TableSectionGroup } from "./TableSectionGroup";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/hooks.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/hooks.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/hooks.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/hooks.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/index.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/index.ts
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/index.ts
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/common.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/common.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/tests/common.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/common.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/enterprise.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/tests/enterprise.unit.spec.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/enterprise.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/setup.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
rename to frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/setup.tsx
diff --git a/frontend/src/metabase/data-studio/guide/pages/GuidePage/index.ts b/frontend/src/metabase/data-studio/guide/pages/GuidePage/index.ts
new file mode 100644
index 00000000000..a9a3b5a3515
--- /dev/null
+++ b/frontend/src/metabase/data-studio/guide/pages/GuidePage/index.ts
@@ -0,0 +1 @@
+export { GuidePage } from "./GuidePage";
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
index fcaf5764263..aac5d0d22d9 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
@@ -1,9 +1,7 @@
import { t } from "ttag";
-import {
- DataModelBreadcrumbs,
- PublishedTableBreadcrumbs,
-} from "metabase/data-studio/common/components/Breadcrumbs";
+import { DataModelBreadcrumbs } from "metabase/data-studio/common/components/DataModelBreadcrumbs";
+import { PublishedTableBreadcrumbs } from "metabase/data-studio/common/components/PublishedTableBreadcrumbs";
import * as Urls from "metabase/urls";
import type { Measure, Table } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page/index.ts b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page/index.ts
new file mode 100644
index 00000000000..576d77e387a
--- /dev/null
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page/index.ts
@@ -0,0 +1 @@
+export { useDataModelMeasurePage } from "./use-data-model-measure-page";
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page/use-data-model-measure-page.ts
similarity index 98%
rename from frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
rename to frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page/use-data-model-measure-page.ts
index f83de07c2a6..c8b10a8b9e4 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page/use-data-model-measure-page.ts
@@ -12,7 +12,7 @@ import { useNavigate } from "metabase/router";
import * as Urls from "metabase/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
-import type { MeasureTabUrls } from "../types";
+import type { MeasureTabUrls } from "../../types";
type DataModelMeasurePageParams = {
databaseId: string;
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-measure-query/index.ts b/frontend/src/metabase/data-studio/measures/hooks/use-measure-query/index.ts
new file mode 100644
index 00000000000..cebf5f80b70
--- /dev/null
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-measure-query/index.ts
@@ -0,0 +1 @@
+export { useMeasureQuery } from "./use-measure-query";
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts b/frontend/src/metabase/data-studio/measures/hooks/use-measure-query/use-measure-query.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts
rename to frontend/src/metabase/data-studio/measures/hooks/use-measure-query/use-measure-query.ts
diff --git a/frontend/src/metabase/data-studio/measures/hooks/index.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/index.ts
similarity index 53%
rename from frontend/src/metabase/data-studio/measures/hooks/index.ts
rename to frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/index.ts
index 3aa65373fe8..d2c64a827c6 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/index.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/index.ts
@@ -1,2 +1 @@
-export { useDataModelMeasurePage } from "./use-data-model-measure-page";
export { usePublishedTableMeasurePage } from "./use-published-table-measure-page";
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/use-published-table-measure-page.ts
similarity index 97%
rename from frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
rename to frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/use-published-table-measure-page.ts
index 1be0bc36b38..0757f369f61 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/use-published-table-measure-page.ts
@@ -11,7 +11,7 @@ import { useToast } from "metabase/common/hooks/use-toast";
import { useNavigate } from "metabase/router";
import * as Urls from "metabase/urls";
-import type { MeasureTabUrls } from "../types";
+import type { MeasureTabUrls } from "../../types";
type PublishedTableMeasurePageParams = {
tableId: string;
diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx
index 3f7028d3181..332a4f6899e 100644
--- a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx
@@ -3,7 +3,7 @@ import { Outlet, useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
-import { useDataModelMeasurePage } from "../../hooks";
+import { useDataModelMeasurePage } from "../../hooks/use-data-model-measure-page";
import { MeasureDependenciesPage } from "../MeasureDependenciesPage";
type DataModelMeasureDependenciesPageParams = {
diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx
index f9e48ee6cf4..3a920d31187 100644
--- a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
-import { useDataModelMeasurePage } from "../../hooks";
+import { useDataModelMeasurePage } from "../../hooks/use-data-model-measure-page";
import { MeasureDetailPage } from "../MeasureDetailPage";
type DataModelMeasureDetailPageParams = {
diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx
index 5b632779972..314ab000faf 100644
--- a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
-import { useDataModelMeasurePage } from "../../hooks";
+import { useDataModelMeasurePage } from "../../hooks/use-data-model-measure-page";
import { MeasureRevisionHistoryPage } from "../MeasureRevisionHistoryPage";
type DataModelMeasureRevisionHistoryPageParams = {
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistory/MeasureRevisionHistory.tsx
similarity index 92%
rename from frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx
rename to frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistory/MeasureRevisionHistory.tsx
index f0ccdc8f00b..c00227fe297 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistory/MeasureRevisionHistory.tsx
@@ -2,7 +2,7 @@ import { t } from "ttag";
import type { Measure, Revision } from "metabase-types/api";
-import { RevisionHistoryTimeline } from "../../../components/RevisionHistory";
+import { RevisionHistoryTimeline } from "../../../../common/components/RevisionHistory";
type MeasureRevisionHistoryProps = {
measure: Measure;
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
rename to frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/index.ts b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistory/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistory/index.ts
diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
index 0bfa8fa3428..a69904e157b 100644
--- a/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
@@ -6,9 +6,9 @@ import { Stack } from "metabase/ui";
import type { Measure } from "metabase-types/api";
import { MeasureHeader } from "../../components/MeasureHeader";
-import { MeasureRevisionHistory } from "../../components/MeasureRevisionHistory";
import type { MeasureTabUrls } from "../../types";
+import { MeasureRevisionHistory } from "./MeasureRevisionHistory";
import S from "./MeasureRevisionHistoryPage.module.css";
type MeasureRevisionHistoryPageProps = {
diff --git a/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasureHeader/NewMeasureHeader.tsx
similarity index 93%
rename from frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
rename to frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasureHeader/NewMeasureHeader.tsx
index bf073ad797d..fc29eda68a1 100644
--- a/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasureHeader/NewMeasureHeader.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import { EditableText } from "metabase/common/components/EditableText";
import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
-import { MeasureMoreMenu } from "../MeasureMoreMenu";
+import { MeasureMoreMenu } from "../../../components/MeasureMoreMenu";
const MEASURE_NAME_MAX_LENGTH = 254;
diff --git a/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/index.ts b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasureHeader/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/index.ts
rename to frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasureHeader/index.ts
diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
index a69ad3c2aab..d1e1d46d3a0 100644
--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
@@ -18,10 +18,11 @@ import * as Lib from "metabase-lib";
import type { DatasetQuery, Measure, Table } from "metabase-types/api";
import { MeasureEditor } from "../../components/MeasureEditor";
-import { NewMeasureHeader } from "../../components/NewMeasureHeader";
import { useMeasureQuery } from "../../hooks/use-measure-query";
import { createInitialQueryForTable } from "../../utils/measure-query";
+import { NewMeasureHeader } from "./NewMeasureHeader";
+
// Hoisted: the metadata selector memoises on the options object, so a fresh
// literal each render would defeat it.
const WITH_HIDDEN_TABLES: MetadataSelectorOpts = { includeHiddenTables: true };
diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx
index ea9d4ce0f52..7ab02177d87 100644
--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx
@@ -3,7 +3,7 @@ import { Outlet, useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
-import { usePublishedTableMeasurePage } from "../../hooks";
+import { usePublishedTableMeasurePage } from "../../hooks/use-published-table-measure-page";
import { MeasureDependenciesPage } from "../MeasureDependenciesPage";
type PublishedTableMeasureDependenciesPageParams = {
diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx
index 8d713060d63..596a868893f 100644
--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
-import { usePublishedTableMeasurePage } from "../../hooks";
+import { usePublishedTableMeasurePage } from "../../hooks/use-published-table-measure-page";
import { MeasureDetailPage } from "../MeasureDetailPage";
type PublishedTableMeasureDetailPageParams = {
diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx
index 940ca3d699e..33821840b7f 100644
--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
-import { usePublishedTableMeasurePage } from "../../hooks";
+import { usePublishedTableMeasurePage } from "../../hooks/use-published-table-measure-page";
import { MeasureRevisionHistoryPage } from "../MeasureRevisionHistoryPage";
type PublishedTableMeasureRevisionHistoryPageParams = {
diff --git a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
deleted file mode 100644
index 839327543ec..00000000000
--- a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useCallback } from "react";
-import { t } from "ttag";
-
-import { ToolbarButton } from "metabase/common/components/ToolbarButton";
-import { useDispatch } from "metabase/redux";
-import { openUrl } from "metabase/redux/app";
-import * as Urls from "metabase/urls";
-import type Question from "metabase-lib/v1/Question";
-
-type DataStudioToolbarButtonProps = {
- question: Question;
-};
-export const DataStudioToolbarButton = ({
- question,
-}: DataStudioToolbarButtonProps) => {
- const dispatch = useDispatch();
- const isMetric = question.type() === "metric";
-
- const handleClick = useCallback(() => {
- dispatch(openUrl(Urls.dataStudioMetric(question.id())));
- }, [question, dispatch]);
-
- if (!isMetric) {
- return null;
- }
-
- return (
- <ToolbarButton
- onClick={handleClick}
- icon="data_studio"
- aria-label={t`Open in Data Studio`}
- tooltipLabel={t`Open in Data Studio`}
- />
- );
-};
diff --git a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx
deleted file mode 100644
index c008ea011d6..00000000000
--- a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.unit.spec.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { renderWithProviders, screen } from "__support__/ui";
-import Question from "metabase-lib/v1/Question";
-import type { CardType } from "metabase-types/api";
-import { createMockCard, createMockUser } from "metabase-types/api/mocks";
-
-import { DataStudioToolbarButton } from "./DataStudioToolbarButton";
-
-const setup = ({
- type = "metric",
- is_superuser = false,
- is_data_analyst = true,
-}: {
- type?: CardType;
- is_data_analyst?: boolean;
- is_superuser?: boolean;
-} = {}) => {
- const question = new Question(
- createMockCard({
- type,
- }),
- );
-
- renderWithProviders(<DataStudioToolbarButton question={question} />, {
- storeInitialState: {
- currentUser: createMockUser({
- is_data_analyst,
- is_superuser,
- }),
- },
- });
-};
-
-describe("DataStudioToolbarButton", () => {
- it("should render a button if the card is a metric and the user has data studio access", async () => {
- setup();
-
- expect(
- await screen.findByRole("button", { name: "Open in Data Studio" }),
- ).toBeInTheDocument();
- });
-
- it("should render a button if the card is a metric and the user is an admin", async () => {
- setup({ is_superuser: true, is_data_analyst: false });
-
- expect(
- await screen.findByRole("button", { name: "Open in Data Studio" }),
- ).toBeInTheDocument();
- });
-
- it("should not render a button if the card is a model", async () => {
- setup({ type: "model" });
-
- expect(
- screen.queryByRole("button", { name: "Open in Data Studio" }),
- ).not.toBeInTheDocument();
- });
-
- it("should not render a button if the card is a question", async () => {
- setup({ type: "question" });
-
- expect(
- screen.queryByRole("button", { name: "Open in Data Studio" }),
- ).not.toBeInTheDocument();
- });
-});
diff --git a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/index.ts b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/index.ts
deleted file mode 100644
index b2c58cf746b..00000000000
--- a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DataStudioToolbarButton";
diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsx
index 10941584f30..81cddbdef8d 100644
--- a/frontend/src/metabase/data-studio/routes.tsx
+++ b/frontend/src/metabase/data-studio/routes.tsx
@@ -19,11 +19,13 @@ import { getDataStudioTransformRoutes } from "metabase/transforms/routes";
import { canAccessTransforms } from "metabase/transforms/selectors";
import * as Urls from "metabase/urls";
+import { getDataStudioActionRoutes } from "./actions/routes";
import { getDataStudioMetadataRoutes } from "./data-model/routes";
import { getDataStudioGlossaryRoutes } from "./glossary/routes";
import { GuidePage } from "./guide/pages/GuidePage/GuidePage";
import { CanAccessDataModel, CanAccessDataStudio } from "./route-guards";
import { getDataStudioSettingsRoutes } from "./settings/routes";
+import { getDataStudioSnippetRoutes } from "./snippets/routes";
/**
* The Data Studio layouts and upsell pages, in their own chunk. The route guards
@@ -63,25 +65,25 @@ const gitSyncSectionLayout = () =>
).then(({ GitSyncSectionLayout }) => ({ Component: GitSyncSectionLayout }));
const dependenciesUpsellPage = () =>
- import(/* webpackChunkName: "data-studio-upsells" */ "./upsells/pages").then(
- ({ DependenciesUpsellPage }) => ({
- Component: DependenciesUpsellPage,
- }),
- );
+ import(
+ /* webpackChunkName: "data-studio-upsells" */ "./upsells/pages/DependenciesUpsellPage"
+ ).then(({ DependenciesUpsellPage }) => ({
+ Component: DependenciesUpsellPage,
+ }));
const libraryUpsellPage = () =>
- import(/* webpackChunkName: "data-studio-upsells" */ "./upsells/pages").then(
- ({ LibraryUpsellPage }) => ({
- Component: LibraryUpsellPage,
- }),
- );
+ import(
+ /* webpackChunkName: "data-studio-upsells" */ "./upsells/pages/LibraryUpsellPage"
+ ).then(({ LibraryUpsellPage }) => ({
+ Component: LibraryUpsellPage,
+ }));
const schemaViewerUpsellPage = () =>
- import(/* webpackChunkName: "data-studio-upsells" */ "./upsells/pages").then(
- ({ SchemaViewerUpsellPage }) => ({
- Component: SchemaViewerUpsellPage,
- }),
- );
+ import(
+ /* webpackChunkName: "data-studio-upsells" */ "./upsells/pages/SchemaViewerUpsellPage"
+ ).then(({ SchemaViewerUpsellPage }) => ({
+ Component: SchemaViewerUpsellPage,
+ }));
export function getDataStudioRoutes(IsAdmin: RouteComponent) {
return (
@@ -94,6 +96,7 @@ export function getDataStudioRoutes(IsAdmin: RouteComponent) {
*/}
{getDataStudioDependencyDiagnosticsRedirects()}
+ {getDataStudioLibraryRedirects()}
<Route element={<CanAccessDataStudio />}>
<Route path="data-studio" lazy={dataStudioLayout}>
<Route index element={<DataStudioIndexRedirect />} />
@@ -107,6 +110,8 @@ export function getDataStudioRoutes(IsAdmin: RouteComponent) {
{getDataStudioTransformRoutes()}
</Route>
{getDataStudioGlossaryRoutes()}
+ {getDataStudioSnippetRoutes()}
+ {getDataStudioActionRoutes()}
{getDataStudioSettingsRoutes()}
{PLUGIN_LIBRARY.isEnabled ? (
PLUGIN_LIBRARY.getDataStudioLibraryRoutes(IsAdmin)
@@ -153,6 +158,24 @@ export function getDataStudioDependencyDiagnosticsRedirects() {
);
}
+/**
+ * Snippets and data actions moved out of the library into their own sections.
+ */
+export function getDataStudioLibraryRedirects() {
+ return (
+ <>
+ <Route
+ path="data-studio/library/snippets/*"
+ element={redirect(`${Urls.dataStudioSnippets()}/*`)}
+ />
+ <Route
+ path="data-studio/library/actions/*"
+ element={redirect(`${Urls.dataStudioActions()}/*`)}
+ />
+ </>
+ );
+}
+
export function DataStudioIndexRedirect() {
const indexPath = useSelector(getIndexPath);
const isNavigating = useIsNavigating();
diff --git a/frontend/src/metabase/data-studio/routes.unit.spec.tsx b/frontend/src/metabase/data-studio/routes.unit.spec.tsx
index c1b4f192938..36a651b2271 100644
--- a/frontend/src/metabase/data-studio/routes.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/routes.unit.spec.tsx
@@ -9,16 +9,20 @@ import { Route } from "metabase/router";
import { defer } from "metabase/utils/promise";
import { createMockUser } from "metabase-types/api/mocks";
-import { DataStudioIndexRedirect, getDataStudioRoutes } from "./routes";
+import {
+ DataStudioIndexRedirect,
+ getDataStudioLibraryRedirects,
+ getDataStudioRoutes,
+} from "./routes";
const Guard = () => null;
describe("data-studio routes", () => {
it("resolves every page", async () => {
const loaders = lazyLoaders(getDataStudioRoutes(Guard));
- // Includes the transform, data model, glossary and settings routes, which
- // this tree nests.
- expect(loaders).toHaveLength(39);
+ // Includes the transform, data model, glossary, settings, snippet and action
+ // routes, which this tree nests.
+ expect(loaders).toHaveLength(52);
for (const load of loaders) {
expect((await load()).Component).toBeDefined();
@@ -130,3 +134,21 @@ describe("Data Studio index redirect", () => {
expect(screen.queryByTestId("guide-page")).not.toBeInTheDocument();
});
});
+
+describe("Data Studio library redirects", () => {
+ it.each([
+ ["/data-studio/library/snippets/5", "/data-studio/snippets/5"],
+ ["/data-studio/library/actions/7/run", "/data-studio/actions/7/run"],
+ ])("redirects %s to %s", async (initialRoute, expectedPathname) => {
+ const { router } = renderWithProviders(
+ <Route path="/">
+ {getDataStudioLibraryRedirects()}
+ <Route path="*" element={<div data-testid="target" />} />
+ </Route>,
+ { withRouter: true, initialRoute },
+ );
+
+ expect(await screen.findByTestId("target")).toBeInTheDocument();
+ expect(router?.location.pathname).toBe(expectedPathname);
+ });
+});
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
index 2e7bfc474ef..20caf24da7c 100644
--- a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
@@ -1,9 +1,7 @@
import { t } from "ttag";
-import {
- DataModelBreadcrumbs,
- PublishedTableBreadcrumbs,
-} from "metabase/data-studio/common/components/Breadcrumbs";
+import { DataModelBreadcrumbs } from "metabase/data-studio/common/components/DataModelBreadcrumbs";
+import { PublishedTableBreadcrumbs } from "metabase/data-studio/common/components/PublishedTableBreadcrumbs";
import * as Urls from "metabase/urls";
import type { Segment, Table } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page/index.ts b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page/index.ts
new file mode 100644
index 00000000000..74335a4f688
--- /dev/null
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page/index.ts
@@ -0,0 +1 @@
+export { useDataModelSegmentPage } from "./use-data-model-segment-page";
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page/use-data-model-segment-page.ts
similarity index 98%
rename from frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
rename to frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page/use-data-model-segment-page.ts
index fa9976722c0..5641992a039 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page/use-data-model-segment-page.ts
@@ -12,7 +12,7 @@ import { useNavigate } from "metabase/router";
import * as Urls from "metabase/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
-import type { SegmentTabUrls } from "../types";
+import type { SegmentTabUrls } from "../../types";
type DataModelSegmentPageParams = {
databaseId: string;
diff --git a/frontend/src/metabase/data-studio/segments/hooks/index.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/index.ts
similarity index 53%
rename from frontend/src/metabase/data-studio/segments/hooks/index.ts
rename to frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/index.ts
index 33d2d77f713..4fca659a4b0 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/index.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/index.ts
@@ -1,2 +1 @@
-export { useDataModelSegmentPage } from "./use-data-model-segment-page";
export { usePublishedTableSegmentPage } from "./use-published-table-segment-page";
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/use-published-table-segment-page.ts
similarity index 97%
rename from frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
rename to frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/use-published-table-segment-page.ts
index 14565cd5909..cc2d39b7742 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/use-published-table-segment-page.ts
@@ -11,7 +11,7 @@ import { useToast } from "metabase/common/hooks/use-toast";
import { useNavigate } from "metabase/router";
import * as Urls from "metabase/urls";
-import type { SegmentTabUrls } from "../types";
+import type { SegmentTabUrls } from "../../types";
type PublishedTableSegmentPageParams = {
tableId: string;
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-segment-query/index.ts b/frontend/src/metabase/data-studio/segments/hooks/use-segment-query/index.ts
new file mode 100644
index 00000000000..32dc54a0ad3
--- /dev/null
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-segment-query/index.ts
@@ -0,0 +1 @@
+export { useSegmentQuery } from "./use-segment-query";
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts b/frontend/src/metabase/data-studio/segments/hooks/use-segment-query/use-segment-query.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts
rename to frontend/src/metabase/data-studio/segments/hooks/use-segment-query/use-segment-query.ts
diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx
index b834adca3ea..0503efa3e40 100644
--- a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx
@@ -3,7 +3,7 @@ import { Outlet, useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
-import { useDataModelSegmentPage } from "../../hooks";
+import { useDataModelSegmentPage } from "../../hooks/use-data-model-segment-page";
import { SegmentDependenciesPage } from "../SegmentDependenciesPage";
type DataModelSegmentDependenciesPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx
index 9dbe0f31c5d..4bfef07dec3 100644
--- a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
-import { useDataModelSegmentPage } from "../../hooks";
+import { useDataModelSegmentPage } from "../../hooks/use-data-model-segment-page";
import { SegmentDetailPage } from "../SegmentDetailPage";
type DataModelSegmentDetailPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx
index 5a8db6a4c0d..324318f9e07 100644
--- a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage/DataModelSegmentRevisionHistoryPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
-import { useDataModelSegmentPage } from "../../hooks";
+import { useDataModelSegmentPage } from "../../hooks/use-data-model-segment-page";
import { SegmentRevisionHistoryPage } from "../SegmentRevisionHistoryPage";
type DataModelSegmentRevisionHistoryPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentHeader/NewSegmentHeader.tsx
similarity index 92%
rename from frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
rename to frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentHeader/NewSegmentHeader.tsx
index 2c751d1d605..ec9a6920ed6 100644
--- a/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentHeader/NewSegmentHeader.tsx
@@ -6,7 +6,7 @@ import {
PaneHeaderInput,
} from "metabase/common/data-studio/components/PaneHeader";
-import { SegmentMoreMenu } from "../SegmentMoreMenu";
+import { SegmentMoreMenu } from "../../../components/SegmentMoreMenu";
const SEGMENT_NAME_MAX_LENGTH = 254;
diff --git a/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/index.ts b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentHeader/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentHeader/index.ts
diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
index 86f5fde6dcc..aa6d92da000 100644
--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
@@ -17,11 +17,12 @@ import { Button } from "metabase/ui";
import * as Lib from "metabase-lib";
import type { DatasetQuery, Segment, Table } from "metabase-types/api";
-import { NewSegmentHeader } from "../../components/NewSegmentHeader";
import { SegmentEditor } from "../../components/SegmentEditor";
import { useSegmentQuery } from "../../hooks/use-segment-query";
import { createInitialQueryForTable } from "../../utils/segment-query";
+import { NewSegmentHeader } from "./NewSegmentHeader";
+
// Hoisted: the metadata selector memoises on the options object, so a fresh
// literal each render would defeat it.
const WITH_HIDDEN_TABLES: MetadataSelectorOpts = { includeHiddenTables: true };
diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx
index 354b5426f39..c226cfb85b6 100644
--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx
@@ -3,7 +3,7 @@ import { Outlet, useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
-import { usePublishedTableSegmentPage } from "../../hooks";
+import { usePublishedTableSegmentPage } from "../../hooks/use-published-table-segment-page";
import { SegmentDependenciesPage } from "../SegmentDependenciesPage";
type PublishedTableSegmentDependenciesPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx
index 66a9280dbb6..01cd136e658 100644
--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
-import { usePublishedTableSegmentPage } from "../../hooks";
+import { usePublishedTableSegmentPage } from "../../hooks/use-published-table-segment-page";
import { SegmentDetailPage } from "../SegmentDetailPage";
type PublishedTableSegmentDetailPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx
index 56668cae5f4..d05803d7ebe 100644
--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage/PublishedTableSegmentRevisionHistoryPage.tsx
@@ -3,7 +3,7 @@ import { useParams } from "metabase/router";
import { Center } from "metabase/ui";
import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
-import { usePublishedTableSegmentPage } from "../../hooks";
+import { usePublishedTableSegmentPage } from "../../hooks/use-published-table-segment-page";
import { SegmentRevisionHistoryPage } from "../SegmentRevisionHistoryPage";
type PublishedTableSegmentRevisionHistoryPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistory/SegmentRevisionHistory.tsx
similarity index 92%
rename from frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx
rename to frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistory/SegmentRevisionHistory.tsx
index f916defe2dd..8d3e0126707 100644
--- a/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistory/SegmentRevisionHistory.tsx
@@ -2,7 +2,7 @@ import { t } from "ttag";
import type { Revision, Segment } from "metabase-types/api";
-import { RevisionHistoryTimeline } from "../../../components/RevisionHistory";
+import { RevisionHistoryTimeline } from "../../../../common/components/RevisionHistory";
type SegmentRevisionHistoryProps = {
segment: Segment;
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
rename to frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/index.ts b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistory/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/index.ts
rename to frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistory/index.ts
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
index f741d4a3622..b590e0cd382 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
@@ -6,9 +6,9 @@ import { Stack } from "metabase/ui";
import type { Segment } from "metabase-types/api";
import { SegmentHeader } from "../../components/SegmentHeader";
-import { SegmentRevisionHistory } from "../../components/SegmentRevisionHistory";
import type { SegmentTabUrls } from "../../types";
+import { SegmentRevisionHistory } from "./SegmentRevisionHistory";
import S from "./SegmentRevisionHistoryPage.module.css";
type SegmentRevisionHistoryPageProps = {
diff --git a/frontend/src/metabase/data-studio/settings/hooks/index.ts b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings/index.ts
similarity index 55%
rename from frontend/src/metabase/data-studio/settings/hooks/index.ts
rename to frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings/index.ts
index 86e38e902a5..9faeffbcc58 100644
--- a/frontend/src/metabase/data-studio/settings/hooks/index.ts
+++ b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings/index.ts
@@ -1,2 +1 @@
export { useDataStudioSettings } from "./use-data-studio-settings";
-export { useLocalSetting } from "./use-local-setting";
diff --git a/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings/use-data-studio-settings.ts
similarity index 94%
rename from frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts
rename to frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings/use-data-studio-settings.ts
index 75ea21d0639..22748e08682 100644
--- a/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts
+++ b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings/use-data-studio-settings.ts
@@ -4,7 +4,7 @@ import { getUserIsAdmin } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { useSetting } from "metabase/settings";
-import type { DataStudioSetting } from "../types";
+import type { DataStudioSetting } from "../../types";
export function useDataStudioSettings(): DataStudioSetting[] {
const isAdmin = useSelector(getUserIsAdmin);
diff --git a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.tsx
index 51ac9ce1834..a9a63dccdc6 100644
--- a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.tsx
+++ b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.tsx
@@ -6,9 +6,11 @@ import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { usePageTitle } from "metabase/hooks/use-page-title";
import { Card, Center, Flex, Stack, Switch, Text, Title } from "metabase/ui";
-import { useDataStudioSettings, useLocalSetting } from "../../hooks";
+import { useDataStudioSettings } from "../../hooks/use-data-studio-settings";
import type { DataStudioSetting } from "../../types";
+import { useLocalSetting } from "./hooks";
+
export function SettingsPage() {
usePageTitle(t`Settings`);
const settings = useDataStudioSettings();
diff --git a/frontend/src/metabase/data-studio/settings/hooks/use-local-setting.ts b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/hooks.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/settings/hooks/use-local-setting.ts
rename to frontend/src/metabase/data-studio/settings/pages/SettingsPage/hooks.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
similarity index 95%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
index 6d2bcfc6fac..867a1d6d942 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
+++ b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
@@ -22,7 +22,7 @@ import { useSelector } from "metabase/redux";
import * as Urls from "metabase/urls";
import type { NativeQuerySnippet } from "metabase-types/api";
-import { SnippetMoreMenu } from "../SnippetMoreMenu";
+import { SnippetMoreMenu } from "./SnippetMoreMenu";
const SNIPPET_NAME_MAX_LENGTH = 254;
@@ -64,8 +64,7 @@ export function SnippetHeader({
{...rest}
breadcrumbs={
<DataStudioBreadcrumbs loading={isLoadingPath}>
- <Link to={Urls.dataStudioLibrary()}>{t`Semantic layer`}</Link>
- <Link key="snippet-root-collection" to={Urls.dataStudioLibrary()}>
+ <Link key="snippet-root-collection" to={Urls.dataStudioSnippets()}>
{t`SQL snippets`}
</Link>
{folderPath?.map((collection, i) => (
@@ -74,7 +73,7 @@ export function SnippetHeader({
to={
collection.type === "trash" || collection.archived
? Urls.dataStudioArchivedSnippets()
- : Urls.dataStudioLibrary({
+ : Urls.dataStudioSnippets({
expandedIds: [
"root",
...folderPath.slice(0, i + 1).map((c) => c.id),
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
index c578ae63294..43c987db907 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
+++ b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
@@ -48,7 +48,7 @@ export function ArchiveSnippetModal(props: ArchiveSnippetModalProps) {
),
icon: "check",
});
- navigate(Urls.dataStudioLibrary());
+ navigate(Urls.dataStudioSnippets());
onClose();
}
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/SnippetModal.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/SnippetModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/SnippetModal.tsx
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/SnippetModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/index.ts b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/index.ts
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetMoreMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetMoreMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/index.ts b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/index.ts
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/index.ts b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/index.ts
rename to frontend/src/metabase/data-studio/snippets/components/SnippetHeader/index.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/index.ts b/frontend/src/metabase/data-studio/snippets/hooks/use-build-snippet-tree/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/index.ts
rename to frontend/src/metabase/data-studio/snippets/hooks/use-build-snippet-tree/index.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts b/frontend/src/metabase/data-studio/snippets/hooks/use-build-snippet-tree/use-build-snippet-tree.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts
rename to frontend/src/metabase/data-studio/snippets/hooks/use-build-snippet-tree/use-build-snippet-tree.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.ts b/frontend/src/metabase/data-studio/snippets/hooks/use-build-snippet-tree/utils.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.ts
rename to frontend/src/metabase/data-studio/snippets/hooks/use-build-snippet-tree/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/ArchivedSnippetListPage.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/ArchivedSnippetListPage.tsx
index 6ac87cc0f2f..84a5f735c8d 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/ArchivedSnippetListPage.tsx
@@ -9,7 +9,6 @@ import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/Da
import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useMetadataToasts } from "metabase/common/hooks";
import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";
-import { useBuildSnippetTree } from "metabase/data-studio/common/hooks/use-build-snippet-tree";
import {
Card,
Center,
@@ -23,9 +22,11 @@ import {
import * as Urls from "metabase/urls";
import type { CollectionItem } from "metabase-types/api";
-import { useColumnDef } from "./hooks/useColumnDef";
+import { useBuildSnippetTree } from "../../hooks/use-build-snippet-tree";
-export function ArchivedSnippetsPage() {
+import { useColumnDef } from "./hooks";
+
+export function ArchivedSnippetListPage() {
const [searchQuery, setSearchQuery] = useState("");
const {
tree: snippetTree,
@@ -75,8 +76,7 @@ export function ArchivedSnippetsPage() {
<PaneHeader
breadcrumbs={
<DataStudioBreadcrumbs>
- <Link to={Urls.dataStudioLibrary()}>{t`Semantic layer`}</Link>
- <Link to={Urls.dataStudioLibrary()}>{t`SQL snippets`}</Link>
+ <Link to={Urls.dataStudioSnippets()}>{t`SQL snippets`}</Link>
{t`Archived snippets`}
</DataStudioBreadcrumbs>
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/hooks.tsx
similarity index 93%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/hooks.tsx
index 99d5c400c0f..6b01adc0d6e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/hooks.tsx
@@ -7,6 +7,7 @@ import {
isCollectionData,
isEmptyStateData,
} from "metabase/data-studio/common/utils";
+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import {
ActionIcon,
@@ -15,7 +16,6 @@ import {
Tooltip,
type TreeTableColumnDef,
} from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { CollectionItem } from "metabase-types/api";
type ColumnDefProps = {
@@ -23,7 +23,9 @@ type ColumnDefProps = {
};
export const useColumnDef = ({ handleUnarchiveClick }: ColumnDefProps) => {
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
return useMemo<TreeTableColumnDef<TreeItem>[]>(
() => [
diff --git a/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/index.ts b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/index.ts
new file mode 100644
index 00000000000..87dc1dfcaf4
--- /dev/null
+++ b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/index.ts
@@ -0,0 +1 @@
+export { ArchivedSnippetListPage } from "./ArchivedSnippetListPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.css b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
index 04058476832..6392804fc02 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
@@ -23,10 +23,10 @@ import { useParams } from "metabase/router";
import { Alert, Card, Center, Flex, Stack } from "metabase/ui";
import * as Urls from "metabase/urls";
-import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";
import { SnippetHeader } from "../../components/SnippetHeader";
import S from "./EditSnippetPage.module.css";
+import { SnippetDescriptionSection } from "./SnippetDescriptionSection";
type EditSnippetPageParams = {
snippetId: string;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/index.ts b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetDescriptionSection/index.ts
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/index.ts b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/index.ts
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/common.unit.spec.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/tests/common.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/common.unit.spec.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/tests/common.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/tests/enterprise.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/enterprise.unit.spec.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/tests/enterprise.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/tests/setup.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/tests/setup.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.module.css b/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
rename to frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
index 37305d4f223..4ff74fd434b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
@@ -82,7 +82,7 @@ export function NewSnippetPage() {
};
const handleCancel = () => {
- navigate(Urls.dataStudioLibrary());
+ navigate(Urls.dataStudioSnippets());
};
const handleCollectionSelected = async (
@@ -122,8 +122,7 @@ export function NewSnippetPage() {
}
breadcrumbs={
<DataStudioBreadcrumbs>
- <Link to={Urls.dataStudioLibrary()}>{t`Semantic layer`}</Link>
- <Link to={Urls.dataStudioLibrary()}>{t`SQL snippets`}</Link>
+ <Link to={Urls.dataStudioSnippets()}>{t`SQL snippets`}</Link>
{t`New Snippet`}
</DataStudioBreadcrumbs>
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/index.ts b/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/index.ts
rename to frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/frontend/src/metabase/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/index.ts b/frontend/src/metabase/data-studio/snippets/pages/SnippetDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/index.ts
rename to frontend/src/metabase/data-studio/snippets/pages/SnippetDependenciesPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/RootSnippetsCollectionMenu.tsx
similarity index 82%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/RootSnippetsCollectionMenu.tsx
index 1e15549a1cb..0b8dcda99ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/RootSnippetsCollectionMenu.tsx
@@ -3,11 +3,10 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
import { getUserIsAdmin } from "metabase/current-user";
+import { PLUGIN_REMOTE_SYNC, PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";
import { dataStudioArchivedSnippets } from "metabase/urls";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import { SnippetCollectionPermissionsModal } from "metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal";
import type { CollectionId } from "metabase-types/api";
type RootSnippetsCollectionMenu = {
@@ -18,8 +17,11 @@ export const RootSnippetsCollectionMenu = ({
collectionId,
}: RootSnippetsCollectionMenu) => {
const isAdmin = useSelector(getUserIsAdmin);
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
- const isReadOnly = remoteSyncReadOnly || !isAdmin;
+ const remoteSyncReadOnly = useSelector(
+ PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,
+ );
+ const canChangePermissions =
+ PLUGIN_SNIPPET_FOLDERS.isEnabled && isAdmin && !remoteSyncReadOnly;
const [showPermissionsModal, { toggle: togglePermissionsModal }] =
useDisclosure(false);
@@ -39,7 +41,7 @@ export const RootSnippetsCollectionMenu = ({
</Tooltip>
</Menu.Target>
<Menu.Dropdown>
- {!isReadOnly && (
+ {canChangePermissions && (
<Menu.Item
leftSection={<FixedSizeIcon name="lock" />}
onClick={(e) => {
@@ -58,7 +60,7 @@ export const RootSnippetsCollectionMenu = ({
{t`View archived snippets`}
</Menu.Item>
</Menu.Dropdown>
- <SnippetCollectionPermissionsModal
+ <PLUGIN_SNIPPET_FOLDERS.CollectionPermissionsModal
opened={showPermissionsModal}
collectionId={collectionId}
onClose={togglePermissionsModal}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/RootSnippetsCollectionMenu.unit.spec.tsx
similarity index 80%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx
rename to frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/RootSnippetsCollectionMenu.unit.spec.tsx
index e83dbb56663..fe794d291f8 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/RootSnippetsCollectionMenu.unit.spec.tsx
@@ -9,6 +9,7 @@ import {
import { mockSettings } from "__support__/settings";
import { createMockState } from "__support__/state/state";
import { renderWithProviders, screen, within } from "__support__/ui";
+import { reinitialize } from "metabase/plugins";
import { Route } from "metabase/router";
import { dataStudioArchivedSnippets } from "metabase/urls";
import type { EnterpriseSettings } from "metabase-types/api";
@@ -21,22 +22,35 @@ import {
import { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";
interface SetupOptions {
+ isEnterprise?: boolean;
isSuperuser?: boolean;
remoteSyncType?: EnterpriseSettings["remote-sync-type"];
}
const collection = createMockCollection({ id: "root", name: "SQL Snippets" });
-const setup = ({ isSuperuser = true, remoteSyncType }: SetupOptions = {}) => {
+const setup = ({
+ isEnterprise = true,
+ isSuperuser = true,
+ remoteSyncType,
+}: SetupOptions = {}) => {
const state = createMockState({
settings: mockSettings({
"remote-sync-type": remoteSyncType,
"remote-sync-enabled": !!remoteSyncType,
- "token-features": createMockTokenFeatures({ snippet_collections: true }),
+ "token-features": createMockTokenFeatures({
+ snippet_collections: isEnterprise,
+ remote_sync: !!remoteSyncType,
+ }),
}),
currentUser: createMockUser({ is_superuser: isSuperuser }),
});
- setupEnterpriseOnlyPlugin("snippets");
+ if (isEnterprise) {
+ setupEnterpriseOnlyPlugin("snippets");
+ }
+ if (remoteSyncType) {
+ setupEnterpriseOnlyPlugin("remote_sync");
+ }
setupCollectionsEndpoints({ collections: [collection] });
setupGroupsEndpoint([]);
setupCollectionPermissionsGraphEndpoint({ revision: 1, groups: {} });
@@ -62,6 +76,7 @@ const setup = ({ isSuperuser = true, remoteSyncType }: SetupOptions = {}) => {
describe("RootSnippetsCollectionMenu", () => {
beforeEach(() => {
jest.clearAllMocks();
+ reinitialize();
});
it("renders snippets options menu", () => {
@@ -82,6 +97,20 @@ describe("RootSnippetsCollectionMenu", () => {
).not.toBeInTheDocument();
});
+ it("does not render 'change permissions' option without snippet folders", async () => {
+ setup({ isEnterprise: false });
+
+ await userEvent.click(
+ screen.getByRole("button", { name: "Snippet collection options" }),
+ );
+ expect(
+ screen.queryByRole("menuitem", { name: /Change permissions/ }),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.getByRole("menuitem", { name: /View archived snippets/ }),
+ ).toBeInTheDocument();
+ });
+
it("does not render 'change permissions' option if remote sync is set to read-only", async () => {
setup({ remoteSyncType: "read-only" });
diff --git a/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/index.ts b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/index.ts
new file mode 100644
index 00000000000..9ee528de755
--- /dev/null
+++ b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/RootSnippetsCollectionMenu/index.ts
@@ -0,0 +1 @@
+export { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";
diff --git a/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/SnippetListPage.tsx b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/SnippetListPage.tsx
new file mode 100644
index 00000000000..a0f8bb02829
--- /dev/null
+++ b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/SnippetListPage.tsx
@@ -0,0 +1,124 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { canUserCreateNativeQueries } from "metabase/current-user";
+import { LibraryTreePage } from "metabase/data-studio/common/components/LibraryTreePage";
+import { useErrorHandling } from "metabase/data-studio/common/hooks/use-error-handling";
+import type { TreeItem } from "metabase/data-studio/common/types";
+import {
+ filterTreeByName,
+ isCollectionData,
+} from "metabase/data-studio/common/utils";
+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
+import { useDispatch, useSelector } from "metabase/redux";
+import { setOpenModalWithProps } from "metabase/redux/ui";
+import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
+import * as Urls from "metabase/urls";
+
+import { useBuildSnippetTree } from "../../hooks/use-build-snippet-tree";
+
+import { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";
+
+const SNIPPET_COLLECTION_PICKER_OPTIONS = {
+ hasLibrary: false,
+ hasRootCollection: true,
+ hasPersonalCollections: false,
+ hasRecents: false,
+ hasSearch: false,
+ hasConfirmButtons: true,
+ canCreateCollections: false,
+};
+
+export function SnippetListPage() {
+ const [searchQuery, setSearchQuery] = useState("");
+ const { tree, isLoading, error } = useBuildSnippetTree();
+ useErrorHandling(error);
+
+ const isSearchActive = searchQuery.trim().length > 0;
+ const visibleTree = useMemo(
+ () => (isSearchActive ? filterTreeByName(tree, searchQuery) : tree),
+ [isSearchActive, tree, searchQuery],
+ );
+ const defaultExpandedIds = useMemo(
+ () => tree.slice(0, 1).map((node) => node.id),
+ [tree],
+ );
+
+ return (
+ <LibraryTreePage
+ title={t`SQL snippets`}
+ tree={visibleTree}
+ isLoading={isLoading}
+ isSearchActive={isSearchActive}
+ searchQuery={searchQuery}
+ emptyMessage={t`No snippets yet`}
+ defaultExpandedIds={defaultExpandedIds}
+ createMenu={<SnippetsCreateMenu />}
+ renderRowMenu={renderSnippetRowMenu}
+ onSearchQueryChange={setSearchQuery}
+ />
+ );
+}
+
+function renderSnippetRowMenu({ data }: TreeItem) {
+ if (!isCollectionData(data)) {
+ return null;
+ }
+ if (data.id === "root") {
+ return <RootSnippetsCollectionMenu collectionId={data.id} />;
+ }
+ return <CollectionRowMenu collection={data} />;
+}
+
+function SnippetsCreateMenu() {
+ const dispatch = useDispatch();
+ const canCreateSnippets = useSelector(canUserCreateNativeQueries);
+ const canCreateFolders =
+ canCreateSnippets && PLUGIN_SNIPPET_FOLDERS.isEnabled;
+
+ const handleNewFolderClick = useCallback(() => {
+ dispatch(
+ setOpenModalWithProps({
+ id: "collection",
+ props: {
+ initialCollectionId: null,
+ namespaces: ["snippets"],
+ pickerOptions: SNIPPET_COLLECTION_PICKER_OPTIONS,
+ showAuthorityLevelPicker: false,
+ },
+ }),
+ );
+ }, [dispatch]);
+
+ if (!canCreateSnippets) {
+ return null;
+ }
+
+ return (
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Button size="lg" leftSection={<Icon name="add" />}>{t`New`}</Button>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioSnippet()}
+ leftSection={<FixedSizeIcon name="snippet" />}
+ aria-label={t`Create new snippet`}
+ >
+ {t`Snippet`}
+ </Menu.Item>
+ {canCreateFolders && (
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="folder" />}
+ onClick={handleNewFolderClick}
+ >
+ {t`Folder`}
+ </Menu.Item>
+ )}
+ </Menu.Dropdown>
+ </Menu>
+ );
+}
diff --git a/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/SnippetListPage.unit.spec.tsx b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/SnippetListPage.unit.spec.tsx
new file mode 100644
index 00000000000..47f116b5303
--- /dev/null
+++ b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/SnippetListPage.unit.spec.tsx
@@ -0,0 +1,135 @@
+import userEvent from "@testing-library/user-event";
+
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
+import {
+ setupCollectionsEndpoints,
+ setupNativeQuerySnippetEndpoints,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+ within,
+} from "__support__/ui";
+import { reinitialize } from "metabase/plugins";
+import { Route } from "metabase/router";
+import type { User } from "metabase-types/api";
+import {
+ createMockCollection,
+ createMockNativeQuerySnippet,
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+
+import { SnippetListPage } from "./SnippetListPage";
+
+type SetupOpts = {
+ isEnterprise?: boolean;
+ user?: Partial<User>;
+};
+
+const NATIVE_WRITE_USER: Partial<User> = {
+ permissions: { can_create_native_queries: true },
+};
+
+function setup({ isEnterprise = false, user = NATIVE_WRITE_USER }: SetupOpts) {
+ setupCollectionsEndpoints({
+ collections: [
+ createMockCollection({ id: "root", name: "Root", namespace: "snippets" }),
+ createMockCollection({
+ id: 10,
+ name: "Revenue folder",
+ namespace: "snippets",
+ location: "/",
+ parent_id: null,
+ }),
+ ],
+ });
+ setupNativeQuerySnippetEndpoints({
+ snippets: [
+ createMockNativeQuerySnippet({
+ id: 1,
+ name: "Orders filter",
+ collection_id: null,
+ }),
+ createMockNativeQuerySnippet({
+ id: 2,
+ name: "Revenue sum",
+ collection_id: 10,
+ }),
+ ],
+ });
+ const state = createMockState({
+ settings: mockSettings({
+ "token-features": createMockTokenFeatures({
+ snippet_collections: isEnterprise,
+ }),
+ }),
+ currentUser: createMockUser(user),
+ });
+ if (isEnterprise) {
+ setupEnterpriseOnlyPlugin("snippets");
+ }
+
+ renderWithProviders(<Route path="/" element={<SnippetListPage />} />, {
+ withRouter: true,
+ storeInitialState: state,
+ });
+}
+
+describe("SnippetListPage", () => {
+ beforeEach(() => {
+ reinitialize();
+ mockGetBoundingClientRect({ width: 1000, height: 1000 });
+ });
+
+ it("lists snippets under the SQL snippets root", async () => {
+ setup({});
+
+ const page = await screen.findByTestId("library-page");
+ expect(await within(page).findByText("Orders filter")).toBeInTheDocument();
+ expect(within(page).getByText("SQL snippets")).toBeInTheDocument();
+ expect(within(page).getByText("Revenue folder")).toBeInTheDocument();
+ });
+
+ it("filters snippets by name, including ones in folders", async () => {
+ setup({});
+
+ await screen.findByText("Orders filter");
+ await userEvent.type(screen.getByPlaceholderText("Search..."), "revenue");
+
+ expect(await screen.findByText("Revenue sum")).toBeInTheDocument();
+ expect(screen.queryByText("Orders filter")).not.toBeInTheDocument();
+ });
+
+ it("offers only new snippets without snippet folders", async () => {
+ setup({});
+
+ await userEvent.click(await screen.findByRole("button", { name: /New/ }));
+
+ expect(
+ screen.getAllByRole("menuitem").map((item) => item.textContent),
+ ).toEqual(["Snippet"]);
+ });
+
+ it("offers new snippets and folders with snippet folders", async () => {
+ setup({ isEnterprise: true });
+
+ await userEvent.click(await screen.findByRole("button", { name: /New/ }));
+
+ expect(
+ screen.getAllByRole("menuitem").map((item) => item.textContent),
+ ).toEqual(["Snippet", "Folder"]);
+ });
+
+ it("does not offer to create anything without native write access", async () => {
+ setup({ user: {} });
+
+ expect(await screen.findByText("Orders filter")).toBeInTheDocument();
+ expect(
+ screen.queryByRole("button", { name: /New/ }),
+ ).not.toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/index.ts b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/index.ts
new file mode 100644
index 00000000000..6ac099974a1
--- /dev/null
+++ b/frontend/src/metabase/data-studio/snippets/pages/SnippetListPage/index.ts
@@ -0,0 +1 @@
+export { SnippetListPage } from "./SnippetListPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx b/frontend/src/metabase/data-studio/snippets/routes.tsx
similarity index 58%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx
rename to frontend/src/metabase/data-studio/snippets/routes.tsx
index 48fb1973948..8b2c5ba2941 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx
+++ b/frontend/src/metabase/data-studio/snippets/routes.tsx
@@ -1,3 +1,4 @@
+import { SnippetsSectionLayout } from "metabase/data-studio/app/pages/SnippetsSectionLayout";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Route } from "metabase/router";
@@ -5,15 +6,22 @@ import { Route } from "metabase/router";
* The snippet pages, in one chunk. They are small and always reached from the
* same place, so one name keeps them to a single request.
*/
+const snippetsPage = () =>
+ import(
+ /* webpackChunkName: "data-studio-snippets" */ "./pages/SnippetListPage"
+ ).then(({ SnippetListPage }) => ({ Component: SnippetListPage }));
+
const newSnippetPage = () =>
import(
/* webpackChunkName: "data-studio-snippets" */ "./pages/NewSnippetPage"
).then(({ NewSnippetPage }) => ({ Component: NewSnippetPage }));
-const archivedSnippetsPage = () =>
+const archivedSnippetListPage = () =>
import(
- /* webpackChunkName: "data-studio-snippets" */ "./pages/ArchivedSnippetsPage"
- ).then(({ ArchivedSnippetsPage }) => ({ Component: ArchivedSnippetsPage }));
+ /* webpackChunkName: "data-studio-snippets" */ "./pages/ArchivedSnippetListPage"
+ ).then(({ ArchivedSnippetListPage }) => ({
+ Component: ArchivedSnippetListPage,
+ }));
const editSnippetPage = () =>
import(
@@ -29,18 +37,16 @@ const snippetDependenciesPage = () =>
export function getDataStudioSnippetRoutes() {
return (
- <>
- <Route path="snippets/new" lazy={newSnippetPage} />
- <Route path="snippets/archived" lazy={archivedSnippetsPage} />
- <Route path="snippets/:snippetId" lazy={editSnippetPage} />
+ <Route path="snippets" element={<SnippetsSectionLayout />}>
+ <Route index lazy={snippetsPage} />
+ <Route path="new" lazy={newSnippetPage} />
+ <Route path="archived" lazy={archivedSnippetListPage} />
+ <Route path=":snippetId" lazy={editSnippetPage} />
{PLUGIN_DEPENDENCIES.isEnabled && (
- <Route
- path="snippets/:snippetId/dependencies"
- lazy={snippetDependenciesPage}
- >
+ <Route path=":snippetId/dependencies" lazy={snippetDependenciesPage}>
<Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} />
</Route>
)}
- </>
+ </Route>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.unit.spec.tsx b/frontend/src/metabase/data-studio/snippets/routes.unit.spec.tsx
similarity index 90%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.unit.spec.tsx
rename to frontend/src/metabase/data-studio/snippets/routes.unit.spec.tsx
index 9a77c39d664..2582cea357b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/snippets/routes.unit.spec.tsx
@@ -6,7 +6,7 @@ describe("data studio snippet routes", () => {
it("resolves every page", async () => {
const loaders = lazyLoaders(getDataStudioSnippetRoutes());
- expect(loaders).toHaveLength(3);
+ expect(loaders).toHaveLength(4);
for (const load of loaders) {
expect((await load()).Component).toBeDefined();
diff --git a/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.module.css b/frontend/src/metabase/data-studio/upsells/components/BaseUpsellPage/BaseUpsellPage.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.module.css
rename to frontend/src/metabase/data-studio/upsells/components/BaseUpsellPage/BaseUpsellPage.module.css
diff --git a/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/components/BaseUpsellPage/BaseUpsellPage.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/components/BaseUpsellPage/BaseUpsellPage.tsx
diff --git a/frontend/src/metabase/data-studio/upsells/components/BaseUpsellPage/index.ts b/frontend/src/metabase/data-studio/upsells/components/BaseUpsellPage/index.ts
new file mode 100644
index 00000000000..05849cee55b
--- /dev/null
+++ b/frontend/src/metabase/data-studio/upsells/components/BaseUpsellPage/index.ts
@@ -0,0 +1,2 @@
+export { BaseUpsellPage } from "./BaseUpsellPage";
+export type { BaseUpsellPageProps } from "./BaseUpsellPage";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage/DependenciesUpsellPage.tsx
similarity index 90%
rename from frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage/DependenciesUpsellPage.tsx
index 73b497b52d9..d239cce4ea0 100644
--- a/frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage.tsx
+++ b/frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage/DependenciesUpsellPage.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import dependenciesUpsellImage from "assets/img/data-studio-dependencies-upsell.png";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { BaseUpsellPage } from "./BaseUpsellPage";
+import { BaseUpsellPage } from "../../components/BaseUpsellPage";
export function DependenciesUpsellPage() {
usePageTitle(t`Dependency graph`);
diff --git a/frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage/index.ts b/frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage/index.ts
new file mode 100644
index 00000000000..08ff7bab375
--- /dev/null
+++ b/frontend/src/metabase/data-studio/upsells/pages/DependenciesUpsellPage/index.ts
@@ -0,0 +1 @@
+export { DependenciesUpsellPage } from "./DependenciesUpsellPage";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage/LibraryUpsellPage.tsx
similarity index 89%
rename from frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage/LibraryUpsellPage.tsx
index fc84aa9d059..58f9bad3202 100644
--- a/frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage.tsx
+++ b/frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage/LibraryUpsellPage.tsx
@@ -2,7 +2,7 @@ import { t } from "ttag";
import libraryUpsellImage from "assets/img/data-studio-library-upsell.svg";
-import { BaseUpsellPage } from "./BaseUpsellPage";
+import { BaseUpsellPage } from "../../components/BaseUpsellPage";
export function LibraryUpsellPage() {
return (
diff --git a/frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage/index.ts b/frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage/index.ts
new file mode 100644
index 00000000000..6505780651a
--- /dev/null
+++ b/frontend/src/metabase/data-studio/upsells/pages/LibraryUpsellPage/index.ts
@@ -0,0 +1 @@
+export { LibraryUpsellPage } from "./LibraryUpsellPage";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage/RemoteSyncUpsellPage.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage/RemoteSyncUpsellPage.tsx
diff --git a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage/index.ts b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage/index.ts
new file mode 100644
index 00000000000..aa622938a8e
--- /dev/null
+++ b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage/index.ts
@@ -0,0 +1 @@
+export { RemoteSyncUpsellPage } from "./RemoteSyncUpsellPage";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage/SchemaViewerUpsellPage.tsx
similarity index 90%
rename from frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage.tsx
rename to frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage/SchemaViewerUpsellPage.tsx
index 1c02021b6f8..94b903d612b 100644
--- a/frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage.tsx
+++ b/frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage/SchemaViewerUpsellPage.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import schemaViewerUpsellImage from "assets/img/schema-viewer.svg";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { BaseUpsellPage } from "./BaseUpsellPage";
+import { BaseUpsellPage } from "../../components/BaseUpsellPage";
export function SchemaViewerUpsellPage() {
usePageTitle(t`Schema viewer`);
diff --git a/frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage/index.ts b/frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage/index.ts
new file mode 100644
index 00000000000..4ddcdb09ebf
--- /dev/null
+++ b/frontend/src/metabase/data-studio/upsells/pages/SchemaViewerUpsellPage/index.ts
@@ -0,0 +1 @@
+export { SchemaViewerUpsellPage } from "./SchemaViewerUpsellPage";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/index.ts b/frontend/src/metabase/data-studio/upsells/pages/index.ts
deleted file mode 100644
index bec03fa5d35..00000000000
--- a/frontend/src/metabase/data-studio/upsells/pages/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { DependenciesUpsellPage } from "./DependenciesUpsellPage";
-export { LibraryUpsellPage } from "./LibraryUpsellPage";
-export { RemoteSyncUpsellPage } from "./RemoteSyncUpsellPage";
-export { SchemaViewerUpsellPage } from "./SchemaViewerUpsellPage";
diff --git a/frontend/src/metabase/plugins/oss/remote-sync.ts b/frontend/src/metabase/plugins/oss/remote-sync.ts
index 55837be3aa0..6dd2b5e7c91 100644
--- a/frontend/src/metabase/plugins/oss/remote-sync.ts
+++ b/frontend/src/metabase/plugins/oss/remote-sync.ts
@@ -40,8 +40,6 @@ export interface RemoteSyncDirtyState {
changedCollections: Record<number, boolean>;
/** Whether any dirty changes exist globally */
isDirty: boolean;
- /** Whether any entities have "removed" status */
- hasRemovedItems: boolean;
/** Whether data is loading */
isLoading: boolean;
/** Check if a specific collection has dirty items */
@@ -82,6 +80,8 @@ const getDefaultPluginRemoteSync = () => ({
}),
useGitSyncVisible: () => ({ isVisible: false, currentBranch: null }),
useHasLibraryDirtyChanges: () => false,
+ useHasSnippetsDirtyChanges: () => false,
+ useHasDataActionsDirtyChanges: () => false,
useHasTransformDirtyChanges: () => false,
useHasGlossaryDirtyChanges: () => false,
getIsRemoteSyncReadOnly: () => false,
@@ -115,6 +115,8 @@ export const PLUGIN_REMOTE_SYNC: {
currentBranch: string | null | undefined;
};
useHasLibraryDirtyChanges: () => boolean;
+ useHasSnippetsDirtyChanges: () => boolean;
+ useHasDataActionsDirtyChanges: () => boolean;
useHasTransformDirtyChanges: () => boolean;
useHasGlossaryDirtyChanges: () => boolean;
getIsRemoteSyncReadOnly: (state: State) => boolean;
diff --git a/frontend/src/metabase/urls/data-studio.ts b/frontend/src/metabase/urls/data-studio.ts
index 95104cca7dd..690ab95dbe6 100644
--- a/frontend/src/metabase/urls/data-studio.ts
+++ b/frontend/src/metabase/urls/data-studio.ts
@@ -94,16 +94,27 @@ export function dataStudioData({
return parts.join("/");
}
-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()}`;
+type ExpandedIdsParams = { expandedIds?: CollectionId[] };
+
+function getExpandedIdsQueryString({ expandedIds }: ExpandedIdsParams) {
+ if (!expandedIds?.length) {
+ return "";
}
- return `${ROOT_URL}/library${query}`;
+ const params = new URLSearchParams();
+ expandedIds.forEach((id) => params.append("expandedId", String(id)));
+ return `?${params.toString()}`;
+}
+
+export function dataStudioLibrary(params: ExpandedIdsParams = {}) {
+ return `${ROOT_URL}/library${getExpandedIdsQueryString(params)}`;
+}
+
+export function dataStudioSnippets(params: ExpandedIdsParams = {}) {
+ return `${ROOT_URL}/snippets${getExpandedIdsQueryString(params)}`;
+}
+
+export function dataStudioActions(params: ExpandedIdsParams = {}) {
+ return `${ROOT_URL}/actions${getExpandedIdsQueryString(params)}`;
}
export function dataStudioTable(tableId: TableId) {
@@ -331,7 +342,7 @@ export function dataStudioGitSync() {
}
export function dataStudioSnippet(snippetId: NativeQuerySnippetId) {
- return `${dataStudioLibrary()}/snippets/${snippetId}`;
+ return `${dataStudioSnippets()}/${snippetId}`;
}
export function dataStudioSnippetDependencies(snippetId: NativeQuerySnippetId) {
@@ -339,15 +350,15 @@ export function dataStudioSnippetDependencies(snippetId: NativeQuerySnippetId) {
}
export function newDataStudioSnippet() {
- return `${dataStudioLibrary()}/snippets/new`;
+ return `${dataStudioSnippets()}/new`;
}
export function dataStudioArchivedSnippets() {
- return `${dataStudioLibrary()}/snippets/archived`;
+ return `${dataStudioSnippets()}/archived`;
}
export function dataStudioAction(actionId: WritebackActionId) {
- return `${dataStudioLibrary()}/actions/${actionId}`;
+ return `${dataStudioActions()}/${actionId}`;
}
export function dataStudioActionEdit(actionId: WritebackActionId) {
@@ -373,11 +384,11 @@ export function dataStudioActionSettings(actionId: WritebackActionId) {
}
export function newDataStudioAction() {
- return `${dataStudioLibrary()}/actions/new`;
+ return `${dataStudioActions()}/new`;
}
export function dataStudioArchivedActions() {
- return `${dataStudioLibrary()}/actions/archived`;
+ return `${dataStudioActions()}/archived`;
}
export function dataStudioSettings() {