Merge pull request #296 from TaskarCenterAtUW/Bug-fixes

Bug fixes

Author: srikanth-vg

GoInfoGame/GoInfoGame/AppDelegate.swift

@@ -69,7 +69,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 DispatchQueue.main.async {
                     Utilities.clearAllData()
                     if let window = UIApplication.window() {
-                        window.rootViewController = UIHostingController(rootView: PosmLoginView())
+                        window.rootViewController = UIHostingController(rootView: PosmLoginView(forceUpdateManager: ForceUpdateManager()))
                     }
                 }
             }

GoInfoGame/GoInfoGame/GoInfoGame.entitlements

@@ -4,9 +4,9 @@
 <dict>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:www.srikanthvoonna.co.in</string>
-		<string>applinks:srikanthvoonna.co.in</string>
 		<string>applinks:portal-dev.tdei.us</string>
+		<string>applinks:portal-stage.tdei.us</string>
+		<string>applinks:portal.tdei.us</string>
 	</array>
 </dict>
 </plist>

GoInfoGame/GoInfoGame/Helpers/Extensions.swift

@@ -215,3 +215,16 @@ extension URLRequest {
         }
     }
 }
+
+extension View {
+    @ViewBuilder
+    func applyPresentationSizingPage() -> some View {
+        if #available(iOS 18.0, *) {
+            self.presentationSizing(.page)
+        } else {
+            // No-op for older OS, letting the default sizing apply.
+            // You can add a fallback here if needed, e.g., using detents.
+            self
+        }
+    }
+}

GoInfoGame/GoInfoGame/Helpers/Utils.swift

@@ -43,8 +43,6 @@ struct Utilities {
        // _ = KeychainManager.delete(key: "username")
         loggedIn = false
         UserProfileCache.shared.clearUserProfile()
-        if let bundleID = Bundle.main.bundleIdentifier {
-            UserDefaults.standard.removePersistentDomain(forName: bundleID)
-        }
+        UserDefaults.standard.removeObject(forKey: APIConfiguration.environmentKey)
     }
 }

GoInfoGame/GoInfoGame/Login/View/PosmLogin.swift

@@ -22,7 +22,7 @@ struct PosmLoginView: View {
     @State private var showDisableDebugModeAlert: Bool = false
     let forceUpdateManager: ForceUpdateManager?
 
-    init(forceUpdateManager: ForceUpdateManager? = nil) {
+    init(forceUpdateManager: ForceUpdateManager?) {
         self.forceUpdateManager = forceUpdateManager
         APIConfiguration.shared.environment = .production
     }
@@ -233,5 +233,5 @@ struct PosmLoginView: View {
 }
 
 #Preview {
-    PosmLoginView()
+    PosmLoginView(forceUpdateManager: nil)
 }

GoInfoGame/GoInfoGame/Network/APIConfiguration.swift

@@ -10,18 +10,18 @@ import Foundation
 class APIConfiguration {
     static let shared = APIConfiguration()
 
-    private let environmentKey = "APIEnvironment"
+    static let environmentKey = "APIEnvironment"
 
         var environment: APIEnvironment {
             get {
-                if let savedValue = UserDefaults.standard.string(forKey: environmentKey),
+                if let savedValue = UserDefaults.standard.string(forKey: APIConfiguration.environmentKey),
                    let savedEnvironment = APIEnvironment(rawValue: savedValue) {
                     return savedEnvironment
                 }
                 return .production // default value
             }
             set {
-                UserDefaults.standard.set(newValue.rawValue, forKey: environmentKey)
+                UserDefaults.standard.set(newValue.rawValue, forKey: APIConfiguration.environmentKey)
             }
         }
 

GoInfoGame/GoInfoGame/Network/APIHandler/NetworkManager.swift

@@ -131,7 +131,7 @@ class NetworkManager: NetworkHandler {
                     DispatchQueue.main.async {
                         if let window = UIApplication.window() {
                             Utilities.clearAllData()
-                            window.rootViewController = UIHostingController(rootView: PosmLoginView())
+                            window.rootViewController = UIHostingController(rootView: PosmLoginView(forceUpdateManager: ForceUpdateManager()))
                             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                                 NotificationCenter.default.post(name: Notification.Name("SessionExpired"), object: nil)
                             }

GoInfoGame/GoInfoGame/Network/ApiManager.swift

@@ -164,7 +164,7 @@ class ApiManager {
                         DispatchQueue.main.async {
                             if let window = UIApplication.window() {
                                 Utilities.clearAllData()
-                                window.rootViewController = UIHostingController(rootView: PosmLoginView())
+                                window.rootViewController = UIHostingController(rootView: PosmLoginView(forceUpdateManager: ForceUpdateManager()))
                                 DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                                     NotificationCenter.default.post(name: Notification.Name("SessionExpired"), object: nil)
                                 }

GoInfoGame/GoInfoGame/UI/InitialView/InitialView.swift

@@ -76,33 +76,26 @@ struct WorkspacesListView: View {
     @State private var showAlert = false
 
     @State private var alertMessage = ""
+    @State private var autoRedirectToMapViewError: String?
 
     var body: some View {
 
-        if viewModel.workspaces?.count == 1 {
-            if let selectedWorkspace = viewModel.workspaces?.first {
-                VStack {
-                    if !shouldNavigateToMapView {
-                        ActivityView(activityText: "Fetching workspace data...")
-                        Spacer()
-                    }
-                }
-                .onAppear {
-                    viewModel.fetchLongQuestsFor(workspaceId: "\(selectedWorkspace.id)") { success, errorMessage  in
-                        if success {
-                            self.selectedWorkspace = selectedWorkspace
-                            let workspaceId = "\(selectedWorkspace.id)"
-                            _ = KeychainManager.save(key: "workspaceID", data: workspaceId)
-                            DispatchQueue.main.async {
-                                shouldNavigateToMapView = true
-                            }
-                        } else {
-                            DispatchQueue.main.async {
-                                alertMessage = errorMessage ?? "Something went wrong. Please pick another workspace."
-                                showAlert = true
-                                shouldNavigateToMapView = false
-                            }
+        if viewModel.workspaces?.count == 1,
+           let selectedWorkspace = viewModel.workspaces?.first,
+           autoRedirectToMapViewError == nil {
+            VStack {
+            }
+            .onAppear {
+                viewModel.fetchLongQuestsFor(workspaceId: "\(selectedWorkspace.id)") { success, errorMessage, workspace  in
+                    if success {
+                        self.selectedWorkspace = workspace
+                        let workspaceId = "\(selectedWorkspace.id)"
+                        _ = KeychainManager.save(key: "workspaceID", data: workspaceId)
+                        DispatchQueue.main.async {
+                            shouldNavigateToMapView = true
                         }
+                    } else {
+                        autoRedirectToMapViewError = errorMessage ?? "Something went wrong. Please pick another workspace."
                     }
                 }
             }
@@ -164,10 +157,10 @@ struct WorkspacesListView: View {
                         ForEach(viewModel.workspaces?.filter({$0.type == "osw" && $0.externalAppAccess == 1}) ?? [], id: \.id) { workspace in
                             Button {
                                 viewModel.checkAndDeleteWorkspaceDB(workspaceId: "\(workspace.id)")
-                                viewModel.fetchLongQuestsFor(workspaceId: "\(workspace.id)", completion: { success, errorMessage in
+                                viewModel.fetchLongQuestsFor(workspaceId: "\(workspace.id)", completion: { success, errorMessage, ws in
                                     if success {
                                         shouldNavigateToMapView = true
-                                        selectedWorkspace = workspace
+                                        selectedWorkspace = ws
 
                                         let workspaceId = "\(workspace.id)"
                                         _ = KeychainManager.save(key: "workspaceID", data: workspaceId)

GoInfoGame/GoInfoGame/UI/InitialView/InitialViewController.swift

@@ -9,6 +9,6 @@ import Foundation
 import SwiftUI
 class InitialViewController: UIHostingController<PosmLoginView> {
     required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder, rootView: PosmLoginView())
+        super.init(coder: aDecoder, rootView: PosmLoginView(forceUpdateManager: ForceUpdateManager()))
     }
 }