refactor: file sharing (#50)

kouprlabs · Nov 30, 2024 · 98c7538 · 98c7538
1 parent 7953e43
commit 98c7538
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 18 deletions.
diff --git a/Sources/Screens/Sharing/SharingBatch.swift b/Sources/Screens/Sharing/SharingBatch.swift
@@ -35,7 +35,7 @@ struct SharingBatch: View, TokenDistributing {
         TabView(selection: $selection) {
             Tab("Users", systemImage: "person", value: Tag.users) {
                 NavigationStack {
-                    SharingUserPermission(
+                    SharingUserForm(
                         fileIDs: fileIDs,
                         sharingStore: sharingStore,
                         workspaceStore: workspaceStore,
@@ -45,7 +45,7 @@ struct SharingBatch: View, TokenDistributing {
             }
             Tab("Groups", systemImage: "person.2", value: Tag.groups) {
                 NavigationStack {
-                    SharingGroupPermission(
+                    SharingGroupForm(
                         fileIDs: fileIDs,
                         sharingStore: sharingStore,
                         workspaceStore: workspaceStore,

diff --git a/...eens/Sharing/SharingGroupPermission.swift → ...es/Screens/Sharing/SharingGroupForm.swift b/...eens/Sharing/SharingGroupPermission.swift → ...es/Screens/Sharing/SharingGroupForm.swift
@@ -11,7 +11,7 @@
 import SwiftUI
 import VoltaserveCore
 
-struct SharingGroupPermission: View, FormValidatable, ErrorPresentable {
+struct SharingGroupForm: View, FormValidatable, ErrorPresentable {
     @ObservedObject private var sharingStore: SharingStore
     @ObservedObject private var workspaceStore: WorkspaceStore
     @Environment(\.dismiss) private var dismiss

diff --git a/...es/Screens/Sharing/SharingGroupList.swift → ...ens/Sharing/SharingGroupPermissions.swift b/...es/Screens/Sharing/SharingGroupList.swift → ...ens/Sharing/SharingGroupPermissions.swift
@@ -11,7 +11,7 @@
 import SwiftUI
 import VoltaserveCore
 
-struct SharingGroupList: View {
+struct SharingGroupPermissions: View {
     @ObservedObject private var sharingStore: SharingStore
     @ObservedObject private var workspaceStore: WorkspaceStore
     @State private var group: VOGroup.Entity?
@@ -31,7 +31,7 @@ struct SharingGroupList: View {
             } else {
                 List(groupPermissions, id: \.id) { groupPermission in
                     NavigationLink {
-                        SharingGroupPermission(
+                        SharingGroupForm(
                             fileIDs: [fileID],
                             sharingStore: sharingStore,
                             workspaceStore: workspaceStore,

diff --git a/Sources/Screens/Sharing/SharingOverview.swift b/Sources/Screens/Sharing/SharingOverview.swift
@@ -33,15 +33,15 @@ struct SharingOverview: View, ViewDataProvider, LoadStateProvider, TimerLifecycl
         NavigationStack {
             TabView(selection: $selection) {
                 Tab("Users", systemImage: "person", value: Tag.users) {
-                    SharingUserList(
+                    SharingUserPermissions(
                         fileID,
                         sharingStore: sharingStore,
                         workspaceStore: workspaceStore
                     )
                 }
                 .badge(userPermissionCount)
                 Tab("Groups", systemImage: "person.2", value: Tag.groups) {
-                    SharingGroupList(
+                    SharingGroupPermissions(
                         fileID,
                         sharingStore: sharingStore,
                         workspaceStore: workspaceStore
@@ -55,13 +55,13 @@ struct SharingOverview: View, ViewDataProvider, LoadStateProvider, TimerLifecycl
                 ToolbarItem(placement: .topBarLeading) {
                     NavigationLink {
                         if selection == .users {
-                            SharingUserPermission(
+                            SharingUserForm(
                                 fileIDs: [fileID],
                                 sharingStore: sharingStore,
                                 workspaceStore: workspaceStore
                             )
                         } else if selection == .groups {
-                            SharingGroupPermission(
+                            SharingGroupForm(
                                 fileIDs: [fileID],
                                 sharingStore: sharingStore,
                                 workspaceStore: workspaceStore

diff --git a/...reens/Sharing/SharingUserPermission.swift → ...ces/Screens/Sharing/SharingUserForm.swift b/...reens/Sharing/SharingUserPermission.swift → ...ces/Screens/Sharing/SharingUserForm.swift
@@ -11,7 +11,7 @@
 import SwiftUI
 import VoltaserveCore
 
-struct SharingUserPermission: View, FormValidatable, ErrorPresentable {
+struct SharingUserForm: View, FormValidatable, ErrorPresentable {
     @ObservedObject private var sharingStore: SharingStore
     @ObservedObject private var workspaceStore: WorkspaceStore
     @Environment(\.dismiss) private var dismiss
@@ -49,7 +49,7 @@ struct SharingUserPermission: View, FormValidatable, ErrorPresentable {
             Section(header: VOSectionHeader("User Permission")) {
                 NavigationLink {
                     if let workspace = workspaceStore.current {
-                        UserSelector(organizationID: workspace.organization.id) { user in
+                        UserSelector(organizationID: workspace.organization.id, excludeMe: true) { user in
                             self.user = user
                         }
                     }

diff --git a/...ces/Screens/Sharing/SharingUserList.swift → ...eens/Sharing/SharingUserPermissions.swift b/...ces/Screens/Sharing/SharingUserList.swift → ...eens/Sharing/SharingUserPermissions.swift
@@ -11,7 +11,7 @@
 import SwiftUI
 import VoltaserveCore
 
-struct SharingUserList: View, TokenDistributing {
+struct SharingUserPermissions: View, TokenDistributing {
     @EnvironmentObject private var tokenStore: TokenStore
     @ObservedObject private var sharingStore: SharingStore
     @ObservedObject private var workspaceStore: WorkspaceStore
@@ -34,7 +34,7 @@ struct SharingUserList: View, TokenDistributing {
                 } else {
                     List(userPermissions, id: \.id) { userPermission in
                         NavigationLink {
-                            SharingUserPermission(
+                            SharingUserForm(
                                 fileIDs: [fileID],
                                 sharingStore: sharingStore,
                                 workspaceStore: workspaceStore,

diff --git a/Sources/Screens/User/UserSelector.swift b/Sources/Screens/User/UserSelector.swift
@@ -20,16 +20,19 @@ struct UserSelector: View, ViewDataProvider, LoadStateProvider, TimerLifecycle,
     private let groupID: String?
     private let organizationID: String?
     private let excludeGroupMembers: Bool?
+    private let excludeMe: Bool?
 
     init(
         organizationID: String? = nil,
         groupID: String? = nil,
         excludeGroupMembers: Bool? = nil,
+        excludeMe: Bool? = nil,
         onCompletion: ((VOUser.Entity) -> Void)? = nil
     ) {
         self.organizationID = organizationID
         self.groupID = groupID
         self.excludeGroupMembers = excludeGroupMembers
+        self.excludeMe = excludeMe
         self.onCompletion = onCompletion
     }
 
@@ -89,6 +92,7 @@ struct UserSelector: View, ViewDataProvider, LoadStateProvider, TimerLifecycle,
             userStore.organizationID = organizationID
             userStore.groupID = groupID
             userStore.excludeGroupMembers = excludeGroupMembers
+            userStore.excludeMe = excludeMe
             if let token = tokenStore.token {
                 assignTokenToStores(token)
                 startTimers()

diff --git a/Sources/Screens/User/UserStore.swift b/Sources/Screens/User/UserStore.swift
@@ -26,6 +26,7 @@ class UserStore: ObservableObject {
     var organizationID: String?
     var groupID: String?
     var excludeGroupMembers: Bool?
+    var excludeMe: Bool?
     var invitationID: String?
 
     var token: VOToken.Value? {
@@ -92,6 +93,7 @@ class UserStore: ObservableObject {
                 organizationID: organizationID,
                 groupID: groupID,
                 excludeGroupMembers: excludeGroupMembers,
+                excludeMe: excludeMe,
                 page: page,
                 size: size
             ))

diff --git a/Voltaserve.xcodeproj/project.pbxproj b/Voltaserve.xcodeproj/project.pbxproj
@@ -143,13 +143,13 @@
 				Server/ServerOverview.swift,
 				Server/ServerRow.swift,
 				Sharing/SharingBatch.swift,
-				Sharing/SharingGroupList.swift,
-				Sharing/SharingGroupPermission.swift,
+				Sharing/SharingGroupForm.swift,
+				Sharing/SharingGroupPermissions.swift,
 				Sharing/SharingGroupRow.swift,
 				Sharing/SharingOverview.swift,
 				Sharing/SharingStore.swift,
-				Sharing/SharingUserList.swift,
-				Sharing/SharingUserPermission.swift,
+				Sharing/SharingUserForm.swift,
+				Sharing/SharingUserPermissions.swift,
 				Sharing/SharingUserRow.swift,
 				SignIn/SignIn.swift,
 				SignIn/TokenStore.swift,

diff --git a/Voltaserve.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Voltaserve.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -16,7 +16,7 @@
       "location" : "https://github.com/kouprlabs/voltaserve-swift.git",
       "state" : {
         "branch" : "main",
-        "revision" : "c3e98454a3ee6a71f1d4021926f4623460027c55"
+        "revision" : "65cd117d479727ebf638276425bd92026f4b6270"
       }
     }
   ],