fix: useState for session

josStorer · Mar 13, 2023 · 9716c26 · 9716c26
1 parent cf7b227
commit 9716c26
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/components/ConversationCardForSearch/index.jsx b/src/components/ConversationCardForSearch/index.jsx
@@ -32,15 +32,17 @@ function ConversationCardForSearch(props) {
   ])
   const [isReady, setIsReady] = useState(false)
   const [port, setPort] = useState(() => Browser.runtime.connect())
+  const [session, setSession] = useState(props.session)
 
   useEffect(() => {
     if (props.onUpdate) props.onUpdate()
   })
 
   useEffect(() => {
     // when the page is responsive, session may accumulate redundant data and needs to be cleared after remounting and before making a new request
-    props.session = initSession({ question: props.question })
-    port.postMessage({ session: props.session })
+    const newSession = initSession({ question: props.question })
+    setSession(newSession)
+    port.postMessage({ session: newSession })
   }, [props.question]) // usually only triggered once
 
   /**
@@ -58,7 +60,7 @@ function ConversationCardForSearch(props) {
         newType,
         appended ? copy[index].content + value : value,
       )
-      copy[index].session = { ...props.session }
+      copy[index].session = { ...session }
       copy[index].done = done
       return copy
     })
@@ -79,7 +81,7 @@ function ConversationCardForSearch(props) {
         UpdateAnswer(msg.answer, false, 'answer')
       }
       if (msg.session) {
-        props.session = msg.session
+        setSession(msg.session)
       }
       if (msg.done) {
         UpdateAnswer('\n<hr/>', true, 'answer', true)
@@ -133,7 +135,7 @@ function ConversationCardForSearch(props) {
           style="margin:15px 15px 10px;"
           onClick={() => {
             let output = ''
-            props.session.conversationRecords.forEach((data) => {
+            session.conversationRecords.forEach((data) => {
               output += `Question:\n\n${data.question}\n\nAnswer:\n\n${data.answer}\n\n<hr/>\n\n`
             })
             const blob = new Blob([output], { type: 'text/plain;charset=utf-8' })
@@ -166,9 +168,10 @@ function ConversationCardForSearch(props) {
           setConversationItemData([...conversationItemData, newQuestion, newAnswer])
           setIsReady(false)
 
-          props.session.question = question
+          const newSession = { ...session, question }
+          setSession(newSession)
           try {
-            port.postMessage({ session: props.session })
+            port.postMessage({ session: newSession })
           } catch (e) {
             UpdateAnswer(e, false, 'error')
           }

diff --git a/src/components/ConversationItem/index.jsx b/src/components/ConversationItem/index.jsx
@@ -36,13 +36,13 @@ export function ConversationItem({ type, content, session, done }) {
           <div className="gpt-header">
             <p>{session ? 'ChatGPT:' : 'Loading...'}</p>
             <div style="display: flex; gap: 15px;">
-              {done && !session.useApiKey && (
+              {done && session && session.conversationId && (
                 <FeedbackForChatGPTWeb
                   messageId={session.messageId}
                   conversationId={session.conversationId}
                 />
               )}
-              {session && session.conversationId && !session.useApiKey && (
+              {session && session.conversationId && (
                 <a
                   title="Continue on official website"
                   href={'https://chat.openai.com/chat/' + session.conversationId}

diff --git a/src/components/DecisionCardForSearch/index.jsx b/src/components/DecisionCardForSearch/index.jsx
@@ -134,7 +134,7 @@ function DecisionCardForSearch(props) {
 }
 
 DecisionCardForSearch.propTypes = {
-  session: PropTypes.string.isRequired,
+  session: PropTypes.object.isRequired,
   question: PropTypes.string.isRequired,
   siteConfig: PropTypes.object.isRequired,
   container: PropTypes.object.isRequired,