Skip to content

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

Push shared redux actions down (#71130)

Fraserb2a016926e32
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx
index bd9b4edf4e5..e3e12591ecf 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx
@@ -2,8 +2,8 @@ import { useMemo } from "react";
import type { SdkQuestionProps } from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";
import { SdkQuestion } from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";
+import { deserializeCard, parseHash } from "metabase/lib/card";
import * as Urls from "metabase/lib/urls";
-import { deserializeCard, parseHash } from "metabase/query_builder/actions";
import type { QuestionMockLocationParameters } from "../SdkQuestion/context";
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx
index 7e2ffd41a63..c9d548aac6f 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx
@@ -2,16 +2,16 @@ import { useCallback, useEffect, useState } from "react";
import { usePrevious, useUnmount } from "react-use";
import { useSdkDispatch, useSdkStore } from "embedding-sdk-bundle/store";
-import {
- NAVIGATE_TO_NEW_CARD,
- reset as dashboardReset,
-} from "metabase/dashboard/actions";
import { getNewCardUrl } from "metabase/dashboard/actions/getNewCardUrl";
import type { NavigateToNewCardFromDashboardOpts } from "metabase/dashboard/components/DashCard/types";
import { parseNumber } from "metabase/lib/number";
import * as Urls from "metabase/lib/urls";
import { isJWT } from "metabase/lib/utils";
-import { navigateBackToDashboard } from "metabase/query_builder/actions";
+import {
+ NAVIGATE_TO_NEW_CARD,
+ reset as dashboardReset,
+} from "metabase/redux/dashboard";
+import { navigateBackToDashboard } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import type Question from "metabase-lib/v1/Question";
import {
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx
index bc61f96605b..2529248fc20 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx
@@ -6,7 +6,7 @@ import { Button } from "metabase/common/components/Button";
import { EmptyState } from "metabase/common/components/EmptyState";
import CS from "metabase/css/core/index.css";
import { setActionForDashcard } from "metabase/dashboard/actions";
-import { connect } from "metabase/lib/redux";
+import { useDispatch } from "metabase/lib/redux";
import type {
ActionDashboardCard,
Dashboard,
@@ -32,30 +32,22 @@ import {
isParameterRequired,
} from "./utils";
-const mapDispatchToProps = {
- setActionForDashcard,
-};
-
interface Props {
dashboard: Dashboard;
dashcard: ActionDashboardCard;
onClose: () => void;
- setActionForDashcard: (
- dashcard: ActionDashboardCard,
- action: WritebackAction,
- ) => void;
}
export function ActionDashcardSettings({
dashboard,
dashcard,
onClose,
- setActionForDashcard,
}: Props) {
+ const dispatch = useDispatch();
const action = dashcard.action;
const setAction = (newAction: WritebackAction) => {
- setActionForDashcard(dashcard, newAction);
+ dispatch(setActionForDashcard(dashcard, newAction));
};
const hasParameters = !!action?.parameters?.length;
@@ -127,8 +119,3 @@ export function ActionDashcardSettings({
const EmptyActionState = () => (
<EmptyState className={CS.p3} message={t`Select an action to get started`} />
);
-
-export const ConnectedActionDashcardSettings = connect(
- null,
- mapDispatchToProps,
-)(ActionDashcardSettings);
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.unit.spec.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.unit.spec.tsx
index 5bb339d4774..7ee481aa769 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.unit.spec.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.unit.spec.tsx
@@ -26,7 +26,7 @@ import {
createMockQueryAction,
} from "metabase-types/api/mocks";
-import { ConnectedActionDashcardSettings } from "./ActionDashcardSettings";
+import { ActionDashcardSettings } from "./ActionDashcardSettings";
const dashboardParameter = createMockParameter({
id: "dash-param-id",
@@ -81,9 +81,7 @@ const dashboard = createMockDashboard({
const DEFAULT_VALUE = "default value";
const setup = (
- options?: Partial<
- React.ComponentProps<typeof ConnectedActionDashcardSettings>
- >,
+ options?: Partial<React.ComponentProps<typeof ActionDashcardSettings>>,
) => {
const searchItems = models.map((model) =>
createMockCollectionItem({ ...model, model: "dataset" }),
@@ -95,7 +93,7 @@ const setup = (
setupActionsEndpoints([...actions1, ...actions2, ...implicitActions]);
renderWithProviders(
- <ConnectedActionDashcardSettings
+ <ActionDashcardSettings
onClose={closeSpy}
dashboard={dashboard}
dashcard={actionDashcard}
diff --git a/frontend/src/metabase/admin/app/actions.ts b/frontend/src/metabase/admin/app/actions.ts
index 2f5c67861fb..798d2a0677c 100644
--- a/frontend/src/metabase/admin/app/actions.ts
+++ b/frontend/src/metabase/admin/app/actions.ts
@@ -1,5 +1,5 @@
-import { updateSetting } from "metabase/admin/settings/settings";
import { createAsyncThunk } from "metabase/lib/redux";
+import { updateSetting } from "metabase/redux/settings";
import { getCurrentVersion } from "./selectors";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx
index da5cf6dec7a..92add4843e6 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx
@@ -1,8 +1,8 @@
import _ from "underscore";
-import { updateSetting } from "metabase/admin/settings/settings";
import { Groups } from "metabase/entities/groups";
import { connect } from "metabase/lib/redux";
+import { updateSetting } from "metabase/redux/settings";
import { getSetting } from "metabase/selectors/settings";
import type { Settings } from "metabase-types/api/settings";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/settings/settings.ts b/frontend/src/metabase/admin/settings/settings.ts
index 0c715604b3f..6a032d524f9 100644
--- a/frontend/src/metabase/admin/settings/settings.ts
+++ b/frontend/src/metabase/admin/settings/settings.ts
@@ -26,23 +26,6 @@ export const initializeSettings = createThunkAction(
},
);
-export const UPDATE_SETTING = "metabase/admin/settings/UPDATE_SETTING";
-export const updateSetting = createThunkAction(
- UPDATE_SETTING,
- function (setting) {
- return async function (dispatch) {
- try {
- await SettingsApi.put(setting);
- } catch (error) {
- console.error("error updating setting", setting, error);
- throw error;
- } finally {
- await dispatch(reloadSettings());
- }
- };
- },
-);
-
export const UPDATE_SETTINGS = "metabase/admin/settings/UPDATE_SETTINGS";
export const updateSettings = createThunkAction(
UPDATE_SETTINGS,
diff --git a/frontend/src/metabase/dashboard/actions/core.ts b/frontend/src/metabase/dashboard/actions/core.ts
index 31529810ec2..88ac55cc1a9 100644
--- a/frontend/src/metabase/dashboard/actions/core.ts
+++ b/frontend/src/metabase/dashboard/actions/core.ts
@@ -11,14 +11,6 @@ import type {
} from "metabase-types/api";
import type { Dispatch, GetState } from "metabase-types/store";
-export const INITIALIZE = "metabase/dashboard/INITIALIZE";
-export const initialize = createAction<{ clearCache?: boolean } | undefined>(
- INITIALIZE,
-);
-
-export const RESET = "metabase/dashboard/RESET";
-export const reset = createAction(RESET);
-
export const SET_EDITING_DASHBOARD = "metabase/dashboard/SET_EDITING_DASHBOARD";
export const setEditingDashboard = (dashboard: Dashboard | null) => {
return (dispatch: Dispatch, getState: GetState) => {
diff --git a/frontend/src/metabase/dashboard/actions/navigation.ts b/frontend/src/metabase/dashboard/actions/navigation.ts
index 2cc17ca7ebe..a070f812611 100644
--- a/frontend/src/metabase/dashboard/actions/navigation.ts
+++ b/frontend/src/metabase/dashboard/actions/navigation.ts
@@ -2,6 +2,7 @@ import { isQuestionDashCard } from "metabase/lib/dashboard";
import { createThunkAction } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { openUrl } from "metabase/redux/app";
+import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";
import { getMetadata } from "metabase/selectors/metadata";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
@@ -10,8 +11,6 @@ import type { Dispatch, GetState } from "metabase-types/store";
import { getNewCardUrl } from "./getNewCardUrl";
-export const EDIT_QUESTION = "metabase/dashboard/EDIT_QUESTION";
-
export const editQuestion = createThunkAction(
EDIT_QUESTION,
(question: Question, mode: "view" | "notebook" | "query" = "notebook") =>
@@ -42,7 +41,6 @@ export const editQuestion = createThunkAction(
* * (not in 0.24.2 yet: drag on line/area/bar visualization)
* - those all can be applied without or with a dashboard filter
*/
-export const NAVIGATE_TO_NEW_CARD = "metabase/dashboard/NAVIGATE_TO_NEW_CARD";
type NavigateToNewCardFromDashboardArgs = {
nextCard: Card | VirtualCard;
previousCard: Card | VirtualCard;
diff --git a/frontend/src/metabase/dashboard/actions/parameters.tsx b/frontend/src/metabase/dashboard/actions/parameters.tsx
index d8b2aaae349..468f7e09c3f 100644
--- a/frontend/src/metabase/dashboard/actions/parameters.tsx
+++ b/frontend/src/metabase/dashboard/actions/parameters.tsx
@@ -22,6 +22,7 @@ import {
setParameterName as setParamName,
setParameterType as setParamType,
} from "metabase/parameters/utils/dashboards";
+import { selectTab, setParameterValues } from "metabase/redux/dashboard";
import { addUndo, dismissUndo } from "metabase/redux/undo";
import { getMetadata } from "metabase/selectors/metadata";
import { Text } from "metabase/ui";
@@ -89,7 +90,6 @@ import {
setDashboardAttributes,
setMultipleDashCardAttributes,
} from "./core";
-import { selectTab } from "./tabs";
import { closeSidebar, setSidebar } from "./ui";
type SingleParamUpdater = (p: Parameter) => Parameter;
@@ -837,9 +837,6 @@ export const setParameterValue = createThunkAction(
},
);
-export const SET_PARAMETER_VALUES = "metabase/dashboard/SET_PARAMETER_VALUES";
-export const setParameterValues = createAction(SET_PARAMETER_VALUES);
-
// Auto-apply filters
const APPLY_DRAFT_PARAMETER_VALUES =
"metabase/dashboard/APPLY_DRAFT_PARAMETER_VALUES";
@@ -1037,10 +1034,6 @@ export const setParameterIndex = createThunkAction(
},
);
-export const SHOW_ADD_PARAMETER_POPOVER =
- "metabase/dashboard/SHOW_ADD_PARAMETER_POPOVER";
-export const showAddParameterPopover = createAction(SHOW_ADD_PARAMETER_POPOVER);
-
export const HIDE_ADD_PARAMETER_POPOVER =
"metabase/dashboard/HIDE_ADD_PARAMETER_POPOVER";
export const hideAddParameterPopover = createAction(HIDE_ADD_PARAMETER_POPOVER);
diff --git a/frontend/src/metabase/dashboard/actions/revisions.ts b/frontend/src/metabase/dashboard/actions/revisions.ts
index 8c3d7d2ad98..17d0a51a822 100644
--- a/frontend/src/metabase/dashboard/actions/revisions.ts
+++ b/frontend/src/metabase/dashboard/actions/revisions.ts
@@ -5,9 +5,9 @@ import {
} from "metabase/dashboard/actions";
import { entityCompatibleQuery } from "metabase/lib/entities";
import { createThunkAction } from "metabase/lib/redux";
+import { REVERT_TO_REVISION } from "metabase/redux/dashboard";
import type { DashboardId, Revision } from "metabase-types/api";
-export const REVERT_TO_REVISION = "metabase/dashboard/REVERT_TO_REVISION";
export const revertToRevision = createThunkAction(
REVERT_TO_REVISION,
(dashboardId: DashboardId, revision: Revision) => {
diff --git a/frontend/src/metabase/dashboard/actions/save.ts b/frontend/src/metabase/dashboard/actions/save.ts
index edc827a056b..a9214fd2e92 100644
--- a/frontend/src/metabase/dashboard/actions/save.ts
+++ b/frontend/src/metabase/dashboard/actions/save.ts
@@ -3,6 +3,7 @@ import _ from "underscore";
import { Dashboards } from "metabase/entities/dashboards";
import { createThunkAction } from "metabase/lib/redux";
+import { UPDATE_DASHBOARD_AND_CARDS } from "metabase/redux/dashboard";
import { CardApi } from "metabase/services";
import { clickBehaviorIsValid } from "metabase-lib/v1/parameters/utils/click-behavior";
import type { DashCardId, ParameterId } from "metabase-types/api";
@@ -25,9 +26,6 @@ import {
trackAddedIFrameDashcards,
} from "./utils";
-export const UPDATE_DASHBOARD_AND_CARDS =
- "metabase/dashboard/UPDATE_DASHBOARD_AND_CARDS";
-
export const UPDATE_DASHBOARD = "metabase/dashboard/UPDATE_DASHBOARD";
export const updateDashboardAndCards = createThunkAction(
diff --git a/frontend/src/metabase/dashboard/actions/tabs.ts b/frontend/src/metabase/dashboard/actions/tabs.ts
index d389d109b37..076176e20e6 100644
--- a/frontend/src/metabase/dashboard/actions/tabs.ts
+++ b/frontend/src/metabase/dashboard/actions/tabs.ts
@@ -3,14 +3,12 @@ import type { Draft } from "@reduxjs/toolkit";
import { createAction, createReducer } from "@reduxjs/toolkit";
import { t } from "ttag";
-import {
- CANCEL_EDITING_DASHBOARD,
- INITIALIZE,
-} from "metabase/dashboard/actions/core";
+import { CANCEL_EDITING_DASHBOARD } from "metabase/dashboard/actions/core";
import { Dashboards } from "metabase/entities/dashboards";
import { isVirtualDashCard } from "metabase/lib/dashboard";
import { getPositionForNewDashCard } from "metabase/lib/dashboard_grid";
import { checkNotNull } from "metabase/lib/types";
+import { INITIALIZE, selectTab } from "metabase/redux/dashboard";
import { addUndo } from "metabase/redux/undo";
import type {
DashCardId,
@@ -59,9 +57,6 @@ type MoveTabPayload = {
sourceTabId: DashboardTabId;
destinationTabId: DashboardTabId;
};
-type SelectTabPayload = {
- tabId: DashboardTabId | null;
-};
type MoveDashCardToTabPayload = {
dashCardId: DashCardId;
destinationTabId: DashboardTabId;
@@ -82,7 +77,7 @@ const DELETE_TAB = "metabase/dashboard/DELETE_TAB";
const UNDO_DELETE_TAB = "metabase/dashboard/UNDO_DELETE_TAB";
const RENAME_TAB = "metabase/dashboard/RENAME_TAB";
const MOVE_TAB = "metabase/dashboard/MOVE_TAB";
-const SELECT_TAB = "metabase/dashboard/SELECT_TAB";
+export { SELECT_TAB } from "metabase/redux/dashboard";
const MOVE_DASHCARD_TO_TAB = "metabase/dashboard/MOVE_DASHCARD_TO_TAB";
const UNDO_MOVE_DASHCARD_TO_TAB =
"metabase/dashboard/UNDO_MOVE_DASHCARD_TO_TAB";
@@ -151,8 +146,6 @@ export function duplicateTab(sourceTabId: DashboardTabId | null) {
return duplicateTabAction({ sourceTabId, newTabId });
}
-export const selectTab = createAction<SelectTabPayload>(SELECT_TAB);
-
function _selectTab({
state,
tabId,
diff --git a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
index 796560afad6..5e2ecdc744d 100644
--- a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
@@ -3,7 +3,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import ActionViz from "metabase/actions/components/ActionViz";
-import { ConnectedActionDashcardSettings } from "metabase/actions/components/ActionViz/ActionDashcardSettings";
+import { ActionDashcardSettings } from "metabase/actions/components/ActionViz/ActionDashcardSettings";
import { isActionDashCard } from "metabase/actions/utils";
import { Ellipsified } from "metabase/common/components/Ellipsified";
import { FormField } from "metabase/common/components/FormField/FormField";
@@ -124,7 +124,7 @@ export function ActionSidebar() {
>
<Modal.Overlay />
<Modal.Content>
- <ConnectedActionDashcardSettings
+ <ActionDashcardSettings
dashboard={dashboard}
dashcard={dashcard as ActionDashboardCard}
onClose={closeActionModal}
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index 03d6a3c1b88..4bfb0079b0a 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -1,11 +1,14 @@
import cx from "classnames";
+import type { LocationDescriptorObject } from "history";
import { useCallback, useMemo } from "react";
+import { push } from "react-router-redux";
import { jt, t } from "ttag";
import _ from "underscore";
import { ExternalLink } from "metabase/common/components/ExternalLink/ExternalLink";
import { useLearnUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
+import { setParameterValuesFromQueryParams } from "metabase/dashboard/actions/parameters";
import { useDashboardContext } from "metabase/dashboard/context";
import { useClickBehaviorData } from "metabase/dashboard/hooks";
import { useResponsiveParameterList } from "metabase/dashboard/hooks/use-responsive-parameter-list";
@@ -18,7 +21,7 @@ import { EmbeddingEntityContextProvider } from "metabase/embedding/context";
import { isVirtualDashCard } from "metabase/lib/dashboard";
import { duration } from "metabase/lib/formatting";
import { measureTextWidth } from "metabase/lib/measure-text";
-import { useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import {
@@ -259,6 +262,16 @@ export function DashCardVisualization({
enableEntityNavigation,
} = useDashboardContext();
+ const dispatch = useDispatch();
+
+ const onSameOriginNavigation = useCallback(
+ (location: LocationDescriptorObject) => {
+ dispatch(push(location));
+ dispatch(setParameterValuesFromQueryParams(location.query));
+ },
+ [dispatch],
+ );
+
const datasets = useSelector((state) => getDashcardData(state, dashcard.id));
const inlineParameters = useSelector((state) =>
@@ -643,6 +656,7 @@ export function DashCardVisualization({
titleMenuItems={titleMenuItems}
errorMessageOverride={visualizerErrMsg}
enableEntityNavigation={enableEntityNavigation}
+ onSameOriginNavigation={onSameOriginNavigation}
autoAdjustSettings
/>
</EmbeddingEntityContextProvider>
diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts
index 918c23c3b6a..6b9a47580c6 100644
--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts
+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts
@@ -1,6 +1,6 @@
import type { Location } from "history";
-import { deserializeCard, parseHash } from "metabase/query_builder/actions";
+import { deserializeCard, parseHash } from "metabase/lib/card";
export const isNavigatingToCreateADashboardQuestion = (
nextLocation?: Location,
diff --git a/frontend/src/metabase/dashboard/context/context.redux.ts b/frontend/src/metabase/dashboard/context/context.redux.ts
index cbfe4215171..91344d4e13f 100644
--- a/frontend/src/metabase/dashboard/context/context.redux.ts
+++ b/frontend/src/metabase/dashboard/context/context.redux.ts
@@ -14,13 +14,11 @@ import {
fetchDashboard,
fetchDashboardCardData,
hideAddParameterPopover,
- initialize,
moveDashboardToCollection,
onReplaceAllDashCardVisualizationSettings,
onUpdateDashCardColumnSettings,
onUpdateDashCardVisualizationSettings,
removeParameter,
- reset,
setArchivedDashboard,
setDashboardAttributes,
setEditingDashboard,
@@ -40,7 +38,6 @@ import {
setParameterValueToDefault,
setSharing,
setSidebar,
- showAddParameterPopover,
toggleSidebar,
updateDashboard,
updateDashboardAndCards,
@@ -51,10 +48,15 @@ import {
duplicateTab,
moveTab,
renameTab,
- selectTab,
undoDeleteTab,
} from "metabase/dashboard/actions/tabs";
import { connect } from "metabase/lib/redux";
+import {
+ initialize,
+ reset,
+ selectTab,
+ showAddParameterPopover,
+} from "metabase/redux/dashboard";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import {
canManageSubscriptions,
diff --git a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts
index 96762859a06..a2f38677521 100644
--- a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts
@@ -1,6 +1,10 @@
import { useMemo } from "react";
import _ from "underscore";
+import {
+ setOrUnsetParameterValues,
+ setParameterValue,
+} from "metabase/dashboard/actions/parameters";
import {
getDashCardById,
getDashboardComplete,
@@ -96,6 +100,8 @@ function createGetExtraDataForClick(
dashboard,
dashcard,
userAttributes,
+ setOrUnsetParameterValues,
+ setParameterValue,
};
};
}
diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts
index 332196c25a9..ba249d497f6 100644
--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts
@@ -9,9 +9,9 @@ import { useSetting } from "metabase/common/hooks";
import { IS_EMBED_PREVIEW } from "metabase/lib/embed";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import { selectTab } from "metabase/redux/dashboard";
import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";
-import { selectTab } from "../actions";
import {
getDashboard,
getSelectedTab,
diff --git a/frontend/src/metabase/dashboard/reducers-typed.ts b/frontend/src/metabase/dashboard/reducers-typed.ts
index 65b803bd1c6..532ccdb57a4 100644
--- a/frontend/src/metabase/dashboard/reducers-typed.ts
+++ b/frontend/src/metabase/dashboard/reducers-typed.ts
@@ -11,10 +11,16 @@ import {
import { Dashboards } from "metabase/entities/dashboards";
import { Questions } from "metabase/entities/questions";
import { handleActions } from "metabase/lib/redux";
+import { REVERT_TO_REVISION } from "metabase/query_builder/actions";
import {
- NAVIGATE_BACK_TO_DASHBOARD,
- REVERT_TO_REVISION,
-} from "metabase/query_builder/actions";
+ INITIALIZE,
+ RESET,
+ SET_PARAMETER_VALUES,
+ SHOW_ADD_PARAMETER_POPOVER,
+ initialize,
+ reset,
+} from "metabase/redux/dashboard";
+import { NAVIGATE_BACK_TO_DASHBOARD } from "metabase/redux/query-builder";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
Card,
@@ -33,15 +39,11 @@ import type {
import {
CLOSE_SIDEBAR,
HIDE_ADD_PARAMETER_POPOVER,
- INITIALIZE,
REMOVE_PARAMETER,
- RESET,
RESET_PARAMETERS,
SET_EDITING_DASHBOARD,
SET_PARAMETER_VALUE,
- SET_PARAMETER_VALUES,
SET_SIDEBAR,
- SHOW_ADD_PARAMETER_POPOVER,
SHOW_AUTO_APPLY_FILTERS_TOAST,
addCardToDash,
addDashcardIdsToLoadingQueue,
@@ -51,9 +53,7 @@ import {
fetchCardDataAction,
fetchDashboard,
fetchDashboardCardDataAction,
- initialize,
markCardAsSlow,
- reset,
setDashboardAttributes,
setDocumentTitle,
setShowLoadingCompleteFavicon,
diff --git a/frontend/src/metabase/dashboard/reducers.ts b/frontend/src/metabase/dashboard/reducers.ts
index 1e8e8a186e1..c3fa2452a7b 100644
--- a/frontend/src/metabase/dashboard/reducers.ts
+++ b/frontend/src/metabase/dashboard/reducers.ts
@@ -4,6 +4,7 @@ import { assoc, chain, merge, updateIn } from "icepick";
import { Actions } from "metabase/entities/actions";
import { Questions } from "metabase/entities/questions";
import { combineReducers } from "metabase/lib/redux";
+import { SET_PARAMETER_VALUES, initialize } from "metabase/redux/dashboard";
import type { Card, WritebackAction } from "metabase-types/api";
import {
@@ -11,12 +12,10 @@ import {
REMOVE_PARAMETER,
RESET_PARAMETERS,
SET_PARAMETER_VALUE,
- SET_PARAMETER_VALUES,
UNDO_REMOVE_CARD_FROM_DASH,
addCardToDash,
addManyCardsToDash,
fetchDashboard,
- initialize,
markNewCardSeen,
onReplaceAllDashCardVisualizationSettings,
onUpdateDashCardColumnSettings,
diff --git a/frontend/src/metabase/dashboard/reducers.unit.spec.ts b/frontend/src/metabase/dashboard/reducers.unit.spec.ts
index e68e3cfebfb..0be59c539f5 100644
--- a/frontend/src/metabase/dashboard/reducers.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/reducers.unit.spec.ts
@@ -1,3 +1,4 @@
+import { INITIALIZE } from "metabase/redux/dashboard";
import { createMockDashboard } from "metabase-types/api/mocks";
import { createMockStoreDashboard } from "metabase-types/store/mocks";
@@ -5,7 +6,6 @@ import {
ADD_DASHCARD_IDS_TO_LOADING_QUEUE,
CLOSE_SIDEBAR,
FETCH_DASHBOARD_CARD_DATA,
- INITIALIZE,
REMOVE_PARAMETER,
SET_DASHBOARD_ATTRIBUTES,
SET_EDITING_DASHBOARD,
diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
index 0f78bb5621f..7c25b2240e9 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
@@ -25,8 +25,6 @@ import {
getRowName,
} from "metabase/detail-view/utils";
import type { OptionsType } from "metabase/lib/formatting/types";
-import { useDispatch } from "metabase/lib/redux";
-import { runQuestionQuery } from "metabase/query_builder/actions";
import { ActionsApi } from "metabase/services";
import {
Box,
@@ -65,6 +63,7 @@ interface Props {
table: Table | undefined;
tableForeignKeys?: ForeignKey[];
url: string | undefined;
+ onActionSuccess?: () => void;
onClose: () => void;
onNextClick: (() => void) | undefined;
onPreviousClick: (() => void) | undefined;
@@ -82,6 +81,7 @@ export function DetailViewSidesheet({
table,
tableForeignKeys,
url,
+ onActionSuccess,
onClose,
onNextClick,
onPreviousClick,
@@ -98,7 +98,6 @@ export function DetailViewSidesheet({
[dataset, columnsFromProp, columnSettings, rowFromProps],
);
- const dispatch = useDispatch();
const [linkCopied, setLinkCopied] = useState(false);
const headerColumns = useMemo(() => getHeaderColumns(columns), [columns]);
const rowName = useMemo(() => {
@@ -160,8 +159,8 @@ export function DetailViewSidesheet({
}, [actionId, rowId]);
const handleActionSuccess = useCallback(() => {
- dispatch(runQuestionQuery());
- }, [dispatch]);
+ onActionSuccess?.();
+ }, [onActionSuccess]);
const handleDeleteSuccess = useCallback(() => {
handleActionSuccess();
diff --git a/frontend/src/metabase/documents/actions.ts b/frontend/src/metabase/documents/actions.ts
index 0a1599bb9f6..41a289d69dd 100644
--- a/frontend/src/metabase/documents/actions.ts
+++ b/frontend/src/metabase/documents/actions.ts
@@ -1,7 +1,7 @@
import { push } from "react-router-redux";
-import { NAVIGATE_TO_NEW_CARD } from "metabase/dashboard/actions";
import { openUrl } from "metabase/redux/app";
+import { NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";
import type { Document } from "metabase-types/api";
import type { Dispatch } from "metabase-types/store";
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx
index 88892fe25eb..78267e06fa8 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx
@@ -4,8 +4,8 @@ import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
import { useSetting } from "metabase/common/hooks";
import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";
import { useDispatch, useSelector } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
import { MODAL_TYPES } from "metabase/querying/constants";
+import { setUIControls } from "metabase/redux/query-builder";
import {
canManageSubscriptions as canManageSubscriptionsSelector,
getUserIsAdmin,
diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.js
index 87f3996bc87..5adf3242db1 100644
--- a/frontend/src/metabase/entities/questions.js
+++ b/frontend/src/metabase/entities/questions.js
@@ -19,7 +19,7 @@ import {
import {
API_UPDATE_QUESTION,
SOFT_RELOAD_CARD,
-} from "metabase/query_builder/actions/core/types";
+} from "metabase/redux/query-builder";
import {
getMetadata,
getMetadataUnfiltered,
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts b/frontend/src/metabase/home/components/EmbedHomepage/actions.ts
index 0c555067c3b..d1b23d7fccc 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts
+++ b/frontend/src/metabase/home/components/EmbedHomepage/actions.ts
@@ -1,5 +1,5 @@
-import { updateSetting } from "metabase/admin/settings/settings";
import { createAsyncThunk } from "metabase/lib/redux";
+import { updateSetting } from "metabase/redux/settings";
import type { EmbeddingHomepageDismissReason } from "metabase-types/api";
import { trackEmbeddingHomepageDismissed } from "./analytics";
diff --git a/frontend/src/metabase/lib/card.ts b/frontend/src/metabase/lib/card.ts
index 2c6975f504d..b59589be1a5 100644
--- a/frontend/src/metabase/lib/card.ts
+++ b/frontend/src/metabase/lib/card.ts
@@ -1,6 +1,9 @@
+import querystring from "querystring";
+
import { b64hash_to_utf8, utf8_to_b64url } from "metabase/lib/encoding";
import { stableStringify } from "metabase/lib/objects";
import { equals } from "metabase/lib/utils";
+import { normalize } from "metabase-lib/v1/queries/utils/normalize";
import type { Card, ParameterValuesMap, UnsavedCard } from "metabase-types/api";
export type SerializeCardOptions = {
@@ -81,3 +84,34 @@ export function serializeCardForUrl(
export function deserializeCardFromUrl(serialized: string): Card {
return JSON.parse(b64hash_to_utf8(serialized));
}
+
+export function deserializeCard(serializedCard: string) {
+ const card = deserializeCardFromUrl(serializedCard);
+ if (card.dataset_query.database != null) {
+ card.dataset_query = normalize(card.dataset_query);
+ }
+ return card;
+}
+
+type HashOptions = {
+ db?: string;
+ table?: string;
+ segment?: string;
+};
+
+export function parseHash(hash?: string) {
+ let options: HashOptions = {};
+ let serializedCard;
+
+ // hash can contain either query params starting with ? or a base64 serialized card
+ if (hash) {
+ const cleanHash = hash.replace(/^#/, "");
+ if (cleanHash.charAt(0) === "?") {
+ options = querystring.parse(cleanHash.substring(1));
+ } else {
+ serializedCard = cleanHash;
+ }
+ }
+
+ return { options, serializedCard };
+}
diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx
index e83e0f843dc..8895a3d0ed6 100644
--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx
+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx
@@ -1,11 +1,11 @@
import { useCallback, useMemo } from "react";
import { t } from "ttag";
-import { updateSetting } from "metabase/admin/settings/settings";
import { useGetVersionInfoQuery } from "metabase/api";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
import { useSetting } from "metabase/common/hooks";
import { useDispatch, useSelector } from "metabase/lib/redux";
+import { updateSetting } from "metabase/redux/settings";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { getIsWhiteLabeling } from "metabase/selectors/whitelabel";
import { Anchor, Flex, Icon, Paper, Stack, Text } from "metabase/ui";
diff --git a/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx b/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx
index b954b2bd93f..aaf55ac00cc 100644
--- a/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx
+++ b/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx
@@ -3,7 +3,6 @@ import { t } from "ttag";
import { Toast } from "metabase/common/components/Toaster/Toaster";
import { applyDraftParameterValues } from "metabase/dashboard/actions";
-import { setParameterValues } from "metabase/dashboard/actions/parameters";
import { useDashboardContext } from "metabase/dashboard/context";
import {
getDraftParameterValues,
@@ -12,6 +11,7 @@ import {
getParameterValues,
} from "metabase/dashboard/selectors";
import { useDispatch, useSelector } from "metabase/lib/redux";
+import { setParameterValues } from "metabase/redux/dashboard";
import { getFilterChangeDescription } from "./utils";
diff --git a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
index db2a77fa54a..3fda67e4cbf 100644
--- a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
@@ -9,8 +9,8 @@ import {
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useDocsUrl, useLearnUrl } from "metabase/common/hooks";
-import { showAddParameterPopover } from "metabase/dashboard/actions";
import { useDispatch } from "metabase/lib/redux";
+import { showAddParameterPopover } from "metabase/redux/dashboard";
import {
Box,
Button,
diff --git a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx
index edaf84dc2d1..7538aa9fced 100644
--- a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import { setupValidFilterFieldsEndpoint } from "__support__/server-mocks";
import { getIcon, renderWithProviders, screen, within } from "__support__/ui";
-import * as dashboardActions from "metabase/dashboard/actions/parameters";
import { checkNotNull } from "metabase/lib/types";
+import * as dashboardActions from "metabase/redux/dashboard";
import { SAMPLE_METADATA } from "metabase-lib/test-helpers";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
diff --git a/frontend/src/metabase/parameters/reducers.ts b/frontend/src/metabase/parameters/reducers.ts
index 21bf0e4b006..984513c2be6 100644
--- a/frontend/src/metabase/parameters/reducers.ts
+++ b/frontend/src/metabase/parameters/reducers.ts
@@ -4,12 +4,12 @@ import {
INITIALIZE,
RESET,
UPDATE_DASHBOARD_AND_CARDS,
-} from "metabase/dashboard/actions";
+} from "metabase/redux/dashboard";
import {
API_UPDATE_QUESTION,
INITIALIZE_QB,
RESET_QB,
-} from "metabase/query_builder/actions";
+} from "metabase/redux/query-builder";
import type { ParameterValuesCache } from "metabase-types/store/parameters";
import type { FetchParameterValuesPayload } from "./actions";
diff --git a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx
index 43767e10a44..6e5ccc474d9 100644
--- a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx
+++ b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx
@@ -1,9 +1,9 @@
import { jt, t } from "ttag";
-import { updateSetting } from "metabase/admin/settings/settings";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDispatch } from "metabase/lib/redux";
import { LegaleseStepDetailsContainer } from "metabase/public/components/widgets/LegaleseStep/LegaleseStep.styled";
+import { updateSetting } from "metabase/redux/settings";
import { Button, Center, Stack, Text, Title } from "metabase/ui";
export const LegaleseStep = ({
diff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.ts
index 7ffb4a6822e..b54a65a388b 100644
--- a/frontend/src/metabase/query_builder/actions/core/core.ts
+++ b/frontend/src/metabase/query_builder/actions/core/core.ts
@@ -1,4 +1,3 @@
-import { createAction } from "redux-actions";
import _ from "underscore";
import { invalidateNotificationsApiCache, revisionApi } from "metabase/api";
@@ -13,6 +12,14 @@ import * as Urls from "metabase/lib/urls";
import { copy } from "metabase/lib/utils";
import { loadMetadataForCard } from "metabase/questions/actions";
import { openUrl } from "metabase/redux/app";
+import {
+ API_UPDATE_QUESTION,
+ SOFT_RELOAD_CARD,
+ clearQueryResult,
+ onCloseSidebars,
+ resetQB,
+ setParameterValue,
+} from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import { getCardAfterVisualizationClick } from "metabase/visualizations/lib/utils";
import * as Lib from "metabase-lib";
@@ -28,8 +35,6 @@ import type {
DashboardTabId,
Database,
DatasetQuery,
- ParameterId,
- ParameterValueOrArray,
} from "metabase-types/api";
import type { Dispatch, GetState } from "metabase-types/store";
@@ -44,24 +49,14 @@ import {
getSubmittableQuestion,
isBasedOnExistingQuestion,
} from "../../selectors";
-import {
- clearQueryResult,
- runDirtyQuestionQuery,
- runQuestionQuery,
-} from "../querying";
-import { onCloseSidebars } from "../ui";
+import { runDirtyQuestionQuery, runQuestionQuery } from "../querying";
import { updateUrl } from "../url";
import { zoomInRow } from "../zoom";
import { loadCard } from "./card";
-import { API_UPDATE_QUESTION, SOFT_RELOAD_CARD } from "./types";
import { updateQuestion } from "./updateQuestion";
-export const RESET_QB = "metabase/qb/RESET_QB";
-export const resetQB = createAction(RESET_QB);
-
// refreshes the card without triggering a run of the card's query
-export { SOFT_RELOAD_CARD };
export const softReloadCard = createThunkAction(SOFT_RELOAD_CARD, () => {
return async (dispatch, getState) => {
const outdatedCard = getCard(getState());
@@ -338,14 +333,6 @@ export const apiUpdateQuestion = (
};
};
-export const SET_PARAMETER_VALUE = "metabase/qb/SET_PARAMETER_VALUE";
-export const setParameterValue = createAction(
- SET_PARAMETER_VALUE,
- (parameterId: ParameterId, value: ParameterValueOrArray | null) => {
- return { id: parameterId, value: normalizeValue(value) };
- },
-);
-
export const SET_PARAMETER_VALUE_TO_DEFAULT =
"metabase/qb/SET_PARAMETER_VALUE_TO_DEFAULT";
export const setParameterValueToDefault = createThunkAction(
@@ -362,20 +349,6 @@ export const setParameterValueToDefault = createThunkAction(
},
);
-function normalizeValue(
- value: ParameterValueOrArray | null,
-): ParameterValueOrArray | null {
- if (value === "") {
- return null;
- }
-
- if (Array.isArray(value) && value.length === 0) {
- return null;
- }
-
- return value;
-}
-
export const REVERT_TO_REVISION = "metabase/qb/REVERT_TO_REVISION";
export const revertToRevision = createThunkAction(
REVERT_TO_REVISION,
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
index 78fa46ef7fc..00b2c7abea9 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
@@ -1,11 +1,9 @@
-import querystring from "querystring";
-
import type { LocationDescriptorObject } from "history";
import { replace } from "react-router-redux";
import { Questions } from "metabase/entities/questions";
import { Snippets } from "metabase/entities/snippets";
-import { deserializeCardFromUrl } from "metabase/lib/card";
+import { deserializeCard, parseHash } from "metabase/lib/card";
import { isNotNull } from "metabase/lib/types";
import * as Urls from "metabase/lib/urls";
import {
@@ -15,6 +13,7 @@ import {
import { loadMetadataForCard } from "metabase/questions/actions";
import { setErrorPage } from "metabase/redux/app";
import { addFields } from "metabase/redux/metadata";
+import { INITIALIZE_QB, resetQB } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import { canUserCreateQueries, getUser } from "metabase/selectors/user";
import * as Lib from "metabase-lib";
@@ -23,7 +22,6 @@ import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import { updateCardTemplateTagNames } from "metabase-lib/v1/queries/NativeQuery";
import { cardIsEquivalent } from "metabase-lib/v1/queries/utils/card";
-import { normalize } from "metabase-lib/v1/queries/utils/normalize";
import type { Card, SegmentId } from "metabase-types/api";
import type { EntityToken } from "metabase-types/api/entity";
import { isSavedCard } from "metabase-types/guards";
@@ -38,7 +36,6 @@ import { cancelQuery, runQuestionQuery } from "../querying";
import { updateUrl } from "../url";
import { loadCard } from "./card";
-import { resetQB } from "./core";
import {
getParameterValuesForQuestion,
propagateDashboardParameters,
@@ -126,15 +123,6 @@ function filterBySegmentId(question: Question, segmentId: SegmentId) {
return question.setQuery(newQuery);
}
-export function deserializeCard(serializedCard: string) {
- const card = deserializeCardFromUrl(serializedCard);
- if (card.dataset_query.database != null) {
- // Ensure older MBQL is supported
- card.dataset_query = normalize(card.dataset_query);
- }
- return card;
-}
-
async function fetchAndPrepareSavedQuestionCards(
{
cardId,
@@ -228,25 +216,6 @@ export async function resolveCards({
);
}
-export function parseHash(hash?: string) {
- let options: BlankQueryOptions = {};
- let serializedCard;
-
- // hash can contain either query params starting with ? or a base64 serialized card
- if (hash) {
- const cleanHash = hash.replace(/^#/, "");
- if (cleanHash.charAt(0) === "?") {
- options = querystring.parse(cleanHash.substring(1));
- } else {
- serializedCard = cleanHash;
- }
- }
-
- return { options, serializedCard };
-}
-
-export const INITIALIZE_QB = "metabase/qb/INITIALIZE_QB";
-
/**
* Updates the template tag names in the query
* to match the latest on the backend, because
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
index 3172ff2d8c5..57e4a57f27a 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
@@ -9,6 +9,7 @@ import { checkNotNull } from "metabase/lib/types";
import * as Urls from "metabase/lib/urls";
import * as questionActions from "metabase/questions/actions";
import { setErrorPage } from "metabase/redux/app";
+import * as sharedQB from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
@@ -43,7 +44,6 @@ import { createMockState } from "metabase-types/store/mocks";
import * as querying from "../querying";
import * as cardActions from "./card";
-import * as core from "./core";
import { initializeQB } from "./initializeQB";
type DisplayLock = { displayIsLocked?: boolean };
@@ -240,7 +240,7 @@ describe("QB Actions > initializeQB", () => {
describe(questionType, () => {
it("resets QB state before doing anything", async () => {
- const resetQBSpy = jest.spyOn(core, "resetQB");
+ const resetQBSpy = jest.spyOn(sharedQB, "resetQB");
await setup({ card });
expect(resetQBSpy).toHaveBeenCalledTimes(1);
});
@@ -490,11 +490,9 @@ describe("QB Actions > initializeQB", () => {
it("handles error if couldn't deserialize card hash", async () => {
const error = new Error("failed to deserialize card");
- jest
- .spyOn(CardLib, "deserializeCardFromUrl")
- .mockImplementation(() => {
- throw error;
- });
+ jest.spyOn(CardLib, "deserializeCard").mockImplementation(() => {
+ throw error;
+ });
const { dispatch } = await setup({ card: card });
diff --git a/frontend/src/metabase/query_builder/actions/core/types.ts b/frontend/src/metabase/query_builder/actions/core/types.ts
index 2164a7fd244..e69de29bb2d 100644
--- a/frontend/src/metabase/query_builder/actions/core/types.ts
+++ b/frontend/src/metabase/query_builder/actions/core/types.ts
@@ -1,2 +0,0 @@
-export const SOFT_RELOAD_CARD = "metabase/qb/SOFT_RELOAD_CARD";
-export const API_UPDATE_QUESTION = "metabase/qb/API_UPDATE_QUESTION";
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
index e6aa4ddbb51..407dae0666f 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
@@ -2,6 +2,10 @@ import _ from "underscore";
import { createThunkAction } from "metabase/lib/redux";
import { loadMetadataForCard } from "metabase/questions/actions";
+import {
+ onCloseQuestionInfo,
+ setUIControls,
+} from "metabase/redux/query-builder";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
@@ -19,7 +23,7 @@ import {
getRawSeries,
} from "../../selectors";
import { runQuestionQuery } from "../querying";
-import { onCloseQuestionInfo, setQueryBuilderMode, setUIControls } from "../ui";
+import { setQueryBuilderMode } from "../ui";
import { updateUrl } from "../url";
import { setIsShowingTemplateTagsEditor } from "./native";
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
index 05ffdd9d5d3..b7c72af5efc 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
@@ -1,6 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { checkNotNull } from "metabase/lib/types";
import * as questionActions from "metabase/questions/actions";
+import * as sharedQB from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import registerVisualizations from "metabase/visualizations/register";
import Question from "metabase-lib/v1/Question";
@@ -449,7 +450,7 @@ describe("QB Actions > updateQuestion", () => {
describe(questionType, () => {
it("triggers question details sidebar closing when turning model into ad-hoc question", async () => {
- const closeSidebarSpy = jest.spyOn(ui, "onCloseQuestionInfo");
+ const closeSidebarSpy = jest.spyOn(sharedQB, "onCloseQuestionInfo");
await setup({ card: getCard(), isShowingTemplateTagsEditor: true });
expect(closeSidebarSpy).not.toHaveBeenCalled();
});
@@ -471,7 +472,7 @@ describe("QB Actions > updateQuestion", () => {
});
it("triggers question details sidebar closing when turning model into ad-hoc question", async () => {
- const closeSidebarSpy = jest.spyOn(ui, "onCloseQuestionInfo");
+ const closeSidebarSpy = jest.spyOn(sharedQB, "onCloseQuestionInfo");
await setup({ card: getCard(), isShowingTemplateTagsEditor: true });
expect(closeSidebarSpy).toHaveBeenCalledTimes(1);
});
diff --git a/frontend/src/metabase/query_builder/actions/index.ts b/frontend/src/metabase/query_builder/actions/index.ts
index 6e549160c67..64266df6ed3 100644
--- a/frontend/src/metabase/query_builder/actions/index.ts
+++ b/frontend/src/metabase/query_builder/actions/index.ts
@@ -10,4 +10,3 @@ export * from "./ui";
export * from "./visualization-settings";
export * from "./zoom";
export * from "./state";
-export * from "./modal";
diff --git a/frontend/src/metabase/query_builder/actions/modal.ts b/frontend/src/metabase/query_builder/actions/modal.ts
index 2cf36253b50..e69de29bb2d 100644
--- a/frontend/src/metabase/query_builder/actions/modal.ts
+++ b/frontend/src/metabase/query_builder/actions/modal.ts
@@ -1,12 +0,0 @@
-import { createThunkAction } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
-import { UserApi } from "metabase/services";
-
-export const CLOSE_QB_NEWB_MODAL = "metabase/qb/CLOSE_QB_NEWB_MODAL";
-export const closeQbNewbModal = createThunkAction(CLOSE_QB_NEWB_MODAL, () => {
- return async (_dispatch, getState) => {
- // persist the fact that this user has seen the NewbModal
- const { currentUser } = getState();
- await UserApi.update_qbnewb({ id: checkNotNull(currentUser).id });
- };
-});
diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.ts
index cff77f62314..1207284a271 100644
--- a/frontend/src/metabase/query_builder/actions/native.ts
+++ b/frontend/src/metabase/query_builder/actions/native.ts
@@ -2,6 +2,7 @@ import { createAction } from "redux-actions";
import { Questions } from "metabase/entities/questions";
import { createThunkAction } from "metabase/lib/redux";
+import { setUIControls } from "metabase/redux/query-builder";
import { updateUserSetting } from "metabase/redux/settings";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import type {
@@ -22,7 +23,6 @@ import {
} from "../selectors";
import { updateQuestion } from "./core/updateQuestion";
-import { setUIControls } from "./ui";
export const TOGGLE_DATA_REFERENCE = "metabase/qb/TOGGLE_DATA_REFERENCE";
export const toggleDataReference = createAction(TOGGLE_DATA_REFERENCE);
diff --git a/frontend/src/metabase/query_builder/actions/navigation.ts b/frontend/src/metabase/query_builder/actions/navigation.ts
index d1fc7fde3e2..47c2f23e439 100644
--- a/frontend/src/metabase/query_builder/actions/navigation.ts
+++ b/frontend/src/metabase/query_builder/actions/navigation.ts
@@ -2,6 +2,7 @@ import type { Location } from "history";
import { createThunkAction } from "metabase/lib/redux";
import { equals } from "metabase/lib/utils";
+import { resetUIControls } from "metabase/redux/query-builder";
import { getLocation } from "metabase/selectors/routing";
import type { Dispatch } from "metabase-types/store";
@@ -18,7 +19,7 @@ import { type QueryParams, initializeQB } from "./core/initializeQB";
import { resetRowZoom } from "./object-detail";
import { cancelQuery } from "./querying";
import { setCurrentState } from "./state";
-import { resetUIControls, setQueryBuilderMode } from "./ui";
+import { setQueryBuilderMode } from "./ui";
import { zoomInRow } from "./zoom";
export const POP_STATE = "metabase/qb/POP_STATE";
diff --git a/frontend/src/metabase/query_builder/actions/object-detail.ts b/frontend/src/metabase/query_builder/actions/object-detail.ts
index 391e54c8edd..f1b95c47a1c 100644
--- a/frontend/src/metabase/query_builder/actions/object-detail.ts
+++ b/frontend/src/metabase/query_builder/actions/object-detail.ts
@@ -1,6 +1,7 @@
import _ from "underscore";
import { createThunkAction } from "metabase/lib/redux";
+import { RESET_ROW_ZOOM } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import { MetabaseApi } from "metabase/services";
import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";
@@ -25,7 +26,6 @@ import { setCardAndRun } from "./core/core";
import { updateUrl } from "./url";
import { zoomInRow } from "./zoom";
-export const RESET_ROW_ZOOM = "metabase/qb/RESET_ROW_ZOOM";
export const resetRowZoom = () => (dispatch: Dispatch) => {
dispatch({ type: RESET_ROW_ZOOM });
diff --git a/frontend/src/metabase/query_builder/actions/querying.ts b/frontend/src/metabase/query_builder/actions/querying.ts
index b511ac281fd..8cae59f915a 100644
--- a/frontend/src/metabase/query_builder/actions/querying.ts
+++ b/frontend/src/metabase/query_builder/actions/querying.ts
@@ -4,6 +4,15 @@ import { t } from "ttag";
import { defer } from "metabase/lib/promise";
import { createThunkAction } from "metabase/lib/redux";
import { syncVizSettingsWithSeries } from "metabase/querying/viz-settings/utils/sync-viz-settings";
+import {
+ CANCEL_QUERY,
+ QUERY_COMPLETED as QUERY_COMPLETED_TYPE,
+ QUERY_ERRORED as QUERY_ERRORED_TYPE,
+ RUN_QUERY as RUN_QUERY_TYPE,
+ SET_DOCUMENT_TITLE,
+ SET_DOCUMENT_TITLE_TIMEOUT_ID,
+ SET_SHOW_LOADING_COMPLETE_FAVICON,
+} from "metabase/redux/query-builder";
import { getWhiteLabeledLoadingMessageFactory } from "metabase/selectors/whitelabel";
import { runQuestionQuery as apiRunQuestionQuery } from "metabase/services";
import { getSensibleDisplays } from "metabase/visualizations";
@@ -28,11 +37,8 @@ import {
import { updateUrl } from "./url";
-export const SET_DOCUMENT_TITLE = "metabase/qb/SET_DOCUMENT_TITLE";
const setDocumentTitle = createAction(SET_DOCUMENT_TITLE);
-export const SET_SHOW_LOADING_COMPLETE_FAVICON =
- "metabase/qb/SET_SHOW_LOADING_COMPLETE_FAVICON";
const showLoadingCompleteFavicon = createAction(
SET_SHOW_LOADING_COMPLETE_FAVICON,
() => true,
@@ -45,8 +51,6 @@ const hideLoadingCompleteFavicon = createAction(
const LOAD_START_UI_CONTROLS = "metabase/qb/LOAD_START_UI_CONTROLS";
const LOAD_COMPLETE_UI_CONTROLS = "metabase/qb/LOAD_COMPLETE_UI_CONTROLS";
const LOAD_ERROR_UI_CONTROLS = "metabase/qb/LOAD_ERROR_UI_CONTROLS";
-export const SET_DOCUMENT_TITLE_TIMEOUT_ID =
- "metabase/qb/SET_DOCUMENT_TITLE_TIMEOUT_ID";
const setDocumentTitleTimeoutId = createAction(SET_DOCUMENT_TITLE_TIMEOUT_ID);
const loadCompleteUIControls = createThunkAction(
@@ -112,7 +116,6 @@ export const runDirtyQuestionQuery =
* Queries the result for the currently active question or alternatively for the card question provided in `overrideWithQuestion`.
* The API queries triggered by this action creator can be cancelled using the deferred provided in RUN_QUERY action.
*/
-export const RUN_QUERY = "metabase/qb/RUN_QUERY";
export const runQuestionQuery = ({
shouldUpdateUrl = true,
ignoreCache = false,
@@ -165,7 +168,7 @@ export const runQuestionQuery = ({
.then((queryResults) => dispatch(queryCompleted(question, queryResults)))
.catch((error) => dispatch(queryErrored(startTime, error)));
- dispatch({ type: RUN_QUERY, payload: { cancelQueryDeferred } });
+ dispatch({ type: RUN_QUERY_TYPE, payload: { cancelQueryDeferred } });
};
};
@@ -192,10 +195,6 @@ const loadStartUIControls = createThunkAction(
},
);
-export const CLEAR_QUERY_RESULT = "metabase/query_builder/CLEAR_QUERY_RESULT";
-export const clearQueryResult = createAction(CLEAR_QUERY_RESULT);
-
-export const QUERY_COMPLETED = "metabase/qb/QUERY_COMPLETED";
export const queryCompleted = (question: Question, queryResults: Dataset[]) => {
return async (dispatch: Dispatch, getState: GetState) => {
const [{ data, error }] = queryResults;
@@ -236,7 +235,7 @@ export const queryCompleted = (question: Question, queryResults: Dataset[]) => {
const card = question.card();
dispatch({
- type: QUERY_COMPLETED,
+ type: QUERY_COMPLETED_TYPE,
payload: {
card,
queryResults,
@@ -246,9 +245,8 @@ export const queryCompleted = (question: Question, queryResults: Dataset[]) => {
};
};
-export const QUERY_ERRORED = "metabase/qb/QUERY_ERRORED";
export const queryErrored = createThunkAction(
- QUERY_ERRORED,
+ QUERY_ERRORED_TYPE,
(startTime, error) => {
return async (dispatch) => {
if (error && error.isCancelled) {
@@ -262,7 +260,6 @@ export const queryErrored = createThunkAction(
},
);
-export const CANCEL_QUERY = "metabase/qb/CANCEL_QUERY";
export const cancelQuery = () => (dispatch: Dispatch, getState: GetState) => {
const isRunning = getIsRunning(getState());
if (isRunning) {
diff --git a/frontend/src/metabase/query_builder/actions/ui.ts b/frontend/src/metabase/query_builder/actions/ui.ts
index cc50731b58e..6a983e41aee 100644
--- a/frontend/src/metabase/query_builder/actions/ui.ts
+++ b/frontend/src/metabase/query_builder/actions/ui.ts
@@ -1,8 +1,10 @@
-import { createAction } from "redux-actions";
-
-import { updateSetting } from "metabase/admin/settings/settings";
import { getOriginalCard } from "metabase/query_builder/selectors";
-import { updateUserSetting } from "metabase/redux/settings";
+import {
+ CANCEL_QUERY,
+ CANCEL_QUESTION_CHANGES,
+ setUIControls,
+} from "metabase/redux/query-builder";
+import { updateSetting, updateUserSetting } from "metabase/redux/settings";
import type { Card } from "metabase-types/api";
import type {
DatasetEditorTab,
@@ -15,14 +17,6 @@ import { trackFirstNonTableChartGenerated } from "../analytics";
import { updateUrl } from "./url";
-const CANCEL_QUERY = "metabase/qb/CANCEL_QUERY";
-
-export const SET_UI_CONTROLS = "metabase/qb/SET_UI_CONTROLS";
-export const setUIControls = createAction(SET_UI_CONTROLS);
-
-export const RESET_UI_CONTROLS = "metabase/qb/RESET_UI_CONTROLS";
-export const resetUIControls = createAction(RESET_UI_CONTROLS);
-
export const setQueryBuilderMode =
(
queryBuilderMode: QueryBuilderMode,
@@ -54,67 +48,6 @@ export const setQueryBuilderMode =
}
};
-export const EDIT_SUMMARY = "metabase/qb/EDIT_SUMMARY";
-export const editSummary = createAction(EDIT_SUMMARY);
-
-export const ON_CLOSE_SUMMARY = "metabase/qb/ON_CLOSE_SUMMARY";
-export const onCloseSummary = createAction(ON_CLOSE_SUMMARY);
-
-export const OPEN_AI_QUESTION_ANALYSIS_SIDEBAR =
- "metabase/qb/OPEN_AI_QUESTION_ANALYSIS_SIDEBAR";
-export const onOpenAIQuestionAnalysisSidebar = createAction(
- OPEN_AI_QUESTION_ANALYSIS_SIDEBAR,
-);
-
-export const CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR =
- "metabase/qb/CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR";
-export const onCloseAIQuestionAnalysisSidebar = createAction(
- CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR,
-);
-
-export const OPEN_CHART_SETTINGS = "metabase/qb/OPEN_CHART_SETTINGS";
-export const onOpenChartSettings = createAction(OPEN_CHART_SETTINGS);
-
-export const CLOSE_CHART_SETTINGS = "metabase/qb/CLOSE_CHART_SETTINGS";
-export const onCloseChartSettings = createAction(CLOSE_CHART_SETTINGS);
-
-export const OPEN_CHART_TYPE = "metabase/qb/OPEN_CHART_TYPE";
-export const onOpenChartType = createAction(OPEN_CHART_TYPE);
-
-export const OPEN_QUESTION_INFO = "metabase/qb/OPEN_QUESTION_INFO";
-export const onOpenQuestionInfo = createAction(OPEN_QUESTION_INFO);
-
-export const CLOSE_QUESTION_INFO = "metabase/qb/CLOSE_QUESTION_INFO";
-export const onCloseQuestionInfo = createAction(CLOSE_QUESTION_INFO);
-
-export const OPEN_QUESTION_SETTINGS = "metabase/qb/OPEN_QUESTION_SETTINGS";
-export const onOpenQuestionSettings = createAction(OPEN_QUESTION_SETTINGS);
-
-export const CLOSE_QUESTION_SETTINGS = "metabase/qb/CLOSE_QUESTION_SETTINGS";
-export const onCloseQuestionSettings = createAction(CLOSE_QUESTION_SETTINGS);
-
-export const OPEN_TIMELINES = "metabase/qb/OPEN_TIMELINES";
-export const onOpenTimelines = createAction(OPEN_TIMELINES);
-
-export const CLOSE_TIMELINES = "metabase/qb/CLOSE_TIMELINES";
-export const onCloseTimelines = createAction(CLOSE_TIMELINES);
-
-export const CLOSE_CHART_TYPE = "metabase/qb/CLOSE_CHART_TYPE";
-export const onCloseChartType = createAction(CLOSE_CHART_TYPE);
-
-export const CLOSE_SIDEBARS = "metabase/qb/CLOSE_SIDEBARS";
-export const onCloseSidebars = createAction(CLOSE_SIDEBARS);
-
-export const SHOW_CHART_SETTINGS = "metabase/qb/SHOW_CHART_SETTINGS";
-export const showChartSettings = createAction(SHOW_CHART_SETTINGS);
-
-export const NAVIGATE_BACK_TO_DASHBOARD =
- "metabase/qb/NAVIGATE_BACK_TO_DASHBOARD";
-export const navigateBackToDashboard = createAction(NAVIGATE_BACK_TO_DASHBOARD);
-
-export const CLOSE_QB = "metabase/qb/CLOSE_QB";
-export const closeQB = createAction(CLOSE_QB);
-
export const setDidFirstNonTableChartRender = (card: Card) => {
trackFirstNonTableChartGenerated(card);
return updateSetting({
@@ -129,7 +62,6 @@ export const setNotebookNativePreviewSidebarWidth = (width: number) =>
value: width,
});
-export const CANCEL_QUESTION_CHANGES = "metabase/qb/CANCEL_QUESTION_CHANGES";
export const cancelQuestionChanges =
() => (dispatch: Dispatch, getState: GetState) => {
const cardBeforeChanges = getOriginalCard(getState());
diff --git a/frontend/src/metabase/query_builder/actions/zoom.ts b/frontend/src/metabase/query_builder/actions/zoom.ts
index 393d5f7ea56..6a3b8574467 100644
--- a/frontend/src/metabase/query_builder/actions/zoom.ts
+++ b/frontend/src/metabase/query_builder/actions/zoom.ts
@@ -1,3 +1,4 @@
+import { ZOOM_IN_ROW } from "metabase/redux/query-builder";
import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";
import type { Dispatch, GetState } from "metabase-types/store";
@@ -5,7 +6,6 @@ import { getPKColumnIndex } from "../selectors";
import { updateUrl } from "./url";
-export const ZOOM_IN_ROW = "metabase/qb/ZOOM_IN_ROW";
export const zoomInRow =
({ objectId }: { objectId: ObjectId }) =>
(dispatch: Dispatch, getState: GetState) => {
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
index 805a654b40b..23dd143f4f8 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
@@ -29,7 +29,6 @@ import { getSemanticTypeIcon } from "metabase/lib/schema_metadata";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import {
setDatasetEditorTab,
- setUIControls,
updateQuestion as updateQuestionAction,
} from "metabase/query_builder/actions";
import { getInitialEditorHeight } from "metabase/query_builder/components/NativeQueryEditor/utils";
@@ -50,6 +49,7 @@ import type { DataReferenceItem } from "metabase/querying/components/DataReferen
import { QueryVisualization } from "metabase/querying/components/QueryVisualization";
import { SnippetSidebar } from "metabase/querying/components/SnippetSidebar";
import { MODAL_TYPES } from "metabase/querying/constants";
+import { setUIControls } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Flex, Icon, Tooltip } from "metabase/ui";
import {
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
index 79c70482c4e..ecf134d9129 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
@@ -1,11 +1,11 @@
import { t } from "ttag";
import { useDispatch, useSelector } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
import {
getIsListViewConfigurationShown,
getTransformedSeries,
} from "metabase/query_builder/selectors";
+import { setUIControls } from "metabase/redux/query-builder";
import { Button, Group, SegmentedControl, Stack, Text } from "metabase/ui";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { CardDisplayType } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
index c72b7951fd9..31e6bef3fa4 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
@@ -4,11 +4,11 @@ import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen"
import { ViewFooterButton } from "metabase/common/components/ViewFooterButton";
import { trackSimpleEvent } from "metabase/lib/analytics";
import { useDispatch, useSelector } from "metabase/lib/redux";
+import { getUiControls } from "metabase/query_builder/selectors";
import {
onCloseTimelines,
onOpenTimelines,
-} from "metabase/query_builder/actions";
-import { getUiControls } from "metabase/query_builder/selectors";
+} from "metabase/redux/query-builder";
import { Indicator } from "metabase/ui";
export interface QuestionTimelineWidgetProps {
diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx
index c14f92cc2b5..8895dad53d1 100644
--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx
@@ -6,15 +6,13 @@ import { useWindowSize } from "react-use";
import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";
import { useDispatch, useSelector } from "metabase/lib/redux";
-import {
- setNotebookNativePreviewSidebarWidth,
- setUIControls,
-} from "metabase/query_builder/actions";
+import { setNotebookNativePreviewSidebarWidth } from "metabase/query_builder/actions";
import { getUiControls } from "metabase/query_builder/selectors";
import {
Notebook,
type NotebookProps,
} from "metabase/querying/notebook/components/Notebook";
+import { setUIControls } from "metabase/redux/query-builder";
import { Box, Flex, rem } from "metabase/ui";
import { canShowNativePreview } from "../../ViewHeader/utils";
diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
index 529fa9f9ff2..3089ea0b6f0 100644
--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
@@ -2,9 +2,10 @@ import { useCallback } from "react";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { checkNotNull } from "metabase/lib/types";
-import { setUIControls, updateQuestion } from "metabase/query_builder/actions";
+import { updateQuestion } from "metabase/query_builder/actions";
import { getQuestion } from "metabase/query_builder/selectors";
import { NotebookNativePreview as ControlledNotebookNativePreview } from "metabase/querying/notebook/components/NotebookNativePreview";
+import { setUIControls } from "metabase/redux/query-builder";
import type Question from "metabase-lib/v1/Question";
export const NotebookNativePreview = () => {
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx
index 2a5bb8857c7..41d0b766d35 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx
@@ -1,7 +1,7 @@
import CS from "metabase/css/core/index.css";
import { useDispatch, useSelector } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
import { getUiControls } from "metabase/query_builder/selectors";
+import { setUIControls } from "metabase/redux/query-builder";
import { QuestionDisplayToggle } from "../QuestionDisplayToggle/QuestionDisplayToggle";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
index 81ce9c1198e..4143988b411 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
@@ -6,13 +6,13 @@ import { ViewButton } from "metabase/common/components/ViewButton";
import CS from "metabase/css/core/index.css";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
+import { getQuestion, getUiControls } from "metabase/query_builder/selectors";
import {
onCloseChartSettings,
onCloseChartType,
onOpenChartSettings,
onOpenChartType,
-} from "metabase/query_builder/actions";
-import { getQuestion, getUiControls } from "metabase/query_builder/selectors";
+} from "metabase/redux/query-builder";
import { Group } from "metabase/ui";
import type { QueryBuilderUIControls } from "metabase-types/store";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
index dbb73b6ef12..d85b2efc14d 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
@@ -5,8 +5,8 @@ import { t } from "ttag";
import { useTranslateContent } from "metabase/i18n/hooks";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { navigateBackToDashboard } from "metabase/query_builder/actions";
import { getParentEntity } from "metabase/query_builder/selectors";
+import { navigateBackToDashboard } from "metabase/redux/query-builder";
import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";
import type { CollectionItemModel, DashboardId } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
index 219a5eadc3e..57d0df8b15a 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
@@ -7,6 +7,7 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { UploadInput } from "metabase/common/components/upload";
import { useDispatch } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
+import { runQuestionQuery } from "metabase/query_builder/actions";
import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";
import type { QueryModalType } from "metabase/querying/constants";
import { uploadFile } from "metabase/redux/uploads";
@@ -84,7 +85,7 @@ export const QuestionActions = ({
uploadFile({
file,
tableId: question._card.based_on_upload,
- reloadQuestionData: true,
+ onUploadComplete: () => dispatch(runQuestionQuery()),
uploadMode,
}),
);
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
index b2188b9ec86..a572bede92f 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
@@ -9,7 +9,6 @@ import { useDispatch, useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { PLUGIN_MODERATION } from "metabase/plugins";
import {
- onOpenQuestionSettings,
softReloadCard,
turnModelIntoQuestion,
turnQuestionIntoModel,
@@ -19,6 +18,7 @@ import { DatasetMetadataStrengthIndicator } from "metabase/query_builder/compone
import { shouldShowQuestionSettingsSidebar } from "metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar";
import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";
import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import { onOpenQuestionSettings } from "metabase/redux/query-builder";
import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";
import { Icon, Menu } from "metabase/ui";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
index 1afc00e40d1..ebe913605c4 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { getEngineNativeType } from "metabase/lib/engine";
import { useDispatch, useSelector } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
import { trackNotebookNativePreviewShown } from "metabase/query_builder/analytics";
import { getUiControls } from "metabase/query_builder/selectors";
+import { setUIControls } from "metabase/redux/query-builder";
import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
index 28cc5ff0668..e09b4d8c63f 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
@@ -5,15 +5,15 @@ import ErrorBoundary from "metabase/ErrorBoundary";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import CS from "metabase/css/core/index.css";
import { useDispatch, useSelector } from "metabase/lib/redux";
-import {
- onCloseChartSettings,
- onOpenChartType,
- onReplaceAllVisualizationSettings,
-} from "metabase/query_builder/actions";
+import { onReplaceAllVisualizationSettings } from "metabase/query_builder/actions";
import {
getUiControls,
getVisualizationSettings,
} from "metabase/query_builder/selectors";
+import {
+ onCloseChartSettings,
+ onOpenChartType,
+} from "metabase/redux/query-builder";
import visualizations from "metabase/visualizations";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx
index b1aa5b1fc82..7bfd253745d 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx
@@ -5,12 +5,7 @@ import { t } from "ttag";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import CS from "metabase/css/core/index.css";
import { useDispatch } from "metabase/lib/redux";
-import {
- onCloseChartType,
- onOpenChartSettings,
- setUIControls,
- updateQuestion,
-} from "metabase/query_builder/actions";
+import { updateQuestion } from "metabase/query_builder/actions";
import {
ChartTypeSettings,
type GetSensibleVisualizationsProps,
@@ -18,6 +13,11 @@ import {
getSensibleVisualizations,
useQuestionVisualizationState,
} from "metabase/query_builder/components/chart-type-selector";
+import {
+ onCloseChartType,
+ onOpenChartSettings,
+ setUIControls,
+} from "metabase/redux/query-builder";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { CardDisplayType } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
index 87fa57c32a6..8d445835972 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
@@ -19,8 +19,8 @@ import { InsightsUpsellTab } from "metabase/dashboard/components/DashboardInfoSi
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_MODERATION } from "metabase/plugins";
-import { onCloseQuestionInfo } from "metabase/query_builder/actions";
import { QuestionActivityTimeline } from "metabase/query_builder/components/QuestionActivityTimeline";
+import { onCloseQuestionInfo } from "metabase/redux/query-builder";
import { Flex, Icon, Stack, Tabs } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx
index 0085b0f054f..85cea0672cc 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx
@@ -6,7 +6,7 @@ import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";
import { useDispatch } from "metabase/lib/redux";
import { PLUGIN_CACHING, PLUGIN_MODEL_PERSISTENCE } from "metabase/plugins";
-import { onCloseQuestionSettings } from "metabase/query_builder/actions";
+import { onCloseQuestionSettings } from "metabase/redux/query-builder";
import { Stack, useModalsStack } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
index 850b5ebd6e1..cc93ebd5cb0 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
@@ -25,6 +25,28 @@ import {
getSampleDatabaseId,
} from "metabase/querying/selectors";
import { closeNavbar } from "metabase/redux/app";
+import {
+ closeQB,
+ closeQbNewbModal,
+ editSummary,
+ navigateBackToDashboard,
+ onCloseAIQuestionAnalysisSidebar,
+ onCloseChartSettings,
+ onCloseChartType,
+ onCloseQuestionInfo,
+ onCloseQuestionSettings,
+ onCloseSidebars,
+ onCloseSummary,
+ onCloseTimelines,
+ onOpenAIQuestionAnalysisSidebar,
+ onOpenChartSettings,
+ onOpenChartType,
+ onOpenQuestionInfo,
+ onOpenQuestionSettings,
+ onOpenTimelines,
+ setParameterValue,
+ setUIControls,
+} from "metabase/redux/query-builder";
import { getIsNavbarOpen } from "metabase/selectors/app";
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
@@ -41,7 +63,63 @@ import type {
} from "metabase-types/api";
import type { QueryBuilderUIControls, State } from "metabase-types/store";
-import * as actions from "../actions";
+import {
+ cancelQuery,
+ cancelQuestionChanges,
+ closeObjectDetail,
+ closeSnippetModal,
+ deselectTimelineEvents,
+ followForeignKey,
+ hideTimelineEvents,
+ initializeQB,
+ insertSnippet,
+ loadObjectDetailFKReferences,
+ locationChanged,
+ navigateToNewCardInsideQB,
+ onCancelCreateNewModel,
+ onModelPersistenceChange,
+ onReplaceAllVisualizationSettings,
+ onUpdateVisualizationSettings,
+ openDataReferenceAtQuestion,
+ openSnippetModalWithSelectedText,
+ popDataReferenceStack,
+ pushDataReferenceStack,
+ queryCompleted,
+ queryErrored,
+ resetRowZoom,
+ runDirtyQuestionQuery,
+ runOrCancelQuestionOrSelectedQuery,
+ runQuestionQuery,
+ selectTimelineEvents,
+ setCurrentState,
+ setDatasetEditorTab,
+ setDatasetQuery,
+ setDidFirstNonTableChartRender,
+ setIsNativeEditorOpen,
+ setIsShowingSnippetSidebar,
+ setLimit,
+ setMetadataDiff,
+ setModalSnippet,
+ setNativeEditorSelectedRange,
+ setNotebookNativePreviewSidebarWidth,
+ setParameterValueToDefault,
+ setQueryBuilderMode,
+ setSnippetCollectionId,
+ setTemplateTag,
+ setTemplateTagConfig,
+ showTimelineEvents,
+ showTimelinesForCollection,
+ softReloadCard,
+ toggleDataReference,
+ toggleSnippetSidebar,
+ toggleTemplateTagsEditor,
+ turnModelIntoQuestion,
+ turnQuestionIntoModel,
+ updateQuestion,
+ viewNextObjectDetail,
+ viewPreviousObjectDetail,
+ zoomInRow,
+} from "../actions";
import { trackCardBookmarkAdded } from "../analytics";
import { View } from "../components/view/View";
import {
@@ -201,7 +279,86 @@ const mapStateToProps = (state: State, props: EntityListLoaderMergedProps) => {
};
const mapDispatchToProps = {
- ...actions,
+ // from metabase/redux/query-builder (shared tier)
+ closeQB,
+ closeQbNewbModal,
+ navigateBackToDashboard,
+ onCloseAIQuestionAnalysisSidebar,
+ onCloseChartSettings,
+ onCloseChartType,
+ onCloseQuestionInfo,
+ onCloseQuestionSettings,
+ onCloseSidebars,
+ onCloseSummary,
+ onCloseTimelines,
+ editSummary,
+ onOpenAIQuestionAnalysisSidebar,
+ onOpenChartSettings,
+ onOpenChartType,
+ onOpenQuestionInfo,
+ onOpenQuestionSettings,
+ onOpenTimelines,
+ setParameterValue,
+ setUIControls,
+
+ // from query_builder/actions
+ cancelQuery,
+ cancelQuestionChanges,
+ closeObjectDetail,
+ closeSnippetModal,
+ deselectTimelineEvents,
+ followForeignKey,
+ hideTimelineEvents,
+ initializeQB,
+ insertSnippet,
+ loadObjectDetailFKReferences,
+ locationChanged,
+ navigateToNewCardInsideQB,
+ onCancelCreateNewModel,
+ onModelPersistenceChange,
+ onReplaceAllVisualizationSettings,
+ onUpdateVisualizationSettings,
+ openDataReferenceAtQuestion,
+ openSnippetModalWithSelectedText,
+ popDataReferenceStack,
+ pushDataReferenceStack,
+ queryCompleted,
+ queryErrored,
+ resetRowZoom,
+ runDirtyQuestionQuery,
+ runOrCancelQuestionOrSelectedQuery,
+ runQuestionQuery,
+ selectTimelineEvents,
+ setCurrentState,
+ setDatasetEditorTab,
+ setDatasetQuery,
+ setDidFirstNonTableChartRender,
+ setIsNativeEditorOpen,
+ setIsShowingSnippetSidebar,
+ setLimit,
+ setMetadataDiff,
+ setModalSnippet,
+ setNativeEditorSelectedRange,
+ setNotebookNativePreviewSidebarWidth,
+ setParameterValueToDefault,
+ setQueryBuilderMode,
+ setSnippetCollectionId,
+ setTemplateTag,
+ setTemplateTagConfig,
+ showTimelineEvents,
+ showTimelinesForCollection,
+ softReloadCard,
+ toggleDataReference,
+ toggleSnippetSidebar,
+ toggleTemplateTagsEditor,
+ turnModelIntoQuestion,
+ turnQuestionIntoModel,
+ updateQuestion,
+ viewNextObjectDetail,
+ viewPreviousObjectDetail,
+ zoomInRow,
+
+ // other
closeNavbar,
onChangeLocation: push,
createBookmark: (id: BookmarkId) =>
diff --git a/frontend/src/metabase/query_builder/containers/use-create-question.ts b/frontend/src/metabase/query_builder/containers/use-create-question.ts
index 02a91f7565a..5ca5ba0fda2 100644
--- a/frontend/src/metabase/query_builder/containers/use-create-question.ts
+++ b/frontend/src/metabase/query_builder/containers/use-create-question.ts
@@ -2,10 +2,8 @@ import { useCallback } from "react";
import type { ScheduleCallback } from "metabase/common/hooks/use-callback-effect";
import { useDispatch } from "metabase/lib/redux";
-import {
- apiCreateQuestion,
- setUIControls,
-} from "metabase/query_builder/actions";
+import { apiCreateQuestion } from "metabase/query_builder/actions";
+import { setUIControls } from "metabase/redux/query-builder";
import type Question from "metabase-lib/v1/Question";
import type { DashboardTabId } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/containers/use-save-question.ts b/frontend/src/metabase/query_builder/containers/use-save-question.ts
index 9fe36abe815..00e14310a13 100644
--- a/frontend/src/metabase/query_builder/containers/use-save-question.ts
+++ b/frontend/src/metabase/query_builder/containers/use-save-question.ts
@@ -2,10 +2,10 @@ import { useCallback } from "react";
import type { ScheduleCallback } from "metabase/common/hooks/use-callback-effect";
import { useDispatch } from "metabase/lib/redux";
+import { setUIControls } from "metabase/redux/query-builder";
import type Question from "metabase-lib/v1/Question";
import { apiUpdateQuestion } from "../actions/core/core";
-import { setUIControls } from "../actions/ui";
import { updateUrl } from "../actions/url";
interface UseSaveQuestionParams {
diff --git a/frontend/src/metabase/query_builder/reducers.ts b/frontend/src/metabase/query_builder/reducers.ts
index 7f36940b2a5..367a81384df 100644
--- a/frontend/src/metabase/query_builder/reducers.ts
+++ b/frontend/src/metabase/query_builder/reducers.ts
@@ -8,38 +8,14 @@ import {
updateCardEmbeddingParams,
updateCardEnableEmbedding,
} from "metabase/api";
-import {
- EDIT_QUESTION,
- NAVIGATE_TO_NEW_CARD,
-} from "metabase/dashboard/actions";
import { TimelineEvents } from "metabase/entities/timeline-events";
import type { Deferred } from "metabase/lib/promise";
import { copy } from "metabase/lib/utils";
-import type {
- Card,
- CollectionItemModel,
- Dataset,
- Field,
- NativeQuerySnippet,
- ParameterValuesMap,
- TimelineEvent,
-} from "metabase-types/api";
-import type {
- ForeignKeyReference,
- InitialChartSettingState,
- QueryBuilderLoadingControls,
- QueryBuilderParentEntityState,
- QueryBuilderQueryStatus,
- QueryBuilderUIControls,
- Range,
-} from "metabase-types/store";
-
+import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";
import {
- API_CREATE_QUESTION,
API_UPDATE_QUESTION,
CANCEL_QUERY,
CANCEL_QUESTION_CHANGES,
- CLEAR_OBJECT_DETAIL_FK_REFERENCES,
CLEAR_QUERY_RESULT,
CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR,
CLOSE_CHART_SETTINGS,
@@ -50,48 +26,71 @@ import {
CLOSE_QUESTION_SETTINGS,
CLOSE_SIDEBARS,
CLOSE_TIMELINES,
- DESELECT_TIMELINE_EVENTS,
EDIT_SUMMARY,
- HIDE_TIMELINE_EVENTS,
INITIALIZE_QB,
- LOAD_OBJECT_DETAIL_FK_REFERENCES,
ON_CLOSE_SUMMARY,
OPEN_AI_QUESTION_ANALYSIS_SIDEBAR,
OPEN_CHART_SETTINGS,
OPEN_CHART_TYPE,
- OPEN_DATA_REFERENCE_AT_QUESTION,
OPEN_QUESTION_INFO,
OPEN_QUESTION_SETTINGS,
OPEN_TIMELINES,
QUERY_COMPLETED,
QUERY_ERRORED,
- RELOAD_CARD,
RESET_QB,
RESET_ROW_ZOOM,
RESET_UI_CONTROLS,
RUN_QUERY,
+ SET_DOCUMENT_TITLE,
+ SET_DOCUMENT_TITLE_TIMEOUT_ID,
+ SET_PARAMETER_VALUE,
+ SET_SHOW_LOADING_COMPLETE_FAVICON,
+ SET_UI_CONTROLS,
+ SHOW_CHART_SETTINGS,
+ SOFT_RELOAD_CARD,
+ ZOOM_IN_ROW,
+} from "metabase/redux/query-builder";
+import type {
+ Card,
+ CollectionItemModel,
+ Dataset,
+ Field,
+ NativeQuerySnippet,
+ ParameterValuesMap,
+ TimelineEvent,
+} from "metabase-types/api";
+import type {
+ ForeignKeyReference,
+ InitialChartSettingState,
+ QueryBuilderLoadingControls,
+ QueryBuilderParentEntityState,
+ QueryBuilderQueryStatus,
+ QueryBuilderUIControls,
+ Range,
+} from "metabase-types/store";
+
+import {
+ API_CREATE_QUESTION,
+ CLEAR_OBJECT_DETAIL_FK_REFERENCES,
+ DESELECT_TIMELINE_EVENTS,
+ HIDE_TIMELINE_EVENTS,
+ LOAD_OBJECT_DETAIL_FK_REFERENCES,
+ OPEN_DATA_REFERENCE_AT_QUESTION,
+ RELOAD_CARD,
SELECT_TIMELINE_EVENTS,
SET_CARD_AND_RUN,
SET_CURRENT_STATE,
SET_DATA_REFERENCE_STACK,
- SET_DOCUMENT_TITLE,
- SET_DOCUMENT_TITLE_TIMEOUT_ID,
SET_IS_SHOWING_TEMPLATE_TAGS_EDITOR,
SET_METADATA_DIFF,
SET_MODAL_SNIPPET,
SET_NATIVE_EDITOR_SELECTED_RANGE,
- SET_PARAMETER_VALUE,
- SET_SHOW_LOADING_COMPLETE_FAVICON,
SET_SNIPPET_COLLECTION_ID,
- SET_UI_CONTROLS,
- SHOW_CHART_SETTINGS,
SHOW_TIMELINE_EVENTS,
- SOFT_RELOAD_CARD,
TOGGLE_DATA_REFERENCE,
TOGGLE_SNIPPET_SIDEBAR,
TOGGLE_TEMPLATE_TAGS_EDITOR,
UPDATE_QUESTION,
- ZOOM_IN_ROW,
} from "./actions";
import {
CLOSED_NATIVE_EDITOR_SIDEBARS,
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
index 3f6a5be07b1..af21eee8441 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
@@ -9,6 +9,7 @@ import ButtonsS from "metabase/css/components/buttons.module.css";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { CreateOrEditQuestionAlertModalWithQuestion } from "metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal";
+import { zoomInRow } from "metabase/query_builder/actions";
import Visualization from "metabase/visualizations/components/Visualization";
import * as Lib from "metabase-lib";
import { ALERT_TYPE_ROWS } from "metabase-lib/v1/Alert";
@@ -150,6 +151,7 @@ export class VisualizationResult extends Component {
timelineEvents={timelineEvents}
token={token}
selectedTimelineEventIds={selectedTimelineEventIds}
+ getExtraDataForClick={() => ({ zoomInRow })}
handleVisualizationClick={this.props.handleVisualizationClick}
onOpenTimelines={this.props.onOpenTimelines}
onSelectTimelineEvents={this.props.selectTimelineEvents}
diff --git a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx
index de003773bca..9c34d49ff98 100644
--- a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx
+++ b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx
@@ -1,7 +1,7 @@
import { c } from "ttag";
import { useDispatch } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
+import { setUIControls } from "metabase/redux/query-builder";
import { ClickActionsView } from "metabase/visualizations/components/ClickActions";
import type {
ClickActionPopoverProps,
diff --git a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx
index a72f096e458..f5ebd56c94a 100644
--- a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx
+++ b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { useDispatch } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
+import { setUIControls } from "metabase/redux/query-builder";
import { Box, Title } from "metabase/ui";
import type {
ClickActionPopoverProps,
diff --git a/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts b/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts
index 0c81b97c110..bb5b6f3ea00 100644
--- a/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts
+++ b/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { editSummary } from "metabase/query_builder/actions";
+import { editSummary } from "metabase/redux/query-builder";
import type {
ClickActionBase,
Drill,
diff --git a/frontend/src/metabase/querying/drills/utils/zoom-drill.ts b/frontend/src/metabase/querying/drills/utils/zoom-drill.ts
index 5a339dbe721..afd2b33530b 100644
--- a/frontend/src/metabase/querying/drills/utils/zoom-drill.ts
+++ b/frontend/src/metabase/querying/drills/utils/zoom-drill.ts
@@ -1,8 +1,10 @@
import { t } from "ttag";
-import { zoomInRow } from "metabase/query_builder/actions";
import type { Drill } from "metabase/visualizations/types/click-actions";
import type * as Lib from "metabase-lib";
+import type { Dispatch, GetState } from "metabase-types/store";
+
+type Dispatcher = (dispatch: Dispatch, getState: GetState) => void;
export const zoomDrill: Drill<Lib.ZoomDrillThruInfo> = ({
drill,
@@ -12,19 +14,27 @@ export const zoomDrill: Drill<Lib.ZoomDrillThruInfo> = ({
}) => {
const { objectId, isManyPks } = drillInfo;
const isDashboard = clicked.extraData?.dashboard != null;
+ const zoomInRow = clicked.extraData?.zoomInRow as
+ | ((opts: { objectId: string | number }) => Dispatcher)
+ | undefined;
+
+ const base = {
+ name: "zoom",
+ section: "details",
+ title: t`View details`,
+ buttonType: "horizontal",
+ icon: "sidebar_open",
+ default: true,
+ ...(!isManyPks ? { extra: () => ({ objectId }) } : {}),
+ } as const;
+
+ if (isDashboard) {
+ return [{ ...base, question: () => applyDrill(drill, objectId) }];
+ }
+
+ if (zoomInRow) {
+ return [{ ...base, action: () => zoomInRow({ objectId }) }];
+ }
- return [
- {
- name: "zoom",
- section: "details",
- title: t`View details`,
- buttonType: "horizontal",
- icon: "sidebar_open",
- default: true,
- ...(isDashboard
- ? { question: () => applyDrill(drill, objectId) }
- : { action: () => zoomInRow({ objectId }) }),
- ...(!isManyPks ? { extra: () => ({ objectId }) } : {}),
- },
- ];
+ return [];
};
diff --git a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx
index 975a4a1be25..4c262b60b4b 100644
--- a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx
+++ b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx
@@ -1,6 +1,6 @@
import type { DataPickerValue } from "metabase/common/components/Pickers/DataPicker";
import { useDispatch } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
+import { setUIControls } from "metabase/redux/query-builder";
import { Box } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
index 34994ae8a6f..2b88a7c0068 100644
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
@@ -18,7 +18,7 @@ import { Dashboards } from "metabase/entities/dashboards";
import { INJECT_RTK_QUERY_QUESTION_VALUE } from "metabase/entities/questions";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { API_UPDATE_QUESTION } from "metabase/query_builder/actions";
+import { API_UPDATE_QUESTION } from "metabase/redux/query-builder";
import { addUndo } from "metabase/redux/undo";
import { Box, Icon, Radio, Title } from "metabase/ui";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/redux/dashboard.ts b/frontend/src/metabase/redux/dashboard.ts
new file mode 100644
index 00000000000..f29427ce6c8
--- /dev/null
+++ b/frontend/src/metabase/redux/dashboard.ts
@@ -0,0 +1,37 @@
+import { createAction } from "@reduxjs/toolkit";
+
+import { createAction as createLegacyAction } from "metabase/lib/redux";
+import type { DashboardTabId } from "metabase-types/api";
+
+export const INITIALIZE = "metabase/dashboard/INITIALIZE";
+export const initialize = createAction<{ clearCache?: boolean } | undefined>(
+ INITIALIZE,
+);
+
+export const RESET = "metabase/dashboard/RESET";
+export const reset = createAction(RESET);
+
+export const SET_PARAMETER_VALUES = "metabase/dashboard/SET_PARAMETER_VALUES";
+export const setParameterValues = createLegacyAction(SET_PARAMETER_VALUES);
+
+export const SHOW_ADD_PARAMETER_POPOVER =
+ "metabase/dashboard/SHOW_ADD_PARAMETER_POPOVER";
+export const showAddParameterPopover = createLegacyAction(
+ SHOW_ADD_PARAMETER_POPOVER,
+);
+
+export const SELECT_TAB = "metabase/dashboard/SELECT_TAB";
+
+type SelectTabPayload = {
+ tabId: DashboardTabId | null;
+};
+
+export const selectTab = createAction<SelectTabPayload>(SELECT_TAB);
+
+export const UPDATE_DASHBOARD_AND_CARDS =
+ "metabase/dashboard/UPDATE_DASHBOARD_AND_CARDS";
+
+export const EDIT_QUESTION = "metabase/dashboard/EDIT_QUESTION";
+export const NAVIGATE_TO_NEW_CARD = "metabase/dashboard/NAVIGATE_TO_NEW_CARD";
+
+export const REVERT_TO_REVISION = "metabase/dashboard/REVERT_TO_REVISION";
diff --git a/frontend/src/metabase/redux/query-builder.ts b/frontend/src/metabase/redux/query-builder.ts
new file mode 100644
index 00000000000..e56f4c08dfe
--- /dev/null
+++ b/frontend/src/metabase/redux/query-builder.ts
@@ -0,0 +1,130 @@
+import { createAction } from "redux-actions";
+
+import { createThunkAction } from "metabase/lib/redux";
+import { checkNotNull } from "metabase/lib/types";
+import { UserApi } from "metabase/services";
+import type { ParameterId, ParameterValueOrArray } from "metabase-types/api";
+
+export const SET_UI_CONTROLS = "metabase/qb/SET_UI_CONTROLS";
+export const setUIControls = createAction(SET_UI_CONTROLS);
+
+export const RESET_UI_CONTROLS = "metabase/qb/RESET_UI_CONTROLS";
+export const resetUIControls = createAction(RESET_UI_CONTROLS);
+
+export const NAVIGATE_BACK_TO_DASHBOARD =
+ "metabase/qb/NAVIGATE_BACK_TO_DASHBOARD";
+export const navigateBackToDashboard = createAction(NAVIGATE_BACK_TO_DASHBOARD);
+
+export const CLOSE_QB = "metabase/qb/CLOSE_QB";
+export const closeQB = createAction(CLOSE_QB);
+
+export const SHOW_CHART_SETTINGS = "metabase/qb/SHOW_CHART_SETTINGS";
+export const showChartSettings = createAction(SHOW_CHART_SETTINGS);
+
+export const CANCEL_QUESTION_CHANGES = "metabase/qb/CANCEL_QUESTION_CHANGES";
+
+export const EDIT_SUMMARY = "metabase/qb/EDIT_SUMMARY";
+export const editSummary = createAction(EDIT_SUMMARY);
+
+export const ON_CLOSE_SUMMARY = "metabase/qb/ON_CLOSE_SUMMARY";
+export const onCloseSummary = createAction(ON_CLOSE_SUMMARY);
+
+export const OPEN_AI_QUESTION_ANALYSIS_SIDEBAR =
+ "metabase/qb/OPEN_AI_QUESTION_ANALYSIS_SIDEBAR";
+export const onOpenAIQuestionAnalysisSidebar = createAction(
+ OPEN_AI_QUESTION_ANALYSIS_SIDEBAR,
+);
+
+export const CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR =
+ "metabase/qb/CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR";
+export const onCloseAIQuestionAnalysisSidebar = createAction(
+ CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR,
+);
+
+export const OPEN_CHART_SETTINGS = "metabase/qb/OPEN_CHART_SETTINGS";
+export const onOpenChartSettings = createAction(OPEN_CHART_SETTINGS);
+
+export const CLOSE_CHART_SETTINGS = "metabase/qb/CLOSE_CHART_SETTINGS";
+export const onCloseChartSettings = createAction(CLOSE_CHART_SETTINGS);
+
+export const OPEN_CHART_TYPE = "metabase/qb/OPEN_CHART_TYPE";
+export const onOpenChartType = createAction(OPEN_CHART_TYPE);
+
+export const OPEN_QUESTION_INFO = "metabase/qb/OPEN_QUESTION_INFO";
+export const onOpenQuestionInfo = createAction(OPEN_QUESTION_INFO);
+
+export const CLOSE_QUESTION_INFO = "metabase/qb/CLOSE_QUESTION_INFO";
+export const onCloseQuestionInfo = createAction(CLOSE_QUESTION_INFO);
+
+export const OPEN_QUESTION_SETTINGS = "metabase/qb/OPEN_QUESTION_SETTINGS";
+export const onOpenQuestionSettings = createAction(OPEN_QUESTION_SETTINGS);
+
+export const CLOSE_QUESTION_SETTINGS = "metabase/qb/CLOSE_QUESTION_SETTINGS";
+export const onCloseQuestionSettings = createAction(CLOSE_QUESTION_SETTINGS);
+
+export const OPEN_TIMELINES = "metabase/qb/OPEN_TIMELINES";
+export const onOpenTimelines = createAction(OPEN_TIMELINES);
+
+export const CLOSE_TIMELINES = "metabase/qb/CLOSE_TIMELINES";
+export const onCloseTimelines = createAction(CLOSE_TIMELINES);
+
+export const CLOSE_CHART_TYPE = "metabase/qb/CLOSE_CHART_TYPE";
+export const onCloseChartType = createAction(CLOSE_CHART_TYPE);
+
+export const CLOSE_SIDEBARS = "metabase/qb/CLOSE_SIDEBARS";
+export const onCloseSidebars = createAction(CLOSE_SIDEBARS);
+
+export const CLEAR_QUERY_RESULT = "metabase/query_builder/CLEAR_QUERY_RESULT";
+export const clearQueryResult = createAction(CLEAR_QUERY_RESULT);
+
+export const SET_DOCUMENT_TITLE = "metabase/qb/SET_DOCUMENT_TITLE";
+export const SET_SHOW_LOADING_COMPLETE_FAVICON =
+ "metabase/qb/SET_SHOW_LOADING_COMPLETE_FAVICON";
+export const SET_DOCUMENT_TITLE_TIMEOUT_ID =
+ "metabase/qb/SET_DOCUMENT_TITLE_TIMEOUT_ID";
+
+export const RUN_QUERY = "metabase/qb/RUN_QUERY";
+export const QUERY_COMPLETED = "metabase/qb/QUERY_COMPLETED";
+export const QUERY_ERRORED = "metabase/qb/QUERY_ERRORED";
+export const CANCEL_QUERY = "metabase/qb/CANCEL_QUERY";
+
+export const SOFT_RELOAD_CARD = "metabase/qb/SOFT_RELOAD_CARD";
+export const API_UPDATE_QUESTION = "metabase/qb/API_UPDATE_QUESTION";
+
+export const RESET_QB = "metabase/qb/RESET_QB";
+export const resetQB = createAction(RESET_QB);
+
+export const SET_PARAMETER_VALUE = "metabase/qb/SET_PARAMETER_VALUE";
+export const setParameterValue = createAction(
+ SET_PARAMETER_VALUE,
+ (parameterId: ParameterId, value: ParameterValueOrArray | null) => {
+ return { id: parameterId, value: normalizeValue(value) };
+ },
+);
+
+function normalizeValue(
+ value: ParameterValueOrArray | null,
+): ParameterValueOrArray | null {
+ if (value === "") {
+ return null;
+ }
+
+ if (Array.isArray(value) && value.length === 0) {
+ return null;
+ }
+
+ return value;
+}
+
+export const INITIALIZE_QB = "metabase/qb/INITIALIZE_QB";
+
+export const ZOOM_IN_ROW = "metabase/qb/ZOOM_IN_ROW";
+export const RESET_ROW_ZOOM = "metabase/qb/RESET_ROW_ZOOM";
+
+export const CLOSE_QB_NEWB_MODAL = "metabase/qb/CLOSE_QB_NEWB_MODAL";
+export const closeQbNewbModal = createThunkAction(CLOSE_QB_NEWB_MODAL, () => {
+ return async (_dispatch, getState) => {
+ const { currentUser } = getState();
+ await UserApi.update_qbnewb({ id: checkNotNull(currentUser).id });
+ };
+});
diff --git a/frontend/src/metabase/redux/settings.ts b/frontend/src/metabase/redux/settings.ts
index 76e16e12c25..d60eb4169bc 100644
--- a/frontend/src/metabase/redux/settings.ts
+++ b/frontend/src/metabase/redux/settings.ts
@@ -1,7 +1,7 @@
import { createAction, createReducer } from "@reduxjs/toolkit";
import { sessionApi } from "metabase/api";
-import { createAsyncThunk } from "metabase/lib/redux";
+import { createAsyncThunk, createThunkAction } from "metabase/lib/redux";
import { SettingsApi } from "metabase/services";
import type { Settings, UserSettings } from "metabase-types/api";
@@ -61,6 +61,23 @@ export const updateUserSetting = createAsyncThunk(
},
);
+export const UPDATE_SETTING = "metabase/admin/settings/UPDATE_SETTING";
+export const updateSetting = createThunkAction(
+ UPDATE_SETTING,
+ function (setting: { key: string; value: unknown }) {
+ return async function (dispatch: any) {
+ try {
+ await SettingsApi.put(setting);
+ } catch (error) {
+ console.error("error updating setting", setting, error);
+ throw error;
+ } finally {
+ await dispatch(refreshSiteSettings());
+ }
+ };
+ },
+);
+
export const settings = createReducer(
// note: this sets the initial state to the current values in the window object
// this is necessary so that we never have empty settings
diff --git a/frontend/src/metabase/redux/uploads.ts b/frontend/src/metabase/redux/uploads.ts
index 91383795615..38e8bee113a 100644
--- a/frontend/src/metabase/redux/uploads.ts
+++ b/frontend/src/metabase/redux/uploads.ts
@@ -9,7 +9,6 @@ import {
createThunkAction,
handleActions,
} from "metabase/lib/redux";
-import { runQuestionQuery } from "metabase/query_builder/actions";
import { MetabaseApi } from "metabase/services";
import type { CardId, CollectionId, TableId } from "metabase-types/api";
import type { Dispatch, State } from "metabase-types/store";
@@ -50,7 +49,7 @@ export interface UploadFileProps {
tableId?: TableId;
modelId?: CardId;
uploadMode: UploadMode;
- reloadQuestionData?: boolean;
+ onUploadComplete?: () => void;
}
export const uploadFile = createThunkAction(
@@ -61,7 +60,7 @@ export const uploadFile = createThunkAction(
tableId,
modelId,
uploadMode,
- reloadQuestionData,
+ onUploadComplete,
}: UploadFileProps) =>
async (dispatch: Dispatch) => {
const id = Date.now();
@@ -120,8 +119,8 @@ export const uploadFile = createThunkAction(
}),
);
- if (tableId && reloadQuestionData) {
- dispatch(runQuestionQuery());
+ if (tableId && onUploadComplete) {
+ onUploadComplete();
} else if (collectionId) {
dispatch(Collections.actions.invalidateLists());
}
diff --git a/frontend/src/metabase/redux/user.ts b/frontend/src/metabase/redux/user.ts
index 6b843afdb81..069827b45bd 100644
--- a/frontend/src/metabase/redux/user.ts
+++ b/frontend/src/metabase/redux/user.ts
@@ -2,7 +2,7 @@ import { createAction, createReducer } from "@reduxjs/toolkit";
import { Dashboards } from "metabase/entities/dashboards";
import { createAsyncThunk } from "metabase/lib/redux";
-import { CLOSE_QB_NEWB_MODAL } from "metabase/query_builder/actions/modal";
+import { CLOSE_QB_NEWB_MODAL } from "metabase/redux/query-builder";
import { UserApi } from "metabase/services";
import type { User } from "metabase-types/api";
diff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.ts
index c5aadc33b98..1277c234abb 100644
--- a/frontend/src/metabase/setup/actions.ts
+++ b/frontend/src/metabase/setup/actions.ts
@@ -4,13 +4,13 @@ import { t } from "ttag";
import { createDatabase } from "metabase/admin/databases/database";
import {
initializeSettings,
- updateSetting,
updateSettings,
} from "metabase/admin/settings/settings";
import { userApi } from "metabase/api";
import { loadLocalization } from "metabase/lib/i18n";
import { createAsyncThunk } from "metabase/lib/redux";
import MetabaseSettings from "metabase/lib/settings";
+import { updateSetting } from "metabase/redux/settings";
import { getSetting } from "metabase/selectors/settings";
import { SetupApi } from "metabase/services";
import type { DatabaseData, Settings, UsageReason } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
index 55093ac987d..ceee1992180 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
@@ -2,13 +2,13 @@ import { t } from "ttag";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { checkNotNull } from "metabase/lib/types";
-import { setUIControls } from "metabase/query_builder/actions";
import { getQuestion } from "metabase/query_builder/selectors";
import { trackColumnCombineViaPlusModal } from "metabase/querying/analytics";
import {
CombineColumns,
hasCombinations,
} from "metabase/querying/components/expressions";
+import { setUIControls } from "metabase/redux/query-builder";
import type { LegacyDrill } from "metabase/visualizations/types";
import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsx
index 57777472515..5686be3f8e6 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/DashboardClickAction.tsx
@@ -1,8 +1,4 @@
-import {
- setOrUnsetParameterValues,
- setParameterValue,
-} from "metabase/dashboard/actions/parameters";
-import { selectTab } from "metabase/dashboard/actions/tabs";
+import { selectTab } from "metabase/redux/dashboard";
import type {
AlwaysDefaultClickAction,
AlwaysDefaultClickActionSubAction,
@@ -18,6 +14,8 @@ import {
getDashboardDrillType,
getDashboardDrillUrl,
} from "metabase-lib/v1/queries/drills/dashboard-click-drill";
+import type { ParameterValueOrArray } from "metabase-types/api";
+import type { Dispatch } from "metabase-types/store";
type DashboardDrillType =
| "link-url"
@@ -26,11 +24,28 @@ type DashboardDrillType =
| "dashboard-filter"
| "dashboard-reset";
+type SetOrUnsetParameterValues = (
+ parameterIdValuePairs: [string, ParameterValueOrArray | null][],
+) => (dispatch: Dispatch) => void;
+
+type SetParameterValue = (
+ id: string,
+ value: ParameterValueOrArray | null,
+) => (dispatch: Dispatch) => void;
+
function getAction(
type: DashboardDrillType,
question: Question,
clicked: ClickObject,
): AlwaysDefaultClickActionSubAction {
+ // These are injected via extraData by the dashboard's useClickBehaviorData hook.
+ // They are guaranteed to be present in dashboard context where
+ // "dashboard-filter" and "dashboard-reset" drill types are produced.
+ const setOrUnsetParameterValues = clicked.extraData
+ ?.setOrUnsetParameterValues as SetOrUnsetParameterValues;
+ const setParameterValue = clicked.extraData
+ ?.setParameterValue as SetParameterValue;
+
switch (type) {
case "link-url":
return {
@@ -48,20 +63,24 @@ function getAction(
case "dashboard-filter":
return {
action: () => {
- const parameterIdValuePairs = getDashboardDrillParameters(clicked);
+ const parameterIdValuePairs = getDashboardDrillParameters(
+ clicked,
+ ) as [string, ParameterValueOrArray | null][];
return setOrUnsetParameterValues(parameterIdValuePairs);
},
};
case "dashboard-reset":
return {
- action: () => (dispatch) => {
+ action: () => (dispatch: Dispatch) => {
const tabId = getDashboardDrillTab(clicked);
if (tabId) {
dispatch(selectTab({ tabId }));
}
- const parameterIdValuePairs = getDashboardDrillParameters(clicked);
+ const parameterIdValuePairs = getDashboardDrillParameters(
+ clicked,
+ ) as [string, ParameterValueOrArray | null][];
parameterIdValuePairs
.map(([id, value]) => setParameterValue(id, value))
.forEach((action) => dispatch(action));
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
index 1bb3dae2c7e..0e63e924882 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
@@ -2,13 +2,13 @@ import { t } from "ttag";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { checkNotNull } from "metabase/lib/types";
-import { setUIControls } from "metabase/query_builder/actions";
import { getQuestion } from "metabase/query_builder/selectors";
import { trackColumnExtractViaPlusModal } from "metabase/querying/analytics";
import {
ExtractColumn,
hasExtractions,
} from "metabase/querying/components/expressions";
+import { setUIControls } from "metabase/redux/query-builder";
import { Box, rem } from "metabase/ui";
import type { LegacyDrill } from "metabase/visualizations/types";
import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx
index eaa7974f7c9..afbce80f8a9 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx
@@ -1,8 +1,8 @@
import { c } from "ttag";
import { isWithinIframe } from "metabase/lib/dom";
-import { setUIControls } from "metabase/query_builder/actions";
import { MODAL_TYPES } from "metabase/querying/constants";
+import { setUIControls } from "metabase/redux/query-builder";
import { Button, Flex } from "metabase/ui";
import type {
CustomClickActionWithCustomView,
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx
index 9ffd0e196b7..629fda4d3a6 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx
@@ -1,3 +1,4 @@
+import type { LocationDescriptorObject } from "history";
import { Component } from "react";
import type * as tippy from "tippy.js";
@@ -29,6 +30,7 @@ interface ChartClickActionsProps {
question?: Question,
) => void;
onUpdateQuestion?: (question: Question) => void;
+ onSameOriginNavigation?: (location: LocationDescriptorObject) => void;
onClose?: () => void;
}
@@ -64,7 +66,12 @@ export class ClickActionsPopover extends Component<
};
handleClickAction = (action: RegularClickAction) => {
- const { dispatch, onChangeCardAndRun, onUpdateQuestion } = this.props;
+ const {
+ dispatch,
+ onChangeCardAndRun,
+ onUpdateQuestion,
+ onSameOriginNavigation,
+ } = this.props;
if (isPopoverClickAction(action)) {
this.setState({ popoverAction: action });
} else {
@@ -72,6 +79,7 @@ export class ClickActionsPopover extends Component<
dispatch,
onChangeCardAndRun,
onUpdateQuestion,
+ onSameOriginNavigation,
});
if (didPerform) {
this.close();
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
index 12d1db95e16..f468384490b 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
@@ -4,6 +4,7 @@ import {
closeObjectDetail,
followForeignKey,
loadObjectDetailFKReferences,
+ runQuestionQuery,
viewNextObjectDetail,
viewPreviousObjectDetail,
} from "metabase/query_builder/actions";
@@ -74,6 +75,7 @@ const mapDispatchToProps = (dispatch: any) => ({
viewPreviousObjectDetail: () => dispatch(viewPreviousObjectDetail()),
viewNextObjectDetail: () => dispatch(viewNextObjectDetail()),
closeObjectDetail: () => dispatch(closeObjectDetail()),
+ onActionSuccess: () => dispatch(runQuestionQuery()),
});
type MapDispatchProps = ReturnType<typeof mapDispatchToProps>;
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx
index 80b28de7331..5f8758ac775 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx
@@ -21,6 +21,7 @@ export function ObjectDetailWrapper({
card,
dashcard,
isObjectDetail,
+ onActionSuccess,
...rest
}: ObjectDetailProps) {
const [currentObjectIndex, setCurrentObjectIndex] = useState(0);
@@ -87,6 +88,7 @@ export function ObjectDetailWrapper({
table={table}
tableForeignKeys={tableForeignKeys}
url={getRowUrl(question, columns, table, zoomedRowID)}
+ onActionSuccess={onActionSuccess}
onClose={closeObjectDetail}
onNextClick={canZoomNextRow ? viewNextObjectDetail : undefined}
onPreviousClick={
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts b/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts
index 2b3f43cf02c..a8dfb96f9e9 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts
@@ -53,6 +53,7 @@ export interface ObjectDetailProps {
viewPreviousObjectDetail: () => void;
viewNextObjectDetail: () => void;
closeObjectDetail: () => void;
+ onActionSuccess?: () => void;
className?: string;
isDashboard: boolean;
}
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
index 63a36fc0903..7021e60be5c 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
@@ -46,7 +46,7 @@ import { useTranslateContent } from "metabase/i18n/hooks";
import { getScrollBarSize } from "metabase/lib/dom";
import { formatValue } from "metabase/lib/formatting";
import { useDispatch } from "metabase/lib/redux";
-import { setUIControls } from "metabase/query_builder/actions";
+import { setUIControls } from "metabase/redux/query-builder";
import { Flex, type MantineTheme } from "metabase/ui";
import {
getTableCellClickedObject,
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 958f62cc00e..a7b7e3a1466 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -1,5 +1,6 @@
/* eslint-disable complexity */
import cx from "classnames";
+import type { LocationDescriptorObject } from "history";
import React, {
type CSSProperties,
type ComponentType,
@@ -184,6 +185,7 @@ type VisualizationOwnProps = {
) => void;
onUpdateWarnings?: (warnings: string[]) => void;
onVisualizationRendered?: (series: Series) => void;
+ onSameOriginNavigation?: (location: LocationDescriptorObject) => void;
/** When true, internal click behaviors (dashboard/question links) are preserved */
enableEntityNavigation?: boolean;
} & VisualizationPassThroughProps;
@@ -581,6 +583,7 @@ class Visualization extends PureComponent<
{
dispatch: this.props.dispatch,
onChangeCardAndRun: this.handleOnChangeCardAndRun,
+ onSameOriginNavigation: this.props.onSameOriginNavigation,
},
);
@@ -1007,6 +1010,7 @@ class Visualization extends PureComponent<
clickActions={regularClickActions}
onChangeCardAndRun={this.handleOnChangeCardAndRun}
onUpdateQuestion={this.props.onUpdateQuestion}
+ onSameOriginNavigation={this.props.onSameOriginNavigation}
onClose={this.hideActions}
series={series}
onUpdateVisualizationSettings={onUpdateVisualizationSettings}
diff --git a/frontend/src/metabase/visualizations/lib/action.ts b/frontend/src/metabase/visualizations/lib/action.ts
index 937fadd23e8..ddaffe19955 100644
--- a/frontend/src/metabase/visualizations/lib/action.ts
+++ b/frontend/src/metabase/visualizations/lib/action.ts
@@ -1,7 +1,7 @@
+import type { LocationDescriptorObject } from "history";
import { push } from "react-router-redux";
import _ from "underscore";
-import { setParameterValuesFromQueryParams } from "metabase/dashboard/actions/parameters";
import { open } from "metabase/lib/dom";
import type Question from "metabase-lib/v1/Question";
import type { Dispatch } from "metabase-types/store";
@@ -16,6 +16,7 @@ type ActionProps = {
dispatch: Dispatch;
onChangeCardAndRun?: OnChangeCardAndRun;
onUpdateQuestion?: (question: Question) => void;
+ onSameOriginNavigation?: (location: LocationDescriptorObject) => void;
};
export function performAction(
@@ -44,8 +45,11 @@ export function performAction(
if (url) {
open(url, {
openInSameOrigin: (location) => {
- dispatch(push(location));
- dispatch(setParameterValuesFromQueryParams(location.query));
+ if (props.onSameOriginNavigation) {
+ props.onSameOriginNavigation(location);
+ } else {
+ dispatch(push(location));
+ }
},
ignoreSiteUrl,
});
diff --git a/frontend/src/metabase/visualizations/lib/action.unit.spec.ts b/frontend/src/metabase/visualizations/lib/action.unit.spec.ts
index 3d02e88399f..34cc3176af8 100644
--- a/frontend/src/metabase/visualizations/lib/action.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/action.unit.spec.ts
@@ -27,7 +27,7 @@ describe("performAction", () => {
expect(action.url).toHaveBeenCalledTimes(1);
- expect(extraProps.dispatch).toHaveBeenCalledTimes(2);
+ expect(extraProps.dispatch).toHaveBeenCalledTimes(1);
expect(extraProps.dispatch).toHaveBeenCalledWith({
payload: {
args: [
@@ -91,7 +91,7 @@ describe("performAction", () => {
expect(action.url).toHaveBeenCalledTimes(1);
- expect(extraProps.dispatch).toHaveBeenCalledTimes(2);
+ expect(extraProps.dispatch).toHaveBeenCalledTimes(1);
expect(extraProps.dispatch).toHaveBeenCalledWith({
payload: {
args: [
@@ -130,7 +130,7 @@ describe("performAction", () => {
expect(action.url).toHaveBeenCalledTimes(1);
- expect(extraProps.dispatch).toHaveBeenCalledTimes(2);
+ expect(extraProps.dispatch).toHaveBeenCalledTimes(1);
expect(extraProps.dispatch).toHaveBeenCalledWith({
payload: {
args: [
@@ -170,7 +170,7 @@ describe("performAction", () => {
expect(action.url).toHaveBeenCalledTimes(1);
- expect(extraProps.dispatch).toHaveBeenCalledTimes(2);
+ expect(extraProps.dispatch).toHaveBeenCalledTimes(1);
expect(extraProps.dispatch).toHaveBeenCalledWith({
payload: {
args: [
@@ -209,7 +209,7 @@ describe("performAction", () => {
expect(action.url).toHaveBeenCalledTimes(1);
- expect(extraProps.dispatch).toHaveBeenCalledTimes(2);
+ expect(extraProps.dispatch).toHaveBeenCalledTimes(1);
expect(extraProps.dispatch).toHaveBeenCalledWith({
payload: {
args: [