fix(issue #646): improves upon the load more functionality of the table

stakwork · Dec 1, 2023 · 15a717c · 15a717c
1 parent 7349507
commit 15a717c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/components/SourcesTableModal/SourcesView/Topics/index.tsx b/src/components/SourcesTableModal/SourcesView/Topics/index.tsx
@@ -17,7 +17,7 @@ import { Filter } from './Sort'
 import { Table } from './Table'
 
 export const TopicSources = () => {
-  const [loading, setLoading] = useState(true)
+  const [loading, setLoading] = useState(false)
 
   const [data, ids, total, setTopics, filters, setFilters, terminate] = useTopicsStore((s) => [
     s.data,
@@ -63,8 +63,15 @@ export const TopicSources = () => {
     init()
   }, [setTopics, filters])
 
-  const handleLoadMore = () => {
-    setFilters({ page: filters.page + 1 })
+  const handleLoadMore = async () => {
+    try {
+      setLoading(true)
+      setFilters({ page: filters.page + 1 })
+    } catch (error) {
+      console.error('Error loading more data:', error)
+    } finally {
+      setLoading(false)
+    }
   }
 
   useEffect(

diff --git a/src/stores/useTopicsStore/index.ts b/src/stores/useTopicsStore/index.ts
@@ -38,8 +38,9 @@ export const useTopicsStore = create<TopicsStore>((set, get) => ({
 
     const responseData: FetchTopicResponse = await getTopicsData(payload)
 
-    const newData: Record<string, Topic> = filters.page > 0 ? data || {} : {}
-    const newIds: string[] = filters.page > 0 ? ids : []
+    // Instead of replacing the data, append new data to existing data
+    const newData: Record<string, Topic> = { ...(data || {}) }
+    const newIds: string[] = [...ids]
 
     responseData.data.forEach((topic) => {
       newData[topic.ref_id] = topic