Add more metrics 3.2

src/components/tutor/ThirdStep.vue

@@ -9,8 +9,9 @@ const props = defineProps<{
   action: () => {};
   actionText?: string;
   disabled: boolean;
-  updateSyllabus: () => void;
+  updateSyllabus: (content: string) => void;
   restart: () => void;
+  updateSyllabusInDB: () => void;
 }>();
 
 const isEditable: Ref<boolean> = ref(false);
@@ -26,9 +27,17 @@ const toggleFeedback = async () => {
   enableFeedback.value = !enableFeedback.value;
 };
 
-const handleTextEdit = (event, index) => {
+const handleTextEdit = (event) => {
   const newValue = event.target.innerText;
-  props.updateSyllabus(index, newValue);
+  props.updateSyllabus(newValue);
+};
+
+const handleSyllabusEdition = () => {
+  if (isEditable.value) {
+    // Save the edited syllabus
+    props.updateSyllabusInDB();
+  }
+  isEditable.value = !isEditable.value;
 };
 </script>
 <template>
@@ -38,7 +47,7 @@ const handleTextEdit = (event, index) => {
     <!-- syllabus -->
 
     <div class="is-flex is-flex-direction-column">
-      <button class="button is-white ml-auto" @click="isEditable = !isEditable">
+      <button class="button is-white ml-auto" @click="handleSyllabusEdition">
         <span class="icon is-small mr-2">
           <EditIcon />
         </span>
@@ -52,7 +61,7 @@ const handleTextEdit = (event, index) => {
           class="syllabus content"
           v-if="syllabus?.content"
           v-html="marked.parse(syllabus?.content)"
-          @blur="handleTextEdit($event, index)"
+          @blur="handleTextEdit($event)"
           @click="isEditable = true"
         />
       </div>

src/stores/metrics.ts

@@ -27,12 +27,24 @@ export const useMetricsStore = defineStore('metrics', () => {
       return;
     }
 
-    if (!isInPage('q-and-a')) {
+    let storageKey;
+
+    if (isInPage('q-and-a')) {
+      storageKey = 'chatMessageId';
+    }
+    if (isInPage('tutor')) {
+      storageKey = 'tutorMessageId';
+    }
+    if (isInPage('search')) {
+      storageKey = 'searchMessageId';
+    }
+
+    if (!storageKey) {
       return;
     }
-    // get message id from storage
-    const messageId = localStorage.getItem('chatMessageId');
 
+    // get message id from storage
+    const messageId = localStorage.getItem(storageKey);
     if (!messageId || !docId) {
       return;
     }

src/stores/search.ts

@@ -38,7 +38,7 @@ export const useSearchStore = defineStore('search', () => {
     try {
       const promises = [
         getSDGsFromQuery(searchInput.value),
-        getSearch(100, {
+        getSearch(1, {
           query: searchInput.value,
           sdg_filter: sdgFilters,
           corpora: sourcesFilters,
@@ -47,10 +47,14 @@ export const useSearchStore = defineStore('search', () => {
       ];
       const [sdgsFromQuery, { data, status }] = await Promise.all(promises);
 
-      sdgsQuery.value = sdgsFromQuery;
+      sdgsQuery.value = sdgsFromQuery as string[];
 
       isFetchingSources.value = false;
-      searchResults.value = data;
+      searchResults.value = data.length ? data : data.docs;
+
+      if (data?.search_message_id) {
+        localStorage.setItem('searchMessageId', data.search_message_id);
+      }
 
       if (status === 206) {
         hasPartialResult.value = true;

src/stores/tutor.ts

@@ -90,8 +90,11 @@ export const useTutorStore = defineStore('tutor', () => {
     summaries.value[index] = content;
   };
 
-  const updateSyllabus = (index, content) => {
-    syllabi.value[index] = content;
+  const updateSyllabus = (content: string) => {
+    if (!syllabi.value) {
+      return;
+    }
+    syllabi.value = { ...syllabi.value, content };
   };
 
   const syllabusLanguage: Ref<string> = ref(i18n.global.locale.value);
@@ -321,6 +324,26 @@ export const useTutorStore = defineStore('tutor', () => {
     }
     const docxContent = await convertMarkdownToDocx(syllabi.value.content);
     downloadDocx(docxContent, 'syllabus.docx');
+    try {
+      await postAxios('/metric/syllabus_downloaded');
+    } catch (error) {
+      console.error('Error during metrics update:', error);
+    }
+  };
+
+  const updateSyllabusInDB = async () => {
+    if (!syllabi.value || !syllabi.value.content) {
+      console.error('No syllabi available for download');
+      return;
+    }
+
+    try {
+      await postAxios('/tutor/syllabus/user_update', {
+        syllabus: syllabi.value.content
+      });
+    } catch (error) {
+      console.error('Error during syllabus update:', error);
+    }
   };
 
   return {
@@ -359,6 +382,7 @@ export const useTutorStore = defineStore('tutor', () => {
     summaries,
     newFilesToSearch,
     stopAction,
-    updateSyllabus
+    updateSyllabus,
+    updateSyllabusInDB
   };
 });

src/stores/user.ts

@@ -12,15 +12,21 @@ const defaultOnboardingState: OnboardingState = {
 };
 
 export const useUserStore = defineStore('user', () => {
-  const userId: Ref<string | null> = ref(localStorage.getItem('userId'));
-  const sessionId: Ref<string | null> = ref(localStorage.getItem('sessionId'));
+  const userId: Ref<string | undefined> = ref(localStorage.getItem('userId') || undefined);
+  const sessionId: Ref<string | undefined> = ref(localStorage.getItem('sessionId') || undefined);
 
-  const setUserIdAndSessionId = async (referer: string | null) => {
+  const setUserIdAndSessionId = async (referer?: string) => {
     const userAndSession = await getUserAndSession(userId.value, sessionId.value, referer);
     userId.value = userAndSession?.userId;
     sessionId.value = userAndSession?.sessionId;
-    localStorage.setItem('userId', userAndSession?.userId || '');
-    localStorage.setItem('sessionId', userAndSession?.sessionId || '');
+
+    if (userId.value !== localStorage.getItem('userId')) {
+      localStorage.setItem('userId', userId.value || '');
+    }
+
+    if (sessionId.value !== localStorage.getItem('sessionId')) {
+      localStorage.setItem('sessionId', sessionId.value || '');
+    }
 
     return {
       userId: userId.value,

src/utils/auth.ts

@@ -4,40 +4,48 @@ export const getUserAndSession = async (
   userId?: string,
   sessionId?: string,
   referer?: string
-): { userId: string; sessionId: string } => {
+): Promise<{ userId: string; sessionId: string }> => {
   try {
-    if (userId && sessionId) return { userId, sessionId };
-
     if (!userId && sessionId) {
       localStorage.removeItem('sessionId');
     }
 
-    let newUserId = userId;
-    let newSessionId = sessionId;
-
-    if (!newUserId) {
-      const parts: string[] = [];
-      if (userId) parts.push(`user_id=${encodeURIComponent(userId)}`);
-      if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);
+    const newUserId = await getUserId(userId, referer);
+    const newSessionId = await getSessionId(newUserId, sessionId, referer);
 
-      const query = parts.length ? `?${parts.join('&')}` : '';
-      const respUserId = await postAxios(`/user/user${query}`);
-      newUserId = respUserId.data.user_id;
+    if (!newUserId || !newSessionId) {
+      throw new Error('Failed to retrieve user ID or session ID');
     }
 
-    if (newUserId) {
-      const parts: string[] = [];
-      parts.push(`user_id=${encodeURIComponent(newUserId)}`);
-      if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);
-
-      const query = `?${parts.join('&')}`;
-      const respSessionId = await postAxios(`/user/session${query}`);
-
-      newSessionId = respSessionId.data.session_id;
-    }
     return { userId: newUserId, sessionId: newSessionId };
   } catch (error) {
     console.warn('Failed to get user and session:', error);
     throw error;
   }
 };
+
+const getUserId = async (userId?: string, referer?: string): Promise<string> => {
+  const parts: string[] = [];
+
+  if (userId) parts.push(`user_id=${encodeURIComponent(userId)}`);
+  if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);
+
+  const query = parts.length ? `?${parts.join('&')}` : '';
+  const respUserId = await postAxios(`/user/user${query}`);
+  return respUserId.data.user_id;
+};
+
+const getSessionId = async (
+  userId: string,
+  sessionId?: string,
+  referer?: string
+): Promise<string> => {
+  const parts: string[] = [];
+  parts.push(`user_id=${encodeURIComponent(userId)}`);
+  if (sessionId) parts.push(`session_id=${encodeURIComponent(sessionId)}`);
+  if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);
+
+  const query = `?${parts.join('&')}`;
+  const respSessionId = await postAxios(`/user/session${query}`);
+  return respSessionId.data.session_id;
+};

src/views/TutorPage.vue

@@ -142,6 +142,7 @@ const stepToAction: Record<0 | 1 | 2 | 3 | 4, () => Promise<void>> = {
         :giveFeedback="store.giveFeedback"
         :action="stepToAction[4]"
         :restart="store.restart"
+        :updateSyllabusInDB="store.updateSyllabusInDB"
       />
     </div>
   </div>