Skip to content

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

Remove Our Analytics from library snippet header (#75266)

Nick Fitzpatrickd9f40d41adaf
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.tsx
index 9c1034b39cd..70d14c1c4d2 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
@@ -4,6 +4,7 @@ import { t } from "ttag";
import { useUpdateSnippetMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
+import { isRootCollection } from "metabase/collections/utils";
import { useToast } from "metabase/common/hooks";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import {
@@ -41,6 +42,11 @@ export function SnippetHeader({
collectionId: snippet.collection_id,
});
+ // Drop the root collection; the "SQL snippets" link already represents it.
+ const folderPath = path?.filter(
+ (collection) => !isRootCollection(collection),
+ );
+
return (
<PaneHeader
title={
@@ -59,7 +65,7 @@ export function SnippetHeader({
<Link key="snippet-root-collection" to={Urls.dataStudioLibrary()}>
{t`SQL snippets`}
</Link>
- {path?.map((collection, i) => (
+ {folderPath?.map((collection, i) => (
<Link
key={collection.id}
to={
@@ -68,7 +74,7 @@ export function SnippetHeader({
: Urls.dataStudioLibrary({
expandedIds: [
"root",
- ...path.slice(0, i + 1).map((c) => c.id),
+ ...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/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
index 6208915f5be..cff67dbf36d 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
@@ -28,7 +28,14 @@ const setup = ({ snippet = {}, remoteSyncType }: SetupOps) => {
const mockSnippet = createMockNativeQuerySnippet(snippet);
setupCollectionByIdEndpoint({
- collections: [createMockCollection({ id: "root" })],
+ collections: [
+ createMockCollection({ id: "root", name: "Our analytics" }),
+ createMockCollection({
+ id: 10,
+ name: "My folder",
+ effective_ancestors: [createMockCollection({ id: "root" })],
+ }),
+ ],
});
const tokenFeatures: Partial<TokenFeatures> = {
@@ -75,6 +82,33 @@ describe("SnippetHeader", () => {
expect(screen.getByTestId("custom-actions")).toBeInTheDocument();
});
+ describe("breadcrumbs", () => {
+ it("does not show 'Our analytics' for a snippet in the root folder (metabase#UXW-4170)", async () => {
+ setup({ snippet: { name: "My Snippet", collection_id: null } });
+
+ expect(
+ await screen.findByRole("link", { name: "SQL snippets" }),
+ ).toBeInTheDocument();
+ expect(
+ screen.queryByRole("link", { name: "Our analytics" }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("shows the folder path for a snippet inside a folder", async () => {
+ setup({ snippet: { name: "My Snippet", collection_id: 10 } });
+
+ expect(
+ await screen.findByRole("link", { name: "SQL snippets" }),
+ ).toBeInTheDocument();
+ expect(
+ await screen.findByRole("link", { name: "My folder" }),
+ ).toBeInTheDocument();
+ expect(
+ screen.queryByRole("link", { name: "Our analytics" }),
+ ).not.toBeInTheDocument();
+ });
+ });
+
describe("when remote sync is set to read-only", () => {
beforeEach(() => {
setup({