Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync folder structure not kept #982

Merged
merged 6 commits into from
Dec 11, 2018
Merged

Conversation

AlexeyBarabash
Copy link
Contributor

@AlexeyBarabash AlexeyBarabash commented Nov 29, 2018

Things done in PR:

  1. Orphaned bookmarks are placed to Pending Bookmarks folder and moved into actual parent folder once it arrived;
  2. Pending Bookmarks and Deleted Bookmarks folder is hidden by BraveBookmarkPermanentNode
  3. Fixed sorting issue of bookmarks tree with a lot of mixed child items/folder;
  4. Added unit tests.

Fixes brave/brave-browser#2133

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Manual is described in brave/brave-browser#2133 .
Auto tests: npm run test -- brave_unit_tests --filter=BraveBookmarkChangeProcessorTest.ItemAheadOfFolder:BraveBookmarkChangeProcessorTest.ItemAheadOfFolderAgressive:BraveBookmarkChangeProcessorTest.ItemAheadOfFolderRequireStrictSorting

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@AlexeyBarabash AlexeyBarabash self-assigned this Nov 29, 2018
@bbondy bbondy changed the title Sync folder structure not kept WIP: Sync folder structure not kept Dec 2, 2018
@AlexeyBarabash AlexeyBarabash force-pushed the sync_folder_structure_not_kept branch 4 times, most recently from 27b7c05 to 064711d Compare December 5, 2018 15:13
@AlexeyBarabash AlexeyBarabash changed the title WIP: Sync folder structure not kept Sync folder structure not kept Dec 5, 2018
@AlexeyBarabash
Copy link
Contributor Author

Pushed a commit with fixes for this review notices, 454d445 . Will squash this commit after approval.

Copy link
Member

@darkdh darkdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to remove the observer hack and manually call set_visible(false) for both our permanent nodes. See the comments

components/brave_sync/client/bookmark_change_processor.cc Outdated Show resolved Hide resolved
@darkdh darkdh force-pushed the sync_folder_structure_not_kept branch 4 times, most recently from 89ea1e1 to 537fef7 Compare December 11, 2018 02:05
@darkdh darkdh force-pushed the sync_folder_structure_not_kept branch from 537fef7 to 2d9e9f3 Compare December 11, 2018 03:45
darkdh
darkdh previously approved these changes Dec 11, 2018
@AlexeyBarabash
Copy link
Contributor Author

master: f177732
0.59.x: 0a17159

@kjozwiak
Copy link
Member

@AlexeyBarabash uplift request to 0.58.x approved after deliberating with @srirambv. 👍 Please add/remove needed labels and ensure that the associated issue is moved to the correct milestone.

@AlexeyBarabash
Copy link
Contributor Author

Thanks @kjozwiak @srirambv

0.58.x aea975a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Folder structure is not maintained on device 2
4 participants