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.

Sign up for GitHub

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

Jump to bottom

Handle conflicts when we move a file #1695

Merged
merged 18 commits into from
May 29, 2019
Merged

Handle conflicts when we move a file #1695

merged 18 commits into from
May 29, 2019

Conversation

cedricmessiant
Copy link
Contributor

@cedricmessiant cedricmessiant commented May 21, 2019 •
edited

Remaining:

  • add unit tests on cancelMove and moveEntries
  • we could have a CozyFile.restore method in cozy-doctypes that just calls the collection's method but do we want this?

Also, I opened a discussion on trello about error handling

@cedricmessiant cedricmessiant force-pushed the move_conflict branch 4 times, most recently from 3a94f48 to 3f1749c Compare May 27, 2019 12:44
@cedricmessiant cedricmessiant mentioned this pull request May 27, 2019
Merged
@cedricmessiant cedricmessiant changed the title WIP: Handle conflicts when we move a file Handle conflicts when we move a file May 28, 2019
@cedricmessiant cedricmessiant marked this pull request as ready for review May 28, 2019 15:29
@cedricmessiant
Copy link
Contributor Author

(𝐋) Upload conflit - étape 1 - écraser fichier non partagé

@cozy-bot
Copy link

Visual Review - Please review screenshots, then restart build.

  • ❌ drive : Search : https://visualreview.cozycloud.cc/#/2/5/609

    		•

    y-lohse
    y-lohse approved these changes May 29, 2019
    View reviewed changes
    Copy link
    Contributor

    @y-lohse y-lohse left a comment

    Choose a reason for hiding this comment

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

    Nit, but I think we want to use more HOC to inject context variables as props, ie translate() and withClient(). Other than that LGTM 👍

    src/drive/web/modules/move/MoveModal.jsx Outdated Show resolved Hide resolved
    @cozy-bot
    Copy link

    🎁 Click here to download the latest Android APK

    @cozy-bot
    Copy link

    Visual Review - Please review screenshots, then restart build.

  • ❌ drive : Search : https://visualreview.cozycloud.cc/#/2/5/695

    		•

    @cozy-bot
    Copy link

    Visual Review - Please review screenshots, then restart build.

  • ❌ drive : Search : https://visualreview.cozycloud.cc/#/2/5/752

    		•

    Crash--
    Crash-- approved these changes May 29, 2019
    View reviewed changes
    Copy link
    Contributor

    @Crash-- Crash-- left a comment

    Choose a reason for hiding this comment

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

    LGTM

    @cozy-bot
    Copy link

    🎁 Click here to download the latest Android APK

    @cedricmessiant
    feat: Handle conflicts when we move a file
    c27b147
    @cedricmessiant
    fix: Modal wants aria-label and into props
    de84736
    @cedricmessiant
    feat: Restore trashed files if move is cancelled
    d7f26b4
    @cedricmessiant
    fix: Remove useless await
    27cc5b5
    @cedricmessiant
    test: Add tests for cancelMove method
    dcdfddb
    @cedricmessiant
    fix: Reset trashedFiles after files have been trashed and before a ne…
    803bd94 
    …w move, don't put null in trashedFiles
    @cedricmessiant
    test: Add tests for moveEntries [APK]
    8cb317d
    @cedricmessiant
    fix: Only one Alerter after cancel
    54285d1
    @cedricmessiant
    refactor: Use HOCs instead of context
    ecd76df
    @cedricmessiant
    refactor: Use absolute paths for imports
    004ae41
    @cedricmessiant
    fix: Fix MoveModal proptypes [APK]
    aaf4105
    @cedricmessiant
    feat: Remove flags for conflict management [APK]
    06b5e48
    @cedricmessiant
    fix: Don't translate before calling Alerter methods to avoid warnings
    c068c96
    @cedricmessiant
    fix: Cancel promises on unmount in MoveModal
    3b0de25
    @cedricmessiant
    fix: We don't need to use state for trashedFiles [APK]
    790558b
    @cedricmessiant
    fix: Better comment about sharingState prop
    144b341
    @cedricmessiant
    refactor: Add unregisterCancelables method
    44c691f
    @cedricmessiant
    lint: No unused var [APK]
    abef4ae
    @cozy-bot
    Copy link

    🎁 Click here to download the latest Android APK

    @cozy-bot
    Copy link

    Visual Review - Please review screenshots, then restart build.

  • ❌ drive : Search : https://visualreview.cozycloud.cc/#/2/5/797

    		•

    @cedricmessiant cedricmessiant merged commit f6e0075 into master May 29, 2019
    @cedricmessiant cedricmessiant deleted the move_conflict branch May 29, 2019 14:11
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Reviewers

    @Crash-- Crash-- Crash-- approved these changes

    @y-lohse y-lohse y-lohse approved these changes

    Assignees
    No one assigned
    Labels
    None yet
    Projects
    None yet
    Milestone
    No milestone
    Development

    Successfully merging this pull request may close these issues.

    None yet
    4 participants
    @cedricmessiant @cozy-bot @Crash-- @y-lohse