Skip to content

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

add new variants to action icon and use it in Inspector Header cell (#70180)

Jakub Chodorowicz451f080ede4e
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/JoinAnalysisSection.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/JoinAnalysisSection.tsx
index 7f8ff7ebeaf..94536416c2e 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/JoinAnalysisSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/JoinAnalysisSection.tsx
@@ -92,6 +92,7 @@ export const JoinAnalysisSection = ({ cards }: JoinAnalysisSectionProps) => {
card={row.original.card}
severity={row.original.severity}
transformId={transform.id}
+ isExpanded={row.getIsExpanded()}
onToggleAlerts={() => row.toggleExpanded()}
/>
),
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx
index d3a2b843637..85a0d701a7f 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx
@@ -15,6 +15,7 @@ type JoinHeaderCellProps = {
severity: InspectorAlertTrigger["severity"] | null;
transformId: TransformId;
onToggleAlerts?: () => void;
+ isExpanded: boolean;
};
export const JoinHeaderCell = ({
@@ -22,20 +23,22 @@ export const JoinHeaderCell = ({
severity,
transformId,
onToggleAlerts,
+ isExpanded,
}: JoinHeaderCellProps) => {
useLensCardLoader({ card });
if (!severity) {
return null;
}
+
return (
<ActionIcon
- variant="transparent"
- color={match(severity)
+ variant={match(severity)
.with("error", () => "error" as const)
.with("warning", () => "warning" as const)
- .with("info", () => "brand" as const)
- .exhaustive()}
+ .with("info", () => "info" as const)
+ .otherwise(() => "subtle" as const)}
size="lg"
+ data-is-active={isExpanded}
onClick={(e) => {
e.stopPropagation();
trackTransformInspectAlertClicked({ transformId, cardId: card.id });
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionButton.stories.tsx b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionButton.stories.tsx
index a25fad538de..0f9535c80d1 100644
--- a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionButton.stories.tsx
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionButton.stories.tsx
@@ -9,8 +9,8 @@ export default {
color: {
control: {
type: "select",
- options: ["brand"],
},
+ options: ["brand"],
},
disabled: {
control: {
@@ -20,14 +20,22 @@ export default {
size: {
control: {
type: "select",
- options: ["xs", "sm", "md", "lg", "xl"],
},
+ options: ["xs", "sm", "md", "lg", "xl"],
},
variant: {
control: {
type: "select",
- options: ["filled", "subtle", "viewFooter", "viewHeader"],
},
+ options: [
+ "filled",
+ "subtle",
+ "viewFooter",
+ "viewHeader",
+ "info",
+ "warning",
+ "error",
+ ],
},
},
};
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css
index 69b2490ce75..2ea7afa6021 100644
--- a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css
@@ -13,6 +13,41 @@
}
}
+ /* To be able to seamlessly support color property across variants we need
+ to implement variantColorResolver. Same thing is pointed out in Button component. */
+ &[data-variant="info"] {
+ color: var(--mb-color-brand);
+ background-color: transparent;
+
+ &:hover,
+ &:active,
+ &[data-is-active="true"] {
+ background-color: var(--mb-color-background-brand);
+ }
+ }
+
+ &[data-variant="warning"] {
+ color: var(--mb-color-warning);
+ background-color: transparent;
+
+ &:hover,
+ &:active,
+ &[data-is-active="true"] {
+ background-color: var(--mb-color-background-warning);
+ }
+ }
+
+ &[data-variant="error"] {
+ color: var(--mb-color-error);
+ background-color: transparent;
+
+ &:hover,
+ &:active,
+ &[data-is-active="true"] {
+ background-color: var(--mb-color-background-error);
+ }
+ }
+
&[data-variant="viewHeader"] {
color: var(--mb-color-text-primary);
background-color: transparent;