Dashboard: Variable without a current value in json model causes crash on load #24261
Conversation
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
|
Don’t understand the test failure , the code is now correct , could need some help |
I will have a look. |
hugohaggmark
approved these changes
May 5, 2020
| reducerTester<VariablesState>() | ||
| .givenReducer(sharedReducer, { ...initialVariablesState }) | ||
| .whenActionIsDispatched(addVariable(payload)) | ||
| .thenStateShouldEqual({ | ||
| [0]: { | ||
| ...initialQueryVariableModelState, | ||
| ...model, | ||
| ...lodashDefaults({}, model, initialQueryVariableModelState), |
There was a problem hiding this comment.
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?
hugohaggmark
reviewed
May 5, 2020
| 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.
Marcus and I looked at the tests and action.payload.data.model is mutated here by lodash/defaults. Marcus will push changes
mckn
approved these changes
May 5, 2020
pull bot
pushed a commit
to digitalocean/grafana
that referenced
this pull request
May 5, 2020
…h on load (grafana#24261) * Variables: Fixes variable initilization and default values * fixed failing tests. Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
carlospeon
added a commit
to carlospeon/grafana
that referenced
this pull request
May 7, 2020
aknuds1
pushed a commit
that referenced
this pull request
Jun 30, 2020
…h on load (#24261) * Variables: Fixes variable initilization and default values * fixed failing tests. Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The way default state (initial state) for a variable was built was not working properly.
Using spread operator here actually overwrites default values with undefined values if the model contains undefined properties (which they can, for example in this case the current property was set to undefined during dashboard migration). https://github.com/grafana/grafana/blob/master/public/app/features/dashboard/state/DashboardMigrator.ts#L505
I choose to fix it here instead so that it does come back again if some other property happens to be set to undefined.
Fixes #24241