feat(dashboard): add ability to change order of variable dropdowns #12821
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
AlirieGray
force-pushed
the
variables/drag-variables-on-dashboard
branch
9 times, most recently
from
678f4a3 to
f98e1c4
Compare
chnn
approved these changes
Mar 22, 2019
|
|
||
| // Components | ||
| import VariableDropdown from 'src/dashboards/components/variablesControlBar/VariableDropdown' | ||
| // import VariableDropdown from 'src/dashboards/components/variablesControlBar/VariableDropdown' |
There was a problem hiding this comment.
Suggested change
| // import VariableDropdown from 'src/dashboards/components/variablesControlBar/VariableDropdown' |
chnn
reviewed
Mar 22, 2019
ui/src/variables/reducers/index.ts
Outdated
| @@ -81,13 +82,29 @@ export const variablesReducer = ( | |||
|
|
|||
| case 'SET_VARIABLE_VALUES': { | |||
| const {contextID, status, values} = action.payload | |||
| const originalOrder = draftState.values[contextID].order | |||
There was a problem hiding this comment.
This line was preventing me from loading a dashboard that had never been loaded before. In this case there are no values in localStorage, so draftState.values[contextID] doesn't exist, so accessing its order property is a run time error.
I think we can also simplify the logic that maintains the existing order:
const prevOrder = get(draftState, `values.${contextID}.order`) || []
if (values) {
// Maintain the existing sort order, placing new variables at the
// beginning
const order = Object.keys(values).sort(
(a, b) => prevOrder.indexOf(a) - prevOrder.indexOf(b)
)
draftState.values[contextID] = {
status,
values,
order,
}
} else if (draftState.values[contextID]) {
There was a problem hiding this comment.
clever! I like it
AlirieGray
force-pushed
the
variables/drag-variables-on-dashboard
branch
2 times, most recently
from
4211f47 to
acad0ff
Compare
AlirieGray
force-pushed
the
variables/drag-variables-on-dashboard
branch
from
acad0ff to
85e44b2
Compare
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.
Closes #12512
Closes #12376
This PR allows variables to be moved left and right within the
VariablesControlBarin a dashboard. The order of the variables on a given dashboard is stored in thevaluesproperty of the Variables state in local storage.