Skip to content

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

chore: convert dashboard actions to typescript (#69737)

Uladzimir Havenchykb404c13d0cfe
diff --git a/frontend/src/metabase/dashboard/actions/actions.unit.spec.js b/frontend/src/metabase/dashboard/actions/actions.unit.spec.ts
similarity index 70%
rename from frontend/src/metabase/dashboard/actions/actions.unit.spec.js
rename to frontend/src/metabase/dashboard/actions/actions.unit.spec.ts
index c73a19e479d..46d544afe58 100644
--- a/frontend/src/metabase/dashboard/actions/actions.unit.spec.js
+++ b/frontend/src/metabase/dashboard/actions/actions.unit.spec.ts
@@ -1,10 +1,17 @@
import { DashboardApi } from "metabase/services";
-import { createMockDashboard } from "metabase-types/api/mocks";
+import {
+ createMockDashboard,
+ createMockDashboardCard,
+ createMockParameter,
+} from "metabase-types/api/mocks";
+import type { Dispatch, GetState } from "metabase-types/store";
import {
createMockDashboardState,
+ createMockLocation,
createMockRoutingState,
createMockState,
-} from "metabase-types/store/mocks/index";
+ createMockStoreDashboard,
+} from "metabase-types/store/mocks";
import { SIDEBAR_NAME } from "../constants";
@@ -21,14 +28,14 @@ import {
setSidebar,
showClickBehaviorSidebar,
updateDashboardAndCards,
-} from "./index";
+} from "./";
DashboardApi.parameterSearch = jest.fn();
DashboardApi.parameterValues = jest.fn();
describe("dashboard actions", () => {
- let dispatch;
- let getState;
+ let dispatch: jest.MockedFunction<Dispatch>;
+ let getState: GetState;
beforeEach(() => {
dispatch = jest.fn();
@@ -37,9 +44,12 @@ describe("dashboard actions", () => {
dashboard: createMockDashboardState({
dashboardId: 1,
dashboards: {
- 1: createMockDashboard({
+ "1": createMockStoreDashboard({
id: 1,
- parameters: [{ id: 123 }, { id: 456 }],
+ parameters: [
+ createMockParameter({ id: "123" }),
+ createMockParameter({ id: "456" }),
+ ],
}),
},
}),
@@ -104,12 +114,12 @@ describe("dashboard actions", () => {
describe("setEditingParameter", () => {
it("should set an edit parameter sidebar when given a parameterId", () => {
- setEditingParameter(0)(dispatch, getState);
+ setEditingParameter("0")(dispatch, getState);
expect(dispatch).toHaveBeenCalledWith(
setSidebar({
name: SIDEBAR_NAME.editParameter,
- props: { parameterId: 0 },
+ props: { parameterId: "0" },
}),
);
});
@@ -135,28 +145,28 @@ describe("dashboard actions", () => {
describe("removeParameter", () => {
it("should remove the parameter from the dashboard with the given parameterId", () => {
- removeParameter(123)(dispatch, getState);
+ removeParameter("123")(dispatch, getState);
expect(dispatch).toHaveBeenCalledWith({
type: SET_DASHBOARD_ATTRIBUTES,
payload: {
id: 1,
attributes: {
- parameters: [{ id: 456 }],
+ parameters: [createMockParameter({ id: "456" })],
},
},
});
});
it("should not remove any parameters if the given parameterId does not match a parameter on the dashboard", () => {
- removeParameter(999)(dispatch, getState);
+ removeParameter("999")(dispatch, getState);
expect(dispatch).toHaveBeenCalledWith({
type: SET_DASHBOARD_ATTRIBUTES,
payload: {
id: 1,
attributes: {
- parameters: getState().dashboard.dashboards[1].parameters,
+ parameters: getState().dashboard.dashboards["1"]?.parameters,
},
},
});
@@ -165,49 +175,52 @@ describe("dashboard actions", () => {
describe("updateDashboardAndCards", () => {
it("should not save anything if the dashboard has not changed", async () => {
- const dashboard = {
+ const dashcard1 = createMockDashboardCard({ id: 1, card_id: 1 });
+ const dashcard2 = createMockDashboardCard({ id: 2, card_id: 2 });
+
+ const storeDashboard = createMockStoreDashboard({
id: 1,
name: "Foo",
parameters: [],
- dashcards: [
- { id: 1, name: "Foo", card_id: 1 },
- { id: 2, name: "Bar", card_id: 2 },
- ],
- };
+ dashcards: [1, 2],
+ });
- const getState = () => ({
- dashboard: {
- editingDashboard: dashboard,
- dashboardId: 1,
- dashboards: {
- 1: {
- ...dashboard,
- dashcards: [1, 2],
+ const getState: GetState = () =>
+ createMockState({
+ dashboard: createMockDashboardState({
+ editingDashboard: createMockDashboard({
+ ...storeDashboard,
+ dashcards: [dashcard1, dashcard2],
+ }),
+ dashboardId: 1,
+ dashboards: {
+ "1": storeDashboard,
},
- },
- dashcards: {
- 1: dashboard.dashcards[0],
- 2: dashboard.dashcards[1],
- },
- },
- });
+ dashcards: {
+ "1": dashcard1,
+ "2": dashcard2,
+ },
+ }),
+ });
await updateDashboardAndCards()(dispatch, getState);
- // if this is called only once, it means that the dashboard was not saved
+ // createThunkAction dispatches the result action once;
+ // no additional dispatches means the dashboard was not saved
expect(dispatch).toHaveBeenCalledTimes(1);
});
});
describe("setEditingDashboard", () => {
- const getState = () => ({
- routing: createMockRoutingState({
- locationBeforeTransitions: {
- pathname: "/dashboard/1",
- hash: "#hashparam",
- },
- }),
- });
+ const getState: GetState = () =>
+ createMockState({
+ routing: createMockRoutingState({
+ locationBeforeTransitions: createMockLocation({
+ pathname: "/dashboard/1",
+ hash: "#hashparam",
+ }),
+ }),
+ });
it("should remove any hash parameters from url when not editing", () => {
setEditingDashboard(null)(dispatch, getState);
diff --git a/frontend/src/metabase/dashboard/actions/cards.js b/frontend/src/metabase/dashboard/actions/cards.js
deleted file mode 100644
index 12b2622ca4a..00000000000
--- a/frontend/src/metabase/dashboard/actions/cards.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { t } from "ttag";
-
-import { createCard } from "metabase/lib/card";
-
-import { trackCardCreated } from "../analytics";
-
-import { addDashCardToDashboard } from "./cards-typed";
-
-export const addActionToDashboard =
- ({ dashId, tabId, action, displayType }) =>
- (dispatch) => {
- trackCardCreated("action", dashId);
-
- const virtualActionsCard = {
- ...createCard(),
- id: action.model_id,
- display: "action",
- archived: false,
- };
-
- const buttonLabel = action.name ?? action.id ?? t`Click Me`;
-
- const dashcardOverrides = {
- action: action.id ? action : null,
- action_id: action.id,
- card_id: action.model_id,
- card: virtualActionsCard,
- visualization_settings: {
- actionDisplayType: displayType ?? "button",
- virtual_card: virtualActionsCard,
- "button.label": buttonLabel,
- },
- };
-
- dispatch(
- addDashCardToDashboard({
- dashId: dashId,
- dashcardOverrides: dashcardOverrides,
- tabId,
- }),
- );
- };
diff --git a/frontend/src/metabase/dashboard/actions/cards.ts b/frontend/src/metabase/dashboard/actions/cards.ts
new file mode 100644
index 00000000000..82e63023e44
--- /dev/null
+++ b/frontend/src/metabase/dashboard/actions/cards.ts
@@ -0,0 +1,53 @@
+import { t } from "ttag";
+
+import type {
+ ActionDisplayType,
+ DashboardId,
+ DashboardTabId,
+ WritebackAction,
+} from "metabase-types/api";
+import type { Dispatch } from "metabase-types/store";
+
+import { trackCardCreated } from "../analytics";
+import { createVirtualCard } from "../utils";
+
+import { addDashCardToDashboard } from "./cards-typed";
+
+type AddActionToDashboardOpts = {
+ dashId: DashboardId;
+ tabId: DashboardTabId | null;
+ action: Partial<WritebackAction>;
+ displayType?: ActionDisplayType;
+};
+
+export const addActionToDashboard =
+ ({ dashId, tabId, action, displayType }: AddActionToDashboardOpts) =>
+ (dispatch: Dispatch) => {
+ trackCardCreated("action", dashId);
+
+ const modelId = action.model_id ?? null;
+ const virtualActionsCard = createVirtualCard("action");
+
+ const buttonLabel =
+ action.name ?? (action.id != null ? String(action.id) : t`Click Me`);
+
+ const dashcardOverrides = {
+ action: action.id ? action : null,
+ action_id: action.id,
+ card_id: modelId,
+ card: virtualActionsCard,
+ visualization_settings: {
+ actionDisplayType: displayType ?? "button",
+ virtual_card: virtualActionsCard,
+ "button.label": buttonLabel,
+ },
+ };
+
+ dispatch(
+ addDashCardToDashboard({
+ dashId: dashId,
+ dashcardOverrides: dashcardOverrides,
+ tabId,
+ }),
+ );
+ };
diff --git a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.js b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
similarity index 68%
rename from frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.js
rename to frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
index 070188ac8d2..a3978c2d51f 100644
--- a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.js
+++ b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
@@ -8,6 +8,7 @@ import {
} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { Api } from "metabase/api";
+import type { Dashboard } from "metabase-types/api";
import {
createMockDashboard,
createMockDashboardCard,
@@ -15,13 +16,26 @@ import {
createMockSettings,
} from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
-import { createMockDashboardState } from "metabase-types/store/mocks";
+import type { DashboardState } from "metabase-types/store";
+import {
+ createMockDashboardState,
+ createMockStoreDashboard,
+} from "metabase-types/store/mocks";
import { dashboardReducers } from "../reducers";
+import { isQuestionDashCard } from "../utils";
import { fetchCardDataAction, fetchDashboard } from "./data-fetching";
-function setup({ dashboards = [], dashboard = createMockDashboardState() }) {
+type SetupOpts = {
+ dashboards?: Dashboard[];
+ dashboard?: DashboardState;
+};
+
+function setup({
+ dashboards = [],
+ dashboard = createMockDashboardState(),
+}: SetupOpts = {}) {
const database = createSampleDatabase();
const state = {
dashboard,
@@ -44,12 +58,12 @@ function setup({ dashboards = [], dashboard = createMockDashboardState() }) {
setupDatabaseEndpoints(database);
setupDashboardsEndpoints(dashboards);
- dashboards.forEach((dashboard) =>
+ dashboards.forEach((dashboard) => {
setupDashboardQueryMetadataEndpoint(
dashboard,
createMockDashboardQueryMetadata({ databases: [database] }),
- ),
- );
+ );
+ });
return store;
}
@@ -104,27 +118,36 @@ describe("fetchDashboard", () => {
});
});
- const sleep = (delay) => new Promise((res) => setTimeout(res, delay));
+ const sleep = (delay: number) =>
+ new Promise<void>((res) => setTimeout(res, delay));
const DASHBOARD = createMockDashboard({
id: 1,
dashcards: [createMockDashboardCard()],
});
+ const dashcard = DASHBOARD.dashcards[0];
+ if (!isQuestionDashCard(dashcard)) {
+ throw new Error("Expected question dashcard");
+ }
const store = setup({
dashboards: [DASHBOARD],
dashboard: createMockDashboardState({
dashboardId: DASHBOARD.id,
dashboards: {
- [DASHBOARD.id]: DASHBOARD,
+ [DASHBOARD.id]: createMockStoreDashboard({
+ ...DASHBOARD,
+ dashcards: DASHBOARD.dashcards.map((dashcard) => dashcard.id),
+ }),
},
}),
});
const firstFetch = store.dispatch(
fetchCardDataAction({
- card: DASHBOARD.dashcards[0].card,
- dashcard: DASHBOARD.dashcards[0],
+ card: dashcard.card,
+ dashcard,
+ options: {},
}),
);
@@ -132,25 +155,27 @@ describe("fetchDashboard", () => {
const secondFetch = store.dispatch(
fetchCardDataAction({
- card: DASHBOARD.dashcards[0].card,
- dashcard: DASHBOARD.dashcards[0],
+ card: dashcard.card,
+ dashcard,
+ options: {},
}),
);
await sleep(50);
const thirdFetch = store.dispatch(
fetchCardDataAction({
- card: DASHBOARD.dashcards[0].card,
- dashcard: DASHBOARD.dashcards[0],
+ card: dashcard.card,
+ dashcard,
+ options: {},
}),
);
- const firstResult = (await firstFetch).payload;
- const secondResult = (await secondFetch).payload;
- const thirdResult = (await thirdFetch).payload;
+ const firstResult = await firstFetch;
+ const secondResult = await secondFetch;
+ const thirdResult = await thirdFetch;
- expect(firstResult.result).toBe(null);
- expect(secondResult.result).toBe(null);
- expect(thirdResult.result).toHaveProperty("foo", true);
+ expect(firstResult.payload).toMatchObject({ result: null });
+ expect(secondResult.payload).toMatchObject({ result: null });
+ expect(thirdResult.payload).toMatchObject({ result: { foo: true } });
});
});
diff --git a/frontend/src/metabase/dashboard/actions/navigation.js b/frontend/src/metabase/dashboard/actions/navigation.ts
similarity index 66%
rename from frontend/src/metabase/dashboard/actions/navigation.js
rename to frontend/src/metabase/dashboard/actions/navigation.ts
index 6f464f00f31..3a4893ee1bc 100644
--- a/frontend/src/metabase/dashboard/actions/navigation.js
+++ b/frontend/src/metabase/dashboard/actions/navigation.ts
@@ -3,23 +3,29 @@ import * as Urls from "metabase/lib/urls";
import { openUrl } from "metabase/redux/app";
import { getMetadata } from "metabase/selectors/metadata";
import * as Lib from "metabase-lib";
+import type Question from "metabase-lib/v1/Question";
+import type { Card, DashboardCard, VirtualCard } from "metabase-types/api";
+import type { Dispatch, GetState } from "metabase-types/store";
+
+import { isQuestionDashCard } from "../utils";
import { getNewCardUrl } from "./getNewCardUrl";
export const EDIT_QUESTION = "metabase/dashboard/EDIT_QUESTION";
+
export const editQuestion = createThunkAction(
EDIT_QUESTION,
- (question, mode = "notebook") =>
- (dispatch, getState) => {
+ (question: Question, mode: "view" | "notebook" | "query" = "notebook") =>
+ (dispatch: Dispatch, getState: GetState) => {
const state = getState();
const { dashboardId, dashboards } = state.dashboard;
- const dashboard = dashboards[dashboardId];
+ const dashboard = dashboardId != null ? dashboards[dashboardId] : null;
const { isNative } = Lib.queryDisplayInfo(question.query());
const finalMode = isNative ? "view" : mode;
const url = Urls.question(question.card(), { mode: finalMode });
dispatch(openUrl(url));
- return { id: dashboardId, name: dashboard.name, model: "dashboard" };
+ return { id: dashboardId, name: dashboard?.name, model: "dashboard" };
},
);
@@ -38,16 +44,28 @@ export const editQuestion = createThunkAction(
* - 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;
+ dashcard: DashboardCard;
+ objectId?: number | string;
+};
+
export const navigateToNewCardFromDashboard = createThunkAction(
NAVIGATE_TO_NEW_CARD,
- ({ nextCard, previousCard, dashcard, objectId }) =>
- (dispatch, getState) => {
+ ({
+ nextCard,
+ previousCard,
+ dashcard,
+ objectId,
+ }: NavigateToNewCardFromDashboardArgs) =>
+ (dispatch: Dispatch, getState: GetState) => {
const state = getState();
const metadata = getMetadata(state);
const { dashboardId, dashboards, parameterValues } = state.dashboard;
- const dashboard = dashboards[dashboardId];
+ const dashboard = dashboardId != null ? dashboards[dashboardId] : null;
- if (dashboard) {
+ if (dashboard && isQuestionDashCard(dashcard)) {
const url = getNewCardUrl({
metadata,
dashboard,
@@ -58,9 +76,11 @@ export const navigateToNewCardFromDashboard = createThunkAction(
objectId,
});
- dispatch(openUrl(url));
+ if (url) {
+ dispatch(openUrl(url));
+ }
}
- return { model: "dashboard", id: dashboardId, name: dashboard.name };
+ return { model: "dashboard", id: dashboardId, name: dashboard?.name };
},
);
diff --git a/frontend/src/metabase/dashboard/actions/save.js b/frontend/src/metabase/dashboard/actions/save.ts
similarity index 58%
rename from frontend/src/metabase/dashboard/actions/save.js
rename to frontend/src/metabase/dashboard/actions/save.ts
index 00742f53c87..edc827a056b 100644
--- a/frontend/src/metabase/dashboard/actions/save.js
+++ b/frontend/src/metabase/dashboard/actions/save.ts
@@ -1,20 +1,24 @@
import { assocIn, dissocIn, getIn } from "icepick";
import _ from "underscore";
-import {
- fetchDashboard,
- fetchDashboardCardData,
-} from "metabase/dashboard/actions";
import { Dashboards } from "metabase/entities/dashboards";
import { createThunkAction } from "metabase/lib/redux";
import { CardApi } from "metabase/services";
import { clickBehaviorIsValid } from "metabase-lib/v1/parameters/utils/click-behavior";
+import type { DashCardId, ParameterId } from "metabase-types/api";
+import type {
+ Dispatch,
+ GetState,
+ StoreDashboard,
+ StoreDashcard,
+} from "metabase-types/store";
import { trackDashboardSaved } from "../analytics";
import { getDashboardBeforeEditing } from "../selectors";
import { getInlineParameterTabMap } from "../utils";
import { setEditingDashboard } from "./core";
+import { fetchDashboard, fetchDashboardCardData } from "./data-fetching";
import {
hasDashboardChanged,
haveDashboardCardsChanged,
@@ -29,15 +33,27 @@ export const UPDATE_DASHBOARD = "metabase/dashboard/UPDATE_DASHBOARD";
export const updateDashboardAndCards = createThunkAction(
UPDATE_DASHBOARD_AND_CARDS,
function () {
- return async function (dispatch, getState) {
+ return async function (dispatch: Dispatch, getState: GetState) {
const startTime = performance.now();
const state = getState();
const { dashboards, dashcards, dashboardId } = state.dashboard;
- const dashboard = {
- ...dashboards[dashboardId],
- dashcards: dashboards[dashboardId].dashcards.map(
- (dashcardId) => dashcards[dashcardId],
- ),
+
+ if (dashboardId == null) {
+ return;
+ }
+
+ const storeDashboard = dashboards[dashboardId];
+ if (!storeDashboard) {
+ return;
+ }
+
+ const dashboard: Omit<StoreDashboard, "dashcards"> & {
+ dashcards: StoreDashcard[];
+ } = {
+ ...storeDashboard,
+ dashcards: storeDashboard.dashcards
+ .map((dashcardId: DashCardId) => dashcards[dashcardId])
+ .filter((dashcard): dashcard is StoreDashcard => dashcard != null),
};
const dashboardBeforeEditing = getDashboardBeforeEditing(state);
@@ -65,8 +81,7 @@ export const updateDashboardAndCards = createThunkAction(
const clickBehaviorPath = ["visualization_settings", "click_behavior"];
dashboard.dashcards = dashboard.dashcards.map((card, index) => {
if (!clickBehaviorIsValid(getIn(card, clickBehaviorPath))) {
- const startingValue = getIn(dashboardBeforeEditing, [
- "dashcards",
+ const startingValue = getIn(dashboardBeforeEditing?.dashcards ?? [], [
index,
...clickBehaviorPath,
]);
@@ -79,46 +94,66 @@ export const updateDashboardAndCards = createThunkAction(
// update parameter mappings
const inlineParameterTabMap = getInlineParameterTabMap(dashboard);
- const inlineParameterIds = Object.keys(inlineParameterTabMap);
- dashboard.dashcards = dashboard.dashcards.map((dc) => ({
- ...dc,
- parameter_mappings: dc.parameter_mappings.filter((mapping) => {
- const isRemoved = !(dashboard.parameters ?? []).some(
- (parameter) => parameter.id === mapping.parameter_id,
- );
- if (isRemoved) {
- return false;
- }
+ const inlineParameterIds: ParameterId[] = Object.keys(
+ inlineParameterTabMap,
+ );
- const isInlineParameter = inlineParameterIds.includes(
- mapping.parameter_id,
- );
- const isOwnInlineParameter = (dc.inline_parameters ?? []).includes(
- mapping.parameter_id,
+ dashboard.dashcards = dashboard.dashcards.map((dc) => {
+ const hasParameter = (parameterId: ParameterId) =>
+ (dashboard.parameters ?? []).some(
+ (parameter) => parameter.id === parameterId,
);
+ const shouldKeepInlineMapping = (parameterId: ParameterId) => {
+ const isInlineParameter = inlineParameterIds.includes(parameterId);
+ const isOwnInlineParameter =
+ "inline_parameters" in dc
+ ? (dc.inline_parameters ?? []).includes(parameterId)
+ : false;
+
if (
isInlineParameter &&
!isOwnInlineParameter &&
(dashboard.tabs ?? []).length > 1
) {
- const parameterTabId = inlineParameterTabMap[mapping.parameter_id];
+ const parameterTabId = inlineParameterTabMap[parameterId];
return parameterTabId === dc.dashboard_tab_id;
}
+ return true;
+ };
- // filter out mappings for deleted series
- return (
- !dc.card_id ||
- dc.action ||
- dc.card_id === mapping.card_id ||
- _.findWhere(dc.series, { id: mapping.card_id })
- );
- }),
- }));
+ const parameter_mappings = (dc.parameter_mappings ?? []).filter(
+ (mapping) => {
+ if (!hasParameter(mapping.parameter_id)) {
+ return false;
+ }
+ if (!shouldKeepInlineMapping(mapping.parameter_id)) {
+ return false;
+ }
+
+ // filter out mappings for deleted series
+ if ("action_id" in dc || !dc.card_id || !("card_id" in mapping)) {
+ return true;
+ }
+
+ const mappedCardId =
+ typeof mapping.card_id === "number" ? mapping.card_id : null;
+ if (mappedCardId == null) {
+ return false;
+ }
+
+ return (
+ dc.card_id === mappedCardId ||
+ _.findWhere(dc.series ?? [], { id: mappedCardId })
+ );
+ },
+ );
+ return Object.assign({}, dc, { parameter_mappings });
+ });
// update modified cards
await Promise.all(
dashboard.dashcards
- .filter((dc) => dc.card.isDirty)
+ .filter((dc) => "isDirty" in dc.card && Boolean(dc.card.isDirty))
.map(async (dc) => CardApi.update(dc.card)),
);
@@ -126,26 +161,33 @@ export const updateDashboardAndCards = createThunkAction(
const dashcardsToUpdate = dashboard.dashcards
.filter((dc) => !dc.isRemoved)
- .map((dc) => ({
- id: dc.id,
- card_id: dc.card_id,
- dashboard_tab_id: dc.dashboard_tab_id,
- action_id: dc.action_id,
- row: dc.row,
- col: dc.col,
- size_x: dc.size_x,
- size_y: dc.size_y,
- series: dc.series,
- visualization_settings: dc.visualization_settings,
- inline_parameters: dc.inline_parameters,
- parameter_mappings: dc.parameter_mappings,
- }));
+ .map((dc) => {
+ const baseDashcard = {
+ id: dc.id,
+ card_id: dc.card_id,
+ dashboard_tab_id: dc.dashboard_tab_id,
+ row: dc.row,
+ col: dc.col,
+ size_x: dc.size_x,
+ size_y: dc.size_y,
+ visualization_settings: dc.visualization_settings,
+ parameter_mappings: dc.parameter_mappings,
+ };
+
+ return {
+ ...baseDashcard,
+ ...("action_id" in dc ? { action_id: dc.action_id } : null),
+ ...("series" in dc ? { series: dc.series } : null),
+ ...("inline_parameters" in dc
+ ? { inline_parameters: dc.inline_parameters }
+ : null),
+ };
+ });
+
const tabsToUpdate = (dashboard.tabs ?? [])
.filter((tab) => !tab.isRemoved)
- .map(({ id, name }) => ({
- id,
- name,
- }));
+ .map(({ id, name }) => ({ id, name }));
+
await dispatch(
Dashboards.actions.update({
...dashboard,
@@ -155,11 +197,13 @@ export const updateDashboardAndCards = createThunkAction(
);
const endTime = performance.now();
- const duration_milliseconds = parseInt(endTime - startTime);
- trackDashboardSaved({
- dashboard_id: dashboard.id,
- duration_milliseconds,
- });
+ const duration_milliseconds = Math.trunc(endTime - startTime);
+ if (typeof dashboard.id === "number") {
+ trackDashboardSaved({
+ dashboard_id: dashboard.id,
+ duration_milliseconds,
+ });
+ }
dispatch(setEditingDashboard(null));
@@ -175,7 +219,7 @@ export const updateDashboardAndCards = createThunkAction(
await dispatch(
fetchDashboard({
dashId: dashboard.id,
- queryParams: null,
+ queryParams: {},
options: { preserveParameters: false },
}),
); // disable using query parameters when saving
@@ -195,10 +239,15 @@ export const updateDashboardAndCards = createThunkAction(
export const updateDashboard = createThunkAction(
UPDATE_DASHBOARD,
- function ({ attributeNames }) {
- return async function (dispatch, getState) {
+ function ({ attributeNames }: { attributeNames: string[] }) {
+ return async function (dispatch: Dispatch, getState: GetState) {
const state = getState();
const { dashboards, dashboardId } = state.dashboard;
+
+ if (dashboardId == null) {
+ return;
+ }
+
const dashboard = dashboards[dashboardId];
if (!dashboard) {
@@ -218,7 +267,7 @@ export const updateDashboard = createThunkAction(
dispatch(
fetchDashboard({
dashId: dashboard.id,
- queryParam: null,
+ queryParams: {},
options: { preserveParameters: true },
}),
);
diff --git a/frontend/src/metabase/dashboard/actions/utils.ts b/frontend/src/metabase/dashboard/actions/utils.ts
index b1d5db3bb0a..d088082e681 100644
--- a/frontend/src/metabase/dashboard/actions/utils.ts
+++ b/frontend/src/metabase/dashboard/actions/utils.ts
@@ -5,9 +5,9 @@ import { getIframeDomainName } from "metabase/visualizations/visualizations/IFra
import type {
DashCardId,
Dashboard,
+ DashboardCard,
DashboardId,
DashboardTabId,
- QuestionDashboardCard,
} from "metabase-types/api";
import type { StoreDashboard, StoreDashcard } from "metabase-types/store";
@@ -36,8 +36,8 @@ export function getExistingDashCards(
}
export function hasDashboardChanged(
- dashboard: Dashboard,
- dashboardBeforeEditing: Dashboard,
+ dashboard: Dashboard | { dashcards: DashboardCard[] },
+ dashboardBeforeEditing: Dashboard | { dashcards: DashboardCard[] },
) {
return !_.isEqual(
{ ...dashboard, dashcards: dashboard.dashcards.length },
@@ -51,8 +51,8 @@ export function hasDashboardChanged(
// sometimes the cards objects change order but all the cards themselves are the same
// this should not trigger a save
export function haveDashboardCardsChanged(
- newCards: QuestionDashboardCard[],
- oldCards: QuestionDashboardCard[],
+ newCards: DashboardCard[],
+ oldCards: DashboardCard[],
) {
return (
newCards.length !== oldCards.length ||
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
index efd0f63ee86..5214a35e0de 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
@@ -37,8 +37,10 @@ export const DashCardMenuItems = ({
const dispatch = useDispatch();
const {
- onEditQuestion = (question, mode = "notebook") =>
- dispatch(editQuestion(question, mode)),
+ onEditQuestion = (
+ question: Question,
+ mode: "query" | "view" | "notebook" = "notebook",
+ ) => dispatch(editQuestion(question, mode)),
} = useSdkDashboardContext();
const { dashcardMenu } = useDashboardContext();