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

Bugfix/legacy migration #6072

Merged
merged 12 commits into from
Sep 26, 2023
Merged

Bugfix/legacy migration #6072

merged 12 commits into from
Sep 26, 2023

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Sep 18, 2023

  • cleans up a bit the Application constructor
  • delays the display of the dialog notifying the user that the migration worked

TODO

  • test on Mac OS
  • test on Windows
  • get feedback from @nextcloud/designers

dialog 1:
step-1

dialog 2:
step-2

dialog when nothing was imported:
step-no-import

@camilasan camilasan marked this pull request as draft September 18, 2023 13:47
@codecov
Copy link

codecov bot commented Sep 18, 2023

Codecov Report

Merging #6072 (d517cbf) into master (bb09bc6) will decrease coverage by 0.42%.
Report is 2 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6072      +/-   ##
==========================================
- Coverage   60.33%   59.92%   -0.42%     
==========================================
  Files         145      145              
  Lines       18800    18800              
==========================================
- Hits        11343    11265      -78     
- Misses       7457     7535      +78     

see 7 files with indirect coverage changes

@nimishavijay
Copy link
Member

nimishavijay commented Sep 18, 2023

Looks good generally :) some small points:

  • show the configuration details in the confirmation dialog
    2 accounts and 4 folders were detected on a legacy desktop client. Should the accounts and folders be imported?
    • Note: use correct wording, for eg. 1 account was detected on a legacy desktop client. Should the account be imported?
  • if the number of accounts and folders is 0 (for both) then don't show the dialog and directly show the setup wizard
  • change wording of buttons to "Import" and "Skip"

(decided to not show the detailed results of the import as it might be too long, if there is a way to show and hide the results then we could include it, but otherwise a simple confirmation is enough :) )

@privatemaker
Copy link

if there is a way to show and hide the results then we could include it

Perhaps the details could be put in an triangular collapsible text box?

@camilasan also brought up idea of showing user names- I like this idea. Something simple like:

Imported 2 accounts and 4 folders.

- Private Maker
- Disco Dancing Club

@camilasan
Copy link
Member Author

@privatemaker @nimishavijay @jancborchardt what do you think?

1 account:
1account
1account-success

2 or more accounts:
2accounts
2accounts-success

@camilasan camilasan force-pushed the bugfix/legacy-migration branch from 9f00412 to 1f0b2fc Compare September 20, 2023 14:36
@nimishavijay
Copy link
Member

nimishavijay commented Sep 20, 2023

Looks good! 2 small changes that was missed with the previous feedback:

  • "1" instead of "one" to maintain consistency when referring to different numbers
  • switch the position of "Import" and "Skip" buttons so the primary action is always in the bottom right

After that, it is super nice! :)

@camilasan
Copy link
Member Author

  • switch the position of "Import" and "Skip" buttons so the primary action is always in the bottom right

Sadly I can't:
"The ButtonRole is used by QMessageBox to determine the ordering of the buttons on screen (which varies according to the platform)."

@camilasan camilasan force-pushed the bugfix/legacy-migration branch from 520cd11 to 638f080 Compare September 20, 2023 17:21
@camilasan camilasan requested review from claucambra, allexzander and mgallien and removed request for allexzander September 20, 2023 17:24
@camilasan camilasan marked this pull request as ready for review September 20, 2023 17:25
@camilasan camilasan force-pushed the bugfix/legacy-migration branch 2 times, most recently from c39f569 to fdb533a Compare September 20, 2023 21:48
src/gui/accountmanager.cpp Show resolved Hide resolved
src/gui/accountmanager.cpp Outdated Show resolved Hide resolved
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

Code-wise looks good

Camila added 11 commits September 26, 2023 14:03
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
…mport.

Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
…unt.

Signed-off-by: Camila <hello@camila.codes>
…acyFolder

Signed-off-by: Camila <hello@camila.codes>
…ction.

Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
@mgallien mgallien force-pushed the bugfix/legacy-migration branch from 4d15236 to d6eb5c5 Compare September 26, 2023 12:03
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@sonarcloud
Copy link

sonarcloud bot commented Sep 26, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 8 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6072-d517cbfd687c70fa2123fad54eaa63d85993b52d-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit a9925b4 into master Sep 26, 2023
11 of 13 checks passed
@mgallien mgallien deleted the bugfix/legacy-migration branch September 26, 2023 15:02
@mgallien
Copy link
Collaborator

/backport to stable-3.10

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

Successfully merging this pull request may close these issues.

7 participants