Skip to content

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

Click Actions — migrate from emotion-js (#72329)

Aleksandr Lesnenko2fb687114c0c
diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.ts
index d2d34bc89a8..bea02eea6de 100644
--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.ts
+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.ts
@@ -263,7 +263,10 @@ describe("scenarios > embedding > sdk iframe embed options passthrough", () => {
cy.findByText(/Filter by this value/).should("be.visible");
cy.log("4. clicking on the filter should drill down");
- cy.get('[type="filter"] button').first().click();
+ cy.findByTestId("click-actions-filter-section")
+ .find("button")
+ .first()
+ .click();
cy.findAllByText("29.8").first().should("be.visible");
cy.log("5. should not show a save button");
@@ -303,7 +306,10 @@ describe("scenarios > embedding > sdk iframe embed options passthrough", () => {
cy.findByText(/Filter by this value/).should("be.visible");
cy.log("5. clicking on the filter should drill down");
- cy.get('[type="filter"] button').first().click();
+ cy.findByTestId("click-actions-filter-section")
+ .find("button")
+ .first()
+ .click();
cy.findAllByText("29.8").first().should("be.visible");
cy.log("6. saving should be disabled in drill-throughs");
@@ -338,7 +344,10 @@ describe("scenarios > embedding > sdk iframe embed options passthrough", () => {
cy.log("1. clicking on the filter should drill down");
cy.findAllByText("37.65").first().should("be.visible").click();
cy.findByText(/Filter by this value/).should("be.visible");
- cy.get('[type="filter"] button').first().click();
+ cy.findByTestId("click-actions-filter-section")
+ .find("button")
+ .first()
+ .click();
cy.findAllByText("29.8").first().should("be.visible");
cy.findByTestId("interactive-question-result-toolbar").should(
"be.visible",
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.styled.tsx b/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.styled.tsx
deleted file mode 100644
index 1ced7cf24d4..00000000000
--- a/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.styled.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const PopoverRoot = styled.div`
- padding-top: 1.5rem;
- max-height: 600px;
- overflow-y: auto;
-`;
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx
index ead0150dc5c..367ac4ab2fa 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx
@@ -1,6 +1,7 @@
import { Fragment } from "react";
import { t } from "ttag";
+import { Box } from "metabase/ui";
import ChartSettingsWidget from "metabase/visualizations/components/ChartSettingsWidget";
import { updateSettings } from "metabase/visualizations/lib/settings";
import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";
@@ -12,8 +13,6 @@ import * as Lib from "metabase-lib";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import type { VisualizationSettings } from "metabase-types/api";
-import { PopoverRoot } from "./ColumnFormattingAction.styled";
-
export const POPOVER_TEST_ID = "column-formatting-settings";
export const ColumnFormattingAction: LegacyDrill = ({ question, clicked }) => {
@@ -68,7 +67,7 @@ export const ColumnFormattingAction: LegacyDrill = ({ question, clicked }) => {
}
return (
- <PopoverRoot>
+ <Box pt="lg" mah={600} style={{ overflowY: "auto" }}>
<ChartSettingsWidget
{...extraProps}
id={id}
@@ -76,7 +75,7 @@ export const ColumnFormattingAction: LegacyDrill = ({ question, clicked }) => {
hidden={false}
dataTestId={POPOVER_TEST_ID}
/>
- </PopoverRoot>
+ </Box>
);
};
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
index 2639105697c..bb93bd14930 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
@@ -3,10 +3,6 @@
color: var(--mb-color-text-primary-inverse);
background-color: var(--mb-color-brand);
- .subtitle {
- color: var(--mb-color-text-primary-inverse);
- }
-
.clickActionButtonIcon,
.clickActionButtonTextIcon {
color: var(--mb-color-text-primary-inverse);
@@ -44,16 +40,3 @@
font-weight: 700;
font-size: 1.25rem;
}
-
-.infoControl {
- color: var(--mb-color-text-primary);
- font-weight: bold;
- line-height: 1.5rem;
- max-width: 10.75rem;
-}
-
-.subtitle {
- color: var(--mb-color-text-tertiary);
- font-weight: normal;
- margin-left: 1rem;
-}
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
index 1078fb7c7d9..eaf26a0d88e 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
@@ -1,5 +1,5 @@
import { useDispatch } from "metabase/redux";
-import { Box, Button, Icon, Tooltip } from "metabase/ui";
+import { Box, Button, Icon, Text, Tooltip } from "metabase/ui";
import {
type ClickAction,
isCustomClickAction,
@@ -143,6 +143,10 @@ export const ClickActionControl = ({
);
case "info":
- return <Box className={S.infoControl}>{action.title}</Box>;
+ return (
+ <Text c="text-primary" fw="bold" lh="1.5rem" maw="10.75rem">
+ {action.title}
+ </Text>
+ );
}
};
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.styled.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.styled.tsx
deleted file mode 100644
index e339dc5b4a1..00000000000
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.styled.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const Container = styled.div`
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
- padding: 1rem 1.5rem 1rem;
- font-weight: 700;
-`;
-
-export const Divider = styled.div`
- height: 1px;
- background-color: var(--mb-color-border);
- margin: 0.5rem -1.5rem 0.5rem;
-`;
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsView.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsView.tsx
index 6aad6eeb6cb..7a964482948 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsView.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsView.tsx
@@ -1,10 +1,10 @@
import type { HTMLAttributes } from "react";
+import { Divider, Stack } from "metabase/ui";
import { trackClickActionPerformed } from "metabase/visualizations/analytics";
import type { RegularClickAction } from "metabase/visualizations/types";
import { ClickActionControl } from "./ClickActionControl";
-import { Container, Divider } from "./ClickActionsPopover.styled";
import { ClickActionsViewSection } from "./ClickActionsViewSection";
import {
getGroupedAndSortedActions,
@@ -29,7 +29,14 @@ export const ClickActionsView = ({
const hasOnlyOneSection = sections.length === 1;
return (
- <Container data-testid="click-actions-view" {...divProps}>
+ <Stack
+ data-testid="click-actions-view"
+ gap="sm"
+ px="lg"
+ py="md"
+ fw={700}
+ {...divProps}
+ >
{sections.map(([sectionKey, actions]) => {
const sectionTitle = getSectionTitle(sectionKey, actions);
const contentDirection = getSectionContentDirection(
@@ -47,7 +54,7 @@ export const ClickActionsView = ({
title={sectionTitle}
contentDirection={contentDirection}
>
- {withTopDivider && <Divider />}
+ {withTopDivider && <Divider mx="-lg" my="sm" />}
{actions.map((action) => (
<ClickActionControl
key={action.name}
@@ -59,10 +66,10 @@ export const ClickActionsView = ({
}}
/>
))}
- {withBottomDivider && <Divider />}
+ {withBottomDivider && <Divider mx="-lg" my="sm" />}
</ClickActionsViewSection>
);
})}
- </Container>
+ </Stack>
);
};
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.styled.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.styled.tsx
deleted file mode 100644
index 2581c4a2a27..00000000000
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.styled.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { css } from "@emotion/react";
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import type { ContentDirectionType } from "./utils";
-
-export const Section = styled.div<{
- type: string;
- direction?: ContentDirectionType;
-}>`
- display: flex;
- ${({ type, direction }) =>
- type === "sort" &&
- direction === "row" &&
- css`
- margin: 0 0 0.5rem -0.5rem;
- `}
- ${({ direction }) =>
- direction === "row"
- ? css`
- flex-direction: row;
- `
- : css`
- flex-direction: column;
- align-items: stretch;
- `}
- gap: 0.5rem;
-`;
-
-export const SectionWithTitle = styled.div<{
- childrenDirection?: ContentDirectionType;
-}>`
- display: flex;
- flex-direction: column;
- align-items: stretch;
- gap: ${({ childrenDirection }) =>
- childrenDirection === "row" ? `0.75rem` : `1rem`};
- margin: ${({ childrenDirection }) =>
- childrenDirection === "row" ? `0.5rem 0` : `0.5rem 0 0`};
-`;
-
-export const SectionTitle = styled.p`
- margin: 0;
- font-size: 0.875em;
- color: var(--mb-color-text-secondary);
-`;
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.tsx
index 3b0ff3b2be0..c727c44e8e7 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.tsx
@@ -1,8 +1,5 @@
-import {
- Section,
- SectionTitle,
- SectionWithTitle,
-} from "./ClickActionsViewSection.styled";
+import { Flex, Stack, Text, rem } from "metabase/ui";
+
import type { ContentDirectionType } from "./utils";
interface Props {
@@ -20,20 +17,31 @@ export const ClickActionsViewSection = ({
contentDirection = "column",
children,
}: Props): JSX.Element => {
+ const isRow = contentDirection === "row";
+ const isSortRow = type === "sort" && isRow;
+
+ const sectionContent = (
+ <Flex
+ data-testid={`click-actions-${type}-section`}
+ direction={contentDirection}
+ gap="sm"
+ mb={isSortRow ? "sm" : undefined}
+ ml={isSortRow ? "-sm" : undefined}
+ >
+ {children}
+ </Flex>
+ );
+
if (title) {
return (
- <SectionWithTitle childrenDirection={contentDirection}>
- <SectionTitle>{title}</SectionTitle>
- <Section type={type} direction={contentDirection}>
- {children}
- </Section>
- </SectionWithTitle>
+ <Stack gap={isRow ? rem(12) : "md"} mt="sm" mb={isRow ? "sm" : undefined}>
+ <Text size="sm" c="text-secondary">
+ {title}
+ </Text>
+ {sectionContent}
+ </Stack>
);
}
- return (
- <Section type={type} direction={contentDirection}>
- {children}
- </Section>
- );
+ return sectionContent;
};