IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 05:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Templating: Expose more informative action names for keyed actions (#48076)

Browse Source
This commit is contained in:
kay delaney 2022-04-22 10:57:02 +01:00 committed by GitHub
parent 11bc5e1a06
commit 3606527359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/variables/editor/actions.test.ts
View File

@ -56,8 +56,15 @@ describe('switchToListMode', () => {
const mockDispatch = jest.fn();
switchToListMode(null)(mockDispatch, mockGetState, undefined);
const keyedAction = {
type: expect.any(String),
payload: {
key: 'null',
action: expect.any(Object),
},
};
expect(mockDispatch).toHaveBeenCalledTimes(2);
expect(mockDispatch.mock.calls[0][0]).toEqual(toKeyedAction('null', expect.any(Object)));
expect(mockDispatch.mock.calls[1][0]).toEqual(toKeyedAction('null', expect.any(Object)));
expect(mockDispatch.mock.calls[0][0]).toMatchObject(keyedAction);
expect(mockDispatch.mock.calls[1][0]).toMatchObject(keyedAction);
});
});

18
public/app/features/variables/state/keyedVariablesReducer.ts
View File

@ -1,5 +1,5 @@
import { AnyAction } from 'redux';
import { createAction, PayloadAction } from '@reduxjs/toolkit';
import { PayloadAction } from '@reduxjs/toolkit';
import { getTemplatingReducers, TemplatingState } from './reducers';
import { variablesInitTransaction } from './transactionReducer';
import { toStateKey } from '../utils';
@ -16,15 +16,27 @@ export interface KeyedAction {
action: PayloadAction<any>;
}
const keyedAction = createAction<KeyedAction>('templating/keyedAction');
const keyedAction = (payload: KeyedAction) => ({
type: `templating/keyed/${payload.action.type.replace(/^templating\//, '')}`,
payload,
});
export function toKeyedAction(key: string, action: PayloadAction<any>): PayloadAction<KeyedAction> {
const keyAsString = toStateKey(key);
return keyedAction({ key: keyAsString, action });
}
const isKeyedAction = (action: AnyAction): action is PayloadAction<KeyedAction> => {
return (
typeof action.type === 'string' &&
action.type.startsWith('templating/keyed') &&
'payload' in action &&
typeof action.payload.key === 'string'
);
};
export function keyedVariablesReducer(state = initialKeyedVariablesState, outerAction: AnyAction): KeyedVariablesState {
if (keyedAction.match(outerAction)) {
if (isKeyedAction(outerAction)) {
const { key, action } = outerAction.payload;
const stringKey = toStateKey(key);
const lastKey = variablesInitTransaction.match(action) ? stringKey : state.lastKey;