fix: organization error handling

Sources/Screens/Browser/BrowserList.swift

@@ -17,6 +17,7 @@ struct BrowserList: View, LoadStateProvider, ViewDataProvider, TimerLifecycle, T
     @ObservedObject private var workspaceStore: WorkspaceStore
     @StateObject private var browserStore = BrowserStore()
     @State private var tappedItem: VOFile.Entity?
+    @State private var searchText = ""
     private let folderID: String
     private let confirmLabelText: String?
     private let onCompletion: ((String) -> Void)?
@@ -67,8 +68,8 @@ struct BrowserList: View, LoadStateProvider, ViewDataProvider, TimerLifecycle, T
                                 }
                             }
                             .listStyle(.inset)
-                            .searchable(text: $browserStore.searchText)
-                            .onChange(of: browserStore.searchText) {
+                            .searchable(text: $searchText)
+                            .onChange(of: searchText) {
                                 browserStore.searchPublisher.send($1)
                             }
                             .navigationDestination(item: $tappedItem) {

Sources/Screens/Browser/BrowserStore.swift

@@ -21,7 +21,6 @@ class BrowserStore: ObservableObject {
     @Published var folderIsLoading: Bool = false
     @Published var folderError: String?
     @Published var query: VOFile.Query?
-    @Published var searchText = ""
     private var list: VOFile.List?
     private var cancellables = Set<AnyCancellable>()
     private var timer: Timer?

Sources/Screens/File/FileOverview.swift

@@ -45,7 +45,9 @@ struct FileOverview: View, ViewDataProvider, LoadStateProvider, TimerLifecycle,
                         }
                     }
                     .searchable(text: $searchText)
-                    .onChange(of: fileStore.searchText) { fileStore.searchPublisher.send($1) }
+                    .onChange(of: searchText) {
+                        fileStore.searchPublisher.send($1)
+                    }
                     .refreshable { fileStore.fetchNextPage(replace: true) }
                 }
             }

Sources/Screens/File/FileStore.swift

@@ -55,7 +55,6 @@ class FileStore: ObservableObject {
     @Published var insightsIsPresented = false
     @Published var infoIsPresented = false
     @Published var viewMode: ViewMode = .grid
-    @Published var searchText = ""
     private var list: VOFile.List?
     private var cancellables = Set<AnyCancellable>()
     private var timer: Timer?

Sources/Screens/Group/GroupList.swift

@@ -44,8 +44,8 @@ struct GroupList: View, ViewDataProvider, LoadStateProvider, TimerLifecycle, Tok
                                     }
                                 }
                             }
-                            .searchable(text: $groupStore.searchText)
-                            .onChange(of: groupStore.searchText) {
+                            .searchable(text: $searchText)
+                            .onChange(of: searchText) {
                                 groupStore.searchPublisher.send($1)
                             }
                         }

Sources/Screens/Group/GroupMemberList.swift

@@ -50,8 +50,8 @@ struct GroupMemberList: View, ViewDataProvider, LoadStateProvider, TimerLifecycl
                                     }
                                 }
                             }
-                            .searchable(text: $groupStore.searchText)
-                            .onChange(of: userStore.searchText) {
+                            .searchable(text: $searchText)
+                            .onChange(of: searchText) {
                                 userStore.searchPublisher.send($1)
                             }
                         }

Sources/Screens/Group/GroupSelector.swift

@@ -49,8 +49,8 @@ struct GroupSelector: View, ViewDataProvider, LoadStateProvider, TimerLifecycle,
                                     }
                                 }
                             }
-                            .searchable(text: $groupStore.searchText)
-                            .onChange(of: groupStore.searchText) {
+                            .searchable(text: $searchText)
+                            .onChange(of: searchText) {
                                 groupStore.searchPublisher.send($1)
                             }
                         }

Sources/Screens/Group/GroupStore.swift

@@ -19,7 +19,6 @@ class GroupStore: ObservableObject {
     @Published var entitiesError: String?
     @Published var current: VOGroup.Entity?
     @Published var query: String?
-    @Published var searchText = ""
     private var list: VOGroup.List?
     private var cancellables = Set<AnyCancellable>()
     private var timer: Timer?

Sources/Screens/Insights/InsightsEntityList.swift

@@ -39,7 +39,7 @@ struct InsightsEntityList: View {
                             }
                         }
                         .searchable(text: $searchText)
-                        .onChange(of: insightsStore.searchText) {
+                        .onChange(of: searchText) {
                             insightsStore.searchPublisher.send($1)
                         }
                     }
@@ -86,7 +86,6 @@ struct InsightsEntityList: View {
             insightsStore.clear()
             insightsStore.fetchEntityNextPage()
         }
-        .sync($insightsStore.searchText, with: $searchText)
         .sync($insightsStore.showError, with: $showError)
     }
 

Sources/Screens/Insights/InsightsStore.swift

@@ -20,7 +20,6 @@ class InsightsStore: ObservableObject {
     @Published var showError = false
     @Published var errorTitle: String?
     @Published var errorMessage: String?
-    @Published var searchText = ""
     private var list: VOInsights.EntityList?
     private var cancellables: Set<AnyCancellable> = []
     private var timer: Timer?

Sources/Screens/Organization/OrganizationCreate.swift

@@ -11,14 +11,11 @@
 import SwiftUI
 import VoltaserveCore
 
-struct OrganizationCreate: View {
+struct OrganizationCreate: View, FormValidatable, ErrorPresentable {
     @ObservedObject private var organizationStore: OrganizationStore
     @Environment(\.dismiss) private var dismiss
     @State private var name = ""
     @State private var isProcessing = false
-    @State private var showError = false
-    @State private var errorTitle: String?
-    @State private var errorMessage: String?
     private let onCompletion: ((VOOrganization.Entity) -> Void)?
 
     init(organizationStore: OrganizationStore, onCompletion: ((VOOrganization.Entity) -> Void)? = nil) {
@@ -51,7 +48,7 @@ struct OrganizationCreate: View {
                     }
                 }
             }
-            .voErrorAlert(isPresented: $showError, title: errorTitle, message: errorMessage)
+            .voErrorSheet(isPresented: $errorIsPresented, message: errorMessage)
         }
     }
 
@@ -72,15 +69,21 @@ struct OrganizationCreate: View {
                 onCompletion(organization)
             }
         } failure: { message in
-            errorTitle = "Error: Creating Organization"
             errorMessage = message
-            showError = true
+            errorIsPresented = true
         } anyways: {
             isProcessing = false
         }
     }
 
-    private func isValid() -> Bool {
+    // MARK: - ErrorPresentable
+
+    @State var errorIsPresented: Bool = false
+    @State var errorMessage: String?
+
+    // MARK: - FormValidatable
+
+    func isValid() -> Bool {
         !normalizedName.isEmpty
     }
 }

Sources/Screens/Organization/OrganizationEditName.swift

@@ -11,14 +11,11 @@
 import SwiftUI
 import VoltaserveCore
 
-struct OrganizationEditName: View {
+struct OrganizationEditName: View, FormValidatable, ErrorPresentable {
     @ObservedObject private var organizationStore: OrganizationStore
     @Environment(\.dismiss) private var dismiss
     @State private var value = ""
     @State private var isSaving = false
-    @State private var showError = false
-    @State private var errorTitle: String?
-    @State private var errorMessage: String?
     private let onCompletion: ((VOOrganization.Entity) -> Void)?
 
     init(organizationStore: OrganizationStore, onCompletion: ((VOOrganization.Entity) -> Void)? = nil) {
@@ -46,7 +43,7 @@ struct OrganizationEditName: View {
                     }
                 }
             }
-            .voErrorAlert(isPresented: $showError, title: errorTitle, message: errorMessage)
+            .voErrorSheet(isPresented: $errorIsPresented, message: errorMessage)
             .onAppear {
                 value = current.name
             }
@@ -55,8 +52,6 @@ struct OrganizationEditName: View {
                     value = newCurrent.name
                 }
             }
-        } else {
-            ProgressView()
         }
     }
 
@@ -78,15 +73,21 @@ struct OrganizationEditName: View {
                 onCompletion(updatedOrganization)
             }
         } failure: { message in
-            errorTitle = "Error: Saving Name"
             errorMessage = message
-            showError = true
+            errorIsPresented = true
         } anyways: {
             isSaving = false
         }
     }
 
-    private func isValid() -> Bool {
+    // MARK: - ErrorPresentable
+
+    @State var errorIsPresented: Bool = false
+    @State var errorMessage: String?
+
+    // MARK: - FormValidatable
+
+    func isValid() -> Bool {
         if let current = organizationStore.current {
             return !nornalizedValue.isEmpty && nornalizedValue != current.name
         }