Skip to content

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

Migrate the Visualization container off Emotion (#83171)

Andrei Chernykh3c2efcc776cf
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/QuestionMoreActionsMenu.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/QuestionMoreActionsMenu.unit.spec.tsx
index f4aff5555b8..462df79155a 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/QuestionMoreActionsMenu.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/QuestionMoreActionsMenu.unit.spec.tsx
@@ -16,7 +16,7 @@ describe("QuestionMoreActionsMenu >", () => {
isEnterprise: false,
});
await openMenu();
- expect(screen.getByText("Create an alert")).toBeInTheDocument();
+ expect(await screen.findByText("Create an alert")).toBeInTheDocument();
});
it("should show the 'Edit alerts' menu item if alerts exist", async () => {
@@ -40,7 +40,7 @@ describe("QuestionMoreActionsMenu >", () => {
isEnterprise: false,
});
await openMenu();
- await userEvent.click(screen.getByText("Edit alerts"));
+ await userEvent.click(await screen.findByText("Edit alerts"));
expect(await screen.findByTestId("alert-list-modal")).toBeInTheDocument();
});
});
@@ -56,7 +56,7 @@ describe("QuestionMoreActionsMenu >", () => {
isEnterprise: false,
});
await openMenu();
- expect(screen.getByText("Create an alert")).toBeInTheDocument();
+ expect(await screen.findByText("Create an alert")).toBeInTheDocument();
});
it("should show the 'Edit alerts' menu item if alerts exist", async () => {
@@ -68,7 +68,7 @@ describe("QuestionMoreActionsMenu >", () => {
isEnterprise: false,
});
await openMenu();
- expect(screen.getByText("Edit alerts")).toBeInTheDocument();
+ expect(await screen.findByText("Edit alerts")).toBeInTheDocument();
});
it("clicking to edit alerts should open the alert popover", async () => {
@@ -80,7 +80,7 @@ describe("QuestionMoreActionsMenu >", () => {
isEnterprise: false,
});
await openMenu();
- await userEvent.click(screen.getByText("Edit alerts"));
+ await userEvent.click(await screen.findByText("Edit alerts"));
expect(await screen.findByTestId("alert-list-modal")).toBeInTheDocument();
});
});
diff --git a/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.styled.tsx
deleted file mode 100644
index 30042fb8eb4..00000000000
--- a/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.styled.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Icon } from "metabase/ui";
-import { color } from "metabase/ui/utils/colors";
-
-export const Root = styled.div<{ isDashboard?: boolean }>`
- display: flex;
- flex: 1 0 auto;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- text-align: center;
- padding-left: 0.5rem;
- padding-right: 0.5rem;
- padding-bottom: 0.5rem;
- color: ${({ isDashboard }) =>
- isDashboard ? color("text-secondary") : color("text-disabled")};
-`;
-
-export const StyledIcon = styled(Icon)`
- margin-bottom: 1rem;
-`;
-
-export const ShortMessage = styled.span`
- font-weight: bold;
- font-size: 1.12em;
-`;
diff --git a/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.tsx b/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.tsx
index ba3e6953b70..29c63809e0e 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.tsx
@@ -1,9 +1,9 @@
import { type ReactNode, forwardRef } from "react";
-import { Tooltip } from "metabase/ui";
+import { Box, Icon, Tooltip } from "metabase/ui";
import type { IconName } from "metabase-types/api";
-import { Root, ShortMessage, StyledIcon } from "./ErrorView.styled";
+import { StateView } from "../StateView";
interface ErrorViewProps {
error: ReactNode;
@@ -15,12 +15,16 @@ interface ErrorViewProps {
export const ErrorView = forwardRef<HTMLDivElement, ErrorViewProps>(
function ErrorView({ error, icon = "warning", isDashboard, isSmall }, ref) {
return (
- <Root ref={ref} isDashboard={isDashboard}>
+ <StateView ref={ref} c={isDashboard ? "text-secondary" : "text-disabled"}>
<Tooltip label={error} disabled={!isSmall}>
- <StyledIcon name={icon} size={50} />
+ <Icon name={icon} size={50} mb="lg" />
</Tooltip>
- {!isSmall && <ShortMessage>{error}</ShortMessage>}
- </Root>
+ {!isSmall && (
+ <Box component="span" fw="bold" fz="1.12em">
+ {error}
+ </Box>
+ )}
+ </StateView>
);
},
);
diff --git a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx
deleted file mode 100644
index 22a889b706a..00000000000
--- a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const Root = styled.div`
- display: flex;
- flex: 1 0 auto;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- text-align: center;
- padding: 0.5rem;
- color: var(--mb-color-core-brand);
-`;
-
-export const SlowQueryMessageContainer = styled.div`
- color: var(--mb-color-text-secondary);
-`;
-
-export const ShortMessage = styled.span`
- font-weight: bold;
- font-size: 1.12em;
- margin-bottom: 0.5rem;
-`;
-
-export const Duration = styled.span`
- white-space: nowrap;
-`;
diff --git a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
index 89183330672..706fd1c0e75 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
@@ -1,15 +1,11 @@
import { jt, t } from "ttag";
-import { Loader } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { Box, Loader } from "metabase/ui";
import { duration } from "metabase/utils/formatting";
import type { CardSlownessStatus } from "metabase/visualizations/types";
-import {
- Duration,
- Root,
- ShortMessage,
- SlowQueryMessageContainer,
-} from "./LoadingView.styled";
+import { StateView } from "../StateView";
export interface LoadingViewProps {
isSlow: CardSlownessStatus | undefined;
@@ -18,14 +14,16 @@ export interface LoadingViewProps {
function SlowQueryView({ expectedDuration, isSlow }: LoadingViewProps) {
return (
- <SlowQueryMessageContainer>
- <ShortMessage>{t`Still Waiting…`}</ShortMessage>
+ <Box c="text-secondary">
+ <Box component="span" fw="bold" fz="1.12em">
+ {t`Still Waiting…`}
+ </Box>
{isSlow === "usually-slow" ? (
<div>
{jt`This usually takes an average of ${(
- <Duration key="duration">
+ <span key="duration" className={CS.textNoWrap}>
{duration(expectedDuration ?? 0)}
- </Duration>
+ </span>
)}, but is currently taking longer.`}
</div>
) : (
@@ -33,19 +31,19 @@ function SlowQueryView({ expectedDuration, isSlow }: LoadingViewProps) {
{t`This usually loads immediately, but is currently taking longer.`}
</div>
)}
- </SlowQueryMessageContainer>
+ </Box>
);
}
function LoadingView({ expectedDuration, isSlow }: LoadingViewProps) {
return (
- <Root>
+ <StateView pt="sm" c="core-brand">
{isSlow ? (
<SlowQueryView expectedDuration={expectedDuration} isSlow={isSlow} />
) : (
<Loader size="lg" color="text-secondary" />
)}
- </Root>
+ </StateView>
);
}
diff --git a/frontend/src/metabase/visualizations/components/Visualization/NoResultsView/NoResultsView.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/NoResultsView/NoResultsView.styled.tsx
deleted file mode 100644
index d5fc189c69d..00000000000
--- a/frontend/src/metabase/visualizations/components/Visualization/NoResultsView/NoResultsView.styled.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const Root = styled.div`
- display: flex;
- flex: 1 0 auto;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- text-align: center;
- padding-left: 0.5rem;
- padding-right: 0.5rem;
- padding-bottom: 0.5rem;
- color: var(--mb-color-text-disabled);
-`;
-
-export const ShortMessage = styled.span`
- font-weight: bold;
- font-size: 1.12em;
-`;
diff --git a/frontend/src/metabase/visualizations/components/Visualization/NoResultsView/NoResultsView.tsx b/frontend/src/metabase/visualizations/components/Visualization/NoResultsView/NoResultsView.tsx
index 9266868520c..9a568c77474 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/NoResultsView/NoResultsView.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/NoResultsView/NoResultsView.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { NoDataError } from "metabase/common/components/errors/NoDataError";
-import { Tooltip } from "metabase/ui";
+import { Box, Tooltip } from "metabase/ui";
-import { Root, ShortMessage } from "./NoResultsView.styled";
+import { StateView } from "../StateView";
interface NoResultsViewProps {
isSmall?: boolean;
@@ -11,14 +11,18 @@ interface NoResultsViewProps {
function NoResultsView({ isSmall }: NoResultsViewProps) {
return (
- <Root>
+ <StateView c="text-disabled">
<Tooltip label={t`No results`} disabled={!isSmall}>
<span>
<NoDataError data-testid="no-results-image" mb="1rem" />
</span>
</Tooltip>
- {!isSmall && <ShortMessage>{t`No results`}</ShortMessage>}
- </Root>
+ {!isSmall && (
+ <Box component="span" fw="bold" fz="1.12em">
+ {t`No results`}
+ </Box>
+ )}
+ </StateView>
);
}
diff --git a/frontend/src/metabase/visualizations/components/Visualization/StateView.tsx b/frontend/src/metabase/visualizations/components/Visualization/StateView.tsx
new file mode 100644
index 00000000000..805394909f7
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/Visualization/StateView.tsx
@@ -0,0 +1,22 @@
+import { forwardRef } from "react";
+
+import { Stack, type StackProps } from "metabase/ui";
+
+/** Centered container shared by the loading, error, and no-results views. */
+export const StateView = forwardRef<HTMLDivElement, StackProps>(
+ function StateView(props, ref) {
+ return (
+ <Stack
+ ref={ref}
+ gap={0}
+ align="center"
+ justify="center"
+ flex="1 0 auto"
+ ta="center"
+ px="sm"
+ pb="sm"
+ {...props}
+ />
+ );
+ },
+);
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx
deleted file mode 100644
index 0ae4b6a527b..00000000000
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const VisualizationRoot = styled.div`
- display: flex;
- flex-direction: column;
- height: 100%;
-`;
-
-export const VisualizationHeader = styled.div`
- padding: 0.625rem 0.5rem 0.375rem 0.5rem;
- flex-shrink: 0;
-`;
-
-export const VisualizationActionButtonsContainer = styled.span`
- display: flex;
- align-items: center;
-`;
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 11e7d94675a..1b46d779ec5 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -28,7 +28,7 @@ import type { Dispatch, State } from "metabase/redux/store";
import type { Path } from "metabase/router";
import { getTokenFeature } from "metabase/settings";
import { getFont } from "metabase/styled-components/selectors";
-import type { IconProps } from "metabase/ui";
+import { Box, Flex, type IconProps, Stack } from "metabase/ui";
import { isQuestionCard } from "metabase/utils/dashboard";
import { formatNumber } from "metabase/utils/formatting";
import { memoize } from "metabase/utils/memoize";
@@ -83,11 +83,6 @@ import { ErrorView } from "./ErrorView";
import LoadingView, { type LoadingViewProps } from "./LoadingView";
import { DashCardLoadingView } from "./LoadingView/DashCardLoadingView";
import NoResultsView from "./NoResultsView";
-import {
- VisualizationActionButtonsContainer,
- VisualizationHeader,
- VisualizationRoot,
-} from "./Visualization.styled";
import { VisualizationRenderedWrapper } from "./VisualizationRenderedWrapper";
import { VisualizationRunningState } from "./VisualizationRunningState";
import { Watermark } from "./Watermark";
@@ -789,9 +784,9 @@ class Visualization extends PureComponent<
}
const extra = (
- <VisualizationActionButtonsContainer>
+ <Flex component="span" align="center">
{actionButtons}
- </VisualizationActionButtonsContainer>
+ </Flex>
);
let { gridSize, gridUnit } = this.props;
@@ -839,9 +834,11 @@ class Visualization extends PureComponent<
onError={this.onErrorBoundaryError}
ref={this.props.forwardedRef}
>
- <VisualizationRoot
- className={className}
+ <Stack
+ // A class, not h="100%": callers override the height through style
+ className={cx(CS.fullHeight, className)}
style={style}
+ gap={0}
data-testid="visualization-root"
// `getUiName` should be defined (and is a required field on the TS type), but because we have javascript
// files about visualizations, it's best if we don't risk crashing the app, hence the `?.()`
@@ -849,7 +846,7 @@ class Visualization extends PureComponent<
ref={this.props.forwardedRef}
>
{!!hasHeader && (
- <VisualizationHeader>
+ <Box pt="0.625rem" px="sm" pb="xs" flex="0 0 auto">
<ChartCaption
series={series}
visualizerRawSeries={visualizerRawSeries}
@@ -864,7 +861,7 @@ class Visualization extends PureComponent<
canSelectTitle ? this.handleOnChangeCardAndRun : null
}
/>
- </VisualizationHeader>
+ </Box>
)}
{replacementContent ? (
replacementContent
@@ -1023,7 +1020,7 @@ class Visualization extends PureComponent<
onUpdateVisualizationSettings={onUpdateVisualizationSettings}
/>
)}
- </VisualizationRoot>
+ </Stack>
</ErrorBoundary>
);
}