feat: fix search

src/components/App/ActionsToolbar/GraphClear/index.tsx

@@ -5,11 +5,11 @@ import ClearIcon from '~/components/Icons/ClearIcon'
 import { useDataStore } from '~/stores/useDataStore'
 
 export const GraphClear = () => {
-  const { resetData } = useDataStore((s) => s)
+  const { resetGraph } = useDataStore((s) => s)
 
   return (
     <Tooltip content="Clear Graph" fontSize="13px" position="left">
-      <ClearButton href="" onClick={() => resetData()} size="medium" startIcon={<ClearIcon />} />
+      <ClearButton href="" onClick={() => resetGraph()} size="medium" startIcon={<ClearIcon />} />
     </Tooltip>
   )
 }

src/components/App/SideBar/FilterSearch/index.tsx

@@ -29,7 +29,7 @@ const defaultValues = {
 
 export const FilterSearch = ({ anchorEl, setAnchorEl, onClose }: Props) => {
   const [schemaAll, setSchemaAll] = useSchemaStore((s) => [s.schemas, s.setSchemas])
-  const { abortFetchData, resetGraph, setFilters } = useDataStore((s) => s)
+  const { abortFetchData, resetGraph, setFilters, resetData } = useDataStore((s) => s)
   const [selectedTypes, setSelectedTypes] = useState<string[]>(defaultValues.selectedTypes)
   const [hops, setHops] = useState(defaultValues.hops)
   const [sourceNodes, setSourceNodes] = useState<number>(defaultValues.sourceNodes)
@@ -74,6 +74,8 @@ export const FilterSearch = ({ anchorEl, setAnchorEl, onClose }: Props) => {
   }
 
   const handleFiltersApply = async () => {
+    resetData()
+
     setFilters({
       node_type: selectedTypes,
       limit: maxResults,

src/components/App/index.tsx

@@ -79,6 +79,7 @@ export const App = () => {
     runningProjectId,
     setRunningProjectMessages,
     isFetching,
+    resetData,
   } = useDataStore((s) => s)
 
   const { setAiSummaryAnswer, getKeyExist, aiRefId } = useAiSummaryStore((s) => s)
@@ -128,8 +129,10 @@ export const App = () => {
       }
     }
 
+    resetData()
+
     runSearch()
-  }, [searchTerm, fetchData, setBudget, setAbortRequests, setSidebarOpen, setSelectedNode])
+  }, [searchTerm, fetchData, setBudget, setAbortRequests, setSidebarOpen, setSelectedNode, resetData])
 
   const handleNewNode = useCallback(() => {
     setNodeCount('INCREMENT')

src/components/Universe/Graph/index.tsx

@@ -33,6 +33,8 @@ export const Graph = () => {
     (s) => s,
   )
 
+  const removeSimulation = useGraphStore((s) => s.removeSimulation)
+
   useEffect(() => {
     if (!dataNew) {
       return
@@ -57,6 +59,12 @@ export const Graph = () => {
     resetDataNew()
   }, [setData, dataNew, simulation, simulationCreate, resetDataNew, simulationHelpers, dataInitial])
 
+  useEffect(() => {
+    if (!dataInitial) {
+      removeSimulation()
+    }
+  }, [dataInitial, removeSimulation])
+
   useEffect(() => {
     if (!simulation) {
       return

src/stores/useDataStore/index.ts

@@ -313,9 +313,15 @@ export const useDataStore = create<DataStore>()(
 
     resetData: () => {
       set({
-        dataNew: { nodes: [], links: [] },
-        dataInitial: { nodes: [], links: [] },
+        dataInitial: null,
+        sidebarFilter: 'all',
+        sidebarFilters: [],
+        sidebarFilterCounts: [],
+        dataNew: null,
+        runningProjectId: '',
         nodeTypes: [],
+        nodesNormalized: new Map<string, Node>(),
+        linksNormalized: new Map<string, Link>(),
       })
     },
 

src/stores/useGraphStore/index.ts

@@ -96,6 +96,7 @@ export type GraphStore = {
   setSelectionData: (data: GraphData) => void
   simulationCreate: (nodes: Node[], links: Link[]) => void
   setIsHovering: (isHovering: boolean) => void
+  removeSimulation: () => void
 }
 
 const defaultData: Omit<
@@ -116,6 +117,7 @@ const defaultData: Omit<
   | 'setHideNodeDetails'
   | 'simulationCreate'
   | 'setIsHovering'
+  | 'removeSimulation'
 > = {
   data: null,
   simulation: null,
@@ -318,6 +320,7 @@ export const useGraphStore = create<GraphStore>()((set, get) => ({
 
     set({ simulation })
   },
+  removeSimulation: () => set({ simulation: null }),
 }))
 
 export const useSelectedNode = () => useGraphStore((s) => s.selectedNode)