-
Notifications
You must be signed in to change notification settings - Fork 12k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Dashboard: Variable without a current value in json model causes crash on load #24261
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
import { createSlice, PayloadAction } from '@reduxjs/toolkit'; | ||
import cloneDeep from 'lodash/cloneDeep'; | ||
import { default as lodashDefaults } from 'lodash/defaults'; | ||
|
||
import { VariableType } from '@grafana/data'; | ||
import { VariableModel, VariableOption, VariableWithOptions } from '../../templating/types'; | ||
|
@@ -16,13 +17,15 @@ const sharedReducerSlice = createSlice({ | |
reducers: { | ||
addVariable: (state: VariablesState, action: PayloadAction<VariablePayload<AddVariable>>) => { | ||
const id = action.payload.id ?? action.payload.data.model.name; // for testing purposes we can call this with an id | ||
const initialState = cloneDeep(variableAdapters.get(action.payload.type).initialState); | ||
|
||
const variable = { | ||
...cloneDeep(variableAdapters.get(action.payload.type).initialState), | ||
...action.payload.data.model, | ||
...lodashDefaults(action.payload.data.model, initialState), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Marcus and I looked at the tests and action.payload.data.model is mutated here by lodash/defaults. Marcus will push changes |
||
id: id, | ||
index: action.payload.data.index, | ||
global: action.payload.data.global, | ||
}; | ||
|
||
state[id] = variable; | ||
}, | ||
addInitLock: (state: VariablesState, action: PayloadAction<VariablePayload>) => { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: just saw that I was using
...initialQueryVariableModelState
before which can be bad, maybe we should just specify the real expected object instead of using spread/defaults?