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

Feature/macos vfs locking #6960

Merged
merged 26 commits into from
Sep 12, 2024
Merged

Feature/macos vfs locking #6960

merged 26 commits into from
Sep 12, 2024

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Aug 1, 2024 •
edited
Loading

Implements GUI side of macOS virtual files locking

Screenshot 2024-08-01 at 15 56 00

@claucambra claucambra self-assigned this Aug 1, 2024
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Aug 1, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@marcotrevisan marcotrevisan mentioned this pull request Aug 1, 2024
Closed
@claucambra claucambra linked an issue Aug 2, 2024 that may be closed by this pull request
Please implement locking on macOS-vfs builds #6716
Closed
@mgallien
Copy link
Collaborator

/backport to stable-3.14

@claucambra @mgallien
Move all sharing components for FileProviderUIExt into a Sharing folder
1d0e3bc 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add basic LockViewController components
73674bf 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add lock/unlock actions in FileProviderUIExt info plist
501c1c4 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Handle new locking action identifiers in document action view control…
ec66bcd 
…ler of FileProviderUIExt

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add basic properties to lock view controller
e3b6cd9 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Design lock view in file provider ui
10f37d3 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add close action to lock view controller
4edbb4b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Move service connection fetcher method into a utils file
624b72b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Move item metadata fetch into util file in FileProviderUIExt
81566ee 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add convenience method to present and log errors in lock view controller
05e5793 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add method to simply provide file details in locking view
fdbc52b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Process target item on init of lock view controller
3b33b26 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Perform lock/unlock procedure in lock view controller
c7d2ed3 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add convenience function to stop/hide loading indicator in lock view …
65e4297 
…controller

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Stop loading indicator when presenting error
516fc7c 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Pull out error handling from completionHandler for nckit lockunlock
d312d00 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Once finished locking/unlocking, stop loading indicator
7ae9f83 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Make sure not to check for kit before we should in shares table view …
f3e341c 
…data source

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Fix file lock server url in lockviewcontroller
4dbfbc3 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Fix XIB initialisation in LockViewController
616ac2e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Fix internal layouting of lock view by simply using a nsview rather t…
4348869 
…han fumbling with a stack view

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Add warn image to locking view if there is an error
19c9c19 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Fix NSExtensionFileProviderActionActivationRules for locking menu items
419035c 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Display checkmark when file lock completed
7413cf6 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Do not provide items if account is not set up correctly
4012d43 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Signal enumeration of locked/unlocked file
94a783c 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@mgallien mgallien force-pushed the feature/macos-vfs-locking branch from 31996e8 to 94a783c Compare September 12, 2024 07:50
@mgallien mgallien merged commit 804cb1d into master Sep 12, 2024
10 of 14 checks passed
@mgallien mgallien deleted the feature/macos-vfs-locking branch September 12, 2024 07:51
@backportbot backportbot bot mentioned this pull request Sep 12, 2024
Merged
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6960-94a783c48268d02b3f4ccae9fa5b01989caba905-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.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

Assignees

@claucambra claucambra

Labels
feature: 💽 virtual filesystem os: 🍎 macOS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Please implement locking on macOS-vfs builds
3 participants
@claucambra @mgallien @nextcloud-desktop-bot