Skip to content

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

Fix #63904: Corrects dashcard selector usage (#64140)

Brad Anderson8f4ccdf2ba89
diff --git a/frontend/src/metabase/dashboard/actions/cards-typed.ts b/frontend/src/metabase/dashboard/actions/cards-typed.ts
index 69bc41b7b6f..b35f1e22512 100644
--- a/frontend/src/metabase/dashboard/actions/cards-typed.ts
+++ b/frontend/src/metabase/dashboard/actions/cards-typed.ts
@@ -37,11 +37,11 @@ import {
} from "../analytics";
import type { SectionLayout } from "../sections";
import {
+ getCurrentDashcards,
getDashCardById,
getDashboard,
getDashboardId,
getDashboards,
- getDashcardList,
getDashcards,
getSelectedTabId,
} from "../selectors";
@@ -471,7 +471,7 @@ export const removeCardFromDashboard = createThunkAction(
}) =>
(dispatch, getState) => {
const dashboard = checkNotNull(getDashboard(getState()));
- const dashcards = getDashcardList(getState());
+ const dashcards = getCurrentDashcards(getState());
const dashcard = getDashCardById(getState(), dashcardId);
const originalParameters = dashboard.parameters
diff --git a/frontend/src/metabase/dashboard/actions/parameters.tsx b/frontend/src/metabase/dashboard/actions/parameters.tsx
index ca17608f429..90ede4263a3 100644
--- a/frontend/src/metabase/dashboard/actions/parameters.tsx
+++ b/frontend/src/metabase/dashboard/actions/parameters.tsx
@@ -51,13 +51,13 @@ import {
} from "../analytics";
import {
getAutoApplyFiltersToastId,
+ getCurrentDashcards,
getDashCardById,
getDashboard,
getDashboardBeforeEditing,
getDashboardComplete,
getDashboardHeaderParameters,
getDashboardId,
- getDashcardList,
getDashcards,
getDraftParameterValues,
getFiltersToReset,
@@ -274,7 +274,7 @@ export const setEditingParameter =
const currentTabId = getSelectedTabId(getState());
const parameterDashcard = findDashCardForInlineParameter(
parameterId,
- getDashcardList(getState()),
+ getCurrentDashcards(getState()),
);
if (
diff --git a/frontend/src/metabase/dashboard/selectors.ts b/frontend/src/metabase/dashboard/selectors.ts
index 3ed61872712..b7e0c643a6e 100644
--- a/frontend/src/metabase/dashboard/selectors.ts
+++ b/frontend/src/metabase/dashboard/selectors.ts
@@ -170,10 +170,6 @@ export const getDashboard = createSelector(
export const getDashcards = (state: State) => state.dashboard.dashcards;
-export const getDashcardList = createSelector([getDashcards], (dashcards) =>
- Object.values(dashcards),
-);
-
export const getDashCardById = (state: State, dashcardId: DashCardId) => {
const dashcards = getDashcards(state);
return dashcards[dashcardId];
@@ -223,6 +219,11 @@ export const getDashboardComplete = createSelector(
},
);
+export const getCurrentDashcards = createSelector(
+ [getDashboardComplete],
+ (dashboard) => dashboard?.dashcards || [],
+);
+
export const getDashcardHref = createSelector(
[getMetadata, getDashboardComplete, getParameterValues, getDashCardById],
(metadata, dashboard, parameterValues, dashcard) => {
@@ -443,9 +444,8 @@ export const getParameters = createSelector(
);
export const getDashboardHeaderParameters = createSelector(
- [getDashcards, getParameters],
- (dashcards, parameters) => {
- const dashcardList = Object.values(dashcards);
+ [getCurrentDashcards, getParameters],
+ (dashcardList, parameters) => {
return parameters.filter(
(parameter) => !isDashcardInlineParameter(parameter.id, dashcardList),
);
diff --git a/frontend/src/metabase/dashboard/selectors.unit.spec.js b/frontend/src/metabase/dashboard/selectors.unit.spec.js
index ba6b423814d..c9ce6bc4021 100644
--- a/frontend/src/metabase/dashboard/selectors.unit.spec.js
+++ b/frontend/src/metabase/dashboard/selectors.unit.spec.js
@@ -4,6 +4,7 @@ import { createMockEntitiesState } from "__support__/store";
import {
getClickBehaviorSidebarDashcard,
getDashboardComplete,
+ getDashboardHeaderParameters,
getEditingParameterId,
getIsEditingParameter,
getIsSharing,
@@ -222,6 +223,39 @@ describe("dashboard/selectors", () => {
});
});
+ describe("getDashboardHeaderParameters", () => {
+ it("should ignore dashcards that don't belong to the current dashboard", () => {
+ const parameterId = "_parameterId_";
+ const state = {
+ ...STATE,
+ dashboard: {
+ ...STATE.dashboard,
+ dashboards: {
+ 0: {
+ ...STATE.dashboard.dashboards[0],
+ dashcards: [1],
+ parameters: [{ id: parameterId }],
+ },
+ },
+ dashcards: {
+ 0: {
+ ...STATE.dashboard.dashcards[0],
+ inline_parameters: [parameterId],
+ dashboard_id: 1,
+ },
+ 1: {
+ ...STATE.dashboard.dashcards[1],
+ dashboard_id: 0,
+ },
+ },
+ },
+ };
+ const headerParameters = getDashboardHeaderParameters(state);
+ expect(headerParameters).toHaveLength(1);
+ expect(headerParameters[0].id).toBe(parameterId);
+ });
+ });
+
describe("getSidebar", () => {
it("should return the sidebar property", () => {
expect(getSidebar(STATE)).toBe(STATE.dashboard.sidebar);
diff --git a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx
index db24476acf8..0b5836b453f 100644
--- a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx
@@ -5,7 +5,7 @@ import _ from "underscore";
import CS from "metabase/css/core/index.css";
import { moveParameter } from "metabase/dashboard/actions";
-import { getDashcardList, getTabs } from "metabase/dashboard/selectors";
+import { getCurrentDashcards, getTabs } from "metabase/dashboard/selectors";
import {
findDashCardForInlineParameter,
isHeadingDashCard,
@@ -29,13 +29,13 @@ export function MoveParameterMenu({ parameterId }: MoveParameterMenuProps) {
const ref = useRef<HTMLInputElement>(null);
const dashcards = useSelector((state) =>
- getDashcardList(state).filter(
+ getCurrentDashcards(state).filter(
(dashcard) => isHeadingDashCard(dashcard) || isQuestionDashCard(dashcard),
),
);
const parameterDashcard = useSelector((state) => {
- const dashcards = getDashcardList(state);
+ const dashcards = getCurrentDashcards(state);
return findDashCardForInlineParameter(parameterId, dashcards);
});
diff --git a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx
index 3dbbb9123d5..a83215b4a06 100644
--- a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx
@@ -50,6 +50,9 @@ async function setup({ tabs = [], dashcards }: SetupOpts) {
dashcards,
parameters: [TEST_PARAMETER],
});
+ const otherDashboardDashcards: DashboardCard[] = [
+ { ...TEST_DASHCARD, id: 1001, dashboard_id: 1001 },
+ ];
renderWithProviders(<MoveParameterMenu parameterId={TEST_PARAMETER.id} />, {
storeInitialState: createMockState({
@@ -61,7 +64,10 @@ async function setup({ tabs = [], dashcards }: SetupOpts) {
dashcards: dashcards.map((dc) => dc.id),
},
},
- dashcards: _.indexBy(dashcards, "id"),
+ dashcards: {
+ ..._.indexBy(dashcards, "id"),
+ ..._.indexBy(otherDashboardDashcards, "id"),
+ },
}),
}),
});