Wrap view tasks into tasks

Yo dawg, I heard you like tasks. So I put a task around your task, so the task is a separate task that won't get cancelled when task gets cancelled. I hope this fixes issue #167 without too much changes in the API. The other solution would maybe be to add task ids: @State private var taskId: UUID = .init() .task(id: taskId) {
supergeorg · Jun 3, 2023 · 5b2c45b · 5b2c45b
1 parent 6ca3b80
commit 5b2c45b
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 27 deletions.
diff --git a/Shared/Views/Admin/UserManagementView.swift b/Shared/Views/Admin/UserManagementView.swift
@@ -109,7 +109,9 @@ struct UserManagementView: View {
         }
         .navigationTitle(LocalizedStringKey("str.admin.user"))
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .refreshable {
             await updateData()

diff --git a/Shared/Views/MasterData/MDBarcodesView.swift b/Shared/Views/MasterData/MDBarcodesView.swift
@@ -120,7 +120,9 @@ struct MDBarcodesView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .toast(
             item: $toastType,
@@ -176,7 +178,9 @@ struct MDBarcodesView: View {
         }
         .navigationTitle(LocalizedStringKey("str.md.barcodes"))
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .refreshable {
             await updateData()

diff --git a/Shared/Views/MasterData/MDLocationsView.swift b/Shared/Views/MasterData/MDLocationsView.swift
@@ -136,7 +136,9 @@ struct MDLocationsView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/MasterData/MDProductGroupsView.swift b/Shared/Views/MasterData/MDProductGroupsView.swift
@@ -133,7 +133,9 @@ struct MDProductGroupsView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/MasterData/MDProductsView.swift b/Shared/Views/MasterData/MDProductsView.swift
@@ -170,7 +170,9 @@ struct MDProductsView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/MasterData/MDQuantityUnitsView.swift b/Shared/Views/MasterData/MDQuantityUnitsView.swift
@@ -131,7 +131,9 @@ struct MDQuantityUnitsView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/MasterData/MDShoppingLocationsView.swift b/Shared/Views/MasterData/MDShoppingLocationsView.swift
@@ -128,7 +128,9 @@ struct MDStoresView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/MasterData/MDTaskCategoriesView.swift b/Shared/Views/MasterData/MDTaskCategoriesView.swift
@@ -131,7 +131,9 @@ struct MDTaskCategoriesView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/MasterData/MDUserEntitiesView.swift b/Shared/Views/MasterData/MDUserEntitiesView.swift
@@ -127,7 +127,9 @@ struct MDUserEntitiesView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/MasterData/MDUserFieldsView.swift b/Shared/Views/MasterData/MDUserFieldsView.swift
@@ -131,7 +131,9 @@ struct MDUserFieldsView: View {
             }
         }
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
         .refreshable {

diff --git a/Shared/Views/Recipes/RecipesView.swift b/Shared/Views/Recipes/RecipesView.swift
@@ -45,7 +45,9 @@ struct RecipesView: View {
                 await updateData()
             })
             .task {
-                await updateData()
+                Task {
+                    await updateData()
+                }
             }
             .searchable(text: $searchString, prompt: LocalizedStringKey("str.search"))
             .animation(.default, value: recipes.count)

diff --git a/Shared/Views/Settings/SettingsShoppingListView.swift b/Shared/Views/Settings/SettingsShoppingListView.swift
@@ -114,8 +114,10 @@ struct SettingsShoppingListView: View {
         .navigationTitle(LocalizedStringKey("str.settings.shoppingList"))
         .task {
             if isFirst {
-                await grocyVM.requestData(objects: dataToUpdate)
-                isFirst = false
+                Task {
+                    await grocyVM.requestData(objects: dataToUpdate)
+                    isFirst = false
+                }
             }
         }
         .onDisappear(perform: {

diff --git a/Shared/Views/Settings/SettingsStockView.swift b/Shared/Views/Settings/SettingsStockView.swift
@@ -141,8 +141,10 @@ struct SettingsStockView: View {
         .navigationTitle(LocalizedStringKey("str.settings.stock"))
         .task {
             if isFirst {
-                await grocyVM.requestData(objects: dataToUpdate)
-                isFirst = false
+                Task {
+                    await grocyVM.requestData(objects: dataToUpdate)
+                    isFirst = false
+                }
             }
         }
         .onDisappear(perform: {

diff --git a/Shared/Views/Settings/SettingsView.swift b/Shared/Views/Settings/SettingsView.swift
@@ -95,7 +95,9 @@ struct SettingsView: View {
             }
         }
         .task {
-            await grocyVM.requestData(additionalObjects: [.system_info, .current_user])
+            Task {
+                await grocyVM.requestData(additionalObjects: [.system_info, .current_user])
+            }
         }
     }
 }

diff --git a/Shared/Views/ShoppingList/ShoppingListView.swift b/Shared/Views/ShoppingList/ShoppingListView.swift
@@ -442,7 +442,9 @@ struct ShoppingListView: View {
         }
         .navigationTitle(LocalizedStringKey("str.shL"))
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .searchable(text: $searchString,
                     prompt: LocalizedStringKey("str.search"))

diff --git a/Shared/Views/Stock/StockEntriesView.swift b/Shared/Views/Stock/StockEntriesView.swift
@@ -215,7 +215,9 @@ struct StockEntriesView: View {
         }
         .animation(.default, value: stockEntries.count)
         .task {
-            await fetchData(ignoreCachedStock: false)
+            Task {
+                await fetchData(ignoreCachedStock: false)
+            }
         }
         .toast(
             item: $toastType,

diff --git a/Shared/Views/Stock/StockJournalView.swift b/Shared/Views/Stock/StockJournalView.swift
@@ -350,8 +350,10 @@ struct StockJournalView: View {
                    value: filteredJournal.count
         )
         .task {
-            await updateData()
-            filteredProductID = selectedProductID
+            Task {
+                await updateData()
+                filteredProductID = selectedProductID
+            }
         }
         .toast(isPresented: $showToastUndoFailed, isSuccess: false, text: LocalizedStringKey("str.stock.journal.undo.failed"))
     }

diff --git a/Shared/Views/Stock/StockView.swift b/Shared/Views/Stock/StockView.swift
@@ -382,8 +382,10 @@ struct StockView: View {
         .animation(.default, value: sortSetting)
         .task {
             if firstAppear {
-                await updateData()
-                firstAppear = false
+                Task {
+                    await updateData()
+                    firstAppear = false
+                }
             }
         }
         .toast(
@@ -450,8 +452,10 @@ struct StockView: View {
         .animation(.default, value: groupedProducts.count)
         .task {
             if firstAppear {
-                await updateData()
-                firstAppear = false
+                Task {
+                    await updateData()
+                    firstAppear = false
+                }
             }
         }
         .toast(

diff --git a/iOS/ActivitiesView.swift b/iOS/ActivitiesView.swift
@@ -27,7 +27,9 @@ struct ActivitiesView: View {
         }
         .navigationTitle(LocalizedStringKey("str.nav.activities"))
         .task {
-            await grocyVM.requestData(objects: [.userentities])
+            Task {
+                await grocyVM.requestData(objects: [.userentities])
+            }
         }
     }
 }

diff --git a/iOS/QuickScan/QuickScanModeView.swift b/iOS/QuickScan/QuickScanModeView.swift
@@ -238,7 +238,9 @@ struct QuickScanModeView: View {
                 }
             })
         .task {
-            await updateData()
+            Task {
+                await updateData()
+            }
         }
         .onChange(of: newRecognizedBarcode?.id, perform: { _ in
             DispatchQueue.main.async {
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,9 @@ struct SettingsView: View { @@
                 }
             }
             .task {
-                await grocyVM.requestData(additionalObjects: [.system_info, .current_user])
+                Task {
+                    await grocyVM.requestData(additionalObjects: [.system_info, .current_user])
+                }
             }
         }
     }
@@ Expand Down @@