The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
GDGT-3404: Dashboard action button without an assigned action: wrong height and always gray (#85104)
Anna Tomka96fa8e8323cc
diff --git a/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js b/e2e/test/scenarios/actions/actions-reproductions.cy.spec.jsindex 3c5ca67f00c..8b985971f24 100644--- a/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js+++ b/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js@@ -552,5 +552,6 @@ function assertActionButtonFitsDashcard() {.getBoundingClientRect();expect(button.bottom).to.be.at.most(dashcard.bottom + 0.5);expect(button.top).to.be.at.least(dashcard.top - 0.5);+ expect(button.height).to.be.closeTo(dashcard.height, 1);});}diff --git a/frontend/src/metabase/actions/utils.ts b/frontend/src/metabase/actions/utils.tsindex 7c389f9794d..4052c4d7f9d 100644--- a/frontend/src/metabase/actions/utils.ts+++ b/frontend/src/metabase/actions/utils.ts@@ -10,6 +10,7 @@ import type Field from "metabase-lib/v1/metadata/Field";import { TYPE } from "metabase-lib/v1/types/constants";import type {ActionDashboardCard,+ ActionDisplayType,ActionFormOption,ActionFormSettings,BaseDashboardCard,@@ -169,6 +170,18 @@ export function isActionDashCard(export const isActionCard = (card?: Card | VirtualCard) =>card?.display === "action";+/**+ * How an action dashcard is shown: the given `actionDisplayType` (from the+ * dashcard's visualization settings), else the action's own setting, else a+ * button.+ */+export function getActionDisplayType(+ actionDisplayType: ActionDisplayType | undefined,+ action: Pick<WritebackAction, "visualization_settings"> | undefined,+): ActionDisplayType {+ return actionDisplayType ?? action?.visualization_settings?.type ?? "button";+}+export const getFormTitle = (action: WritebackAction): string => {return action.visualization_settings?.name || action.name || t`Action form`;};diff --git a/frontend/src/metabase/actions/utils.unit.spec.ts b/frontend/src/metabase/actions/utils.unit.spec.tsindex 380c0414dbc..f96cf293b7c 100644--- a/frontend/src/metabase/actions/utils.unit.spec.ts+++ b/frontend/src/metabase/actions/utils.unit.spec.ts@@ -5,6 +5,7 @@ import {import { createSampleDatabase } from "metabase-types/api/mocks/presets";import {+ getActionDisplayType,getActionItems,getDefaultFieldSettings,getDefaultFormSettings,@@ -195,3 +196,26 @@ describe("isValidImplicitUpdateAction", () => {).toBe(false);});});++describe("getActionDisplayType", () => {+ it("uses the given display type first", () => {+ expect(+ getActionDisplayType("button", {+ visualization_settings: { type: "form" },+ }),+ ).toBe("button");+ });++ it("falls back to the action's display type", () => {+ expect(+ getActionDisplayType(undefined, {+ visualization_settings: { type: "form" },+ }),+ ).toBe("form");+ });++ it("defaults to a button when neither sets it", () => {+ expect(getActionDisplayType(undefined, undefined)).toBe("button");+ expect(getActionDisplayType(undefined, {})).toBe("button");+ });+});diff --git a/frontend/src/metabase/dashboard/components/ActionViz/Action.tsx b/frontend/src/metabase/dashboard/components/ActionViz/Action.tsxindex 1e5ce5ed2ed..45c3a60eefc 100644--- a/frontend/src/metabase/dashboard/components/ActionViz/Action.tsx+++ b/frontend/src/metabase/dashboard/components/ActionViz/Action.tsx@@ -1,6 +1,7 @@import { useCallback, useMemo } from "react";import { t } from "ttag";+import { getActionDisplayType } from "metabase/actions/utils";import { skipToken, useGetCardQuery } from "metabase/api";import {executeRowAction,@@ -63,9 +64,10 @@ const ActionComponent = ({);const model = useQuestionFromCard(card);- const actionSettings = dashcard.action?.visualization_settings;- const actionDisplayType =- settings?.actionDisplayType ?? actionSettings?.type ?? "button";+ const actionDisplayType = getActionDisplayType(+ settings?.actionDisplayType,+ dashcard.action,+ );const dashcardParamValues = useMemo(() => getDashcardParamValues(dashcard, parameterValues),@@ -169,6 +171,7 @@ function ActionFn(props: ActionProps) {icon="bolt"tooltip={tooltip}settings={props.settings}+ isFullHeight={!props.isSettings}focus={props.isEditingDashcard}/></Box>diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.module.css b/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.module.cssindex 2be596ad2ff..08284330370 100644--- a/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.module.css+++ b/frontend/src/metabase/dashboard/components/ActionViz/ActionButton.module.css@@ -1,8 +1,15 @@-.actionButton {- &[data-variant]:disabled,- &[data-variant][data-disabled="true"] {+/* Doubled selector so these overrides beat the disabled rule in+ Button.module.css regardless of bundle order. */+.actionButton.actionButton {+ &[data-variant]:disabled:not([data-loading]),+ &[data-variant][data-disabled="true"]:not([data-loading]) {opacity: 0.5;color: var(--button-color);background-color: var(--button-bg);}++ &[data-variant="default"]:disabled:not([data-loading]),+ &[data-variant="default"][data-disabled="true"]:not([data-loading]) {+ border-color: var(--mb-color-border-neutral-strong);+ }}diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex c533f5ab0ce..7b56bebbc26 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -3,6 +3,7 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import _ from "underscore";+import { getActionDisplayType, isActionDashCard } from "metabase/actions/utils";import { getMetricSeriesWithDefaultDisplay } from "metabase/common/utils/card";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/content-translation/plugins";import CS from "metabase/css/core/index.css";@@ -631,6 +632,15 @@ export function DashCardVisualization({<DashCardLoadingView {...loadingViewProps} display={question?.display()} />);+ // An action button fills its borderless card and has its own rounded outline,+ // so clipping it to the card's radius would cut its corners off.+ const isActionButton =+ isActionDashCard(dashcard) &&+ getActionDisplayType(+ dashcard.visualization_settings.actionDisplayType,+ dashcard.action,+ ) === "button";+return (<divclassName={cx(S.VisualizationContainer, CS.flexFull, CS.fullHeight, {@@ -642,7 +652,7 @@ export function DashCardVisualization({<VisualizationclassName={cx(S.Visualization, CS.flexFull, {[CS.overflowAuto]: visualizationOverlay,- [CS.overflowHidden]: !visualizationOverlay,+ [CS.overflowHidden]: !visualizationOverlay && !isActionButton,})}dashboard={dashboard ?? undefined}dashcard={dashcard}diff --git a/frontend/src/metabase/dashboard/components/grid/utils.ts b/frontend/src/metabase/dashboard/components/grid/utils.tsindex 9d2c4766872..0c202d3ff65 100644--- a/frontend/src/metabase/dashboard/components/grid/utils.ts+++ b/frontend/src/metabase/dashboard/components/grid/utils.ts@@ -1,6 +1,6 @@import _ from "underscore";-import { isActionDashCard } from "metabase/actions/utils";+import { getActionDisplayType, isActionDashCard } from "metabase/actions/utils";import { getMobileHeight } from "metabase/viz-core";import type { BaseDashboardCard } from "metabase-types/api";@@ -26,8 +26,10 @@ export function generateMobileLayout(desktopLayout: DashcardLayout[]) {// An action shown as a form needs its rows, unlike an action buttonconst isActionForm =isActionDashCard(dashcard) &&- (dashcard.visualization_settings.actionDisplayType ??- dashcard.action?.visualization_settings?.type) === "form";+ getActionDisplayType(+ dashcard.visualization_settings.actionDisplayType,+ dashcard.action,+ ) === "form";mobile.push({...item,