close

src/components/App/UniverseQuestion/index.tsx

@@ -12,11 +12,13 @@ import { useAppStore } from '~/stores/useAppStore'
 import { useDataStore } from '~/stores/useDataStore'
 import { useUserStore } from '~/stores/useUserStore'
 import { colors } from '~/utils/colors'
+import { useUpdateSelectedNode } from '~/stores/useGraphStore'
 
 export const UniverseQuestion = () => {
   const [question, setQuestion] = useState('')
   const { fetchData, setAbortRequests, seedQuestions } = useDataStore((s) => s)
   const [setBudget] = useUserStore((s) => [s.setBudget])
+  const setSelectedNode = useUpdateSelectedNode()
 
   const { setUniverseQuestionIsOpen, setSidebarOpen, setShowCollapseButton } = useAppStore((s) => ({
     setUniverseQuestionIsOpen: s.setUniverseQuestionIsOpen,
@@ -35,6 +37,7 @@ export const UniverseQuestion = () => {
 
   const handleSubmitQuestion = async (questionToSubmit: string) => {
     if (questionToSubmit) {
+      setSelectedNode(null)
       resetAiSummaryAnswer()
       setUniverseQuestionIsOpen()
       setSidebarOpen(true)

src/components/Universe/Graph/Cubes/index.tsx

@@ -11,15 +11,17 @@ import { Cube } from './Cube'
 import { RelevanceBadges } from './RelevanceBadges'
 import { SelectionDataNodes } from './SelectionDataNodes'
 import { TextNode } from './Text'
+import { useAiSummaryStore } from '~/stores/useAiSummaryStore'
 
 const POINTER_IN_DELAY = 200
 
 export const Cubes = memo(() => {
   const selectedNode = useSelectedNode()
   const relativeIds = useSelectedNodeRelativeIds()
   const { selectionGraphData, showSelectionGraph, setHoveredNode, setIsHovering } = useGraphStore((s) => s)
+  const { resetAiSummaryAnswer, setNewLoading } = useAiSummaryStore()
 
-  const data = useDataStore((s) => s.dataInitial)
+  const [data, abortFetchData] = useDataStore((s) => [s.dataInitial, s.abortFetchData])
   const setTranscriptOpen = useAppStore((s) => s.setTranscriptOpen)
 
   const ignoreNodeEvent = useCallback(
@@ -41,14 +43,18 @@ export const Cubes = memo(() => {
         // always close transcript when switching nodes
         setTranscriptOpen(false)
 
+        setNewLoading(null)
+        abortFetchData()
+        resetAiSummaryAnswer()
+
         if (node.userData) {
           if (!ignoreNodeEvent(node.userData as NodeExtended)) {
             useGraphStore.getState().setSelectedNode((node?.userData as NodeExtended) || null)
           }
         }
       }
     },
-    [setTranscriptOpen, ignoreNodeEvent],
+    [setTranscriptOpen, setNewLoading, abortFetchData, resetAiSummaryAnswer, ignoreNodeEvent],
   )
 
   const hoverTimeoutRef = useRef<NodeJS.Timeout | null>(null)

src/stores/useDataStore/index.ts

@@ -72,6 +72,7 @@
   nextPage: () => void
   setFilters: (filters: Partial<FilterParams>) => void
   setSeedQuestions: (questions: string[]) => void
+  abortFetchData: () => void
 }
 
 const defaultData: Omit<
@@ -237,13 +238,20 @@
           sidebarFilterCounts,
         })
       } catch (error) {
         console.log(error)
 
         if (error !== 'abort') {
           set({ isLoadingNew: false, isFetching: false })
         }
       }
     },
+
+    abortFetchData: () => {
+      if (abortController) {
+        abortController.abort('abort')
+      }
+    },
+
     setPage: (page: number) => set({ currentPage: page }),
     nextPage: () => {
       const { currentPage, fetchData } = get()
@@ -275,7 +283,7 @@
     setHideNodeDetails: (hideNodeDetails) => set({ hideNodeDetails }),
     setSeedQuestions: (questions) => set({ seedQuestions: questions }),
     updateNode: (updatedNode) => {
       console.log(updatedNode)
     },
     addNewNode: (data) => {
       const { dataInitial: existingData } = get()
@@ -319,7 +327,7 @@
       })
     },
     removeNode: (id) => {
       console.log(id)
     },
     setAbortRequests: (abortRequest) => set({ abortRequest }),
   })),