All 1.3.1 dev

.github/workflows/all-dev-tn-new.yml

@@ -3,7 +3,7 @@ name: ALL new tn dev Deployment
 on:
   push:
     branches:
-      - all-1.3-tn-dev-hotfix
+      - all-1.3-feedback-change
 
 jobs:
   deploy:

.github/workflows/all-dev-tn.yml

@@ -3,7 +3,7 @@ name: ALL tn dev Deployment
 on:
   push:
     branches:
-      - all-1.2-tn-dev
+      - all-1.3.1-dev
 
 jobs:
   deploy:

.gitignore

@@ -10,7 +10,7 @@ lerna-debug.log*
 .env
 #build
 build
-
+*.env*
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 

src/App.js

@@ -6,7 +6,7 @@ import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import routes from "./routes";
 import { AppContent } from "./views";
 import theme from "./assets/styles/theme";
-import { initialize } from "./services/telementryService";
+import { initialize, end } from "./services/telementryService";
 import { startEvent } from "./services/callTelemetryIntract";
 import "@project-sunbird/telemetry-sdk/index.js";
 import { getParameter } from "./utils/constants";
@@ -72,6 +72,20 @@ const App = () => {
     setFp();
   }, []);
 
+  useEffect(() => {
+    const handleBeforeUnload = (event) => {
+      window.telemetry && window.telemetry.syncEvents && window.telemetry.syncEvents();
+    };
+
+    // Add the event listener
+    window.addEventListener("beforeunload", handleBeforeUnload);
+
+    // Cleanup the event listener on component unmount
+    return () => {
+      window.removeEventListener("beforeunload", handleBeforeUnload);
+    };
+  }, []);
+
   useEffect(() => {
     let virtualId;
 

src/components/Assesment/Assesment.jsx

@@ -598,10 +598,12 @@ const Assesment = ({ discoverStart }) => {
         }
 
         localStorage.setItem("lang", lang || "ta");
-        const getPointersDetails = await axios.get(
-          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${usernameDetails?.data?.result?.virtualID}/${session_id}?language=${lang}`
-        );
-        setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+        if (process.env.REACT_APP_IS_APP_IFRAME !== "true" && localStorage.getItem("contentSessionId") !== null) {
+          const getPointersDetails = await axios.get(
+            `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${usernameDetails?.data?.result?.virtualID}/${session_id}?language=${lang}`
+          );
+          setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
+        }
 
         dispatch(setVirtualId(usernameDetails?.data?.result?.virtualID));
       })();
@@ -635,7 +637,7 @@ const Assesment = ({ discoverStart }) => {
           localStorage.setItem("sessionId", sessionId);
         }
 
-        if (virtualId) {
+        if (process.env.REACT_APP_IS_APP_IFRAME !== "true" && virtualId && localStorage.getItem("contentSessionId") !== null) {
           const getPointersDetails = await axios.get(
             `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
           );

src/components/AssesmentEnd/AssesmentEnd.jsx

@@ -16,19 +16,23 @@ import { useEffect, useState } from "react";
 import LevelCompleteAudio from "../../assets/audio/levelComplete.wav";
 import { ProfileHeader } from "../Assesment/Assesment";
 import desktopLevel5 from "../../assets/images/assesmentComplete.png";
-import config from '../../utils/urlConstants.json';
+import config from "../../utils/urlConstants.json";
 import { uniqueId } from "../../services/utilService";
+import usePreloadAudio from "../../hooks/usePreloadAudio";
 
 const AssesmentEnd = () => {
   const [shake, setShake] = useState(true);
   const [level, setLevel] = useState("");
   const [previousLevel, setPreviousLevel] = useState("");
   const [points, setPoints] = useState(0);
+  const levelCompleteAudioSrc = usePreloadAudio(LevelCompleteAudio);
 
   useEffect(() => {
     (async () => {
-      let audio = new Audio(LevelCompleteAudio);
-      audio.play();
+      if (levelCompleteAudioSrc) {
+        let audio = new Audio(levelCompleteAudioSrc);
+        audio.play();
+      }
       const virtualId = getLocalData("virtualId");
       const lang = getLocalData("lang");
       const previous_level = getLocalData("previous_level");
@@ -40,19 +44,21 @@ const AssesmentEnd = () => {
       setLevel(data.data.milestone_level);
       setLocalData("userLevel", data.data.milestone_level?.replace("m", ""));
       let sessionId = getLocalData("sessionId");
-      if (!sessionId){
+      if (!sessionId) {
         sessionId = uniqueId();
-        localStorage.setItem("sessionId", sessionId)
+        localStorage.setItem("sessionId", sessionId);
+      }
+      if (process.env.REACT_APP_IS_APP_IFRAME !== "true" && localStorage.getItem("contentSessionId") !== null) {
+        const getPointersDetails = await axios.get(
+          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
+        );
+        setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
       }
-      const getPointersDetails = await axios.get(
-        `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
-      );
-      setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
     })();
     setTimeout(() => {
       setShake(false);
     }, 4000);
-  }, []);
+  }, [levelCompleteAudioSrc]);
 
   const navigate = useNavigate();
   let newLevel = level.replace("m", "");

src/components/DiscoverEnd/DiscoverEnd.jsx

@@ -8,12 +8,9 @@ import back from "../../assets/images/back-arrow.svg";
 import discoverEndLeft from "../../assets/images/discover-end-left.svg";
 import discoverEndRight from "../../assets/images/discover-end-right.svg";
 import textureImage from "../../assets/images/textureImage.png";
-import {
-  LetsStart,
-  getLocalData,
-  setLocalData,
-} from "../../utils/constants";
-import config from '../../utils/urlConstants.json';
+import { LetsStart, getLocalData, setLocalData } from "../../utils/constants";
+import config from "../../utils/urlConstants.json";
+import usePreloadAudio from "../../hooks/usePreloadAudio";
 
 const sectionStyle = {
   backgroundImage: `url(${textureImage})`,
@@ -32,12 +29,14 @@ const sectionStyle = {
 const SpeakSentenceComponent = () => {
   const [shake, setShake] = useState(true);
   const [level, setLevel] = useState("");
+  const levelCompleteAudioSrc = usePreloadAudio(LevelCompleteAudio);
 
   useEffect(() => {
-
     (async () => {
-      let audio = new Audio(LevelCompleteAudio);
-      audio.play();
+      if (levelCompleteAudioSrc) {
+        let audio = new Audio(levelCompleteAudioSrc);
+        audio.play();
+      }
       const virtualId = getLocalData("virtualId");
       const lang = getLocalData("lang");
       const getMilestoneDetails = await axios.get(
@@ -50,14 +49,14 @@ const SpeakSentenceComponent = () => {
     setTimeout(() => {
       setShake(false);
     }, 4000);
-  }, []);
+  }, [levelCompleteAudioSrc]);
 
   const handleProfileBack = () => {
     try {
-      if (process.env.REACT_APP_IS_APP_IFRAME === 'true') {
-        navigate("/")
+      if (process.env.REACT_APP_IS_APP_IFRAME === "true") {
+        navigate("/");
       } else {
-        navigate("/discover-start")
+        navigate("/discover-start");
       }
     } catch (error) {
       console.error("Error posting message:", error);
@@ -132,7 +131,7 @@ const SpeakSentenceComponent = () => {
           </Typography>
 
           <Box
-           onClick={() => handleProfileBack()}
+            onClick={handleProfileBack}
             sx={{
               display: "flex",
               justifyContent: "center",

src/components/DiscoverSentance/DiscoverSentance.jsx

@@ -14,6 +14,7 @@ import LevelCompleteAudio from "../../assets/audio/levelComplete.wav";
 import config from "../../utils/urlConstants.json";
 import { MessageDialog } from "../Assesment/Assesment";
 import { Log } from "../../services/telementryService";
+import usePreloadAudio from "../../hooks/usePreloadAudio";
 
 const SpeakSentenceComponent = () => {
   const [currentQuestion, setCurrentQuestion] = useState(0);
@@ -37,10 +38,13 @@ const SpeakSentenceComponent = () => {
   const [totalSyllableCount, setTotalSyllableCount] = useState("");
   const [isNextButtonCalled, setIsNextButtonCalled] = useState(false);
 
+  const levelCompleteAudioSrc = usePreloadAudio(LevelCompleteAudio);
+
   const callConfettiAndPlay = () => {
-    let audio = new Audio(LevelCompleteAudio);
+    let audio = new Audio(levelCompleteAudioSrc);
     audio.play();
     callConfetti();
+    window.telemetry?.syncEvents && window.telemetry.syncEvents();
   };
 
   useEffect(() => {
@@ -118,35 +122,18 @@ const SpeakSentenceComponent = () => {
     try {
       const lang = getLocalData("lang");
 
-      if (!(localStorage.getItem("contentSessionId") !== null)) {
-        const pointsRes = await axios.post(
-          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_POINTER}`,
-          {
-            userId: localStorage.getItem("virtualId"),
-            sessionId: localStorage.getItem("sessionId"),
-            points: 1,
-            language: lang,
-            milestone: "m0",
-          }
-        );
-        setPoints(pointsRes?.data?.result?.totalLanguagePoints || 0);
-      } else {
-        send(1);
-        // setPoints(localStorage.getItem("currentLessonScoreCount"));
-      }
-
-      await axios.post(
-        `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_LESSON}`,
-        {
-          userId: localStorage.getItem("virtualId"),
-          sessionId: localStorage.getItem("sessionId"),
-          milestone: `discoveryList/discovery/${currentCollectionId}`,
-          lesson: localStorage.getItem("storyTitle"),
-          progress: ((currentQuestion + 1) * 100) / questions.length,
-          language: lang,
-          milestoneLevel: "m0",
-        }
-      );
+      // await axios.post(
+      //   `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_LESSON}`,
+      //   {
+      //     userId: localStorage.getItem("virtualId"),
+      //     sessionId: localStorage.getItem("sessionId"),
+      //     milestone: `discoveryList/discovery/${currentCollectionId}`,
+      //     lesson: localStorage.getItem("storyTitle"),
+      //     progress: ((currentQuestion + 1) * 100) / questions.length,
+      //     language: lang,
+      //     milestoneLevel: "m0",
+      //   }
+      // );
 
       if (currentQuestion < questions.length - 1) {
         setCurrentQuestion(currentQuestion + 1);
@@ -164,6 +151,24 @@ const SpeakSentenceComponent = () => {
             language: localStorage.getItem("lang"),
           }
         );
+
+        if (!(localStorage.getItem("contentSessionId") !== null)) {
+          const pointsRes = await axios.post(
+            `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.ADD_POINTER}`,
+            {
+              userId: localStorage.getItem("virtualId"),
+              sessionId: localStorage.getItem("sessionId"),
+              points: 1,
+              language: lang,
+              milestone: "m0",
+            }
+          );
+          setPoints(pointsRes?.data?.result?.totalLanguagePoints || 0);
+        } else {
+          send(5);
+          // setPoints(localStorage.getItem("currentLessonScoreCount"));
+        }
+
         setInitialAssesment(false);
         const { data: getSetData } = getSetResultRes;
         const data = JSON.stringify(getSetData?.data);

src/components/Layouts.jsx/MainLayout.jsx

@@ -163,27 +163,70 @@ const MainLayout = (props) => {
     }
   };
 
+  const [audioCache, setAudioCache] = useState({});
+
+  useEffect(() => {
+    const preloadAudio = async () => {
+      try {
+        const urls = [LevelCompleteAudio, gameLoseAudio];
+        const cache = {};
+
+        for (const url of urls) {
+          const response = await fetch(url);
+          const audioBlob = await response.blob();
+          const audioUrl = URL.createObjectURL(audioBlob);
+          cache[url] = audioUrl;
+        }
+
+        setAudioCache(cache);
+      } catch (error) {
+        console.error("Error preloading audio:", error);
+      }
+    };
+
+    preloadAudio();
+
+    // Cleanup cached audio URLs on unmount
+    return () => {
+      Object.values(audioCache).forEach((audioUrl) =>
+        URL.revokeObjectURL(audioUrl)
+      );
+    };
+  }, []);
+
   useEffect(() => {
     if (isShowCase && gameOverData) {
-      setShake(gameOverData ? gameOverData.userWon : true);
+      setShake(gameOverData.userWon ?? true);
 
-      let audio = "";
+      let audioSrc;
       if (gameOverData) {
-        audio = new Audio(
-          gameOverData.userWon ? LevelCompleteAudio : gameLoseAudio
-        );
+        audioSrc = gameOverData.userWon
+          ? audioCache[LevelCompleteAudio]
+          : audioCache[gameLoseAudio];
+      } else {
+        audioSrc = audioCache[LevelCompleteAudio];
+      }
+
+      if (audioSrc) {
+        const audio = new Audio(audioSrc);
+        audio.play().catch((error) => {
+          console.error("Error playing audio:", error);
+        });
+
         if (!gameOverData?.userWon) {
           callConfettiSnow();
         }
-      } else {
-        audio = new Audio(LevelCompleteAudio);
       }
-      audio.play();
-      setTimeout(() => {
+
+      const shakeTimeout = setTimeout(() => {
         setShake(false);
       }, 4000);
+
+      return () => {
+        clearTimeout(shakeTimeout);
+      };
     }
-  }, [startShowCase, isShowCase, gameOverData]);
+  }, [startShowCase, isShowCase, gameOverData, audioCache]);
 
   let currentPracticeStep = progressData?.currentPracticeStep;
   let currentPracticeProgress = progressData?.currentPracticeProgress || 0;
@@ -752,7 +795,7 @@ const MainLayout = (props) => {
                         >
                           <Stack justifyContent="center" alignItems="center">
                             <img
-                              src={gameLost}
+                              src={`https://raw.githubusercontent.com/Sunbird-ALL/all-learner-ai-app/refs/heads/all-1.3/src/assets/images/gameLost.svg`}
                               alt="gameLost"
                               style={{ height: 340 }}
                             />
@@ -1196,6 +1239,9 @@ MainLayout.propTypes = {
   storedData: PropTypes.array,
   resetStoredData: PropTypes.func,
   pageName: PropTypes.string,
+  gameOverData: PropTypes.shape({
+    userWon: PropTypes.bool,
+  }),
 };
 
 export default MainLayout;