mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Variables: move state tree into a keyed state (#44642)
* Variables: move state tree into a keyed state * Update public/app/features/variables/state/transactionReducer.ts Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com> * Chore: fix prettier error * Chore: renamed slices and lastUid * Chore: rename toUidAction * Chore: rename dashboardVariableReducer * Chore: rename state prop back to templating * Chore renames variable.dashboardUid * Chore: rename toDashboardVariableIdentifier * Chore: rename getDashboardVariable * Chore: rename getDashboardVariablesState * Chore: rename getDashboardVariables * Chore: some more renames * Chore: small clean up * Chore: small rename * Chore: removes unused function * Chore: rename VariableModel.stateKey * Chore: rename KeyedVariableIdentifier.stateKey * user essentials mob! 🔱 * user essentials mob! 🔱 * user essentials mob! 🔱 * user essentials mob! 🔱 Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com> Co-authored-by: kay delaney <kay@grafana.com> Co-authored-by: Alexandra Vargas <alexa1866@gmail.com> Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
import { StoreState } from '../../app/types';
|
||||
import { getPreloadedState } from '../../app/features/variables/state/helpers';
|
||||
|
||||
export const convertToStoreState = (variables: any[]): StoreState => {
|
||||
export const convertToStoreState = (key: string, models: any[]): StoreState => {
|
||||
const variables = models.reduce((byName, variable) => {
|
||||
byName[variable.name] = variable;
|
||||
return byName;
|
||||
}, {});
|
||||
return {
|
||||
templating: {
|
||||
variables: variables.reduce((byName, variable) => {
|
||||
byName[variable.name] = variable;
|
||||
return byName;
|
||||
}, {}),
|
||||
},
|
||||
...getPreloadedState(key, { variables }),
|
||||
} as StoreState;
|
||||
};
|
||||
|
||||
@@ -3,8 +3,8 @@ import { convertToStoreState } from './convertToStoreState';
|
||||
import { TemplateSrv } from '../../app/features/templating/template_srv';
|
||||
import { getTemplateSrvDependencies } from './getTemplateSrvDependencies';
|
||||
|
||||
export function initTemplateSrv(variables: any[], timeRange?: TimeRange) {
|
||||
const state = convertToStoreState(variables);
|
||||
export function initTemplateSrv(key: string, variables: any[], timeRange?: TimeRange) {
|
||||
const state = convertToStoreState(key, variables);
|
||||
const srv = new TemplateSrv(getTemplateSrvDependencies(state));
|
||||
srv.init(variables, timeRange);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user