Skip to content

Commit 770a95a

Browse files
committed
refactor: widgetClickJumpAction params
1 parent 5410a8a commit 770a95a

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

frontend/src/app/pages/DashBoardPage/actions/widgetAction.ts

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
import { urlSearchTransfer } from 'app/pages/MainPage/pages/VizPage/utils';
1919
import { ChartMouseEventParams } from 'app/types/Chart';
20-
import type { History } from 'history';
2120
import i18next from 'i18next';
2221
import { RootState } from 'types';
2322
import { jumpTypes } from '../constants';
@@ -106,13 +105,14 @@ export const tableChartClickAction =
106105
};
107106

108107
export const widgetClickJumpAction =
109-
(
110-
renderMode: VizRenderMode,
111-
widget: Widget,
112-
params: ChartMouseEventParams,
113-
history: History<any>,
114-
) =>
108+
(obj: {
109+
renderMode: VizRenderMode;
110+
widget: Widget;
111+
params: ChartMouseEventParams;
112+
history: any;
113+
}) =>
115114
(dispatch, getState) => {
115+
const { renderMode, widget, params, history } = obj;
116116
const state = getState() as RootState;
117117
const orgId = state?.main?.orgId || '';
118118
const folderIds = state.viz?.vizs?.map(v => v.relId) || [];
@@ -245,15 +245,16 @@ export const widgetClickLinkageAction =
245245
};
246246
//
247247
export const widgetChartClickAction =
248-
(
249-
boardId: string,
250-
editing: boolean,
251-
renderMode: VizRenderMode,
252-
widget: Widget,
253-
params: ChartMouseEventParams,
254-
history: History<any>,
255-
) =>
248+
(obj: {
249+
boardId: string;
250+
editing: boolean;
251+
renderMode: VizRenderMode;
252+
widget: Widget;
253+
params: ChartMouseEventParams;
254+
history: any;
255+
}) =>
256256
dispatch => {
257+
const { boardId, editing, renderMode, widget, params, history } = obj;
257258
//is tableChart
258259
if (
259260
params.componentType === 'table' &&
@@ -267,7 +268,7 @@ export const widgetChartClickAction =
267268
// jump
268269
const jumpConfig = widget.config?.jumpConfig;
269270
if (jumpConfig && jumpConfig.open) {
270-
dispatch(widgetClickJumpAction(renderMode, widget, params, history));
271+
dispatch(widgetClickJumpAction({ renderMode, widget, params, history }));
271272
return;
272273
}
273274
// linkage

frontend/src/app/pages/DashBoardPage/components/ActionProvider/WidgetActionProvider.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@ export const WidgetActionProvider: FC<{
178178
//
179179
onWidgetChartClick: (widget: Widget, params: ChartMouseEventParams) => {
180180
dispatch(
181-
widgetChartClickAction(
181+
widgetChartClickAction({
182182
boardId,
183-
boardEditing,
183+
editing: boardEditing,
184184
renderMode,
185185
widget,
186186
params,
187187
history,
188-
),
188+
}),
189189
);
190190
},
191191

0 commit comments

Comments
 (0)