Skip to content

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

Move the drill layer from visualizations into querying (#79500)

Fraser8e3b90894eaf
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsx
index 06403297f5f..655d73e1821 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsx
@@ -108,7 +108,8 @@ export const QuestionVisualization = ({
isNativeEditorOpen={false}
result={result}
noHeader
- mode={mode ?? undefined}
+ mode={mode}
+ hasColumnReordering
navigateToNewCardInsideQB={navigateToNewCard ?? undefined}
onNavigateBack={onNavigateBack}
onUpdateQuestion={(question: Question) =>
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/SdkQuestionProvider.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/SdkQuestionProvider.tsx
index 704bd227cff..e74e536ae7b 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/SdkQuestionProvider.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/SdkQuestionProvider.tsx
@@ -21,6 +21,7 @@ import { useSetupContentTranslations } from "embedding-sdk-bundle/hooks/private/
import { useWarnConflictingParameterProps } from "embedding-sdk-bundle/hooks/private/use-warn-conflicting-parameter-props";
import { getEffectiveParameterValues } from "embedding-sdk-bundle/lib/controlled-parameters";
import { EmbeddingSdkMode } from "embedding-sdk-bundle/lib/modes/EmbeddingSdkMode";
+import { getEmbeddingMode } from "embedding-sdk-bundle/lib/modes/getEmbeddingMode";
import { useSdkDispatch, useSdkSelector } from "embedding-sdk-bundle/store";
import {
clearGuestToken,
@@ -44,8 +45,6 @@ import {
} from "metabase/query_builder";
import { useSaveQuestion } from "metabase/query_builder";
import { EmbeddingDataPickerContextProvider } from "metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/context";
-import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
-import type { ClickActionModeGetter } from "metabase/visualizations/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
@@ -89,7 +88,7 @@ export const SdkQuestionProvider = ({
withAlerts,
targetDashboardId,
backToDashboard,
- getClickActionMode: userGetClickActionMode,
+ clickActionMode: userClickActionMode,
navigateToNewCard: userNavigateToNewCard,
onDrillThrough,
onVisualizationChange,
@@ -237,21 +236,16 @@ export const SdkQuestionProvider = ({
return { ...globalPlugins, ...componentPlugins };
}, [globalPlugins, componentPlugins]);
- const getClickActionMode: ClickActionModeGetter =
- userGetClickActionMode ??
- (({ question }: { question: Question }) => {
- return (
- question &&
- getEmbeddingMode({
- question,
- queryMode: EmbeddingSdkMode,
- // Unjustified type cast. FIXME
- plugins: plugins as InternalMetabasePluginsConfig,
- })
- );
- });
-
- const mode = (question && getClickActionMode({ question })) ?? null;
+ const mode = useMemo(
+ () =>
+ userClickActionMode ??
+ getEmbeddingMode({
+ queryMode: EmbeddingSdkMode,
+ // Unjustified type cast. FIXME
+ plugins: plugins as InternalMetabasePluginsConfig,
+ }),
+ [userClickActionMode, plugins],
+ );
// Wrap navigateToNewCard to intercept navigation to new card
const navigateToNewCardWithDrillThrough = useCallback(
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts
index 6daab95d20b..3184c53c151 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts
@@ -15,11 +15,7 @@ import type {
EmbeddingDataPicker,
EmbeddingEntityType,
} from "metabase/redux/store/embedding-data-picker";
-import type {
- ClickActionModeGetter,
- ClickActionsMode,
- QueryClickActionsMode,
-} from "metabase/visualizations/types";
+import type { ClickActionsMode } from "metabase/visualizations/types";
import type Question from "metabase-lib/v1/Question";
import type {
CardDisplayType,
@@ -184,7 +180,7 @@ export type SdkQuestionProviderProps = PropsWithChildren<
/**
* @internal
*/
- getClickActionMode?: ClickActionModeGetter | undefined;
+ clickActionMode?: ClickActionsMode | undefined;
/**
* @internal
@@ -226,7 +222,7 @@ export type SdkQuestionContextType = Omit<
| "onVisualizationChange"
> & {
plugins: SdkQuestionConfig["componentPlugins"] | null;
- mode: QueryClickActionsMode | ClickActionsMode | null | undefined;
+ mode: ClickActionsMode;
originalId: SdkQuestionId | null;
token: EntityToken | null | undefined;
lastVisibleStageIndex: number;
diff --git a/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.tsx b/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.tsx
index 7a0400eedba..3c234145b20 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.tsx
@@ -47,7 +47,7 @@ export type InteractiveQuestionBaseProps = Omit<
SdkQuestionProps,
| "token"
| "questionId"
- | "getClickActionMode"
+ | "clickActionMode"
| "navigateToNewCard"
| "backToDashboard"
>;
diff --git a/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.tsx b/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.tsx
index d1fa87a4c7e..8d39f201992 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.tsx
@@ -151,7 +151,7 @@ export const _SdkQuestion = ({
withAlerts = false,
targetDashboardId,
backToDashboard,
- getClickActionMode,
+ clickActionMode,
navigateToNewCard,
onDrillThrough,
@@ -214,7 +214,7 @@ export const _SdkQuestion = ({
withAlerts={withAlerts}
targetDashboardId={targetDashboardId}
backToDashboard={backToDashboard}
- getClickActionMode={getClickActionMode}
+ clickActionMode={clickActionMode}
navigateToNewCard={navigateToNewCard}
onDrillThrough={onDrillThrough}
onVisualizationChange={onVisualizationChange}
diff --git a/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx b/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx
index a4a14de56d3..cf7bfad1c32 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx
@@ -33,6 +33,7 @@ import { QuestionAlertsButton } from "embedding-sdk-bundle/components/public/not
import { useMobileLayout } from "embedding-sdk-bundle/hooks/private/use-mobile-layout";
import { useNormalizeGuestEmbedQuestionOrDashboardComponentProps } from "embedding-sdk-bundle/hooks/private/use-normalize-guest-embed-question-or-dashboard-component-props";
import { EmbeddingSdkStaticMode } from "embedding-sdk-bundle/lib/modes/EmbeddingSdkStaticMode";
+import { getEmbeddingMode } from "embedding-sdk-bundle/lib/modes/getEmbeddingMode";
import { resolveDeserializedCard } from "embedding-sdk-bundle/lib/sdk-question/resolve-deserialized-card";
import { useSdkSelector } from "embedding-sdk-bundle/store";
import { getIsGuestEmbed } from "embedding-sdk-bundle/store/selectors";
@@ -41,12 +42,13 @@ import type {
SdkQuestionEntityPublicProps,
} from "embedding-sdk-bundle/types/question";
import { Box, Group, Stack } from "metabase/ui";
-import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
-import type { ClickActionModeGetter } from "metabase/visualizations/types";
-import type Question from "metabase-lib/v1/Question";
import { staticQuestionSchema } from "./StaticQuestion.schema";
+const staticClickActionMode = getEmbeddingMode({
+ queryMode: EmbeddingSdkStaticMode,
+});
+
type StaticQuestionBaseProps = PropsWithChildren<
Pick<
SdkQuestionProps,
@@ -164,26 +166,12 @@ const StaticQuestionInner = (
const { ref: containerRef, isMobile } = useMobileLayout();
- const getClickActionMode: ClickActionModeGetter = ({
- question,
- }: {
- question: Question;
- }) => {
- return (
- question &&
- getEmbeddingMode({
- question,
- queryMode: EmbeddingSdkStaticMode,
- })
- );
- };
-
return (
<SdkQuestion
questionId={questionId}
token={token}
deserializedCard={deserializedCard}
- getClickActionMode={getClickActionMode}
+ clickActionMode={staticClickActionMode}
navigateToNewCard={null}
initialSqlParameters={initialSqlParameters}
sqlParameters={sqlParameters}
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/EditableDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/EditableDashboard.tsx
index f3bd9b9fc98..22af55d35d1 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/EditableDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/EditableDashboard.tsx
@@ -1,14 +1,14 @@
-import { useCallback } from "react";
+import { useMemo } from "react";
import { useTrackSdkComponentMount } from "embedding-sdk-bundle/analytics/component-events";
import { withPublicComponentWrapper } from "embedding-sdk-bundle/components/private/PublicComponentWrapper";
import { SdkInternalNavigationProvider } from "embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationProvider";
import { useSdkInternalNavigation } from "embedding-sdk-bundle/components/private/SdkInternalNavigation/context";
import { createEmbeddingSdkMode } from "embedding-sdk-bundle/lib/modes/EmbeddingSdkMode";
+import { getEmbeddingMode } from "embedding-sdk-bundle/lib/modes/getEmbeddingMode";
import { DASHBOARD_EDITING_ACTIONS } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants";
import { DASHBOARD_ACTION } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys";
import type { MetabasePluginsConfig as InternalMetabasePluginsConfig } from "metabase/embedding-sdk/types/plugins";
-import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
import {
type EditableDashboardOwnProps,
@@ -59,27 +59,21 @@ const EditableDashboardContent = (props: EditableDashboardProps) => {
DASHBOARD_ACTION.REFRESH_INDICATOR,
];
- const getClickActionMode: SdkDashboardInnerProps["getClickActionMode"] =
- useCallback(
- ({
- question,
- }: Parameters<
- NonNullable<SdkDashboardInnerProps["getClickActionMode"]>
- >[0]) =>
- getEmbeddingMode({
- question,
- queryMode: createEmbeddingSdkMode({ pushNavigation }),
- // Unjustified type cast. FIXME
- plugins: props.drillThroughQuestionProps
- ?.plugins as InternalMetabasePluginsConfig,
- }),
- [pushNavigation, props.drillThroughQuestionProps?.plugins],
- );
+ const clickActionMode = useMemo(
+ () =>
+ getEmbeddingMode({
+ queryMode: createEmbeddingSdkMode({ pushNavigation }),
+ // Unjustified type cast. FIXME
+ plugins: props.drillThroughQuestionProps
+ ?.plugins as InternalMetabasePluginsConfig,
+ }),
+ [pushNavigation, props.drillThroughQuestionProps?.plugins],
+ );
return (
<SdkDashboard
{...props}
- getClickActionMode={getClickActionMode}
+ clickActionMode={clickActionMode}
dashboardActions={dashboardActions}
/>
);
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx
index 167c653133c..259688ddf8a 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx
@@ -1,10 +1,11 @@
-import { useCallback, useMemo } from "react";
+import { useMemo } from "react";
import { useTrackSdkComponentMount } from "embedding-sdk-bundle/analytics/component-events";
import { withPublicComponentWrapper } from "embedding-sdk-bundle/components/private/PublicComponentWrapper";
import { SdkInternalNavigationProvider } from "embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationProvider";
import { useSdkInternalNavigation } from "embedding-sdk-bundle/components/private/SdkInternalNavigation/context";
import { createEmbeddingSdkMode } from "embedding-sdk-bundle/lib/modes/EmbeddingSdkMode";
+import { getEmbeddingMode } from "embedding-sdk-bundle/lib/modes/getEmbeddingMode";
import { useSdkSelector } from "embedding-sdk-bundle/store";
import { getPlugins } from "embedding-sdk-bundle/store/selectors";
import type { MetabasePluginsConfig } from "embedding-sdk-bundle/types/plugins";
@@ -12,8 +13,6 @@ import { PublicOrEmbeddedDashCardMenu } from "metabase/dashboard/components/Dash
import { DASHBOARD_ACTION } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys";
import type { MetabasePluginsConfig as InternalMetabasePluginsConfig } from "metabase/embedding-sdk/types/plugins";
import { isQuestionCard } from "metabase/utils/dashboard";
-import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
-import type { ClickActionModeGetter } from "metabase/visualizations/types";
import {
SdkDashboard,
@@ -57,10 +56,9 @@ export const InteractiveDashboardContent = (
return { ...globalPlugins, ...props.plugins };
}, [globalPlugins, props.plugins]);
- const getClickActionMode: ClickActionModeGetter = useCallback(
- ({ question }) =>
+ const clickActionMode = useMemo(
+ () =>
getEmbeddingMode({
- question,
queryMode: createEmbeddingSdkMode({ pushNavigation }),
// Unjustified type cast. FIXME
plugins: plugins as InternalMetabasePluginsConfig,
@@ -71,7 +69,7 @@ export const InteractiveDashboardContent = (
const dashboardProps: SdkDashboardInnerProps = useMemo(
() => ({
...props,
- getClickActionMode,
+ clickActionMode,
dashboardActions: [
DASHBOARD_ACTION.DASHBOARD_SUBSCRIPTIONS,
DASHBOARD_ACTION.DOWNLOAD_PDF,
@@ -85,7 +83,7 @@ export const InteractiveDashboardContent = (
<PublicOrEmbeddedDashCardMenu result={result} dashcard={dashcard} />
),
}),
- [props, getClickActionMode],
+ [props, clickActionMode],
);
return <SdkDashboard {...dashboardProps} />;
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
index 29f24887d3e..54766c287e4 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
@@ -224,7 +224,7 @@ export type SdkDashboardInnerProps = SdkDashboardProps &
Partial<
Pick<
DashboardContextProps,
- | "getClickActionMode"
+ | "clickActionMode"
| "dashboardActions"
| "dashcardMenu"
| "navigateToNewCardFromDashboard"
@@ -256,7 +256,7 @@ const SdkDashboardInner = ({
renderDrillThroughQuestion: AdHocQuestionView,
dashboardActions,
dashcardMenu,
- getClickActionMode,
+ clickActionMode,
navigateToNewCardFromDashboard,
className,
style,
@@ -619,7 +619,7 @@ const SdkDashboardInner = ({
onLoad={handleLoad}
onLoadWithoutCards={handleLoadWithoutCards}
onError={(error) => dispatch(setErrorPage(error))}
- getClickActionMode={getClickActionMode}
+ clickActionMode={clickActionMode}
dashcardMenu={finalDashcardMenu}
dashboardActions={dashboardActions}
onAddQuestion={(dashboard) => {
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx
index f225f5e2811..c746d5b84bd 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx
@@ -2,17 +2,20 @@ import { useTrackSdkComponentMount } from "embedding-sdk-bundle/analytics/compon
import { withPublicComponentWrapper } from "embedding-sdk-bundle/components/private/PublicComponentWrapper";
import { useNormalizeGuestEmbedQuestionOrDashboardComponentProps } from "embedding-sdk-bundle/hooks/private/use-normalize-guest-embed-question-or-dashboard-component-props";
import { EmbeddingSdkStaticMode } from "embedding-sdk-bundle/lib/modes/EmbeddingSdkStaticMode";
+import { getEmbeddingMode } from "embedding-sdk-bundle/lib/modes/getEmbeddingMode";
import type { SdkDashboardEntityPublicProps } from "embedding-sdk-bundle/types/dashboard";
import { PublicOrEmbeddedDashCardMenu } from "metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu";
import { DASHBOARD_ACTION } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys";
import { isQuestionCard } from "metabase/utils/dashboard";
-import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
-import type { ClickActionModeGetter } from "metabase/visualizations/types";
import { SdkDashboard, type SdkDashboardProps } from "../SdkDashboard";
import { staticDashboardSchema } from "./StaticDashboard.schema";
+const staticClickActionMode = getEmbeddingMode({
+ queryMode: EmbeddingSdkStaticMode,
+});
+
/**
* @interface
* @expand
@@ -50,17 +53,11 @@ const StaticDashboardInner = (props: StaticDashboardProps) => {
},
);
- const getClickActionMode: ClickActionModeGetter = ({ question }) =>
- getEmbeddingMode({
- question,
- queryMode: EmbeddingSdkStaticMode,
- });
-
return (
<SdkDashboard
// Unjustified type cast. FIXME
{...(normalizedProps as SdkDashboardProps)}
- getClickActionMode={getClickActionMode}
+ clickActionMode={staticClickActionMode}
dashboardActions={[
DASHBOARD_ACTION.DASHBOARD_SUBSCRIPTIONS,
DASHBOARD_ACTION.DOWNLOAD_PDF,
diff --git a/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkMode.ts b/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkMode.ts
index ee459a593bc..2763ed09f3b 100644
--- a/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkMode.ts
+++ b/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkMode.ts
@@ -7,15 +7,12 @@ import {
} from "metabase/dashboard/click-behavior/dashboard-click-drill";
import type { ParameterIdValuePair } from "metabase/dashboard/click-behavior/types";
import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";
-import { CombineColumnsAction } from "metabase/visualizations/click-actions/actions/CombineColumnsAction";
-import { ExtractColumnAction } from "metabase/visualizations/click-actions/actions/ExtractColumnAction";
+import { CombineColumnsAction } from "metabase/querying/click-actions/actions/CombineColumnsAction";
+import { ExtractColumnAction } from "metabase/querying/click-actions/actions/ExtractColumnAction";
+import { NativeQueryClickFallback } from "metabase/querying/click-actions/actions/NativeQueryClickFallback";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
import { HideColumnAction } from "metabase/visualizations/click-actions/actions/HideColumnAction";
-import { NativeQueryClickFallback } from "metabase/visualizations/click-actions/actions/NativeQueryClickFallback";
-import type {
- ClickObject,
- LegacyDrill,
- QueryClickActionsMode,
-} from "metabase/visualizations/types";
+import type { ClickObject, LegacyDrill } from "metabase/visualizations/types";
import type { CardId, DashboardId, DashboardTabId } from "metabase-types/api";
export type ClickBehaviorTarget = {
diff --git a/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkStaticMode.ts b/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkStaticMode.ts
index f61653bfe33..4413a808506 100644
--- a/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkStaticMode.ts
+++ b/frontend/src/embedding-sdk-bundle/lib/modes/EmbeddingSdkStaticMode.ts
@@ -1,5 +1,5 @@
import { DashboardClickAction } from "metabase/dashboard/click-behavior/DashboardClickAction";
-import type { QueryClickActionsMode } from "metabase/visualizations/types";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
export const EmbeddingSdkStaticMode: QueryClickActionsMode = {
name: "embedding-sdk-static",
diff --git a/frontend/src/embedding-sdk-bundle/lib/modes/getEmbeddingMode.ts b/frontend/src/embedding-sdk-bundle/lib/modes/getEmbeddingMode.ts
new file mode 100644
index 00000000000..f3a4bfa95aa
--- /dev/null
+++ b/frontend/src/embedding-sdk-bundle/lib/modes/getEmbeddingMode.ts
@@ -0,0 +1,65 @@
+import { transformClickedDataPoint } from "metabase/embedding-sdk/lib/transform-clicked";
+import type { MetabasePluginsConfig } from "metabase/embedding-sdk/types/plugins";
+import { Mode } from "metabase/querying/click-actions/Mode";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
+import type {
+ ClickAction,
+ ClickActionsMode,
+ ClickObject,
+} from "metabase/visualizations/types";
+import type Question from "metabase-lib/v1/Question";
+
+export function getEmbeddingMode({
+ queryMode,
+ plugins,
+}: {
+ queryMode: QueryClickActionsMode;
+ plugins?: MetabasePluginsConfig;
+}): ClickActionsMode {
+ return new Mode(() => queryMode, {
+ mapActions: (actions, clicked, question) =>
+ applyClickActionsPlugin(plugins, actions, clicked, question),
+ });
+}
+
+function applyClickActionsPlugin(
+ plugins: MetabasePluginsConfig | undefined,
+ actions: ClickAction[],
+ clicked: ClickObject,
+ question: Question,
+): ClickAction[] {
+ if (!plugins?.mapQuestionClickActions) {
+ return actions;
+ }
+
+ const actionsOrActionObject = plugins.mapQuestionClickActions(
+ actions,
+ transformClickedDataPoint(clicked, question),
+ );
+
+ if (Array.isArray(actionsOrActionObject)) {
+ return actionsOrActionObject;
+ }
+
+ if ("onClick" in actionsOrActionObject) {
+ // When a click yields exactly one action and it has `default: true`, performDefaultAction runs it instead of showing the popover.
+ return [
+ {
+ default: true,
+ section: "auto",
+ type: "custom",
+ buttonType: "horizontal",
+ name: "default",
+
+ // Unjustified type cast. FIXME
+ ...(actionsOrActionObject as Partial<ClickAction>),
+ },
+ ];
+ }
+
+ console.warn(
+ "mapQuestionClickActions should return an array of actions, or a single object with a `onClick` property",
+ );
+
+ return actions;
+}
diff --git a/frontend/src/embedding-sdk-bundle/lib/modes/getEmbeddingMode.unit.spec.ts b/frontend/src/embedding-sdk-bundle/lib/modes/getEmbeddingMode.unit.spec.ts
new file mode 100644
index 00000000000..3de78c4f4a4
--- /dev/null
+++ b/frontend/src/embedding-sdk-bundle/lib/modes/getEmbeddingMode.unit.spec.ts
@@ -0,0 +1,79 @@
+import { createMockMetadata } from "__support__/metadata";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
+import type { ClickAction } from "metabase/visualizations/types";
+import Question from "metabase-lib/v1/Question";
+import { createMockCard } from "metabase-types/api/mocks";
+
+import { getEmbeddingMode } from "./getEmbeddingMode";
+
+const question = new Question(createMockCard(), createMockMetadata({}));
+
+const action: ClickAction = {
+ name: "stock",
+ section: "auto",
+ buttonType: "horizontal",
+ question: () => question,
+};
+
+const queryMode: QueryClickActionsMode = {
+ name: "test",
+ hasDrills: false,
+ clickActions: [() => [action]],
+};
+
+describe("getEmbeddingMode", () => {
+ it("should return the query mode's actions without a plugin", () => {
+ const mode = getEmbeddingMode({ queryMode });
+ expect(mode.actionsForClick({}, { question })).toEqual([action]);
+ });
+
+ it("should pass the actions and the transformed click to the plugin", () => {
+ const mapQuestionClickActions = jest.fn(() => []);
+ const mode = getEmbeddingMode({
+ queryMode,
+ plugins: { mapQuestionClickActions },
+ });
+ const clicked = { value: 42 };
+
+ expect(mode.actionsForClick(clicked, { question })).toEqual([]);
+ expect(mapQuestionClickActions).toHaveBeenCalledWith(
+ [action],
+ expect.objectContaining({ value: 42, raw: clicked }),
+ );
+ });
+
+ it("should turn a single onClick object into one default action", () => {
+ const onClick = jest.fn();
+ const mode = getEmbeddingMode({
+ queryMode,
+ plugins: { mapQuestionClickActions: () => ({ onClick }) },
+ });
+
+ expect(mode.actionsForClick({}, { question })).toEqual([
+ {
+ default: true,
+ section: "auto",
+ type: "custom",
+ buttonType: "horizontal",
+ name: "default",
+ onClick,
+ },
+ ]);
+ });
+
+ it("should warn and keep the actions when the plugin returns something else", () => {
+ const warn = jest.spyOn(console, "warn").mockImplementation(() => {});
+ const mode = getEmbeddingMode({
+ queryMode,
+ plugins: {
+ mapQuestionClickActions: jest.fn().mockReturnValue({}),
+ },
+ });
+
+ expect(mode.actionsForClick({}, { question })).toEqual([action]);
+ expect(warn).toHaveBeenCalledWith(
+ "mapQuestionClickActions should return an array of actions, or a single object with a `onClick` property",
+ );
+ warn.mockRestore();
+ });
+});
diff --git a/frontend/src/metabase/dashboard/click-behavior/mode.ts b/frontend/src/metabase/dashboard/click-behavior/mode.ts
index 35a44cd395e..a46b1b99691 100644
--- a/frontend/src/metabase/dashboard/click-behavior/mode.ts
+++ b/frontend/src/metabase/dashboard/click-behavior/mode.ts
@@ -1,30 +1,22 @@
-import { Mode } from "metabase/visualizations/click-actions/Mode";
-import { ArchivedMode } from "metabase/visualizations/click-actions/modes/ArchivedMode";
-import { DefaultMode } from "metabase/visualizations/click-actions/modes/DefaultMode";
-import { ListMode } from "metabase/visualizations/click-actions/modes/ListMode";
-import type {
- ClickActionModeGetter,
- QueryClickActionsMode,
-} from "metabase/visualizations/types";
+import { Mode } from "metabase/querying/click-actions/Mode";
+import { getQueryMode } from "metabase/querying/click-actions/lib/modes";
+import { DefaultMode } from "metabase/querying/click-actions/modes/DefaultMode";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
+import type { ClickActionsMode } from "metabase/visualizations/types";
+import type Question from "metabase-lib/v1/Question";
import { DashboardClickAction } from "./DashboardClickAction";
const DashboardDefaultMode: QueryClickActionsMode = {
...DefaultMode,
- clickActions: [...(DefaultMode.clickActions ?? []), DashboardClickAction],
+ clickActions: [...DefaultMode.clickActions, DashboardClickAction],
};
-// Mirrors getMode from metabase/visualizations/click-actions/lib/modes, with
-// the dashboard-owned click-behavior action added for regular dashcards.
-export const getDashboardClickActionMode: ClickActionModeGetter = ({
- question,
-}) => {
- if (question.isArchived()) {
- return new Mode(question, ArchivedMode);
- }
+function getDashboardQueryMode(question: Question): QueryClickActionsMode {
+ const mode = getQueryMode(question);
+ return mode === DefaultMode ? DashboardDefaultMode : mode;
+}
- const queryMode =
- question.display() === "list" ? ListMode : DashboardDefaultMode;
-
- return new Mode(question, queryMode);
-};
+export const dashboardClickActionMode: ClickActionsMode = new Mode(
+ getDashboardQueryMode,
+);
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index e847c913554..a6fb5e6d82f 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -6,7 +6,7 @@ import _ from "underscore";
import { getMetricSeriesWithDefaultDisplay } from "metabase/common/utils/card";
import CS from "metabase/css/core/index.css";
import { setParameterValuesFromQueryParams } from "metabase/dashboard/actions/parameters";
-import { getDashboardClickActionMode } from "metabase/dashboard/click-behavior/mode";
+import { dashboardClickActionMode } from "metabase/dashboard/click-behavior/mode";
import { useDashboardContext } from "metabase/dashboard/context";
import { useClickBehaviorData } from "metabase/dashboard/hooks";
import { useResponsiveParameterList } from "metabase/dashboard/hooks/use-responsive-parameter-list";
@@ -189,7 +189,7 @@ export function DashCardVisualization({
cardTitled,
dashboard,
dashcardMenu,
- getClickActionMode,
+ clickActionMode,
isEditing = false,
isFullscreen = false,
isEditingParameter,
@@ -609,7 +609,7 @@ export function DashCardVisualization({
: undefined
}
metadata={metadata}
- mode={getClickActionMode ?? getDashboardClickActionMode}
+ mode={clickActionMode ?? dashboardClickActionMode}
getHref={getHref}
gridSize={gridSize}
totalNumGridCols={totalNumGridCols}
diff --git a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx b/frontend/src/metabase/dashboard/components/DashboardGrid.tsx
index e2dfdde521c..fda05452e3b 100644
--- a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardGrid.tsx
@@ -143,7 +143,7 @@ type DashboardGridContext = {
| "isEditingParameter"
| "isFullscreen"
| "clickBehaviorSidebarDashcard"
- | "getClickActionMode"
+ | "clickActionMode"
| "navigateToNewCardFromDashboard"
| "downloadsEnabled"
| "autoScrollToDashcardId"
@@ -724,7 +724,7 @@ const DashboardGrid = forwardRef<
isEditingParameter = false,
isFullscreen,
clickBehaviorSidebarDashcard,
- getClickActionMode,
+ clickActionMode,
navigateToNewCardFromDashboard,
downloadsEnabled,
autoScrollToDashcardId,
@@ -748,7 +748,7 @@ const DashboardGrid = forwardRef<
isEditingParameter={isEditingParameter}
isFullscreen={isFullscreen}
clickBehaviorSidebarDashcard={clickBehaviorSidebarDashcard}
- getClickActionMode={getClickActionMode}
+ clickActionMode={clickActionMode}
navigateToNewCardFromDashboard={navigateToNewCardFromDashboard}
downloadsEnabled={downloadsEnabled}
autoScrollToDashcardId={autoScrollToDashcardId}
diff --git a/frontend/src/metabase/dashboard/constants.ts b/frontend/src/metabase/dashboard/constants.ts
index a5d82940434..1b577acc1fc 100644
--- a/frontend/src/metabase/dashboard/constants.ts
+++ b/frontend/src/metabase/dashboard/constants.ts
@@ -61,5 +61,5 @@ export const DEFAULT_DASHBOARD_DISPLAY_OPTIONS: EmbedDisplayParams = {
// TODO: (Kelvin 2025-11-17) this will be removed when I work on EMB-1025
withSubscriptions: true,
withFooter: true,
- getClickActionMode: undefined,
+ clickActionMode: undefined,
};
diff --git a/frontend/src/metabase/dashboard/context/context.tsx b/frontend/src/metabase/dashboard/context/context.tsx
index 22d8320b5d2..b7a6fb56fab 100644
--- a/frontend/src/metabase/dashboard/context/context.tsx
+++ b/frontend/src/metabase/dashboard/context/context.tsx
@@ -160,7 +160,7 @@ const DashboardContextProviderInner = forwardRef(
autoScrollToDashcardId = undefined,
reportAutoScrolledToDashcard = noop,
cardTitled = true,
- getClickActionMode = undefined,
+ clickActionMode = undefined,
withFooter = true,
enableEntityNavigation = true, // true in core app, SDK passes it down as false
@@ -447,7 +447,7 @@ const DashboardContextProviderInner = forwardRef(
autoScrollToDashcardId,
reportAutoScrolledToDashcard,
cardTitled,
- getClickActionMode,
+ clickActionMode,
withFooter,
enableEntityNavigation,
diff --git a/frontend/src/metabase/dashboard/context/mock-context.tsx b/frontend/src/metabase/dashboard/context/mock-context.tsx
index a648334711e..00f13e65933 100644
--- a/frontend/src/metabase/dashboard/context/mock-context.tsx
+++ b/frontend/src/metabase/dashboard/context/mock-context.tsx
@@ -85,7 +85,7 @@ export const MockDashboardContext = ({
autoScrollToDashcardId = undefined,
reportAutoScrolledToDashcard = noop,
cardTitled = true,
- getClickActionMode = undefined,
+ clickActionMode = undefined,
withFooter = true,
isFullscreen = false,
dashboardActions = undefined,
@@ -110,7 +110,7 @@ export const MockDashboardContext = ({
autoScrollToDashcardId={autoScrollToDashcardId}
reportAutoScrolledToDashcard={reportAutoScrolledToDashcard}
cardTitled={cardTitled}
- getClickActionMode={getClickActionMode}
+ clickActionMode={clickActionMode}
withFooter={withFooter}
dashboardActions={dashboardActions}
dashcardMenu={dashcardMenu}
diff --git a/frontend/src/metabase/dashboard/types/embed-display-options.ts b/frontend/src/metabase/dashboard/types/embed-display-options.ts
index 1ef0aa064d4..4fd4aeeb419 100644
--- a/frontend/src/metabase/dashboard/types/embed-display-options.ts
+++ b/frontend/src/metabase/dashboard/types/embed-display-options.ts
@@ -1,5 +1,5 @@
import type { DisplayTheme } from "metabase/embedding/types";
-import type { ClickActionModeGetter } from "metabase/visualizations/types";
+import type { ClickActionsMode } from "metabase/visualizations/types";
import type { EmbedResourceDownloadOptions } from "metabase-types/api";
type EmbedBackground = boolean;
@@ -25,7 +25,7 @@ export type EmbedDisplayParams = {
hideParameters: EmbedHideParameters;
font: EmbedFont;
theme: DisplayTheme;
- getClickActionMode: ClickActionModeGetter | undefined;
+ clickActionMode: ClickActionsMode | undefined;
downloadsEnabled: EmbedResourceDownloadOptions;
withFooter: boolean;
// TODO: (Kelvin 2026-01-29) move this to a new type in EMB-1025 (canceled at moment)
diff --git a/frontend/src/metabase/documents/components/Editor/DocumentEditorHost.tsx b/frontend/src/metabase/documents/components/Editor/DocumentEditorHost.tsx
index e8e6638779e..44894465f84 100644
--- a/frontend/src/metabase/documents/components/Editor/DocumentEditorHost.tsx
+++ b/frontend/src/metabase/documents/components/Editor/DocumentEditorHost.tsx
@@ -7,10 +7,7 @@ import {
EditorHostProvider,
useEditorHost,
} from "metabase/rich_text_editing/tiptap/EditorHost";
-import type {
- ClickActionsMode,
- QueryClickActionsMode,
-} from "metabase/visualizations/types";
+import type { ClickActionsMode } from "metabase/visualizations/types";
import type { HighlightedObject } from "metabase/viz-core";
import type { Series } from "metabase-types/api";
@@ -51,7 +48,7 @@ import {
getSelectedTimelineEventIds,
} from "../../selectors";
-import { DocumentMode } from "./DocumentMode";
+import { documentClickActionMode } from "./DocumentMode";
/**
* {@link EditorHost} plus the visualization contracts CardEmbed needs.
@@ -66,7 +63,7 @@ export type DocumentEditorHost = EditorHost & {
useVisualizationMode: (opts: {
childTargetId: string;
hostData?: Record<string, unknown> | null;
- }) => ClickActionsMode | QueryClickActionsMode | undefined;
+ }) => ClickActionsMode | undefined;
};
/**
@@ -109,7 +106,7 @@ export const documentEditorHost: DocumentEditorHost = {
useCommentUrl: useDocumentCommentUrl,
useUnresolvedCommentsCount: useUnresolvedDocumentCommentsCount,
useHighlighted: () => null,
- useVisualizationMode: () => DocumentMode,
+ useVisualizationMode: () => documentClickActionMode,
useCardEmbedSlots: () => EMPTY_CARD_EMBED_SLOTS,
useNodeInViewport,
useReportPrefetchLoading,
diff --git a/frontend/src/metabase/documents/components/Editor/DocumentMode.ts b/frontend/src/metabase/documents/components/Editor/DocumentMode.ts
index 177bc0ad081..806332e7540 100644
--- a/frontend/src/metabase/documents/components/Editor/DocumentMode.ts
+++ b/frontend/src/metabase/documents/components/Editor/DocumentMode.ts
@@ -1,9 +1,11 @@
+import { Mode } from "metabase/querying/click-actions/Mode";
+import { NativeQueryClickFallback } from "metabase/querying/click-actions/actions/NativeQueryClickFallback";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
import { ColumnFormattingAction } from "metabase/visualizations/click-actions/actions/ColumnFormattingAction";
import { HideColumnAction } from "metabase/visualizations/click-actions/actions/HideColumnAction";
-import { NativeQueryClickFallback } from "metabase/visualizations/click-actions/actions/NativeQueryClickFallback";
-import type { QueryClickActionsMode } from "metabase/visualizations/types";
+import type { ClickActionsMode } from "metabase/visualizations/types";
-export const DocumentMode: QueryClickActionsMode = {
+const DocumentMode: QueryClickActionsMode = {
name: "document-mode",
hasDrills: true,
clickActions: [HideColumnAction, ColumnFormattingAction],
@@ -30,3 +32,7 @@ export const DocumentMode: QueryClickActionsMode = {
// we want to skip "drill-thru/zoom"
],
};
+
+export const documentClickActionMode: ClickActionsMode = new Mode(
+ () => DocumentMode,
+);
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
index 9e9b12f15ea..d9a69b07702 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
@@ -825,6 +825,7 @@ export const CardEmbedComponent = memo(
rawSeries={series}
metadata={metadata}
mode={visualizationMode}
+ hasColumnReordering
highlighted={highlighted}
onChangeCardAndRun={
isStatic
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
index b58ea40a14d..171a24c4f9c 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
@@ -7,6 +7,7 @@ import { datasetApi } from "metabase/api/dataset";
import { getErrorMessage as getResponseErrorMessage } from "metabase/api/utils";
import { ErrorMessage } from "metabase/common/components/ErrorMessage";
import { getMetadata } from "metabase/metadata-store";
+import { defaultClickActionMode } from "metabase/querying/click-actions/lib/modes";
import { DataReference } from "metabase/querying/components/DataReference/DataReference";
import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";
import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
@@ -418,6 +419,7 @@ export const NativeQueryModal = ({
<Visualization
rawSeries={rawSeries}
metadata={metadata}
+ mode={defaultClickActionMode}
onChangeCardAndRun={() => {}}
getExtraDataForClick={() => ({})}
isEditing={false}
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx
index e43779963f5..9abf37fc1fa 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationGroupVisualization.tsx
@@ -562,6 +562,7 @@ export function ExplorationVisualization({
className={className}
onUpdateWarnings={setWarnings}
mode={mode}
+ hasColumnReordering
onChangeCardAndRun={noop} // needed to show ConnectedClickActionsPopover
highlighted={highlighted}
selectedTimelineEventIds={selectedTimelineEventIds}
diff --git a/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx b/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx
index 7f4f84032d6..3ddfa4f620a 100644
--- a/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx
+++ b/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx
@@ -15,12 +15,12 @@ import {
} from "metabase/explorations/components/ExplorationVisualization/utils";
import type {
ClickAction,
+ ClickActionModeContext,
ClickActionPopoverProps,
ClickActionsMode,
ClickObject,
} from "metabase/visualizations/types";
import { isBrushClickObject } from "metabase/visualizations/types";
-import type { ComputedVisualizationSettings } from "metabase/viz-core";
import type {
DocumentContent,
ExplorationId,
@@ -65,7 +65,7 @@ export function useExplorationClickActionsMode({
return {
actionsForClick: (
clicked: ClickObject,
- settings?: ComputedVisualizationSettings,
+ { settings }: ClickActionModeContext = {},
) => {
const actions: ClickAction[] = [];
diff --git a/frontend/src/metabase/public/PublicDashboardMode.ts b/frontend/src/metabase/public/PublicDashboardMode.ts
index fedcc135ddd..717012beba5 100644
--- a/frontend/src/metabase/public/PublicDashboardMode.ts
+++ b/frontend/src/metabase/public/PublicDashboardMode.ts
@@ -1,9 +1,15 @@
import { DashboardClickAction } from "metabase/dashboard/click-behavior/DashboardClickAction";
-import type { QueryClickActionsMode } from "metabase/visualizations/types";
+import { Mode } from "metabase/querying/click-actions/Mode";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
+import type { ClickActionsMode } from "metabase/visualizations/types";
import { PublicMode } from "./PublicMode";
-export const PublicDashboardMode: QueryClickActionsMode = {
+const PublicDashboardMode: QueryClickActionsMode = {
...PublicMode,
clickActions: [DashboardClickAction],
};
+
+export const publicDashboardClickActionMode: ClickActionsMode = new Mode(
+ () => PublicDashboardMode,
+);
diff --git a/frontend/src/metabase/public/PublicMode.ts b/frontend/src/metabase/public/PublicMode.ts
index 7c279b1e434..f0aa8dc973f 100644
--- a/frontend/src/metabase/public/PublicMode.ts
+++ b/frontend/src/metabase/public/PublicMode.ts
@@ -1,7 +1,13 @@
-import type { QueryClickActionsMode } from "metabase/visualizations/types";
+import { Mode } from "metabase/querying/click-actions/Mode";
+import type { QueryClickActionsMode } from "metabase/querying/click-actions/types";
+import type { ClickActionsMode } from "metabase/visualizations/types";
export const PublicMode: QueryClickActionsMode = {
name: "public",
hasDrills: false,
clickActions: [],
};
+
+export const publicClickActionMode: ClickActionsMode = new Mode(
+ () => PublicMode,
+);
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx
index 25293fefba5..4c29063133c 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx
@@ -7,7 +7,7 @@ import { DashboardContextProvider } from "metabase/dashboard/context";
import { useDashboardUrlQuery } from "metabase/dashboard/hooks/use-dashboard-url-query";
import { LocaleProvider } from "metabase/embedding/LocaleProvider";
import { EmbeddingEntityContextProvider } from "metabase/embedding/context";
-import { PublicDashboardMode } from "metabase/public/PublicDashboardMode";
+import { publicDashboardClickActionMode } from "metabase/public/PublicDashboardMode";
import { useEmbedFrameOptions, useSetEmbedFont } from "metabase/public/hooks";
import { useDispatch, useSelector } from "metabase/redux";
import { setErrorPage } from "metabase/redux/app";
@@ -15,7 +15,6 @@ import { useLocation, useParams } from "metabase/router";
import { getCanWhitelabel } from "metabase/selectors/whitelabel";
import { parseSearchQuery } from "metabase/utils/browser";
import { isActionDashCard, isQuestionCard } from "metabase/utils/dashboard";
-import { Mode } from "metabase/visualizations/click-actions/Mode";
import type { EntityToken } from "metabase-types/api/entity";
import { usePublicEndpoints } from "../../../hooks/use-public-endpoints";
@@ -82,9 +81,7 @@ export const PublicOrEmbeddedDashboardPage = () => {
parameterQueryParams={parameterQueryParams}
cardTitled={true}
withFooter={true}
- getClickActionMode={({ question }) =>
- new Mode(question, PublicDashboardMode)
- }
+ clickActionMode={publicDashboardClickActionMode}
navigateToNewCardFromDashboard={null}
onError={(error) => {
dispatch(setErrorPage(error));
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx
index 3fc53a2a6fa..7624e1edd43 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx
@@ -6,7 +6,6 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import CS from "metabase/css/core/index.css";
import type { DisplayTheme } from "metabase/embedding/types";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
-import { PublicMode } from "metabase/public/PublicMode";
import { EmbedFrame } from "metabase/public/components/EmbedFrame";
import { PublicOrEmbeddedQuestionDownloadPopover } from "metabase/query_builder";
import Visualization from "metabase/visualizations/components/Visualization";
@@ -23,6 +22,8 @@ import type {
VisualizationSettings,
} from "metabase-types/api";
+import { publicClickActionMode } from "../../PublicMode";
+
export interface PublicOrEmbeddedQuestionViewProps {
initialized: boolean;
card: Card | null;
@@ -125,7 +126,7 @@ export function PublicOrEmbeddedQuestionView({
}}
gridUnit={12}
showTitle={false}
- mode={PublicMode}
+ mode={publicClickActionMode}
// Why do we need `isDashboard` when this is a standalone question?
// `isDashboard` is used by Visualization to change some visual behaviors
// including the "No results" message
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
index d3611b23dd0..f435e514097 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
@@ -769,6 +769,7 @@ const DatasetEditorInnerView = (props: DatasetEditorInnerProps) => {
className={CS.spread}
noHeader
queryBuilderMode="dataset"
+ hasColumnReordering
onHeaderColumnReorder={handleHeaderColumnReorder}
isShowingDetailsOnlyColumns={datasetEditorTab !== "metadata"}
hasMetadataPopovers={false}
diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx
index 2269b2da44e..cf0d9d1d9eb 100644
--- a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx
@@ -5,13 +5,14 @@ import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
import CS from "metabase/css/core/index.css";
import { HasResultsAlertPrompt } from "metabase/notifications/HasResultsAlertPrompt";
import { SyncedParametersList } from "metabase/parameters/components/SyncedParametersList";
+import { Mode } from "metabase/querying/click-actions/Mode";
+import { getQueryMode } from "metabase/querying/click-actions/lib/modes";
import { QueryVisualization } from "metabase/querying/components/QueryVisualization";
import type { QueryModalType } from "metabase/querying/constants";
import type { SelectionRange } from "metabase/querying/editor/types";
import { TimeseriesChrome } from "metabase/querying/filters/components/TimeseriesChrome";
import type { QueryBuilderMode } from "metabase/redux/store";
import { Box } from "metabase/ui";
-import type { Mode } from "metabase/visualizations/click-actions/Mode";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
@@ -30,6 +31,10 @@ import { ViewNativeQueryEditor } from "../ViewNativeQueryEditor";
import ViewMainContainerS from "./ViewMainContainer.module.css";
+const clickActionMode = new Mode(getQueryMode, {
+ hasColumnShortcutActions: true,
+});
+
interface ViewMainContainerProps {
question: Question;
query: NativeQuery;
@@ -79,7 +84,6 @@ interface ViewMainContainerProps {
onSetDatabaseId?: (id: DatabaseId) => void;
queryBuilderMode: QueryBuilderMode;
- mode: Mode;
showLeftSidebar: boolean;
showRightSidebar: boolean;
isLiveResizable: boolean;
@@ -91,7 +95,6 @@ interface ViewMainContainerProps {
export const ViewMainContainer = (props: ViewMainContainerProps) => {
const {
queryBuilderMode,
- mode,
question,
isDirty,
showLeftSidebar,
@@ -112,7 +115,6 @@ export const ViewMainContainer = (props: ViewMainContainerProps) => {
return;
}
- const queryMode = mode && mode.queryMode();
const { isNative } = Lib.queryDisplayInfo(question.query());
const isSidebarOpen = showLeftSidebar || showRightSidebar;
@@ -149,7 +151,8 @@ export const ViewMainContainer = (props: ViewMainContainerProps) => {
{...visualizationResultProps}
noHeader
className={CS.spread}
- mode={queryMode}
+ mode={clickActionMode}
+ hasColumnReordering
noResultsAction={
!isDirty && <HasResultsAlertPrompt question={question} />
}
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
index 5cc425645b0..6108cf90848 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
@@ -121,7 +121,7 @@ import {
onOpenTimelines,
setParameterValue,
} from "../store/actions";
-import { getIsObjectDetail, getMode } from "../store/mode-selectors";
+import { getIsObjectDetail } from "../store/mode-selectors";
import {
getCard,
getDataReferenceStack,
@@ -178,8 +178,6 @@ const mapStateToProps = (state: State) => {
canManageSubscriptions: canManageSubscriptions(state),
isAdmin: getUserIsAdmin(state),
- mode: getMode(state),
-
question: getQuestion(state),
originalQuestion: getOriginalQuestion(state),
lastRunCard: getLastRunCard(state),
diff --git a/frontend/src/metabase/query_builder/store/mode-selectors.ts b/frontend/src/metabase/query_builder/store/mode-selectors.ts
index 585014595e7..54cbf87cf09 100644
--- a/frontend/src/metabase/query_builder/store/mode-selectors.ts
+++ b/frontend/src/metabase/query_builder/store/mode-selectors.ts
@@ -1,33 +1,11 @@
import { createSelector } from "@reduxjs/toolkit";
-import { getMetadata } from "metabase/metadata-store";
-import { getMode as getQuestionMode } from "metabase/visualizations/click-actions/lib/modes";
-import Question from "metabase-lib/v1/Question";
-
import type { QueryBuilderStoreState } from "./state";
-const getLastRunCard = (state: QueryBuilderStoreState) => state.qb.lastRunCard;
-const getParameterValues = (state: QueryBuilderStoreState) =>
- state.qb.parameterValues;
const getZoomedObjectId = (state: QueryBuilderStoreState) =>
state.qb.zoomedRowObjectId;
-const getLastRunQuestion = createSelector(
- [getMetadata, getLastRunCard, getParameterValues],
- (metadata, card, parameterValues) =>
- card && metadata && new Question(card, metadata, parameterValues),
-);
-
-const isZoomingRow = createSelector(
+export const getIsObjectDetail = createSelector(
[getZoomedObjectId],
(index) => index != null,
);
-
-export const getMode = createSelector([getLastRunQuestion], (question) =>
- question ? getQuestionMode(question) : null,
-);
-
-export const getIsObjectDetail = createSelector(
- [getMode, isZoomingRow],
- (mode, isZoomingSingleRow) => isZoomingSingleRow || mode?.name() === "object",
-);
diff --git a/frontend/src/metabase/querying/click-actions/Mode/Mode.ts b/frontend/src/metabase/querying/click-actions/Mode/Mode.ts
new file mode 100644
index 00000000000..c9c47618d23
--- /dev/null
+++ b/frontend/src/metabase/querying/click-actions/Mode/Mode.ts
@@ -0,0 +1,83 @@
+import { queryDrill } from "metabase/querying/drills/utils/query-drill";
+import type {
+ ClickAction,
+ ClickActionModeContext,
+ ClickActionsMode,
+ ClickObject,
+} from "metabase/visualizations/types";
+import type { DrillThruDisplayInfo } from "metabase-lib";
+import type Question from "metabase-lib/v1/Question";
+import type { ClickActionProps } from "metabase-lib/v1/queries/drills/types";
+
+import type { QueryClickActionsMode } from "../types";
+
+type MapClickActions = (
+ actions: ClickAction[],
+ clicked: ClickObject,
+ question: Question,
+) => ClickAction[];
+
+type ModeOptions = {
+ mapActions?: MapClickActions;
+ hasColumnShortcutActions?: boolean;
+};
+
+export class Mode implements ClickActionsMode {
+ _getQueryMode: (question: Question) => QueryClickActionsMode;
+ _mapActions?: MapClickActions;
+
+ hasColumnShortcutActions?: (props: ClickActionProps) => boolean;
+
+ constructor(
+ getQueryMode: (question: Question) => QueryClickActionsMode,
+ { mapActions, hasColumnShortcutActions }: ModeOptions = {},
+ ) {
+ this._getQueryMode = getQueryMode;
+ this._mapActions = mapActions;
+
+ if (hasColumnShortcutActions) {
+ this.hasColumnShortcutActions = (props) =>
+ this._getQueryMode(props.question).clickActions.some(
+ (action) => action(props)?.length > 0,
+ );
+ }
+ }
+
+ actionsForClick(
+ clicked: ClickObject,
+ { question, settings }: ClickActionModeContext = {},
+ ): ClickAction[] {
+ if (!question) {
+ return [];
+ }
+
+ const mode = this._getQueryMode(question);
+ const props = { question, settings, clicked };
+
+ let actions = [
+ ...(mode.hasDrills
+ ? queryDrill(question, clicked, (drill) => isDrillEnabled(mode, drill))
+ : []),
+ ...mode.clickActions.flatMap((drill) => drill(props)),
+ ];
+
+ if (!actions.length && mode.fallback) {
+ actions = mode.fallback(props);
+ }
+
+ return this._mapActions
+ ? this._mapActions(actions, clicked, question)
+ : actions;
+ }
+}
+
+function isDrillEnabled(
+ mode: QueryClickActionsMode,
+ drill: DrillThruDisplayInfo,
+): boolean {
+ if (mode.hasDrills && mode.availableOnlyDrills != null) {
+ return mode.availableOnlyDrills.includes(drill.type);
+ }
+
+ return true;
+}
diff --git a/frontend/src/metabase/visualizations/click-actions/Mode/index.ts b/frontend/src/metabase/querying/click-actions/Mode/index.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/Mode/index.ts
rename to frontend/src/metabase/querying/click-actions/Mode/index.ts
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx b/frontend/src/metabase/querying/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
rename to frontend/src/metabase/querying/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/index.ts b/frontend/src/metabase/querying/click-actions/actions/CombineColumnsAction/index.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/index.ts
rename to frontend/src/metabase/querying/click-actions/actions/CombineColumnsAction/index.ts
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CopyValueAction/CopyValueAction.tsx b/frontend/src/metabase/querying/click-actions/actions/CopyValueAction/CopyValueAction.tsx
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/CopyValueAction/CopyValueAction.tsx
rename to frontend/src/metabase/querying/click-actions/actions/CopyValueAction/CopyValueAction.tsx
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CopyValueAction/CopyValueAction.unit.spec.tsx b/frontend/src/metabase/querying/click-actions/actions/CopyValueAction/CopyValueAction.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/CopyValueAction/CopyValueAction.unit.spec.tsx
rename to frontend/src/metabase/querying/click-actions/actions/CopyValueAction/CopyValueAction.unit.spec.tsx
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CopyValueAction/index.ts b/frontend/src/metabase/querying/click-actions/actions/CopyValueAction/index.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/CopyValueAction/index.ts
rename to frontend/src/metabase/querying/click-actions/actions/CopyValueAction/index.ts
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx b/frontend/src/metabase/querying/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
rename to frontend/src/metabase/querying/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/index.ts b/frontend/src/metabase/querying/click-actions/actions/ExtractColumnAction/index.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/index.ts
rename to frontend/src/metabase/querying/click-actions/actions/ExtractColumnAction/index.ts
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx b/frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.tsx
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx
rename to frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.tsx
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx b/frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx
rename to frontend/src/metabase/querying/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/utils.ts b/frontend/src/metabase/querying/click-actions/actions/utils.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/click-actions/actions/utils.ts
rename to frontend/src/metabase/querying/click-actions/actions/utils.ts
diff --git a/frontend/src/metabase/querying/click-actions/lib/modes.ts b/frontend/src/metabase/querying/click-actions/lib/modes.ts
new file mode 100644
index 00000000000..66b66def130
--- /dev/null
+++ b/frontend/src/metabase/querying/click-actions/lib/modes.ts
@@ -0,0 +1,17 @@
+import type { ClickActionsMode } from "metabase/visualizations/types";
+import type Question from "metabase-lib/v1/Question";
+
+import { Mode } from "../Mode";
+import { ArchivedMode } from "../modes/ArchivedMode";
+import { DefaultMode } from "../modes/DefaultMode";
+import { ListMode } from "../modes/ListMode";
+import type { QueryClickActionsMode } from "../types";
+
+export function getQueryMode(question: Question): QueryClickActionsMode {
+ if (question.isArchived()) {
+ return ArchivedMode;
+ }
+ return question.display() === "list" ? ListMode : DefaultMode;
+}
+
+export const defaultClickActionMode: ClickActionsMode = new Mode(getQueryMode);
diff --git a/frontend/src/metabase/querying/click-actions/lib/modes.unit.spec.ts b/frontend/src/metabase/querying/click-actions/lib/modes.unit.spec.ts
new file mode 100644
index 00000000000..50b15e8e664
--- /dev/null
+++ b/frontend/src/metabase/querying/click-actions/lib/modes.unit.spec.ts
@@ -0,0 +1,123 @@
+import { createMockMetadata } from "__support__/metadata";
+import type { ClickAction, LegacyDrill } from "metabase/visualizations/types";
+import Question from "metabase-lib/v1/Question";
+import type { Card } from "metabase-types/api";
+import { createMockCard } from "metabase-types/api/mocks";
+
+import { Mode } from "../Mode";
+import { ArchivedMode } from "../modes/ArchivedMode";
+import { DefaultMode } from "../modes/DefaultMode";
+import { ListMode } from "../modes/ListMode";
+import type { QueryClickActionsMode } from "../types";
+
+import { getQueryMode } from "./modes";
+
+const metadata = createMockMetadata({});
+
+function createQuestion(card: Partial<Card> = {}) {
+ return new Question(createMockCard(card), metadata);
+}
+
+describe("getQueryMode", () => {
+ it("should return ArchivedMode for an archived question", () => {
+ expect(getQueryMode(createQuestion({ archived: true }))).toBe(ArchivedMode);
+ });
+
+ it("should return ListMode for a list question", () => {
+ expect(getQueryMode(createQuestion({ display: "list" }))).toBe(ListMode);
+ });
+
+ it("should return DefaultMode for other questions", () => {
+ expect(getQueryMode(createQuestion())).toBe(DefaultMode);
+ });
+});
+
+describe("Mode", () => {
+ const clickAction = jest.fn(() => []);
+ const queryMode: QueryClickActionsMode = {
+ name: "test",
+ hasDrills: false,
+ clickActions: [clickAction],
+ };
+
+ beforeEach(() => {
+ clickAction.mockClear();
+ });
+
+ it("should choose the query mode from the clicked question", () => {
+ const chooseQueryMode = jest.fn(() => queryMode);
+ const mode = new Mode(chooseQueryMode);
+ const question = createQuestion();
+ mode.actionsForClick({}, { question });
+ expect(chooseQueryMode).toHaveBeenCalledWith(question);
+ expect(clickAction).toHaveBeenCalledWith(
+ expect.objectContaining({ question }),
+ );
+ });
+
+ it("should return no actions without a question", () => {
+ const mode = new Mode(() => queryMode);
+ expect(mode.actionsForClick({})).toEqual([]);
+ expect(clickAction).not.toHaveBeenCalled();
+ });
+
+ it("should return the actions mapped by mapActions", () => {
+ const mapped: ClickAction[] = [];
+ const mapActions = jest.fn(() => mapped);
+ const mode = new Mode(() => queryMode, { mapActions });
+ const question = createQuestion();
+ const clicked = { value: 1 };
+ expect(mode.actionsForClick(clicked, { question })).toBe(mapped);
+ expect(mapActions).toHaveBeenCalledWith([], clicked, question);
+ });
+
+ describe("hasColumnShortcutActions", () => {
+ const props = {
+ question: createQuestion(),
+ clicked: { columnShortcuts: true },
+ };
+ const shortcutAction: LegacyDrill = ({ question }) => [
+ {
+ name: "column-shortcut",
+ section: "new-column",
+ buttonType: "horizontal",
+ question: () => question,
+ },
+ ];
+
+ it("should be undefined unless opted in", () => {
+ const mode = new Mode(() => queryMode);
+ expect(mode.hasColumnShortcutActions).toBeUndefined();
+ });
+
+ it("should call the query mode's actions with the click", () => {
+ const mode = new Mode(() => queryMode, {
+ hasColumnShortcutActions: true,
+ });
+ mode.hasColumnShortcutActions?.(props);
+ expect(clickAction).toHaveBeenCalledWith(props);
+ });
+
+ it("should return true when an action returns something", () => {
+ const mode = new Mode(
+ () => ({ ...queryMode, clickActions: [clickAction, shortcutAction] }),
+ { hasColumnShortcutActions: true },
+ );
+ expect(mode.hasColumnShortcutActions?.(props)).toBe(true);
+ });
+
+ it("should return false when every action returns nothing", () => {
+ const mode = new Mode(() => queryMode, {
+ hasColumnShortcutActions: true,
+ });
+ expect(mode.hasColumnShortcutActions?.(props)).toBe(false);
+ });
+
+ it("should return false when the query mode has no actions", () => {
+ const mode = new Mode(() => ({ ...queryMode, clickActions: [] }), {
+ hasColumnShortcutActions: true,
+ });
+ expect(mode.hasColumnShortcutActions?.(props)).toBe(false);
+ });
+ });
+});
diff --git a/frontend/src/metabase/visualizations/click-actions/modes/ArchivedMode.ts b/frontend/src/metabase/querying/click-actions/modes/ArchivedMode.ts
similarity index 66%
rename from frontend/src/metabase/visualizations/click-actions/modes/ArchivedMode.ts
rename to frontend/src/metabase/querying/click-actions/modes/ArchivedMode.ts
index 2173a16f054..2ca7a576019 100644
--- a/frontend/src/metabase/visualizations/click-actions/modes/ArchivedMode.ts
+++ b/frontend/src/metabase/querying/click-actions/modes/ArchivedMode.ts
@@ -1,4 +1,4 @@
-import type { QueryClickActionsMode } from "../../types";
+import type { QueryClickActionsMode } from "../types";
export const ArchivedMode: QueryClickActionsMode = {
name: "archived",
diff --git a/frontend/src/metabase/visualizations/click-actions/modes/DefaultMode.ts b/frontend/src/metabase/querying/click-actions/modes/DefaultMode.ts
similarity index 67%
rename from frontend/src/metabase/visualizations/click-actions/modes/DefaultMode.ts
rename to frontend/src/metabase/querying/click-actions/modes/DefaultMode.ts
index 6f4fe39dc21..32651e517c7 100644
--- a/frontend/src/metabase/visualizations/click-actions/modes/DefaultMode.ts
+++ b/frontend/src/metabase/querying/click-actions/modes/DefaultMode.ts
@@ -1,10 +1,11 @@
-import type { QueryClickActionsMode } from "../../types";
-import { ColumnFormattingAction } from "../actions/ColumnFormattingAction";
+import { ColumnFormattingAction } from "metabase/visualizations/click-actions/actions/ColumnFormattingAction";
+import { HideColumnAction } from "metabase/visualizations/click-actions/actions/HideColumnAction";
+
import { CombineColumnsAction } from "../actions/CombineColumnsAction";
import { CopyValueAction } from "../actions/CopyValueAction";
import { ExtractColumnAction } from "../actions/ExtractColumnAction";
-import { HideColumnAction } from "../actions/HideColumnAction";
import { NativeQueryClickFallback } from "../actions/NativeQueryClickFallback";
+import type { QueryClickActionsMode } from "../types";
export const DefaultMode: QueryClickActionsMode = {
name: "default",
diff --git a/frontend/src/metabase/visualizations/click-actions/modes/ListMode.ts b/frontend/src/metabase/querying/click-actions/modes/ListMode.ts
similarity index 72%
rename from frontend/src/metabase/visualizations/click-actions/modes/ListMode.ts
rename to frontend/src/metabase/querying/click-actions/modes/ListMode.ts
index cb3684b6304..ff524384da5 100644
--- a/frontend/src/metabase/visualizations/click-actions/modes/ListMode.ts
+++ b/frontend/src/metabase/querying/click-actions/modes/ListMode.ts
@@ -1,4 +1,4 @@
-import type { QueryClickActionsMode } from "../../types";
+import type { QueryClickActionsMode } from "../types";
export const ListMode: QueryClickActionsMode = {
name: "list",
diff --git a/frontend/src/metabase/querying/click-actions/types.ts b/frontend/src/metabase/querying/click-actions/types.ts
new file mode 100644
index 00000000000..d6da3a4b2ce
--- /dev/null
+++ b/frontend/src/metabase/querying/click-actions/types.ts
@@ -0,0 +1,16 @@
+import type { LegacyDrill } from "metabase/visualizations/types";
+import type * as Lib from "metabase-lib";
+
+export type QueryClickActionsMode = {
+ name: string;
+ clickActions: LegacyDrill[];
+ fallback?: LegacyDrill;
+} & (
+ | {
+ hasDrills: false;
+ }
+ | {
+ hasDrills: true;
+ availableOnlyDrills?: Lib.DrillThruType[];
+ }
+);
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
index 165383c7523..ecc3acf78c3 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
@@ -8,6 +8,8 @@ import Visualization from "metabase/visualizations/components/Visualization";
import * as Lib from "metabase-lib";
import { datasetContainsNoResults } from "metabase-lib/v1/queries/utils/dataset";
+import { defaultClickActionMode } from "../../click-actions/lib/modes";
+
import type { QueryVisualizationProps } from "./types";
const ALLOWED_VISUALIZATION_PROPS = [
@@ -18,7 +20,7 @@ const ALLOWED_VISUALIZATION_PROPS = [
"tableHeaderHeight",
"scrollToColumn",
"renderTableHeader",
- "mode",
+ "hasColumnReordering",
"renderEmptyMessage",
"zoomedRowIndex",
// Legend
@@ -118,6 +120,7 @@ export function VisualizationResult(props: QueryVisualizationProps) {
onHeaderColumnReorder={props.onHeaderColumnReorder}
onUpdateVisualizationSettings={props.onUpdateVisualizationSettings}
onVisualizationRendered={props.onVisualizationRendered}
+ mode={props.mode ?? defaultClickActionMode}
{...vizSpecificProps}
/>
);
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx
index bfad907703f..2f87c6ddd3b 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx
@@ -1,38 +1,170 @@
+import userEvent from "@testing-library/user-event";
+
import { createMockMetadata } from "__support__/metadata";
-import { renderWithProviders, screen } from "__support__/ui";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+ within,
+} from "__support__/ui";
+import { registerVisualizations } from "metabase/visualizations/register";
+import { loadVisualizationComponents } from "metabase/viz-core";
import Question from "metabase-lib/v1/Question";
-import { createMockCard, createMockDataset } from "metabase-types/api/mocks";
-import { createSampleDatabase } from "metabase-types/api/mocks/presets";
+import {
+ createMockDataset,
+ createMockDatasetData,
+} from "metabase-types/api/mocks";
+import {
+ ORDERS_ID,
+ SAMPLE_DB_ID,
+ createOrdersIdDatasetColumn,
+ createOrdersTotalDatasetColumn,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
+
+import { Mode } from "../../click-actions/Mode";
+import { defaultClickActionMode } from "../../click-actions/lib/modes";
+import { DefaultMode } from "../../click-actions/modes/DefaultMode";
import { VisualizationResult } from "./VisualizationResult";
+import type { QueryVisualizationProps } from "./types";
+
+registerVisualizations();
+
+// Chart components are loaded on demand. Register them up front so each test
+// renders in one pass and can be run on its own.
+beforeAll(() => {
+ mockGetBoundingClientRect();
+ return loadVisualizationComponents(["table"]);
+});
+
+const metadata = createMockMetadata({
+ databases: [createSampleDatabase()],
+});
-const metadata = createMockMetadata({ databases: [createSampleDatabase()] });
-const question = new Question(createMockCard(), metadata);
-const emptyResult = createMockDataset();
+const setup = (props: Partial<QueryVisualizationProps> = {}) => {
+ const question = new Question(
+ {
+ dataset_query: {
+ type: "query",
+ query: {
+ "source-table": ORDERS_ID,
+ },
+ database: SAMPLE_DB_ID,
+ },
+ display: "table",
+ visualization_settings: {},
+ },
+ metadata,
+ );
+
+ const data = createMockDatasetData({
+ cols: [createOrdersIdDatasetColumn(), createOrdersTotalDatasetColumn()],
+ rows: [
+ [1, 10],
+ [2, 20],
+ ],
+ });
+
+ renderWithProviders(
+ <VisualizationResult
+ question={question}
+ result={createMockDataset({ data })}
+ rawSeries={[{ card: question.card(), data }]}
+ // VisualizationResult passes this on as onChangeCardAndRun, which the click actions popover needs to render.
+ navigateToNewCardInsideQB={jest.fn()}
+ {...props}
+ />,
+ );
+};
+
+const expectColumnReorderingDisabled = async () => {
+ const header = await screen.findByRole("columnheader", { name: "Total" });
+ // dnd-kit renders a draggable header as a button.
+ expect(within(header).queryByRole("button")).not.toBeInTheDocument();
+};
describe("VisualizationResult", () => {
- it("should render the no-results action", () => {
- renderWithProviders(
- <VisualizationResult
- question={question}
- result={emptyResult}
- noResultsAction={<p>Alert prompt</p>}
- />,
- );
-
- expect(screen.getByText("No results")).toBeInTheDocument();
- expect(screen.getByText("Alert prompt")).toBeInTheDocument();
+ describe("without hasColumnReordering", () => {
+ it("should disable column reordering", async () => {
+ setup();
+
+ await expectColumnReorderingDisabled();
+ });
+
+ it("should disable column reordering with an explicit mode", async () => {
+ setup({ mode: defaultClickActionMode });
+
+ await expectColumnReorderingDisabled();
+ });
+
+ it("should show click actions on a cell click", async () => {
+ setup();
+
+ const cells = await screen.findAllByRole("gridcell");
+ await userEvent.click(cells[cells.length - 1]);
+
+ expect(
+ await screen.findByTestId("click-actions-view"),
+ ).toBeInTheDocument();
+ });
+ });
+
+ describe("with hasColumnReordering", () => {
+ it("should enable column reordering", async () => {
+ setup({ hasColumnReordering: true });
+
+ const header = await screen.findByRole("columnheader", { name: "Total" });
+ expect(within(header).getByRole("button")).toHaveAttribute(
+ "aria-roledescription",
+ "sortable",
+ );
+ });
+ });
+
+ describe("with the default mode", () => {
+ it("should hide the add-column shortcut", async () => {
+ setup({ mode: defaultClickActionMode });
+
+ await screen.findByRole("columnheader", { name: "Total" });
+ expect(
+ screen.queryByRole("button", { name: "Add column" }),
+ ).not.toBeInTheDocument();
+ });
});
- it("should not render an alert link without a no-results action", () => {
- renderWithProviders(
- <VisualizationResult question={question} result={emptyResult} />,
- );
+ describe("with hasColumnShortcutActions", () => {
+ it("should show the add-column shortcut", async () => {
+ setup({
+ mode: new Mode(() => DefaultMode, { hasColumnShortcutActions: true }),
+ });
+
+ await screen.findByRole("columnheader", { name: "Total" });
+ expect(
+ screen.getByRole("button", { name: "Add column" }),
+ ).toBeInTheDocument();
+ });
+ });
+
+ describe("with no results", () => {
+ it("should render the no-results action", () => {
+ setup({
+ result: createMockDataset(),
+ noResultsAction: <p>Alert prompt</p>,
+ });
+
+ expect(screen.getByText("No results")).toBeInTheDocument();
+ expect(screen.getByText("Alert prompt")).toBeInTheDocument();
+ });
+
+ it("should not render an alert link without a no-results action", () => {
+ setup({ result: createMockDataset() });
- expect(screen.getByText("No results")).toBeInTheDocument();
- expect(screen.queryByText(/get an alert/)).not.toBeInTheDocument();
- expect(
- screen.getByRole("button", { name: "Back to previous results" }),
- ).toBeInTheDocument();
+ expect(screen.getByText("No results")).toBeInTheDocument();
+ expect(screen.queryByText(/get an alert/)).not.toBeInTheDocument();
+ expect(
+ screen.getByRole("button", { name: "Back to previous results" }),
+ ).toBeInTheDocument();
+ });
});
});
diff --git a/frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts b/frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts
deleted file mode 100644
index 30906aada28..00000000000
--- a/frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { transformClickedDataPoint } from "metabase/embedding-sdk/lib/transform-clicked";
-import type { MetabasePluginsConfig } from "metabase/embedding-sdk/types/plugins";
-import { queryDrill } from "metabase/querying/drills/utils/query-drill";
-import type { DrillThruDisplayInfo } from "metabase-lib";
-import type Question from "metabase-lib/v1/Question";
-
-import type {
- ClickAction,
- ClickActionsMode,
- ClickObject,
- QueryClickActionsMode,
-} from "../../types";
-
-export class Mode implements ClickActionsMode {
- _question: Question;
- _queryMode: QueryClickActionsMode;
- _plugins?: MetabasePluginsConfig;
-
- constructor(
- question: Question,
- queryMode: QueryClickActionsMode,
- plugins?: MetabasePluginsConfig,
- ) {
- this._question = question;
- this._queryMode = queryMode;
- this._plugins = plugins;
- }
-
- queryMode() {
- return this._queryMode;
- }
-
- name() {
- return this._queryMode.name;
- }
-
- actionsForClick(
- clicked: ClickObject,
- settings: Record<string, any>,
- extraData?: Record<string, any>,
- ): ClickAction[] {
- const mode = this._queryMode;
- const question = this._question;
- const props = { question, settings, clicked, extraData };
-
- let actions = [
- ...(mode.hasDrills
- ? queryDrill(question, clicked, this.isDrillEnabled)
- : []),
- ...(mode.clickActions?.flatMap((drill) => drill(props)) ?? []),
- ];
-
- if (!actions.length && mode.fallback) {
- actions = mode.fallback(props);
- }
-
- if (this._plugins?.mapQuestionClickActions) {
- const actionsOrActionObject = this._plugins.mapQuestionClickActions(
- actions,
- transformClickedDataPoint(clicked, question),
- );
-
- if (Array.isArray(actionsOrActionObject)) {
- actions = actionsOrActionObject;
- } else if ("onClick" in actionsOrActionObject) {
- // If the plugin returns a single object, it means we should call that action right away without showing the popover
- // `performDefaultAction` checks if it only gets one action, and if it has `default: true`, it's called directly without showing the popover
- actions = [
- {
- // makes it run without showing the popover
- default: true,
-
- // fallback values in case they just return `{ onClick: () => {})`}
- section: "auto",
- type: "custom",
- buttonType: "horizontal",
- name: "default",
-
- // Unjustified type cast. FIXME
- ...(actionsOrActionObject as Partial<ClickAction>),
- },
- ];
- } else {
- console.warn(
- "mapQuestionClickActions should return an array of actions, or a single object with a `onClick` property",
- );
- }
- }
-
- return actions;
- }
-
- private isDrillEnabled = (drill: DrillThruDisplayInfo): boolean => {
- const mode = this._queryMode;
-
- if (mode.hasDrills && mode.availableOnlyDrills != null) {
- return mode.availableOnlyDrills.includes(drill.type);
- }
-
- return true;
- };
-}
diff --git a/frontend/src/metabase/visualizations/click-actions/lib/modes.ts b/frontend/src/metabase/visualizations/click-actions/lib/modes.ts
deleted file mode 100644
index e5bb4fc7126..00000000000
--- a/frontend/src/metabase/visualizations/click-actions/lib/modes.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { MetabasePluginsConfig } from "metabase/embedding-sdk/types/plugins";
-import type { QueryClickActionsMode } from "metabase/visualizations/types";
-import type Question from "metabase-lib/v1/Question";
-
-import { Mode } from "../Mode";
-import { ArchivedMode } from "../modes/ArchivedMode";
-import { DefaultMode } from "../modes/DefaultMode";
-import { ListMode } from "../modes/ListMode";
-
-export function getMode(question: Question): Mode | null {
- if (question.isArchived()) {
- return new Mode(question, ArchivedMode);
- }
- const queryMode = question.display() === "list" ? ListMode : DefaultMode;
- return new Mode(question, queryMode);
-}
-
-export function getEmbeddingMode({
- question,
- queryMode,
- plugins,
-}: {
- question: Question;
- queryMode: QueryClickActionsMode;
- plugins?: MetabasePluginsConfig;
-}): Mode {
- return new Mode(question, queryMode, plugins);
-}
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
index be297914bae..dc0c3250bea 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
@@ -51,7 +51,7 @@ import { memoize } from "metabase/utils/memoize";
import { formatValue } from "metabase/value-formatting";
import { createPlainCellFormatter } from "metabase/visualizations/lib/plain-cell-formatter";
import type {
- QueryClickActionsMode,
+ ClickActionsMode,
VisualizationProps,
} from "metabase/visualizations/types";
import {
@@ -122,8 +122,9 @@ interface TableProps extends VisualizationProps {
rowIndexToPkMap?: Record<number, string>;
isPivoted?: boolean;
hasMetadataPopovers?: boolean;
+ hasColumnReordering?: boolean;
question: Question;
- mode: QueryClickActionsMode;
+ mode?: ClickActionsMode;
scrollToColumn?: number;
scrollToLastColumn?: boolean;
theme: MantineTheme;
@@ -174,6 +175,7 @@ export const TableInteractiveInner = forwardRef(function TableInteractiveInner(
question,
clicked,
hasMetadataPopovers = true,
+ hasColumnReordering = false,
mode,
theme,
scrollToColumn,
@@ -470,32 +472,32 @@ export const TableInteractiveInner = forwardRef(function TableInteractiveInner(
const handleAddColumnButtonClick = useMemo(() => {
if (
!question ||
- !mode?.clickActions ||
+ !mode?.hasColumnShortcutActions ||
!onVisualizationClick ||
isPivoted
) {
return undefined;
}
- for (const action of mode.clickActions) {
- const res = action({
- question,
- clicked: {
- columnShortcuts: true,
- extraData: {
- isRawTable,
- },
+ const hasActions = mode.hasColumnShortcutActions({
+ question,
+ clicked: {
+ columnShortcuts: true,
+ extraData: {
+ isRawTable,
},
- });
- if (res?.length > 0) {
- return (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
- onVisualizationClick({
- columnShortcuts: true,
- element: e.currentTarget,
- });
- };
- }
+ },
+ });
+ if (!hasActions) {
+ return undefined;
}
+
+ return (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+ onVisualizationClick({
+ columnShortcuts: true,
+ element: e.currentTarget,
+ });
+ };
}, [isRawTable, mode, onVisualizationClick, question, isPivoted]);
const columnsOptions: ColumnOptions<RowValues, RowValue>[] = useMemo(() => {
@@ -506,7 +508,8 @@ export const TableInteractiveInner = forwardRef(function TableInteractiveInner(
const isMinibar = columnSettings["show_mini_bar"];
const cellVariant = getBodyCellVariant(col);
const isImage = columnSettings["view_as"] === "image";
- const headerVariant = mode != null || isDashboard ? "light" : "outline";
+ const headerVariant =
+ hasColumnReordering || isDashboard ? "light" : "outline";
const getBackgroundColor = memoize(
(value: RowValue, rowIndex: number) =>
settings["table._cell_background_getter"]?.(
@@ -630,7 +633,7 @@ export const TableInteractiveInner = forwardRef(function TableInteractiveInner(
theme,
data,
question,
- mode,
+ hasColumnReordering,
renderTableHeader,
cols,
getColumnSortDirection,
@@ -878,7 +881,7 @@ export const TableInteractiveInner = forwardRef(function TableInteractiveInner(
}
const isColumnReorderingDisabled =
- (isDashboard || mode == null || isRawTable) && !isSettings;
+ (isDashboard || !hasColumnReordering || isRawTable) && !isSettings;
return (
<TableInteractiveContextProvider value={tableInteractiveContextValue}>
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index d0d11e834db..795702cebff 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -31,8 +31,6 @@ import { isQuestionCard } from "metabase/utils/dashboard";
import { formatNumber } from "metabase/utils/formatting";
import { memoizeClass } from "metabase/utils/memoize";
import { getVisualizationComponent } from "metabase/visualizations";
-import { Mode } from "metabase/visualizations/click-actions/Mode";
-import { getMode } from "metabase/visualizations/click-actions/lib/modes";
import ChartCaption from "metabase/visualizations/components/ChartCaption";
import ChartTooltip from "metabase/visualizations/components/ChartTooltip";
import { ConnectedClickActionsPopover } from "metabase/visualizations/components/ClickActions";
@@ -40,13 +38,10 @@ import { performDefaultAction } from "metabase/visualizations/lib/action";
import { hasNoResults } from "metabase/visualizations/lib/no-results";
import {
type CardSlownessStatus,
- type ClickActionModeGetter,
type ClickActionsMode,
type ClickObject,
type OnBrush,
- type QueryClickActionsMode,
type VisualizationPassThroughProps,
- isClickActionsMode,
isRegularClickAction,
} from "metabase/visualizations/types";
import {
@@ -161,7 +156,7 @@ type VisualizationOwnProps = {
/** Shown while a custom viz plugin loads. Documents supply their card-embed loading view here. */
customVizLoadingView?: ReactNode;
metadata?: Metadata;
- mode?: ClickActionModeGetter | ClickActionsMode | QueryClickActionsMode;
+ mode?: ClickActionsMode;
editSummary?: () => void;
rawSeries?: VisualizationRawSeries;
visualizerRawSeries?: RawSeries;
@@ -444,11 +439,7 @@ class Visualization extends PureComponent<
_getClickActionsCached(
clickedObject: ClickObject | null | undefined,
- mode:
- | ClickActionModeGetter
- | ClickActionsMode
- | QueryClickActionsMode
- | undefined,
+ mode: ClickActionsMode | undefined,
computedSettings: Record<string, string>,
dashcard?: DashboardCard,
metadata?: Metadata,
@@ -478,10 +469,9 @@ class Visualization extends PureComponent<
return [];
}
const question = Visualization.getQuestionForCard(metadata, card);
- const modeInstance = Visualization.getMode(mode, question);
- return modeInstance
- ? modeInstance.actionsForClick(
+ return mode
+ ? mode.actionsForClick(
{
...clicked,
extraData: {
@@ -489,39 +479,11 @@ class Visualization extends PureComponent<
isRawTable,
},
},
- computedSettings,
+ { question, settings: computedSettings },
)
: [];
}
- private static getMode(
- modeOrModeGetter:
- | ClickActionModeGetter
- | ClickActionsMode
- | QueryClickActionsMode
- | undefined,
- question: Question | undefined,
- ) {
- const modeOrQueryMode =
- typeof modeOrModeGetter === "function"
- ? question
- ? modeOrModeGetter({ question })
- : null
- : modeOrModeGetter;
-
- if (isClickActionsMode(modeOrQueryMode)) {
- return modeOrQueryMode;
- }
-
- if (question && modeOrQueryMode) {
- return new Mode(question, modeOrQueryMode);
- }
-
- if (question) {
- return getMode(question);
- }
- }
-
getClickActions(clickedObject?: ClickObject | null) {
const {
mode,
@@ -684,6 +646,7 @@ class Visualization extends PureComponent<
fontFamily,
getExtraDataForClick,
getHref,
+ hasColumnReordering,
hasDevWatermark,
headerIcon,
highlighted,
@@ -967,6 +930,7 @@ class Visualization extends PureComponent<
getExtraDataForClick={getExtraDataForClick}
getHref={getHref}
gridSize={gridSize}
+ hasColumnReordering={hasColumnReordering}
headerIcon={hasHeader ? null : headerIcon}
height={height}
hovered={hovered}
diff --git a/frontend/src/metabase/visualizations/types/click-actions.ts b/frontend/src/metabase/visualizations/types/click-actions.ts
index ce7d12bef1f..610b464d00c 100644
--- a/frontend/src/metabase/visualizations/types/click-actions.ts
+++ b/frontend/src/metabase/visualizations/types/click-actions.ts
@@ -14,10 +14,6 @@ import type {
VisualizationSettings,
} from "metabase-types/api";
-export type ClickActionModeGetter = (data: {
- question: Question;
-}) => QueryClickActionsMode | ClickActionsMode;
-
export type {
BrushClickObject,
BrushRange,
@@ -211,38 +207,23 @@ export type Drill<
applyDrill: (drill: Lib.DrillThru, ...args: any[]) => Question;
}) => ClickAction[];
+export type ClickActionModeContext = {
+ question?: Question;
+ settings?: VisualizationSettings;
+};
+
export interface ClickActionsMode {
actionsForClick(
clicked: ClickObject,
- settings?: Record<string, any>,
- extraData?: Record<string, any>,
+ context?: ClickActionModeContext,
): ClickAction[];
-}
-export function isClickActionsMode(value: unknown): value is ClickActionsMode {
- return (
- value != null &&
- typeof value === "object" &&
- "actionsForClick" in value &&
- // Unjustified type cast. FIXME
- typeof (value as any).actionsForClick === "function"
- );
+ /**
+ * Leaving this undefined hides the add-column shortcut.
+ */
+ hasColumnShortcutActions?(props: ClickActionProps): boolean;
}
-export type QueryClickActionsMode = {
- name: string;
- clickActions: LegacyDrill[];
- fallback?: LegacyDrill;
-} & (
- | {
- hasDrills: false;
- }
- | {
- hasDrills: true;
- availableOnlyDrills?: Lib.DrillThruType[];
- }
-);
-
export const isCustomClickAction = (
clickAction: ClickAction,
): clickAction is CustomClickAction =>
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 439380baa8c..1bec347693d 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -28,12 +28,7 @@ import type {
VisualizationSettings,
} from "metabase-types/api";
-import type {
- ClickActionModeGetter,
- ClickActionsMode,
- ClickObject,
- QueryClickActionsMode,
-} from "./click-actions";
+import type { ClickActionsMode, ClickObject } from "./click-actions";
export type TableCellFormatter = (value: RowValue) => ReactNode;
@@ -165,7 +160,12 @@ export type VisualizationPassThroughProps = {
index: number,
theme: unknown,
) => ReactNode;
- mode?: ClickActionModeGetter | ClickActionsMode | QueryClickActionsMode;
+ mode?: ClickActionsMode;
+ /**
+ * Lets users drag column headers to reorder the columns.
+ * Without it the table shows the outline header, the style used for read-only previews.
+ */
+ hasColumnReordering?: boolean;
renderEmptyMessage?: boolean;
// frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx