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
Move `metabase/utils/icon` to `metabase/common/utils/icon` (#73294)
Romeo Van Snickdbe73d1a3667
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsxindex a1d239aa55d..e89fa0ef89e 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx@@ -4,8 +4,8 @@ import { getShortStrategyLabel } from "metabase/admin/performance/utils";import { MaybeLink } from "metabase/common/components/Badge/Badge.styled";import { EllipsifiedCollectionPath } from "metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath";import { Link } from "metabase/common/components/Link";+import { getIcon } from "metabase/common/utils/icon";import { Box, Button, Ellipsified, FixedSizeIcon, Flex } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import * as Urls from "metabase/utils/urls";import type { CacheableModel } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsxindex 2adc8608911..67058250658 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx@@ -11,8 +11,8 @@ import {TableColumn,} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";import { Columns } from "metabase/common/components/ItemsTable/Columns";+import { getIcon } from "metabase/common/utils/icon";import { Ellipsified, FixedSizeIcon, Flex, Tooltip } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type { SortingOptions } from "metabase-types/api/sorting";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsxindex ed9a5a4deeb..f0832d00473 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";import { t } from "ttag";+import type { ObjectWithModel } from "metabase/common/utils/icon";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { Group, Icon, Text } from "metabase/ui";-import type { ObjectWithModel } from "metabase/utils/icon";import type { Collection } from "metabase-types/api";export const CollectionAuthorityLevelDisplay = ({diff --git a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts b/enterprise/frontend/src/metabase-enterprise/collections/utils.tsindex 531437e21de..98934152c2e 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/collections/utils.ts@@ -2,10 +2,10 @@ import type {CollectionAuthorityLevelConfig,CollectionInstanceAnaltyicsConfig,} from "metabase/collections/types";+import type { IconData, ObjectWithModel } from "metabase/common/utils/icon";+import { getIconBase } from "metabase/common/utils/icon";import { getLibraryCollectionType } from "metabase/data-studio/utils";import type { ItemWithCollection } from "metabase/plugins";-import type { IconData, ObjectWithModel } from "metabase/utils/icon";-import { getIconBase } from "metabase/utils/icon";import type {Bookmark,Collection,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.tsindex bd9f51431f1..a0a1690255e 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts@@ -4,6 +4,7 @@ import _ from "underscore";import { skipToken, useListCollectionItemsQuery } from "metabase/api";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";+import { getIcon } from "metabase/common/utils/icon";import type {LibrarySectionType,TreeItem,@@ -11,7 +12,6 @@ import type {import { createEmptyStateItem } from "metabase/data-studio/common/utils";import { useMetadataToasts } from "metabase/metadata/hooks";import { useSelector } from "metabase/redux";-import { getIcon } from "metabase/utils/icon";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { Collection, CollectionId } from "metabase-types/api";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 0fe669bb23a..924ae00ad2c 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@@ -1,7 +1,11 @@import { useMemo } from "react";+import {+ type IconData,+ type IconModel,+ getIcon,+} from "metabase/common/utils/icon";import { Anchor, Group, Icon } from "metabase/ui";-import { type IconData, type IconModel, getIcon } from "metabase/utils/icon";import { modelToUrl } from "metabase/utils/urls";import type { RemoteSyncEntity } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsxindex 2f0f5b038a4..84b2d942b07 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx@@ -1,8 +1,8 @@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 { modelIconMap } from "metabase/utils/icon";import * as Urls from "metabase/utils/urls";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex e861c28ad27..d3dff54de53 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -18,6 +18,7 @@ import { Columns } from "metabase/common/components/ItemsTable/Columns";import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";+import { getIcon } from "metabase/common/utils/icon";import { useDispatch } from "metabase/redux";import {Ellipsified,@@ -27,7 +28,6 @@ import {Repeat,Skeleton,} from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import * as Urls from "metabase/utils/urls";import type { SortingOptions } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsxindex f7fbde66e6b..49a1171f1b3 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx@@ -8,10 +8,10 @@ import type {DeleteBookmark,} from "metabase/collections/types";import { EventSandbox } from "metabase/common/components/EventSandbox";+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 { getIcon } from "metabase/utils/icon";import { modelToUrl } from "metabase/utils/urls";import type Database from "metabase-lib/v1/metadata/Database";import type {diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxindex 3ecb098d906..80374aa891a 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx@@ -6,7 +6,7 @@ import {screen,getIcon as testGetIcon,} from "__support__/ui";-import { getIcon } from "metabase/utils/icon";+import { getIcon } from "metabase/common/utils/icon";import type { CollectionItem, CollectionItemModel } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsxindex 518bb19112b..e074d7cc3fe 100644--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx@@ -11,10 +11,10 @@ import {isPreviewShown,} from "metabase/collections/utils";import { EventSandbox } from "metabase/common/components/EventSandbox";+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 { getIcon } from "metabase/utils/icon";import { modelToUrl } from "metabase/utils/urls";import Visualization from "metabase/visualizations/components/Visualization";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsxindex ad5c076ae21..de553581692 100644--- a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx@@ -5,7 +5,7 @@ import type { OnToggleSelectedWithItem } from "metabase/collections/types";import { isRootTrashCollection } from "metabase/collections/utils";import type { BaseItemsTableProps } from "metabase/common/components/ItemsTable/BaseItemsTable";import { Columns } from "metabase/common/components/ItemsTable/Columns";-import { getIcon } from "metabase/utils/icon";+import { getIcon } from "metabase/common/utils/icon";import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsxindex 3633cd3f509..74a6414dcbd 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx@@ -4,6 +4,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { VirtualizedList } from "metabase/common/components/VirtualizedList";import { NoObjectError } from "metabase/common/components/errors/NoObjectError";+import { getIcon } from "metabase/common/utils/icon";import { PLUGIN_LIBRARY, PLUGIN_MODERATION } from "metabase/plugins";import {Box,@@ -14,7 +15,6 @@ import {SegmentedControl,Text,} from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type { OmniPickerItem, OmniPickerTableItem, SearchScope } from "../..";import { useOmniPickerContext } from "../../context";diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.tsindex fa31c5610d9..9cce070e3de 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts@@ -1,7 +1,7 @@import _ from "underscore";+import { type IconData, getIcon } from "metabase/common/utils/icon";import type { ColorName } from "metabase/ui/colors/types";-import { type IconData, getIcon } from "metabase/utils/icon";import type {CollectionItemModel,CollectionNamespace,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.tsindex 1c1a9b46566..125e7215936 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.ts@@ -1,4 +1,4 @@-import { getIcon } from "metabase/utils/icon";+import { getIcon } from "metabase/common/utils/icon";import type { CollectionItemModel } from "metabase-types/api";import {@@ -16,7 +16,7 @@ import {isSelectedItem,} from "./utils";-jest.mock("metabase/utils/icon", () => ({+jest.mock("metabase/common/utils/icon", () => ({getIcon: jest.fn(),}));diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsxindex 6fb7be35093..3a0efcc2505 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx@@ -1,5 +1,5 @@+import { getIcon } from "metabase/common/utils/icon";import { Box, Ellipsified, Icon, Menu, type MenuItemProps } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type {MiniPickerCollectionItem,diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsxindex 86a6aa58001..bd124e66689 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx@@ -16,6 +16,7 @@ import { canCollectionCardBeUsed } from "metabase/common/components/Pickers/utilimport { VirtualizedList } from "metabase/common/components/VirtualizedList";import { useSetting } from "metabase/common/hooks";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";+import { getIcon } from "metabase/common/utils/icon";import { PLUGIN_LIBRARY } from "metabase/plugins";import { useSelector } from "metabase/redux";import {@@ -28,7 +29,6 @@ import {Stack,Text,} from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type {CollectionItem,SchemaName,diff --git a/frontend/src/metabase/utils/icon.ts b/frontend/src/metabase/common/utils/icon.tssimilarity index 74%rename from frontend/src/metabase/utils/icon.tsrename to frontend/src/metabase/common/utils/icon.tsindex b4c2f836804..4836ab0feca 100644--- a/frontend/src/metabase/utils/icon.ts+++ b/frontend/src/metabase/common/utils/icon.ts@@ -70,41 +70,59 @@ export type IconData = {tooltip?: string;};-/** get an Icon for any entity object, doesn't depend on the entity system */-export const getIconBase = (item: ObjectWithModel): IconData => {- if (item.model === "card" && item.display) {- return { name: getIconForVisualizationType(item.display) };+const getCollectionIcon = (item: ObjectWithModel): IconData | void => {+ if (item.model !== "collection") {+ return;}- if (item.model === "collection" && item.id === PERSONAL_COLLECTIONS.id) {+ if (item.id === PERSONAL_COLLECTIONS.id) {return { name: "group" };}- if (- item.model === "collection" &&- item.is_personal &&- item.location === "/"- ) {+ if (item.is_personal && item.location === "/") {return { name: "person" };}- if (item.model === "collection" && item.id === "databases") {+ if (item.id === "databases") {return { name: "database" };}+ switch (getLibraryCollectionType(item.type as CollectionType)) {+ case "root":+ return { name: "repository" };+ case "data":+ return { name: "table" };+ case "metrics":+ return { name: "metric" };+ }+};++const getModelIcon = (model: IconModel): IconData => {+ return {+ name: modelIconMap[model] ?? "unknown",+ };+};++/**+ * Get an Icon for any entity object, doesn't depend on the entity system.+ */+export const getIconBase = (item: ObjectWithModel): IconData => {+ if (item.model === "card" && item.display) {+ return {+ name: getIconForVisualizationType(item.display),+ };+ }+if (item.model === "collection") {- switch (getLibraryCollectionType(item.type as CollectionType)) {- case "root":- return { name: "repository" };- case "data":- return { name: "table" };- case "metrics":- return { name: "metric" };+ const data = getCollectionIcon(item);+ if (data) {+ return data;}}- return { name: modelIconMap?.[item.model] ?? "unknown" };+ return getModelIcon(item.model);};+/*** relies mainly on the `model` property to determine the icon to return* also handle special collection icons and visualization types for cardsdiff --git a/frontend/src/metabase/utils/icon.unit.spec.ts b/frontend/src/metabase/common/utils/icon.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/utils/icon.unit.spec.tsrename to frontend/src/metabase/common/utils/icon.unit.spec.tsdiff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsxindex a6fb09d8684..2c5c8e6ef9f 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx@@ -13,6 +13,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { SelectList } from "metabase/common/components/SelectList";import type { BaseSelectListItemProps } from "metabase/common/components/SelectList/BaseSelectListItem";import { usePagination } from "metabase/common/hooks/use-pagination";+import { getIcon } from "metabase/common/utils/icon";import { addCardWithVisualization } from "metabase/dashboard/actions";import { getSelectedTabId } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";@@ -21,7 +22,6 @@ import { PLUGIN_MODERATION } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { ActionIcon, Box, Flex, Icon, Tooltip } from "metabase/ui";import { DEFAULT_SEARCH_LIMIT } from "metabase/utils/constants";-import { getIcon } from "metabase/utils/icon";import { VisualizerModal } from "metabase/visualizer/components/VisualizerModal";import type { CardId, CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsxindex 5fd3897381c..eccaf6cc607 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx@@ -9,6 +9,7 @@ import { SelectList } from "metabase/common/components/SelectList";import type { BaseSelectListItemProps } from "metabase/common/components/SelectList/BaseSelectListItem";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { getCollectionBreadCrumbs } from "metabase/common/utils/collections";+import { getIcon } from "metabase/common/utils/icon";import { useDashboardContext } from "metabase/dashboard/context";import { getDashboard } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";@@ -21,7 +22,6 @@ import {} from "metabase/selectors/user";import { Button, Flex, Icon } from "metabase/ui";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";-import { getIcon } from "metabase/utils/icon";import type { Collection, CollectionId } from "metabase-types/api";import { QuestionList } from "./QuestionList";diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsxindex 9c17063d85c..b8eda1ed88d 100644--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { Markdown } from "metabase/common/components/Markdown";+import { getIcon } from "metabase/common/utils/icon";import { Icon } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import { isEmpty } from "metabase/utils/validate";import type { UnrestrictedLinkEntity } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsxindex 886cd0f42c8..9d66f7d78f4 100644--- a/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx+++ b/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx@@ -2,6 +2,7 @@ import type { ReactNode } from "react";import { t } from "ttag";import { useUpdateSegmentMutation } from "metabase/api";+import { modelIconMap } from "metabase/common/utils/icon";import { EntityDetailTabs } from "metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";import {PaneHeader,@@ -10,7 +11,6 @@ import {import type { SegmentTabUrls } from "metabase/data-studio/segments/types";import { useMetadataToasts } from "metabase/metadata/hooks";import { Stack } from "metabase/ui";-import { modelIconMap } from "metabase/utils/icon";import type { Segment } from "metabase-types/api";import { SegmentMoreMenu } from "../SegmentMoreMenu";diff --git a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsxindex df6658cf608..5c3a5288b01 100644--- a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx+++ b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx@@ -3,7 +3,7 @@ import _ from "underscore";import { useListPopularItemsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { getIcon } from "metabase/utils/icon";+import { getIcon } from "metabase/common/utils/icon";import { getName } from "metabase/utils/name";import * as Urls from "metabase/utils/urls";import type { PopularItem } from "metabase-types/api";diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsxindex b9b8bcf21c1..a2c561011a4 100644--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { useListRecentsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getIcon } from "metabase/common/utils/icon";import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { getIcon } from "metabase/utils/icon";import { getName } from "metabase/utils/name";import * as Urls from "metabase/utils/urls";import type { RecentItem } from "metabase-types/api";diff --git a/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsxindex 7ae72951c6e..da071093dd9 100644--- a/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx+++ b/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx@@ -1,10 +1,10 @@import { match } from "ts-pattern";+import { getIcon } from "metabase/common/utils/icon";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 { getIcon } from "metabase/utils/icon";import { modelToUrl } from "metabase/utils/urls";import S from "../AIMarkdown.module.css";diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.tsxindex 75a50cd7bbc..6e6bb8cffa2 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.tsx@@ -14,6 +14,7 @@ import { canonicalCollectionId } from "metabase/collections/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";import { useToast } from "metabase/common/hooks";+import { getIcon } from "metabase/common/utils/icon";import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";import { PLUGIN_MODERATION } from "metabase/plugins";import {@@ -26,7 +27,6 @@ import {Switch,Text,} from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type {Collection,CollectionEssentials,diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/SegmentsLink/SegmentsLink.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/SegmentsLink/SegmentsLink.tsxindex 32bf86a8b69..10cc049eba1 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/SegmentsLink/SegmentsLink.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/SegmentsLink/SegmentsLink.tsx@@ -2,8 +2,8 @@ import cx from "classnames";import { t } from "ttag";import { Link } from "metabase/common/components/Link";+import { modelIconMap } from "metabase/common/utils/icon";import { Flex, Icon } from "metabase/ui";-import { modelIconMap } from "metabase/utils/icon";import S from "./SegmentsLink.module.css";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsxindex 9cec789d9e4..b52b917ed30 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx@@ -1,8 +1,8 @@import type React from "react";import { t } from "ttag";+import { getIcon } from "metabase/common/utils/icon";import { Box, Repeat, Skeleton, Stack, Text } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type { MetricOrMeasureResult } from "../../../hooks/use-metric-measure-search";import { MetricResultItem } from "../MetricResultItem";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsxindex 0a672574363..219d89156a5 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx@@ -13,13 +13,13 @@ import { t } from "ttag";import { CollapseSection } from "metabase/common/components/CollapseSection";import { Sortable } from "metabase/common/components/Sortable";+import { getIcon } from "metabase/common/utils/icon";import GrabberS from "metabase/css/components/grabber.module.css";import { Bookmarks } from "metabase/entities/bookmarks";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 { getIcon } from "metabase/utils/icon";import * as Urls from "metabase/utils/urls";import type { Bookmark } from "metabase-types/api";diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex cb9cfd4b82c..208d907a90a 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -8,6 +8,7 @@ import { getAdminPaths } from "metabase/admin/app/selectors";import { getPerformanceAdminPaths } from "metabase/admin/performance/constants/complex";import { useListRecentsQuery, useSearchQuery } from "metabase/api";import { useSetting } from "metabase/common/hooks";+import { getIcon } from "metabase/common/utils/icon";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";import { Search } from "metabase/entities/search";import { PLUGIN_CACHING } from "metabase/plugins";@@ -22,7 +23,6 @@ import { canAccessSettings, getUserIsAdmin } from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Icon, Text } from "metabase/ui";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";-import { getIcon } from "metabase/utils/icon";import { getName } from "metabase/utils/name";import * as Urls from "metabase/utils/urls";import { modelToUrl } from "metabase/utils/urls";diff --git a/frontend/src/metabase/plugins/oss/collections.ts b/frontend/src/metabase/plugins/oss/collections.tsindex cf9129b3b0c..f5bbe77b35d 100644--- a/frontend/src/metabase/plugins/oss/collections.ts+++ b/frontend/src/metabase/plugins/oss/collections.ts@@ -7,9 +7,9 @@ import type {CollectionAuthorityLevelConfig,CollectionInstanceAnaltyicsConfig,} from "metabase/collections/types";+import { getIconBase } from "metabase/common/utils/icon";import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";import type { IconProps } from "metabase/ui";-import { getIconBase } from "metabase/utils/icon";import type {BaseEntityId,Bookmark,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 55ea130a24b..6adbaebcb25 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@@ -1,8 +1,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 { getIcon } from "metabase/utils/icon";import { isNotNull } from "metabase/utils/types";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";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 1a6f38321dc..bdaae666c2b 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@@ -3,9 +3,9 @@ import { t } from "ttag";import { useListCardsQuery } from "metabase/api";import { Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getIcon } from "metabase/common/utils/icon";import type { IconName } from "metabase/ui";import { Group, Icon, Repeat, Skeleton, Stack, Text } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import * as Urls from "metabase/utils/urls";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsxindex ea349945ae8..4ac3694e75c 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx@@ -3,10 +3,10 @@ import { c } from "ttag";import { Link } from "metabase/common/components/Link";import { SidesheetCardSection } from "metabase/common/components/Sidesheet";+import { getIcon } from "metabase/common/utils/icon";import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";import { useSelector } from "metabase/redux";import { Flex, FixedSizeIcon as Icon } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import { getDataSourceParts } from "../../../ViewHeader/components/QuestionDataSource/utils";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsxindex e9d276d1941..fe46e4b9a24 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx@@ -4,11 +4,11 @@ import _ from "underscore";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, within } from "__support__/ui";+import { modelIconMap } from "metabase/common/utils/icon";import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";-import { modelIconMap } from "metabase/utils/icon";import { convertSavedQuestionToVirtualTable } from "metabase-lib/v1/metadata/utils/saved-questions";import type { Card, NormalizedTable } from "metabase-types/api";import { createMockCard, createMockSettings } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.ts b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.tsindex 0e5bb494d83..dd4da569d16 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.ts+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.ts@@ -1,4 +1,4 @@-import type { IconData } from "metabase/utils/icon";+import type { IconData } from "metabase/common/utils/icon";import type { SearchModel } from "metabase-types/api";export interface QuestionSource {diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsxindex dc5697ced5d..f16a3330570 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsx@@ -1,5 +1,5 @@+import { getIcon } from "metabase/common/utils/icon";import { getUrl } from "metabase/querying/notebook/components/NotebookDataPicker/utils";-import { getIcon } from "metabase/utils/icon";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/querying/expressions/suggestions/segments.ts b/frontend/src/metabase/querying/expressions/suggestions/segments.tsindex 52ace612af3..03dcc126e49 100644--- a/frontend/src/metabase/querying/expressions/suggestions/segments.ts+++ b/frontend/src/metabase/querying/expressions/suggestions/segments.ts@@ -1,6 +1,6 @@import type { CompletionContext } from "@codemirror/autocomplete";-import { modelIconMap } from "metabase/utils/icon";+import { modelIconMap } from "metabase/common/utils/icon";import * as Lib from "metabase-lib";import { formatIdentifier } from "../identifier";diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsxindex 9b5dcd2aecd..b5649343017 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx@@ -12,6 +12,7 @@ import {} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";import { useLocale } from "metabase/common/hooks";import { getColumnGroupIcon } from "metabase/common/utils/column-groups";+import { modelIconMap } from "metabase/common/utils/icon";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import {@@ -20,7 +21,6 @@ import {} from "metabase/querying/expressions";import { getGroupName } from "metabase/querying/filters/utils/groups";import { DelayGroup, Icon } from "metabase/ui";-import { modelIconMap } from "metabase/utils/icon";import { isNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/questions/components/CollectionBadge.tsx b/frontend/src/metabase/questions/components/CollectionBadge.tsxindex c2fe3dde562..7616c6e6ebc 100644--- a/frontend/src/metabase/questions/components/CollectionBadge.tsx+++ b/frontend/src/metabase/questions/components/CollectionBadge.tsx@@ -1,11 +1,11 @@import type { ComponentType, PropsWithChildren } from "react";import { Badge } from "metabase/common/components/Badge";+import { getIcon } from "metabase/common/utils/icon";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 { getIcon } from "metabase/utils/icon";import { modelToUrl } from "metabase/utils/urls/modelToUrl";import type {CollectionId,diff --git a/frontend/src/metabase/reference/guide/BaseSidebar.tsx b/frontend/src/metabase/reference/guide/BaseSidebar.tsxindex d2f7a6eaa99..9a96370a559 100644--- a/frontend/src/metabase/reference/guide/BaseSidebar.tsx+++ b/frontend/src/metabase/reference/guide/BaseSidebar.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";import S from "metabase/common/components/Sidebar.module.css";import { SidebarItem } from "metabase/common/components/SidebarItem";+import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";-import { modelIconMap } from "metabase/utils/icon";const BaseSidebar = () => (<div className={S.sidebar}>diff --git a/frontend/src/metabase/reference/segments/SegmentDetail.jsx b/frontend/src/metabase/reference/segments/SegmentDetail.jsxindex 086cee55dfe..f551cf7af16 100644--- a/frontend/src/metabase/reference/segments/SegmentDetail.jsx+++ b/frontend/src/metabase/reference/segments/SegmentDetail.jsx@@ -7,6 +7,7 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import { List } from "metabase/common/components/List";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";@@ -20,7 +21,6 @@ import {getShallowFields as getFields,getMetadata,} from "metabase/selectors/metadata";-import { modelIconMap } from "metabase/utils/icon";import S from "../components/Detail.module.css";import {diff --git a/frontend/src/metabase/reference/segments/SegmentFieldList.jsx b/frontend/src/metabase/reference/segments/SegmentFieldList.jsxindex 9405fbe7c8c..46432d0ae5a 100644--- a/frontend/src/metabase/reference/segments/SegmentFieldList.jsx+++ b/frontend/src/metabase/reference/segments/SegmentFieldList.jsx@@ -8,6 +8,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { List } from "metabase/common/components/List";import S from "metabase/common/components/List/List.module.css";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";@@ -17,7 +18,6 @@ import EditableReferenceHeader from "metabase/reference/components/EditableReferimport Field from "metabase/reference/components/Field";import F from "metabase/reference/components/Field.module.css";import * as actions from "metabase/reference/reference";-import { modelIconMap } from "metabase/utils/icon";import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";import {diff --git a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsxindex 3697e15d6f5..862c5c6b178 100644--- a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx+++ b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx@@ -7,12 +7,12 @@ import { List } from "metabase/common/components/List";import S from "metabase/common/components/List/List.module.css";import { ListItem } from "metabase/common/components/ListItem";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";import { useSelector } from "metabase/redux";import { getShallowSegments } from "metabase/selectors/metadata";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";-import { modelIconMap } from "metabase/utils/icon";import ReferenceHeader from "../../components/ReferenceHeader";import { getError, getLoading } from "../../selectors";diff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx b/frontend/src/metabase/reference/segments/SegmentQuestions.jsxindex 52c51fed3db..571a399db04 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.jsx@@ -9,11 +9,11 @@ import S from "metabase/common/components/List/List.module.css";import { ListItem } from "metabase/common/components/ListItem";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useQuestionListQuery } from "metabase/common/hooks";+import { modelIconMap } from "metabase/common/utils/icon";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 { modelIconMap } from "metabase/utils/icon";import * as Urls from "metabase/utils/urls";import visualizations from "metabase/visualizations";diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx b/frontend/src/metabase/reference/segments/SegmentRevisions.jsxindex 860685a136d..a833126d807 100644--- a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.jsx@@ -7,13 +7,13 @@ import { t } from "ttag";import { EmptyState } from "metabase/common/components/EmptyState";import S from "metabase/common/components/List/List.module.css";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";import { Revision } from "metabase/querying/segments/components/revisions/Revision";import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import { getShallowTables as getTables } from "metabase/selectors/metadata";import { assignUserColors } from "metabase/ui/colors/formatting-colors";-import { modelIconMap } from "metabase/utils/icon";import ReferenceHeader from "../components/ReferenceHeader";import {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 42fc9e53970..d8461685c32 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@@ -21,6 +21,11 @@ import {useListMentionsQuery,} from "metabase/api";import { Link } from "metabase/common/components/Link";+import {+ type IconModel,+ type ObjectWithModel,+ getIcon,+} from "metabase/common/utils/icon";import { updateMentionsCache } from "metabase/documents/documents.slice";import {METABSE_PROTOCOL_MD_LINK,@@ -29,11 +34,6 @@ import {import { PLUGIN_TRANSFORMS } from "metabase/plugins";import { useDispatch } from "metabase/redux";import { Icon } from "metabase/ui";-import {- type IconModel,- type ObjectWithModel,- getIcon,-} from "metabase/utils/icon";import { modelToUrl } from "metabase/utils/urls/modelToUrl";import { extractEntityId } from "metabase/utils/urls/utils";import type {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 731f6f45dad..412c529ccdb 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@@ -1,9 +1,9 @@import { match } from "ts-pattern";+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 { getIcon } from "metabase/utils/icon";import { getName } from "metabase/utils/name";import { type UrlableModel, modelToUrl } from "metabase/utils/urls/modelToUrl";import type {diff --git a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx b/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsxindex c6ede1299a0..dfba5023297 100644--- a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx+++ b/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx@@ -1,9 +1,9 @@+import { getIcon } from "metabase/common/utils/icon";import {DEFAULT_ICON_SIZE,LARGE_ICON_SIZE,} from "metabase/search/components/SearchResult/components";import { Icon } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type { IconComponentProps } from "./ItemIcon";diff --git a/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx b/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsxindex aec718a8652..a72bcfcbfdd 100644--- a/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx+++ b/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx@@ -1,5 +1,5 @@+import { getIcon } from "metabase/common/utils/icon";import { Icon } from "metabase/ui";-import { getIcon } from "metabase/utils/icon";import type { IconComponentProps } from "./ItemIcon";import { DEFAULT_ICON_SIZE } from "./constants";