Skip to content

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

Uxw 3355 page titles not in sync with data studio tabs (#71401)

Nick Fitzpatrickbee30e64230b
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/CreateMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.unit.spec.tsx
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
new file mode 100644
index 00000000000..fe4036b0095
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
@@ -0,0 +1,437 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+import _ from "underscore";
+
+import { useListCollectionsTreeQuery } from "metabase/api";
+import { isLibraryCollection } from "metabase/collections/utils";
+import { DateTime } from "metabase/common/components/DateTime";
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { ListEmptyState } from "metabase/common/components/ListEmptyState";
+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 { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
+import { useRouter } from "metabase/router";
+import {
+ Anchor,
+ Card,
+ EntityNameCell,
+ Flex,
+ Icon,
+ Stack,
+ Text,
+ TextInput,
+ TreeTable,
+ type TreeTableColumnDef,
+ TreeTableSkeleton,
+ useTreeTableInstance,
+} from "metabase/ui";
+import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import type { Collection, CollectionId } from "metabase-types/api";
+
+import { LibraryEmptyState } from "../components/LibraryEmptyState";
+
+import { CreateMenu } from "./CreateMenu";
+import { PublishTableModal } from "./PublishTableModal";
+import { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";
+import { useBuildTreeForCollection, useErrorHandling } from "./hooks";
+import { getAccessibleCollection, getWritableCollection } from "./utils";
+
+interface EmptyStateActionProps {
+ data: EmptyStateData;
+ onPublishTable: () => void;
+}
+
+function EmptyStateAction({ data, onPublishTable }: EmptyStateActionProps) {
+ if (data.sectionType === "data") {
+ return (
+ <Anchor
+ component="button"
+ type="button"
+ fz="inherit"
+ onClick={(e) => {
+ e.stopPropagation();
+ onPublishTable();
+ }}
+ >
+ {data.actionLabel}
+ </Anchor>
+ );
+ }
+
+ if (data.actionUrl) {
+ return (
+ <Anchor
+ component={ForwardRefLink}
+ to={data.actionUrl}
+ fz="inherit"
+ onClick={(e) => e.stopPropagation()}
+ >
+ {data.actionLabel}
+ </Anchor>
+ );
+ }
+
+ return null;
+}
+
+export function LibraryPage() {
+ const hasLibraryFeature = useHasTokenFeature("library");
+
+ if (!hasLibraryFeature) {
+ return <LibraryUpsellPage />;
+ }
+
+ return <LibraryPageContent />;
+}
+
+function LibraryPageContent() {
+ const { location } = useRouter();
+ const [editingCollection, setEditingCollection] = useState<Collection | null>(
+ null,
+ );
+ const [permissionsCollectionId, setPermissionsCollectionId] =
+ useState<CollectionId | null>(null);
+ const [searchQuery, setSearchQuery] = useState("");
+ const [isPublishTableModalOpen, setIsPublishTableModalOpen] = useState(false);
+ const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+
+ const expandedIdsFromUrl = useMemo(() => {
+ const rawIds = location.query?.expandedId;
+ if (!rawIds) {
+ return null;
+ }
+
+ const ids = Array.isArray(rawIds) ? rawIds : [rawIds];
+ return _.object(
+ ids.map((id) => [`collection:${id}`, true]),
+ ) as ExpandedState;
+ }, [location.query?.expandedId]);
+
+ const { data: collections = [], isLoading: isLoadingCollections } =
+ useListCollectionsTreeQuery({
+ "exclude-other-user-collections": true,
+ "exclude-archived": true,
+ "include-library": true,
+ });
+
+ 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 writableMetricCollection = useMemo(
+ () =>
+ libraryCollection &&
+ getWritableCollection(libraryCollection, "library-metrics"),
+ [libraryCollection],
+ );
+
+ const getItemHref = useCallback((item: TreeItem): string | null => {
+ if (item.model === "empty-state" || isEmptyStateData(item.data)) {
+ return null;
+ }
+ const entityId = item.data.id as number;
+ if (item.model === "metric") {
+ return Urls.dataStudioMetric(entityId);
+ }
+ if (item.model === "snippet") {
+ return Urls.dataStudioSnippet(entityId);
+ }
+ if (item.model === "table") {
+ return Urls.dataStudioTable(entityId);
+ }
+ return null;
+ }, []);
+ const {
+ tree: tablesTree,
+ isLoading: loadingTables,
+ error: tablesError,
+ } = useBuildTreeForCollection(tableCollection, "data");
+ const {
+ tree: metricsTree,
+ isLoading: loadingMetrics,
+ error: metricsError,
+ } = useBuildTreeForCollection(
+ metricCollection,
+ "metrics",
+ metricCollection?.id,
+ );
+ const {
+ tree: snippetTree,
+ isLoading: loadingSnippets,
+ error: snippetsError,
+ } = useBuildSnippetTree();
+
+ const combinedTree = useMemo(
+ () => [...tablesTree, ...metricsTree, ...snippetTree],
+ [tablesTree, metricsTree, snippetTree],
+ );
+
+ const isLoading = loadingTables || loadingMetrics || loadingSnippets;
+ useErrorHandling(tablesError || metricsError || snippetsError);
+
+ // Collections with only empty-state children should always be expanded
+ // (even when navigating back via breadcrumbs which may collapse other sections)
+ const alwaysExpandedIds = useMemo(() => {
+ const ids: Record<string, boolean> = {};
+ combinedTree.forEach((node) => {
+ if (node.model === "collection" && node.children) {
+ const hasOnlyEmptyState = node.children.every(
+ (child) => child.model === "empty-state",
+ );
+ if (hasOnlyEmptyState) {
+ ids[node.id] = true;
+ }
+ }
+ });
+ return ids;
+ }, [combinedTree]);
+
+ // Merge URL-based expansion with always-expanded empty sections
+ const effectiveExpandedState = useMemo(() => {
+ if (!expandedIdsFromUrl) {
+ return true; // Expand all by default
+ }
+ return {
+ ...expandedIdsFromUrl,
+ ...alwaysExpandedIds,
+ };
+ }, [expandedIdsFromUrl, alwaysExpandedIds]);
+
+ 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-tertiary" fz="inherit">
+ {data.description}
+ </Text>
+ {!isRemoteSyncReadOnly && (
+ <EmptyStateAction
+ data={data}
+ onPublishTable={() => setIsPublishTableModalOpen(true)}
+ />
+ )}
+ </Flex>
+ );
+ }
+
+ return (
+ <EntityNameCell
+ data-testid={`${row.original.model}-name`}
+ icon={row.original.icon}
+ name={row.original.name}
+ />
+ );
+ },
+ },
+ {
+ 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;
+ }
+ const dateValue = getValue() as string | undefined;
+ return dateValue ? <DateTime value={dateValue} /> : null;
+ },
+ },
+ {
+ id: "actions",
+ width: 48,
+ cell: ({ row }) => {
+ const { data } = row.original;
+ if (isEmptyStateData(data)) {
+ return null;
+ }
+ if (
+ isCollection(data) &&
+ data.model === "collection" &&
+ data.namespace === "snippets"
+ ) {
+ if (data.id === "root") {
+ return (
+ <RootSnippetsCollectionMenu
+ setPermissionsCollectionId={setPermissionsCollectionId}
+ />
+ );
+ } else {
+ return (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionMenu
+ collection={data}
+ onEditDetails={setEditingCollection}
+ onChangePermissions={setPermissionsCollectionId}
+ />
+ );
+ }
+ }
+
+ return null;
+ },
+ },
+ ],
+ [setIsPublishTableModalOpen, isRemoteSyncReadOnly],
+ );
+
+ const getRowHref = useCallback(
+ (row: { original: TreeItem }) => getItemHref(row.original),
+ [getItemHref],
+ );
+
+ const treeTableInstance = useTreeTableInstance({
+ data: combinedTree,
+ columns: libraryColumnDef,
+ getSubRows: (node) => node.children,
+ getNodeId: (node) => node.id,
+ globalFilter: searchQuery,
+ onGlobalFilterChange: setSearchQuery,
+ isFilterable: (node) =>
+ node.model !== "collection" && node.model !== "empty-state",
+ defaultExpanded: effectiveExpandedState,
+ });
+
+ let emptyMessage = null;
+ if (!libraryHasContent) {
+ emptyMessage = t`No tables, metrics, or snippets yet`;
+ } else if (searchQuery) {
+ emptyMessage = t`No results for "${searchQuery}"`;
+ }
+
+ return (
+ <>
+ <SectionLayout>
+ <PaneHeader
+ breadcrumbs={
+ <DataStudioBreadcrumbs>{t`Library`}</DataStudioBreadcrumbs>
+ }
+ px="3.5rem"
+ py={0}
+ />
+ <Stack
+ bg="background-secondary"
+ data-testid="library-page"
+ pb="2rem"
+ px="3.5rem"
+ style={{ overflow: "hidden" }}
+ >
+ {!libraryCollection && !isLoadingCollections ? (
+ <LibraryEmptyState />
+ ) : (
+ <>
+ <Flex gap="md">
+ <TextInput
+ placeholder={t`Search...`}
+ leftSection={<Icon name="search" />}
+ bdrs="md"
+ flex="1"
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ />
+ <CreateMenu
+ metricCollectionId={writableMetricCollection?.id}
+ canWriteToMetricCollection={!!writableMetricCollection}
+ />
+ </Flex>
+ <Card withBorder p={0}>
+ {isLoading ? (
+ <TreeTableSkeleton columnWidths={[0.6, 0.2, 0.05]} />
+ ) : (
+ <TreeTable
+ instance={treeTableInstance}
+ emptyState={
+ emptyMessage ? (
+ <ListEmptyState label={emptyMessage} />
+ ) : null
+ }
+ onRowClick={(row) => {
+ if (row.original.model === "empty-state") {
+ return;
+ }
+ if (row.getCanExpand()) {
+ row.toggleExpanded();
+ }
+ // Navigation for leaf nodes is handled by the link
+ }}
+ getRowHref={getRowHref}
+ />
+ )}
+ </Card>
+ </>
+ )}
+ </Stack>
+ </SectionLayout>
+ {editingCollection && (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionFormModal
+ collection={editingCollection}
+ onClose={() => setEditingCollection(null)}
+ onSaved={() => setEditingCollection(null)}
+ />
+ )}
+ {permissionsCollectionId !== null && (
+ <PLUGIN_SNIPPET_FOLDERS.CollectionPermissionsModal
+ collectionId={permissionsCollectionId}
+ onClose={() => setPermissionsCollectionId(null)}
+ />
+ )}
+ <PublishTableModal
+ opened={isPublishTableModalOpen}
+ onClose={() => setIsPublishTableModalOpen(false)}
+ onPublished={() => setIsPublishTableModalOpen(false)}
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/PublishTableModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/PublishTableModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/PublishTableModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/PublishTableModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx
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/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/RootSnippetsCollectionMenu.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/hooks.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/index.ts
new file mode 100644
index 00000000000..22776757c98
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/index.ts
@@ -0,0 +1 @@
+export { LibraryPage } from "./LibraryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.unit.spec.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/utils.unit.spec.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/utils.unit.spec.ts
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.tsx
index 65a37df31cc..94dad07f5f6 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
@@ -1,439 +1,14 @@
-import { useCallback, useMemo, useState } from "react";
+import type { ReactNode } from "react";
import { t } from "ttag";
-import _ from "underscore";
-import { useListCollectionsTreeQuery } from "metabase/api";
-import { isLibraryCollection } from "metabase/collections/utils";
-import { DateTime } from "metabase/common/components/DateTime";
-import { ForwardRefLink } from "metabase/common/components/Link";
-import { ListEmptyState } from "metabase/common/components/ListEmptyState";
-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";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
-import { useRouter } from "metabase/router";
-import {
- Anchor,
- Card,
- EntityNameCell,
- Flex,
- Icon,
- Stack,
- Text,
- TextInput,
- TreeTable,
- type TreeTableColumnDef,
- TreeTableSkeleton,
- useTreeTableInstance,
-} from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
-import type { Collection, CollectionId } from "metabase-types/api";
-import { LibraryEmptyState } from "../components/LibraryEmptyState";
+type LibrarySectionLayoutProps = {
+ children?: ReactNode;
+};
-import { CreateMenu } from "./CreateMenu";
-import { PublishTableModal } from "./PublishTableModal";
-import { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";
-import { useBuildTreeForCollection, useErrorHandling } from "./hooks";
-import { getAccessibleCollection, getWritableCollection } from "./utils";
-
-interface EmptyStateActionProps {
- data: EmptyStateData;
- onPublishTable: () => void;
-}
-
-function EmptyStateAction({ data, onPublishTable }: EmptyStateActionProps) {
- if (data.sectionType === "data") {
- return (
- <Anchor
- component="button"
- type="button"
- fz="inherit"
- onClick={(e) => {
- e.stopPropagation();
- onPublishTable();
- }}
- >
- {data.actionLabel}
- </Anchor>
- );
- }
-
- if (data.actionUrl) {
- return (
- <Anchor
- component={ForwardRefLink}
- to={data.actionUrl}
- fz="inherit"
- onClick={(e) => e.stopPropagation()}
- >
- {data.actionLabel}
- </Anchor>
- );
- }
-
- return null;
-}
-
-export function LibrarySectionLayout() {
+export function LibrarySectionLayout({ children }: LibrarySectionLayoutProps) {
usePageTitle(t`Library`);
- const hasLibraryFeature = useHasTokenFeature("library");
-
- if (!hasLibraryFeature) {
- return <LibraryUpsellPage />;
- }
-
- return <LibrarySectionContent />;
-}
-
-function LibrarySectionContent() {
- const { location } = useRouter();
- const [editingCollection, setEditingCollection] = useState<Collection | null>(
- null,
- );
- const [permissionsCollectionId, setPermissionsCollectionId] =
- useState<CollectionId | null>(null);
- const [searchQuery, setSearchQuery] = useState("");
- const [isPublishTableModalOpen, setIsPublishTableModalOpen] = useState(false);
- const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
-
- const expandedIdsFromUrl = useMemo(() => {
- const rawIds = location.query?.expandedId;
- if (!rawIds) {
- return null;
- }
-
- const ids = Array.isArray(rawIds) ? rawIds : [rawIds];
- return _.object(
- ids.map((id) => [`collection:${id}`, true]),
- ) as ExpandedState;
- }, [location.query?.expandedId]);
-
- const { data: collections = [], isLoading: isLoadingCollections } =
- useListCollectionsTreeQuery({
- "exclude-other-user-collections": true,
- "exclude-archived": true,
- "include-library": true,
- });
-
- 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 writableMetricCollection = useMemo(
- () =>
- libraryCollection &&
- getWritableCollection(libraryCollection, "library-metrics"),
- [libraryCollection],
- );
-
- const getItemHref = useCallback((item: TreeItem): string | null => {
- if (item.model === "empty-state" || isEmptyStateData(item.data)) {
- return null;
- }
- const entityId = item.data.id as number;
- if (item.model === "metric") {
- return Urls.dataStudioMetric(entityId);
- }
- if (item.model === "snippet") {
- return Urls.dataStudioSnippet(entityId);
- }
- if (item.model === "table") {
- return Urls.dataStudioTable(entityId);
- }
- return null;
- }, []);
- const {
- tree: tablesTree,
- isLoading: loadingTables,
- error: tablesError,
- } = useBuildTreeForCollection(tableCollection, "data");
- const {
- tree: metricsTree,
- isLoading: loadingMetrics,
- error: metricsError,
- } = useBuildTreeForCollection(
- metricCollection,
- "metrics",
- metricCollection?.id,
- );
- const {
- tree: snippetTree,
- isLoading: loadingSnippets,
- error: snippetsError,
- } = useBuildSnippetTree();
-
- const combinedTree = useMemo(
- () => [...tablesTree, ...metricsTree, ...snippetTree],
- [tablesTree, metricsTree, snippetTree],
- );
-
- const isLoading = loadingTables || loadingMetrics || loadingSnippets;
- useErrorHandling(tablesError || metricsError || snippetsError);
-
- // Collections with only empty-state children should always be expanded
- // (even when navigating back via breadcrumbs which may collapse other sections)
- const alwaysExpandedIds = useMemo(() => {
- const ids: Record<string, boolean> = {};
- combinedTree.forEach((node) => {
- if (node.model === "collection" && node.children) {
- const hasOnlyEmptyState = node.children.every(
- (child) => child.model === "empty-state",
- );
- if (hasOnlyEmptyState) {
- ids[node.id] = true;
- }
- }
- });
- return ids;
- }, [combinedTree]);
-
- // Merge URL-based expansion with always-expanded empty sections
- const effectiveExpandedState = useMemo(() => {
- if (!expandedIdsFromUrl) {
- return true; // Expand all by default
- }
- return {
- ...expandedIdsFromUrl,
- ...alwaysExpandedIds,
- };
- }, [expandedIdsFromUrl, alwaysExpandedIds]);
-
- 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-tertiary" fz="inherit">
- {data.description}
- </Text>
- {!isRemoteSyncReadOnly && (
- <EmptyStateAction
- data={data}
- onPublishTable={() => setIsPublishTableModalOpen(true)}
- />
- )}
- </Flex>
- );
- }
-
- return (
- <EntityNameCell
- data-testid={`${row.original.model}-name`}
- icon={row.original.icon}
- name={row.original.name}
- />
- );
- },
- },
- {
- 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;
- }
- const dateValue = getValue() as string | undefined;
- return dateValue ? <DateTime value={dateValue} /> : null;
- },
- },
- {
- id: "actions",
- width: 48,
- cell: ({ row }) => {
- const { data } = row.original;
- if (isEmptyStateData(data)) {
- return null;
- }
- if (
- isCollection(data) &&
- data.model === "collection" &&
- data.namespace === "snippets"
- ) {
- if (data.id === "root") {
- return (
- <RootSnippetsCollectionMenu
- setPermissionsCollectionId={setPermissionsCollectionId}
- />
- );
- } else {
- return (
- <PLUGIN_SNIPPET_FOLDERS.CollectionMenu
- collection={data}
- onEditDetails={setEditingCollection}
- onChangePermissions={setPermissionsCollectionId}
- />
- );
- }
- }
-
- return null;
- },
- },
- ],
- [setIsPublishTableModalOpen, isRemoteSyncReadOnly],
- );
-
- const getRowHref = useCallback(
- (row: { original: TreeItem }) => getItemHref(row.original),
- [getItemHref],
- );
-
- const treeTableInstance = useTreeTableInstance({
- data: combinedTree,
- columns: libraryColumnDef,
- getSubRows: (node) => node.children,
- getNodeId: (node) => node.id,
- globalFilter: searchQuery,
- onGlobalFilterChange: setSearchQuery,
- isFilterable: (node) =>
- node.model !== "collection" && node.model !== "empty-state",
- defaultExpanded: effectiveExpandedState,
- });
-
- let emptyMessage = null;
- if (!libraryHasContent) {
- emptyMessage = t`No tables, metrics, or snippets yet`;
- } else if (searchQuery) {
- emptyMessage = t`No results for "${searchQuery}"`;
- }
- return (
- <>
- <SectionLayout>
- <PaneHeader
- breadcrumbs={
- <DataStudioBreadcrumbs>{t`Library`}</DataStudioBreadcrumbs>
- }
- px="3.5rem"
- py={0}
- />
- <Stack
- bg="background-secondary"
- data-testid="library-page"
- pb="2rem"
- px="3.5rem"
- style={{ overflow: "hidden" }}
- >
- {!libraryCollection && !isLoadingCollections ? (
- <LibraryEmptyState />
- ) : (
- <>
- <Flex gap="md">
- <TextInput
- placeholder={t`Search...`}
- leftSection={<Icon name="search" />}
- bdrs="md"
- flex="1"
- value={searchQuery}
- onChange={(e) => setSearchQuery(e.target.value)}
- />
- <CreateMenu
- metricCollectionId={writableMetricCollection?.id}
- canWriteToMetricCollection={!!writableMetricCollection}
- />
- </Flex>
- <Card withBorder p={0}>
- {isLoading ? (
- <TreeTableSkeleton columnWidths={[0.6, 0.2, 0.05]} />
- ) : (
- <TreeTable
- instance={treeTableInstance}
- emptyState={
- emptyMessage ? (
- <ListEmptyState label={emptyMessage} />
- ) : null
- }
- onRowClick={(row) => {
- if (row.original.model === "empty-state") {
- return;
- }
- if (row.getCanExpand()) {
- row.toggleExpanded();
- }
- // Navigation for leaf nodes is handled by the link
- }}
- getRowHref={getRowHref}
- />
- )}
- </Card>
- </>
- )}
- </Stack>
- </SectionLayout>
- {editingCollection && (
- <PLUGIN_SNIPPET_FOLDERS.CollectionFormModal
- collection={editingCollection}
- onClose={() => setEditingCollection(null)}
- onSaved={() => setEditingCollection(null)}
- />
- )}
- {permissionsCollectionId !== null && (
- <PLUGIN_SNIPPET_FOLDERS.CollectionPermissionsModal
- collectionId={permissionsCollectionId}
- onClose={() => setPermissionsCollectionId(null)}
- />
- )}
- <PublishTableModal
- opened={isPublishTableModalOpen}
- onClose={() => setIsPublishTableModalOpen(false)}
- onPublished={() => setIsPublishTableModalOpen(false)}
- />
- </>
- );
+ return <>{children}</>;
}
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 2d4a51bb4bb..0fadd506029 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
@@ -2,6 +2,7 @@ import { IndexRoute, Route } from "react-router";
import { getDataStudioSegmentRoutes } from "metabase/data-studio/segments/routes";
+import { LibraryPage } from "./LibraryPage";
import { LibrarySectionLayout } from "./LibrarySectionLayout";
import { getDataStudioMetricRoutes } from "./metrics/routes";
import { getDataStudioSnippetRoutes } from "./snippets/routes";
@@ -9,8 +10,8 @@ import { getDataStudioTableRoutes } from "./tables/routes";
export const getDataStudioLibraryRoutes = () => {
return (
- <Route path="library">
- <IndexRoute component={LibrarySectionLayout} />
+ <Route path="library" component={LibrarySectionLayout}>
+ <IndexRoute component={LibraryPage} />
{getDataStudioTableRoutes()}
{getDataStudioMetricRoutes()}
{getDataStudioSegmentRoutes()}
diff --git a/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
index 4cc8ff16139..22d3ed2e252 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx
@@ -10,7 +10,7 @@ type DataSectionLayoutProps = {
};
export function DataSectionLayout({ children }: DataSectionLayoutProps) {
- usePageTitle(t`Data`);
+ usePageTitle(t`Data structure`);
return <SectionLayout>{children}</SectionLayout>;
}
diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
index 59095702676..08c3229ce6a 100644
--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
@@ -17,7 +17,7 @@ type TransformsSectionLayoutProps = {
export function TransformsSectionLayout({
children,
}: TransformsSectionLayoutProps) {
- usePageTitle(t`Transforms`);
+ usePageTitle(t`Transforms`, { titleIndex: 1 });
const shouldShowUpsell = useSelector(getShouldShowTransformsUpsell);
const isTransformsEnabled = useSetting("transforms-enabled");
const isHosted = useSetting("is-hosted?");
diff --git a/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
index 8bec2866d19..010a177f450 100644
--- a/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
+++ b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
@@ -14,12 +14,14 @@ import {
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { usePageTitle } from "metabase/hooks/use-page-title";
import { GlossaryTable } from "metabase/reference/glossary/GlossaryTable";
import { Box, Card } from "metabase/ui";
import S from "./GlossaryPage.module.css";
export function GlossaryPage() {
+ usePageTitle(t`Glossary`);
const { data: glossary = [] } = useListGlossaryQuery();
const [createGlossary] = useCreateGlossaryMutation();
const [updateGlossary] = useUpdateGlossaryMutation();
diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsx
index 6577a8786e2..cf8476f6452 100644
--- a/frontend/src/metabase/data-studio/routes.tsx
+++ b/frontend/src/metabase/data-studio/routes.tsx
@@ -16,6 +16,7 @@ import type { State } from "metabase-types/store";
import { DataSectionLayout } from "./app/pages/DataSectionLayout";
import { DataStudioLayout } from "./app/pages/DataStudioLayout";
import { DependenciesSectionLayout } from "./app/pages/DependenciesSectionLayout";
+import { DependencyDiagnosticsSectionLayout } from "./app/pages/DependencyDiagnosticsSectionLayout";
import { GitSyncSectionLayout } from "./app/pages/GitSyncSectionLayout";
import { TransformsSectionLayout } from "./app/pages/TransformsSectionLayout";
import { WorkspacesSectionLayout } from "./app/pages/WorkspacesSectionLayout";
@@ -70,7 +71,7 @@ export function getDataStudioRoutes(
{PLUGIN_DEPENDENCIES.isEnabled ? (
<Route
path="dependency-diagnostics"
- component={DependenciesSectionLayout}
+ component={DependencyDiagnosticsSectionLayout}
>
{PLUGIN_DEPENDENCIES.getDataStudioDependencyDiagnosticsRoutes()}
</Route>
diff --git a/frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx b/frontend/src/metabase/transforms/pages/JobSectionLayout/JobSectionLayout.tsx
similarity index 52%
rename from frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx
rename to frontend/src/metabase/transforms/pages/JobSectionLayout/JobSectionLayout.tsx
index c7018b11581..7cdebf338ff 100644
--- a/frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.tsx
+++ b/frontend/src/metabase/transforms/pages/JobSectionLayout/JobSectionLayout.tsx
@@ -1,14 +1,15 @@
import type { ReactNode } from "react";
+import { t } from "ttag";
+import { usePageTitle } from "metabase/hooks/use-page-title";
import { Flex } from "metabase/ui";
interface TransformTopNavLayoutProps {
children: ReactNode;
}
-export const TransformTopNavLayout = ({
- children,
-}: TransformTopNavLayoutProps) => {
+export const JobSectionLayout = ({ children }: TransformTopNavLayoutProps) => {
+ usePageTitle(t`Jobs`, { titleIndex: 0 });
return (
<Flex direction="column" w="100%" h="100%">
{children}
diff --git a/frontend/src/metabase/transforms/pages/JobSectionLayout/index.ts b/frontend/src/metabase/transforms/pages/JobSectionLayout/index.ts
new file mode 100644
index 00000000000..8283aec6fba
--- /dev/null
+++ b/frontend/src/metabase/transforms/pages/JobSectionLayout/index.ts
@@ -0,0 +1 @@
+export { JobSectionLayout } from "./JobSectionLayout";
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
index 96c802be0b5..96d704e5549 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
@@ -13,6 +13,7 @@ import {
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { usePageTitle } from "metabase/hooks/use-page-title";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { POLLING_INTERVAL } from "metabase/transforms/constants";
@@ -43,6 +44,7 @@ type RunListPageProps = {
};
export function RunListPage({ location }: RunListPageProps) {
+ usePageTitle(t`Runs`);
const params = getParsedParams(location);
const { page = 0 } = params;
const { ref: containerRef, width: containerWidth } = useElementSize();
diff --git a/frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css b/frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css
deleted file mode 100644
index 3928ba9b966..00000000000
--- a/frontend/src/metabase/transforms/pages/TransformTopNavLayout/TransformTopNavLayout.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.header {
- border-bottom: 1px solid var(--mb-color-border);
-}
diff --git a/frontend/src/metabase/transforms/pages/TransformTopNavLayout/index.ts b/frontend/src/metabase/transforms/pages/TransformTopNavLayout/index.ts
deleted file mode 100644
index 5076b630446..00000000000
--- a/frontend/src/metabase/transforms/pages/TransformTopNavLayout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TransformTopNavLayout } from "./TransformTopNavLayout";
diff --git a/frontend/src/metabase/transforms/routes.tsx b/frontend/src/metabase/transforms/routes.tsx
index 74f983d2b2d..bfeca8b45f6 100644
--- a/frontend/src/metabase/transforms/routes.tsx
+++ b/frontend/src/metabase/transforms/routes.tsx
@@ -8,6 +8,7 @@ import {
import { JobListPage } from "./pages/JobListPage";
import { JobPage } from "./pages/JobPage";
+import { JobSectionLayout } from "./pages/JobSectionLayout";
import { NewJobPage } from "./pages/NewJobPage";
import {
NewCardTransformPage,
@@ -20,19 +21,19 @@ import { TransformListPage } from "./pages/TransformListPage";
import { TransformQueryPage } from "./pages/TransformQueryPage";
import { TransformRunPage } from "./pages/TransformRunPage";
import { TransformSettingsPage } from "./pages/TransformSettingsPage";
-import { TransformTopNavLayout } from "./pages/TransformTopNavLayout";
export function getDataStudioTransformRoutes() {
return (
<>
- <Route path="runs" component={TransformTopNavLayout}>
- <IndexRoute component={RunListPage} />
- </Route>
+ <Route path="runs" component={RunListPage} />
<Route>
<IndexRoute component={TransformListPage} />
- <Route path="jobs" component={JobListPage} />
- <Route path="jobs/new" component={NewJobPage} />
- <Route path="jobs/:jobId" component={JobPage} />
+ <Route path="jobs" component={JobSectionLayout}>
+ <IndexRoute component={JobListPage} />
+ <Route path="new" component={NewJobPage} />
+ <Route path=":jobId" component={JobPage} />
+ </Route>
+
<Route path="new/query" component={NewQueryTransformPage} />
<Route path="new/native" component={NewNativeTransformPage} />
<Route path="new/card/:cardId" component={NewCardTransformPage} />