This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
fix sync bookmarks hierarchy #8088
Merged
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
ayumi
approved these changes
Apr 5, 2017
There was a problem hiding this comment.
sweet, test plan works.
i tried to address folderIds not set in #8073 however it assumes the records are properly ordered (folders sent first so they get made first). i like this PR's approach of setting all the folderIds on a batch in a first pass because it's safer.
(as a result of the above there's a minor merge conflict which can be superseded by this one)
merge after 8073 ?
| @@ -303,16 +304,30 @@ module.exports.getObjectById = (objectId, category, appState) => { | |||
| * Given an bookmark folder objectId, find the folder and return its folderId. | |||
| * @param {Immutable.List} objectId | |||
| * @param {Immutable.Map=} appState | |||
| * @param {Immutable.List=} records | |||
There was a problem hiding this comment.
minor: maybe clarify it's a batch of records possibly not yet applied.
There was a problem hiding this comment.
fix #7971 Test Plan: 1. open pyramid 0, enable sync 2. bookmark bing.com 3. create a folder 4. move the bing bookmark into the folder 5. open pyramid 1, sync it to pyramid 0 6. a folder should appear in pyramid 1 with bing inside the folder
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fix #7971
Test Plan:
git rebase -ito squash commits (if needed).this should probably be merged after #8073 which fixes some tests