fix rag indices getting & cleanups

Author: Veikkosuhonen

src/client/App.tsx

@@ -1,24 +1,22 @@
-import React, { createContext, useContext, useEffect, useRef, useState } from 'react'
-import { Outlet, useLocation, useNavigate, useParams } from 'react-router-dom'
-import { SnackbarProvider } from 'notistack'
-import { initShibbolethPinger } from 'unfuck-spa-shibboleth-session'
+import { Box, Button, CssBaseline, Snackbar } from '@mui/material'
 import { ThemeProvider } from '@mui/material/styles'
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3'
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'
 import { fi } from 'date-fns/locale'
-import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3'
-import { Box, Button, CssBaseline, Snackbar } from '@mui/material'
-import { AppContext } from './contexts/AppContext'
+import { SnackbarProvider } from 'notistack'
+import React, { useEffect, useRef } from 'react'
+import { Outlet, useLocation, useParams } from 'react-router-dom'
+import { initShibbolethPinger } from 'unfuck-spa-shibboleth-session'
 import { PUBLIC_URL } from '../config'
-import type { User } from './types'
-import useTheme from './theme'
-import NavBar from './components/NavBar'
+import { Feedback } from './components/Feedback'
 import Footer from './components/Footer'
-import useCurrentUser from './hooks/useCurrentUser'
+import NavBar from './components/NavBar'
+import { AppContext } from './contexts/AppContext'
 import { EmbeddedProvider, useIsEmbedded } from './contexts/EmbeddedContext'
-import { Feedback } from './components/Feedback'
+import useCurrentUser from './hooks/useCurrentUser'
 import { AnalyticsProvider } from './stores/analytics'
-import { useTranslation } from 'react-i18next'
-import { useUpdateUrlLang } from './hooks/useUpdateUrlLang.tsx'
+import useTheme from './theme'
+import type { User } from './types'
 
 const hasAccess = (user: User | null | undefined, courseId?: string) => {
   if (!user) return false
@@ -73,7 +71,7 @@ const AdminLoggedInAsBanner = () => {
 }
 
 const App = () => {
-  const urlUpdater = useUpdateUrlLang() //DONT REMOVE, the hook creates 2 useEffects to keep the url param synced with user language changes
+  useUpdateUrlLang()
   const theme = useTheme()
   const { courseId } = useParams()
   const location = useLocation()

src/client/components/ChatV2/ChatV2.tsx

@@ -10,7 +10,7 @@ import { getLanguageValue } from '../../../shared/utils'
 import useCourse from '../../hooks/useCourse'
 import useInfoTexts from '../../hooks/useInfoTexts'
 import useLocalStorageState from '../../hooks/useLocalStorageState'
-import { useRagIndices } from '../../hooks/useRagIndices'
+import { useCourseRagIndices } from '../../hooks/useRagIndices'
 import useRetryTimeout from '../../hooks/useRetryTimeout'
 import useUserStatus from '../../hooks/useUserStatus'
 import type { Message } from '../../types'
@@ -59,7 +59,7 @@ export const ChatV2 = () => {
   const isMobile = useMediaQuery(theme.breakpoints.down('md'))
 
   const { data: course } = useCourse(courseId)
-  const { ragIndices } = useRagIndices(courseId)
+  const { ragIndices } = useCourseRagIndices(course?.id)
   const { infoTexts } = useInfoTexts()
 
   const { userStatus, isLoading: statusLoading, refetch: refetchStatus } = useUserStatus(courseId)

src/client/hooks/useRagIndices.ts

@@ -2,13 +2,30 @@ import { useQuery } from '@tanstack/react-query'
 import type { RagIndexAttributes } from '../../shared/types'
 import apiClient from '../util/apiClient'
 
-export const useRagIndices = (chatInstanceId?: string, includeExtras?: boolean) => {
+export const useRagIndices = (includeExtras?: boolean) => {
   const { data: ragIndices, ...rest } = useQuery<RagIndexAttributes[]>({
-    queryKey: chatInstanceId ? ['ragIndices', chatInstanceId] : ['ragIndices'],
+    queryKey: ['ragIndices'],
     queryFn: async () => {
       const response = await apiClient.get(`/rag/indices`, {
         params: {
-          chatInstanceId: chatInstanceId ? chatInstanceId : undefined,
+          includeExtras: includeExtras ? includeExtras : false,
+        },
+      })
+      return response.data
+    },
+  })
+
+  return { ragIndices, ...rest }
+}
+
+export const useCourseRagIndices = (chatInstanceId?: string, includeExtras?: boolean) => {
+  const { data: ragIndices, ...rest } = useQuery<RagIndexAttributes[]>({
+    enabled: !!chatInstanceId,
+    queryKey: ['ragIndices', chatInstanceId],
+    queryFn: async () => {
+      const response = await apiClient.get(`/rag/indices`, {
+        params: {
+          chatInstanceId,
           includeExtras: includeExtras ? includeExtras : false,
         },
       })

src/client/hooks/useUpdateUrlLang.tsx

@@ -1,14 +1,12 @@
 import { useTranslation } from 'react-i18next'
-import { useLocation, useNavigate, useSearchParams } from 'react-router-dom'
+import { useLocation, useSearchParams } from 'react-router-dom'
 import useCurrentUser from '../hooks/useCurrentUser'
 import { useState, useEffect } from 'react'
 
 export const useUpdateUrlLang = () => {
-  const location = useLocation()
-  const navigate = useNavigate()
   const languages = ['fi', 'sv', 'en']
-  const { t, i18n } = useTranslation()
-  const { user, isLoading } = useCurrentUser()
+  const { i18n } = useTranslation()
+  const { user } = useCurrentUser()
   const [lang, setLanguageState] = useState(localStorage.getItem('lang'))
   const [params, setParams] = useSearchParams()
   const langParam = params.get('lang')
@@ -28,10 +26,9 @@ export const useUpdateUrlLang = () => {
       // so lets use the local storage (example: see how admin page)
       setLang(updatedLangFromLocal)
     }
-  }, [location.pathname])
+  }, [])
 
   useEffect(() => {
-    console.log('lang changed!')
     if (i18n.language !== localStorage.getItem('lang')) {
       setLang(i18n.language)
     }