Merge pull request #180 from TelemetryDeck/fix-user-stuck-in-loading

Add FunctionCall to finish Loading
TelemetryDeck · May 24, 2024 · ce1fbd3 · ce1fbd3
2 parents fdee6a4 + 18abe55
commit ce1fbd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Services/OrgService.swift b/Services/OrgService.swift
@@ -22,6 +22,9 @@ class OrgService: ObservableObject {
         self.errorService = errors
     }
 
+    // Wasn't getting called before -> Never leaving loading state.
+    // For now called when retrieveOrganisations also called
+    // Maybe move getCode into the retrieve Func?
     func getOrganisation() {
         let locallyCachedOrganization = retrieveFromDisk()
         self.organization = locallyCachedOrganization
@@ -33,7 +36,6 @@ class OrgService: ObservableObject {
                 let org = try await self.retrieveOrganisation()
                 DispatchQueue.main.async {
                     self.organization = org
-
                     self.loadingState = .finished(Date())
                 }
             } catch {

diff --git a/Shared/Navigational Structure/LeftSidebarView.swift b/Shared/Navigational Structure/LeftSidebarView.swift
@@ -125,6 +125,7 @@ struct LeftSidebarView: View {
             if let organization = try? await orgService.retrieveOrganisation() {
                 DispatchQueue.main.async {
                     orgService.organization = organization
+                    orgService.getOrganisation()
                 }
             }
         }