Merge pull request #251 from terminusdb/openAI

Open ai

Author: KittyJose

package-lock.json

@@ -30,15 +30,17 @@ export function useOpenAI(){
 
     const location = useLocation()
 
-
-    useEffect(()=>{
+    const resetSearch =() => {
         if(location.state && location.state.previewPage === "documentView"){
-          const resultSaved = localStorage.getItem(`${location.pathname}___SEARCH__RESULT`)
-          const startSaved = localStorage.getItem(`${location.pathname}___START`) || 0
-          setStartValue(Number(startSaved))
-          if(resultSaved)setSearchResult(JSON.parse(resultSaved))
+            const resultSaved = localStorage.getItem(`${location.pathname}___SEARCH__RESULT`)
+            const startSaved = localStorage.getItem(`${location.pathname}___START`) || 0
+            setStartValue(Number(startSaved))
+            if(resultSaved)setSearchResult(JSON.parse(resultSaved))
+        }else{
+            setStartValue(0)
+            setSearchResult(false)
         }
-    },[location])
+     }
 
     function getUrl(action="changes"){
         const client = woqlClient.copy()
@@ -54,9 +56,9 @@ export function useOpenAI(){
     ///changes/:orgid/:dbid/indexedcommit
     const getSearchableCommit = async (limit=1, status=null)=>{
         try{
-            setLoading(true)
             setSearchableCommit(false)
-            const url = `${getUrl()}/indexedcommits?limit=${limit}&status=${status}`
+            setLoading(true)
+            const url = `${getUrl('indexes')}?limit=${limit}&status=${status}`
             const result = await woqlClient.sendCustomRequest("GET", url)
             if(result && result.bindings){
                 setSearchableCommit(result.bindings)
@@ -72,9 +74,10 @@ export function useOpenAI(){
     const getResearchResult = async (commit, freeText, domain, branch = "main"  ) =>{
         if(woqlClient){
             try{
+                setSearchResult(false)
                 setLoading(true)
                 localStorage.setItem(`${location.pathname}___SEARCH__TEXT`,freeText)
-                const url = `${getUrl('index')}/search?domain=${domain}&commit=${commit}`
+                const url = `${getUrl('indexes')}/search?domain=${domain}&commit=${commit}`
                 const result = await woqlClient.sendCustomRequest("POST", url , {freeText:freeText})
                 localStorage.setItem(`${location.pathname}___SEARCH__RESULT`,JSON.stringify(result))
                 setSearchResult(result)
@@ -104,7 +107,7 @@ export function useOpenAI(){
 
     const pollingCall = async (commitid,updateStatus) =>{
         try{
-            const pollingUrl = `${getUrl()}/check/${commitid}`
+            const pollingUrl = `${getUrl('indexes')}/check/${commitid}`
             const document = await woqlClient.sendCustomRequest("GET", pollingUrl)
             if(document.indexing_status !== "Assigned" && document.indexing_status !== "Error"){
                 await timeout(5000)
@@ -301,6 +304,7 @@ export function useOpenAI(){
 
 
     return {pollingCall,
+            resetSearch,
             getPrewiew,
             resetPreviewResult,
             getSearchableCommit,

packages/tdb-dashboard/src/hooks/useOpenAI.js

@@ -16,7 +16,7 @@ import  Alert  from "react-bootstrap/Alert";
 
 export function FreeTextSearch() {
 
-    const {getSearchableCommit, searchableCommit, searchResult,getResearchResult,start,setStart, error, setError,loading,} = useOpenAI()
+    const {resetSearch, getSearchableCommit, searchableCommit, searchResult,getResearchResult,start,setStart, error, setError,loading,} = useOpenAI()
     const {dataProduct, organization} = useParams()
 
     const search = useRef(null)
@@ -26,11 +26,14 @@ export function FreeTextSearch() {
 
     const commit = Array.isArray(searchableCommit) && searchableCommit.length>0 ? searchableCommit[0].searchable_commit['@value'] : null
     useEffect(()=>{
-        if(searchResult)getElements()
-
+        if(searchResult){
+            getElements()
+        }
     },[start,searchResult])
 
     useEffect(()=>{
+        setElements([])
+        resetSearch()
         getSearchableCommit(1, "Assigned")
     },[dataProduct])
 
@@ -84,7 +87,7 @@ export function FreeTextSearch() {
             </div>}
             <Container className="mt-4">
                 {!commit  && <Alert type="Info" >
-                    <h3>You need to index your data before search them</h3>
+                    <h3>You need to index your data before you can search</h3>
                     <p>if you haven't already done it, Go to <NavLink to={`/${organization}/profile`}>Profile page</NavLink> and add an OpenAi Key to your team,</p> 
                     after you can start to index your data using the change request workflow
                 </Alert>}