refactor: rename fextNext() to fetchNextPage()

kouprlabs · Nov 23, 2024 · 824a571 · 824a571
1 parent a6dfc8c
commit 824a571
Show file tree

Hide file tree

Showing 31 changed files with 73 additions and 73 deletions.
diff --git a/Sources/Screens/Browser/BrowserList.swift b/Sources/Screens/Browser/BrowserList.swift
@@ -79,7 +79,7 @@ struct BrowserList: View {
                     }
                 }
                 .refreshable {
-                    browserStore.fetchNext(replace: true)
+                    browserStore.fetchNextPage(replace: true)
                 }
             } else {
                 ProgressView()
@@ -123,7 +123,7 @@ struct BrowserList: View {
         }
         .onChange(of: browserStore.query) {
             browserStore.clear()
-            browserStore.fetchNext()
+            browserStore.fetchNextPage()
         }
         .sync($browserStore.searchText, with: $searchText)
         .sync($browserStore.showError, with: $showError)
@@ -135,7 +135,7 @@ struct BrowserList: View {
 
     private func fetchData() {
         browserStore.fetch()
-        browserStore.fetchNext(replace: true)
+        browserStore.fetchNextPage(replace: true)
     }
 
     private func startTimers() {
@@ -152,7 +152,7 @@ struct BrowserList: View {
 
     private func onListItemAppear(_ id: String) {
         if browserStore.isEntityThreshold(id) {
-            browserStore.fetchNext()
+            browserStore.fetchNextPage()
         }
     }
 }
diff --git a/Sources/Screens/Browser/BrowserStore.swift b/Sources/Screens/Browser/BrowserStore.swift
@@ -79,7 +79,7 @@ class BrowserStore: ObservableObject {
         try await fileClient?.fetchList(id, options: .init(query: query, page: page, size: size, type: .folder))
     }
 
-    func fetchNext(replace: Bool = false) {
+    func fetchNextPage(replace: Bool = false) {
         guard let fileID else { return }
         guard !isLoading else { return }
 

diff --git a/Sources/Screens/File/FileCopy.swift b/Sources/Screens/File/FileCopy.swift
@@ -68,7 +68,7 @@ struct FileCopy: View {
         withErrorHandling(delaySeconds: 1) {
             result = try await fileStore.copy(Array(fileStore.selection), to: destinationID)
             if fileStore.isLastPage() {
-                fileStore.fetchNext()
+                fileStore.fetchNextPage()
             }
             if let result {
                 if result.failed.isEmpty {

diff --git a/Sources/Screens/File/FileGrid.swift b/Sources/Screens/File/FileGrid.swift
@@ -74,7 +74,7 @@ struct FileGrid: View {
 
     private func onListItemAppear(_ id: String) {
         if fileStore.isEntityThreshold(id) {
-            fileStore.fetchNext()
+            fileStore.fetchNextPage()
         }
     }
 }
diff --git a/Sources/Screens/File/FileList.swift b/Sources/Screens/File/FileList.swift
@@ -62,7 +62,7 @@ struct FileList: View {
 
     private func onListItemAppear(_ id: String) {
         if fileStore.isEntityThreshold(id) {
-            fileStore.fetchNext()
+            fileStore.fetchNextPage()
         }
     }
 }
diff --git a/Sources/Screens/File/FileOverview.swift b/Sources/Screens/File/FileOverview.swift
@@ -42,7 +42,7 @@ struct FileOverview: View {
                 }
                 .searchable(text: $searchText)
                 .onChange(of: fileStore.searchText) { fileStore.searchPublisher.send($1) }
-                .refreshable { fileStore.fetchNext(replace: true) }
+                .refreshable { fileStore.fetchNextPage(replace: true) }
             } else {
                 ProgressView()
             }
@@ -74,7 +74,7 @@ struct FileOverview: View {
         }
         .onChange(of: fileStore.query) {
             fileStore.clear()
-            fileStore.fetchNext(replace: true)
+            fileStore.fetchNextPage(replace: true)
         }
         .sync($fileStore.searchText, with: $searchText)
         .sync($fileStore.showError, with: $showError)
@@ -86,7 +86,7 @@ struct FileOverview: View {
 
     private func fetchData() {
         fileStore.fetch()
-        fileStore.fetchNext(replace: true)
+        fileStore.fetchNextPage(replace: true)
         fileStore.fetchTaskCount()
     }
 

diff --git a/Sources/Screens/File/FileStore.swift b/Sources/Screens/File/FileStore.swift
@@ -128,7 +128,7 @@ class FileStore: ObservableObject {
         try await fileClient?.fetchList(id, options: .init(query: query, page: page, size: size))
     }
 
-    func fetchNext(replace: Bool = false) {
+    func fetchNextPage(replace: Bool = false) {
         guard let current else { return }
         guard !isLoading else { return }
 

diff --git a/Sources/Screens/File/FileUpload.swift b/Sources/Screens/File/FileUpload.swift
@@ -79,7 +79,7 @@ struct FileUpload: View {
                     }
                     _ = try await fileStore.upload(url, workspaceID: workspace.id)
                     if fileStore.isLastPage() {
-                        fileStore.fetchNext()
+                        fileStore.fetchNextPage()
                     }
                     url.stopAccessingSecurityScopedResource()
                     dispatchGroup.leave()

diff --git a/Sources/Screens/File/FolderCreate.swift b/Sources/Screens/File/FolderCreate.swift
@@ -70,7 +70,7 @@ struct FolderCreate: View {
                 parentID: parentID
             )
             if fileStore.isLastPage() {
-                fileStore.fetchNext()
+                fileStore.fetchNextPage()
             }
             return true
         } success: {

diff --git a/Sources/Screens/Group/GroupList.swift b/Sources/Screens/Group/GroupList.swift
@@ -48,7 +48,7 @@ struct GroupList: View {
                 }
                 .navigationTitle("Groups")
                 .refreshable {
-                    groupStore.fetchNext(replace: true)
+                    groupStore.fetchNextPage(replace: true)
                 }
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
@@ -102,7 +102,7 @@ struct GroupList: View {
         }
         .onChange(of: groupStore.query) {
             groupStore.clear()
-            groupStore.fetchNext()
+            groupStore.fetchNextPage()
         }
         .sync($groupStore.searchText, with: $searchText)
         .sync($groupStore.showError, with: $showError)
@@ -113,7 +113,7 @@ struct GroupList: View {
     }
 
     private func fetchData() {
-        groupStore.fetchNext(replace: true)
+        groupStore.fetchNextPage(replace: true)
     }
 
     private func startTimers() {
@@ -130,7 +130,7 @@ struct GroupList: View {
 
     private func onListItemAppear(_ id: String) {
         if groupStore.isEntityThreshold(id) {
-            groupStore.fetchNext()
+            groupStore.fetchNextPage()
         }
     }
 }
diff --git a/Sources/Screens/Group/GroupMemberList.swift b/Sources/Screens/Group/GroupMemberList.swift
@@ -52,7 +52,7 @@ struct GroupMemberList: View {
                     }
                 }
                 .refreshable {
-                    userStore.fetchNext(replace: true)
+                    userStore.fetchNextPage(replace: true)
                 }
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
@@ -98,7 +98,7 @@ struct GroupMemberList: View {
         }
         .onChange(of: userStore.query) {
             userStore.clear()
-            userStore.fetchNext()
+            userStore.fetchNextPage()
         }
         .sync($userStore.searchText, with: $searchText)
         .sync($userStore.showError, with: $showError)
@@ -109,7 +109,7 @@ struct GroupMemberList: View {
     }
 
     private func fetchData() {
-        userStore.fetchNext(replace: true)
+        userStore.fetchNextPage(replace: true)
     }
 
     private func startTimers() {
@@ -126,7 +126,7 @@ struct GroupMemberList: View {
 
     private func onListItemAppear(_ id: String) {
         if userStore.isEntityThreshold(id) {
-            userStore.fetchNext()
+            userStore.fetchNextPage()
         }
     }
 }
diff --git a/Sources/Screens/Group/GroupSelector.swift b/Sources/Screens/Group/GroupSelector.swift
@@ -55,7 +55,7 @@ struct GroupSelector: View {
                     }
                 }
                 .refreshable {
-                    groupStore.fetchNext(replace: true)
+                    groupStore.fetchNextPage(replace: true)
                 }
                 .voErrorAlert(
                     isPresented: $showError,
@@ -94,7 +94,7 @@ struct GroupSelector: View {
         }
         .onChange(of: groupStore.query) {
             groupStore.clear()
-            groupStore.fetchNext()
+            groupStore.fetchNextPage()
         }
         .sync($groupStore.showError, with: $showError)
         .sync($groupStore.searchText, with: $searchText)
@@ -106,12 +106,12 @@ struct GroupSelector: View {
 
     private func onListItemAppear(_ id: String) {
         if groupStore.isEntityThreshold(id) {
-            groupStore.fetchNext()
+            groupStore.fetchNextPage()
         }
     }
 
     private func fetchData() {
-        groupStore.fetchNext(replace: true)
+        groupStore.fetchNextPage(replace: true)
     }
 
     private func startTimers() {

diff --git a/Sources/Screens/Group/GroupStore.swift b/Sources/Screens/Group/GroupStore.swift
@@ -88,7 +88,7 @@ class GroupStore: ObservableObject {
         }
     }
 
-    func fetchNext(replace: Bool = false) {
+    func fetchNextPage(replace: Bool = false) {
         guard !isLoading else { return }
 
         var nextPage = -1

diff --git a/Sources/Screens/Insights/InsightsChart.swift b/Sources/Screens/Insights/InsightsChart.swift
@@ -55,7 +55,7 @@ struct InsightsChart: View {
                 .navigationBarTitleDisplayMode(.inline)
                 .navigationTitle("Insights")
                 .refreshable {
-                    insightsStore.fetchEntityNext(replace: true)
+                    insightsStore.fetchEntityNextPage(replace: true)
                 }
                 .toolbar {
                     ToolbarItem(placement: .topBarTrailing) {
@@ -93,7 +93,7 @@ struct InsightsChart: View {
     }
 
     private func fetchData() {
-        insightsStore.fetchEntityNext(replace: true)
+        insightsStore.fetchEntityNextPage(replace: true)
     }
 
     private func startTimers() {

diff --git a/Sources/Screens/Insights/InsightsEntityList.swift b/Sources/Screens/Insights/InsightsEntityList.swift
@@ -47,7 +47,7 @@ struct InsightsEntityList: View {
                 .navigationBarTitleDisplayMode(.inline)
                 .navigationTitle("Insights")
                 .refreshable {
-                    insightsStore.fetchEntityNext(replace: true)
+                    insightsStore.fetchEntityNextPage(replace: true)
                 }
                 .toolbar {
                     ToolbarItem(placement: .topBarTrailing) {
@@ -84,7 +84,7 @@ struct InsightsEntityList: View {
         }
         .onChange(of: insightsStore.query) {
             insightsStore.clear()
-            insightsStore.fetchEntityNext()
+            insightsStore.fetchEntityNextPage()
         }
         .sync($insightsStore.searchText, with: $searchText)
         .sync($insightsStore.showError, with: $showError)
@@ -95,7 +95,7 @@ struct InsightsEntityList: View {
     }
 
     private func fetchData() {
-        insightsStore.fetchEntityNext(replace: true)
+        insightsStore.fetchEntityNextPage(replace: true)
     }
 
     private func startTimers() {
@@ -112,7 +112,7 @@ struct InsightsEntityList: View {
 
     private func onListItemAppear(_ id: String) {
         if insightsStore.isEntityThreshold(id) {
-            insightsStore.fetchEntityNext()
+            insightsStore.fetchEntityNextPage()
         }
     }
 }
diff --git a/Sources/Screens/Insights/InsightsStore.swift b/Sources/Screens/Insights/InsightsStore.swift
@@ -118,7 +118,7 @@ class InsightsStore: ObservableObject {
         )
     }
 
-    func fetchEntityNext(replace: Bool = false) {
+    func fetchEntityNextPage(replace: Bool = false) {
         var nextPage = -1
         var list: VOInsights.EntityList?
 

diff --git a/Sources/Screens/Invitation/InvitationIncomingList.swift b/Sources/Screens/Invitation/InvitationIncomingList.swift
@@ -43,7 +43,7 @@ struct InvitationIncomingList: View {
                     }
                 }
                 .refreshable {
-                    invitationStore.fetchNext(replace: true)
+                    invitationStore.fetchNextPage(replace: true)
                 }
             } else {
                 ProgressView()
@@ -81,7 +81,7 @@ struct InvitationIncomingList: View {
     }
 
     private func fetchData() {
-        invitationStore.fetchNext(replace: true)
+        invitationStore.fetchNextPage(replace: true)
     }
 
     private func startTimers() {
@@ -98,7 +98,7 @@ struct InvitationIncomingList: View {
 
     private func onListItemAppear(_ id: String) {
         if invitationStore.isEntityThreshold(id) {
-            invitationStore.fetchNext()
+            invitationStore.fetchNextPage()
         }
     }
 }
diff --git a/Sources/Screens/Invitation/InvitationOutgoingList.swift b/Sources/Screens/Invitation/InvitationOutgoingList.swift
@@ -49,7 +49,7 @@ struct InvitationOutgoingList: View {
                     }
                 }
                 .refreshable {
-                    invitationStore.fetchNext(replace: true)
+                    invitationStore.fetchNextPage(replace: true)
                 }
             } else {
                 ProgressView()
@@ -97,7 +97,7 @@ struct InvitationOutgoingList: View {
     }
 
     private func fetchData() {
-        invitationStore.fetchNext(replace: true)
+        invitationStore.fetchNextPage(replace: true)
     }
 
     private func startTimers() {
@@ -117,7 +117,7 @@ struct InvitationOutgoingList: View {
 
     private func onListItemAppear(_ id: String) {
         if invitationStore.isEntityThreshold(id) {
-            invitationStore.fetchNext()
+            invitationStore.fetchNextPage()
         }
     }
 }
diff --git a/Sources/Screens/Invitation/InvitationStore.swift b/Sources/Screens/Invitation/InvitationStore.swift
@@ -53,7 +53,7 @@ class InvitationStore: ObservableObject {
         }
     }
 
-    func fetchNext(replace: Bool = false) {
+    func fetchNextPage(replace: Bool = false) {
         guard !entitiesIsLoading else { return }
 
         var nextPage = -1