Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

fix sync duplicating folders #9187

Merged
merged 1 commit into from
Jun 2, 2017
Merged

fix sync duplicating folders #9187

merged 1 commit into from
Jun 2, 2017

Conversation

diracdeltas
Copy link
Member

@diracdeltas diracdeltas commented Jun 1, 2017

fix #8454, particularly #8454 (comment)

Test Plan:

  1. Enable sync in Pyramid 0.
  2. Create a folder.
  3. Wait for at least 1 minute. The folder should not be duplicated.
  4. Repeat the test plan from Sync is not tracking & merging changes between pyramids which creates a loss of hierarchy #8454 to make sure that bookmark hierarchy is preserved when syncing pyramids.

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).
  • Ran git rebase -i to squash commits (if needed).

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

fix #8454, particularly #8454 (comment)

Test Plan:
1. Enable sync in Pyramid 0.
2. Create a folder.
3. Wait for at least 1 minute. The folder should not be duplicated.
4. Repeat the test plan from #8454 to make sure that bookmark hierarchy is preserved when syncing pyramids.
@diracdeltas diracdeltas added this to the 0.18.x milestone Jun 1, 2017
@diracdeltas diracdeltas self-assigned this Jun 1, 2017
@diracdeltas diracdeltas requested a review from ayumi June 1, 2017 01:09
if (action.destinationDetail) {
const sourceKey = siteUtil.getSiteKey(action.siteDetail)
const destinationKey = siteUtil.getSiteKey(action.destinationDetail)
if (action.destinationDetail) {
Copy link
Member Author

Choose a reason for hiding this comment

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

all of this code seems to assume that action.siteDetail is not a List, so i think it should go within the if block instead of outside it

Copy link
Contributor

@ayumi ayumi left a comment

Choose a reason for hiding this comment

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

💖

@bsclifton bsclifton merged commit 5963176 into master Jun 2, 2017
@bsclifton bsclifton deleted the fix/sync-hierarchy branch June 2, 2017 23:02
@bsclifton bsclifton modified the milestones: 0.17.x (Frozen, only critical adds from here), 0.18.x Jun 2, 2017
bsclifton added a commit that referenced this pull request Jun 2, 2017
bsclifton added a commit that referenced this pull request Jun 5, 2017
@bsclifton bsclifton modified the milestones: 0.16.x (Frozen, only critical adds from here), 0.17.x (Frozen, only critical adds from here) Jun 5, 2017
@bsclifton
Copy link
Member

Pulling into 0.16.x, per request by @alexwykoff

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sync is not tracking & merging changes between pyramids which creates a loss of hierarchy
3 participants