Improve update of datasets to use correct dataset order #227
Conversation
This file contains hidden or 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
|
@sjurba this PR will need to be rebased |
|
@benmccann: reabased onto master. |
benmccann
reviewed
Jan 9, 2018
src/index.js
Outdated
| const current = | ||
| currentDatasetsIndexed[this.props.datasetKeyProvider(next)]; | ||
| if (current && current.type === next.type) { | ||
| //The data array must be edited in place. As chart.js adds listeneres to it. |
benmccann
reviewed
Jan 9, 2018
src/index.js
Outdated
| }); | ||
| const { data, ...otherProps } = next; | ||
| //Merge properties. Notice weekness here if a property is removed | ||
| //from next, it will be retained by current and never dissapears. |
There was a problem hiding this comment.
dissapears -> disappears
benmccann
reviewed
Jan 9, 2018
src/index.js
Outdated
| current.data[pid] = next.data[pid]; | ||
| }); | ||
| const { data, ...otherProps } = next; | ||
| //Merge properties. Notice weekness here if a property is removed |
benmccann
reviewed
Jan 9, 2018
src/index.js
Outdated
| this.props.datasetKeyProvider | ||
| ); | ||
|
|
||
| //We can safely replace the dataset array, as long as we retain the _meta property |
There was a problem hiding this comment.
should put a space after each // for consistency with existing code
|
I read the first comment and thought: "spell checking comments.. A bit nitpicking maybe.." Then I read the second comment and was embarrassed. Then I read the third one. Sorry about that, and thank you for spell checking my comments. Fixed and amended. |
|
Thanks! I'll let @jerairrest review this PR since he's more familiar with the code. I just noticed those small issues |
|
Looks good to me! |
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.
This fixes #226 by maintaining the order of the nextDatasets while merging the data from currentDatasets.
Fixes #226