Skip to content

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

Gdgt 2586 replace deprecated loadingspinner component (#77638)

Egor Grushin0d59548a1eae
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsx
index d507c788c11..29545e7afaa 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsx
@@ -108,7 +108,7 @@ export const CollectionSyncList = ({
if (isLoading) {
return (
<Flex justify="center" py="lg">
- <Loader data-testid="loading-indicator" />
+ <Loader />
</Flex>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
index 83b307a6e03..06a2f594b76 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
@@ -148,7 +148,7 @@ const EditSandboxingModal = ({
if (loadingCard || loadingTabe) {
return (
<Center p="2rem">
- <Loader data-testid="loading-indicator" />
+ <Loader />
</Center>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.tsx
index a9162e30738..581ced70e81 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.tsx
@@ -1,5 +1,4 @@
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
-import { Flex, Text } from "metabase/ui";
+import { Flex, Loader, Text } from "metabase/ui";
import S from "./EditTableDataOverlay.module.css";
@@ -18,7 +17,7 @@ export function EditTableDataOverlay({
return (
<Flex className={S.overlay}>
- <LoadingSpinner />
+ <Loader size="lg" />
{message && <Text className={S.message}>{message}</Text>}
</Flex>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
index e948ca87e52..24dd8c4749a 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
@@ -4,13 +4,13 @@ import { c, t } from "ttag";
import EmptyCodeResult from "assets/img/empty-states/code.svg";
import { AnsiLogs } from "metabase/common/components/AnsiLogs";
import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
-import { LoadingSpinner } from "metabase/common/components/MetadataInfo/MetadataInfo.styled";
import {
ActionIcon,
Box,
Flex,
Group,
Icon,
+ Loader,
Stack,
Tabs,
Text,
@@ -104,8 +104,8 @@ function getRunQueryShortcut() {
function LoadingState() {
return (
- <Flex p="md" className={S.loading}>
- <LoadingSpinner />
+ <Flex p="md" align="center" justify="center" className={S.loading}>
+ <Loader size="lg" color="core-brand" />
</Flex>
);
}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkLoader.tsx b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkLoader.tsx
index 7260ce38dce..53b30e70b19 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkLoader.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkLoader.tsx
@@ -4,7 +4,7 @@ import { Center, Loader } from "metabase/ui";
export const SdkLoader = ({ className, style }: CommonStylingProps) => {
return (
<Center className={className} style={style} h="100%" w="100%" mx="auto">
- <Loader data-testid="loading-indicator" />
+ <Loader />
</Center>
);
};
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx
index 00bcdf3afec..329c8f2df3d 100644
--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx
+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx
@@ -119,7 +119,7 @@ const TableBrowserItem = ({
onClick={() => trackTableClick(table.id as ConcreteTableId)}
>
<>
- {isLoading && <Loader size="xs" data-testid="loading-indicator" />}
+ {isLoading && <Loader size="xs" />}
{!isLoading && !isVirtual && (
<TableBrowserItemButtons
// Unjustified type cast. FIXME
diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
index c6cbb609145..43b0857ad83 100644
--- a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
+++ b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
@@ -12,11 +12,10 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { ListSearchField } from "metabase/common/components/ListSearchField";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import ListS from "metabase/css/components/list.module.css";
import CS from "metabase/css/core/index.css";
import type { TextInputProps } from "metabase/ui";
-import { Box, Icon, Text, isValidIconName } from "metabase/ui";
+import { Box, Icon, Loader, Text, isValidIconName } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import { color } from "metabase/ui/utils/colors";
import { isTouchDevice } from "metabase/utils/browser";
@@ -231,7 +230,7 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
)}
{showSpinner(section) && (
<Box ml="0.5rem">
- <LoadingSpinner size={16} borderWidth={2} />
+ <Loader size="xs" />
</Box>
)}
{sections.length > 1 && section.items && section.items.length > 0 && (
@@ -299,7 +298,7 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
)}
{showSpinner(section) && (
<Box ml="0.5rem">
- <LoadingSpinner size={16} borderWidth={2} />
+ <Loader size="xs" />
</Box>
)}
<IconWrapper>
@@ -316,7 +315,7 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
} else if (type === "loading") {
content = (
<div className={cx(CS.m1, CS.flex, CS.layoutCentered)}>
- <LoadingSpinner />
+ <Loader size="lg" />
</div>
);
} else if (type === "search") {
@@ -402,7 +401,7 @@ export const AccordionListCell = forwardRef(function AccordionListCell<
</div>
{showSpinner(item) && (
<Box ml="0.5rem">
- <LoadingSpinner size={16} borderWidth={2} />
+ <Loader size="xs" />
</Box>
)}
</Content>
diff --git a/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx b/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx
index 6ca0678f5ca..a3441e65b36 100644
--- a/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx
+++ b/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx
@@ -135,11 +135,7 @@ export const ActionButton = forwardRef<ActionButtonHandle, ActionButtonProps>(
{active ? (
useLoadingSpinner ? (
<Center px="2rem">
- <Loader
- size="sm"
- color="core-white"
- data-testid="loading-indicator"
- />
+ <Loader size="sm" color="core-white" />
</Center>
) : (
activeText
diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx
index ce755e4875c..bb9cae3ae6b 100644
--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx
+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx
@@ -2,7 +2,6 @@
import styled from "@emotion/styled";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { darken } from "metabase/ui/colors";
import { color } from "metabase/ui/utils/colors";
@@ -60,13 +59,6 @@ export const EntityItemWrapper = styled.div<{
}
`;
-export const EntityItemSpinner = styled(LoadingSpinner)`
- display: flex;
- flex-direction: column;
- justify-content: center;
- color: var(--mb-color-core-brand);
-`;
-
export const EntityMenuContainer = styled.div`
display: flex;
align-items: center;
diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx
index d7235a074d8..f6c90dfbd49 100644
--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx
+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx
@@ -43,7 +43,6 @@ import S from "./EntityItem.module.css";
import {
EntityIconWrapper,
EntityItemActions,
- EntityItemSpinner,
EntityItemWrapper,
EntityMenuContainer,
} from "./EntityItem.styled";
@@ -389,7 +388,6 @@ export const EntityItem = ({
buttons,
extraInfo,
pinned,
- loading,
disabled,
}: {
name: string;
@@ -406,7 +404,6 @@ export const EntityItem = ({
buttons?: ReactNode;
extraInfo?: ReactNode;
pinned?: boolean;
- loading?: boolean;
disabled?: boolean;
}) => {
const icon = useMemo(() => ({ name: iconName }), [iconName]);
@@ -436,7 +433,6 @@ export const EntityItem = ({
<EntityItemActions onClick={(e) => e.preventDefault()}>
{buttons}
- {loading && <EntityItemSpinner size={24} borderWidth={3} />}
<EntityItemMenu
item={item}
onPin={onPin}
diff --git a/frontend/src/metabase/common/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx b/frontend/src/metabase/common/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx
index 9a57605e274..8cb1e1f3736 100644
--- a/frontend/src/metabase/common/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx
+++ b/frontend/src/metabase/common/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx
@@ -10,8 +10,8 @@ import {
} from "react";
import { t } from "ttag";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import CS from "metabase/css/core/index.css";
+import { Loader } from "metabase/ui";
export interface LoadingAndErrorWrapperProps {
loading?: boolean;
@@ -133,7 +133,7 @@ export const LoadingAndErrorWrapper = forwardRef<
renderError(contentClassName)
) : loading ? (
<div className={contentClassName}>
- {showSpinner && <LoadingSpinner />}
+ {showSpinner && <Loader size="lg" />}
<h2 className={cx(CS.textNormal, CS.textLight, CS.mt1)}>
{getLoadingMessages()[messageIndex]}
</h2>
diff --git a/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.module.css b/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.module.css
deleted file mode 100644
index 16d1706c8ae..00000000000
--- a/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.module.css
+++ /dev/null
@@ -1,31 +0,0 @@
-@keyframes spinner {
- from {
- transform: rotate(0deg);
- }
-
- to {
- transform: rotate(360deg);
- }
-}
-
-.spinnerIcon {
- box-sizing: border-box;
- border: var(--border-width) solid transparent;
- border-top-color: currentColor;
- border-radius: 50%;
- animation: spinner 1.3s infinite cubic-bezier(0.785, 0.135, 0.15, 0.86);
-
- &::after {
- content: "";
- display: inherit;
- box-sizing: inherit;
- width: inherit;
- height: inherit;
- border: var(--border-width) solid currentColor;
- border-radius: 50%;
- opacity: 0.25;
- position: relative;
- top: calc(-1 * var(--border-width));
- left: calc(-1 * var(--border-width));
- }
-}
diff --git a/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.tsx b/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.tsx
deleted file mode 100644
index d9824c1efe4..00000000000
--- a/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Box, Flex, Icon } from "metabase/ui";
-import { isReducedMotionPreferred } from "metabase/utils/dom";
-
-import S from "./LoadingSpinner.module.css";
-
-interface Props {
- className?: string;
- size?: number;
- borderWidth?: number;
- "data-testid"?: string;
-}
-
-/**
- * @deprecated: use Loader from "metabase/ui"
- */
-export const LoadingSpinner = ({
- className,
- size = 32,
- borderWidth = 4,
- "data-testid": dataTestId,
-}: Props) => (
- <Flex
- align="center"
- fz={0}
- className={className}
- data-testid={dataTestId ?? "loading-indicator"}
- >
- {isReducedMotionPreferred() ? (
- <Icon name="hourglass" size="24" />
- ) : (
- <Box
- display="inline-block"
- w={`${size}px`}
- h={`${size}px`}
- className={S.spinnerIcon}
- style={{ "--border-width": `${borderWidth}px` }}
- />
- )}
- </Flex>
-);
diff --git a/frontend/src/metabase/common/components/LoadingSpinner/index.ts b/frontend/src/metabase/common/components/LoadingSpinner/index.ts
deleted file mode 100644
index 033b8151ae5..00000000000
--- a/frontend/src/metabase/common/components/LoadingSpinner/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { LoadingSpinner } from "./LoadingSpinner";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx
index 812ed283618..31150baad1e 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx
@@ -1,8 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import type { ComponentProps } from "react";
-import { LoadingSpinner as LoadingSpinnerBase } from "metabase/common/components/LoadingSpinner";
import { isReducedMotionPreferred } from "metabase/utils/dom";
const TRANSITION_DURATION = () => (isReducedMotionPreferred() ? "0" : "0.25s");
@@ -26,18 +24,6 @@ export const NoWrap = styled.div`
line-height: 1.3em;
`;
-type LoadingSpinnerProps = ComponentProps<typeof LoadingSpinnerBase>;
-
-export const LoadingSpinner = styled((props: LoadingSpinnerProps) => (
- <LoadingSpinnerBase {...props} size={props.size ?? 18} />
-))`
- display: flex;
- flex-grow: 1;
- align-self: center;
- justify-content: center;
- color: var(--mb-color-core-brand);
-`;
-
export const RelativeContainer = styled.div<{ height?: string }>`
position: relative;
height: ${({ height }) => height || "1em"};
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx
index 7982d39db04..68a649ad0a3 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx
@@ -3,6 +3,7 @@ import { msgid, ngettext, t } from "ttag";
import { useGetFieldValuesQuery } from "metabase/api";
import { useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { Flex, Loader } from "metabase/ui";
import { formatNumber } from "metabase/utils/formatting";
import type { FieldId, FieldValue } from "metabase-types/api";
@@ -11,7 +12,6 @@ import {
Fade,
FadeAndSlide,
Li,
- LoadingSpinner,
NoWrap,
RelativeContainer,
} from "./GlobalFingerprint.styled";
@@ -115,7 +115,9 @@ function ShortenedFieldValuesList({
return (
<RelativeContainer height={isLoading ? "1.8em" : "1.5em"}>
<Fade visible={isLoading}>
- <LoadingSpinner />
+ <Flex justify="center">
+ <Loader size={18} color="core-brand" />
+ </Flex>
</Fade>
<FadeAndSlide visible={!isLoading}>
<NoWrap>{shortenedValuesStr}</NoWrap>
diff --git a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx
index 806db874bee..886505c0123 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx
@@ -1,7 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { LoadingSpinner as LoadingSpinnerBase } from "metabase/common/components/LoadingSpinner";
import { Icon } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import { color } from "metabase/ui/utils/colors";
@@ -66,14 +65,6 @@ export const Fade = styled.div<FadeProps>`
}
`;
-export const LoadingSpinner = styled(LoadingSpinnerBase)`
- display: flex;
- flex-grow: 1;
- align-self: center;
- justify-content: center;
- color: var(--mb-color-core-brand);
-`;
-
export const Table = styled.table`
font-size: 1em;
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
index 3ec831a9ffa..dc8af79ca47 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
@@ -9,14 +9,11 @@ import {
fetchTableMetadata,
} from "metabase/redux/tables";
import { getMetadata } from "metabase/selectors/metadata";
+import { Loader } from "metabase/ui";
import type Table from "metabase-lib/v1/metadata/Table";
import { Description, EmptyDescription } from "../MetadataInfo";
-import {
- AbsoluteContainer,
- Fade,
- LoadingSpinner,
-} from "../MetadataInfo.styled";
+import { AbsoluteContainer, Fade } from "../MetadataInfo.styled";
import { ColumnCount } from "./ColumnCount";
import { ConnectedTables } from "./ConnectedTables";
@@ -103,7 +100,7 @@ export function TableInfoInner({
<MetadataContainer>
<Fade visible={!hasFetchedMetadata}>
<AbsoluteContainer>
- <LoadingSpinner size={24} />
+ <Loader size="md" color="core-brand" />
</AbsoluteContainer>
</Fade>
<Fade visible={hasFetchedMetadata}>
diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx
index cede2174c9f..f8b9c2d0676 100644
--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx
+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx
@@ -96,7 +96,7 @@ export const ConfirmMoveDashboardQuestionCandidatesModal = ({
{match({ isLoading, fetchError, rows })
.with({ isLoading: true }, () => (
<Flex justify="center" py="18.25rem">
- <Loader size="xl" data-testid="loading-indicator" />
+ <Loader size="xl" />
</Flex>
))
.with({ fetchError: P.not(P.nullish) }, ({ fetchError }) => {
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/LoadingSpinner.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/LoadingSpinner.tsx
index bd299ca709c..e14b1edede6 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/LoadingSpinner.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/LoadingSpinner.tsx
@@ -5,13 +5,7 @@ import { t } from "ttag";
import { Box, Center, Flex, Loader, Text } from "metabase/ui";
export const LoadingSpinner = ({ text }: { text?: string }) => (
- <Flex
- align="center"
- justify="center"
- h="100%"
- data-testid="loading-indicator"
- gap="md"
- >
+ <Flex align="center" justify="center" h="100%" gap="md">
<Loader size="lg" />
{!!text && <Text color="text-secondary">{text}</Text>}
</Flex>
diff --git a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
index 36d6298ab43..a8e75247043 100644
--- a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
+++ b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
@@ -244,7 +244,7 @@ export function SearchResult({
</ResultNameSection>
{isLoading && (
<LoadingSection px="xs">
- <Loader />
+ <Loader data-testid="search-result-sync-loading-indicator" />
</LoadingSection>
)}
{showXRayButton && (
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
index c609f2e4c95..e52b3511acc 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/BulkTableVisibilityToggle.tsx
@@ -88,7 +88,7 @@ export function BulkTableVisibilityToggle({
if (isLoading) {
return (
<ActionIcon disabled variant="transparent">
- <Loader data-testid="loading-indicator" size="xs" />
+ <Loader size="xs" />
</ActionIcon>
);
}
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
index 21ecdd4352b..8663178af79 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TableVisibilityToggle.tsx
@@ -80,7 +80,7 @@ export function TableVisibilityToggle({ className, table, onUpdate }: Props) {
if (isLoading) {
return (
<ActionIcon disabled variant="transparent">
- <Loader data-testid="loading-indicator" size="xs" />
+ <Loader size="xs" />
</ActionIcon>
);
}
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.tsx
index 9d4fd9a5788..aa0fe209772 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
@@ -309,9 +309,7 @@ const TableSectionBase = ({
<Tabs.Panel value="field">
<Stack gap="md">
<Group gap="md" justify="flex-start" wrap="nowrap">
- {isUpdatingSorting && (
- <Loader data-testid="loading-indicator" size="xs" />
- )}
+ {isUpdatingSorting && <Loader size="xs" />}
{!isSorting && hasFields && (
<ResponsiveButton
diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx
index 5194146c2ec..fdea2957e2f 100644
--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx
+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx
@@ -73,7 +73,7 @@ export const Relationship = ({ fk, rowId, onClick }: Props) => {
? { component: Link, to: fkQuestionUrl, onClick }
: undefined)}
>
- {isFetching && <Loader data-testid="loading-indicator" size="md" />}
+ {isFetching && <Loader size="md" />}
{!isFetching && (
<Text
diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
index 52953faa877..1062203fb4c 100644
--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
@@ -207,9 +207,7 @@ const TableSectionBase = ({
>
{/* keep these conditions in sync with getRequiredWidth in useResponsiveButtons */}
- {isUpdatingSorting && (
- <Loader data-testid="loading-indicator" size="xs" />
- )}
+ {isUpdatingSorting && <Loader size="xs" />}
{!isSorting && hasFields && (
<ResponsiveButton
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
index c609f2e4c95..e52b3511acc 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
@@ -88,7 +88,7 @@ export function BulkTableVisibilityToggle({
if (isLoading) {
return (
<ActionIcon disabled variant="transparent">
- <Loader data-testid="loading-indicator" size="xs" />
+ <Loader size="xs" />
</ActionIcon>
);
}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
index 21ecdd4352b..8663178af79 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
@@ -80,7 +80,7 @@ export function TableVisibilityToggle({ className, table, onUpdate }: Props) {
if (isLoading) {
return (
<ActionIcon disabled variant="transparent">
- <Loader data-testid="loading-indicator" size="xs" />
+ <Loader size="xs" />
</ActionIcon>
);
}
diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx
index 5726087fef4..826167cc938 100644
--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx
@@ -51,7 +51,7 @@ export type SearchResultsProps = {
};
export const SearchLoadingSpinner = () => (
- <Loader size="lg" data-testid="loading-indicator" label={t`Loading…`} />
+ <Loader size="lg" label={t`Loading…`} />
);
export const SearchResults = ({
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.tsx
index f1f2ede18e7..1b9203bcc7a 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
@@ -49,7 +49,7 @@ export const CSVPanel = ({
if (isLoadingStorageAddOn) {
return (
<Center h="100%">
- <Loader data-testid="loading-indicator" />
+ <Loader />
</Center>
);
}
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 224566ec368..e250a36a55d 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
@@ -18,7 +18,6 @@ import {
useGetRemappedParameterValueQuery,
} from "metabase/api";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { MultiAutocompleteWithTranslation } from "metabase/common/components/MultiAutocomplete";
import {
TokenField,
@@ -560,7 +559,7 @@ const LoadingState = () => (
className={cx(CS.flex, CS.layoutCentered, CS.alignCenter)}
style={{ minHeight: 82 }}
>
- <LoadingSpinner size={16} />
+ <Loader size="xs" />
</div>
);
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
index ede3dda1057..b3f138ceb2f 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
@@ -4,12 +4,11 @@ import { t } from "ttag";
import _ from "underscore";
import { EmptyState } from "metabase/common/components/EmptyState";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { optionItemEqualsFilter } from "metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/utils";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
-import { Checkbox, Flex, Input, Text, TextInput } from "metabase/ui";
+import { Checkbox, Input, Text, TextInput } from "metabase/ui";
import { delay } from "metabase/utils/delay";
import type { RowValue } from "metabase-types/api";
@@ -45,7 +44,6 @@ export const ListField = ({
optionRenderer,
placeholder,
isDashboardFilter,
- isLoading,
}: ListFieldProps) => {
const normalizedValue = useMemo(
() => normalizeValuesToOptionKeys(value, options),
@@ -195,41 +193,33 @@ export const ListField = ({
</EmptyStateContainer>
)}
- {isLoading && (
- <Flex p="md" align="center" justify="center">
- <LoadingSpinner size={24} />
- </Flex>
- )}
-
- {!isLoading && (
- <OptionsList isDashboardFilter={isDashboardFilter}>
- {filteredOptions.length > 0 && (
- <OptionContainer>
- <Checkbox
- variant="stacked"
- label={
- <Text c="text-secondary" lh="inherit">
- {debouncedFilter ? t`Select these` : t`Select all`}
- </Text>
- }
- checked={isAll}
- indeterminate={!isAll && !isNone}
- onChange={handleToggleAll}
- />
- </OptionContainer>
- )}
- {filteredOptions.map((option, index) => (
- <OptionContainer key={index}>
- <Checkbox
- data-testid={`${option[0]}-filter-value`}
- checked={selectedValues.has(option[0])}
- label={optionRenderer(option)}
- onChange={() => handleToggleOption(option[0])}
- />
- </OptionContainer>
- ))}
- </OptionsList>
- )}
+ <OptionsList isDashboardFilter={isDashboardFilter}>
+ {filteredOptions.length > 0 && (
+ <OptionContainer>
+ <Checkbox
+ variant="stacked"
+ label={
+ <Text c="text-secondary" lh="inherit">
+ {debouncedFilter ? t`Select these` : t`Select all`}
+ </Text>
+ }
+ checked={isAll}
+ indeterminate={!isAll && !isNone}
+ onChange={handleToggleAll}
+ />
+ </OptionContainer>
+ )}
+ {filteredOptions.map((option, index) => (
+ <OptionContainer key={index}>
+ <Checkbox
+ data-testid={`${option[0]}-filter-value`}
+ checked={selectedValues.has(option[0])}
+ label={optionRenderer(option)}
+ onChange={() => handleToggleOption(option[0])}
+ />
+ </OptionContainer>
+ ))}
+ </OptionsList>
</>
);
};
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts
index 3097ea4a3ac..d0ce8cc0a75 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/types.ts
@@ -14,5 +14,4 @@ export interface ListFieldProps {
placeholder: string;
isDashboardFilter?: boolean;
checkedColor?: string;
- isLoading?: boolean;
}
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
index 976af877b33..2a4c3a502fd 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
@@ -4,11 +4,10 @@ import { t } from "ttag";
import _ from "underscore";
import { EmptyState } from "metabase/common/components/EmptyState";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
-import { Flex, Input, TextInput } from "metabase/ui";
+import { Input, TextInput } from "metabase/ui";
import { delay } from "metabase/utils/delay";
import type { RowValue } from "metabase-types/api";
@@ -48,7 +47,6 @@ const SingleSelectListField = ({
placeholder = t`Find...`,
onSearchChange,
isDashboardFilter,
- isLoading,
checkedColor,
}: SingleSelectListFieldProps) => {
const normalizedValue = useMemo(
@@ -118,7 +116,7 @@ const SingleSelectListField = ({
}, [debouncedFilter, sortedOptions, isFilterInValues, tc]);
const shouldShowEmptyState =
- filter.length > 0 && !isLoading && filteredOptions.length === 0;
+ filter.length > 0 && filteredOptions.length === 0;
const onClickOption = (option: any) => {
if (selectedValue !== option) {
@@ -189,33 +187,25 @@ const SingleSelectListField = ({
</EmptyStateContainer>
)}
- {isLoading && (
- <Flex p="md" align="center" justify="center">
- <LoadingSpinner size={24} />
- </Flex>
- )}
-
- {!isLoading && (
- <OptionsList isDashboardFilter={isDashboardFilter}>
- {filteredOptions.map((option) => (
- <OptionContainer key={String(option[0])}>
- <OptionItem
- data-testid={`${option[0]}-filter-value`}
- selectedColor={
- (checkedColor ?? isDashboardFilter)
- ? "var(--mb-color-background_surface-selected)"
- : "var(--mb-color-core-filter)"
- }
- selected={selectedValue === option[0]}
- onClick={() => onClickOption(option[0])}
- onMouseDown={(e) => e.preventDefault()}
- >
- {optionRenderer(option)}
- </OptionItem>
- </OptionContainer>
- ))}
- </OptionsList>
- )}
+ <OptionsList isDashboardFilter={isDashboardFilter}>
+ {filteredOptions.map((option) => (
+ <OptionContainer key={String(option[0])}>
+ <OptionItem
+ data-testid={`${option[0]}-filter-value`}
+ selectedColor={
+ (checkedColor ?? isDashboardFilter)
+ ? "var(--mb-color-background_surface-selected)"
+ : "var(--mb-color-core-filter)"
+ }
+ selected={selectedValue === option[0]}
+ onClick={() => onClickOption(option[0])}
+ onMouseDown={(e) => e.preventDefault()}
+ >
+ {optionRenderer(option)}
+ </OptionItem>
+ </OptionContainer>
+ ))}
+ </OptionsList>
</>
);
};
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts
index a2ec708accc..522ef4e87df 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/types.ts
@@ -10,6 +10,5 @@ export interface SingleSelectListFieldProps {
onSearchChange?: (value: string) => void;
placeholder?: string;
isDashboardFilter?: boolean;
- isLoading?: boolean;
checkedColor?: string;
}
diff --git a/frontend/src/metabase/querying/common/components/FieldValuePicker/FieldValuePicker.tsx b/frontend/src/metabase/querying/common/components/FieldValuePicker/FieldValuePicker.tsx
index 17560928d81..39b5e15eb75 100644
--- a/frontend/src/metabase/querying/common/components/FieldValuePicker/FieldValuePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/FieldValuePicker.tsx
@@ -59,7 +59,7 @@ export function FieldValuePicker({
if (isLoading) {
return (
<Center h="2.5rem">
- <Loader data-testid="loading-indicator" />
+ <Loader />
</Center>
);
}
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.tsx b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.tsx
index 10024917099..19e24ce7aca 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.tsx
@@ -5,12 +5,11 @@ import { useTimeout } from "react-use";
import { c, t } from "ttag";
import EmptyCodeResult from "assets/img/empty-states/code.svg";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { Warnings } from "metabase/common/components/Warnings";
import QueryBuilderS from "metabase/css/query_builder.module.css";
import { useSelector } from "metabase/redux";
import { getWhiteLabeledLoadingMessageFactory } from "metabase/selectors/whitelabel";
-import { Box, Flex, Stack, Text, Title } from "metabase/ui";
+import { Box, Flex, Loader, Stack, Text, Title } from "metabase/ui";
import { isMac } from "metabase/utils/browser";
import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
import * as Lib from "metabase-lib";
@@ -135,7 +134,7 @@ export function VisualizationRunningState({
justify="center"
align="center"
>
- <LoadingSpinner />
+ <Loader size="lg" />
<Title c="core-brand" order={3} mt="lg">
{message}
</Title>
diff --git a/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsx b/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsx
index c221183e33c..49c5be20696 100644
--- a/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsx
+++ b/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsx
@@ -34,7 +34,7 @@ export const SearchFilterPopoverWrapper = ({
if (isLoading) {
return (
<Center p="lg">
- <Loader data-testid="loading-indicator" />
+ <Loader />
</Center>
);
}
diff --git a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsx b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsx
index cb31bbefd7a..f26592c64c6 100644
--- a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsx
+++ b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsx
@@ -2,7 +2,6 @@
import styled from "@emotion/styled";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { color } from "metabase/ui/utils/colors";
export const StatusRoot = styled.div`
@@ -80,13 +79,6 @@ export const StatusCardDescription = styled.div`
margin-top: 0.25rem;
`;
-export const StatusCardSpinner = styled(LoadingSpinner)`
- display: flex;
- align-items: center;
- justify-content: center;
- color: var(--mb-color-core-brand);
-`;
-
interface StatusCardIconContainerProps {
isError?: boolean;
}
diff --git a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx
index d0f7bc1d24d..1cb18095a47 100644
--- a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx
+++ b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx
@@ -2,7 +2,7 @@ import type { PropsWithChildren } from "react";
import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
-import { Ellipsified, Icon } from "metabase/ui";
+import { Ellipsified, Icon, Loader } from "metabase/ui";
import type { IconName } from "metabase-types/api";
import useStatusVisibility from "../../hooks/use-status-visibility";
@@ -14,7 +14,6 @@ import {
StatusCardIcon,
StatusCardIconContainer,
StatusCardRoot,
- StatusCardSpinner,
StatusCardTitle,
StatusHeader,
StatusRoot,
@@ -118,7 +117,7 @@ const StatusCard = ({
</StatusCardTitle>
<StatusCardDescription>{description}</StatusCardDescription>
</StatusCardBody>
- {isInProgress && <StatusCardSpinner size={24} borderWidth={3} />}
+ {isInProgress && <Loader size="md" color="core-brand" />}
{isCompleted && (
<StatusCardIconContainer>
<Icon name="check" size={12} />
diff --git a/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsx b/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsx
index 11fcd285289..cd4dc2ec086 100644
--- a/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsx
+++ b/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsx
@@ -12,6 +12,7 @@ const SIZES: Record<string, string> = {
interface LoaderProps extends MantineLoaderProps {
label?: string;
+ "data-testid"?: string;
}
type CustomLoaderType = React.ComponentType<{ label?: string }> | undefined;
@@ -22,19 +23,32 @@ export const setCustomLoader = (component: CustomLoaderType) => {
CustomLoader = component;
};
-export const Loader = ({ size = "md", label, ...props }: LoaderProps) => {
+export const Loader = ({
+ size = "md",
+ label,
+ "data-testid": dataTestId = "loading-indicator",
+ ...props
+}: LoaderProps) => {
if (CustomLoader) {
return <CustomLoader label={label} />;
}
return label ? (
<Stack justify="center" align="center" gap="sm" mt="xl">
- <MantineLoader {...props} size={getSize(SIZES[size] ?? size)} />
+ <MantineLoader
+ {...props}
+ data-testid={dataTestId}
+ size={getSize(SIZES[size] ?? size)}
+ />
<Text c="text-disabled" size="xl">
{label}
</Text>
</Stack>
) : (
- <MantineLoader {...props} size={getSize(SIZES[size] ?? size)} />
+ <MantineLoader
+ {...props}
+ data-testid={dataTestId}
+ size={getSize(SIZES[size] ?? size)}
+ />
);
};
diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.tsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.tsx
index 55d5fedea60..8f1c815c912 100644
--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.tsx
+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.tsx
@@ -7,13 +7,12 @@ import { jt, t } from "ttag";
import _ from "underscore";
import { Link } from "metabase/common/components/Link";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { connect, useSelector } from "metabase/redux";
import type { State } from "metabase/redux/store";
import { getUserIsAdmin } from "metabase/selectors/user";
-import { Flex, Text } from "metabase/ui";
+import { Flex, Loader, Text } from "metabase/ui";
import MetabaseSettings from "metabase/utils/settings";
import {
HEAT_MAP_ZERO_COLOR,
@@ -348,7 +347,7 @@ function ChoroplethMapInner(props: ChoroplethMapProps) {
if (!geoJson) {
return (
<div className={cx(className, CS.flex, CS.layoutCentered)}>
- <LoadingSpinner />
+ <Loader size="lg" />
</div>
);
}
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx
index dd9db7c2898..6943900d49c 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx
@@ -12,10 +12,9 @@ import {
} from "metabase/api";
import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";
import { NotFound } from "metabase/common/components/ErrorPages";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { useDatabaseListQuery } from "metabase/common/hooks";
import { useDispatch } from "metabase/redux";
-import { Modal } from "metabase/ui";
+import { Loader, Modal } from "metabase/ui";
import * as Lib from "metabase-lib";
import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";
import { isPK } from "metabase-lib/v1/types/utils/isa";
@@ -329,7 +328,7 @@ export function ObjectDetailPanel({
<ObjectDetailContainer wide={hasRelationships} className={className}>
{maybeLoading ? (
<ErrorWrapper>
- <LoadingSpinner />
+ <Loader />
</ErrorWrapper>
) : hasNotFoundError ? (
<ErrorWrapper>
diff --git a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx
index 09be6475571..22a889b706a 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx
@@ -1,8 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
-
export const Root = styled.div`
display: flex;
flex: 1 0 auto;
@@ -27,7 +25,3 @@ export const ShortMessage = styled.span`
export const Duration = styled.span`
white-space: nowrap;
`;
-
-export const StyledLoadingSpinner = styled(LoadingSpinner)`
- color: var(--mb-color-text-secondary);
-`;
diff --git a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
index acda282f6c7..89183330672 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
@@ -1,5 +1,6 @@
import { jt, t } from "ttag";
+import { Loader } from "metabase/ui";
import { duration } from "metabase/utils/formatting";
import type { CardSlownessStatus } from "metabase/visualizations/types";
@@ -8,7 +9,6 @@ import {
Root,
ShortMessage,
SlowQueryMessageContainer,
- StyledLoadingSpinner,
} from "./LoadingView.styled";
export interface LoadingViewProps {
@@ -43,7 +43,7 @@ function LoadingView({ expectedDuration, isSlow }: LoadingViewProps) {
{isSlow ? (
<SlowQueryView expectedDuration={expectedDuration} isSlow={isSlow} />
) : (
- <StyledLoadingSpinner />
+ <Loader size="lg" color="text-secondary" />
)}
</Root>
);
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx
index 4c056cf5d8a..829e12116b5 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx
@@ -1,9 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
-import { color } from "metabase/ui/utils/colors";
-
export const VisualizationRoot = styled.div`
display: flex;
flex-direction: column;
@@ -16,18 +13,7 @@ export const VisualizationHeader = styled.div`
flex-shrink: 0;
`;
-interface VisualizationSlowSpinnerProps {
- isUsuallySlow: boolean;
-}
-
export const VisualizationActionButtonsContainer = styled.span`
display: flex;
align-items: center;
`;
-
-export const VisualizationSlowSpinner = styled(
- LoadingSpinner,
-)<VisualizationSlowSpinnerProps>`
- color: ${(props) =>
- props.isUsuallySlow ? color("accent4") : color("text-secondary")};
-`;
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 9b079bf44f1..502d5697535 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -18,7 +18,6 @@ import { SmallGenericError } from "metabase/common/components/ErrorPages";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import type { ContentTranslationFunction } from "metabase/content-translation/types";
import CS from "metabase/css/core/index.css";
-import DashboardS from "metabase/css/dashboard.module.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { PLUGIN_CUSTOM_VIZ } from "metabase/plugins";
import { VisualizationRunningState } from "metabase/querying/components/QueryVisualization";
@@ -93,7 +92,6 @@ import {
VisualizationActionButtonsContainer,
VisualizationHeader,
VisualizationRoot,
- VisualizationSlowSpinner,
} from "./Visualization.styled";
import { VisualizationRenderedWrapper } from "./VisualizationRenderedWrapper";
import { Watermark } from "./Watermark";
@@ -821,13 +819,6 @@ class Visualization extends PureComponent<
const extra = (
<VisualizationActionButtonsContainer>
- {isSlow && !loading && (
- <VisualizationSlowSpinner
- className={DashboardS.VisualizationSlowSpinner}
- size={18}
- isUsuallySlow={isSlow === "usually-slow"}
- />
- )}
{actionButtons}
</VisualizationActionButtonsContainer>
);