diff --git a/ui/src/dashboards/reducers/ui.js b/ui/src/dashboards/reducers/ui.js index cfe86cce9c..8a9c51581a 100644 --- a/ui/src/dashboards/reducers/ui.js +++ b/ui/src/dashboards/reducers/ui.js @@ -145,7 +145,7 @@ const ui = (state = initialState, action) => { const { dashboardID, templateID, - values: updatedSelectedValues, + values: updatedLocalSelectedValues, } = action.payload const newDashboards = state.dashboards.map(dashboard => { @@ -154,8 +154,10 @@ const ui = (state = initialState, action) => { if (staleTemplate.id === templateID) { const newValues = staleTemplate.values.map(staleValue => { let localSelected = false - for (let i = 0; i < updatedSelectedValues.length; i++) { - if (updatedSelectedValues[i].value === staleValue.value) { + for (let i = 0; i < updatedLocalSelectedValues.length; i++) { + if ( + updatedLocalSelectedValues[i].value === staleValue.value + ) { localSelected = true break } diff --git a/ui/src/dashboards/utils/tempVars.ts b/ui/src/dashboards/utils/tempVars.ts index b5c174abc9..e854b1e8cb 100644 --- a/ui/src/dashboards/utils/tempVars.ts +++ b/ui/src/dashboards/utils/tempVars.ts @@ -200,15 +200,15 @@ export const reconcileSelectedAndLocalSelectedValues = ( ): Template => { const localSelectedValue = nextTemplate.values.find(v => v.localSelected) const selectedValue = nextTemplate.values.find(v => v.selected) - const TemplateWithLocalSelected = makeSelected( + const templateWithLocalSelected = makeSelected( nextNextTemplate, getDeep(selectedValue, 'value', '') ) - const TemplateWithLocalSelectedAndSelected = makeLocalSelected( - TemplateWithLocalSelected, + const templateWithLocalSelectedAndSelected = makeLocalSelected( + templateWithLocalSelected, getDeep(localSelectedValue, 'value', '') ) - return TemplateWithLocalSelectedAndSelected + return templateWithLocalSelectedAndSelected } diff --git a/ui/src/tempVars/components/TemplateVariableEditor.tsx b/ui/src/tempVars/components/TemplateVariableEditor.tsx index 4fb70191c7..4e297ba567 100644 --- a/ui/src/tempVars/components/TemplateVariableEditor.tsx +++ b/ui/src/tempVars/components/TemplateVariableEditor.tsx @@ -235,12 +235,12 @@ class TemplateVariableEditor extends PureComponent { private handleUpdateTemplate = (nextNextTemplate: Template): void => { const {nextTemplate} = this.state - const TemplateWithSelectedAndLocalSelected = reconcileSelectedAndLocalSelectedValues( + const templateWithSelectedAndLocalSelected = reconcileSelectedAndLocalSelectedValues( nextTemplate, nextNextTemplate ) - this.setState({nextTemplate: TemplateWithSelectedAndLocalSelected}) + this.setState({nextTemplate: templateWithSelectedAndLocalSelected}) } private handleChooseType = ({type}) => {