IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

logs: refactor: remove unused param "index" (#56543)

Browse Source
This commit is contained in:
Gábor Farkas 2022-10-13 10:04:51 +02:00 committed by GitHub
parent 277803a894
commit 5a0d90b104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/explore/Explore.tsx
View File

@ -173,12 +173,12 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
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);
}
};

34
public/app/features/explore/state/query.ts
View File

@ -96,7 +96,6 @@ export const queriesImportedAction = createAction<QueriesImportedPayload>('explo
export interface ModifyQueriesPayload {
exploreId: ExploreId;
modification: QueryFixAction;
index?: number;
modifier: (query: DataQuery, modification: QueryFixAction) => DataQuery;
}
export const modifyQueriesAction = createAction<ModifyQueriesPayload>('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<void> {
export function modifyQueries(exploreId: ExploreId, modification: QueryFixAction, modifier: any): ThunkResult<void> {
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,