From 5a0d90b104ce1228b548277218b2f8ba71919bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Farkas?= Date: Thu, 13 Oct 2022 10:04:51 +0200 Subject: [PATCH] logs: refactor: remove unused param "index" (#56543) --- public/app/features/explore/Explore.tsx | 4 +-- public/app/features/explore/state/query.ts | 34 +++++----------------- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index eb0cd59c80c..7f54d7abdbf 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -173,12 +173,12 @@ export class Explore extends React.PureComponent { makeAbsoluteTime(); }; - onModifyQueries = (action: QueryFixAction, index?: number) => { + onModifyQueries = (action: QueryFixAction) => { const { datasourceInstance } = this.props; if (datasourceInstance?.modifyQuery) { const modifier = (queries: DataQuery, modification: QueryFixAction) => datasourceInstance.modifyQuery!(queries, modification); - this.props.modifyQueries(this.props.exploreId, action, modifier, index); + this.props.modifyQueries(this.props.exploreId, action, modifier); } }; diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts index 373c32653c7..03713fa05c8 100644 --- a/public/app/features/explore/state/query.ts +++ b/public/app/features/explore/state/query.ts @@ -96,7 +96,6 @@ export const queriesImportedAction = createAction('explo export interface ModifyQueriesPayload { exploreId: ExploreId; modification: QueryFixAction; - index?: number; modifier: (query: DataQuery, modification: QueryFixAction) => DataQuery; } export const modifyQueriesAction = createAction('explore/modifyQueries'); @@ -354,17 +353,11 @@ export const importQueries = ( * Action to modify a query given a datasource-specific modifier action. * @param exploreId Explore area * @param modification Action object with a type, e.g., ADD_FILTER - * @param index Optional query row index. If omitted, the modification is applied to all query rows. * @param modifier Function that executes the modification, typically `datasourceInstance.modifyQueries`. */ -export function modifyQueries( - exploreId: ExploreId, - modification: QueryFixAction, - modifier: any, - index?: number -): ThunkResult { +export function modifyQueries(exploreId: ExploreId, modification: QueryFixAction, modifier: any): ThunkResult { return (dispatch) => { - dispatch(modifyQueriesAction({ exploreId, modification, index, modifier })); + dispatch(modifyQueriesAction({ exploreId, modification, modifier })); if (!modification.preventSubmit) { dispatch(runQueries(exploreId)); } @@ -745,25 +738,12 @@ export const queryReducer = (state: ExploreItemState, action: AnyAction): Explor if (modifyQueriesAction.match(action)) { const { queries } = state; - const { modification, index, modifier } = action.payload; + const { modification, modifier } = action.payload; let nextQueries: DataQuery[]; - if (index === undefined) { - // Modify all queries - nextQueries = queries.map((query, i) => { - const nextQuery = modifier({ ...query }, modification); - return generateNewKeyAndAddRefIdIfMissing(nextQuery, queries, i); - }); - } else { - // Modify query only at index - nextQueries = queries.map((query, i) => { - if (i === index) { - const nextQuery = modifier({ ...query }, modification); - return generateNewKeyAndAddRefIdIfMissing(nextQuery, queries, i); - } - - return query; - }); - } + nextQueries = queries.map((query, i) => { + const nextQuery = modifier({ ...query }, modification); + return generateNewKeyAndAddRefIdIfMissing(nextQuery, queries, i); + }); return { ...state, queries: nextQueries,