Skip to content

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

Move ErrorBoundary into common (#82624)

Romeo Van Snickd5d6eba4c5f0
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AnalyticsExportStatus.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AnalyticsExportStatus.tsx
index d95b8576e14..69870f57ec2 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AnalyticsExportStatus.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AnalyticsExportStatus.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import StatusLarge from "metabase/status/components/StatusLarge";
import useStatusVisibility from "metabase/status/hooks/use-status-visibility";
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
index 35191aabdc7..82d7b7c86c6 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
@@ -11,7 +11,7 @@ import {
} from "react";
import { c, msgid, ngettext, t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { Markdown } from "metabase/common/components/Markdown";
import { UploadInput } from "metabase/common/components/upload";
diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx
index 38f4e548400..f0f57bc4e71 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx
@@ -1,7 +1,7 @@
import { forwardRef } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { Link } from "metabase/common/components/Link";
import { useSetting } from "metabase/settings";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsx
index 27cef6d83ff..9c9cc9a243f 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsx
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Tree } from "metabase/common/components/tree";
import {
SidebarHeading,
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index a3a99abc396..8024f640d55 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -418,12 +418,6 @@ const elements = [
mode: "full",
}),
),
- createElement({
- type: "shared",
- name: "error-boundary",
- pattern: "frontend/src/metabase/ErrorBoundary.tsx",
- mode: "full",
- }),
createElement({
type: "app",
name: "routes-stable-id-aware",
diff --git a/frontend/lint/shared-tiers.mjs b/frontend/lint/shared-tiers.mjs
index 7450c95f611..5bc0966b8fc 100644
--- a/frontend/lint/shared-tiers.mjs
+++ b/frontend/lint/shared-tiers.mjs
@@ -31,7 +31,6 @@ const SHARED_UTILS_LEVELS = [
"shared/metadata-store",
"shared/selectors",
"shared/content-translation",
- "shared/error-boundary",
"shared/forms",
"shared/archive",
"shared/hooks",
diff --git a/frontend/src/metabase/AppComponent.tsx b/frontend/src/metabase/AppComponent.tsx
index 57b357aab06..648b912992e 100644
--- a/frontend/src/metabase/AppComponent.tsx
+++ b/frontend/src/metabase/AppComponent.tsx
@@ -11,6 +11,7 @@ import {
getIsNavBarEnabled,
} from "metabase/app/selectors";
import { AppBanner } from "metabase/common/components/AppBanner";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import {
Archived,
GenericError,
@@ -34,7 +35,6 @@ import { initializeIframeResizer } from "metabase/utils/dom";
import { AppContainer, AppContent, AppContentContainer } from "./App.styled";
import { AppKBarProvider } from "./AppKBarProvider";
-import ErrorBoundary from "./ErrorBoundary";
import ScrollToTop from "./ScrollToTop";
import { trackPageView } from "./analytics";
import { Metabot } from "./metabot/components/Metabot";
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx b/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx
index 53f65947325..7d57935a2a0 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx
@@ -1,5 +1,5 @@
-import ErrorBoundary from "metabase/ErrorBoundary";
import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Outlet } from "metabase/router";
import { Box } from "metabase/ui";
diff --git a/frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.tsx b/frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.tsx
index bf0e39861ab..8f20019c8ae 100644
--- a/frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.tsx
+++ b/frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.tsx
@@ -1,7 +1,7 @@
import type React from "react";
import { useEffect, useRef } from "react";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { NotFound } from "metabase/common/components/ErrorPages";
import { useLocation } from "metabase/router";
import { Box } from "metabase/ui";
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx
index 1904ab34667..1888c7923c4 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx
@@ -2,7 +2,7 @@ import { updateIn } from "icepick";
import { type ComponentType, useState } from "react";
import _ from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { GenericError } from "metabase/common/components/ErrorPages";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
index 7454b9b0296..f548ca65cb2 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
@@ -2,12 +2,12 @@ import { type ComponentType, useEffect, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
import {
useGetDatabaseQuery,
useGetDatabaseSettingsAvailableQuery,
} from "metabase/api";
import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { GenericError } from "metabase/common/components/ErrorPages";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
diff --git a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
index 95f499bf16b..cd9d335b469 100644
--- a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
+++ b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
@@ -4,7 +4,7 @@ import { getIn } from "icepick";
import { useCallback, useState } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Link } from "metabase/common/components/Link";
import { useDispatch } from "metabase/redux";
import { loginGoogle } from "metabase/redux/auth";
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
index c8cae12c023..d9f3ddb35d4 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
@@ -5,7 +5,6 @@ import { usePrevious } from "react-use";
import { match } from "ts-pattern";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
import {
Api,
useCreateBookmarkMutation,
@@ -28,6 +27,7 @@ import type {
OnFileUpload,
} from "metabase/common/collections/types";
import { isTrashedCollection } from "metabase/common/collections/utils";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { ItemsDragLayer } from "metabase/common/components/dnd/ItemsDragLayer";
import { useSetCollection, useToast } from "metabase/common/hooks";
import { useListSelect } from "metabase/common/hooks/use-list-select";
diff --git a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx
index 53df08bb64a..be0f2dd525c 100644
--- a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx
+++ b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx
@@ -4,9 +4,9 @@ import { useCallback, useEffect } from "react";
import { useLocation } from "react-use";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
import type { CommentExtraRenderer } from "metabase/comments/types";
import { formatCommentDate, getCommentNodeId } from "metabase/comments/utils";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { getUser } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { Avatar, Box, Group, Icon, Text, Timeline, Tooltip } from "metabase/ui";
diff --git a/frontend/src/metabase/ErrorBoundary.tsx b/frontend/src/metabase/common/components/ErrorBoundary.tsx
similarity index 96%
rename from frontend/src/metabase/ErrorBoundary.tsx
rename to frontend/src/metabase/common/components/ErrorBoundary.tsx
index 23a8aaae9a0..8c1c97229ef 100644
--- a/frontend/src/metabase/ErrorBoundary.tsx
+++ b/frontend/src/metabase/common/components/ErrorBoundary.tsx
@@ -7,7 +7,8 @@ import type {
import { Component, forwardRef } from "react";
import { useReportFrontendErrorMutation } from "metabase/api";
-import { SmallGenericError } from "metabase/common/components/ErrorPages";
+
+import { SmallGenericError } from "./ErrorPages";
interface ErrorBoundaryProps extends PropsWithChildren {
onError?: (errorInfo: ErrorInfo) => void;
diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
index 833900fc2c1..adeb3cb67e6 100644
--- a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
@@ -2,8 +2,8 @@ import { useEffect, useState } from "react";
import { c, t } from "ttag";
import _ from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
import { useSendBugReportMutation } from "metabase/api/bug-report";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { MetabotLogo } from "metabase/common/components/MetabotLogo";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { useDispatch, useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPicker.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPicker.tsx
index 07c18de1862..40a15f0b389 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPicker.tsx
@@ -1,4 +1,4 @@
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { EntityPickerProvider } from "../context";
import type { EntityPickerProps } from "../types";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NestedItemPicker.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NestedItemPicker.tsx
index 090edd4c243..4c3e0c0facb 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NestedItemPicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NestedItemPicker.tsx
@@ -1,4 +1,4 @@
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Box, Flex } from "metabase/ui";
import { useOmniPickerContext } from "../context";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
index ffb8467c5ee..c0aa73af656 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
@@ -2,8 +2,8 @@ import cx from "classnames";
import { memo, useCallback, useMemo, useRef, useState } from "react";
import { useMount, useUpdateEffect } from "react-use";
-import ErrorBoundary from "metabase/ErrorBoundary";
import { isActionCard } from "metabase/actions/utils";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import CS from "metabase/css/core/index.css";
import DashboardS from "metabase/css/dashboard.module.css";
import { addParameter, duplicateCard } from "metabase/dashboard/actions";
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
index 527ac3bb911..5768a6a75e3 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
@@ -4,9 +4,9 @@ import { useCallback, useMemo, useState } from "react";
import { useMount } from "react-use";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
import { skipToken, useListRevisionsQuery } from "metabase/api";
import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx
index 82e792f36f3..8cf19f47b41 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx
@@ -2,7 +2,7 @@ import { useCallback } from "react";
import { useMount } from "react-use";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import { toggleAutoApplyFilters } from "metabase/dashboard/actions/parameters";
diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx
index 802f39994a4..e96b511e0bd 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx
@@ -1,7 +1,7 @@
import cx from "classnames";
import { useEffect, useMemo, useState } from "react";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { isRouteInSync } from "metabase/common/hooks/is-route-in-sync";
import { useFavicon } from "metabase/common/hooks/use-favicon";
import CS from "metabase/css/core/index.css";
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
index a9e3f46c562..1e5a072f0bc 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
@@ -10,7 +10,6 @@ import { useLocation } from "react-use";
import { t } from "ttag";
import { noop } from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
import {
useCreateCommentMutation,
useDeleteCommentMutation,
@@ -27,6 +26,7 @@ import {
getCommentNodeId,
getListCommentsQuery,
} from "metabase/comments/utils";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useToast } from "metabase/common/hooks";
import { getUser } from "metabase/current-user";
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx
index 9abf37fc1fa..682d0dd1355 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx
@@ -4,8 +4,8 @@ import { shallowEqual } from "react-redux";
import { t } from "ttag";
import { noop } from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
import { explorationApi } from "metabase/api/exploration";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Warnings } from "metabase/common/components/Warnings";
import { HEADER_HEIGHT, ROW_HEIGHT } from "metabase/data-grid/constants";
import { useDispatch, useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsx
index cacfa318da7..54a04464b72 100644
--- a/frontend/src/metabase/metabot/components/Metabot.tsx
+++ b/frontend/src/metabase/metabot/components/Metabot.tsx
@@ -3,8 +3,8 @@ import { tinykeys } from "tinykeys";
import { t } from "ttag";
import MetabotFailure from "assets/img/metabot-failure.svg?component";
-import ErrorBoundary from "metabase/ErrorBoundary";
import { idTag } from "metabase/api/tags";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { getUser } from "metabase/current-user";
import {
useIsFullPageMetabot,
diff --git a/frontend/src/metabase/monitor/components/MonitorLayout/Sidebar.tsx b/frontend/src/metabase/monitor/components/MonitorLayout/Sidebar.tsx
index d0d58a38c5b..7566e20e9f6 100644
--- a/frontend/src/metabase/monitor/components/MonitorLayout/Sidebar.tsx
+++ b/frontend/src/metabase/monitor/components/MonitorLayout/Sidebar.tsx
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
import { createPortal } from "react-dom";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { useMonitorSidebarContext } from "./MonitorContent";
import { SidebarResizableBox } from "./SidebarResizableBox";
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx b/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
index ec1ae399bb8..e613843f28f 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBar.tsx
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";
import type { DetailViewState } from "metabase/redux/store";
import type { CollectionId, SearchResult, User } from "metabase-types/api";
diff --git a/frontend/src/metabase/nav/components/AreaLayout/AreaContent.tsx b/frontend/src/metabase/nav/components/AreaLayout/AreaContent.tsx
index ea00a476cec..9290a477eec 100644
--- a/frontend/src/metabase/nav/components/AreaLayout/AreaContent.tsx
+++ b/frontend/src/metabase/nav/components/AreaLayout/AreaContent.tsx
@@ -1,6 +1,6 @@
import { type ReactNode, memo } from "react";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Box } from "metabase/ui";
export const CONTENT_PADDING_X = "3.5rem";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
index cb2fdef00ff..0ff85c6e49b 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
@@ -4,7 +4,6 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import _ from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
import type { CollectionTreeItem } from "metabase/common/collections/utils";
import {
isExamplesCollection,
@@ -12,6 +11,7 @@ import {
isRootTrashCollection,
} from "metabase/common/collections/utils";
import { CollapseSection } from "metabase/common/components/CollapseSection";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Tree } from "metabase/common/components/tree";
import { useIsAtHomepageDashboard } from "metabase/common/hooks/use-is-at-homepage-dashboard";
import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx
index e3d83e24bc4..b65e5b8c74e 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx
@@ -1,7 +1,6 @@
import { useCallback, useMemo } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
import type { CollectionTreeItem } from "metabase/common/collections/utils";
import {
buildCollectionTree,
@@ -9,6 +8,7 @@ import {
isLibraryCollection,
} from "metabase/common/collections/utils";
import { CollapseSection } from "metabase/common/components/CollapseSection";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { Tree } from "metabase/common/components/tree";
import {
SidebarHeading,
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
index 05c30a1dd42..266721b0802 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
@@ -10,13 +10,13 @@ import { useMount, usePrevious } from "react-use";
import { t } from "ttag";
import _ from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
import {
skipToken,
useGetRemappedCardParameterValueQuery,
useGetRemappedDashboardParameterValueQuery,
useGetRemappedParameterValueQuery,
} from "metabase/api";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import { MultiAutocompleteWithTranslation } from "metabase/common/components/MultiAutocomplete";
import { useTranslateContent } from "metabase/content-translation/hooks";
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionLastUpdated/QuestionLastUpdated.tsx b/frontend/src/metabase/query_builder/components/view/QuestionLastUpdated/QuestionLastUpdated.tsx
index 397c881d8e7..374286aeae0 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionLastUpdated/QuestionLastUpdated.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionLastUpdated/QuestionLastUpdated.tsx
@@ -1,6 +1,6 @@
import { c } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { FixedSizeIcon, Flex, type FlexProps, Tooltip } from "metabase/ui";
import type { Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
index abb5bd17d95..5dd79b7e5b6 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
@@ -1,7 +1,7 @@
import { memo, useCallback, useMemo } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import CS from "metabase/css/core/index.css";
import { useDispatch, useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
index 2a52b44bfc3..20fbec712d1 100644
--- a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
+++ b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { AggregationPicker } from "metabase/querying/common/components/AggregationPicker";
import { ClauseStep } from "metabase/querying/notebook/components/ClauseStep";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx
index 7f3a9cb93a1..8cc5f66fe41 100644
--- a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { useLocale } from "metabase/common/hooks";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";
diff --git a/frontend/src/metabase/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx b/frontend/src/metabase/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
index 769c8d0f5ff..9a1055953e0 100644
--- a/frontend/src/metabase/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
+++ b/frontend/src/metabase/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from "react";
import { t } from "ttag";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { useLocale } from "metabase/common/hooks";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";
diff --git a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx
index 54403392900..2dc192703a0 100644
--- a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx
+++ b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx
@@ -1,7 +1,7 @@
import _ from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
import { skipToken, useGetCollectionQuery } from "metabase/api";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { useDispatch, useSelector } from "metabase/redux";
import type { FileUpload } from "metabase/redux/store/upload";
import { clearAllUploads, getAllUploads } from "metabase/redux/uploads";
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 0f7e1dee4af..11e7d94675a 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -13,7 +13,7 @@ import React, {
import { t } from "ttag";
import _ from "underscore";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { SmallGenericError } from "metabase/common/components/ErrorPages";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import type { ContentTranslationFunction } from "metabase/content-translation/types";
diff --git a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
index 64c8bb3a4f3..b196fd9ca7e 100644
--- a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
+++ b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
@@ -1,6 +1,6 @@
import { forwardRef, useCallback, useMemo } from "react";
-import ErrorBoundary from "metabase/ErrorBoundary";
+import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { useDispatch, useSelector } from "metabase/redux";
import { Center } from "metabase/ui";
import { BaseChartSettings } from "metabase/visualizations/components/ChartSettings";