The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Implement Archived Snippets page (#68823)
Anderson6602db9fd2fc
diff --git a/e2e/support/helpers/api/index.ts b/e2e/support/helpers/api/index.tsindex b65ab29678f..e821bc377bd 100644--- a/e2e/support/helpers/api/index.ts+++ b/e2e/support/helpers/api/index.ts@@ -3,6 +3,7 @@ export { addQuestionToDashboard } from "./addQuestionToDashboard";export { archiveCollection } from "./archiveCollection";export { archiveDashboard } from "./archiveDashboard";export { archiveQuestion } from "./archiveQuestion";+export { updateSnippet } from "./updateSnippet";export { createApiKey } from "./createApiKey";export { createCard } from "./createCard";export { createCollection } from "./createCollection";diff --git a/e2e/support/helpers/api/updateSnippet.ts b/e2e/support/helpers/api/updateSnippet.tsnew file mode 100644index 00000000000..8059402d879--- /dev/null+++ b/e2e/support/helpers/api/updateSnippet.ts@@ -0,0 +1,12 @@+import type {+ NativeQuerySnippet,+ NativeQuerySnippetId,+} from "metabase-types/api";++export const updateSnippet = (+ id: NativeQuerySnippetId,+ data: Partial<NativeQuerySnippet>,+) => {+ cy.log(`Updating a snippet with id: ${id}`);+ return cy.request("PUT", `/api/native-query-snippet/${id}`, data);+};diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.tsindex d58ce63fd4c..007e8a33c8b 100644--- a/e2e/support/helpers/e2e-data-studio-helpers.ts+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts@@ -6,6 +6,7 @@ const { H } = cy;const libraryPage = () => cy.findByTestId("library-page");const newSnippetPage = () => cy.findByTestId("new-snippet-page");+const archivedSnippetsPage = () => cy.findByTestId("archived-snippets-page");const editSnippetPage = () => cy.findByTestId("edit-snippet-page");const metricOverviewPage = () => cy.findByTestId("metric-overview-page");const metricQueryEditor = () => cy.findByTestId("metric-query-editor");@@ -74,6 +75,7 @@ export const DataStudio = {Snippets: {newPage: newSnippetPage,editPage: editSnippetPage,+ archivedPage: archivedSnippetsPage,nameInput: () => newSnippetPage().findByDisplayValue("New SQL snippet"),descriptionInput: () => cy.findByPlaceholderText("No description"),saveButton: () => cy.findByRole("button", { name: "Save" }),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.tsindex c5733c43956..f7112a0144b 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@@ -145,9 +145,7 @@ describe("scenarios > data studio > library", () => {cy.log("Verify Data section empty state");H.DataStudio.Library.libraryPage()- .findByText(- "Cleaned, pre-transformed data sources ready for exploring.",- )+ .findByText("Cleaned, pre-transformed data sources ready for exploring").should("be.visible");H.DataStudio.Library.libraryPage().findByRole("button", { name: "Publish a table" })@@ -155,7 +153,7 @@ describe("scenarios > data studio > library", () => {cy.log("Verify Metrics section empty state");H.DataStudio.Library.libraryPage()- .findByText("Standardized calculations with known dimensions.")+ .findByText("Standardized calculations with known dimensions").should("be.visible");H.DataStudio.Library.libraryPage().findByRole("link", { name: "New metric" })@@ -163,7 +161,7 @@ describe("scenarios > data studio > library", () => {cy.log("Verify SQL snippets section empty state");H.DataStudio.Library.libraryPage()- .findByText("Reusable bits of code that save your time.")+ .findByText("Reusable bits of code that save your time").should("be.visible");H.DataStudio.Library.libraryPage().findByRole("link", { name: "New snippet" })@@ -193,9 +191,7 @@ describe("scenarios > data studio > library", () => {cy.log("Verify Data empty state is visible initially");H.DataStudio.Library.libraryPage()- .findByText(- "Cleaned, pre-transformed data sources ready for exploring.",- )+ .findByText("Cleaned, pre-transformed data sources ready for exploring").should("be.visible");cy.log("Publish a table via the +New menu");@@ -220,10 +216,10 @@ describe("scenarios > data studio > library", () => {"Verify Metrics and SQL snippets still show empty states (always expanded behavior)",);H.DataStudio.Library.libraryPage()- .findByText("Standardized calculations with known dimensions.")+ .findByText("Standardized calculations with known dimensions").should("be.visible");H.DataStudio.Library.libraryPage()- .findByText("Reusable bits of code that save your time.")+ .findByText("Reusable bits of code that save your time").should("be.visible");});});diff --git a/e2e/test/scenarios/data-studio/snippets.cy.spec.ts b/e2e/test/scenarios/data-studio/snippets.cy.spec.tsindex 21742f74476..eaadb3973c6 100644--- a/e2e/test/scenarios/data-studio/snippets.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/snippets.cy.spec.ts@@ -177,8 +177,8 @@ describe("scenarios > data studio > snippets", () => {});});- describe("deletion", () => {- it("should be able to delete a snippet", () => {+ describe("archiving", () => {+ it("should be able to archive a snippet", () => {H.createSnippet({name: "Test snippet",content: "SELECT * FROM orders",@@ -191,11 +191,11 @@ describe("scenarios > data studio > snippets", () => {cy.findByTestId("snippet-header").findByRole("button", { name: /Snippet menu options/ }).click();- H.popover().findByText("Delete").click();+ H.popover().findByText("Archive").click();H.modal().within(() => {- cy.findByText("Delete snippet?").should("be.visible");- cy.button("Delete").click();+ cy.findByText("Archive snippet?").should("be.visible");+ cy.button("Archive").click();cy.wait("@updateSnippet");});@@ -203,6 +203,48 @@ describe("scenarios > data studio > snippets", () => {.findByText("Test snippet").should("not.exist");});++ it("should be able to unarchive a snippet", () => {+ H.createSnippet({+ name: "Test snippet",+ content: "SELECT * FROM orders",+ }).then((response) => {+ cy.log("Archive snippet");+ return H.updateSnippet(response.body.id, { archived: true });+ });++ H.DataStudio.Library.visit();++ H.DataStudio.Library.libraryPage()+ .findByRole("button", { name: "Snippet collection options" })+ .click();++ H.popover()+ .findByText(/View archived snippets/)+ .click();++ cy.url().should("include", "/snippets/archived");++ H.DataStudio.Snippets.archivedPage()+ .findByText("Test snippet")+ .should("be.visible");++ H.DataStudio.Snippets.archivedPage()+ .findByRole("button", { name: "Unarchive snippet" })+ .click();++ cy.wait("@updateSnippet");++ H.DataStudio.Snippets.archivedPage()+ .findByText("Test snippet")+ .should("not.exist");++ H.DataStudio.Library.visit();++ H.DataStudio.Library.libraryPage()+ .findByText("Test snippet")+ .should("be.visible");+ });});describe("snippet folders", () => {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsxindex 8ea0b2cc33e..68e129089e3 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx@@ -10,6 +10,15 @@ import { useHasTokenFeature } from "metabase/common/hooks";import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";+import { useBuildSnippetTree } from "metabase/data-studio/common/hooks/use-build-snippet-tree";+import type {+ EmptyStateData,+ TreeItem,+} from "metabase/data-studio/common/types";+import {+ isCollection,+ isEmptyStateData,+} from "metabase/data-studio/common/utils";import type { ExpandedState } from "metabase/data-studio/data-model/components/TablePicker/types";import { LibraryUpsellPage } from "metabase/data-studio/upsells/pages";import { usePageTitle } from "metabase/hooks/use-page-title";@@ -38,17 +47,7 @@ import { LibraryEmptyState } from "../components/LibraryEmptyState";import { CreateMenu } from "./CreateMenu";import { PublishTableModal } from "./PublishTableModal";import { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";-import {- useBuildSnippetTree,- useBuildTreeForCollection,- useErrorHandling,-} from "./hooks";-import {- type EmptyStateData,- type TreeItem,- isCollection,- isEmptyStateData,-} from "./types";+import { useBuildTreeForCollection, useErrorHandling } from "./hooks";import { getAccessibleCollection, getWritableCollection } from "./utils";interface EmptyStateActionProps {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsxindex 3473c0d1af2..4fc88dac257 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx@@ -1,6 +1,8 @@+import { Link } from "react-router";import { t } from "ttag";import { useSelector } from "metabase/lib/redux";+import { dataStudioArchivedSnippets } from "metabase/lib/urls";import { getUserIsAdmin } from "metabase/selectors/user";import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";@@ -13,10 +15,7 @@ export const RootSnippetsCollectionMenu = ({}) => {const isAdmin = useSelector(getUserIsAdmin);const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);-- if (!isAdmin || remoteSyncReadOnly) {- return null;- }+ const isReadOnly = remoteSyncReadOnly || !isAdmin;const optionsLabel = t`Snippet collection options`;@@ -34,14 +33,23 @@ export const RootSnippetsCollectionMenu = ({</Tooltip></Menu.Target><Menu.Dropdown>+ {!isReadOnly && (+ <Menu.Item+ leftSection={<FixedSizeIcon name="lock" />}+ onClick={(e) => {+ e.stopPropagation();+ setPermissionsCollectionId("root");+ }}+ >+ {t`Change permissions`}+ </Menu.Item>+ )}<Menu.Item- leftSection={<FixedSizeIcon name="lock" />}- onClick={(e) => {- e.stopPropagation();- setPermissionsCollectionId("root");- }}+ component={Link}+ leftSection={<FixedSizeIcon name="view_archive" />}+ to={dataStudioArchivedSnippets()}>- {t`Change permissions`}+ {t`View archived snippets`}</Menu.Item></Menu.Dropdown></Menu>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsxindex 6b9d163098d..af72239f08a 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx@@ -1,7 +1,9 @@import userEvent from "@testing-library/user-event";+import { Route } from "react-router";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";+import { dataStudioArchivedSnippets } from "metabase/lib/urls";import type { EnterpriseSettings } from "metabase-types/api";import { createMockUser } from "metabase-types/api/mocks";import { createMockState } from "metabase-types/store/mocks/state";@@ -24,11 +26,23 @@ const setup = ({ isSuperuser = true, remoteSyncType }: SetupOptions = {}) => {currentUser: createMockUser({ is_superuser: isSuperuser }),});return renderWithProviders(- <RootSnippetsCollectionMenu- setPermissionsCollectionId={setPermissionsCollectionId}- />,+ <>+ <Route+ path="/"+ component={() => (+ <RootSnippetsCollectionMenu+ setPermissionsCollectionId={setPermissionsCollectionId}+ />+ )}+ />+ <Route+ path={dataStudioArchivedSnippets()}+ component={() => <div data-testid="archived-snippets" />}+ />+ </>,{storeInitialState: state,+ withRouter: true,},);};@@ -45,21 +59,29 @@ describe("RootSnippetsCollectionMenu", () => {).toBeInTheDocument();});- it("renders nothing if user is not a superuser", () => {+ it("does not render 'change permissions' option if user is not a superuser", async () => {setup({ isSuperuser: false });++ await userEvent.click(+ screen.getByRole("button", { name: "Snippet collection options" }),+ );expect(- screen.queryByRole("button", { name: "Snippet collection options" }),+ screen.queryByRole("menuitem", { name: /Change permissions/ }),).not.toBeInTheDocument();});- it("renders nothing if remote sync is set to read-only", () => {+ it("does not render 'change permissions' option if remote sync is set to read-only", async () => {setup({ remoteSyncType: "read-only" });++ await userEvent.click(+ screen.getByRole("button", { name: "Snippet collection options" }),+ );expect(- screen.queryByRole("button", { name: "Snippet collection options" }),+ screen.queryByRole("menuitem", { name: /Change permissions/ }),).not.toBeInTheDocument();});- describe("show permissions options", () => {+ describe("show permissions option", () => {it("is rendered on menu click", async () => {setup();await userEvent.click(@@ -81,4 +103,19 @@ describe("RootSnippetsCollectionMenu", () => {expect(setPermissionsCollectionId).toHaveBeenCalledWith("root");});});++ describe("view archived snippets option", () => {+ it("navigates to archived snippets page", async () => {+ const { history } = setup();+ await userEvent.click(+ screen.getByRole("button", { name: "Snippet collection options" }),+ );+ await userEvent.click(+ screen.getByRole("menuitem", { name: /View archived snippets/ }),+ );+ expect(history?.getCurrentLocation()?.pathname).toMatch(+ /\/snippets\/archived/,+ );+ });+ });});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.tsindex 165c498cdbd..16b39623e20 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.ts@@ -2,20 +2,17 @@ import { useEffect, useMemo } from "react";import { t } from "ttag";import _ from "underscore";-import {- skipToken,- useListCollectionItemsQuery,- useListCollectionsQuery,- useListSnippetsQuery,-} from "metabase/api";+import { skipToken, useListCollectionItemsQuery } from "metabase/api";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";+import type {+ LibrarySectionType,+ TreeItem,+} from "metabase/data-studio/common/types";+import { createEmptyStateItem } from "metabase/data-studio/common/utils";import { getIcon } from "metabase/lib/icon";import { useMetadataToasts } from "metabase/metadata/hooks";import type { Collection, CollectionId } from "metabase-types/api";-import type { LibrarySectionType, TreeItem } from "./types";-import { buildSnippetTree, createEmptyStateItem } from "./utils";-export const useBuildTreeForCollection = (collection: Collection | undefined,sectionType: LibrarySectionType,@@ -71,49 +68,6 @@ export const useBuildTreeForCollection = (}, [isLoading, items, collection, error, sectionType, metricCollectionId]);};-export const useBuildSnippetTree = (): {- isLoading: boolean;- tree: TreeItem[];- error?: unknown;-} => {- const {- data: snippets,- isLoading: loadingSnippets,- error,- } = useListSnippetsQuery();- const { data: snippetCollections, isLoading: loadingCollections } =- useListCollectionsQuery({- namespace: "snippets",- });-- return useMemo(() => {- if (- loadingSnippets ||- loadingCollections ||- !snippets ||- !snippetCollections- ) {- return {- isLoading: true,- tree: [],- error,- };- }-- return {- isLoading: false,- error,- tree: buildSnippetTree(snippetCollections, snippets),- };- }, [- loadingSnippets,- loadingCollections,- snippets,- snippetCollections,- error,- ]);-};-export const useErrorHandling = (_error: unknown) => {const error = useDebouncedValue(_error, 1000);const { sendErrorToast } = useMetadataToasts();diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.tsindex e73510e5318..9bc330e454b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.ts@@ -1,86 +1,4 @@-import { t } from "ttag";--import { isRootCollection } from "metabase/collections/utils";-import * as Urls from "metabase/lib/urls";-import type {- Collection,- CollectionId,- CollectionType,- NativeQuerySnippet,-} from "metabase-types/api";--import type { LibrarySectionType, TreeItem } from "./types";--function createSnippetNode(snippet: NativeQuerySnippet): TreeItem {- return {- id: `snippet:${snippet.id}`,- name: snippet.name,- icon: "snippet",- model: "snippet",- data: { ...snippet, model: "snippet" },- updatedAt: snippet.updated_at,- };-}--function buildCollectionNode(- collection: Collection,- allCollections: Collection[],- allSnippets: NativeQuerySnippet[],-): TreeItem {- const isRoot = isRootCollection(collection);- const parentIdToMatch = isRoot ? null : collection.id;-- const childCollections = allCollections.filter(- (c) => c.parent_id === parentIdToMatch,- );- const childSnippets = allSnippets.filter(- (s) => s.collection_id === parentIdToMatch,- );-- const children = [- ...childCollections.map((child) =>- buildCollectionNode(child, allCollections, allSnippets),- ),- ...childSnippets.map(createSnippetNode),- ];-- return {- id: `collection:${collection.id}`,- name: collection.name,- model: "collection",- icon: isRoot ? "snippet" : "folder",- data: { ...collection, model: "collection" },- children: children.length > 0 ? children : undefined,- };-}--export function buildSnippetTree(- snippetCollections: Collection[],- snippets: NativeQuerySnippet[],-): TreeItem[] {- const collections = snippetCollections.filter((c) => !c.archived);- const activeSnippets = snippets.filter((s) => !s.archived);-- const rootCollection = collections.find(isRootCollection);- if (!rootCollection) {- return [];- }-- const nonRootCollections = collections.filter((c) => !isRootCollection(c));- const rootNode = buildCollectionNode(- rootCollection,- nonRootCollections,- activeSnippets,- );-- // If the root has no children (no snippets or subfolders), add an empty state- const hasContent = activeSnippets.length > 0 || nonRootCollections.length > 0;- const children = hasContent- ? rootNode.children- : [createEmptyStateItem("snippets")];-- return [{ ...rootNode, name: t`SQL snippets`, children }];-}+import type { Collection, CollectionType } from "metabase-types/api";export function getAccessibleCollection(rootCollection: Collection,@@ -98,63 +16,3 @@ export function getWritableCollection(const collection = getAccessibleCollection(rootCollection, type);return collection?.can_write ? collection : undefined;}--type EmptyStateConfig = {- sectionType: LibrarySectionType;- description: string;- actionLabel: string;- actionUrl?: string;-};--function getEmptyStateConfig(- sectionType: LibrarySectionType,-): Omit<EmptyStateConfig, "sectionType" | "actionUrl"> {- const config: Record<- LibrarySectionType,- Omit<EmptyStateConfig, "sectionType" | "actionUrl">- > = {- data: {- description: t`Cleaned, pre-transformed data sources ready for exploring.`,- actionLabel: t`Publish a table`,- },- metrics: {- description: t`Standardized calculations with known dimensions.`,- actionLabel: t`New metric`,- },- snippets: {- description: t`Reusable bits of code that save your time.`,- actionLabel: t`New snippet`,- },- };-- return config[sectionType];-}--export function createEmptyStateItem(- sectionType: LibrarySectionType,- metricCollectionId?: CollectionId,-): TreeItem {- const config = getEmptyStateConfig(sectionType);-- let actionUrl: string | undefined;- if (sectionType === "metrics" && metricCollectionId) {- actionUrl = Urls.newDataStudioMetric({ collectionId: metricCollectionId });- } else if (sectionType === "snippets") {- actionUrl = Urls.newDataStudioSnippet();- }- // "data" section opens a modal, so no actionUrl-- return {- id: `empty-state:${sectionType}`,- name: "",- icon: "empty",- model: "empty-state",- data: {- model: "empty-state",- sectionType,- description: config.description,- actionLabel: config.actionLabel,- actionUrl,- },- };-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/index.tsdeleted file mode 100644index 7779e9eb64f..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/index.ts+++ /dev/null@@ -1 +0,0 @@-export { DeleteSnippetModal } from "./DeleteSnippetModal";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsxindex dfbe83a24d9..c4acd059e04 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { Link } from "react-router";-import { push } from "react-router-redux";import { t } from "ttag";import { useUpdateSnippetMutation } from "metabase/api";@@ -15,7 +14,7 @@ import {PaneHeaderTabs,} from "metabase/data-studio/common/components/PaneHeader";import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";-import { useDispatch, useSelector } from "metabase/lib/redux";+import { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { PLUGIN_DEPENDENCIES, PLUGIN_REMOTE_SYNC } from "metabase/plugins";import type { NativeQuerySnippet } from "metabase-types/api";@@ -34,15 +33,10 @@ export function SnippetHeader({actions,...rest}: SnippetHeaderProps & Omit<PaneHeaderProps, "breadcrumbs">) {- const dispatch = useDispatch();const remoteSyncReadOnly = useSelector(PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,);- const handleDelete = () => {- dispatch(push(Urls.dataStudioLibrary()));- };-const { path, isLoadingPath } = useCollectionPath({collectionId: snippet.collection_id,});@@ -50,13 +44,12 @@ export function SnippetHeader({return (<PaneHeadertitle={- <SnippetNameInput snippet={snippet} readOnly={remoteSyncReadOnly} />- }- menu={- remoteSyncReadOnly ? null : (- <SnippetMoreMenu snippet={snippet} onDelete={handleDelete} />- )+ <SnippetNameInput+ snippet={snippet}+ readOnly={remoteSyncReadOnly || !!snippet?.archived}+ />}+ menu={remoteSyncReadOnly ? null : <SnippetMoreMenu snippet={snippet} />}tabs={<SnippetTabs snippet={snippet} />}actions={actions}data-testid="snippet-header"@@ -69,11 +62,20 @@ export function SnippetHeader({{path?.map((collection, i) => (<Linkkey={collection.id}- to={Urls.dataStudioLibrary({- expandedIds: ["root", ...path.slice(0, i + 1).map((c) => c.id)],- })}+ to={+ collection.type === "trash" || collection.archived+ ? Urls.dataStudioArchivedSnippets()+ : Urls.dataStudioLibrary({+ expandedIds: [+ "root",+ ...path.slice(0, i + 1).map((c) => c.id),+ ],+ })+ }>- {collection.name}+ {collection.type === "trash"+ ? t`Archived snippets`+ : collection.name}</Link>))}<span>{snippet.name}</span>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsxnew file mode 100644index 00000000000..2d1f71936f3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx@@ -0,0 +1,75 @@+import { Link } from "react-router";+import { push } from "react-router-redux";+import { t } from "ttag";++import { useUpdateSnippetMutation } from "metabase/api";+import { getErrorMessage } from "metabase/api/utils";+import { useToast } from "metabase/common/hooks";+import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";+import { Button, Group, Modal, Stack, Text } from "metabase/ui";+import type { NativeQuerySnippet } from "metabase-types/api";++type ArchiveSnippetModalProps = {+ snippet: NativeQuerySnippet;+ onClose: () => void;+};++export function ArchiveSnippetModal(props: ArchiveSnippetModalProps) {+ const { snippet, onClose } = props;+ const dispatch = useDispatch();+ const [updateSnippet, { isLoading }] = useUpdateSnippetMutation();+ const [sendToast] = useToast();++ const handleArchive = async () => {+ const { error } = await updateSnippet({+ id: snippet.id,+ archived: true,+ });++ if (error) {+ sendToast({+ message: getErrorMessage(error, t`Failed to archive snippet`),+ icon: "warning",+ });+ } else {+ sendToast({+ message: (+ <>+ {t`"${snippet.name}" archived.`}{" "}+ <Text+ c="inherit"+ component={Link}+ td="underline"+ to={Urls.dataStudioArchivedSnippets()}+ >+ {t`View archived snippets`}+ </Text>+ </>+ ),+ icon: "check",+ });+ dispatch(push(Urls.dataStudioLibrary()));+ onClose();+ }+ };++ return (+ <Modal opened onClose={onClose} title={t`Archive snippet?`}>+ <Stack>+ <Text>{t`Are you sure you want to archive "${snippet.name}"?`}</Text>+ <Group gap="sm" justify="flex-end">+ <Button onClick={onClose}>{t`Cancel`}</Button>+ <Button+ color="error"+ loading={isLoading}+ onClick={handleArchive}+ variant="filled"+ >+ {t`Archive`}+ </Button>+ </Group>+ </Stack>+ </Modal>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/SnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/SnippetModal.tsxnew file mode 100644index 00000000000..b8ec8d90c5c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/SnippetModal.tsx@@ -0,0 +1,35 @@+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";+import type { NativeQuerySnippet } from "metabase-types/api";++import { ArchiveSnippetModal } from "./ArchiveSnippetModal";+import { UnarchiveSnippetModal } from "./UnarchiveSnippetModal";++export type SnippetModalType = "move" | "archive" | "unarchive";++type SnippetModalProps = {+ snippet: NativeQuerySnippet;+ modalType: SnippetModalType;+ onClose: () => void;+};++export function SnippetModal({+ snippet,+ modalType,+ onClose,+}: SnippetModalProps) {+ switch (modalType) {+ case "move":+ return (+ <PLUGIN_SNIPPET_FOLDERS.MoveSnippetModal+ snippet={snippet}+ onClose={onClose}+ />+ );+ case "archive":+ return <ArchiveSnippetModal snippet={snippet} onClose={onClose} />;+ case "unarchive":+ return <UnarchiveSnippetModal snippet={snippet} onClose={onClose} />;+ default:+ return null;+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsxsimilarity index 59%rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsxrename to enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsxindex 1528a598e4d..9942b9b7c00 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/DeleteSnippetModal/DeleteSnippetModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx@@ -6,56 +6,48 @@ import { useToast } from "metabase/common/hooks";import { Button, Group, Modal, Stack, Text } from "metabase/ui";import type { NativeQuerySnippet } from "metabase-types/api";-type DeleteSnippetModalProps = {- snippet: NativeQuerySnippet;- onDelete?: () => void;+type ArchiveSnippetModalProps = {+ snippet: Pick<NativeQuerySnippet, "id" | "name">;onClose: () => void;};-export function DeleteSnippetModal({- snippet,- onDelete,- onClose,-}: DeleteSnippetModalProps) {+export function UnarchiveSnippetModal(props: ArchiveSnippetModalProps) {+ const { snippet, onClose } = props;const [updateSnippet, { isLoading }] = useUpdateSnippetMutation();const [sendToast] = useToast();- const handleDelete = async () => {+ const handleUnarchive = async () => {const { error } = await updateSnippet({id: snippet.id,- archived: true,+ archived: false,});if (error) {sendToast({- message: getErrorMessage(error, t`Failed to delete snippet`),+ message: getErrorMessage(error, t`Failed to unarchive snippet`),icon: "warning",});} else {sendToast({- message: t`Snippet deleted`,+ message: t`"${snippet.name}" unarchived`,icon: "check",});- onDelete?.();onClose();}};return (- <Modal opened onClose={onClose} title={t`Delete snippet?`}>+ <Modal opened onClose={onClose} title={t`Unarchive snippet?`}><Stack>- <Text>- {t`Are you sure you want to delete "${snippet.name}"? This action cannot be undone.`}- </Text>+ <Text>{t`Are you sure you want to unarchive "${snippet.name}"?`}</Text><Group gap="sm" justify="flex-end"><Button onClick={onClose}>{t`Cancel`}</Button><Buttonvariant="filled"- color="error"- onClick={handleDelete}+ onClick={handleUnarchive}loading={isLoading}>- {t`Delete`}+ {t`Unarchive`}</Button></Group></Stack>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/index.tsnew file mode 100644index 00000000000..e43ed48225e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/index.ts@@ -0,0 +1 @@+export { SnippetModal, type SnippetModalType } from "./SnippetModal";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsxindex 7a6111f5d5b..6a785655725 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetMoreMenu.tsx@@ -5,26 +5,22 @@ import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";import { ActionIcon, Icon, Menu } from "metabase/ui";import type { NativeQuerySnippet } from "metabase-types/api";-import { DeleteSnippetModal } from "../DeleteSnippetModal";--type SnippetModalType = "move" | "delete";+import { SnippetModal, type SnippetModalType } from "./SnippetModal";type SnippetMoreMenuProps = {snippet: NativeQuerySnippet;- onDelete?: () => void;};-export function SnippetMoreMenu({ snippet, onDelete }: SnippetMoreMenuProps) {+export function SnippetMoreMenu({ snippet }: SnippetMoreMenuProps) {const [modalType, setModalType] = useState<SnippetModalType>();return (<>- <SnippetMenu onOpenModal={setModalType} />- {modalType != null && (+ <SnippetMenu onOpenModal={setModalType} snippet={snippet} />+ {!!modalType && (<SnippetModalsnippet={snippet}modalType={modalType}- onDelete={onDelete}onClose={() => setModalType(undefined)}/>)}@@ -34,12 +30,13 @@ export function SnippetMoreMenu({ snippet, onDelete }: SnippetMoreMenuProps) {type SnippetMenuProps = {onOpenModal: (modalType: SnippetModalType) => void;+ snippet: NativeQuerySnippet;};-function SnippetMenu({ onOpenModal }: SnippetMenuProps) {+function SnippetMenu({ onOpenModal, snippet }: SnippetMenuProps) {const menuItems = [];- if (PLUGIN_SNIPPET_FOLDERS.isEnabled) {+ if (PLUGIN_SNIPPET_FOLDERS.isEnabled && !snippet.archived) {menuItems.push(<Menu.Itemkey="move"@@ -51,15 +48,27 @@ function SnippetMenu({ onOpenModal }: SnippetMenuProps) {);}- menuItems.push(- <Menu.Item- key="delete"- leftSection={<Icon name="trash" />}- onClick={() => onOpenModal("delete")}- >- {t`Delete`}- </Menu.Item>,- );+ if (snippet.archived) {+ menuItems.push(+ <Menu.Item+ key="archive"+ leftSection={<Icon name="unarchive" />}+ onClick={() => onOpenModal("unarchive")}+ >+ {t`Unarchive`}+ </Menu.Item>,+ );+ } else {+ menuItems.push(+ <Menu.Item+ key="archive"+ leftSection={<Icon name="archive" />}+ onClick={() => onOpenModal("archive")}+ >+ {t`Archive`}+ </Menu.Item>,+ );+ }if (menuItems.length === 0) {return null;@@ -76,37 +85,3 @@ function SnippetMenu({ onOpenModal }: SnippetMenuProps) {</Menu>);}--type SnippetModalProps = {- snippet: NativeQuerySnippet;- modalType: SnippetModalType;- onDelete?: () => void;- onClose: () => void;-};--function SnippetModal({- snippet,- modalType,- onDelete,- onClose,-}: SnippetModalProps) {- switch (modalType) {- case "move":- return (- <PLUGIN_SNIPPET_FOLDERS.MoveSnippetModal- snippet={snippet}- onClose={onClose}- />- );- case "delete":- return (- <DeleteSnippetModal- snippet={snippet}- onDelete={onDelete}- onClose={onClose}- />- );- default:- return null;- }-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsxnew file mode 100644index 00000000000..3dd5af58282--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx@@ -0,0 +1,135 @@+import { useCallback, useState } from "react";+import { Link } from "react-router";+import { t } from "ttag";++import { useUpdateSnippetMutation } from "metabase/api";+import { getErrorMessage } from "metabase/api/utils";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";+import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";+import { useBuildSnippetTree } from "metabase/data-studio/common/hooks/use-build-snippet-tree";+import * as Urls from "metabase/lib/urls";+import { useMetadataToasts } from "metabase/metadata/hooks";+import {+ Card,+ Center,+ Icon,+ Stack,+ TextInput,+ TreeTable,+ TreeTableSkeleton,+ useTreeTableInstance,+} from "metabase/ui";+import type { CollectionItem } from "metabase-types/api";++import { useColumnDef } from "./hooks/useColumnDef";++export function ArchivedSnippetsPage() {+ const [searchQuery, setSearchQuery] = useState("");+ const {+ tree: snippetTree,+ isLoading,+ error,+ } = useBuildSnippetTree({ archived: true });+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();+ const [updateSnippet] = useUpdateSnippetMutation();++ const handleUnarchiveClick = useCallback(+ async (item: CollectionItem) => {+ try {+ await updateSnippet({+ id: item.id,+ archived: false,+ }).unwrap();++ sendSuccessToast(t`"${item.name}" unarchived`);+ } catch (error) {+ sendErrorToast(getErrorMessage(error, t`Failed to unarchive snippet`));+ }+ },+ [sendErrorToast, sendSuccessToast, updateSnippet],+ );+ const columns = useColumnDef({ handleUnarchiveClick });++ const treeTableInstance = useTreeTableInstance({+ data: snippetTree,+ columns,+ getSubRows: (node) => node.children,+ getNodeId: (node) => node.id,+ globalFilter: searchQuery,+ onGlobalFilterChange: setSearchQuery,+ defaultExpanded: true,+ });++ if (isLoading || error) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <SectionLayout>+ <PaneHeader+ breadcrumbs={+ <DataStudioBreadcrumbs>+ <Link to={Urls.dataStudioLibrary()}>{t`SQL snippets`}</Link>+ {t`Archived snippets`}+ </DataStudioBreadcrumbs>+ }+ px="3.5rem"+ py={0}+ />+ <Stack+ bg="background-secondary"+ data-testid="archived-snippets-page"+ pb="2rem"+ px="3.5rem"+ style={{ overflow: "hidden" }}+ >+ <TextInput+ placeholder={t`Search...`}+ leftSection={<Icon name="search" />}+ bdrs="md"+ value={searchQuery}+ onChange={(e) => setSearchQuery(e.target.value)}+ />++ <Card withBorder p={0}>+ {isLoading ? (+ <TreeTableSkeleton columnWidths={[0.6, 0.2, 0.05]} />+ ) : (+ <TreeTable+ instance={treeTableInstance}+ emptyState={t`No archived snippets`}+ onRowClick={(row) => {+ const { data } = row.original;++ if (data.model === "empty-state") {+ return;+ }++ if (row.getCanExpand()) {+ row.toggleExpanded();+ return;+ }+ }}+ getRowHref={(row) => {+ const { data } = row.original;++ if (data.model === "snippet") {+ const snippetId = Number(data.id);+ return Urls.dataStudioSnippet(snippetId);+ }++ return null;+ }}+ />+ )}+ </Card>+ </Stack>+ </SectionLayout>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsxnew file mode 100644index 00000000000..13658cc7b07--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx@@ -0,0 +1,78 @@+import { useMemo } from "react";+import { t } from "ttag";++import type { TreeItem } from "metabase/data-studio/common/types";+import {+ isCollection,+ isEmptyStateData,+} from "metabase/data-studio/common/utils";+import { useSelector } from "metabase/lib/redux";+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";+import {+ ActionIcon,+ EntityNameCell,+ FixedSizeIcon,+ Tooltip,+ type TreeTableColumnDef,+} from "metabase/ui";+import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";+import type { CollectionItem } from "metabase-types/api";++type ColumnDefProps = {+ handleUnarchiveClick: (item: CollectionItem) => void;+};++export const useColumnDef = ({ handleUnarchiveClick }: ColumnDefProps) => {+ const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);++ return useMemo<TreeTableColumnDef<TreeItem>[]>(+ () => [+ {+ id: "name",+ header: t`Name`,+ enableSorting: true,+ accessorKey: "name",+ minWidth: 200,+ cell: ({ row }) => (+ <EntityNameCell+ data-testid={`${row.original.model}-name`}+ icon={row.original.icon}+ name={row.original.name}+ />+ ),+ },+ {+ id: "actions",+ width: 48,+ cell: ({ row }) => {+ const { data } = row.original;++ if (remoteSyncReadOnly || isEmptyStateData(data)) {+ return null;+ }++ if (isCollection(data)) {+ return <PLUGIN_SNIPPET_FOLDERS.CollectionMenu collection={data} />;+ }++ return (+ <Tooltip label={t`Unarchive snippet`}>+ <ActionIcon+ aria-label={t`Unarchive snippet`}+ size="md"+ onClick={async (event) => {+ event.stopPropagation();+ event.preventDefault();+ handleUnarchiveClick(data);+ }}+ >+ <FixedSizeIcon name={"unarchive"} c="text-primary" />+ </ActionIcon>+ </Tooltip>+ );+ },+ },+ ],+ [handleUnarchiveClick, remoteSyncReadOnly],+ );+};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.tsnew file mode 100644index 00000000000..837fe8d2f99--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/index.ts@@ -0,0 +1 @@+export { ArchivedSnippetsPage } from "./ArchivedSnippetsPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.cssindex db2ed3cffd7..83be9c5801c 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.module.css@@ -11,3 +11,7 @@flex-shrink: 0;border-left: 1px solid var(--mb-color-border);}++.flexStart {+ align-self: flex-start;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsxindex 71b062dd070..ad63ae95ba4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx@@ -12,6 +12,7 @@ import {import { getErrorMessage } from "metabase/api/utils";import { CodeMirror } from "metabase/common/components/CodeMirror";import { EntityCreationInfo } from "metabase/common/components/EntityCreationInfo";+import { NotFound } from "metabase/common/components/ErrorPages";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks";@@ -20,7 +21,7 @@ import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeimport { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";-import { Card, Center, Flex, Stack } from "metabase/ui";+import { Alert, Card, Center, Flex, Stack } from "metabase/ui";import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";import { SnippetHeader } from "../../components/SnippetHeader";@@ -51,6 +52,7 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {const [content, setContent] = useState(snippet?.content ?? "");const [updateSnippet, { isLoading: isSaving }] = useUpdateSnippetMutation();+ const isReadOnly = remoteSyncReadOnly || !!snippet?.archived;const isDirty = useMemo(() => snippet != null && content !== snippet.content,@@ -95,6 +97,10 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {const extensions = useMemo(() => [sql()], []);+ if (!snippetId) {+ return <NotFound />;+ }+if (isLoading || error || !snippet) {return (<Center h="100%">@@ -105,7 +111,7 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {return (<>- <PageContainer pos="relative" data-testid="edit-snippet-page">+ <PageContainer pos="relative" data-testid="edit-snippet-page" gap="md"><SnippetHeadersnippet={snippet}actions={@@ -118,7 +124,21 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {/>}/>- <Flex flex={1} w="100%" gap="sm">+ {isReadOnly && (+ <Alert+ className={S.flexStart}+ color="warning"+ p="0.75rem"+ title={+ snippet?.archived+ ? t`This snippet is archived and cannot be edited. Unarchive it to edit.`+ : t`This snippet is not editable because Remote Sync is in read-only mode.`+ }+ variant="outline"+ w="auto"+ />+ )}+ <Flex flex={1} w="100%" gap="sm" mt="md"><CardwithBorderp={0}@@ -135,7 +155,8 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {height="100%"className={S.editor}data-testid="snippet-editor"- editable={!remoteSyncReadOnly}+ editable={!isReadOnly}+ readOnly={isReadOnly}basicSetup={{lineNumbers: true,foldGutter: true,@@ -147,7 +168,7 @@ export function EditSnippetPage({ params, route }: EditSnippetPageProps) {<Stack p="md" gap="lg" flex="0 0 20rem"><SnippetDescriptionSectionsnippet={snippet}- isDisabled={remoteSyncReadOnly}+ isDisabled={isReadOnly}/><EntityCreationInfocreatedAt={snippet.created_at}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsxindex 0babcbc183b..3dd47949857 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx@@ -2,6 +2,7 @@ import { IndexRoute, Route } from "react-router";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { ArchivedSnippetsPage } from "./pages/ArchivedSnippetsPage";import { EditSnippetPage } from "./pages/EditSnippetPage";import { NewSnippetPage } from "./pages/NewSnippetPage";import { SnippetDependenciesPage } from "./pages/SnippetDependenciesPage";@@ -10,6 +11,7 @@ export function getDataStudioSnippetRoutes() {return (<><Route path="snippets/new" component={NewSnippetPage} />+ <Route path="snippets/archived" component={ArchivedSnippetsPage} /><Route path="snippets/:snippetId" component={EditSnippetPage} />{PLUGIN_DEPENDENCIES.isEnabled && (<Routediff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsxindex a035948a67d..0359313a044 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx@@ -1,6 +1,7 @@import { t } from "ttag";-import { useUpdateCollectionMutation } from "metabase/api";+import { snippetApi, useUpdateCollectionMutation } from "metabase/api";+import { listTag } from "metabase/api/tags";import { isRootCollection } from "metabase/collections/utils";import { useDispatch, useSelector } from "metabase/lib/redux";import type { SnippetCollectionMenuProps } from "metabase/plugins";@@ -28,7 +29,6 @@ export function SnippetCollectionMenu({const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);const isRoot = isRootCollection(collection);- const isArchived = collection.archived;if (!collection.can_write || remoteSyncReadOnly) {return null;@@ -52,14 +52,33 @@ export function SnippetCollectionMenu({id: collection.id,archived: wasArchived,});+ dispatch(snippetApi.util.invalidateTags([listTag("snippet")]));},}),);+ dispatch(snippetApi.util.invalidateTags([listTag("snippet")]));} catch (error) {console.error("Failed to update collection:", error);}};+ if (collection.archived) {+ return (+ <Tooltip label={t`Unarchive snippet folder`}>+ <ActionIcon+ aria-label={t`Unarchive snippet folder`}+ size="md"+ onClick={(event) => {+ event.stopPropagation();+ void handleArchiveToggle();+ }}+ >+ <FixedSizeIcon name="unarchive" c="text-primary" />+ </ActionIcon>+ </Tooltip>+ );+ }+const optionsLabel = t`Snippet folder options`;return (@@ -77,41 +96,30 @@ export function SnippetCollectionMenu({</Tooltip></Menu.Target><Menu.Dropdown>- {isArchived ? (+ {!isRoot && (+ <Menu.Item+ leftSection={<Icon name="pencil" />}+ onClick={() => onEditDetails?.(collection)}+ >+ {t`Edit folder details`}+ </Menu.Item>+ )}+ {isAdmin && (+ <Menu.Item+ leftSection={<Icon name="lock" />}+ onClick={() => onChangePermissions?.(collection.id)}+ >+ {t`Change permissions`}+ </Menu.Item>+ )}+ {!isRoot && (<Menu.Item- leftSection={<Icon name="unarchive" />}+ leftSection={<Icon name="archive" />}onClick={handleArchiveToggle}+ c="error">- {t`Unarchive`}+ {t`Archive`}</Menu.Item>- ) : (- <>- {!isRoot && (- <Menu.Item- leftSection={<Icon name="pencil" />}- onClick={() => onEditDetails(collection)}- >- {t`Edit folder details`}- </Menu.Item>- )}- {isAdmin && (- <Menu.Item- leftSection={<Icon name="lock" />}- onClick={() => onChangePermissions(collection.id)}- >- {t`Change permissions`}- </Menu.Item>- )}- {!isRoot && (- <Menu.Item- leftSection={<Icon name="archive" />}- onClick={handleArchiveToggle}- c="error"- >- {t`Archive`}- </Menu.Item>- )}- </>)}</Menu.Dropdown></Menu>diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.tsindex 0670496b29f..3e71e2df5f4 100644--- a/frontend/src/metabase-types/api/collection.ts+++ b/frontend/src/metabase-types/api/collection.ts@@ -83,7 +83,7 @@ export interface Collection {can_write: boolean;can_restore: boolean;can_delete: boolean;- archived: boolean;+ archived?: boolean;children?: Collection[];authority_level?: CollectionAuthorityLevel;type?: CollectionType;diff --git a/frontend/src/metabase-types/api/performance.ts b/frontend/src/metabase-types/api/performance.tsindex 86fea3c3139..62cb918ad1d 100644--- a/frontend/src/metabase-types/api/performance.ts+++ b/frontend/src/metabase-types/api/performance.ts@@ -1,4 +1,5 @@-import type { CollectionType } from "./collection";+import type { CollectionEssentials } from "metabase-types/api/search";+import type { SortDirection } from "./sorting";/** 'Model' as in 'type of object' */@@ -82,12 +83,7 @@ export interface ListCacheConfigsRequest {/** Cache config with hydrated name and collection data */export interface CacheConfigWithDetails extends CacheConfig {name?: string;- collection?: {- id: number;- name: string;- authority_level?: "official" | null;- type?: CollectionType;- } | null;+ collection?: CollectionEssentials | null;}export interface ListCacheConfigsResponse {diff --git a/frontend/src/metabase-types/api/search.ts b/frontend/src/metabase-types/api/search.tsindex 96ed38a5048..0dd4363c765 100644--- a/frontend/src/metabase-types/api/search.ts+++ b/frontend/src/metabase-types/api/search.ts@@ -59,7 +59,7 @@ export type SearchResponse<export type CollectionEssentials = Pick<Collection,- "id" | "name" | "authority_level" | "type"+ "id" | "name" | "authority_level" | "type" | "archived"> &Partial<Pick<Collection, "effective_ancestors">>;diff --git a/frontend/src/metabase/collections/utils.ts b/frontend/src/metabase/collections/utils.tsindex 158c63461a1..5ce1e2ecea1 100644--- a/frontend/src/metabase/collections/utils.ts+++ b/frontend/src/metabase/collections/utils.ts@@ -78,7 +78,7 @@ export function isRootTrashCollection(export function isTrashedCollection(collection: Pick<Collection, "type" | "archived">,): boolean {- return isRootTrashCollection(collection) || collection.archived;+ return isRootTrashCollection(collection) || !!collection.archived;}export function isPublicCollection(diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsxindex 6807d8be1e6..f85394dc07b 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsx+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsx@@ -220,6 +220,7 @@ export const setup = async (collection: {id: 789,name: "Misc Metrics",+ archived: false,},}),createMockSearchResult({@@ -231,6 +232,7 @@ export const setup = async (collection: {id: 7891,name: "Misc Tables",+ archived: false,},}),createMockSearchResult({ id: 304, model: "document", name: "Wickham" }),diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/index.ts b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/index.tsnew file mode 100644index 00000000000..e0ad822a86d--- /dev/null+++ b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/index.ts@@ -0,0 +1 @@+export { useBuildSnippetTree } from "./use-build-snippet-tree";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/common/hooks/use-build-snippet-tree/use-build-snippet-tree.tsnew file mode 100644index 00000000000..52f981bfdfd--- /dev/null+++ b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts@@ -0,0 +1,53 @@+import { useMemo } from "react";++import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";+import type { TreeItem } from "metabase/data-studio/common/types";++import { buildActiveSnippetTree, buildArchivedSnippetTree } from "./utils";++export const useBuildSnippetTree = ({ archived = false } = {}): {+ isLoading: boolean;+ tree: TreeItem[];+ error?: unknown;+} => {+ const {+ data: snippets,+ isLoading: loadingSnippets,+ error,+ } = useListSnippetsQuery({ archived });+ const { data: snippetCollections, isLoading: loadingCollections } =+ useListCollectionsQuery({+ namespace: "snippets",+ archived,+ });++ return useMemo(() => {+ if (+ loadingSnippets ||+ loadingCollections ||+ !snippets ||+ !snippetCollections+ ) {+ return {+ isLoading: true,+ tree: [],+ error,+ };+ }++ return {+ isLoading: false,+ error,+ tree: archived+ ? buildArchivedSnippetTree(snippetCollections, snippets)+ : buildActiveSnippetTree(snippetCollections, snippets),+ };+ }, [+ loadingSnippets,+ loadingCollections,+ snippets,+ snippetCollections,+ error,+ archived,+ ]);+};diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.ts b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.tsnew file mode 100644index 00000000000..3c0ee6ef210--- /dev/null+++ b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.ts@@ -0,0 +1,105 @@+import { t } from "ttag";++import {+ coerceCollectionId,+ isRootCollection,+} from "metabase/collections/utils";+import type { TreeItem } from "metabase/data-studio/common/types";+import { createEmptyStateItem } from "metabase/data-studio/common/utils";+import type { Collection, NativeQuerySnippet } from "metabase-types/api";++function createSnippetNode(snippet: NativeQuerySnippet): TreeItem {+ return {+ id: `snippet:${snippet.id}`,+ name: snippet.name,+ icon: "snippet",+ model: "snippet",+ data: { ...snippet, model: "snippet" },+ updatedAt: snippet.updated_at,+ };+}++function buildSnippetCollectionNode(+ collection: Collection,+ allCollections: Collection[],+ allSnippets: NativeQuerySnippet[],+): TreeItem {+ const isRoot = isRootCollection(collection);+ const parentIdToMatch = isRoot ? null : collection.id;++ const childCollections = allCollections.filter(+ (c) => c.parent_id === parentIdToMatch,+ );+ const childSnippets = allSnippets.filter(+ (s) => s.collection_id === parentIdToMatch,+ );++ const children = [+ ...childCollections.map((child) =>+ buildSnippetCollectionNode(child, allCollections, allSnippets),+ ),+ ...childSnippets.map(createSnippetNode),+ ];++ return {+ id: `collection:${collection.id}`,+ name: collection.name,+ model: "collection",+ icon: isRoot ? "snippet" : "folder",+ data: { ...collection, model: "collection" },+ children: children.length > 0 ? children : undefined,+ };+}++export function buildActiveSnippetTree(+ snippetCollections: Collection[],+ snippets: NativeQuerySnippet[],+): TreeItem[] {+ const collections = snippetCollections.filter((c) => !c.archived);+ const activeSnippets = snippets.filter((s) => !s.archived);++ const rootCollection = collections.find(isRootCollection);+ if (!rootCollection) {+ return [];+ }++ const nonRootCollections = collections.filter((c) => !isRootCollection(c));+ const rootNode = buildSnippetCollectionNode(+ rootCollection,+ nonRootCollections,+ activeSnippets,+ );++ // If the root has no children (no snippets or subfolders), add an empty state+ const hasContent = activeSnippets.length > 0 || nonRootCollections.length > 0;+ const children = hasContent+ ? rootNode.children+ : [createEmptyStateItem("snippets")];++ return [{ ...rootNode, name: t`SQL snippets`, children }];+}++export function buildArchivedSnippetTree(+ archivedCollections: Collection[],+ archivedSnippets: NativeQuerySnippet[],+): TreeItem[] {+ const hasContent =+ archivedSnippets.length > 0 || archivedCollections.length > 0;++ if (!hasContent) {+ return [];+ }++ return [+ ...archivedCollections.map((collection) =>+ buildSnippetCollectionNode(+ collection,+ archivedCollections,+ archivedSnippets,+ ),+ ),+ ...archivedSnippets+ .filter((snippet) => coerceCollectionId(snippet.collection_id) === "root")+ .map(createSnippetNode),+ ];+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/types.ts b/frontend/src/metabase/data-studio/common/types.tssimilarity index 73%rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/types.tsrename to frontend/src/metabase/data-studio/common/types.tsindex f5d2d08fd3c..025ca7205d1 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/types.ts+++ b/frontend/src/metabase/data-studio/common/types.ts@@ -32,15 +32,3 @@ export type TreeItem = {| EmptyStateData;children?: TreeItem[];};--export const isCollection = (- c: Collection | Omit<CollectionItem, "getUrl">,-): c is Collection => {- return Object.keys(c).includes("namespace");-};--export const isEmptyStateData = (- data: TreeItem["data"],-): data is EmptyStateData => {- return data.model === "empty-state";-};diff --git a/frontend/src/metabase/data-studio/common/utils/create-empty-space-item.ts b/frontend/src/metabase/data-studio/common/utils/create-empty-space-item.tsnew file mode 100644index 00000000000..8cb68c3507a--- /dev/null+++ b/frontend/src/metabase/data-studio/common/utils/create-empty-space-item.ts@@ -0,0 +1,66 @@+import { t } from "ttag";++import * as Urls from "metabase/lib/urls";+import type { CollectionId } from "metabase-types/api";++import type { LibrarySectionType, TreeItem } from "../types";++type EmptyStateConfig = {+ sectionType: LibrarySectionType;+ description: string;+ actionLabel: string;+ actionUrl?: string;+};++const getEmptyStateConfig = (+ sectionType: LibrarySectionType,+): Omit<EmptyStateConfig, "sectionType" | "actionUrl"> => {+ const config: Record<+ LibrarySectionType,+ Omit<EmptyStateConfig, "sectionType" | "actionUrl">+ > = {+ data: {+ description: t`Cleaned, pre-transformed data sources ready for exploring`,+ actionLabel: t`Publish a table`,+ },+ metrics: {+ description: t`Standardized calculations with known dimensions`,+ actionLabel: t`New metric`,+ },+ snippets: {+ description: t`Reusable bits of code that save your time`,+ actionLabel: t`New snippet`,+ },+ };++ return config[sectionType];+};++export const createEmptyStateItem = (+ sectionType: LibrarySectionType,+ metricCollectionId?: CollectionId,+): TreeItem => {+ const config = getEmptyStateConfig(sectionType);++ let actionUrl: string | undefined;+ if (sectionType === "metrics" && metricCollectionId) {+ actionUrl = Urls.newDataStudioMetric({ collectionId: metricCollectionId });+ } else if (sectionType === "snippets") {+ actionUrl = Urls.newDataStudioSnippet();+ }+ // "data" section opens a modal, so no actionUrl++ return {+ id: `empty-state:${sectionType}`,+ name: "",+ icon: "empty",+ model: "empty-state",+ data: {+ model: "empty-state",+ sectionType,+ description: config.description,+ actionLabel: config.actionLabel,+ actionUrl,+ },+ };+};diff --git a/frontend/src/metabase/data-studio/common/utils.ts b/frontend/src/metabase/data-studio/common/utils/get-result-metadata.tssimilarity index 54%rename from frontend/src/metabase/data-studio/common/utils.tsrename to frontend/src/metabase/data-studio/common/utils/get-result-metadata.tsindex bdc5217bc93..377aae48f25 100644--- a/frontend/src/metabase/data-studio/common/utils.ts+++ b/frontend/src/metabase/data-studio/common/utils/get-result-metadata.ts@@ -1,9 +1,5 @@import * as Lib from "metabase-lib";-import type {- Dataset,- DatasetQuery,- GetLibraryCollectionResponse,-} from "metabase-types/api";+import type { Dataset, DatasetQuery } from "metabase-types/api";export function getResultMetadata(currentQuery: DatasetQuery,@@ -19,8 +15,3 @@ export function getResultMetadata(}return null;}--// TODO Alex P 12/05/2025 Fix the endpoint to return sensible data-export const hasLibraryCollection = (- libraryCollection?: GetLibraryCollectionResponse,-) => libraryCollection != null && "name" in libraryCollection;diff --git a/frontend/src/metabase/data-studio/common/utils/index.ts b/frontend/src/metabase/data-studio/common/utils/index.tsnew file mode 100644index 00000000000..1f307adb784--- /dev/null+++ b/frontend/src/metabase/data-studio/common/utils/index.ts@@ -0,0 +1,28 @@+import type {+ Collection,+ CollectionItem,+ GetLibraryCollectionResponse,+} from "metabase-types/api";++import type { EmptyStateData, TreeItem } from "../types";++export { createEmptyStateItem } from "./create-empty-space-item";+export { getDatasetQueryPreviewUrl } from "./get-dataset-query-preview-url";+export { getResultMetadata } from "./get-result-metadata";++// TODO Alex P 12/05/2025 Fix the endpoint to return sensible data+export const hasLibraryCollection = (+ libraryCollection?: GetLibraryCollectionResponse,+) => libraryCollection != null && "name" in libraryCollection;++export const isCollection = (+ c: Collection | Omit<CollectionItem, "getUrl">,+): c is Collection => {+ return Object.keys(c).includes("namespace");+};++export const isEmptyStateData = (+ data: TreeItem["data"],+): data is EmptyStateData => {+ return data.model === "empty-state";+};diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/lib/urls/data-studio.tsindex bd39b210043..7964aece706 100644--- a/frontend/src/metabase/lib/urls/data-studio.ts+++ b/frontend/src/metabase/lib/urls/data-studio.ts@@ -305,6 +305,10 @@ export function newDataStudioSnippet() {return `${dataStudioLibrary()}/snippets/new`;}+export function dataStudioArchivedSnippets() {+ return `${dataStudioLibrary()}/snippets/archived`;+}+export function dataStudioWorkspaceList() {return `${ROOT_URL}/workspaces`;}diff --git a/frontend/src/metabase/plugins/oss/snippets.ts b/frontend/src/metabase/plugins/oss/snippets.tsindex 10e6a675a6b..7f806019f11 100644--- a/frontend/src/metabase/plugins/oss/snippets.ts+++ b/frontend/src/metabase/plugins/oss/snippets.ts@@ -45,8 +45,8 @@ export type SnippetFormModalProps = {export type SnippetCollectionMenuProps = {collection: Collection;- onEditDetails: (collection: Collection) => void;- onChangePermissions: (collectionId: CollectionId) => void;+ onEditDetails?: (collection: Collection) => void;+ onChangePermissions?: (collectionId: CollectionId) => void;};export type SnippetCollectionPermissionsModalProps = {@@ -68,7 +68,7 @@ export type SnippetFoldersPlugin = {MoveSnippetModal: ComponentType<MoveSnippetModalProps>;};-export const getDefaultPluiginSnippetFolders = () => ({+export const getDefaultPluginSnippetFolders = () => ({isEnabled: false,CollectionPickerModal:PluginPlaceholder as ComponentType<SnippetCollectionPickerModalProps>,@@ -81,8 +81,8 @@ export const getDefaultPluiginSnippetFolders = () => ({MoveSnippetModal: PluginPlaceholder as ComponentType<MoveSnippetModalProps>,});-export const PLUGIN_SNIPPET_FOLDERS = getDefaultPluiginSnippetFolders();+export const PLUGIN_SNIPPET_FOLDERS = getDefaultPluginSnippetFolders();export function reinitialize() {- Object.assign(PLUGIN_SNIPPET_FOLDERS, getDefaultPluiginSnippetFolders());+ Object.assign(PLUGIN_SNIPPET_FOLDERS, getDefaultPluginSnippetFolders());}