Merge branch 'Connect-Search-Filter' of https://github.com/MirzaHanan…

…/sphinx-nav-fiber into Connect-Search-Filter
stakwork · Oct 2, 2024 · cbdd26b · cbdd26b
2 parents e8d3d40 + ccf1a53
commit cbdd26b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/components/App/SideBar/FilterSearch/index.tsx b/src/components/App/SideBar/FilterSearch/index.tsx
@@ -6,7 +6,6 @@ import PlusIcon from '~/components/Icons/PlusIcon'
 import { SchemaExtended } from '~/components/ModalsContainer/BlueprintModal/types'
 import { Flex } from '~/components/common/Flex'
 import { useDataStore } from '~/stores/useDataStore'
-import { useUserStore } from '~/stores/useUserStore'
 import { colors } from '~/utils/colors'
 import { Hops } from './Hops'
 import { MaxResults } from './MaxResults'
@@ -42,8 +41,7 @@ export const FilterSearch = ({
     )
   }
 
-  const { setFilters, fetchData, setAbortRequests } = useDataStore((s) => s)
-  const { setBudget } = useUserStore((s) => s)
+  const { setFilters } = useDataStore((s) => s)
   const [selectedTypes, setSelectedTypes] = useState<string[]>(defaultValues.selectedTypes)
   const [hops, setHops] = useState(defaultValues.hops)
   const [sourceNodes, setSourceNodes] = useState<number>(defaultValues.sourceNodes)
@@ -74,8 +72,6 @@ export const FilterSearch = ({
 
     setAnchorEl(null)
     onClose()
-
-    await fetchData(setBudget, setAbortRequests)
   }
 
   const uniqueSchemas = (showAllSchemas ? schemaAll : schemaAll.slice(0, 4)).filter(

diff --git a/src/stores/useDataStore/index.ts b/src/stores/useDataStore/index.ts
@@ -30,10 +30,6 @@ export type FetchNodeParams = {
   skip_cache?: string
   free?: string
   media_type?: string
-  node_type?: string
-  limit?: string
-  depth?: string
-  top_node_count?: string
 }
 
 export type SidebarFilterWithCount = {
@@ -160,7 +156,7 @@ export const useDataStore = create<DataStore>()(
   devtools((set, get) => ({
     ...defaultData,
 
-    fetchData: async (setBudget, setAbortRequests, AISearchQuery = '', params: FetchNodeParams = {}) => {
+    fetchData: async (setBudget, setAbortRequests, AISearchQuery = '') => {
       const { dataInitial: existingData, filters } = get()
       const currentPage = filters.skip
       const itemsPerPage = filters.limit
@@ -198,7 +194,6 @@ export const useDataStore = create<DataStore>()(
 
       const updatedParams = {
         ...withoutNodeType,
-        ...params,
         ...ai,
         skip: currentPage === 0 ? String(currentPage * itemsPerPage) : String(currentPage * itemsPerPage + 1),
         limit: word ? '25' : String(itemsPerPage),
@@ -306,7 +301,10 @@ export const useDataStore = create<DataStore>()(
       fetchData()
     },
     resetDataNew: () => null,
-    setFilters: (filters: FilterParams) => set((state) => ({ filters: { ...state.filters, ...filters, page: 0 } })),
+    setFilters: (filters: Partial<FilterParams>) => {
+      set((state) => ({ filters: { ...state.filters, ...filters, skip: 0 } }))
+      get().fetchData(get().setBudget, get().setAbortRequests)
+    },
     setSidebarFilterCounts: (sidebarFilterCounts) => set({ sidebarFilterCounts }),
     setTrendingTopics: (trendingTopics) => set({ trendingTopics }),
     setStats: (stats) => set({ stats }),