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
Clean up url utils (#73167)
Romeo Van Snick7ff626e9669b
diff --git a/deps.edn b/deps.ednindex 3141882d85d..b67e71cf478 100644--- a/deps.edn+++ b/deps.edn@@ -716,7 +716,7 @@"resources/html-entities.edn""resources/openapi/.*""frontend/src/cljs"- "frontend/src/metabase/utils/urls\\.unit\\.spec\\.js$"+ "frontend/src/metabase/urls\\.unit\\.spec\\.js$""frontend/src/metabase/utils/formatting\\.unit\\.spec\\.js$""src/metabase/util/currency\\.cljc$""test/metabase/channel/render/png_test.clj"diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsxindex b2f0284bd12..0fd955521c8 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx@@ -3,7 +3,7 @@ import { jt, t } from "ttag";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { Code } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { isEmpty } from "metabase/utils/validate";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsxindex 9955d0710ee..a3605d7ac1b 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsx@@ -4,7 +4,7 @@ import { Link } from "metabase/common/components/Link";import SidesheetS from "metabase/common/components/Sidesheet/sidesheet.module.css";import type { InsightsLinkProps } from "metabase/plugins";import { Flex, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useGetAuditInfoQuery } from "metabase-enterprise/api";import type { Collection } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsxindex 544ed76b027..c667ba29759 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import type { InsightsMenuItemProps } from "metabase/plugins";import { Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useGetAuditInfoQuery } from "metabase-enterprise/api";export const InsightsMenuItem = ({diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js b/enterprise/frontend/src/metabase-enterprise/audit_app/index.jsindex 7387b2c08cf..020cbf12ed9 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/index.js@@ -7,7 +7,7 @@ import {PLUGIN_AUDIT,} from "metabase/plugins";import { Menu } from "metabase/ui";-import { isInternalUser } from "metabase/utils/urls";+import { isInternalUser } from "metabase/urls";import { hasPremiumFeature } from "metabase-enterprise/settings";import { InsightsLink } from "./components/InsightsLink";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxindex 3894c3eade4..3977ff95910 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx@@ -33,10 +33,10 @@ import {Text,Title,} from "metabase/ui";+import { question as ML_getUrl } from "metabase/urls/questions";import { formatNumber } from "metabase/utils/formatting";import { getUserName } from "metabase/utils/user";import Question from "metabase-lib/v1/Question";-import { getUrl as ML_getUrl } from "metabase-lib/v1/urls";import type { DatasetQuery, VisualizationDisplay } from "metabase-types/api";import { useGetMetabotConversationQuery } from "../../api";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsxindex b603be9c74e..9f7b11e6f6b 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx@@ -22,8 +22,8 @@ import {Text,Title,} from "metabase/ui";+import * as Urls from "metabase/urls";import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";-import * as Urls from "metabase/utils/urls";import { getUserName } from "metabase/utils/user";import { useGetTenantQuery } from "metabase-enterprise/api";import * as EnterpriseUrls from "metabase-enterprise/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsxindex e89fa0ef89e..2920968df34 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx@@ -6,7 +6,7 @@ import { EllipsifiedCollectionPath } from "metabase/common/components/Ellipsifieimport { Link } from "metabase/common/components/Link";import { getIcon } from "metabase/common/utils/icon";import { Box, Button, Ellipsified, FixedSizeIcon, Flex } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CacheableModel } from "metabase-types/api";import type { CacheableItem, UpdateTarget } from "../types";diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsxindex 37c7c790634..17322e8cf3e 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsx@@ -1,7 +1,7 @@import { match } from "ts-pattern";import { t } from "ttag";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import type { CacheableDashboard, CacheableModel } from "metabase-types/api";@@ -27,5 +27,5 @@ export const getItemUrl = () =>match(model).with("dashboard", () => Urls.dashboard(item))- .with("question", () => Urls.question(item))+ .with("question", () => Urls.card(item)).otherwise(() => null);diff --git a/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsxindex bd37c6b137e..6284fe865e0 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx@@ -14,7 +14,7 @@ import { MetricPageShell } from "metabase/metrics/components/MetricPageShell";import { metricUrls as defaultUrls } from "metabase/metrics/urls";import type { MetricSettingsPageProps } from "metabase/plugins/oss/caching";import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getItemName } from "metabase-enterprise/caching/components/utils";import Question from "metabase-lib/v1/Question";import type { CacheableModel } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsxindex 8dc53d4f299..e37e58afa7d 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx@@ -10,7 +10,7 @@ import { useListSelect } from "metabase/common/hooks/use-list-select";import { Search } from "metabase/entities/search";import { useDispatch } from "metabase/redux";import { Flex, Modal } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";import type { SortingOptions } from "metabase-types/api/sorting";diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsxindex 6569003220a..9895f7cc5ea 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsx@@ -6,7 +6,7 @@ import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen"import { ModalRoute } from "metabase/hoc/ModalRoute";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { Badge, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";import { hasPremiumFeature } from "metabase-enterprise/settings";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsxindex 9020f18e3c4..642cb771ecb 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx@@ -11,7 +11,7 @@ import {canUserCreateQueries,} from "metabase/selectors/user";import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { CollectionId } from "metabase-types/api";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.tsxindex d97161ff9b9..dc132b07d40 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx@@ -39,7 +39,7 @@ import {TreeTableSkeleton,useTreeTableInstance,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { Collection, CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsxindex 05ac4e0c468..a5786244318 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";-import { dataStudioArchivedSnippets } from "metabase/utils/urls";+import { dataStudioArchivedSnippets } from "metabase/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsxindex 8fb05631003..1e77f043da9 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx@@ -4,7 +4,7 @@ import { Route } from "react-router";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks/state";-import { dataStudioArchivedSnippets } from "metabase/utils/urls";+import { dataStudioArchivedSnippets } from "metabase/urls";import type { EnterpriseSettings } from "metabase-types/api";import { createMockUser } from "metabase-types/api/mocks";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsxindex 63c8c147f02..f88f62be079 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx@@ -23,7 +23,7 @@ import {Stack,Text,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { usePublishTablesMutation } from "metabase-enterprise/api";import type {BulkTableInfo,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsxindex 81a3e9c5529..d34d6bbc7cf 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx@@ -1,7 +1,7 @@import { Link } from "metabase/common/components/Link";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Card } from "metabase-types/api";interface DataStudioMetricBreadcrumbsProps {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsxindex 78d86473486..a5962ae6df1 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { NewMetricPage } from "metabase/metrics/pages/NewMetricPage";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { dataStudioMetricUrls } from "../../urls";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.tsindex 1ab55c2cc5c..bf745b3318a 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts@@ -1,5 +1,5 @@import type { MetricUrls } from "metabase/metrics/types";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";export const dataStudioMetricUrls: MetricUrls = {about: Urls.dataStudioMetric,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 ca87c4708fc..9c1034b39cd 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@@ -16,7 +16,7 @@ import {import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";import { PLUGIN_DEPENDENCIES, PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { NativeQuerySnippet } from "metabase-types/api";import { SnippetMoreMenu } from "../SnippetMoreMenu";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.tsxindex 82346c9c910..021c872fe3a 100644--- 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.tsx@@ -7,7 +7,7 @@ import { getErrorMessage } from "metabase/api/utils";import { useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";import { Button, Group, Modal, Stack, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { NativeQuerySnippet } from "metabase-types/api";type ArchiveSnippetModalProps = {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.tsxindex 721c9cc466a..d25f25d62eb 100644--- 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.tsx@@ -20,7 +20,7 @@ import {TreeTableSkeleton,useTreeTableInstance,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionItem } from "metabase-types/api";import { useColumnDef } from "./hooks/useColumnDef";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 7ef958acb46..92c416b5c99 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@@ -21,7 +21,7 @@ import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeimport { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";import { Alert, Card, Center, Flex, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";import { SnippetHeader } from "../../components/SnippetHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsxindex dd4e51a5baf..2300c5caa23 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx@@ -22,7 +22,7 @@ import {import { PLUGIN_REMOTE_SYNC, PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { Card, Flex, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {NativeQuerySnippet,RegularCollectionId,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsxindex bc946add648..7848786933c 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx@@ -5,7 +5,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { SnippetHeader } from "../../components/SnippetHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsxindex fd271b42f03..66d15dc740c 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx@@ -5,7 +5,7 @@ import {type PaneHeaderProps,} from "metabase/data-studio/common/components/PaneHeader";import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";import { TableMoreMenu } from "./TableMoreMenu";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsxindex d2664349a35..b509a3d1455 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx@@ -6,7 +6,7 @@ import { ForwardRefLink } from "metabase/common/components/Link";import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { ActionIcon, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";type TableModalType = "unpublish";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsxindex f9ca917065d..9d241de05ce 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx@@ -8,7 +8,7 @@ import {import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";type TableTabsProps = {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsxindex 1e4ab44b3ac..cc35e886c3f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx@@ -5,7 +5,7 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContaiimport { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TableHeader } from "../../components/TableHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsxindex 61ca7b6c944..8b11b817483 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx@@ -25,7 +25,7 @@ import {Stack,Text,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { trackMetadataChange } from "../../analytics";import { TableHeader } from "../../components/TableHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsxindex c5dbad0e06e..ca7940a3372 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx@@ -8,7 +8,7 @@ import {import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";import { useSelector } from "metabase/redux";import { Flex } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ConcreteTableId, Table } from "metabase-types/api";type TableMeasuresProps = {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsxindex 85dd60a0277..c4216c5a3f6 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx@@ -2,7 +2,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TableHeader } from "../../components/TableHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsxindex 47e405a8960..347b3846f5d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx@@ -24,8 +24,8 @@ import {Text,rem,} from "metabase/ui";+import * as Urls from "metabase/urls";import { isNullOrUndefined } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import type { Table, TableDataSource, UserId } from "metabase-types/api";import S from "./DescriptionSection.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsxindex 7427dc712a0..ac647c1beb0 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx@@ -2,7 +2,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TableHeader } from "../../components/TableHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsxindex 026bca70ae7..39f48482cb3 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx@@ -8,7 +8,7 @@ import {import { getUserCanWriteSegments } from "metabase/data-studio/selectors";import { useSelector } from "metabase/redux";import { Flex } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ConcreteTableId, Table } from "metabase-types/api";type TableSegmentsProps = {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsxindex f1680e722f4..136ee4288fa 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx@@ -2,7 +2,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TableHeader } from "../../components/TableHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsxindex a44bb603335..a6622578d56 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx@@ -12,7 +12,7 @@ import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { Flex, Icon, Modal, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useCreateDestinationDatabaseMutation } from "metabase-enterprise/api";import type { Database, DatabaseData } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsxindex acf8e7ddf67..30578b5be66 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { useDispatch } from "metabase/redux";import { Modal } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { DestinationDatabasesList } from "../DestinationDatabasesList";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsxindex db756621d0a..f53850c7fc9 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx@@ -6,7 +6,7 @@ import { useDeleteDatabaseMutation, useGetDatabaseQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useDispatch } from "metabase/redux";import { Modal } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";export const RemoveDestinationDatabaseModal = ({params,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsxindex d95c72817fb..4904de26816 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx@@ -21,7 +21,7 @@ import {Stack,Text,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import visualizations from "metabase/visualizations";import type {Card as ApiCard,@@ -155,7 +155,7 @@ function getItemName(item: DependencyItem) {function getItemLink(item: DependencyItem) {switch (item.type) {case "card":- return Urls.question(item.card);+ return Urls.card(item.card);default:return Urls.transform(item.transform.id);}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsxindex a69e032ca90..0fac3ec42ee 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx@@ -5,7 +5,7 @@ import { useLayoutEffect, useState } from "react";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { trackDependencyDiagnosticsEntitySelected } from "metabase/data-studio/analytics";import { Center, Flex, Stack } from "metabase/ui";-import type * as Urls from "metabase/utils/urls";+import type * as Urls from "metabase/urls";import {useListBreakingGraphNodesQuery,useListUnreferencedGraphNodesQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsxindex e8ed0ee8a61..e5d0a7c8dcb 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx@@ -7,7 +7,7 @@ import {type PaneHeaderTab,PaneHeaderTabs,} from "metabase/data-studio/common/components/PaneHeader";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";export const DiagnosticsHeader = memo(function DiagnosticsHeader() {const tabs: PaneHeaderTab[] = [diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsxindex adc9ae41d3d..826b0904128 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { DateTime } from "metabase/common/components/DateTime";import CS from "metabase/css/core/index.css";import { Anchor, Box, Card, FixedSizeIcon, Group, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getUserName } from "metabase/utils/user";import type { DependencyNode } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsxindex 215965cf068..dc19c51cf3b 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx@@ -5,7 +5,7 @@ import { ForwardRefLink } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { DependencyNode } from "metabase-types/api";import { TOOLTIP_OPEN_DELAY_MS } from "../../../../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.tsindex eb66f57fad9..7813e3b8d97 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.ts@@ -1,4 +1,4 @@-import type * as Urls from "metabase/utils/urls";+import type * as Urls from "metabase/urls";import { DEFAULT_INCLUDE_PERSONAL_COLLECTIONS } from "../../constants";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsxindex 64851bb3b31..0cf3cda368d 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx@@ -1,7 +1,7 @@import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { DependencyEntry, DependencyNode } from "metabase-types/api";import {createMockCardDependencyNode,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.tsindex 463d0e1690b..03f7889e1cc 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { DependencyEntry, DependencyNode } from "metabase-types/api";import type { NodeTableInfo } from "./types";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsxindex 142a46bb8b1..823336b8474 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx@@ -13,7 +13,7 @@ import {Menu,Stack,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { DependencyNode } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsxindex 4e28dda3855..e1fc4779831 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx@@ -4,7 +4,7 @@ import { replace } from "react-router-redux";import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import { useDispatch } from "metabase/redux";-import type * as Urls from "metabase/utils/urls";+import type * as Urls from "metabase/urls";import { DependencyDiagnostics } from "../../components/DependencyDiagnostics";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsxindex b099248e6ae..015f60730f0 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsx@@ -12,7 +12,7 @@ import {screen,within,} from "__support__/ui";-import type * as Urls from "metabase/utils/urls";+import type * as Urls from "metabase/urls";import type {DependencyDiagnosticsUserParams,DependencyNode,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.tsindex 65331ddf5a7..3d8a366ef2d 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.ts@@ -1,6 +1,6 @@import type { Location } from "history";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {DEPENDENCY_GROUP_TYPES,DEPENDENCY_SORT_COLUMNS,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsxindex 9fa8e24862c..dbc829f22b2 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx@@ -5,7 +5,7 @@ import { skipToken } from "metabase/api";import { AppSwitcher } from "metabase/nav/components/AppSwitcher";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useGetDependencyGraphQuery } from "metabase-enterprise/api";import { DependencyGraph } from "../../components/DependencyGraph";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.tsindex dc5982bd38a..be6dbb2d27b 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts@@ -1,4 +1,4 @@-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { DEPENDENCY_TYPES, type DependencyEntry } from "metabase-types/api";export function parseDependencyEntry(diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.tsindex aa2a5fc5f8d..521761bbf02 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts@@ -1,7 +1,7 @@import { c, msgid, ngettext, t } from "ttag";import type { IconName } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { NamedUser } from "metabase/utils/user";import visualizations from "metabase/visualizations";import type {@@ -133,7 +133,7 @@ export function getNodeLink(node: DependencyNode): NodeLink | null {case "card":return {label: getCardLinkLabel(node.data.type),- url: Urls.question({+ url: Urls.card({id: node.id,name: node.data.name,type: node.data.type,diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsxindex 5ac723a49e3..539a3d1c6e5 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx@@ -25,7 +25,7 @@ import {Text,Title,} from "metabase/ui";-import { getSubpathSafeUrl } from "metabase/utils/urls";+import { getSubpathSafeUrl } from "metabase/urls";import { useGetGsheetsFolderQuery } from "metabase-enterprise/api";import {DriveConnectionDisplay,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsxindex b0d2a69b83f..855a137f206 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsx@@ -1,7 +1,7 @@import { Fragment } from "react";import { Anchor, Group, Text } from "metabase/ui";-import { collection as collectionUrl } from "metabase/utils/urls";+import { collection as collectionUrl } from "metabase/urls";import type { CollectionPathSegment } from "../../utils";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsxindex 924ae00ad2c..fee67cafc28 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsx@@ -6,7 +6,7 @@ import {getIcon,} from "metabase/common/utils/icon";import { Anchor, Group, Icon } from "metabase/ui";-import { modelToUrl } from "metabase/utils/urls";+import { modelToUrl } from "metabase/urls";import type { RemoteSyncEntity } from "metabase-types/api";import { getSyncStatusColor, getSyncStatusIcon } from "../../utils";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsxindex cd886bbef02..5e4f2675ea7 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx@@ -5,7 +5,7 @@ import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Button, Icon, Menu, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";export function TransformToolsMenu() {const isAdmin = useSelector(getUserIsAdmin);diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsxindex 7e5ac66ecf4..72d53ddf326 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import type { IconName } from "metabase/ui";import { Anchor, FixedSizeIcon, Group, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Card } from "metabase-types/api";type LocationSectionProps = {diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsxindex f704552ff88..8b70652bc81 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Card } from "metabase-types/api";import S from "./SidebarHeader.module.css";@@ -15,7 +15,7 @@ type SidebarHeaderProps = {};export function SidebarHeader({ card, onClose }: SidebarHeaderProps) {- const link = Urls.question({ id: card.id, name: card.name });+ const link = Urls.card({ id: card.id, name: card.name });return (<Groupdiff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsxindex 3a6afc7c2f6..2d1f028eab6 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { Box, Text, Title } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";export function PageHeader() {return (diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsxindex d32b38efa41..f75cac9ecbc 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx@@ -10,7 +10,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { getParentPath } from "metabase/hoc/ModalRoute";import { useDispatch, useSelector } from "metabase/redux";-import { parseIntParam } from "metabase/utils/urls";+import { parseIntParam } from "metabase/urls";import { getGroupTableAccessPolicy } from "metabase-enterprise/sandboxes/selectors";import type { GroupTableAccessPolicy } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsxindex b53ab748da3..f8d016bf522 100644--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx@@ -6,7 +6,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PaginationControls } from "metabase/common/components/PaginationControls";import { useDispatch } from "metabase/redux";import { Box, Button, Flex, LoadingOverlay, Text, Title } from "metabase/ui";-import { adminToolsGrantAccess } from "metabase/utils/urls";+import { adminToolsGrantAccess } from "metabase/urls";import { useAccessGrantsQuery } from "../../hooks/useAccessGrantsQuery";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsxindex a45bf87f6b6..e41633cc27f 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { HeadBreadcrumbs } from "metabase/query_builder/components/view/ViewHeader/components";import type { DataSourcePart } from "metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils";import { ViewHeading } from "metabase/query_builder/components/view/ViewSection";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Database, Table } from "metabase-types/api";type TableBreadcrumbsProps = {diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsxindex 764d5bf8db8..f7f608c1f7b 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx@@ -4,7 +4,7 @@ import { jt, t } from "ttag";import { useGetTableQuery } from "metabase/api";import { Anchor, Box, Button, Group, Icon, Stack, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {getUpdateApiErrorMessage,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsxindex 9ce4c53a001..a7766573b95 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx@@ -22,7 +22,7 @@ import { ActionIcon, Flex, Icon, Modal, Tooltip } from "metabase/ui";import {tenantSpecificCollections,tenantUsersPersonalCollections,-} from "metabase/utils/urls";+} from "metabase/urls";import { useGetRemoteSyncChangesQuery } from "metabase-enterprise/api";import { CollectionSyncStatusBadge } from "metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/CollectionSyncStatusBadge";import type { Collection } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsxindex 2f5bd731a9b..ab99a59a968 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { CollectionListView } from "metabase/common/components/CollectionListView";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";import type { IconName } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useListTenantsQuery } from "metabase-enterprise/api";export const TenantCollectionList = () => {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsxindex eff8b552c7a..9648e5e6e66 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { CollectionListView } from "metabase/common/components/CollectionListView";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";import type { IconName } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useListTenantsQuery } from "metabase-enterprise/api";export const TenantUsersList = () => {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsxindex 4bf008fa740..ba5e97bbf78 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx@@ -4,7 +4,7 @@ import { useListUsersQuery } from "metabase/api";import { CollectionListView } from "metabase/common/components/CollectionListView";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";import type { IconName } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useGetTenantQuery } from "metabase-enterprise/api";interface TenantUsersPersonalCollectionListProps {diff --git a/enterprise/frontend/src/metabase-enterprise/tools/mode.js b/enterprise/frontend/src/metabase-enterprise/tools/mode.jsindex a0294bb83ce..8e2f59bc790 100644--- a/enterprise/frontend/src/metabase-enterprise/tools/mode.js+++ b/enterprise/frontend/src/metabase-enterprise/tools/mode.js@@ -1,7 +1,7 @@import { push } from "react-router-redux";import { t } from "ttag";-import { question } from "metabase/utils/urls";+import { card } from "metabase/urls";const CARD_ID_ROW_IDX = 0;@@ -18,7 +18,7 @@ const ErrorDrill = ({ clicked }) => {title: t`View this`,default: true,action() {- return push(question({ id: cardId }));+ return push(card({ id: cardId }));},},];diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsxindex 9fbfc05f175..2d8bdbd63d4 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx@@ -7,7 +7,7 @@ import { TransformHeader } from "metabase/transforms/components/TransformHeader"import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";import { RunSection } from "metabase/transforms/pages/TransformRunPage/RunSection";import { Alert, Center, Icon, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { InspectorContent } from "./components/InspectorContent";import type { RouteParams } from "./types";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsxindex 28dc3d44a2e..6db74170cd2 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx@@ -4,7 +4,7 @@ import { useGetAdhocQueryMetadataQuery } from "metabase/api";import { useSnapshotSelector } from "metabase/common/hooks";import { getMetadata } from "metabase/selectors/metadata";import { Box, Card, Loader, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import Visualization from "metabase/visualizations/components/Visualization";import * as Lib from "metabase-lib";import { defaultDisplay } from "metabase-lib/query/display";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsxindex 04fb28d5d25..5c3223b1b31 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx@@ -8,7 +8,7 @@ import { clickableTokens } from "metabase/common/components/CodeMirror";import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";import { useDispatch } from "metabase/redux";import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { SHARED_LIB_IMPORT_PATH } from "../../../constants";import { PythonEditor } from "../../PythonEditor";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsxindex 85612d18398..07569bd8e06 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx@@ -7,7 +7,7 @@ import {PanelHeaderTitle,} from "metabase/data-studio/common/components/PaneHeader";import { Button, Group } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";type PythonLibraryEditorHeaderProps = {isDirty?: boolean;diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsxindex eaa715548e7..f095defaf9a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx@@ -8,8 +8,8 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContaiimport { useMetadataToasts } from "metabase/metadata/hooks";import { useSelector } from "metabase/redux";import { Alert, Box, Card, Stack } from "metabase/ui";+import type * as Urls from "metabase/urls";import { isResourceNotFoundError } from "metabase/utils/errors";-import type * as Urls from "metabase/utils/urls";import {useGetPythonLibraryQuery,useUpdatePythonLibraryMutation,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsxindex 672d5169a3a..f1f0f1ce1d6 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { trackUpsellClicked } from "metabase/common/components/upsells/components/analytics";import { useMetadataToasts } from "metabase/metadata/hooks";import { Button, Stack, Text } from "metabase/ui";+import * as Urls from "metabase/urls";import { formatNumber } from "metabase/utils/formatting";-import * as Urls from "metabase/utils/urls";import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";import { TransformsSettingUpModal } from "metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal";import type { ICloudAddOnProduct } from "metabase-types/api/store";diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsxindex ea60b8325f3..8260d647e8a 100644--- a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx@@ -19,7 +19,7 @@ import {Icon,Text,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {useDeleteUploadTableMutation,useListUploadTablesQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/urls.ts b/enterprise/frontend/src/metabase-enterprise/urls.tsindex f9cb9c43c7d..cd83b5973a7 100644--- a/enterprise/frontend/src/metabase-enterprise/urls.ts+++ b/enterprise/frontend/src/metabase-enterprise/urls.ts@@ -1,6 +1,6 @@import type { DatabaseId, Tenant } from "metabase-types/api";-export * as Urls from "metabase/utils/urls";+export * as Urls from "metabase/urls";export function viewDestinationDatabases(databaseId: DatabaseId) {return `/admin/databases/${databaseId}/destination-databases`;diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsxindex 4d6cd50033e..55e97922c23 100644--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx@@ -14,7 +14,7 @@ import { useUpdateDatabaseMutation } from "metabase/api";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import type { WritableConnectionInfoSectionProps } from "metabase/plugins/oss/writable-connection";import { Alert, Button, Group, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";export function WritableConnectionInfoSection({database,diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsxindex 101146679d2..e09381e805e 100644--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx@@ -15,7 +15,7 @@ import { DatabaseForm } from "metabase/databases/components/DatabaseForm";import type { DatabaseFormConfig } from "metabase/databases/types";import { useDispatch } from "metabase/redux";import { Box, Flex, ScrollArea, Title } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Database, DatabaseData } from "metabase-types/api";const FORM_CONFIG: DatabaseFormConfig = {diff --git a/eslint.config.mjs b/eslint.config.mjsindex 71ecf212be1..1f692315fe9 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -696,7 +696,7 @@ const configs = ["!metabase/utils/time","!metabase/utils/time-dayjs","!metabase/utils/types",- "!metabase/utils/urls",+ "!metabase/urls","!metabase/utils/clone",],},diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsxindex b61be7561c9..ae5281da29a 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx@@ -3,7 +3,7 @@ import { useMemo } from "react";import type { SdkQuestionProps } from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";import { SdkQuestion } from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";import { deserializeCard, parseHash } from "metabase/common/utils/card";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { QuestionMockLocationParameters } from "../SdkQuestion/context";diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsxindex 593e9ba6b93..5e28ac78da2 100644--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx@@ -11,9 +11,9 @@ import {import { navigateBackToDashboard } from "metabase/redux/query-builder";import type { StoreDashboard } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";+import * as Urls from "metabase/urls";import { isJWT } from "metabase/utils/jwt";import { parseNumber } from "metabase/utils/number";-import * as Urls from "metabase/utils/urls";import type Question from "metabase-lib/v1/Question";import {type DashboardId,@@ -114,7 +114,7 @@ export const useCommonDashboardParams = ({model: "dashboard",},});- setAdhocQuestionUrl(Urls.question(question.card()));+ setAdhocQuestionUrl(Urls.card(question.card()));}},[dashboardId, dispatch, store],diff --git a/frontend/src/metabase-lib/v1/Question.ts b/frontend/src/metabase-lib/v1/Question.tsindex 013dbd050af..a0da59710fd 100644--- a/frontend/src/metabase-lib/v1/Question.ts+++ b/frontend/src/metabase-lib/v1/Question.ts@@ -4,11 +4,6 @@ import { assoc, assocIn, chain, dissoc, getIn } from "icepick";import slugg from "slugg";import _ from "underscore";-/* eslint-disable no-restricted-imports */-import {- type SerializeCardOptions,- serializeCardForUrl,-} from "metabase/common/utils/card";import { applyParameter } from "metabase/querying/parameters/utils/query";import * as Lib from "metabase-lib";import type Database from "metabase-lib/v1/metadata/Database";@@ -128,6 +123,16 @@ class Question {return this._doNotCallSerializableCard();}+ /**+ * returns the card but normalizes the dataset_query field.+ */+ cardWithNormalizedQuery() {+ return {+ ...this.card(),+ dataset_query: Lib.toJsQuery(this.query()),+ };+ }+_doNotCallSerializableCard() {return this._card;}@@ -148,21 +153,6 @@ class Question {);}- omitTransientCardIds() {- let question = this;-- const card = question.card();- const { id, original_card_id } = card;- if (isTransientCardId(id)) {- question = question.setCard(_.omit(question.card(), "id"));- }- if (isTransientCardId(original_card_id)) {- question = question.setCard(_.omit(question.card(), "original_card_id"));- }-- return question;- }-/*** A question contains either a:* - StructuredQuery for queries written in MBQL@@ -673,17 +663,6 @@ class Question {);}- serializeForUrl(opts: SerializeCardOptions = {}) {- const card = {- ...this.card(),- dataset_query: Lib.toJsQuery(this.query()),- };- return serializeCardForUrl(card, {- ...opts,- parameterValues: this._parameterValues,- });- }-// Internal methods_getValueForComparison() {const value = {@@ -870,9 +849,5 @@ class Question {}}-export function isTransientCardId(id: CardId | string | null | undefined) {- return id != null && typeof id === "string" && isNaN(parseInt(id));-}-// eslint-disable-next-line import/no-default-export -- deprecated usageexport default Question;diff --git a/frontend/test/metabase-lib/lib/Question.unit.spec.js b/frontend/src/metabase-lib/v1/Question.unit.spec.jssimilarity index 70%rename from frontend/test/metabase-lib/lib/Question.unit.spec.jsrename to frontend/src/metabase-lib/v1/Question.unit.spec.jsindex 44d98d62428..79719b89e3a 100644--- a/frontend/test/metabase-lib/lib/Question.unit.spec.js+++ b/frontend/src/metabase-lib/v1/Question.unit.spec.js@@ -1,13 +1,5 @@-import { parse } from "url";--import { assoc, dissoc } from "icepick";-import { createMockMetadata } from "__support__/metadata";-import { deserializeCardFromUrl } from "metabase/common/utils/card";import * as Lib from "metabase-lib";-import Question from "metabase-lib/v1/Question";-import NativeQuery from "metabase-lib/v1/queries/NativeQuery";-import * as ML_Urls from "metabase-lib/v1/urls";import {createMockColumn,createMockDatasetData,@@ -34,12 +26,13 @@ import {createSampleDatabase,} from "metabase-types/api/mocks/presets";+import Question from "./Question";+import NativeQuery from "./queries/NativeQuery";+const metadata = createMockMetadata({databases: [createSampleDatabase()],});-const metadataProvider = Lib.metadataProvider(SAMPLE_DB_ID, metadata);-const metadata_without_order_pk = createMockMetadata({databases: [createSampleDatabase({@@ -588,37 +581,6 @@ describe("Question", () => {});});- describe("URLs", () => {- const adhocUrl =- "/question#eyJkYXRhc2V0X3F1ZXJ5Ijp7ImRhdGFiYXNlIjoxLCJsaWIvdHlwZSI6Im1icWwvcXVlcnkiLCJzdGFnZXMiOlt7ImxpYi90eXBlIjoibWJxbC5zdGFnZS9tYnFsIiwic291cmNlLXRhYmxlIjoyfV19LCJkaXNwbGF5IjoidGFibGUiLCJuYW1lIjoiUmF3IG9yZGVycyBkYXRhIiwicGFyYW1ldGVyVmFsdWVzIjp7fSwidmlzdWFsaXphdGlvbl9zZXR0aW5ncyI6e319";-- // Covered a lot in query_builder/actions.spec.js, just very basic cases here- // (currently getUrl has logic that is strongly tied to the logic query builder Redux actions)- describe("getUrl(originalQuestion?)", () => {- it("returns URL with ID for saved question", () => {- const question = new Question(- assoc(orders_raw_card, "id", 1),- metadata,- );- expect(ML_Urls.getUrl(question)).toBe("/question/1-raw-orders-data");- });-- it("returns a URL with hash for an unsaved question", () => {- const question = new Question(dissoc(orders_raw_card, "id"), metadata);- expect(ML_Urls.getUrl(question)).toBe(adhocUrl);- });- });-- it("should avoid generating URLs with transient IDs", () => {- const question = new Question(- assoc(orders_raw_card, "id", "foo"),- metadata,- );-- expect(ML_Urls.getUrl(question)).toBe(adhocUrl);- });- });-describe("Question.prototype.getResultMetadata", () => {it("should return the `result_metadata` property off the underlying card", () => {const question = base_question.setResultsMetadata({ columns: [1, 2, 3] });@@ -822,347 +784,6 @@ describe("Question", () => {});});- describe("getUrlWithParameters", () => {- const parameters = [- {- id: 1,- slug: "param_string",- type: "category",- target: ["dimension", ["field", 1, null]],- },- {- id: 2,- slug: "param_operator",- type: "category/starts-with",- target: ["dimension", ["field", 2, null]],- },- {- id: 3,- slug: "param_date",- type: "date/month",- target: ["dimension", ["field", PRODUCTS.CREATED_AT, null]],- },- {- id: 4,- slug: "param_fk",- type: "date/month",- target: ["dimension", ["field", 2, { "source-field": 1 }]],- },- {- id: 5,- slug: "param_number",- type: "number/=",- target: ["dimension", ["field", 2, null]],- },- ];-- const card = {- id: 1,- dataset_query: Lib.toJsQuery(- Lib.fromJsQuery(metadataProvider, {- type: "query",- query: {- "source-table": PRODUCTS_ID,- },- database: SAMPLE_DB_ID,- }),- ),- };-- describe("with structured card", () => {- const question = new Question(card, metadata);- const originalQuestion = question;-- it("should return question URL with no parameters", () => {- const parameters = [];- const parameterValues = {};-- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parameters,- parameterValues,- );-- expect(parseUrl(url)).toEqual({- pathname: "/question/1",- query: {},- card: null,- });- });-- it("should return question URL with string MBQL filter added", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parameters,- {- 1: "bar",- },- );-- const parsedUrl = parseUrl(url);- const parsedQuestion = new Question(- parsedUrl.card,- question.metadata(),- );- expect(parsedUrl.pathname).toEqual("/question");- expect(parsedUrl.query).toEqual({});- expect(Lib.filters(parsedQuestion.query(), -1)).toHaveLength(1);- });-- it("should return question URL with number MBQL filter added", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parameters,- {- 5: 123,- },- );-- const parsedUrl = parseUrl(url);- const parsedQuestion = new Question(- parsedUrl.card,- question.metadata(),- );- expect(Lib.filters(parsedQuestion.query(), -1)).toHaveLength(1);- });-- it("should return question URL with date MBQL filter added", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parameters,- {- 3: "2017-05",- },- );-- const parsedUrl = parseUrl(url);- const parsedQuestion = new Question(- parsedUrl.card,- question.metadata(),- );- expect(Lib.filters(parsedQuestion.query(), -1)).toHaveLength(1);- });-- it("should include objectId in a URL", () => {- const OBJECT_ID = "5";- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parameters,- { 1: "bar" },- { objectId: OBJECT_ID },- );-- expect(parseUrl(url)).toEqual({- pathname: "/question",- query: { objectId: OBJECT_ID },- card: expect.any(Object),- });- });- });-- describe("with structured question & no permissions", () => {- const question = new Question(card);- const originalQuestion = question;-- it("should return a card with attached parameters and parameter values as query params", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parameters,- {- 1: "bar",- },- );-- const deserializedCard = {- ...card,- parameters,- original_card_id: card.id,- parameterValues: {},- };-- delete deserializedCard.id;-- expect(parseUrl(url)).toEqual({- pathname: "/question",- query: {- param_date: "",- param_fk: "",- param_number: "",- param_operator: "",- param_string: "bar",- },- card: deserializedCard,- });- });-- it("should not include objectId in a URL", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parameters,- { 1: "bar" },- { objectId: 5 },- );-- expect(parseUrl(url).query.objectId).toBeUndefined();- });- });-- describe("with a native question", () => {- const cardWithTextFilter = {- id: 1,- dataset_query: {- database: SAMPLE_DB_ID,- type: "native",- native: {- "template-tags": {- baz: { name: "baz", type: "text", id: "foo" },- },- },- },- };-- const parametersForNativeQ = [- {- ...parameters[0],- target: ["variable", ["template-tag", "baz"]],- },- {- ...parameters[4],- target: ["dimension", ["template-tag", "bar"]],- },- ];-- const cardWithFieldFilter = {- id: 2,- dataset_query: {- database: SAMPLE_DB_ID,- type: "native",- native: {- "template-tags": {- bar: { name: "bar", type: "number/=", id: "abc" },- },- },- },- };-- const question = new Question(cardWithTextFilter, metadata);- const originalQuestion = question;-- it("should return question URL when there are no parameters", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- [],- {},- );- expect(parseUrl(url)).toEqual({- pathname: "/question/1",- query: {},- card: null,- });- });-- it("should return question URL with query string parameter when there is a value for a parameter mapped to the question's variable", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parametersForNativeQ,- {- 1: "bar",- },- );-- expect(parseUrl(url)).toEqual({- pathname: "/question/1",- query: { baz: "bar" },- card: null,- });- });-- it("should return question URL with query string parameter when there is a value for a parameter mapped to the question's field filter", () => {- const question = new Question(cardWithFieldFilter, metadata);- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parametersForNativeQ,- {- 5: "111",- },- );-- expect(parseUrl(url)).toEqual({- pathname: "/question/2",- query: { bar: "111" },- card: null,- });- });-- it("should not include objectId in a URL", () => {- const url = ML_Urls.getUrlWithParameters(- question,- originalQuestion,- parametersForNativeQ,- {- 1: "bar",- },- );- expect(parseUrl(url).query.objectId).toBeUndefined();- });- });- });-- describe("Question.prototype.omitTransientCardIds", () => {- it("should return a question without a transient ids", () => {- const cardWithTransientId = {- ...card,- id: "foo",- original_card_id: 123,- };-- const question = new Question(cardWithTransientId, metadata);- const newQuestion = question.omitTransientCardIds();- expect(newQuestion.id()).toBeUndefined();- expect(newQuestion._doNotCallSerializableCard().original_card_id).toBe(- 123,- );- });-- it("should return a question without a transient original_card_id", () => {- const cardWithTransientId = {- ...card,- id: 123,- original_card_id: "bar",- };-- const question = new Question(cardWithTransientId, metadata);- const newQuestion = question.omitTransientCardIds();- expect(- newQuestion._doNotCallSerializableCard().original_card_id,- ).toBeUndefined();- expect(newQuestion.id()).toBe(123);- });-- it("should do nothing if id and original_card_id are both not transient", () => {- const cardWithoutTransientId = {- ...card,- id: 123,- original_card_id: undefined,- };-- const question = new Question(cardWithoutTransientId, metadata);- const newQuestion = question.omitTransientCardIds();-- expect(newQuestion).toBe(question);- });- });-describe("Question.prototype.supportsImplicitActions", () => {it("should allow to create implicit actions for a raw model", () => {const question = new Question(orders_raw_card, metadata);@@ -1255,12 +876,3 @@ describe("Question", () => {});});});--function parseUrl(url) {- const parsed = parse(url, true);- return {- card: parsed.hash && deserializeCardFromUrl(parsed.hash),- query: parsed.query,- pathname: parsed.pathname,- };-}diff --git a/frontend/test/metabase-lib/lib/metadata/Table.unit.spec.js b/frontend/src/metabase-lib/v1/metadata/Table.unit.spec.jssimilarity index 100%rename from frontend/test/metabase-lib/lib/metadata/Table.unit.spec.jsrename to frontend/src/metabase-lib/v1/metadata/Table.unit.spec.jsdiff --git a/frontend/src/metabase-lib/v1/parameters/utils/template-tags.ts b/frontend/src/metabase-lib/v1/parameters/utils/template-tags.tsindex bc19cc65ad2..ab597917b02 100644--- a/frontend/src/metabase-lib/v1/parameters/utils/template-tags.ts+++ b/frontend/src/metabase-lib/v1/parameters/utils/template-tags.ts@@ -4,7 +4,6 @@ import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { ParameterWithTarget } from "metabase-lib/v1/parameters/types";-import { getTemplateTagFromTarget } from "metabase-lib/v1/parameters/utils/targets";import { InternalQuery } from "metabase-lib/v1/queries/InternalQuery";import type {Card,@@ -121,34 +120,3 @@ export function getTemplateTagParametersFromCard(const tags = getTemplateTags(card, metadata);return getTemplateTagParameters(tags, card.parameters);}--// when navigating from dashboard --> saved native question,-// we are given dashboard parameters and a map of dashboard parameter ids to parameter values-// we need to transform this into a map of template tag ids to parameter values-// so that we populate the template tags in the native editor-export function remapParameterValuesToTemplateTags(- templateTags: TemplateTag[],- dashboardParameters: ParameterWithTarget[],- parameterValuesByDashboardParameterId: {- [key: string]: any;- },-) {- const parameterValues: {- [key: string]: any;- } = {};- const templateTagParametersByName = _.indexBy(templateTags, "name");-- dashboardParameters.forEach((dashboardParameter) => {- const { target } = dashboardParameter;- const tag = getTemplateTagFromTarget(target);-- if (tag != null && templateTagParametersByName[tag]) {- const templateTagParameter = templateTagParametersByName[tag];- const parameterValue =- parameterValuesByDashboardParameterId[dashboardParameter.id];- parameterValues[templateTagParameter.name] = parameterValue;- }- });-- return parameterValues;-}diff --git a/frontend/src/metabase-lib/v1/parameters/utils/template-tags.unit.spec.js b/frontend/src/metabase-lib/v1/parameters/utils/template-tags.unit.spec.jsindex 3fc82a2ec87..630543a963c 100644--- a/frontend/src/metabase-lib/v1/parameters/utils/template-tags.unit.spec.js+++ b/frontend/src/metabase-lib/v1/parameters/utils/template-tags.unit.spec.js@@ -1,7 +1,6 @@import {getTemplateTagParameters,getTemplateTags,- remapParameterValuesToTemplateTags,} from "metabase-lib/v1/parameters/utils/template-tags";import { createMockTemplateTag } from "metabase-types/api/mocks";@@ -281,61 +280,4 @@ describe("parameters/utils/cards", () => {]);});});-- describe("remapParameterValuesToTemplateTags", () => {- it("should convert a dashboard parameterValues map into a map of template tag values", () => {- const parameterValues = {- "dashboard-parameter-1": "aaa",- "dashboard-parameter-2": "bbb",- "dashboard-parameter-3": null,- "dashboard-parameter-4": "ddd",- };-- const dashboardParameters = [- {- id: "dashboard-parameter-1",- target: ["variable", ["template-tag", "template-tag-1"]],- },- {- id: "dashboard-parameter-2",- target: ["dimension", ["template-tag", "template-tag-2"]],- },- {- id: "dashboard-parameter-3",- target: ["dimension", ["template-tag", "template-tag-3"]],- },- {- id: "dashboard-parameter-4",- target: ["dimension", ["field", 1, null]],- },- {- id: "dashboard-parameter-5",- },- ];-- const templateTags = [- {- name: "template-tag-1",- },- {- name: "template-tag-2",- },- {- name: "template-tag-3",- },- ];-- expect(- remapParameterValuesToTemplateTags(- templateTags,- dashboardParameters,- parameterValues,- ),- ).toEqual({- "template-tag-1": "aaa",- "template-tag-2": "bbb",- "template-tag-3": null,- });- });- });});diff --git a/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js b/frontend/src/metabase-lib/v1/queries/NativeQuery.unit.spec.jssimilarity index 100%rename from frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.jsrename to frontend/src/metabase-lib/v1/queries/NativeQuery.unit.spec.jsdiff --git a/frontend/src/metabase-lib/v1/urls.ts b/frontend/src/metabase-lib/v1/urls.tsdeleted file mode 100644index 891538625a5..00000000000--- a/frontend/src/metabase-lib/v1/urls.ts+++ /dev/null@@ -1,136 +0,0 @@-import { utf8_to_b64url } from "metabase/utils/encoding";-import * as Urls from "metabase/utils/urls";-import * as Lib from "metabase-lib";-import { isTransientCardId } from "metabase-lib/v1/Question";-import type { ParameterWithTarget } from "metabase-lib/v1/parameters/types";-import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";-import { remapParameterValuesToTemplateTags } from "metabase-lib/v1/parameters/utils/template-tags";-import type { ParameterId, ParameterValueOrArray } from "metabase-types/api";--import type Question from "./Question";-import type NativeQuery from "./queries/NativeQuery";--type UrlBuilderOpts = {- originalQuestion?: Question;- query?: Record<string, any>;- includeDisplayIsLocked?: boolean;- creationType?: string;-};--export function getUrl(- question: Question,- { originalQuestion, query, creationType }: UrlBuilderOpts = {},-) {- question = question.omitTransientCardIds();-- if (- !question.id() ||- (originalQuestion && question.isDirtyComparedTo(originalQuestion))- ) {- return Urls.question(null, {- hash: question.serializeForUrl({- includeDisplayIsLocked: true,- creationType,- }),- query,- });- } else {- return Urls.question(question.card(), { query });- }-}--export function getUrlWithParameters(- question: Question,- originalQuestion: Question,- parameters: ParameterWithTarget[],- parameterValues: Record<- ParameterId,- ParameterValueOrArray | undefined | null- >,- { objectId }: { objectId?: string | number } = {},-): string {- const includeDisplayIsLocked = true;- if (parameters.length === 0 && objectId == null) {- return getUrl(question, { includeDisplayIsLocked });- }-- const { isNative, isEditable } = Lib.queryDisplayInfo(question.query());- if (!isNative) {- let questionWithParameters = question.setParameters(parameters);-- if (isEditable) {- // treat the dataset/model question like it is already composed so that we can apply- // dataset/model-specific metadata to the underlying dimension options- const needsComposing = question.type() !== "question";- questionWithParameters = needsComposing- ? question.composeQuestionAdhoc().setParameters(parameters)- : questionWithParameters;- questionWithParameters = questionWithParameters- .setParameterValues(parameterValues)- ._convertParametersToMbql({ isComposed: needsComposing });-- return getUrl(questionWithParameters, {- originalQuestion,- includeDisplayIsLocked,- query: objectId === undefined ? {} : { objectId },- });- }-- const query = getParameterValuesBySlug(parameters, parameterValues);- return getUrl(questionWithParameters.markDirty(), {- query,- includeDisplayIsLocked,- });- }-- const query = question.legacyNativeQuery() as NativeQuery;- return getUrl(question, {- query: remapParameterValuesToTemplateTags(- query.templateTags(),- parameters,- parameterValues,- ),- includeDisplayIsLocked,- });-}--export function getAutomaticDashboardUrl(- question: Question,- questionWithFilters: Question,-) {- const questionId = question.id();- const filterQuery = Lib.toLegacyQuery(questionWithFilters.query());- const filter = filterQuery.type === "query" ? filterQuery.query.filter : null;- const cellQuery = filter- ? `/cell/${utf8_to_b64url(JSON.stringify(filter))}`- : "";-- const query = question.datasetQuery();- if (questionId != null && !isTransientCardId(questionId)) {- return `auto/dashboard/question/${questionId}${cellQuery}`;- } else {- const adHocQuery = utf8_to_b64url(JSON.stringify(query));- return `auto/dashboard/adhoc/${adHocQuery}${cellQuery}`;- }-}--export function getComparisonDashboardUrl(- question: Question,- questionWithFilters: Question,-) {- const questionId = question.id();- const tableId = Lib.sourceTableOrCardId(question.query());- const filterQuery = Lib.toLegacyQuery(questionWithFilters.query());- const filter = filterQuery.type === "query" ? filterQuery.query.filter : null;- const cellQuery = filter- ? `/cell/${utf8_to_b64url(JSON.stringify(filter))}`- : "";-- const query = question.datasetQuery();- if (questionId != null && !isTransientCardId(questionId)) {- return `auto/dashboard/question/${questionId}${cellQuery}/compare/table/${tableId}`;- } else {- const adHocQuery = utf8_to_b64url(JSON.stringify(query));- return `auto/dashboard/adhoc/${adHocQuery}${cellQuery}/compare/table/${tableId}`;- }-}diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsxindex a43394c9fc9..5056e08a02d 100644--- a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx@@ -8,7 +8,7 @@ import { Link } from "metabase/common/components/Link";import { formatTitle } from "metabase/notifications/utils";import { canArchiveLegacyAlert, formatChannel } from "metabase/pulse";import { Box, Flex, Icon, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Channel, User } from "metabase-types/api";import S from "./DashboardNotificationCard.module.css";diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsxindex 5e645a34c5b..f573b843935 100644--- a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx@@ -11,7 +11,7 @@ import {getNotificationEnabledChannelsMap,} from "metabase/notifications/utils";import { Box, Flex, Group, Icon, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { User } from "metabase-types/api";import S from "./DashboardNotificationCard.module.css";@@ -34,7 +34,7 @@ export const NotificationCard = ({const { item } = listItem;const hasArchive = canArchive(listItem.item, user);- const entityLink = Urls.question({+ const entityLink = Urls.card({id: item.payload.card_id,card_id: item.payload.card_id,});diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsxindex 8e900da8343..f8f6a4fe76e 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -15,7 +15,7 @@ import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { Switch, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {ActionFormSettings,WritebackAction,diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsxindex 80cd893e975..ca8dd438a83 100644--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx@@ -9,7 +9,7 @@ import { Questions } from "metabase/entities/questions";import { connect } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import type { AppErrorDescriptor, State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import type { WritebackAction } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsxindex 74964c86b92..4149131ff88 100644--- a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx+++ b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx@@ -20,7 +20,7 @@ import {Text,UnstyledButton,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Database, DatabaseUsageInfo } from "metabase-types/api";import ContentRemovalConfirmation from "../ContentRemovalConfirmation";diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsxindex bbf9c12d355..908280e0e3a 100644--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx@@ -2,8 +2,8 @@ import { Link } from "react-router";import { t } from "ttag";import { Button, Flex, Icon } from "metabase/ui";+import { browseDatabase } from "metabase/urls";import { isSyncInProgress } from "metabase/utils/syncing";-import { browseDatabase } from "metabase/utils/urls";import type { Database } from "metabase-types/api";interface Props {diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsxindex 07a660320a7..b115077f93c 100644--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx@@ -1,7 +1,7 @@import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";-import { browseDatabase } from "metabase/utils/urls";+import { browseDatabase } from "metabase/urls";import type { Database } from "metabase-types/api";import { createMockDatabase } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsxindex 8d46e5c9354..7707707bbaa 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx@@ -3,7 +3,7 @@ import { Link } from "react-router";import { t } from "ttag";import { ActionIcon, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Segment } from "metabase-types/api";import S from "./SegmentActionSelect.module.css";diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsxindex 84b2d942b07..0b0dc917377 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx@@ -3,7 +3,7 @@ import { Link } from "react-router";import { modelIconMap } from "metabase/common/utils/icon";import { TableBreadcrumbs } from "metabase/metadata/components";import { Box, Flex, Group, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Segment } from "metabase-types/api";import { SegmentActionSelect } from "./SegmentActionSelect";diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsxindex d2211ff39d4..83722d1deb7 100644--- a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx+++ b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx@@ -7,7 +7,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport CS from "metabase/css/core/index.css";import { Revision } from "metabase/querying/segments/components/revisions/Revision";import { assignUserColors } from "metabase/ui/colors/formatting-colors";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {Revision as RevisionType,Segment,diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsxindex de96d5758b9..a121d0392fd 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx@@ -15,7 +15,7 @@ import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUserIsAdmin } from "metabase/selectors/user";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Segment } from "metabase-types/api";interface Props {diff --git a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx b/frontend/src/metabase/admin/people/components/PeopleListRow.tsxindex b1916863ff0..e5f0e362f7c 100644--- a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleListRow.tsx@@ -16,7 +16,7 @@ import {Tooltip,UnstyledButton,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getFullName } from "metabase/utils/user";import type {GroupId,diff --git a/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsx b/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsxindex d7fb5d8e550..ae47a72c847 100644--- a/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsx+++ b/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { Icon, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { User } from "metabase-types/api";import S from "./ReactivateUserButton.module.css";diff --git a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx b/frontend/src/metabase/admin/people/containers/NewUserModal.tsxindex d37523ab7b6..5ff7067b74f 100644--- a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx+++ b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx@@ -5,9 +5,9 @@ import { useCreateUserMutation } from "metabase/api";import { PLUGIN_TENANTS } from "metabase/plugins";import { useDispatch } from "metabase/redux";import { Modal } from "metabase/ui";+import * as Urls from "metabase/urls";import { generatePassword } from "metabase/utils/password";import MetabaseSettings from "metabase/utils/settings";-import * as Urls from "metabase/utils/urls";import type { User as UserType } from "metabase-types/api";import { UserForm } from "../forms/UserForm";diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsxindex b7a0e387277..6eaa01d5867 100644--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx@@ -10,7 +10,7 @@ import { PLUGIN_TENANTS } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Flex, Group, Tabs, Title } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { PeopleList } from "../../components/PeopleList";import { SearchFilter } from "../../components/SearchFilter";diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxindex a878b4388eb..2d80fd9e6f7 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx@@ -11,7 +11,7 @@ import { Collections } from "metabase/entities/collections";import { Groups } from "metabase/entities/groups";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection, CollectionNamespace } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsxindex c5d8ca17840..98544babfac 100644--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsx@@ -5,7 +5,7 @@ import {useListEmbeddableDashboardsQuery,} from "metabase/api";import { Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {GetEmbeddableCard,GetEmbeddableDashboard,@@ -42,7 +42,7 @@ export const QuestionEmbeddedResources = () => {<SettingHeader id="embedded-questions" title={t`Embedded questions`} /><PublicLinksListing<GetEmbeddableCard>data-testid="-embedded-questions-setting"- getUrl={(question) => Urls.question(question)}+ getUrl={(question) => Urls.card(question)}noLinksMessage={t`No questions have been embedded yet.`}{...query}/>diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsxindex 1b4c82c34c9..eb69e3a4da6 100644--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsx@@ -5,7 +5,7 @@ import {useDeleteDocumentPublicLinkMutation,useListPublicDocumentsQuery,} from "metabase/api";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Document } from "metabase-types/api";export const PublicLinksDocumentListing = () => {diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsxindex fac70591fde..6da27c19a29 100644--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsx@@ -3,7 +3,7 @@ import { act } from "react-dom/test-utils";import { renderWithProviders, screen, within } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { GetPublicCard } from "metabase-types/api";import { PublicLinksListing } from "./PublicLinksListing";@@ -17,7 +17,7 @@ const setup = async (props: {<PublicLinksListing<GetPublicCard>data={props.publicCardData}noLinksMessage={`No questions have been publicly shared yet.`}- getUrl={(question) => Urls.question(question)}+ getUrl={(question) => Urls.card(question)}getPublicUrl={({ name }) => {return `test-public-url-${name}`;}}diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsxindex b1216dd46c1..234c6406493 100644--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx@@ -9,7 +9,7 @@ import {useListPublicDashboardsQuery,} from "metabase/api";import { useSetting } from "metabase/common/hooks";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {GetPublicAction,GetPublicCard,@@ -44,7 +44,7 @@ export const PublicLinksQuestionListing = () => {return (<PublicLinksListing<GetPublicCard>revoke={revoke}- getUrl={(question) => Urls.question(question)}+ getUrl={(question) => Urls.card(question)}getPublicUrl={({ public_uuid }) => {if (public_uuid) {return Urls.publicQuestion({ uuid: public_uuid });diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsxindex 69962ee0a04..bced9f6ec4d 100644--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx@@ -20,8 +20,8 @@ import CS from "metabase/css/core/index.css";import { PersistedModels } from "metabase/entities/persisted-models";import { connect } from "metabase/redux";import { Icon, Tooltip } from "metabase/ui";+import * as Urls from "metabase/urls";import { capitalize } from "metabase/utils/formatting";-import * as Urls from "metabase/utils/urls";import { checkCanRefreshModelCache } from "metabase-lib/v1/metadata/utils/models";import type { ModelCacheRefreshStatus } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsx b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsxindex e5c5979623a..5c6406f31c2 100644--- a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsx@@ -20,8 +20,8 @@ import {Title,Tooltip,} from "metabase/ui";+import * as Urls from "metabase/urls";import { openSaveDialog } from "metabase/utils/dom";-import * as Urls from "metabase/utils/urls";import type { Database } from "metabase-types/api";import { SettingsSection } from "../../../components/SettingsSection";diff --git a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsxindex 0a39d5ecf38..ed01e9bad56 100644--- a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx@@ -12,7 +12,7 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Task } from "metabase-types/api";import { createMockTask } from "metabase-types/api/mocks";import { createSampleDatabase } from "metabase-types/api/mocks/presets";diff --git a/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsxindex 7e26f8872aa..dac15638a32 100644--- a/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsx@@ -18,7 +18,7 @@ import {} from "__support__/ui";import { URL_UPDATE_DEBOUNCE_DELAY } from "metabase/common/hooks/use-url-state";import { createMockLocation } from "metabase/redux/store/mocks";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ListTasksResponse } from "metabase-types/api";import { createMockTask } from "metabase-types/api/mocks";import { createSampleDatabase } from "metabase-types/api/mocks/presets";diff --git a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsxindex f65a69ca19c..93c8a88b5b0 100644--- a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx@@ -11,7 +11,7 @@ import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";import { Box, Ellipsified, Flex } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {Database,ListTasksSortColumn,diff --git a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsxindex d35820c7740..69773c24e0e 100644--- a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx@@ -22,7 +22,7 @@ import {Title,Tooltip,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Task } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsxindex 4c37d854702..3e62648c0de 100644--- a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx@@ -9,7 +9,7 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TaskRunExtended } from "metabase-types/api";import { createMockTaskRunExtended } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsxindex a1d0787e3c8..d652f3ee163 100644--- a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx@@ -8,7 +8,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ListTaskRunsResponse } from "metabase-types/api";import { createMockTaskRun } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsxindex b99f2411a47..77ad133981c 100644--- a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx@@ -8,7 +8,7 @@ import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";import { Box, Ellipsified, Flex } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TaskRun } from "metabase-types/api";import { formatTaskRunType, renderTaskRunCounters } from "../../utils";diff --git a/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx b/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsxindex ef3af3f1fec..ee9213d5e3e 100644--- a/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx+++ b/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { useDispatch } from "metabase/redux";import { Flex, Icon, Tabs, Title, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {SettingsPageWrapper,diff --git a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx b/frontend/src/metabase/admin/tools/components/ToolsApp.tsxindex 104d16c1e10..6648a483b7b 100644--- a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx+++ b/frontend/src/metabase/admin/tools/components/ToolsApp.tsx@@ -8,7 +8,7 @@ import {AdminNavWrapper,} from "metabase/admin/components/AdminNav";import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";type ToolsAppProps = {location: Location;diff --git a/frontend/src/metabase/admin/tools/utils.ts b/frontend/src/metabase/admin/tools/utils.tsindex 3c34f80340f..7d29c3de9fd 100644--- a/frontend/src/metabase/admin/tools/utils.ts+++ b/frontend/src/metabase/admin/tools/utils.ts@@ -1,7 +1,7 @@import { match } from "ts-pattern";import { t } from "ttag";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {Task,TaskRun,@@ -50,7 +50,7 @@ export const getEntityUrl = (): string =>match(entityType).with("database", () => Urls.viewDatabase(entityId))- .with("card", () => Urls.question({ id: entityId, name: entityName }))+ .with("card", () => Urls.card({ id: entityId, name: entityName })).with("dashboard", () => Urls.dashboard({ id: entityId })).exhaustive();diff --git a/frontend/src/metabase/auth/actions.ts b/frontend/src/metabase/auth/actions.tsindex d0b44a5c9ba..8fb369e9fe5 100644--- a/frontend/src/metabase/auth/actions.ts+++ b/frontend/src/metabase/auth/actions.ts@@ -9,11 +9,11 @@ import { createAsyncThunk } from "metabase/redux/utils";import { getSetting } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";import { SessionApi, UtilApi } from "metabase/services";+import * as Urls from "metabase/urls";import { deleteSession, initiateSLO } from "metabase/utils/auth";import { isSmallScreen, reload } from "metabase/utils/dom";import { loadLocalization } from "metabase/utils/i18n";import { passwordComplexityDescription } from "metabase/utils/password";-import * as Urls from "metabase/utils/urls";import type { LoginData } from "./types";diff --git a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsxindex 8b0663f90d2..484575a6511 100644--- a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx+++ b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx@@ -8,8 +8,8 @@ import ErrorBoundary from "metabase/ErrorBoundary";import { Link } from "metabase/common/components/Link";import { useDispatch, useSelector } from "metabase/redux";import { Box, Checkbox, useColorScheme } from "metabase/ui";+import * as Urls from "metabase/urls";import { getCspNonce } from "metabase/utils/csp";-import * as Urls from "metabase/utils/urls";import { loginGoogle } from "../../actions";import { getGoogleClientId, getSiteLocale } from "../../selectors";diff --git a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsxindex 929b2c100bd..27306548a73 100644--- a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx+++ b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { useSelector } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getIsLdapEnabled } from "../../selectors";import { AuthButton } from "../AuthButton";diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.tsxindex 08c862fc998..557c386a82a 100644--- a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.tsx@@ -11,8 +11,8 @@ import { getEngineLogo } from "metabase/databases/utils/engine";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Group, Stack, Text, Title } from "metabase/ui";-import * as Urls from "metabase/utils/urls";-import { newDatabase } from "metabase/utils/urls";+import * as Urls from "metabase/urls";+import { newDatabase } from "metabase/urls";import { BrowseCard } from "../components/BrowseCard";import S from "../components/BrowseContainer.module.css";diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsxindex 999030ba86c..fec9b4291c5 100644--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx@@ -26,7 +26,7 @@ import {Title,Tooltip,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import S from "../components/BrowseContainer.module.css";diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex 95ef0b45fce..8d06a62fa2f 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -36,7 +36,7 @@ import {Repeat,Skeleton,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { SortingOptions } from "metabase-types/api";import BrowseTableS from "../components/BrowseTable.module.css";diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex d3dff54de53..bded414592f 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -28,7 +28,7 @@ import {Repeat,Skeleton,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { SortingOptions } from "metabase-types/api";import BrowseTableS from "../components/BrowseTable.module.css";diff --git a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsxindex 4f7a0e24ea7..873b9cab02f 100644--- a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx+++ b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx@@ -7,7 +7,7 @@ import CS from "metabase/css/core/index.css";import { Databases } from "metabase/entities/databases";import { Schemas } from "metabase/entities/schemas";import { Flex } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionItem } from "metabase-types/api";import { BrowseCard } from "../components/BrowseCard";diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsxindex bba373e8528..e70b08ec5c1 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx@@ -5,11 +5,10 @@ import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";+import * as Urls from "metabase/urls";import { isSyncInProgress } from "metabase/utils/syncing";-import * as Urls from "metabase/utils/urls";import type Metadata from "metabase-lib/v1/metadata/Metadata";import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";-import * as ML_Urls from "metabase-lib/v1/urls";import type { DatabaseId, Table } from "metabase-types/api";import { RELOAD_INTERVAL } from "../../constants";@@ -59,7 +58,7 @@ const getReloadInterval = (export const getTableUrl = (table: Table, metadata?: Metadata): string => {const metadataTable = metadata?.table(table.id);const question = metadataTable?.newQuestion();- return question ? ML_Urls.getUrl(question) : "";+ return question ? Urls.question(question) : "";};export const TableBrowser = _.compose(diff --git a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.tsindex 7414bb6cef3..dd5ef7a69d3 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts+++ b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts@@ -3,7 +3,7 @@ import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";import { Databases } from "metabase/entities/databases";import { useSelector } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";import type { DatabaseId } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsxindex 7f271bde3d4..306b81c909d 100644--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx@@ -29,7 +29,7 @@ import { entityForObject } from "metabase/entities/utils";import { connect, useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsxindex 3d384889466..7c6e9de92c1 100644--- a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx+++ b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx@@ -8,7 +8,7 @@ import _ from "underscore";import { ArchiveModal } from "metabase/common/components/ArchiveModal";import { Collections } from "metabase/entities/collections";import { connect } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";const mapDispatchToProps = {setCollectionArchived: Collections.actions.setArchived,diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsxindex 6e5095968e3..4054280404e 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link/Link";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";interface CollectionPermissionsProps {diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsxindex 1f91c3db5bc..777ef28bac1 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link/Link";import { Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";import { CollectionHeaderButton } from "./CollectionHeader.styled";diff --git a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsxindex 46810c05f7e..c36703a531d 100644--- a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx+++ b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx@@ -4,8 +4,8 @@ import { replace } from "react-router-redux";import { useGetCollectionQuery } from "metabase/api";import { useDispatch } from "metabase/redux";+import { extractCollectionId } from "metabase/urls";import { isNotNull } from "metabase/utils/types";-import { extractCollectionId } from "metabase/utils/urls";import { CollectionContent } from "../CollectionContent";diff --git a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsxindex 906ffbe772f..c75b9d7e240 100644--- a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx+++ b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx@@ -13,7 +13,7 @@ import { useHasDashboardQuestionCandidates } from "metabase/common/components/Moimport { UserHasSeenAll } from "metabase/common/components/UserHasSeen/UserHasSeenAll";import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";import { ActionIcon, Icon, Indicator, Menu, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";export interface CollectionMenuProps {diff --git a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsxindex 75240bdfdf5..541ca7fc69f 100644--- a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx+++ b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx@@ -10,7 +10,7 @@ import { MoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModaimport { useCollectionQuery } from "metabase/common/hooks";import { Collections } from "metabase/entities/collections";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection, CollectionId } from "metabase-types/api";export interface MoveCollectionModalProps {diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsxindex 49a1171f1b3..3a5aa50737e 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx@@ -12,7 +12,7 @@ import { getIcon } from "metabase/common/utils/icon";import { PLUGIN_MODERATION } from "metabase/plugins";import { Tooltip } from "metabase/ui";import { Flex, type IconName, Skeleton } from "metabase/ui";-import { modelToUrl } from "metabase/utils/urls";+import { modelToUrl } from "metabase/urls";import type Database from "metabase-lib/v1/metadata/Database";import type {Bookmark,diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsxindex e074d7cc3fe..53ece9b24b6 100644--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx@@ -15,7 +15,7 @@ import { getIcon } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";import { PLUGIN_MODERATION } from "metabase/plugins";import { Box, Flex, Group, Icon, Text } from "metabase/ui";-import { modelToUrl } from "metabase/utils/urls";+import { modelToUrl } from "metabase/urls";import Visualization from "metabase/visualizations/components/Visualization";import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsxindex a5c8110a92a..29535548a66 100644--- a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx+++ b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx@@ -8,7 +8,7 @@ import { Collections } from "metabase/entities/collections";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Modal } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";import type { CreateCollectionFormOwnProps } from "../components/CreateCollectionForm";diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsxindex 3c52cc5f6cb..ac4c131561a 100644--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx@@ -6,7 +6,7 @@ import type { SdkCollectionId } from "embedding-sdk-bundle/types";import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";import { useDispatch } from "metabase/redux";import { Modal, type ModalProps } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionId, Dashboard } from "metabase-types/api";import { CreateDashboardForm } from "./CreateDashboardForm";diff --git a/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsx b/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsxindex cc32080d2d6..153690b12f2 100644--- a/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsx+++ b/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsx@@ -8,13 +8,13 @@ import {SAMPLE_PROVIDER,} from "metabase-lib/test-helpers";import Question from "metabase-lib/v1/Question";-import * as ML_Urls from "metabase-lib/v1/urls";import { AdHocQuestionLoaderView } from "./AdHocQuestionLoader";-const getQuestionHash = (questionUrl: string) => {- const url = new URL(questionUrl, "http://example.com");- return url.hash;+const getQuestionHash = (question: Question) => {+ return Card.serializeCardForUrl(question.card(), {+ includeDisplayIsLocked: true,+ });};describe("AdHocQuestionLoader", () => {@@ -31,11 +31,10 @@ describe("AdHocQuestionLoader", () => {const q = Question.create({ metadata: SAMPLE_METADATA }).setQuery(Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY),);- const questionHash = getQuestionHash(ML_Urls.getUrl(q));render(<AdHocQuestionLoaderView- questionHash={questionHash}+ questionHash={getQuestionHash(q)}loadMetadataForCard={loadMetadataSpy}>{mockChild}@@ -59,13 +58,13 @@ describe("AdHocQuestionLoader", () => {const q = Question.create({ metadata: SAMPLE_METADATA }).setQuery(Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY),);- const questionHash = getQuestionHash(ML_Urls.getUrl(q));+ const questionHash = getQuestionHash(q);// Create a different valid question with a different limitconst q2 = Question.create({ metadata: SAMPLE_METADATA }).setQuery(Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY)).updateSettings({ "table.pivot": true });- const newQuestionHash = getQuestionHash(ML_Urls.getUrl(q2));+ const newQuestionHash = getQuestionHash(q2);const deserializeCardSpy = jest.spyOn(Card, "deserializeCardFromUrl");@@ -104,7 +103,7 @@ describe("AdHocQuestionLoader", () => {const q = Question.create({ metadata: SAMPLE_METADATA }).setQuery(Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY),);- const questionHash = getQuestionHash(ML_Urls.getUrl(q));+ const questionHash = getQuestionHash(q);// Make loadMetadataForCard hang so we can observe loading statelet resolveLoad: () => void;diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsxindex 742962a7ed6..5255cd09a03 100644--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx@@ -27,7 +27,7 @@ import { Swapper } from "metabase/common/components/Swapper";import CS from "metabase/css/core/index.css";import type { IconName, IconProps } from "metabase/ui";import { Ellipsified, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionItem } from "metabase-types/api";import {diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx b/frontend/src/metabase/common/components/ItemsTable/Columns.tsxindex 965ab5fcf74..1363ca6149c 100644--- a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx@@ -12,8 +12,8 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_MODERATION } from "metabase/plugins";import { Ellipsified, type IconProps, Tooltip } from "metabase/ui";+import { modelToUrl } from "metabase/urls";import { isTouchDevice } from "metabase/utils/browser";-import { modelToUrl } from "metabase/utils/urls";import { getUserName } from "metabase/utils/user";import type {CollectionItem,diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsxindex 3a39912eaea..534ecd75729 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import * as Urls from "metabase/urls";import type Table from "metabase-lib/v1/metadata/Table";-import * as ML_Urls from "metabase-lib/v1/urls";import { Container, Label, LabelContainer } from "../MetadataInfo.styled";@@ -55,7 +55,7 @@ function ConnectedTableButton({function ConnectedTableLink({ table }: { table: Table }) {return (- <LabelLink to={ML_Urls.getUrl(table.newQuestion())}>+ <LabelLink to={Urls.question(table.newQuestion())}><InteractiveTableLabel table={table} /></LabelLink>);diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsxindex 4da0f908803..830efbad954 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx@@ -14,7 +14,7 @@ import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledimport { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { getUserIsAdmin } from "metabase/selectors/user";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { ConfirmMoveDashboardQuestionCandidatesModal } from "./ConfirmMoveDashboardQuestionCandidatesModal";import { MoveQuestionsIntoDashboardsInfoModal } from "./MoveQuestionsIntoDashboardsInfoModal";diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsxindex 2d63857df05..4d11d15c644 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx@@ -10,7 +10,7 @@ import { setOpenModal } from "metabase/redux/ui";import { getSetting } from "metabase/selectors/settings";import { getUserCanWriteToCollections } from "metabase/selectors/user";import { Box, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionId } from "metabase-types/api";import { trackNewMenuItemClicked } from "./analytics";diff --git a/frontend/src/metabase/common/components/UserCollectionList.tsx b/frontend/src/metabase/common/components/UserCollectionList.tsxindex 28299641987..a8b2df9b70c 100644--- a/frontend/src/metabase/common/components/UserCollectionList.tsx+++ b/frontend/src/metabase/common/components/UserCollectionList.tsx@@ -5,7 +5,7 @@ import {ROOT_COLLECTION,} from "metabase/entities/collections/constants";import type { IconName } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";export const UserCollectionList = () => {const { data, isLoading } = useListUsersQuery({});diff --git a/frontend/src/metabase/common/utils/card.ts b/frontend/src/metabase/common/utils/card.tsindex e049abde3da..d1b331947c6 100644--- a/frontend/src/metabase/common/utils/card.ts+++ b/frontend/src/metabase/common/utils/card.ts@@ -18,6 +18,7 @@ import { normalize } from "metabase-lib/v1/queries/utils/normalize";import type {ActionParametersMapping,Card,+ CardId,DashboardParameterMapping,DatasetQuery,LegacyDatasetQuery,@@ -62,7 +63,8 @@ function getCleanCard(if (includeDatasetQuery) {keysToInclude.push("dataset_query");}- if (includeOriginalCardId) {+ if (includeOriginalCardId && !isTransientCardId(value.original_card_id)) {+ // transient card id's are never includedkeysToInclude.push("original_card_id");}if (includeDisplayIsLocked) {@@ -265,3 +267,7 @@ export function applyParameters(return datasetQuery;}++export function isTransientCardId(id: CardId | string | null | undefined) {+ return id != null && typeof id === "string" && isNaN(parseInt(id));+}diff --git a/frontend/src/metabase/dashboard/actions/getNewCardUrl.ts b/frontend/src/metabase/dashboard/actions/getNewCardUrl.tsindex 376c9592439..bc167f1792b 100644--- a/frontend/src/metabase/dashboard/actions/getNewCardUrl.ts+++ b/frontend/src/metabase/dashboard/actions/getNewCardUrl.ts@@ -1,21 +1,26 @@import _ from "underscore";import type { StoreDashboard } from "metabase/redux/store";+import * as Urls from "metabase/urls";import { getCardAfterVisualizationClick } from "metabase/visualizations/lib/utils";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { ParameterWithTarget } from "metabase-lib/v1/parameters/types";-import * as ML_Urls from "metabase-lib/v1/urls";+import { getTemplateTagFromTarget } from "metabase-lib/v1/parameters/utils/targets";+import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";import type {Card,Dashboard,ParameterId,ParameterValueOrArray,QuestionDashboardCard,+ TemplateTag,VirtualCard,} from "metabase-types/api";+import { getStructuredQuestionUrlWithParameters } from "../utils/question-url";+/*** All navigation URLs from dashboards to cards (e.x. clicking a title, drill through)* should come from this function, which merges any currently applied dashboard filters@@ -68,17 +73,25 @@ export const getNewCardUrl = ({// This try/catch block is a temporary workaround for metabase#43990.// Please remove it once the underlying issue is fixed.try {- const url = ML_Urls.getUrlWithParameters(+ const { isNative } = Lib.queryDisplayInfo(nextQuestion.query());+ if (isNative) {+ const nativeQuery = nextQuestion.legacyNativeQuery() as NativeQuery;+ return Urls.question(nextQuestion, {+ query: remapParameterValuesToTemplateTags(+ nativeQuery.templateTags(),+ parametersMappedToCard,+ parameterValues,+ ),+ });+ }++ return getStructuredQuestionUrlWithParameters(nextQuestion,previousQuestion,parametersMappedToCard,parameterValues,- {- objectId,- },+ { objectId },);-- return url;} catch (error) {return undefined;}@@ -108,3 +121,29 @@ export function getParametersMappedToCard(];});}++// When navigating from a dashboard to a saved native question, dashboard parameters+// need to be remapped from dashboard-parameter-id keys to template-tag-name keys so+// the native editor populates its template tags from the URL query string.+export function remapParameterValuesToTemplateTags(+ templateTags: TemplateTag[],+ dashboardParameters: ParameterWithTarget[],+ parameterValuesByDashboardParameterId: Record<string, any>,+) {+ const parameterValues: Record<string, any> = {};+ const templateTagParametersByName = _.indexBy(templateTags, "name");++ dashboardParameters.forEach((dashboardParameter) => {+ const { target } = dashboardParameter;+ const tag = getTemplateTagFromTarget(target);++ if (tag != null && templateTagParametersByName[tag]) {+ const templateTagParameter = templateTagParametersByName[tag];+ const parameterValue =+ parameterValuesByDashboardParameterId[dashboardParameter.id];+ parameterValues[templateTagParameter.name] = parameterValue;+ }+ });++ return parameterValues;+}diff --git a/frontend/src/metabase/dashboard/actions/getNewCardUrl.unit.spec.ts b/frontend/src/metabase/dashboard/actions/getNewCardUrl.unit.spec.tsindex fd1568effe3..0795ab33600 100644--- a/frontend/src/metabase/dashboard/actions/getNewCardUrl.unit.spec.ts+++ b/frontend/src/metabase/dashboard/actions/getNewCardUrl.unit.spec.ts@@ -5,7 +5,10 @@ import {createMockParameter,} from "metabase-types/api/mocks";-import { getParametersMappedToCard } from "./getNewCardUrl";+import {+ getParametersMappedToCard,+ remapParameterValuesToTemplateTags,+} from "./getNewCardUrl";describe("getParametersMappedToDashcard", () => {const dashboard = createMockDashboard({@@ -88,3 +91,54 @@ describe("getParametersMappedToDashcard", () => {]);});});++describe("remapParameterValuesToTemplateTags", () => {+ it("should convert a dashboard parameterValues map into a map of template tag values", () => {+ const parameterValues = {+ "dashboard-parameter-1": "aaa",+ "dashboard-parameter-2": "bbb",+ "dashboard-parameter-3": null,+ "dashboard-parameter-4": "ddd",+ };++ const dashboardParameters = [+ {+ id: "dashboard-parameter-1",+ target: ["variable", ["template-tag", "template-tag-1"]],+ },+ {+ id: "dashboard-parameter-2",+ target: ["dimension", ["template-tag", "template-tag-2"]],+ },+ {+ id: "dashboard-parameter-3",+ target: ["dimension", ["template-tag", "template-tag-3"]],+ },+ {+ id: "dashboard-parameter-4",+ target: ["dimension", ["field", 1, null]],+ },+ {+ id: "dashboard-parameter-5",+ },+ ] as any;++ const templateTags = [+ { name: "template-tag-1" },+ { name: "template-tag-2" },+ { name: "template-tag-3" },+ ] as any;++ expect(+ remapParameterValuesToTemplateTags(+ templateTags,+ dashboardParameters,+ parameterValues,+ ),+ ).toEqual({+ "template-tag-1": "aaa",+ "template-tag-2": "bbb",+ "template-tag-3": null,+ });+ });+});diff --git a/frontend/src/metabase/dashboard/actions/navigation.ts b/frontend/src/metabase/dashboard/actions/navigation.tsindex 5dc8481b5ca..b898dbb2e61 100644--- a/frontend/src/metabase/dashboard/actions/navigation.ts+++ b/frontend/src/metabase/dashboard/actions/navigation.ts@@ -3,8 +3,8 @@ import { openUrl } from "metabase/redux/app";import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";import type { Dispatch, GetState } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";+import * as Urls from "metabase/urls";import { isQuestionDashCard } from "metabase/utils/dashboard";-import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { Card, DashboardCard, VirtualCard } from "metabase-types/api";@@ -20,7 +20,7 @@ export const editQuestion = createThunkAction(const dashboard = dashboardId != null ? dashboards[dashboardId] : null;const { isNative } = Lib.queryDisplayInfo(question.query());const finalMode = isNative ? "view" : mode;- const url = Urls.question(question.card(), { mode: finalMode });+ const url = Urls.card(question.card(), { mode: finalMode });dispatch(openUrl(url));return { id: dashboardId, name: dashboard?.name, model: "dashboard" };diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsxindex f0357e07dfc..4c77054e6df 100644--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx@@ -11,7 +11,7 @@ import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { Dashboards } from "metabase/entities/dashboards";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";import { getDashboardComplete } from "../selectors";diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsxindex 0fe5bdb095f..00a95178c04 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx@@ -9,7 +9,7 @@ import { SidesheetCardSection } from "metabase/common/components/Sidesheet";import Styles from "metabase/css/core/index.css";import { DashboardPublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover";import { Box, FixedSizeIcon, Flex, Text } from "metabase/ui";-import { collection as collectionUrl } from "metabase/utils/urls";+import { collection as collectionUrl } from "metabase/urls";import { getUserName } from "metabase/utils/user";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsxindex d3262496044..debfd6aa2fb 100644--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx@@ -10,7 +10,7 @@ import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Flex, Icon } from "metabase/ui";import { color } from "metabase/ui/utils/colors";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionId, Dashboard, DashboardId } from "metabase-types/api";import S from "./DashboardMoveModal.module.css";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.tsindex 4471faee66f..17c3df4f103 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts@@ -2,7 +2,7 @@ import { push } from "react-router-redux";import { getDashboard } from "metabase/dashboard/selectors";import { createThunkAction } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";const ADD_DASHBOARD_QUESTION = "metabase/dashboard/ADD_DASHBOARD_QUESTION";diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsxindex 938e5ef7395..db8a40e38e0 100644--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx@@ -8,7 +8,7 @@ import { setArchivedDashboard } from "metabase/dashboard/actions";import { Collections } from "metabase/entities/collections";import { Dashboards } from "metabase/entities/dashboards";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";type OwnProps = {diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsxindex 8a662b83bc0..21498c8b110 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx@@ -24,7 +24,7 @@ import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { Box, Flex, Group } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Dashboard as IDashboard } from "metabase-types/api";import { FixedWidthContainer } from "../../components/Dashboard/DashboardComponents";diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsxindex b804376e3f6..3ef3764c49a 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx@@ -34,8 +34,8 @@ import {} from "metabase/hooks/use-page-title";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";+import * as Urls from "metabase/urls";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";-import * as Urls from "metabase/utils/urls";import type { DashboardId, Dashboard as IDashboard } from "metabase-types/api";import { useRegisterDashboardMetabotContext } from "../../hooks/use-register-dashboard-metabot-context";diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.tsindex 81d0c7a6717..5f12bb2d4b4 100644--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts@@ -9,7 +9,7 @@ import { useSetting } from "metabase/common/hooks";import { isEmbedPreview } from "metabase/embedding/config";import { useDispatch, useSelector } from "metabase/redux";import { selectTab } from "metabase/redux/dashboard";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";import {diff --git a/frontend/src/metabase/dashboard/selectors.ts b/frontend/src/metabase/dashboard/selectors.tsindex 4dbe3a65970..f7f6bfbd588 100644--- a/frontend/src/metabase/dashboard/selectors.ts+++ b/frontend/src/metabase/dashboard/selectors.ts@@ -29,9 +29,9 @@ import {import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { getIsWebApp } from "metabase/selectors/web-app";+import * as Urls from "metabase/urls";import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";import { isNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";import Question from "metabase-lib/v1/Question";import {diff --git a/frontend/src/metabase-lib/v1/queries/drills/dashboard-click-drill.js b/frontend/src/metabase/dashboard/utils/dashboard-click-drill.jssimilarity index 96%rename from frontend/src/metabase-lib/v1/queries/drills/dashboard-click-drill.jsrename to frontend/src/metabase/dashboard/utils/dashboard-click-drill.jsindex f87220c42c7..350274b2898 100644--- a/frontend/src/metabase-lib/v1/queries/drills/dashboard-click-drill.js+++ b/frontend/src/metabase/dashboard/utils/dashboard-click-drill.js@@ -3,8 +3,8 @@ import querystring from "querystring";import { getIn } from "icepick";import _ from "underscore";+import * as Urls from "metabase/urls";import { renderLinkURLForClick } from "metabase/utils/formatting/link";-import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import {@@ -13,7 +13,8 @@ import {getTargetForQueryParams,} from "metabase-lib/v1/parameters/utils/click-behavior";import { isDate } from "metabase-lib/v1/types/utils/isa";-import * as ML_Urls from "metabase-lib/v1/urls";++import { getStructuredQuestionUrlWithParameters } from "./question-url";export function getDashboardDrillType(clicked) {const clickBehavior = getClickBehavior(clicked);@@ -151,13 +152,13 @@ export function getDashboardDrillQuestionUrl(question, clicked) {const originalQuestion = targetQuestion;return !isTargetQuestionNative- ? ML_Urls.getUrlWithParameters(+ ? getStructuredQuestionUrlWithParameters(targetQuestion,originalQuestion,parameters,queryParams,)- : `${ML_Urls.getUrl(targetQuestion)}?${querystring.stringify(queryParams)}`;+ : Urls.question(targetQuestion, { query: queryParams });}export function getClickBehavior(clicked) {diff --git a/frontend/src/metabase/dashboard/utils/question-url.ts b/frontend/src/metabase/dashboard/utils/question-url.tsnew file mode 100644index 00000000000..e65a95f6489--- /dev/null+++ b/frontend/src/metabase/dashboard/utils/question-url.ts@@ -0,0 +1,47 @@+import * as Urls from "metabase/urls";+import * as Lib from "metabase-lib";+import type Question from "metabase-lib/v1/Question";+import type { ParameterWithTarget } from "metabase-lib/v1/parameters/types";+import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";+import type { ParameterId, ParameterValueOrArray } from "metabase-types/api";++// Builds a URL to a structured (MBQL) question with dashboard parameters applied.+// Callers must handle native queries themselves — their parameters map to template+// tags and produce a different URL shape.+export function getStructuredQuestionUrlWithParameters(+ question: Question,+ originalQuestion: Question,+ parameters: ParameterWithTarget[],+ parameterValues: Record<+ ParameterId,+ ParameterValueOrArray | undefined | null+ >,+ { objectId }: { objectId?: string | number } = {},+): string {+ if (parameters.length === 0 && objectId == null) {+ return Urls.question(question);+ }++ const { isEditable } = Lib.queryDisplayInfo(question.query());+ const questionWithParameters = question.setParameters(parameters);++ if (isEditable) {+ // treat the dataset/model question like it is already composed so that we can apply+ // dataset/model-specific metadata to the underlying dimension options+ const needsComposing = question.type() !== "question";+ const composed = needsComposing+ ? question.composeQuestionAdhoc().setParameters(parameters)+ : questionWithParameters;+ const withMbqlFilters = composed+ .setParameterValues(parameterValues)+ ._convertParametersToMbql({ isComposed: needsComposing });++ return Urls.question(withMbqlFilters, {+ originalQuestion,+ query: objectId === undefined ? {} : { objectId },+ });+ }++ const query = getParameterValuesBySlug(parameters, parameterValues);+ return Urls.question(questionWithParameters.markDirty(), { query });+}diff --git a/frontend/src/metabase/dashboard/utils/question-url.unit.spec.ts b/frontend/src/metabase/dashboard/utils/question-url.unit.spec.tsnew file mode 100644index 00000000000..0fc2995bd60--- /dev/null+++ b/frontend/src/metabase/dashboard/utils/question-url.unit.spec.ts@@ -0,0 +1,220 @@+import { parse } from "url";++import { createMockMetadata } from "__support__/metadata";+import { deserializeCardFromUrl } from "metabase/common/utils/card";+import * as Lib from "metabase-lib";+import Question from "metabase-lib/v1/Question";+import type { ParameterWithTarget } from "metabase-lib/v1/parameters/types";+import {+ PRODUCTS,+ PRODUCTS_ID,+ SAMPLE_DB_ID,+ createSampleDatabase,+} from "metabase-types/api/mocks/presets";++import { getStructuredQuestionUrlWithParameters } from "./question-url";++const metadata = createMockMetadata({+ databases: [createSampleDatabase()],+});++const metadataProvider = Lib.metadataProvider(SAMPLE_DB_ID, metadata);++function parseUrl(url: string) {+ const parsed = parse(url, true);+ return {+ card: parsed.hash && deserializeCardFromUrl(parsed.hash),+ query: parsed.query,+ pathname: parsed.pathname,+ };+}++describe("getStructuredQuestionUrlWithParameters", () => {+ const parameters: ParameterWithTarget[] = [+ {+ id: "1",+ name: "String",+ slug: "param_string",+ type: "category",+ target: ["dimension", ["field", 1, null]],+ },+ {+ id: "2",+ name: "Operator",+ slug: "param_operator",+ type: "category/starts-with",+ target: ["dimension", ["field", 2, null]],+ },+ {+ id: "3",+ name: "Date",+ slug: "param_date",+ type: "date/month",+ target: ["dimension", ["field", PRODUCTS.CREATED_AT, null]],+ },+ {+ id: "4",+ name: "Foreign Key",+ slug: "param_fk",+ type: "date/month",+ target: ["dimension", ["field", 2, { "source-field": 1 }]],+ },+ {+ id: "5",+ name: "Number",+ slug: "param_number",+ type: "number/=",+ target: ["dimension", ["field", 2, null]],+ },+ ];++ const card = {+ id: 1,+ dataset_query: Lib.toJsQuery(+ Lib.fromJsQuery(metadataProvider, {+ type: "query",+ query: {+ "source-table": PRODUCTS_ID,+ },+ database: SAMPLE_DB_ID,+ }),+ ),+ };++ describe("with structured card", () => {+ const question = new Question(card, metadata);+ const originalQuestion = question;++ it("should return question URL with no parameters", () => {+ const parameters: ParameterWithTarget[] = [];+ const parameterValues = {};++ const url = getStructuredQuestionUrlWithParameters(+ question,+ originalQuestion,+ parameters,+ parameterValues,+ );++ expect(parseUrl(url)).toEqual({+ pathname: "/question/1",+ query: {},+ card: null,+ });+ });++ it("should return question URL with string MBQL filter added", () => {+ const url = getStructuredQuestionUrlWithParameters(+ question,+ originalQuestion,+ parameters,+ {+ 1: "bar",+ },+ );++ const parsedUrl = parseUrl(url);+ const parsedQuestion = new Question(parsedUrl.card, question.metadata());+ expect(parsedUrl.pathname).toEqual("/question");+ expect(parsedUrl.query).toEqual({});+ expect(Lib.filters(parsedQuestion.query(), -1)).toHaveLength(1);+ });++ it("should return question URL with number MBQL filter added", () => {+ const url = getStructuredQuestionUrlWithParameters(+ question,+ originalQuestion,+ parameters,+ {+ 5: 123,+ },+ );++ const parsedUrl = parseUrl(url);+ const parsedQuestion = new Question(parsedUrl.card, question.metadata());+ expect(Lib.filters(parsedQuestion.query(), -1)).toHaveLength(1);+ });++ it("should return question URL with date MBQL filter added", () => {+ const url = getStructuredQuestionUrlWithParameters(+ question,+ originalQuestion,+ parameters,+ {+ 3: "2017-05",+ },+ );++ const parsedUrl = parseUrl(url);+ const parsedQuestion = new Question(parsedUrl.card, question.metadata());+ expect(Lib.filters(parsedQuestion.query(), -1)).toHaveLength(1);+ });++ it("should include objectId in a URL", () => {+ const OBJECT_ID = "5";+ const url = getStructuredQuestionUrlWithParameters(+ question,+ originalQuestion,+ parameters,+ { 1: "bar" },+ { objectId: OBJECT_ID },+ );++ expect(parseUrl(url)).toEqual({+ pathname: "/question",+ query: { objectId: OBJECT_ID },+ card: expect.any(Object),+ });+ });+ });++ describe("with structured question & no permissions", () => {+ const question = new Question(card);+ const originalQuestion = question;++ it("should return a card with attached parameters and parameter values as query params", () => {+ const url = getStructuredQuestionUrlWithParameters(+ question,+ originalQuestion,+ parameters,+ {+ 1: "bar",+ },+ );++ const deserializedCard = {+ ...card,+ parameters,+ original_card_id: card.id,+ parameterValues: {},+ };++ // @ts-expect-error: We're removing a required field+ delete deserializedCard.id;++ expect(parseUrl(url)).toEqual({+ pathname: "/question",+ query: {+ param_date: "",+ param_fk: "",+ param_number: "",+ param_operator: "",+ param_string: "bar",+ },+ card: deserializedCard,+ });+ });++ it("should not include objectId in a URL", () => {+ const url = getStructuredQuestionUrlWithParameters(+ question,+ originalQuestion,+ parameters,+ { 1: "bar" },+ { objectId: 5 },+ );++ expect(parseUrl(url).query.objectId).toBeUndefined();+ });+ });+});diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsxindex 7ed6d0379d4..ce49e7f54f7 100644--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx@@ -8,8 +8,8 @@ import { getParameterValues } from "metabase/dashboard/selectors";import { Search } from "metabase/entities/search";import { SearchResults } from "metabase/nav/components/search/SearchResults";import { useSelector } from "metabase/redux";+import { modelToUrl } from "metabase/urls";import { getUrlTarget } from "metabase/utils/dom";-import { modelToUrl } from "metabase/utils/urls";import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";import type {Dashboard,diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex 9cb9807d4b3..3f8797e93be 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -31,8 +31,8 @@ import {Text,Tooltip,} from "metabase/ui";+import * as Urls from "metabase/urls";import { isMac } from "metabase/utils/browser";-import * as Urls from "metabase/utils/urls";import S from "./DataStudioLayout.module.css";import { getCurrentTab } from "./utils";diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.tsindex 6db0c63ac53..7326726d621 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts@@ -1,4 +1,4 @@-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";type TabName =| "data"diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsxindex 4741a4f19dc..a5de52e8ae8 100644--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx@@ -3,7 +3,7 @@ import { Link } from "react-router";import { useListDatabaseSchemasQuery } from "metabase/api";import { Ellipsified } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";import { DataStudioBreadcrumbs } from "../DataStudioBreadcrumbs";diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsxindex 66572884883..2b9482f22ba 100644--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx@@ -1,6 +1,6 @@import { Link } from "react-router";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";import { useCollectionPath } from "../../hooks/use-collection-path/useCollectionPath";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.tsindex 84394ddf2b5..3c802915305 100644--- 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.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionId } from "metabase-types/api";import type { LibrarySectionType, TreeItem } from "../types";diff --git a/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts b/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.tsindex 37d96edf944..9a9d3fea49f 100644--- a/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts+++ b/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts@@ -1,4 +1,4 @@-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { DatasetQuery } from "metabase-types/api";export function getDatasetQueryPreviewUrl(diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsxindex 7d06cb4f2db..3dbb085c7fb 100644--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from "react";import { replace } from "react-router-redux";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { RouteParams } from "../../pages/DataModel/types";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsxindex 84f67f5acf3..ca4f0dc4060 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx@@ -35,9 +35,9 @@ import {Tabs,Tooltip,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";-import type { DataStudioTableMetadataTab } from "metabase/utils/urls/data-studio";-import { dependencyGraph } from "metabase/utils/urls/dependencies";+import * as Urls from "metabase/urls";+import type { DataStudioTableMetadataTab } from "metabase/urls/data-studio";+import { dependencyGraph } from "metabase/urls/dependencies";import {type FieldId,type Table,diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsxindex ac236e182b1..1ae50cea857 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx@@ -6,7 +6,7 @@ import { trackMeasureCreateStarted } from "metabase/data-studio/analytics";import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";import { useSelector } from "metabase/redux";import { Button, Group, Icon, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ConcreteTableId, Table } from "metabase-types/api";import S from "../../TableSection.module.css";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsxindex 5564d57d741..feabe0439bb 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx@@ -1,7 +1,7 @@import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { createMockSegment } from "metabase-types/api/mocks";import { SegmentItem } from "./SegmentItem";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsxindex 802cb313969..a2a243103aa 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx@@ -6,7 +6,7 @@ import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";import { getUserCanWriteSegments } from "metabase/data-studio/selectors";import { useSelector } from "metabase/redux";import { Button, Group, Icon, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";import S from "../../TableSection.module.css";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsxindex 3ff4212aa8e..f611c06f9da 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx@@ -11,7 +11,7 @@ import {} from "metabase/metadata/components";import { useMetadataToasts } from "metabase/metadata/hooks";import { Box, Icon, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {Table,TableDataLayer,diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsxindex a508502f3ba..ab3041d66a7 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx@@ -2,7 +2,7 @@ import { Link } from "react-router";import { t } from "ttag";import { Box } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";import S from "./TableCollection.module.css";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsxindex b068b187e47..1f398947b7d 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx@@ -6,8 +6,8 @@ import { Link } from "metabase/common/components/Link";import { useNumberFormatter } from "metabase/common/hooks/use-number-formatter";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Ellipsified, Group, Stack, Text } from "metabase/ui";+import { dependencyGraph } from "metabase/urls/dependencies";import { isNullOrUndefined } from "metabase/utils/types";-import { dependencyGraph } from "metabase/utils/urls/dependencies";import type { Table } from "metabase-types/api";interface Props {diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsxindex e8e6f981a0a..ffc83b5a125 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx@@ -9,7 +9,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import type { RouteParams } from "metabase/data-studio/data-model/pages/DataModel/types";import { createMockState } from "metabase/redux/store/mocks";-import type { DataStudioTableMetadataTab } from "metabase/utils/urls";+import type { DataStudioTableMetadataTab } from "metabase/urls";import type {Database,EnterpriseSettings,diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsxindex c224f2f767f..c29c64668f6 100644--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx@@ -35,7 +35,7 @@ import {Stack,rem,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { trackMetadataChange } from "../../analytics";import {diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsxindex 46fc342995d..93cbf27a56c 100644--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx@@ -25,8 +25,8 @@ import {within,} from "__support__/ui";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import registerVisualizations from "metabase/visualizations/register";import type {Database,diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.tsindex a971929dae2..2dfbe1b953c 100644--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts@@ -1,4 +1,4 @@-import type { DataStudioTableMetadataTab } from "metabase/utils/urls/data-studio";+import type { DataStudioTableMetadataTab } from "metabase/urls/data-studio";import type {DatabaseId,FieldId,diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.tsindex a675684e36d..827d737ca98 100644--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts@@ -1,5 +1,5 @@-import * as Urls from "metabase/utils/urls";-import { isDataStudioTableMetadataTab } from "metabase/utils/urls/data-studio";+import * as Urls from "metabase/urls";+import { isDataStudioTableMetadataTab } from "metabase/urls/data-studio";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import type { ParsedRouteParams, RouteParams } from "./types";diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsxindex 936decd1e30..fcaf5764263 100644--- a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx+++ b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx@@ -4,7 +4,7 @@ import {DataModelBreadcrumbs,PublishedTableBreadcrumbs,} from "metabase/data-studio/common/components/Breadcrumbs";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Measure, Table } from "metabase-types/api";type MeasureBreadcrumbsProps = {diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.tsindex 8ee7b91e00f..f3772cf514d 100644--- a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts+++ b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts@@ -9,7 +9,7 @@ import {} from "metabase/api";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.tsindex df8df360c63..b5e3f729ad9 100644--- a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts+++ b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts@@ -9,7 +9,7 @@ import {} from "metabase/api";import { useToast } from "metabase/common/hooks/use-toast";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";import type { MeasureTabUrls } from "../types";diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsxindex f13b66cb595..46aec6c26fe 100644--- a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx@@ -4,7 +4,7 @@ import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxindex 335bb36cb0f..5b62dc93107 100644--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -11,7 +11,7 @@ import { useMetadataToasts } from "metabase/metadata/hooks";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type { Measure } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsxindex 75a47792a9b..aa9fd09c2e5 100644--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx@@ -4,7 +4,7 @@ import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";import { NewMeasurePage } from "../NewMeasurePage";diff --git a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsxindex a18cf41326d..839327543ec 100644--- a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx+++ b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { useDispatch } from "metabase/redux";import { openUrl } from "metabase/redux/app";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";type DataStudioToolbarButtonProps = {diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsxindex 4b2e227415d..9e465d0deae 100644--- a/frontend/src/metabase/data-studio/routes.tsx+++ b/frontend/src/metabase/data-studio/routes.tsx@@ -10,7 +10,7 @@ import {import type { State } from "metabase/redux/store";import { getDataStudioTransformRoutes } from "metabase/transforms/routes";import { canAccessTransforms } from "metabase/transforms/selectors";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { DataSectionLayout } from "./app/pages/DataSectionLayout";import { DataStudioLayout } from "./app/pages/DataStudioLayout";diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsxindex 032be8266b6..2e7bfc474ef 100644--- a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx+++ b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx@@ -4,7 +4,7 @@ import {DataModelBreadcrumbs,PublishedTableBreadcrumbs,} from "metabase/data-studio/common/components/Breadcrumbs";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Segment, Table } from "metabase-types/api";type SegmentBreadcrumbsProps = {diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.tsindex 0afa3aa9fbc..5e1c2f195ec 100644--- a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts+++ b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts@@ -9,7 +9,7 @@ import {} from "metabase/api";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.tsindex 2bcb6a68ed4..30de22a722f 100644--- a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts+++ b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts@@ -9,7 +9,7 @@ import {} from "metabase/api";import { useToast } from "metabase/common/hooks/use-toast";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";import type { SegmentTabUrls } from "../types";diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsxindex 21a1e573f2b..80c0f4afdea 100644--- a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx@@ -4,7 +4,7 @@ import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsxindex 508160a6523..060bdf2a88d 100644--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx@@ -4,7 +4,7 @@ import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";import { NewSegmentPage } from "../NewSegmentPage";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsxindex 629acb018e2..af4ee0d3140 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx@@ -7,7 +7,7 @@ import { getDocsUrl } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Button, Divider, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { ContactSupportButtonSection } from "./ContactSupportButtonSection";diff --git a/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx b/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsxindex a9d3a7f8d07..204da25c63a 100644--- a/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx@@ -1,5 +1,5 @@import { useGetCollectionQuery } from "metabase/api";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionId } from "metabase-types/api";import { Breadcrumb } from "./Breadcrumb";diff --git a/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx b/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsxindex dbccc1e9ca1..25733768656 100644--- a/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx@@ -6,7 +6,7 @@ import {useGetCollectionQuery,} from "metabase/api";import { Group, type GroupProps } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import type { Table } from "metabase-types/api";@@ -56,7 +56,7 @@ export const ModelNav = ({ rowName, table, ...props }: Props) => {{card && (<>- <Breadcrumb href={Urls.question(card)} icon="model">+ <Breadcrumb href={Urls.card(card)} icon="model">{card.name}</Breadcrumb>diff --git a/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx b/frontend/src/metabase/detail-view/components/Nav/TableNav.tsxindex ea5b393c7e5..6e5d47ce07b 100644--- a/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx@@ -2,7 +2,7 @@ import type { ReactNode } from "react";import { skipToken, useListDatabaseSchemasQuery } from "metabase/api";import { Group, type GroupProps } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";import { Breadcrumb } from "./Breadcrumb";diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.ts b/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.tsindex b2cca06344a..91d8416b83e 100644--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.ts+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.ts@@ -1,5 +1,5 @@+import * as Urls from "metabase/urls";import { parseNumber } from "metabase/utils/number";-import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";@@ -85,5 +85,5 @@ export const getForeignKeyQuestionUrl = (query: Lib.Query): string => {dataset_query: Lib.toJsQuery(query),});- return Urls.question(question.card(), { hash: question.card() });+ return Urls.card(question.card());};diff --git a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsxindex 0240e7bac8e..9d11b97d1dc 100644--- a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx+++ b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx@@ -16,7 +16,7 @@ import { useDispatch, useSelector } from "metabase/redux";import { closeNavbar, setDetailView } from "metabase/redux/app";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { extractRemappedColumns } from "metabase/visualizations";import * as Lib from "metabase-lib";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsxindex 88ad66928f6..f89cf7ebe6c 100644--- a/frontend/src/metabase/documents/components/DocumentPage.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx@@ -42,8 +42,8 @@ import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { Box } from "metabase/ui";-import { extractEntityId } from "metabase/utils/urls";-import * as Urls from "metabase/utils/urls";+import { extractEntityId } from "metabase/urls";+import * as Urls from "metabase/urls";import type {Card,CollectionId,diff --git a/frontend/src/metabase/documents/hooks/use-block-menus.ts b/frontend/src/metabase/documents/hooks/use-block-menus.tsindex c03876446c9..b54ebdba5e2 100644--- a/frontend/src/metabase/documents/hooks/use-block-menus.ts+++ b/frontend/src/metabase/documents/hooks/use-block-menus.ts@@ -10,8 +10,8 @@ import {} from "metabase/documents/selectors";import { isTopLevel } from "metabase/documents/utils/editorNodeUtils";import { useSelector } from "metabase/redux";+import { documentWithAnchor } from "metabase/urls";import { isWithinIframe } from "metabase/utils/iframe";-import { documentWithAnchor } from "metabase/utils/urls";interface UseBlockMenusOptions {node: NodeViewProps["node"];diff --git a/frontend/src/metabase/documents/routes.tsx b/frontend/src/metabase/documents/routes.tsxindex 45f2e438f2e..79963f1b47b 100644--- a/frontend/src/metabase/documents/routes.tsx+++ b/frontend/src/metabase/documents/routes.tsx@@ -1,6 +1,6 @@import type { ComponentProps } from "react";-import { extractEntityId } from "metabase/utils/urls";+import { extractEntityId } from "metabase/urls";import { DocumentPage } from "./components/DocumentPage";diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsxindex 269071e79e8..bafc6df5c5a 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx@@ -6,7 +6,7 @@ import {trackPublicLinkCopied,trackPublicLinkRemoved,} from "metabase/public/lib/analytics";-import { publicDashboard as getPublicDashboardUrl } from "metabase/utils/urls";+import { publicDashboard as getPublicDashboardUrl } from "metabase/urls";import type { Dashboard } from "metabase-types/api";import { PublicLinkPopover } from "./PublicLinkPopover";diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsxindex c5586611fff..c76d7b40d11 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx@@ -11,7 +11,7 @@ import {trackPublicLinkRemoved,} from "metabase/public/lib/analytics";import { Box, Popover, Title } from "metabase/ui";-import { publicDocument as getPublicDocumentUrl } from "metabase/utils/urls/documents";+import { publicDocument as getPublicDocumentUrl } from "metabase/urls/documents";import type { Document } from "metabase-types/api";import { DocumentPublicLinkPopoverContent } from "./DocumentPublicLinkPopoverContent";diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsxindex 0fcdfaf3da5..e1d00b3668b 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx@@ -9,7 +9,7 @@ import {trackPublicLinkCopied,trackPublicLinkRemoved,} from "metabase/public/lib/analytics";-import { publicQuestion as getPublicQuestionUrl } from "metabase/utils/urls";+import { publicQuestion as getPublicQuestionUrl } from "metabase/urls";import type Question from "metabase-lib/v1/Question";import { PublicLinkPopover } from "./PublicLinkPopover";diff --git a/frontend/src/metabase/entities/collections/getInitialCollectionId.ts b/frontend/src/metabase/entities/collections/getInitialCollectionId.tsindex a401237776a..e2c22af9491 100644--- a/frontend/src/metabase/entities/collections/getInitialCollectionId.ts+++ b/frontend/src/metabase/entities/collections/getInitialCollectionId.ts@@ -8,7 +8,7 @@ import {} from "metabase/collections/utils";import type { State } from "metabase/redux/store";import { getUserPersonalCollectionId } from "metabase/selectors/user";-import * as Urls from "metabase/utils/urls/collections";+import * as Urls from "metabase/urls/collections";import type { Collection, CollectionId } from "metabase-types/api";import { ROOT_COLLECTION } from "./constants";diff --git a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsxindex 5c3a5288b01..40684ebda93 100644--- a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx+++ b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx@@ -4,8 +4,8 @@ import _ from "underscore";import { useListPopularItemsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { getIcon } from "metabase/common/utils/icon";+import * as Urls from "metabase/urls";import { getName } from "metabase/utils/name";-import * as Urls from "metabase/utils/urls";import type { PopularItem } from "metabase-types/api";import { HomeCaption } from "../HomeCaption";diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsxindex a2c561011a4..d409a6c6478 100644--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx@@ -5,8 +5,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { getIcon } from "metabase/common/utils/icon";import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";+import * as Urls from "metabase/urls";import { getName } from "metabase/utils/name";-import * as Urls from "metabase/utils/urls";import type { RecentItem } from "metabase-types/api";import { isWithinWeeks } from "../../utils";diff --git a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsxindex 061915508c5..09093bcb72d 100644--- a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx+++ b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx@@ -12,9 +12,9 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { Select } from "metabase/common/components/Select";import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";+import * as Urls from "metabase/urls";import { isSyncCompleted } from "metabase/utils/syncing";import { isNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import type { Database, DatabaseXray } from "metabase-types/api";import { HomeCaption } from "../HomeCaption";diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsxindex 3da79cfa542..771a7b3b7c1 100644--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx@@ -39,7 +39,7 @@ import {Title,rem,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import S from "./Onboarding.module.css";import {diff --git a/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsxindex da071093dd9..9e347a5894c 100644--- a/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx+++ b/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx@@ -5,7 +5,7 @@ import type { MetabaseProtocolEntityModel } from "metabase/metabot/utils/links";import { useEntityData } from "metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode";import { entityToUrlableModel } from "metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils";import { Icon } from "metabase/ui";-import { modelToUrl } from "metabase/utils/urls";+import { modelToUrl } from "metabase/urls";import S from "../AIMarkdown.module.css";diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsxindex 3cd306f5211..7504d243672 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx@@ -25,7 +25,7 @@ import {Skeleton,Tooltip,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { MetabotInfo, SuggestedMetabotPrompt } from "metabase-types/api";export const PAGE_SIZE = 10;diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex 7182d180616..277afbb8189 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -33,7 +33,7 @@ import {Text,Tooltip,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {diff --git a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsxindex ea57d0d185c..0b537c69d48 100644--- a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx@@ -8,8 +8,8 @@ import {import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import { ActionIcon, Tooltip } from "metabase/ui";+import * as Urls from "metabase/urls";import { METAKEY } from "metabase/utils/browser";-import * as Urls from "metabase/utils/urls";import { trackMetabotChatOpened } from "../analytics";diff --git a/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsxindex 051bb83bdde..ea62f083c5b 100644--- a/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { Metabot } from "./Metabot";diff --git a/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsxindex ef2f05ff1fc..f7144439e5e 100644--- a/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx@@ -21,7 +21,7 @@ import {Text,UnstyledButton,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { useMetabotAgent, useUserMetabotPermissions } from "../../hooks";diff --git a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsx b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsxindex 916ae6dff5a..8316567f0ae 100644--- a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsx+++ b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionId } from "metabase-types/api";export function getNewMenuItemAIExploration(diff --git a/frontend/src/metabase/metabot/state/selectors.ts b/frontend/src/metabase/metabot/state/selectors.tsindex e1005ef4a6b..50dd4ef4052 100644--- a/frontend/src/metabase/metabot/state/selectors.ts+++ b/frontend/src/metabase/metabot/state/selectors.ts@@ -5,7 +5,7 @@ import _ from "underscore";import { isEmbedding } from "metabase/embedding/config";import type { State } from "metabase/redux/store";import { getLocation } from "metabase/selectors/routing";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TransformId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsxindex 65f760c89db..92eda47aa0f 100644--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx@@ -19,7 +19,7 @@ import {Text,Tooltip,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { FieldId, Table, TableFieldOrder } from "metabase-types/api";import { FieldOrderPicker } from "../FieldOrderPicker";diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsxindex 33492d27104..3cafc9038e9 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx@@ -11,7 +11,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { getRawTableFieldId } from "metabase/metadata/utils/field";import { Box, Flex, Stack, rem } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {FieldEmptyState,diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsxindex ecba6208fac..977675d0f50 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx@@ -22,8 +22,8 @@ import {} from "__support__/ui";import { getNextId } from "__support__/utils";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import registerVisualizations from "metabase/visualizations/register";import type {Database,diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsxindex a5e183c6997..172b6498143 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx@@ -10,7 +10,7 @@ import {import { ForwardRefLink } from "metabase/common/components/Link";import { Box, Flex, Icon, Skeleton, rem } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TYPE_ICONS } from "../constants";import type { FlatItem, TreePath } from "../types";diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsxindex 6a965f5808d..31b7edd032d 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx@@ -3,7 +3,7 @@ import { push, replace } from "react-router-redux";import { useDispatch, useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TablePicker } from "./components";import type { ChangeOptions, TreePath } from "./types";diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts b/frontend/src/metabase/metadata/pages/DataModelV1/utils.tsindex 588a6f9ce83..4f4842299c8 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts+++ b/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts@@ -1,6 +1,6 @@import { skipToken } from "metabase/api";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import type { GetTableQueryMetadataRequest, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/metadata/pages/shared/utils.ts b/frontend/src/metabase/metadata/pages/shared/utils.tsindex eac1039829b..9b2c10d64d3 100644--- a/frontend/src/metabase/metadata/pages/shared/utils.ts+++ b/frontend/src/metabase/metadata/pages/shared/utils.ts@@ -1,6 +1,6 @@import { skipToken } from "metabase/api";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";import type { GetTableQueryMetadataRequest, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx b/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsxindex b94b3bc7e66..bf9e0b54de3 100644--- a/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx+++ b/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import CS from "metabase/css/core/index.css";import { Box, Center, Stack, Text, Title } from "metabase/ui";-import { getSubpathSafeUrl } from "metabase/utils/urls";+import { getSubpathSafeUrl } from "metabase/urls";function MetricsViewerEmptyStateLayout({title,diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsxindex 94bb9df3a0a..7e01cc874d7 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { SourceColorIndicator } from "metabase/common/components/SourceColorIndicator";import { Box, Flex, Icon, Menu, Pill, Popover, Skeleton } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ProjectionClause } from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.tsindex c4f5004e548..48a9d9b547f 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts@@ -5,7 +5,7 @@ import { t } from "ttag";import { useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { MeasureId } from "metabase-types/api";import type { MetricId } from "metabase-types/api/metric";diff --git a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsxindex bfaeae68ac1..3356b9dbd0f 100644--- a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx+++ b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx@@ -4,7 +4,7 @@ import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";import { Breadcrumbs, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Card } from "metabase-types/api";interface CollectionBreadcrumbsProps {diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsxindex 699b9ea4c3b..92c323e7c06 100644--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx@@ -16,7 +16,7 @@ import {Stack,Text,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import Visualization from "metabase/visualizations/components/Visualization";import ChartSkeleton from "metabase/visualizations/components/skeletons/ChartSkeleton";import type { MetricDefinition } from "metabase-lib/metric";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex df5f2e5cfee..652fd909a21 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -24,7 +24,7 @@ import { openUrl } from "metabase/redux/app";import { getMetadata } from "metabase/selectors/metadata";import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { Button, Group, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsxindex 27eb32ee908..7acffb88a0f 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx@@ -5,7 +5,7 @@ import { OverviewVisualization } from "metabase/data-studio/common/components/Ovimport { useMetricDefinition } from "metabase/metrics/common/hooks";import { useDispatch } from "metabase/redux";import { Box, Flex, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as LibMetric from "metabase-lib/metric";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsxindex e36f89e364d..99530de0149 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx@@ -2,7 +2,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { MetricPageShell } from "../../components/MetricPageShell";import type { MetricPageProps } from "../../types";diff --git a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsxindex 8712d7e0285..eee8979d451 100644--- a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx@@ -5,7 +5,7 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContaiimport { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { MetricPageShell } from "../../components/MetricPageShell";import type { MetricPageProps } from "../../types";diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsxindex 816b7e60df7..f73e8cf3706 100644--- a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx@@ -2,7 +2,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";import { Box, Card, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { MetricActivityTimeline } from "../../components/MetricActivityTimeline";import { MetricPageShell } from "../../components/MetricPageShell";diff --git a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsxindex 2b8acf8afb3..5a24bb06f9d 100644--- a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx@@ -7,7 +7,7 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContaiimport { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";import { useDispatch } from "metabase/redux";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { MetricDimensionGrid } from "../../components/MetricDimensionGrid";import { MetricPageShell } from "../../components/MetricPageShell";diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsxindex 070cbe1f326..82b8f56e78f 100644--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx@@ -16,7 +16,7 @@ import { getInitialUiState } from "metabase/querying/editor/components/QueryEditimport { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type { Card as CardApiType } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsxindex a9af5918842..b6897c028b0 100644--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -21,7 +21,7 @@ import { getInitialUiState } from "metabase/querying/editor/components/QueryEditimport { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Breadcrumbs, Card, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type { Card as CardApiType } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/urls.ts b/frontend/src/metabase/metrics/urls.tsindex 6a654b051dd..0ac3fb4f303 100644--- a/frontend/src/metabase/metrics/urls.ts+++ b/frontend/src/metabase/metrics/urls.ts@@ -1,4 +1,4 @@-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { MetricUrls } from "./types";diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsxindex e8975bb957c..918b3613380 100644--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx@@ -9,8 +9,8 @@ import { Actions } from "metabase/entities/actions";import { Databases } from "metabase/entities/databases";import { connect } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";+import * as Urls from "metabase/urls";import { parseTimestamp } from "metabase/utils/time-dayjs";-import * as Urls from "metabase/utils/urls";import type Question from "metabase-lib/v1/Question";import {canArchiveAction,diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActions.tsxindex 5056dcd21b4..1f323624c27 100644--- a/frontend/src/metabase/models/components/ModelActions/ModelActions.tsx+++ b/frontend/src/metabase/models/components/ModelActions/ModelActions.tsx@@ -2,7 +2,7 @@ import { jt, t } from "ttag";import { Link } from "metabase/common/components/Link";import { Group, Icon, Paper, Stack, Title } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import ModelActionDetails from "./ModelActionDetails";diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsxindex ffd1b0034ac..a75e6d2a172 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx@@ -14,7 +14,7 @@ import ModelActionsView from "metabase/models/components/ModelActions";import { loadMetadataForCard } from "metabase/questions/actions";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type Table from "metabase-lib/v1/metadata/Table";@@ -84,7 +84,7 @@ function ModelActions({loadMetadataForCard(card);}} else {- onChangeLocation(Urls.question(card));+ onChangeLocation(Urls.card(card));}});diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsxindex 8503bd255ff..e506d25fa47 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx@@ -25,9 +25,9 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { TYPE } from "metabase-lib/v1/types/constants";-import * as ML_Urls from "metabase-lib/v1/urls";import type {Card,Collection,@@ -691,7 +691,7 @@ describe("ModelActions", () => {});expect(history?.getCurrentLocation().pathname).toBe(- ML_Urls.getUrl(question),+ Urls.question(question),);});diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsxindex 485cd68443b..dd454d7550e 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx@@ -13,7 +13,7 @@ import {} from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Group } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { EducationalButton, OptionsRoot } from "./NewModelOptions.styled";diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsxindex ab0e3a92bc8..767be247eb9 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx@@ -32,7 +32,7 @@ import {Text,} from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { AboutModal } from "../AboutModal/AboutModal";diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsxindex c6134f10d20..fce818a9662 100644--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx@@ -6,7 +6,7 @@ import { useToggle } from "metabase/common/hooks/use-toggle";import { useTranslateContent } from "metabase/i18n/hooks";import { CollectionBadge } from "metabase/questions/components/CollectionBadge";import { ActionIcon, Box, Flex, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {Collection,CollectionEssentials,diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsxindex c2c08ca30de..6055485222a 100644--- a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx+++ b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { Banner } from "metabase/common/components/Banner";import { Link } from "metabase/common/components/Link";import { Flex, Text } from "metabase/ui";-import { adminLicense } from "metabase/utils/urls";+import { adminLicense } from "metabase/urls";import styles from "./LicenseTokenMissingBanner.module.css";diff --git a/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx b/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsxindex 1e60378b0c0..7c06a8480c5 100644--- a/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx+++ b/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx@@ -4,8 +4,8 @@ import { Badge } from "metabase/common/components/Badge";import { Link } from "metabase/common/components/Link/Link";import CS from "metabase/css/core/index.css";import type { IconName } from "metabase/ui";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";-import * as ML_Urls from "metabase-lib/v1/urls";export interface QuestionLineageProps {icon?: IconName;@@ -25,7 +25,7 @@ const QuestionLineage = ({return (<Badge icon={icon} isSingleLine>{t`Started from`}{" "}- <Link className={CS.link} to={ML_Urls.getUrl(originalQuestion)}>+ <Link className={CS.link} to={Urls.question(originalQuestion)}>{originalQuestion.displayName()}</Link></Badge>diff --git a/frontend/src/metabase/nav/components/search/RecentsList/util.ts b/frontend/src/metabase/nav/components/search/RecentsList/util.tsindex 4de8de01b87..d442dad95a4 100644--- a/frontend/src/metabase/nav/components/search/RecentsList/util.ts+++ b/frontend/src/metabase/nav/components/search/RecentsList/util.ts@@ -1,5 +1,5 @@+import * as Urls from "metabase/urls";import { isSyncCompleted } from "metabase/utils/syncing";-import * as Urls from "metabase/utils/urls";import type { RecentItem } from "metabase-types/api";export const isItemActive = (item: RecentItem) => {diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsxindex abdb870b1fc..7a84650168f 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx@@ -26,9 +26,9 @@ import {} from "metabase/search/utils";import { getSetting } from "metabase/selectors/settings";import { Icon } from "metabase/ui";+import { modelToUrl } from "metabase/urls";import { isSmallScreen } from "metabase/utils/dom";import { isWithinIframe } from "metabase/utils/iframe";-import { modelToUrl } from "metabase/utils/urls";import { CommandPaletteTrigger } from "./CommandPaletteTrigger";import {diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsxindex 3b73bea78c9..74da0964e11 100644--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx@@ -18,11 +18,11 @@ import { SearchResult } from "metabase/search/components/SearchResult/SearchResuimport { SearchContextTypes } from "metabase/search/constants";import type { SearchFilters } from "metabase/search/types";import { Loader } from "metabase/ui";+import { modelToUrl } from "metabase/urls";import {DEFAULT_SEARCH_LIMIT,SEARCH_DEBOUNCE_DURATION,} from "metabase/utils/constants";-import { modelToUrl } from "metabase/utils/urls";import type {CollectionItem,SearchModel,diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsxindex 804634d7fe5..d4953f2e65b 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx@@ -12,7 +12,7 @@ import { getDashboard } from "metabase/dashboard/selectors";import { connect } from "metabase/redux";import { closeNavbar, openNavbar } from "metabase/redux/app";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import Question from "metabase-lib/v1/Question";import type { CollectionId, Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsxindex 7c3a6f5b9ae..8480a15c0c0 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx@@ -16,7 +16,7 @@ import {Title,Tooltip,} from "metabase/ui";-import { getSubpathSafeUrl } from "metabase/utils/urls";+import { getSubpathSafeUrl } from "metabase/urls";import IconCSV from "./illustrations/csv.svg?component";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsxindex 50959d628a4..c3199a6ac66 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { UpsellStorage } from "metabase/common/components/upsells/UpsellStorage";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { CSVPanelEmptyState } from "./AddDataModalEmptyStates";import { CSVUpload } from "./CSVUpload";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsxindex f4aac5834de..4da0ebb3e62 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx@@ -2,7 +2,7 @@ import { Link } from "react-router";import { t } from "ttag";import { Box, Group, Modal } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import S from "../AddDataModal.module.css";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsxindex 219d89156a5..a810c675b42 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx@@ -20,7 +20,7 @@ import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { connect, useSelector } from "metabase/redux";import { getIsTenantUser } from "metabase/selectors/user";import { Icon, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Bookmark } from "metabase-types/api";import { SidebarHeading } from "../../MainNavbar.styled";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsxindex d6275df8501..27205025613 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx@@ -30,7 +30,7 @@ import {getUser,getUserCanWriteToCollections,} from "metabase/selectors/user";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, User } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsxindex 67c82f45ef4..af8fbf47b96 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx@@ -30,8 +30,8 @@ import {getUserCanWriteToCollections,} from "metabase/selectors/user";import { ActionIcon, Icon, Tooltip } from "metabase/ui";+import * as Urls from "metabase/urls";import { isSmallScreen } from "metabase/utils/dom";-import * as Urls from "metabase/utils/urls";import type { Bookmark, Collection } from "metabase-types/api";import {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsxindex bbd6035fc1d..1eb72ea9d1c 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx@@ -12,7 +12,7 @@ import { getCollectionIcon } from "metabase/entities/collections/utils";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getIsTenantUser } from "metabase/selectors/user";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";import {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts b/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.tsindex 243ae8a8f9c..0d9fe787f17 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts@@ -1,5 +1,5 @@import { coerceCollectionId } from "metabase/collections/utils";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import type { Collection, Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsxindex 6220e44f1da..2e1fda3b5c0 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx@@ -4,7 +4,7 @@ import dayjs from "dayjs";import { screen, within } from "__support__/ui";import { createMockModelResult } from "metabase/browse/models/test-utils";import { ROOT_COLLECTION } from "metabase/entities/collections";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {createMockCard,createMockDashboard,diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex 6a8196cbd2c..a3ae77ca116 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -22,7 +22,7 @@ import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { closeModal, setOpenModal } from "metabase/redux/ui";import { getCurrentOpenModalState } from "metabase/selectors/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { WritebackAction } from "metabase-types/api";export const NewModals = withRouter((props: WithRouterProps) => {diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex 208d907a90a..7c9c0a28bc2 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -22,10 +22,10 @@ import {import { canAccessSettings, getUserIsAdmin } from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Icon, Text } from "metabase/ui";+import * as Urls from "metabase/urls";+import { modelToUrl } from "metabase/urls";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import { getName } from "metabase/utils/name";-import * as Urls from "metabase/utils/urls";-import { modelToUrl } from "metabase/utils/urls";import {type RecentItem,isRecentCollectionItem,diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex 10663771a77..317b7a3bb1f 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -28,7 +28,7 @@ import {getUserPersonalCollectionId,} from "metabase/selectors/user";import { useColorScheme } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {type RegisterShortcutProps,diff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.tsindex a5f3b49283b..ec33ef6ef8e 100644--- a/frontend/src/metabase/query_builder/actions/core/core.ts+++ b/frontend/src/metabase/query_builder/actions/core/core.ts@@ -23,10 +23,10 @@ import {} from "metabase/redux/query-builder";import type { Dispatch, GetState } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";+import * as Urls from "metabase/urls";import { clone } from "metabase/utils/clone";import { shouldOpenInBlankWindow } from "metabase/utils/dom";import { isNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import { getCardAfterVisualizationClick } from "metabase/visualizations/lib/utils";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.tsindex 9a37470c531..78370dbbcb7 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts@@ -23,8 +23,8 @@ import type {} from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { canUserCreateQueries, getUser } from "metabase/selectors/user";+import * as Urls from "metabase/urls";import { isNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.tsindex ce35754f169..a0b11ed5c88 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts@@ -10,8 +10,8 @@ import { setErrorPage } from "metabase/redux/app";import * as sharedQB from "metabase/redux/query-builder";import { createMockState } from "metabase/redux/store/mocks";import { getMetadata } from "metabase/selectors/metadata";+import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";@@ -102,7 +102,7 @@ function getLocationForCard(): LocationDescriptorObject {const isSaved = "id" in card;return {- pathname: isSaved ? Urls.question(card) : Urls.serializedQuestion(card),+ pathname: isSaved ? Urls.card(card) : Urls.serializedQuestion(card),hash: !isSaved ? CardLib.serializeCardForUrl(card) : "",query: {},...extra,@@ -276,7 +276,7 @@ describe("QB Actions > initializeQB", () => {it("does not run question query in notebook mode", async () => {const runQuestionQuerySpy = jest.spyOn(querying, "runQuestionQuery");- const baseUrl = Urls.question(card as Card);+ const baseUrl = Urls.card(card as Card);const location = getLocationForCard(card, {pathname: `${baseUrl}/notebook`,});@@ -311,7 +311,7 @@ describe("QB Actions > initializeQB", () => {});it("sets QB mode to notebook if opening /notebook route", async () => {- const baseUrl = Urls.question(card as Card);+ const baseUrl = Urls.card(card as Card);const location = getLocationForCard(card, {pathname: `${baseUrl}/notebook`,});@@ -534,7 +534,7 @@ describe("QB Actions > initializeQB", () => {it("runs question query on /query route", async () => {const runQuestionQuerySpy = jest.spyOn(querying, "runQuestionQuery");- const baseUrl = Urls.question(card);+ const baseUrl = Urls.card(card);const location = getLocationForCard(card, {pathname: `${baseUrl}/query`,});@@ -546,7 +546,7 @@ describe("QB Actions > initializeQB", () => {it("runs question query on /metadata route", async () => {const runQuestionQuerySpy = jest.spyOn(querying, "runQuestionQuery");- const baseUrl = Urls.question(card);+ const baseUrl = Urls.card(card);const location = getLocationForCard(card, {pathname: `${baseUrl}/metadata`,});@@ -557,7 +557,7 @@ describe("QB Actions > initializeQB", () => {});it("sets UI state correctly for /query route", async () => {- const baseUrl = Urls.question(card);+ const baseUrl = Urls.card(card);const location = getLocationForCard(card, {pathname: `${baseUrl}/query`,});@@ -569,7 +569,7 @@ describe("QB Actions > initializeQB", () => {});it("sets UI state correctly for /columns route", async () => {- const baseUrl = Urls.question(card);+ const baseUrl = Urls.card(card);const location = getLocationForCard(card, {pathname: `${baseUrl}/columns`,});@@ -581,7 +581,7 @@ describe("QB Actions > initializeQB", () => {});it("sets UI state correctly for /metadata route", async () => {- const baseUrl = Urls.question(card);+ const baseUrl = Urls.card(card);const location = getLocationForCard(card, {pathname: `${baseUrl}/metadata`,});diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsxindex 9839706dd59..569240021f4 100644--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx+++ b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx@@ -11,7 +11,7 @@ import { canPlaceEntityInCollectionOrDescendants } from "metabase/data-studio/utimport { ROOT_COLLECTION } from "metabase/entities/collections";import { useSelector } from "metabase/redux";import { getUserPersonalCollectionId } from "metabase/selectors/user";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Card, Dashboard } from "metabase-types/api";import { useMostRecentlyViewedDashboard } from "./hooks";diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex be2813b7fb9..f8d1f102a3d 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -25,7 +25,7 @@ import EditEventModal from "metabase/timelines/questions/containers/EditEventModimport MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";import NewEventModal from "metabase/timelines/questions/containers/NewEventModal";import { Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import Question from "metabase-lib/v1/Question";import type { Card, DashboardTabId } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsxindex ef071f15af9..430510a9b05 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsx@@ -2,8 +2,8 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import { ViewButton } from "metabase/common/components/ViewButton";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";-import { getUrl as ML_getUrl } from "metabase-lib/v1/urls";interface ExploreResultsLinkProps {question: Question;@@ -20,7 +20,7 @@ export function ExploreResultsLink({ question }: ExploreResultsLinkProps) {);if (query) {- const url = ML_getUrl(query.setDisplay("table").setSettings({}));+ const url = Urls.question(query.setDisplay("table").setSettings({}));return <Link to={url}>{button}</Link>;}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsxindex 6056ee38166..a4bcaa44781 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsxindex 742993a40ee..25564778597 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx@@ -7,7 +7,7 @@ import { getParentEntity } from "metabase/query_builder/selectors";import { useDispatch, useSelector } from "metabase/redux";import { navigateBackToDashboard } from "metabase/redux/query-builder";import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { CollectionItemModel, DashboardId } from "metabase-types/api";import S from "./QueryBuilderBackButton.module.css";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.js b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.jsindex 5589b41e52a..17862b970d4 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.js+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.js@@ -8,12 +8,11 @@ import {} from "__support__/server-mocks";import { getIcon, renderWithProviders, screen } from "__support__/ui";import { deserializeCardFromUrl } from "metabase/common/utils/card";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import { SAMPLE_METADATA } from "metabase-lib/test-helpers";import Question from "metabase-lib/v1/Question";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";-import * as ML_Urls from "metabase-lib/v1/urls";import {createMockCard,createMockDatabase,@@ -407,7 +406,7 @@ describe("QuestionDataSource", () => {expect(areQuestionUrlsEquivalent(node.closest("a").href,- ML_Urls.getUrl(table.newQuestion()),+ Urls.question(table.newQuestion()),),).toBe(true);});@@ -421,7 +420,7 @@ describe("QuestionDataSource", () => {expect(areQuestionUrlsEquivalent(node.closest("a").href,- ML_Urls.getUrl(table.newQuestion()),+ Urls.question(table.newQuestion()),),).toBe(true);});@@ -471,14 +470,14 @@ describe("QuestionDataSource", () => {expect(areQuestionUrlsEquivalent(orders.closest("a").href,- ML_Urls.getUrl(getAdHocOrdersQuestion()),+ Urls.question(getAdHocOrdersQuestion()),),).toBe(true);expect(products).toBeInTheDocument();expect(areQuestionUrlsEquivalent(products.closest("a").href,- ML_Urls.getUrl(getAdHocProductsQuestion()),+ Urls.question(getAdHocProductsQuestion()),),).toBe(true);});@@ -503,21 +502,21 @@ describe("QuestionDataSource", () => {expect(areQuestionUrlsEquivalent(orders.closest("a").href,- ML_Urls.getUrl(getAdHocOrdersQuestion()),+ Urls.question(getAdHocOrdersQuestion()),),).toBe(true);expect(products).toBeInTheDocument();expect(areQuestionUrlsEquivalent(products.closest("a").href,- ML_Urls.getUrl(getAdHocProductsQuestion()),+ Urls.question(getAdHocProductsQuestion()),),).toBe(true);expect(people).toBeInTheDocument();expect(areQuestionUrlsEquivalent(people.closest("a").href,- ML_Urls.getUrl(getAdHocPeopleQuestion()),+ Urls.question(getAdHocPeopleQuestion()),),).toBe(true);});diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsxindex ee3f0f080a2..e6973a33f6a 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { skipToken, useGetCollectionQuery } from "metabase/api";import { Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";@@ -54,7 +54,7 @@ export function SourceModelBreadcrumbs({<HeadBreadcrumbs.BadgeinactiveColor="text-tertiary"icon={{ name: "warning", c: "danger" }}- to={Urls.question(question.card())}+ to={Urls.card(question.card())}>{question.displayName()}</HeadBreadcrumbs.Badge>@@ -63,7 +63,7 @@ export function SourceModelBreadcrumbs({) : (<HeadBreadcrumbs.Badgekey="name"- to={Urls.question(question.card())}+ to={Urls.card(question.card())}inactiveColor="text-tertiary">{question.displayName()}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsxindex 4c6a5efd127..de796ba59a4 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx@@ -2,7 +2,7 @@ import type { ReactElement } from "react";import { skipToken, useGetTableQuery } from "metabase/api";import { TableInfoIcon } from "metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsxindex 6adbaebcb25..d918742a1e8 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx@@ -3,8 +3,8 @@ import { type ReactElement, isValidElement } from "react";import { TableInfoIcon } from "metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon";import { getIcon } from "metabase/common/utils/icon";import type { IconName } from "metabase/ui";+import * as Urls from "metabase/urls";import { isNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type Table from "metabase-lib/v1/metadata/Table";@@ -14,7 +14,6 @@ import {isVirtualCardId,} from "metabase-lib/v1/metadata/utils/saved-questions";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";-import * as ML_Urls from "metabase-lib/v1/urls";import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";import HeaderS from "../HeaderBreadcrumbs/HeaderBreadcrumbs.module.css";@@ -188,10 +187,10 @@ function getTableURL(table: Table) {if (isVirtualCardId(table.id)) {const cardId = getQuestionIdFromVirtualTableId(table.id);if (cardId != null) {- return Urls.question({ id: cardId, name: table.displayName() });+ return Urls.card({ id: cardId, name: table.displayName() });}}- return ML_Urls.getUrl(table.newQuestion());+ return Urls.question(table.newQuestion());}export function getQuestionIcon(question: Question): IconName {diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsxindex 2c754afe62b..7a39d450cb0 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx@@ -10,7 +10,7 @@ import { SidesheetCardSection } from "metabase/common/components/Sidesheet";import Styles from "metabase/css/core/index.css";import { QuestionPublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover";import { Box, Flex, FixedSizeIcon as Icon, Loader, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { getUserName } from "metabase/utils/user";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsxindex cae51a1a3dc..8e697caf889 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx@@ -21,7 +21,7 @@ import { QuestionActivityTimeline } from "metabase/query_builder/components/Quesimport { useDispatch } from "metabase/redux";import { onCloseQuestionInfo } from "metabase/redux/query-builder";import { Flex, Icon, Stack, Tabs } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import { QuestionDetails } from "./QuestionDetails";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsxindex bdaae666c2b..eb9b25838ee 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx@@ -6,7 +6,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { getIcon } from "metabase/common/utils/icon";import type { IconName } from "metabase/ui";import { Group, Icon, Repeat, Skeleton, Stack, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import { ToggleFullList } from "./ToggleFullList";@@ -54,7 +54,7 @@ export function ModelUsageDetails({ model }: ModelUsageDetailsProps) {{filtered.map((card) => {return (<Link- to={Urls.question(card)}+ to={Urls.card(card)}aria-label={card.name}variant="brand"key={card.id}diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsxindex fcc71a58ba5..6055e798515 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx@@ -18,9 +18,9 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { TYPE } from "metabase-lib/v1/types/constants";-import * as ML_Urls from "metabase-lib/v1/urls";import type { Card, Collection, Database, Settings } from "metabase-types/api";import {createMockCardQueryMetadata,@@ -209,7 +209,7 @@ describe("ModelUsageDetails", () => {for (const q of usedByQuestions) {const link = await screen.findByLabelText(q._card.name);expect(link).toBeInTheDocument();- expect(link).toHaveAttribute("href", ML_Urls.getUrl(q));+ expect(link).toHaveAttribute("href", Urls.question(q));}expect(@@ -235,7 +235,7 @@ describe("ModelUsageDetails", () => {for (const q of slicedQuestions) {const link = await screen.findByLabelText(q._card.name);expect(link).toBeInTheDocument();- expect(link).toHaveAttribute("href", ML_Urls.getUrl(q));+ expect(link).toHaveAttribute("href", Urls.question(q));}// Expect sixth card to be hiddendiff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsxindex e813c8c8024..c395e35ab7b 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";import { testDataset } from "__support__/testDataset";import { screen, within } from "__support__/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";import type { BaseEntityId } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/utils/index.ts b/frontend/src/metabase/query_builder/utils/index.tsindex f37a6c30f28..5a6c38bc104 100644--- a/frontend/src/metabase/query_builder/utils/index.ts+++ b/frontend/src/metabase/query_builder/utils/index.ts@@ -5,7 +5,7 @@ import _ from "underscore";import { serializeCardForUrl } from "metabase/common/utils/card";import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { Card, Field, NormalizedField, Series } from "metabase-types/api";@@ -44,12 +44,7 @@ export function getURLForCardState(query: QueryParams = {},objectId: string,) {- interface Options {- hash: string;- query: QueryParams;- objectId?: string;- }- const options: Options = {+ const options: Urls.CardUrlBuilderParams = {hash:card && dirty? serializeCardForUrl(card, {@@ -63,12 +58,12 @@ export function getURLForCardState(const isAdHocQuestion = !card.id;if (objectId != null) {if (isAdHocQuestion) {- options.query.objectId = objectId;+ (options.query as QueryParams).objectId = objectId;} else {options.objectId = objectId;}}- return Urls.question(card, options);+ return Urls.card(card, options);}export const isNavigationAllowed = ({diff --git a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsxindex 5f739d57bf2..d74aa67ba15 100644--- a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx@@ -17,9 +17,9 @@ import { SidebarContent } from "metabase/common/components/SidebarContent";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Box, Flex, Icon, type IconName } from "metabase/ui";+import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";-import * as ML_Urls from "metabase-lib/v1/urls";import { FieldList } from "../FieldList";import { NodeListTitleText } from "../NodeList";@@ -95,7 +95,7 @@ export const QuestionPane = ({<Flex color="text-secondary" align="center" p="0.25rem 0.5rem" fw={700}><aclassName={S.QuestionPaneDetailLink}- href={ML_Urls.getUrl(question)}+ href={Urls.question(question)}target="_blank"rel="noreferrer">diff --git a/frontend/src/metabase/querying/drills/utils/automatic-insights-drill.tsx b/frontend/src/metabase/querying/drills/utils/automatic-insights-drill.tsxindex e6d4592a2c3..884add6e4d7 100644--- a/frontend/src/metabase/querying/drills/utils/automatic-insights-drill.tsx+++ b/frontend/src/metabase/querying/drills/utils/automatic-insights-drill.tsx@@ -1,15 +1,12 @@import { t } from "ttag";+import * as Urls from "metabase/urls";import { ClickActionsView } from "metabase/visualizations/components/ClickActions";import type {ClickActionPopoverProps,Drill,RegularClickAction,} from "metabase/visualizations/types/click-actions";-import {- getAutomaticDashboardUrl,- getComparisonDashboardUrl,-} from "metabase-lib/v1/urls";export const automaticInsightsDrill: Drill = ({question,@@ -23,7 +20,7 @@ export const automaticInsightsDrill: Drill = ({section: "auto-popover",icon: "bolt",buttonType: "horizontal",- url: () => getAutomaticDashboardUrl(question, applyDrill(drill)),+ url: () => Urls.automaticDashboard(question, applyDrill(drill)),},{name: "automatic-insights.compare",@@ -31,7 +28,7 @@ export const automaticInsightsDrill: Drill = ({section: "auto-popover",icon: "segment",buttonType: "horizontal",- url: () => getComparisonDashboardUrl(question, applyDrill(drill)),+ url: () => Urls.comparisonDashboard(question, applyDrill(drill)),},];diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsxindex 286c9d9d697..bcf0edcab65 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx@@ -6,7 +6,7 @@ import { isEmbedding } from "metabase/embedding/config";import { useTranslateContent } from "metabase/i18n/hooks";import type { IconName } from "metabase/ui";import { Flex, Icon, UnstyledButton } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import { NotebookCell } from "../NotebookCell";diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.tsindex faee82f1ef6..86aa26a77ab 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts@@ -1,4 +1,4 @@-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";type Props = {@@ -31,7 +31,7 @@ export const getUrl = ({name: tableInfo.displayName,};- return isModel ? Urls.model(payload) : Urls.question(payload);+ return isModel ? Urls.model(payload) : Urls.card(payload);} else {return Urls.tableRowsQuery(databaseId, tableId);}diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsxindex 1b3656ea968..a2a41c5d1cb 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { useGetAdhocQueryQuery } from "metabase/api";import { Button, Flex, Loader, Text } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import { ClauseStep } from "../ClauseStep";diff --git a/frontend/src/metabase/questions/components/CollectionBadge.tsx b/frontend/src/metabase/questions/components/CollectionBadge.tsxindex 7616c6e6ebc..9d4230004e0 100644--- a/frontend/src/metabase/questions/components/CollectionBadge.tsx+++ b/frontend/src/metabase/questions/components/CollectionBadge.tsx@@ -6,7 +6,7 @@ import { Collections } from "metabase/entities/collections";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import type { State } from "metabase/redux/store";-import { modelToUrl } from "metabase/utils/urls/modelToUrl";+import { modelToUrl } from "metabase/urls/modelToUrl";import type {CollectionId,Collection as CollectionType,diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsxindex ae53069af54..c754309d8b6 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx@@ -20,7 +20,7 @@ import { useDispatch } from "metabase/redux";import { API_UPDATE_QUESTION } from "metabase/redux/query-builder";import { addUndo } from "metabase/redux/undo";import { Box, Icon, Radio, Title } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Card } from "metabase-types/api";import MoveCardToast from "./MoveCardToast";diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsxindex 5d0dfa6110c..509b6f2356f 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx@@ -8,7 +8,7 @@ import {} from "metabase/api";import type { MoveDestination } from "metabase/collections/types";import { coerceCollectionId } from "metabase/collections/utils";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Card, CollectionId, DashboardId } from "metabase-types/api";import { DestinationLink, StyledIcon, ToastRoot } from "./MoveCardToast.styled";diff --git a/frontend/src/metabase/redux/downloads.ts b/frontend/src/metabase/redux/downloads.tsindex 0ec369e44dc..6b4cfe613cd 100644--- a/frontend/src/metabase/redux/downloads.ts+++ b/frontend/src/metabase/redux/downloads.ts@@ -16,12 +16,12 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import type { DownloadsState, State } from "metabase/redux/store";import { createAsyncThunk } from "metabase/redux/utils";import { getTokenFeature } from "metabase/setup/selectors";+import * as Urls from "metabase/urls";import api, { GET, POST } from "metabase/utils/api";import { openSaveDialog } from "metabase/utils/dom";import { isWithinIframe } from "metabase/utils/iframe";import { isJWT } from "metabase/utils/jwt";import { checkNotNull } from "metabase/utils/types";-import * as Urls from "metabase/utils/urls";import { isUuid } from "metabase/utils/uuid";import { saveChartImage } from "metabase/visualizations/lib/save-chart-image";import { saveDashboardPdf } from "metabase/visualizations/lib/save-dashboard-pdf";diff --git a/frontend/src/metabase/reference/databases/TableQuestions.jsx b/frontend/src/metabase/reference/databases/TableQuestions.jsxindex e85cd5e40fe..24dd111a7c9 100644--- a/frontend/src/metabase/reference/databases/TableQuestions.jsx+++ b/frontend/src/metabase/reference/databases/TableQuestions.jsx@@ -14,7 +14,7 @@ import CS from "metabase/css/core/index.css";import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import visualizations from "metabase/visualizations";import ReferenceHeader from "../components/ReferenceHeader";@@ -89,7 +89,7 @@ class TableQuestions extends Component {description={t`Created ${dayjs(entity.created_at,).fromNow()} by ${entity.creator.common_name}`}- url={Urls.question(entity)}+ url={Urls.card(entity)}icon={visualizations.get(entity.display).iconName}/>),diff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx b/frontend/src/metabase/reference/segments/SegmentQuestions.jsxindex 571a399db04..302cca6b5e6 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.jsx@@ -14,7 +14,7 @@ import CS from "metabase/css/core/index.css";import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import visualizations from "metabase/visualizations";import ReferenceHeader from "../components/ReferenceHeader";@@ -73,7 +73,7 @@ const SegmentQuestionsInner = ({ style, table, segment, metadata }) => {key={question.id()}name={question.displayName()}description={getDescription(question)}- url={Urls.question(question.card())}+ url={Urls.card(question.card())}icon={visualizations.get(question.display()).iconName}/>),diff --git a/frontend/src/metabase/reference/utils.js b/frontend/src/metabase/reference/utils.jsindex b4bf892015c..6fe686c61fd 100644--- a/frontend/src/metabase/reference/utils.js+++ b/frontend/src/metabase/reference/utils.js@@ -1,7 +1,8 @@import dayjs from "dayjs";import { t } from "ttag";-import * as Urls from "metabase/utils/urls";+import { serializeCardForUrl } from "metabase/common/utils/card";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";@@ -86,7 +87,9 @@ function filterBySegmentId(query, segmentId) {}export const getQuestionUrl = (getQuestionArgs) =>- Urls.question(null, { hash: getQuestion(getQuestionArgs) });+ Urls.card(null, {+ hash: serializeCardForUrl(getQuestion(getQuestionArgs)),+ });// little utility function to determine if we 'has' things, useful// for handling entity empty statesdiff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsxindex 54265d7ba48..3994d6a5ea4 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx@@ -51,13 +51,13 @@ import {Text,TextInput,} from "metabase/ui";+import * as Urls from "metabase/urls";import { DocumentMode } from "metabase/visualizations/click-actions/modes/DocumentMode";import Visualization from "metabase/visualizations/components/Visualization";import { ErrorView } from "metabase/visualizations/components/Visualization/ErrorView/ErrorView";import ChartSkeleton from "metabase/visualizations/components/skeletons/ChartSkeleton";import { getGenericErrorMessage } from "metabase/visualizations/lib/errors";import Question from "metabase-lib/v1/Question";-import { getUrl } from "metabase-lib/v1/urls";import type { CardDisplayType, Dataset } from "metabase-types/api";import { CommentsButton } from "../../components/CommentsButton";@@ -366,7 +366,7 @@ export const CardEmbedComponent = memo(isDraftCard ? { ...card, id: null } : card,metadata,);- const url = getUrl(question, { includeDisplayIsLocked: true });+ const url = Urls.question(question);dispatch(navigateToCardFromDocument(url, document));} catch (error) {console.error("Failed to navigate to question:", error);diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.tsindex be66bc67a70..c0389cdbfde 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts@@ -7,8 +7,8 @@ import type { UseCardDataResult } from "metabase/documents/hooks/use-card-data";import { useDraftCardOperations } from "metabase/documents/hooks/use-draft-card-operations";import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";+import * as Urls from "metabase/urls";import Question from "metabase-lib/v1/Question";-import { getUrl } from "metabase-lib/v1/urls";import type { Card, Document, VisualizationSettings } from "metabase-types/api";export const useUpdateCardOperations = ({@@ -59,7 +59,7 @@ export const useUpdateCardOperations = ({// Remove the ID so getUrl creates an adhoc question URL instead of navigating to saved questionconst adhocCard = { ...nextCard, id: null };const question = new Question(adhocCard, metadata);- const url = getUrl(question, { includeDisplayIsLocked: true });+ const url = Urls.question(question);dispatch(navigateToCardFromDocument(url, document));} catch (error) {console.error("Failed to create question URL:", error);diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsxindex d8461685c32..da519999901 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx@@ -34,8 +34,8 @@ import {import { PLUGIN_TRANSFORMS } from "metabase/plugins";import { useDispatch } from "metabase/redux";import { Icon } from "metabase/ui";-import { modelToUrl } from "metabase/utils/urls/modelToUrl";-import { extractEntityId } from "metabase/utils/urls/utils";+import { modelToUrl } from "metabase/urls/modelToUrl";+import { extractEntityId } from "metabase/urls/utils";import type {Card,CardDisplayType,diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.tsindex 412c529ccdb..60fa99cff30 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts@@ -4,8 +4,8 @@ import { getIcon } from "metabase/common/utils/icon";import { getTranslatedEntityName } from "metabase/common/utils/model-names";import type { MenuItem } from "metabase/documents/components/Editor/shared/MenuComponents";import type { MetabaseProtocolEntityModel } from "metabase/metabot/utils/links";+import { type UrlableModel, modelToUrl } from "metabase/urls/modelToUrl";import { getName } from "metabase/utils/name";-import { type UrlableModel, modelToUrl } from "metabase/utils/urls/modelToUrl";import type {Database,MentionableUser,diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.tsindex fa288ae6865..3c2409d59cd 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts@@ -4,7 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { getTranslatedEntityName } from "metabase/common/utils/model-names";import type { DocumentLinkedEntityPickerItemValue } from "metabase/rich_text_editing/tiptap/extensions/shared/LinkedEntityPickerModal/types";-import { modelToUrl } from "metabase/utils/urls/modelToUrl";+import { modelToUrl } from "metabase/urls/modelToUrl";import type {MentionableUser,RecentItem,diff --git a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx b/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsxindex 9075c587712..53262d14516 100644--- a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx+++ b/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx@@ -4,11 +4,7 @@ import { useDatabaseQuery, useTableQuery } from "metabase/common/hooks";import { SearchResultLink } from "metabase/search/components/SearchResultLink";import type { WrappedResult } from "metabase/search/types";import { Box, Icon, Text } from "metabase/ui";-import {- browseDatabase,- browseSchema,- tableRowsQuery,-} from "metabase/utils/urls";+import { browseDatabase, browseSchema, tableRowsQuery } from "metabase/urls";import type Database from "metabase-lib/v1/metadata/Database";import type { InfoTextData } from "./get-info-text";diff --git a/frontend/src/metabase/search/components/InfoText/get-info-text.tsx b/frontend/src/metabase/search/components/InfoText/get-info-text.tsxindex 6a7000c6a12..fc4dcb94792 100644--- a/frontend/src/metabase/search/components/InfoText/get-info-text.tsx+++ b/frontend/src/metabase/search/components/InfoText/get-info-text.tsx@@ -9,7 +9,7 @@ import { Box, Icon } from "metabase/ui";import {collection as collectionUrl,dashboard as dashboardUrl,-} from "metabase/utils/urls";+} from "metabase/urls";import type { Collection } from "metabase-types/api";export type InfoTextData = {diff --git a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/search/components/SearchResult/SearchResult.tsxindex 96bd874f678..43310e69033 100644--- a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx+++ b/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx@@ -8,8 +8,8 @@ import { useDispatch } from "metabase/redux";import { trackSearchClick } from "metabase/search/analytics";import type { WrappedResult } from "metabase/search/types";import { Group, Icon, Loader } from "metabase/ui";+import { modelToUrl } from "metabase/urls";import { isSyncCompleted } from "metabase/utils/syncing";-import { modelToUrl } from "metabase/utils/urls";import type { SearchContext } from "metabase-types/api";import { InfoText } from "../InfoText";diff --git a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx b/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsxindex eaaa57b87b2..696188db138 100644--- a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx+++ b/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx@@ -10,7 +10,7 @@ import { getIcon, renderWithProviders, screen } from "__support__/ui";import { SearchResult } from "metabase/search/components/SearchResult/SearchResult";import { createWrappedSearchResult } from "metabase/search/components/SearchResult/tests/util";import type { WrappedResult } from "metabase/search/types";-import { modelToUrl } from "metabase/utils/urls";+import { modelToUrl } from "metabase/urls";import { createMockCollection, createMockUser } from "metabase-types/api/mocks";const TEST_REGULAR_COLLECTION = createMockCollection({diff --git a/frontend/src/metabase/timelines/collections/actions.ts b/frontend/src/metabase/timelines/collections/actions.tsindex 81303fa8c15..44813bbde1c 100644--- a/frontend/src/metabase/timelines/collections/actions.ts+++ b/frontend/src/metabase/timelines/collections/actions.ts@@ -2,7 +2,7 @@ import { push } from "react-router-redux";import { Timelines } from "metabase/entities/timelines";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";export const setCollectionAndNavigate = (diff --git a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsxindex 3d3363fac40..7288edc81b5 100644--- a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx+++ b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx@@ -4,9 +4,9 @@ import { t } from "ttag";import { EntityMenu } from "metabase/common/components/EntityMenu";import { Link } from "metabase/common/components/Link";import type { IconName } from "metabase/ui";+import * as Urls from "metabase/urls";import { formatDateTimeWithUnit } from "metabase/utils/formatting";import Settings from "metabase/utils/settings";-import * as Urls from "metabase/utils/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";import {diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsxindex 663deb271d7..0b97a715cd5 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx@@ -7,7 +7,7 @@ import {getTimelineName,} from "metabase/common/utils/timelines";import type { IconName } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";import {diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsxindex 186ce6a64bb..65d99dd4042 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -8,9 +8,9 @@ import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { getTimelineName } from "metabase/common/utils/timelines";import ButtonsS from "metabase/css/components/buttons.module.css";import ModalHeader from "metabase/timelines/common/components/ModalHeader";+import * as Urls from "metabase/urls";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import { parseTimestamp } from "metabase/utils/time-dayjs";-import * as Urls from "metabase/utils/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";import type { MenuItem } from "../../types";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsxindex e28efaecd8a..7efca7a749e 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx@@ -5,7 +5,7 @@ import { Link } from "metabase/common/components/Link";import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Button, Stack, Text, Title, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection, Timeline } from "metabase-types/api";export interface TimelineEmptyStateProps {diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsxindex f4b6277410d..1ded21b1aa3 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx@@ -7,7 +7,7 @@ import {getSortedTimelines,} from "metabase/common/utils/timelines";import ModalHeader from "metabase/timelines/common/components/ModalHeader";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection, Timeline } from "metabase-types/api";import SearchEmptyState from "../SearchEmptyState";diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsxindex 9e18b38e3e2..c1af642e879 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx@@ -6,7 +6,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import DeleteEventModal from "metabase/timelines/common/components/DeleteEventModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";import type { ModalParams } from "../../types";diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsxindex 5e8e7a7421e..43c122a4acb 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -5,7 +5,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import DeleteTimelineModal from "metabase/timelines/common/components/DeleteTimelineModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";import type { ModalParams } from "../../types";diff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsxindex 2d1c765620d..77c938a77b6 100644--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx@@ -6,7 +6,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import EditEventModal from "metabase/timelines/common/components/EditEventModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsxindex cc42ad01f80..c3058d2e3e8 100644--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx@@ -5,7 +5,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import EditTimelineModal from "metabase/timelines/common/components/EditTimelineModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsxindex 13fddaf3b49..54f628d675b 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -7,7 +7,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import MoveEventModal from "metabase/timelines/common/components/MoveEventModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsxindex 351a8c30063..e5e94b1453e 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx@@ -4,7 +4,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import MoveTimelineModal from "metabase/timelines/common/components/MoveTimelineModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";import { setCollectionAndNavigate } from "../../actions";diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsxindex 1fc7494ab4d..13a87280d8f 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx@@ -6,7 +6,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import NewEventModal from "metabase/timelines/common/components/NewEventModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsxindex 2db51297248..46b3de42129 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx@@ -6,7 +6,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import NewEventModal from "metabase/timelines/common/components/NewEventModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection, TimelineEvent } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsxindex 3f088676c96..0081b182ffb 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx@@ -6,7 +6,7 @@ import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsxindex 017bef1d294..2c88fccc198 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx@@ -5,7 +5,7 @@ import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsxindex 14fd234a324..db9252a2f2f 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -5,7 +5,7 @@ import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsxindex 1a13827e8ad..6a3b652d321 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx@@ -1,6 +1,6 @@import { Timelines } from "metabase/entities/timelines";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import TimelineIndexModal from "../../components/TimelineIndexModal";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsxindex d302e2bb710..183ceb518dc 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx@@ -5,7 +5,7 @@ import { Collections } from "metabase/entities/collections";import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Collection, TimelineEvent } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsxindex baa4b768de6..4e0abb809a7 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx@@ -3,7 +3,7 @@ import _ from "underscore";import { Collections } from "metabase/entities/collections";import { Timelines } from "metabase/entities/timelines";import type { State } from "metabase/redux/store";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import TimelineListModal from "../../components/TimelineListModal";diff --git a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsxindex a22297cf341..b0fcffa2ef0 100644--- a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx@@ -9,7 +9,7 @@ import {PaneHeaderInput,} from "metabase/data-studio/common/components/PaneHeader";import { Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";import { NAME_MAX_LENGTH } from "../../constants";diff --git a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsxindex 4dd87b20ac6..610df5338fb 100644--- a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx@@ -9,7 +9,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Transform, TransformJobId } from "metabase-types/api";import { TitleSection } from "../../TitleSection";diff --git a/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx b/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsxindex 28be121e3d2..39d1b31d51a 100644--- a/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx+++ b/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx@@ -2,7 +2,7 @@ import { Link } from "react-router";import { t } from "ttag";import { Button, type ButtonProps } from "metabase/ui";-import { transformEdit } from "metabase/utils/urls";+import { transformEdit } from "metabase/urls";import type { TransformId } from "metabase-types/api";type EditDefinitionButtonProps = {diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsxindex 617f608f1d7..433f7caa3bb 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx@@ -8,7 +8,7 @@ import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collectimport { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";import type { StackProps } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Transform } from "metabase-types/api";import { TransformMoreMenu } from "./TransformMoreMenu";diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsxindex 978c2ac7230..e0dc6c184a7 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";import { ActionIcon, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Transform } from "metabase-types/api";import { TransformRevisionHistorySidebar } from "../../TransformRevisionHistorySidebar";diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsxindex 5cfb2f622b5..fea2d7afbec 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx@@ -8,7 +8,7 @@ import {PLUGIN_DEPENDENCIES,PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Transform, TransformId } from "metabase-types/api";type TransformTabsProps = {diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsxindex 3763cab2f1c..3064e6a46bc 100644--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx@@ -24,7 +24,7 @@ import {TreeTableSkeleton,useTreeTableInstance,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TransformJob } from "metabase-types/api";export const JobListPage = () => {diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsxindex a8202532dfb..f85624b94f2 100644--- a/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx+++ b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";import { ActionIcon, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TransformJob } from "metabase-types/api";import { DeleteJobModal } from "./DeleteJobModal";diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsxindex ded67e612c5..9879e3a0f82 100644--- a/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx@@ -14,7 +14,7 @@ import {useTransformPermissions,} from "metabase/transforms/hooks/use-transform-permissions";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {ScheduleDisplayType,TransformJob,diff --git a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsxindex fbc1e437b43..884a18dc0d6 100644--- a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx@@ -12,7 +12,7 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";import { trackTransformJobCreated } from "../../analytics";diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsxindex 4ee63ee40bb..4229e39d113 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -21,7 +21,7 @@ import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type {Database,diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsxindex 5e702566119..cb0ac01ed9f 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx@@ -17,7 +17,7 @@ import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { POLLING_INTERVAL } from "metabase/transforms/constants";import { Center, Flex, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TransformRun, TransformRunId } from "metabase-types/api";import { RunFilterBar } from "./RunFilterBar";diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsxindex 4c0aec16660..39a2b83eac8 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx@@ -13,7 +13,7 @@ import {screen,within,} from "__support__/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TransformRun } from "metabase-types/api";import {createMockListTransformRunsResponse,diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsxindex 387d46ed60c..f52f8695436 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import CS from "metabase/css/core/index.css";import { Anchor, Breadcrumbs, FixedSizeIcon, Group } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TransformRun } from "metabase-types/api";type LocationSectionProps = {diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsxindex 428a31667f7..b585b63ad58 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx@@ -6,7 +6,7 @@ import CS from "metabase/css/core/index.css";import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { TransformRun } from "metabase-types/api";import { getTransformRunName } from "../../../../utils";diff --git a/frontend/src/metabase/transforms/pages/RunListPage/utils.ts b/frontend/src/metabase/transforms/pages/RunListPage/utils.tsindex 3f04f2d1973..52a5bc31f4f 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/utils.ts+++ b/frontend/src/metabase/transforms/pages/RunListPage/utils.ts@@ -1,6 +1,6 @@import type { Location } from "history";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import {SORT_DIRECTIONS,TRANSFORM_RUN_METHODS,diff --git a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsxindex 7b66ffb6a9a..189af1fea97 100644--- a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx@@ -6,7 +6,7 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContaiimport { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TransformHeader } from "../../components/TransformHeader";diff --git a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/TransformInspectorUpsellPage.tsx b/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/TransformInspectorUpsellPage.tsxindex 3d72522ec0b..a21d2351999 100644--- a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/TransformInspectorUpsellPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/TransformInspectorUpsellPage.tsx@@ -14,7 +14,7 @@ import {} from "metabase/transforms/constants";import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";import { Center, Stack } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";type TransformInspectorUpsellPageProps = {params: { transformId: string };diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsxindex 7bff2f6c754..308c89e9753 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx@@ -10,7 +10,7 @@ import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { trackTransformCreate } from "../../../analytics";import { CreateTransformCollectionModal } from "../../../components/CreateTransformCollectionModal";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsxindex 38d2c4416e4..21f8f8315eb 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx@@ -45,7 +45,7 @@ import {useTreeTableInstance,} from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { type NamedUser, getUserName } from "metabase/utils/user";import { CollectionRowMenu } from "./CollectionRowMenu";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex 4fdeb150390..4190b7f3d78 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -24,7 +24,7 @@ import { getInitialUiState } from "metabase/querying/editor/components/QueryEditimport { useDispatch, useSelector } from "metabase/redux";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center, Group, Icon } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {Database,DatasetQuery,diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsxindex 7d643a57aeb..bd03e2d0f39 100644--- a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx@@ -13,8 +13,8 @@ import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";import { Anchor, Box, Card, Divider, Group, Stack } from "metabase/ui";+import * as Urls from "metabase/urls";import { isResourceNotFoundError } from "metabase/utils/errors";-import * as Urls from "metabase/utils/urls";import type { Transform, TransformTagId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsxindex f3c2db83d3d..8380b70beb1 100644--- a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx@@ -3,7 +3,7 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContaiimport { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TransformHeader } from "../../components/TransformHeader";diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsxindex 6e4b41c834c..d1d531cf879 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx@@ -2,7 +2,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Center } from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import { TransformHeader } from "../../components/TransformHeader";import { useTransformWithPolling } from "../../hooks/use-transform-with-polling";diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsxindex 1802ee98a0c..7be2f9bbe80 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx@@ -10,7 +10,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {EnterpriseSettings,TokenFeatures,diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsxindex c6bd61c8ae0..f06c7680da6 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx@@ -24,7 +24,7 @@ import {Stack,Text,} from "metabase/ui";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type { Transform, UserId } from "metabase-types/api";import { TitleSection } from "../../../components/TitleSection";diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsxindex 02d263f92ed..2fd9faeff5d 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx@@ -10,7 +10,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";-import * as Urls from "metabase/utils/urls";+import * as Urls from "metabase/urls";import type {EnterpriseSettings,TokenFeatures,diff --git a/frontend/src/metabase/utils/urls/actions.ts b/frontend/src/metabase/urls/actions.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/actions.tsrename to frontend/src/metabase/urls/actions.tsdiff --git a/frontend/src/metabase/utils/urls/admin.ts b/frontend/src/metabase/urls/admin.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/admin.tsrename to frontend/src/metabase/urls/admin.tsdiff --git a/frontend/src/metabase/utils/urls/auth.ts b/frontend/src/metabase/urls/auth.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/auth.tsrename to frontend/src/metabase/urls/auth.tsdiff --git a/frontend/src/metabase/utils/urls/bookmarks.ts b/frontend/src/metabase/urls/bookmarks.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/bookmarks.tsrename to frontend/src/metabase/urls/bookmarks.tsdiff --git a/frontend/src/metabase/utils/urls/browse.ts b/frontend/src/metabase/urls/browse.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/browse.tsrename to frontend/src/metabase/urls/browse.tsdiff --git a/frontend/src/metabase/urls/cards.ts b/frontend/src/metabase/urls/cards.tsnew file mode 100644index 00000000000..7b6d8c58595--- /dev/null+++ b/frontend/src/metabase/urls/cards.ts@@ -0,0 +1,109 @@+import slugg from "slugg";++import {+ isTransientCardId,+ serializeCardForUrl,+} from "metabase/common/utils/card";+import type {+ CardId,+ ParameterValuesMap,+ Card as SavedCard,+ UnsavedCard,+} from "metabase-types/api";++import {+ appendSlug,+ encodeIfNeeded,+ getEncodedUrlSearchParams,+ prefixIfNeeded,+} from "./utils";++type Card = Partial<SavedCard> & {+ card_id?: CardId | string;+ model?: "card" | "dataset";+};++export type CardUrlBuilderParams = {+ mode?: "view" | "notebook" | "query";+ query?: Record<string, unknown> | string;+ objectId?: number | string;+ creationType?: string;+ parameterValues?: ParameterValuesMap;+ includeDisplayIsLocked?: boolean;+ // Route to the unsaved-with-hash URL even though the card has a real id —+ // used for dirty edits to a saved question that shouldn't land on the saved path.+ forceUnsaved?: boolean;+ // Pre-serialized card hash to append even on the saved-card path. Used by the+ // QB to keep the in-memory card state recoverable on reload while still showing+ // the canonical /question/{id}-{slug} URL.+ hash?: string;+};++export function card(+ card: Partial<Card> | null,+ {+ mode = "view",+ query = "",+ objectId,+ creationType,+ parameterValues,+ includeDisplayIsLocked = false,+ forceUnsaved = false,+ hash,+ }: CardUrlBuilderParams = {},+) {+ query = encodeIfNeeded(query, getEncodedUrlSearchParams);+ query = prefixIfNeeded(query, "?");++ hash = prefixIfNeeded(hash ?? "", "#");++ const isModel = card?.type === "model" || card?.model === "dataset";+ const fallbackPath = isModel ? "model" : "question";+ let path: string = card?.type ?? fallbackPath;++ if (!card || !card.id || isTransientCardId(card.id) || forceUnsaved) {+ const unsavedPath = path === "metric" ? "question" : path;+ const computedHash = card?.dataset_query+ ? `#${serializeCardForUrl(card as SavedCard | UnsavedCard, {+ creationType,+ parameterValues,+ includeDisplayIsLocked,+ })}`+ : "";+ return `/${unsavedPath}${query}${hash || computedHash}`;+ }++ const { card_id, id, name } = card;+ /**+ * If the question has been added to the dashboard we're reading the dashCard's properties.+ * In that case `card_id` is the actual question's id, while `id` corresponds with the dashCard itself.+ *+ * There can be multiple instances of the same question in a dashboard, hence this distinction.+ */+ const questionId = card_id || id;+ path = `/${path}/${questionId}`;++ /**+ * Although it's not possible to intentionally save a question without a name,+ * it is possible that the `name` is not recognized if it contains symbols.+ *+ * Please see: https://github.com/metabase/metabase/pull/15989#pullrequestreview-656646149+ */+ if (name) {+ path = appendSlug(path, slugg(name));+ }++ if (mode === "notebook") {+ path = `${path}/notebook`;+ } else if (mode === "query") {+ if (card.type === "model" || card.type === "metric") {+ path = `${path}/query`;+ } else {+ path = `${path}/notebook`;+ }+ } else if (objectId) {+ path = `${path}/${objectId}`;+ }++ return `${path}${query}${hash}`;+}diff --git a/frontend/src/metabase/utils/urls/collections.ts b/frontend/src/metabase/urls/collections.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/collections.tsrename to frontend/src/metabase/urls/collections.tsdiff --git a/frontend/src/metabase/urls/dashboards.ts b/frontend/src/metabase/urls/dashboards.tsnew file mode 100644index 00000000000..a4cf1348494--- /dev/null+++ b/frontend/src/metabase/urls/dashboards.ts@@ -0,0 +1,99 @@+import slugg from "slugg";++import { isTransientCardId } from "metabase/common/utils/card";+import { stringifyHashOptions } from "metabase/utils/browser";+import { utf8_to_b64url } from "metabase/utils/encoding";+import MetabaseSettings from "metabase/utils/settings";+import * as Lib from "metabase-lib";+import type Question from "metabase-lib/v1/Question";+import type {+ DashCardId,+ DashboardId,+ DashboardTabId,+} from "metabase-types/api";++import { appendSlug } from "./utils";++type DashboardUrlBuilderOpts = {+ addCardWithId?: number;+ editMode?: boolean;+ tabId?: DashboardTabId | undefined;+ scrollToDashcard?: DashCardId | undefined;+};++export function dashboard(+ dashboard: {+ id: DashboardId;+ name?: string;+ },+ {+ addCardWithId,+ editMode,+ tabId,+ scrollToDashcard,+ }: DashboardUrlBuilderOpts = {},+) {+ // x-ray dashboards have ids as urls+ const path =+ typeof dashboard.id === "string"+ ? `${dashboard.id}`+ : `/dashboard/${appendSlug(dashboard.id, dashboard.name ? slugg(dashboard.name) : null)}`;++ const query = tabId+ ? new URLSearchParams({ tab: `${tabId}` }).toString()+ : "";++ const hash = stringifyHashOptions({+ ...(addCardWithId ? { add: addCardWithId } : {}),+ ...(editMode ? { edit: editMode } : {}),+ ...(scrollToDashcard ? { scrollTo: scrollToDashcard } : {}),+ });++ return `${path}${query ? "?" + query : ""}${hash ? "#" + hash : ""}`;+}++export function publicDashboard(uuid: string) {+ const siteUrl = MetabaseSettings.get("site-url");+ return `${siteUrl}/public/dashboard/${uuid}`;+}++export function comparisonDashboard(+ question: Question,+ questionWithFilters: Question,+) {+ const questionId = question.id();+ const tableId = Lib.sourceTableOrCardId(question.query());+ const filterQuery = Lib.toLegacyQuery(questionWithFilters.query());+ const filter = filterQuery.type === "query" ? filterQuery.query.filter : null;+ const cellQuery = filter+ ? `/cell/${utf8_to_b64url(JSON.stringify(filter))}`+ : "";++ const query = question.datasetQuery();+ if (questionId != null && !isTransientCardId(questionId)) {+ return `auto/dashboard/question/${questionId}${cellQuery}/compare/table/${tableId}`;+ } else {+ const adHocQuery = utf8_to_b64url(JSON.stringify(query));+ return `auto/dashboard/adhoc/${adHocQuery}${cellQuery}/compare/table/${tableId}`;+ }+}++export function automaticDashboard(+ question: Question,+ questionWithFilters: Question,+) {+ const questionId = question.id();+ const filterQuery = Lib.toLegacyQuery(questionWithFilters.query());+ const filter = filterQuery.type === "query" ? filterQuery.query.filter : null;+ const cellQuery = filter+ ? `/cell/${utf8_to_b64url(JSON.stringify(filter))}`+ : "";++ const query = question.datasetQuery();+ if (questionId != null && !isTransientCardId(questionId)) {+ return `auto/dashboard/question/${questionId}${cellQuery}`;+ } else {+ const adHocQuery = utf8_to_b64url(JSON.stringify(query));+ return `auto/dashboard/adhoc/${adHocQuery}${cellQuery}`;+ }+}diff --git a/frontend/src/metabase/utils/urls/data-studio.ts b/frontend/src/metabase/urls/data-studio.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/data-studio.tsrename to frontend/src/metabase/urls/data-studio.tsdiff --git a/frontend/src/metabase/utils/urls/data-studio.unit.spec.ts b/frontend/src/metabase/urls/data-studio.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/data-studio.unit.spec.tsrename to frontend/src/metabase/urls/data-studio.unit.spec.tsdiff --git a/frontend/src/metabase/utils/urls/dependencies.ts b/frontend/src/metabase/urls/dependencies.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/dependencies.tsrename to frontend/src/metabase/urls/dependencies.tsdiff --git a/frontend/src/metabase/utils/urls/documents.ts b/frontend/src/metabase/urls/documents.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/documents.tsrename to frontend/src/metabase/urls/documents.tsdiff --git a/frontend/src/metabase/utils/urls/documents.unit.spec.ts b/frontend/src/metabase/urls/documents.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/documents.unit.spec.tsrename to frontend/src/metabase/urls/documents.unit.spec.tsdiff --git a/frontend/src/metabase/utils/urls/index.ts b/frontend/src/metabase/urls/index.tssimilarity index 95%rename from frontend/src/metabase/utils/urls/index.tsrename to frontend/src/metabase/urls/index.tsindex fd8e0a5c666..f3c38865ff9 100644--- a/frontend/src/metabase/utils/urls/index.ts+++ b/frontend/src/metabase/urls/index.ts@@ -4,6 +4,7 @@ export * from "./auth";export * from "./data-studio";export * from "./bookmarks";export * from "./browse";+export * from "./cards";export * from "./collections";export * from "./dashboards";export * from "./dependencies";diff --git a/frontend/src/metabase/utils/urls/indexed-entities.ts b/frontend/src/metabase/urls/indexed-entities.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/indexed-entities.tsrename to frontend/src/metabase/urls/indexed-entities.tsdiff --git a/frontend/src/metabase/utils/urls/metabot.ts b/frontend/src/metabase/urls/metabot.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/metabot.tsrename to frontend/src/metabase/urls/metabot.tsdiff --git a/frontend/src/metabase/utils/urls/metrics.ts b/frontend/src/metabase/urls/metrics.tssimilarity index 95%rename from frontend/src/metabase/utils/urls/metrics.tsrename to frontend/src/metabase/urls/metrics.tsindex 29713f82a68..e43a726a12f 100644--- a/frontend/src/metabase/utils/urls/metrics.ts+++ b/frontend/src/metabase/urls/metrics.ts@@ -6,8 +6,8 @@ import {} from "metabase/metrics-viewer/utils/url-serialization";import type { CardId, CollectionId } from "metabase-types/api";+import { card as urlForCard } from "./cards";import type { CardOrSearchResult } from "./models";-import { question } from "./questions";const METRICS_VIEWER_ROOT = "/explore";@@ -100,9 +100,9 @@ export function metric(card: CardOrSearchResult): string {if (!isNaN(numericId)) {return metricAbout(numericId);}- return question(card);+ return urlForCard(card);}export function metricQuestionUrl(card: CardOrSearchResult): string {- return question({ ...card, type: "metric" });+ return urlForCard({ ...card, type: "metric" });}diff --git a/frontend/src/metabase/utils/urls/misc.ts b/frontend/src/metabase/urls/misc.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/misc.tsrename to frontend/src/metabase/urls/misc.tsdiff --git a/frontend/src/metabase/utils/urls/modelToUrl.ts b/frontend/src/metabase/urls/modelToUrl.tssimilarity index 96%rename from frontend/src/metabase/utils/urls/modelToUrl.tsrename to frontend/src/metabase/urls/modelToUrl.tsindex 43869efe0b5..9b5a1696439 100644--- a/frontend/src/metabase/utils/urls/modelToUrl.ts+++ b/frontend/src/metabase/urls/modelToUrl.ts@@ -8,6 +8,7 @@ import type {import { action } from "./actions";import { browseDatabase } from "./browse";+import { card } from "./cards";import { collection } from "./collections";import { dashboard } from "./dashboards";import { dataStudioPublishedTableMeasure } from "./data-studio";@@ -15,7 +16,7 @@ import { document } from "./documents";import { indexedEntity } from "./indexed-entities";import { metric } from "./metrics";import { model } from "./models";-import { question, tableRowsQuery } from "./questions";+import { tableRowsQuery } from "./questions";import { timeline } from "./timelines";import { transform } from "./transforms";@@ -43,7 +44,7 @@ export function modelToUrl(item: UrlableModel): string {switch (item.model) {case "card":- return question({+ return card({...item,model: "card", // somehow typescript is not smart enough to infer this});diff --git a/frontend/src/metabase/utils/urls/modelToUrl.unit.spec.ts b/frontend/src/metabase/urls/modelToUrl.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/modelToUrl.unit.spec.tsrename to frontend/src/metabase/urls/modelToUrl.unit.spec.tsdiff --git a/frontend/src/metabase/utils/urls/models.ts b/frontend/src/metabase/urls/models.tssimilarity index 78%rename from frontend/src/metabase/utils/urls/models.tsrename to frontend/src/metabase/urls/models.tsindex 49e7d4d9d89..9e452348176 100644--- a/frontend/src/metabase/utils/urls/models.ts+++ b/frontend/src/metabase/urls/models.ts@@ -2,8 +2,7 @@ import slugg from "slugg";import type { Card } from "metabase-types/api";-import type { QuestionUrlBuilderParams } from "./questions";-import { question } from "./questions";+import { type CardUrlBuilderParams, card as urlForCard } from "./cards";import { appendSlug } from "./utils";export type CardOrSearchResult = Partial<Card> & {@@ -12,11 +11,8 @@ export type CardOrSearchResult = Partial<Card> & {name?: string;};-export function model(- card: CardOrSearchResult,- opts?: QuestionUrlBuilderParams,-) {- return question(card, opts);+export function model(card: CardOrSearchResult, opts?: CardUrlBuilderParams) {+ return urlForCard(card, opts);}export function modelDetail(card: CardOrSearchResult, tab = "") {diff --git a/frontend/src/metabase/utils/urls/permissions.ts b/frontend/src/metabase/urls/permissions.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/permissions.tsrename to frontend/src/metabase/urls/permissions.tsdiff --git a/frontend/src/metabase/urls/questions.ts b/frontend/src/metabase/urls/questions.tsnew file mode 100644index 00000000000..d86f69a8e6b--- /dev/null+++ b/frontend/src/metabase/urls/questions.ts@@ -0,0 +1,117 @@+import MetabaseSettings from "metabase/utils/settings";+import type { QuestionCreatorOpts } from "metabase-lib/v1/Question";+import Question from "metabase-lib/v1/Question";+import type {+ CardId,+ Card as SavedCard,+ UnsavedCard,+} from "metabase-types/api";+import type { EntityToken } from "metabase-types/api/entity";++import { card as urlForCard } from "./cards";++type QuestionUrlBuilderOpts = {+ originalQuestion?: Question;+ query?: Record<string, any>;+ creationType?: string;+};++export function question(+ question: Question,+ { originalQuestion, query, creationType }: QuestionUrlBuilderOpts = {},+) {+ const isDirty =+ originalQuestion != null && question.isDirtyComparedTo(originalQuestion);++ return urlForCard(question.cardWithNormalizedQuery(), {+ query,+ creationType,+ parameterValues: question._parameterValues,+ includeDisplayIsLocked: true,+ // dirty questions should always render as unsaved+ forceUnsaved: isDirty,+ });+}++export function serializedQuestion(card: SavedCard | UnsavedCard, opts = {}) {+ return urlForCard(card, { ...opts, forceUnsaved: true });+}++type NewQuestionUrlBuilderParams = QuestionCreatorOpts & {+ mode?: "view" | "notebook" | "query" | "ask";+ creationType?: string;+ objectId?: number | string;+};++export function newQuestion({+ mode,+ creationType,+ objectId,+ ...options+}: NewQuestionUrlBuilderParams) {+ if (mode === "ask") {+ return `/question/ask`;+ }++ const q = Question.create(options);+ const url = question(q, {+ creationType,+ query: objectId === undefined ? {} : { objectId },+ });+ const type = q.type();++ if (mode) {+ const pathType = type === "metric" ? "question" : type;+ return url.replace(/^\/(question|model|metric)/, `/${pathType}\/${mode}`);+ }++ return url;+}++export function publicQuestion({+ uuid,+ type = null,+ query,+ includeSiteUrl = true,+}: {+ uuid: string;+ type?: string | null;+ query?: string;+ includeSiteUrl?: boolean;+}) {+ const siteUrl = includeSiteUrl ? MetabaseSettings.get("site-url") : "";+ const searchQuery = query ? `?${query}` : "";+ return (+ `${siteUrl}/public/question/${uuid}` ++ (type ? `.${type}` : "") ++ searchQuery+ );+}++export function embedCard(token: EntityToken, type: string | null = null) {+ return `/embed/question/${token}` + (type ? `.${type}` : ``);+}++export function tableRowsQuery(+ databaseId: number | string,+ tableId: number | string,+ metricId?: number | string,+ segmentId?: number | string,+) {+ let query = `?db=${databaseId}&table=${tableId}`;++ if (metricId) {+ query += `&metric=${metricId}`;+ }++ if (segmentId) {+ query += `&segment=${segmentId}`;+ }++ // QB parses this querystring-in-hash to build an ad-hoc question — confusing, but load-bearing.+ return `/question#${query}`;+}++export function xrayModel(id: CardId) {+ return `/auto/dashboard/model/${id}`;+}diff --git a/frontend/src/metabase/urls/questions.unit.spec.ts b/frontend/src/metabase/urls/questions.unit.spec.tsnew file mode 100644index 00000000000..edbc3d84320--- /dev/null+++ b/frontend/src/metabase/urls/questions.unit.spec.ts@@ -0,0 +1,74 @@+import { assoc, dissoc } from "icepick";++import { createMockMetadata } from "__support__/metadata";+import Question from "metabase-lib/v1/Question";+import {+ ORDERS_ID,+ SAMPLE_DB_ID,+ createSampleDatabase,+} from "metabase-types/api/mocks/presets";++import { newQuestion, question } from "./questions";++const metadata = createMockMetadata({+ databases: [createSampleDatabase()],+});++const orders_raw_card = {+ id: 1,+ name: "Raw orders data",+ display: "table",+ visualization_settings: {},+ can_write: true,+ dataset_query: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: {+ "source-table": ORDERS_ID,+ },+ },+};++describe("urls > questions", () => {+ describe("question", () => {+ const adhocUrl =+ "/question#eyJkYXRhc2V0X3F1ZXJ5Ijp7ImRhdGFiYXNlIjoxLCJsaWIvdHlwZSI6Im1icWwvcXVlcnkiLCJzdGFnZXMiOlt7ImxpYi90eXBlIjoibWJxbC5zdGFnZS9tYnFsIiwic291cmNlLXRhYmxlIjoyfV19LCJkaXNwbGF5IjoidGFibGUiLCJuYW1lIjoiUmF3IG9yZGVycyBkYXRhIiwicGFyYW1ldGVyVmFsdWVzIjp7fSwidmlzdWFsaXphdGlvbl9zZXR0aW5ncyI6e319";++ // Covered a lot in query_builder/actions.spec.js, just very basic cases here+ // (currently getUrl has logic that is strongly tied to the logic query builder Redux actions)+ describe("question(originalQuestion?)", () => {+ it("returns URL with ID for saved question", () => {+ const q = new Question(assoc(orders_raw_card, "id", 1), metadata);+ expect(question(q)).toBe("/question/1-raw-orders-data");+ });++ it("returns a URL with hash for an unsaved question", () => {+ const q = new Question(dissoc(orders_raw_card, "id"), metadata);+ expect(question(q)).toBe(adhocUrl);+ });+ });++ it("should avoid generating URLs with transient IDs", () => {+ const q = new Question(+ { ...orders_raw_card, id: "foo", original_card_id: "bar" },+ metadata,+ );++ expect(question(q)).toBe(adhocUrl);+ });+ });++ describe("newQuestion", () => {+ it("should return the correct url", () => {+ const hash =+ "eyJkYXRhc2V0X3F1ZXJ5Ijp7ImRhdGFiYXNlIjpudWxsLCJsaWIvdHlwZSI6Im1icWwvcXVlcnkiLCJzdGFnZXMiOlt7ImxpYi90eXBlIjoibWJxbC5zdGFnZS9tYnFsIiwic291cmNlLXRhYmxlIjpudWxsfV19LCJkaXNwbGF5IjoidGFibGUiLCJwYXJhbWV0ZXJWYWx1ZXMiOnt9LCJ2aXN1YWxpemF0aW9uX3NldHRpbmdzIjp7fX0=";++ expect(newQuestion({ mode: "query" })).toBe(`/question/query#${hash}`);+ expect(newQuestion({ mode: "notebook" })).toBe(+ `/question/notebook#${hash}`,+ );+ expect(newQuestion({ mode: "view" })).toBe(`/question/view#${hash}`);+ expect(newQuestion({ mode: "ask" })).toBe("/question/ask");+ });+ });+});diff --git a/frontend/src/metabase/utils/urls/timelines.ts b/frontend/src/metabase/urls/timelines.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/timelines.tsrename to frontend/src/metabase/urls/timelines.tsdiff --git a/frontend/src/metabase/utils/urls/transforms.ts b/frontend/src/metabase/urls/transforms.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/transforms.tsrename to frontend/src/metabase/urls/transforms.tsdiff --git a/frontend/src/metabase/utils/urls.unit.spec.ts b/frontend/src/metabase/urls/urls.unit.spec.tssimilarity index 85%rename from frontend/src/metabase/utils/urls.unit.spec.tsrename to frontend/src/metabase/urls/urls.unit.spec.tsindex 648caa8cd57..89e63b6e11b 100644--- a/frontend/src/metabase/utils/urls.unit.spec.ts+++ b/frontend/src/metabase/urls/urls.unit.spec.ts@@ -1,6 +1,9 @@+import type { Bookmark, CollectionId } from "metabase-types/api";+import {bookmark,browseDatabase,+ card,collection,dashboard,extractCollectionId,@@ -10,70 +13,60 @@ import {model,modelDetail,modelEditor,- question,-} from "metabase/utils/urls";-import type { Bookmark, CollectionId } from "metabase-types/api";+} from ".";describe("urls", () => {describe("question", () => {describe("with a query", () => {it("returns the correct url", () => {- expect(question({}, { query: { foo: "bar" } })).toEqual(+ expect(card({}, { query: { foo: "bar" } })).toEqual("/question?foo=bar",);- expect(question({}, { hash: "hash", query: { foo: "bar" } })).toEqual(- "/question?foo=bar#hash",- );- expect(question(null, { hash: "hash", query: { foo: "bar" } })).toEqual(- "/question?foo=bar#hash",- );- expect(question(null, { query: { foo: "bar" } })).toEqual(+ expect(card(null, { query: { foo: "bar" } })).toEqual("/question?foo=bar",);- expect(question(null, { query: { foo: "bar+bar" } })).toEqual(+ expect(card(null, { query: { foo: "bar+bar" } })).toEqual("/question?foo=bar%2Bbar",);- expect(question(null, { query: { foo: ["bar", "baz"] } })).toEqual(+ expect(card(null, { query: { foo: ["bar", "baz"] } })).toEqual("/question?foo=bar&foo=baz",);- expect(question(null, { query: { foo: ["bar", "baz+bay"] } })).toEqual(+ expect(card(null, { query: { foo: ["bar", "baz+bay"] } })).toEqual("/question?foo=bar&foo=baz%2Bbay",);- expect(question(null, { query: { foo: ["bar", "baz&bay"] } })).toEqual(+ expect(card(null, { query: { foo: ["bar", "baz&bay"] } })).toEqual("/question?foo=bar&foo=baz%26bay",);});it("includes undefined params", () => {- expect(question(null, { query: { foo: undefined } })).toEqual(+ expect(card(null, { query: { foo: undefined } })).toEqual("/question?foo=",);- expect(- question(null, { query: { foo: undefined, bar: "bar" } }),- ).toEqual("/question?foo=&bar=bar");+ expect(card(null, { query: { foo: undefined, bar: "bar" } })).toEqual(+ "/question?foo=&bar=bar",+ );});it("includes null params", () => {- expect(question(null, { query: { foo: null } })).toEqual(- "/question?foo=",+ expect(card(null, { query: { foo: null } })).toEqual("/question?foo=");+ expect(card(null, { query: { foo: undefined, bar: "bar" } })).toEqual(+ "/question?foo=&bar=bar",);- expect(- question(null, { query: { foo: undefined, bar: "bar" } }),- ).toEqual("/question?foo=&bar=bar");});});describe("question ids", () => {it("returns the correct url", () => {- expect(question(null)).toEqual("/question");- expect(question({ id: 1 })).toEqual("/question/1");+ expect(card(null)).toEqual("/question");+ expect(card({ id: 1 })).toEqual("/question/1");/*** If we're dealing with the question in a dashboard, we're reading the dashCard properties.* Make sure `card_id` gets assigned to the question url.*/- expect(question({ id: 1, card_id: 42, name: "Foo" })).toEqual(+ expect(card({ id: 1, card_id: 42, name: "Foo" })).toEqual("/question/42-foo",);@@ -83,12 +76,12 @@ describe("urls", () => {* * We still have to make sure links to questions in a dashboard render correctly.*/- expect(question({ id: 1, card_id: 42 })).toEqual("/question/42");+ expect(card({ id: 1, card_id: 42 })).toEqual("/question/42");- expect(question({ id: 1, card_id: 42, name: "ベーコン" })).toEqual(+ expect(card({ id: 1, card_id: 42, name: "ベーコン" })).toEqual("/question/42",);- expect(question({ id: 1, card_id: 42, name: "培根" })).toEqual(+ expect(card({ id: 1, card_id: 42, name: "培根" })).toEqual("/question/42",);});@@ -96,27 +89,14 @@ describe("urls", () => {describe("with object ID", () => {it("should append object ID to path", () => {- const url = question({ id: 1 }, { objectId: 5 });+ const url = card({ id: 1 }, { objectId: 5 });expect(url).toBe("/question/1/5");});it("should support query params", () => {- const url = question({ id: 1 }, { query: "?a=b", objectId: 5 });+ const url = card({ id: 1 }, { query: "?a=b", objectId: 5 });expect(url).toBe("/question/1/5?a=b");});-- it("should support hash", () => {- const url = question({ id: 1 }, { hash: "abc", objectId: 5 });- expect(url).toBe("/question/1/5#abc");- });-- it("should support both hash and query params", () => {- const url = question(- { id: 1, name: "foo" },- { hash: "abc", query: "a=b", objectId: 5 },- );- expect(url).toBe("/question/1-foo/5?a=b#abc");- });});});@@ -482,9 +462,7 @@ describe("urls", () => {});it(`should handle ${caseName} correctly for question URLs`, () => {- expect(question(entity)).toBe(- expectedUrl("/question/1", expectedString),- );+ expect(card(entity)).toBe(expectedUrl("/question/1", expectedString));});});});diff --git a/frontend/src/metabase/utils/urls/utils.ts b/frontend/src/metabase/urls/utils.tssimilarity index 88%rename from frontend/src/metabase/utils/urls/utils.tsrename to frontend/src/metabase/urls/utils.tsindex 8debf14e514..8b554169d81 100644--- a/frontend/src/metabase/utils/urls/utils.ts+++ b/frontend/src/metabase/urls/utils.ts@@ -99,3 +99,20 @@ export function parseListParam<T>(return undefined;}}++export function encodeIfNeeded<T extends object>(+ value: T | string,+ fn: (value: T) => string,+) {+ if (typeof value === "string") {+ return value;+ }+ return fn(value);+}++export function prefixIfNeeded(value: string, prefix: string) {+ if (value === "" || value.startsWith(prefix)) {+ return value;+ }+ return `${prefix}${value}`;+}diff --git a/frontend/src/metabase/utils/urls/utils.unit.spec.ts b/frontend/src/metabase/urls/utils.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/utils/urls/utils.unit.spec.tsrename to frontend/src/metabase/urls/utils.unit.spec.tsdiff --git a/frontend/src/metabase/utils/urls/dashboards.ts b/frontend/src/metabase/utils/urls/dashboards.tsdeleted file mode 100644index c7e5dde91aa..00000000000--- a/frontend/src/metabase/utils/urls/dashboards.ts+++ /dev/null@@ -1,54 +0,0 @@-import slugg from "slugg";--import { stringifyHashOptions } from "metabase/utils/browser";-import MetabaseSettings from "metabase/utils/settings";-import type {- DashCardId,- DashboardId,- DashboardTabId,-} from "metabase-types/api";--import { appendSlug } from "./utils";--type DashboardUrlBuilderOpts = {- addCardWithId?: number;- editMode?: boolean;- tabId?: DashboardTabId | undefined;- scrollToDashcard?: DashCardId | undefined;-};--export function dashboard(- dashboard: {- id: DashboardId;- name?: string;- },- {- addCardWithId,- editMode,- tabId,- scrollToDashcard,- }: DashboardUrlBuilderOpts = {},-) {- // x-ray dashboards have ids as urls- const path =- typeof dashboard.id === "string"- ? `${dashboard.id}`- : `/dashboard/${appendSlug(dashboard.id, dashboard.name ? slugg(dashboard.name) : null)}`;-- const query = tabId- ? new URLSearchParams({ tab: `${tabId}` }).toString()- : "";-- const hash = stringifyHashOptions({- ...(addCardWithId ? { add: addCardWithId } : {}),- ...(editMode ? { edit: editMode } : {}),- ...(scrollToDashcard ? { scrollTo: scrollToDashcard } : {}),- });-- return `${path}${query ? "?" + query : ""}${hash ? "#" + hash : ""}`;-}--export function publicDashboard(uuid: string) {- const siteUrl = MetabaseSettings.get("site-url");- return `${siteUrl}/public/dashboard/${uuid}`;-}diff --git a/frontend/src/metabase/utils/urls/questions.ts b/frontend/src/metabase/utils/urls/questions.tsdeleted file mode 100644index 4e2d670ac1c..00000000000--- a/frontend/src/metabase/utils/urls/questions.ts+++ /dev/null@@ -1,199 +0,0 @@-import slugg from "slugg";--import { serializeCardForUrl } from "metabase/common/utils/card";-import MetabaseSettings from "metabase/utils/settings";-import type { QuestionCreatorOpts } from "metabase-lib/v1/Question";-import Question from "metabase-lib/v1/Question";-import * as ML_Urls from "metabase-lib/v1/urls";-import type {- CardId,- Card as SavedCard,- UnsavedCard,-} from "metabase-types/api";-import type { EntityToken } from "metabase-types/api/entity";--import { appendSlug, getEncodedUrlSearchParams } from "./utils";--type Card = Partial<SavedCard> & {- card_id?: CardId | string;- model?: "card" | "dataset";-};--export type QuestionUrlBuilderParams = {- mode?: "view" | "notebook" | "query";- hash?: SavedCard | UnsavedCard | string;- query?: Record<string, unknown> | string;- objectId?: number | string;-};--export function question(- card: Partial<- Pick<- Card,- | "id"- | "name"- | "type"- | "card_id"- | "model"- | "collection_id"- | "dashboard_id"- >- > | null,- {- mode = "view",- hash = "",- query = "",- objectId,- }: QuestionUrlBuilderParams = {},-) {- hash = encodeIfNeeded(hash, serializeCardForUrl);- hash = prefixIfNeeded(hash, "#");-- query = encodeIfNeeded(query, getEncodedUrlSearchParams);- query = prefixIfNeeded(query, "?");-- const isModel = card?.type === "model" || card?.model === "dataset";- const fallbackPath = isModel ? "model" : "question";- let path: string = card?.type ?? fallbackPath;-- if (!card || !card.id) {- const unsavedPath = path === "metric" ? "question" : path;- return `/${unsavedPath}${query}${hash}`;- }-- const { card_id, id, name } = card;- /**- * If the question has been added to the dashboard we're reading the dashCard's properties.- * In that case `card_id` is the actual question's id, while `id` corresponds with the dashCard itself.- *- * There can be multiple instances of the same question in a dashboard, hence this distinction.- */- const questionId = card_id || id;- path = `/${path}/${questionId}`;-- /**- * Although it's not possible to intentionally save a question without a name,- * it is possible that the `name` is not recognized if it contains symbols.- *- * Please see: https://github.com/metabase/metabase/pull/15989#pullrequestreview-656646149- */- if (name) {- path = appendSlug(path, slugg(name));- }-- if (mode === "notebook") {- path = `${path}/notebook`;- } else if (mode === "query") {- if (card.type === "model" || card.type === "metric") {- path = `${path}/query`;- } else {- path = `${path}/notebook`;- }- } else if (objectId) {- path = `${path}/${objectId}`;- }-- return `${path}${query}${hash}`;-}--function encodeIfNeeded<T extends object>(- value: T | string,- fn: (value: T) => string,-) {- if (typeof value === "string") {- return value;- }- return fn(value);-}--function prefixIfNeeded(value: string, prefix: string) {- if (value === "" || value.startsWith(prefix)) {- return value;- }- return `${prefix}${value}`;-}--export function serializedQuestion(card: SavedCard | UnsavedCard, opts = {}) {- return question(null, { ...opts, hash: card });-}--type NewQuestionUrlBuilderParams = QuestionCreatorOpts & {- mode?: "view" | "notebook" | "query" | "ask";- creationType?: string;- objectId?: number | string;-};--export function newQuestion({- mode,- creationType,- objectId,- ...options-}: NewQuestionUrlBuilderParams) {- if (mode === "ask") {- return `/question/ask`;- }-- const question = Question.create(options);- const url = ML_Urls.getUrl(question, {- creationType,- query: objectId ? { objectId } : undefined,- });- const type = question.type();-- if (mode) {- const pathType = type === "metric" ? "question" : type;- return url.replace(/^\/(question|model|metric)/, `/${pathType}\/${mode}`);- }-- return url;-}--export function publicQuestion({- uuid,- type = null,- query,- includeSiteUrl = true,-}: {- uuid: string;- type?: string | null;- query?: string;- includeSiteUrl?: boolean;-}) {- const siteUrl = includeSiteUrl ? MetabaseSettings.get("site-url") : "";- const searchQuery = query ? `?${query}` : "";- return (- `${siteUrl}/public/question/${uuid}` +- (type ? `.${type}` : "") +- searchQuery- );-}--export function embedCard(token: EntityToken, type: string | null = null) {- return `/embed/question/${token}` + (type ? `.${type}` : ``);-}--export function tableRowsQuery(- databaseId: number | string,- tableId: number | string,- metricId?: number | string,- segmentId?: number | string,-) {- let query = `?db=${databaseId}&table=${tableId}`;-- if (metricId) {- query += `&metric=${metricId}`;- }-- if (segmentId) {- query += `&segment=${segmentId}`;- }-- // This will result in a URL like "/question#?db=1&table=1"- // The QB will parse the querystring and use DB and table IDs to create an ad-hoc question- // We should refactor the initializeQB to avoid passing query string to hash as it's pretty confusing- return question(null, { hash: query });-}--export function xrayModel(id: CardId) {- return `/auto/dashboard/model/${id}`;-}diff --git a/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsxindex 815b3363e31..909eb995b07 100644--- a/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsx+++ b/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsx@@ -1,3 +1,11 @@+import {+ getDashboardDrillLinkUrl,+ getDashboardDrillParameters,+ getDashboardDrillQuestionUrl,+ getDashboardDrillTab,+ getDashboardDrillType,+ getDashboardDrillUrl,+} from "metabase/dashboard/utils/dashboard-click-drill";import { selectTab } from "metabase/redux/dashboard";import type { Dispatch } from "metabase/redux/store";import type {@@ -7,14 +15,6 @@ import type {LegacyDrill,} from "metabase/visualizations/types";import type Question from "metabase-lib/v1/Question";-import {- getDashboardDrillLinkUrl,- getDashboardDrillParameters,- getDashboardDrillQuestionUrl,- getDashboardDrillTab,- getDashboardDrillType,- getDashboardDrillUrl,-} from "metabase-lib/v1/queries/drills/dashboard-click-drill";import type { ParameterValueOrArray } from "metabase-types/api";type DashboardDrillType =diff --git a/frontend/src/metabase/visualizations/click-actions/modes/EmbeddingSdkMode.ts b/frontend/src/metabase/visualizations/click-actions/modes/EmbeddingSdkMode.tsindex f9e40e813bd..6be2e09d9e4 100644--- a/frontend/src/metabase/visualizations/click-actions/modes/EmbeddingSdkMode.ts+++ b/frontend/src/metabase/visualizations/click-actions/modes/EmbeddingSdkMode.ts@@ -1,9 +1,9 @@-import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";import {getClickBehavior,getClickBehaviorData,getParameterValuesBySlug,-} from "metabase-lib/v1/queries/drills/dashboard-click-drill";+} from "metabase/dashboard/utils/dashboard-click-drill";+import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";import type {ClickObject,diff --git a/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts b/frontend/src/metabase/visualizations/components/EmptyVizState/utils.tsindex 3fba322c11f..c7dfa06e6ef 100644--- a/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts+++ b/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { getSubpathSafeUrl } from "metabase/utils/urls";+import { getSubpathSafeUrl } from "metabase/urls";import type { CardDisplayType } from "metabase-types/api";/**diff --git a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsx b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsxindex 32b80bc1026..a27b8cf3a74 100644--- a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsx+++ b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsx@@ -1,7 +1,7 @@import L from "leaflet";import _ from "underscore";-import { getSubpathSafeUrl } from "metabase/utils/urls";+import { getSubpathSafeUrl } from "metabase/urls";import type { HoveredObject } from "metabase/visualizations/types";import type { ClickObject } from "metabase-lib";import { isPK } from "metabase-lib/v1/types/utils/isa";diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsxindex 69c0d94337e..34cb1b83ee4 100644--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx@@ -5,9 +5,9 @@ import _ from "underscore";import { isNative } from "metabase/common/utils/card";import CS from "metabase/css/core/index.css";+import { getSubpathSafeUrl } from "metabase/urls";import { displayNameForColumn } from "metabase/utils/formatting";import type { OptionsType } from "metabase/utils/formatting/types";-import { getSubpathSafeUrl } from "metabase/utils/urls";import ChartSettingLinkUrlInput from "metabase/visualizations/components/settings/ChartSettingLinkUrlInput";import { ChartSettingNumberInput } from "metabase/visualizations/components/settings/ChartSettingNumberInput";import {