cleanup: use messages array to get the last query id

Author: densumesh

clients/search-component/src/TrieveModal/Chat/FollowupQueries.tsx

@@ -7,7 +7,7 @@ import { useModalState } from "../../utils/hooks/modal-context";
 
 export const FollowupQueries = () => {
   const { props, trieveSDK, fingerprint } = useModalState();
-  const { isDoneReading, askQuestion } = useChatState();
+  const { isDoneReading, askQuestion, messages } = useChatState();
   const { suggestedQuestions, isLoadingSuggestedQueries } =
     useFollowupQuestions();
   const [parent] = useAutoAnimate();
@@ -17,40 +17,36 @@ export const FollowupQueries = () => {
   }
 
   const handleFollowupQuery = async (q: string) => {
-    const lastMessage = JSON.parse(
-      window.localStorage.getItem("lastMessage") ?? "{}",
-    );
-
-    const requestId =
-      Object.keys(lastMessage)[0] || "00000000-0000-0000-0000-000000000000";
-
-    await trieveSDK.sendAnalyticsEvent({
-      event_name: `site-followup_query`,
-      event_type: "click",
-      user_id: fingerprint,
-      location: window.location.href,
-      metadata: {
-        followup_query: q,
-        component_props: props,
-      },
-      request: {
-        request_id: requestId,
-        request_type: "rag",
-      },
-    });
+    const requestId = messages[messages.length - 1].queryId;
 
+    if (requestId) {
+      await trieveSDK.sendAnalyticsEvent({
+        event_name: `site-followup_query`,
+        event_type: "click",
+        user_id: fingerprint,
+        location: window.location.href,
+        metadata: {
+          followup_query: q,
+          component_props: props,
+        },
+        request: {
+          request_id: requestId,
+          request_type: "rag",
+        },
+      });
+    };
     askQuestion(q);
-  };
+
+  }
 
   return (
     <div ref={parent} className="followup-questions">
       {suggestedQuestions?.map((q) => (
         <button
           onClick={() => handleFollowupQuery(q)}
           key={q}
-          className={`followup-question ${
-            isLoadingSuggestedQueries ? "loading" : ""
-          }`}
+          className={`followup-question ${isLoadingSuggestedQueries ? "loading" : ""
+            }`}
         >
           <SparklesIcon className="followup-icon" />
           {q}

clients/search-component/src/TrieveModal/Chat/SuggestedQuestions.tsx

@@ -16,14 +16,33 @@ export const SuggestedQuestions = ({
   const { suggestedQuestions, isLoadingSuggestedQueries, getQuestions } =
     useSuggestedQuestions();
 
-  const { props } = useModalState();
+  const { props, trieveSDK, fingerprint } = useModalState();
   const [parent] = useAutoAnimate({ duration: 100 });
 
   if (messages.length) {
     return null;
   }
 
   const handleSuggestedQuestion = async (q: string) => {
+    const requestId = messages[messages.length - 1].queryId;
+
+    if (requestId) {
+      await trieveSDK.sendAnalyticsEvent({
+        event_name: `site-followup_query`,
+        event_type: "click",
+        user_id: fingerprint,
+        location: window.location.href,
+        metadata: {
+          followup_query: q,
+          component_props: props,
+        },
+        request: {
+          request_id: requestId,
+          request_type: "rag",
+        },
+      });
+    };
+
     setCurrentQuestion(q);
     askQuestion(q);
     if (onMessageSend) {
@@ -65,9 +84,8 @@ export const SuggestedQuestions = ({
                 handleSuggestedQuestion(q);
               }}
               key={q}
-              className={`suggested-question tv-flex tv-gap-1 tv-items-center${
-                isLoadingSuggestedQueries ? " loading" : ""
-              }`}
+              className={`suggested-question tv-flex tv-gap-1 tv-items-center${isLoadingSuggestedQueries ? " loading" : ""
+                }`}
             >
               <SparklesIcon width={15} height={15} />
               {q}