Skip to content

Task #224690 fix: Added expection handling dialogue for apis failed #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepali-chavhan wants to merge 1 commit into
base: all-2.0
Choose a base branch
from
Open

Task #224690 fix: Added expection handling dialogue for apis failed #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/components/Assesment/Assesment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ const Assesment = ({ discoverStart }) => {
localStorage.setItem("sessionId", contentSessionId);
if (discoverStart && username && !localStorage.getItem("virtualId")) {
(async () => {
try {
setLocalData("profileName", username);
const usernameDetails = await axios.post(
`${process.env.REACT_APP_VIRTUAL_ID_HOST}/${config.URLS.GET_VIRTUAL_ID}?username=${username}`
Expand Down Expand Up @@ -536,11 +537,21 @@ const Assesment = ({ discoverStart }) => {
setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);

dispatch(setVirtualId(usernameDetails?.data?.result?.virtualID));
}
catch (error) {
setOpenMessageDialog({
message:
"An error occurred. Please try again later.",
isError: true,
dontShowHeader: true
});
}
})();
} else {
(async () => {
const virtualId = getLocalData("virtualId");
const language = lang;
try {
const getMilestoneDetails = await axios.get(
`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/${config.URLS.GET_MILESTONE}/${virtualId}?language=${language}`
);
Expand All @@ -559,12 +570,32 @@ const Assesment = ({ discoverStart }) => {
sessionId = uniqueId();
localStorage.setItem("sessionId", sessionId)
}
}
catch(err){
setOpenMessageDialog({
message:
"An error occurred. Please try again later.",
isError: true,
dontShowHeader:true
});
}


if (virtualId) {
try{
let sessionId = getLocalData("sessionId");
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);
}catch(err){
setOpenMessageDialog({
message:
"Error getting pointer details",
isError: true,
dontShowHeader:true
});
}
}
})();
}
Expand Down Expand Up @@ -618,6 +649,9 @@ const Assesment = ({ discoverStart }) => {
message={openMessageDialog.message}
closeDialog={() => {
setOpenMessageDialog("");
if (openMessageDialog.isError) {
window.location.reload();
}
}}
isError={openMessageDialog.isError}
dontShowHeader={openMessageDialog.dontShowHeader}
Expand Down
12 changes: 11 additions & 1 deletion src/components/AssesmentEnd/AssesmentEnd.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ const AssesmentEnd = () => {
const [level, setLevel] = useState("");
const [previousLevel, setPreviousLevel] = useState("");
const [points, setPoints] = useState(0);
const [openMessageDialog, setOpenMessageDialog] = useState("");

useEffect(() => {
(async () => {
let audio = new Audio(LevelCompleteAudio);
audio.play();
try {
const virtualId = getLocalData("virtualId");
const lang = getLocalData("lang");
const previous_level = getLocalData("previous_level");
Expand All @@ -39,7 +41,7 @@ const AssesmentEnd = () => {
const { data } = getMilestoneDetails;
setLevel(data.data.milestone_level);
setLocalData("userLevel", data.data.milestone_level?.replace("m", ""));
const sessionId = getLocalData("sessionId");
let sessionId = getLocalData("sessionId");
if (!sessionId){
sessionId = uniqueId();
localStorage.setItem("sessionId", sessionId)
Expand All @@ -48,6 +50,14 @@ const AssesmentEnd = () => {
`${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.GET_POINTER}/${virtualId}/${sessionId}?language=${lang}`
);
setPoints(getPointersDetails?.data?.result?.totalLanguagePoints || 0);
}catch (error) {
setOpenMessageDialog({
message:
"Error fetching data",
isError: true,
dontShowHeader:true
});
}
})();
setTimeout(() => {
setShake(false);
Expand Down
26 changes: 26 additions & 0 deletions src/components/DiscoverEnd/DiscoverEnd.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
setLocalData,
} from "../../utils/constants";
import config from '../../utils/urlConstants.json';
import { MessageDialog } from "../Assesment/Assesment";

const sectionStyle = {
backgroundImage: `url(${textureImage})`,
Expand All @@ -32,6 +33,7 @@ const sectionStyle = {
const SpeakSentenceComponent = () => {
const [shake, setShake] = useState(true);
const [level, setLevel] = useState("");
const [openMessageDialog, setOpenMessageDialog] = useState("");

useEffect(() => {

Expand All @@ -40,12 +42,21 @@ const SpeakSentenceComponent = () => {
audio.play();
const virtualId = getLocalData("virtualId");
const lang = getLocalData("lang");
try {
const getMilestoneDetails = await axios.get(
`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/${config.URLS.GET_MILESTONE}/${virtualId}?language=${lang}`
);
const { data } = getMilestoneDetails;
setLevel(data.data.milestone_level);
setLocalData("userLevel", data.data.milestone_level?.replace("m", ""));
}catch (error) {
setOpenMessageDialog({
message:
"An error occurred. Please try again later.",
isError: true,
dontShowHeader: true
});
}
})();
setTimeout(() => {
setShake(false);
Expand All @@ -68,6 +79,20 @@ const SpeakSentenceComponent = () => {
const navigate = useNavigate();

return (
<>
{!!openMessageDialog && (
<MessageDialog
message={openMessageDialog.message}
closeDialog={() => {
setOpenMessageDialog("");
if (openMessageDialog.isError) {
window.location.reload();
}
}}
isError={openMessageDialog.isError}
dontShowHeader={openMessageDialog.dontShowHeader}
/>
)}
<Box
sx={{
background: "linear-gradient(45deg, #5FDF9A 30%, #35C57C 90%)",
Expand Down Expand Up @@ -146,6 +171,7 @@ const SpeakSentenceComponent = () => {
</CardContent>
</Card>
</Box>
</>
);
};

Expand Down
45 changes: 35 additions & 10 deletions src/components/DiscoverSentance/DiscoverSentance.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,22 @@ const SpeakSentenceComponent = () => {
useEffect(() => {
if (!(localStorage.getItem("contentSessionId") !== null)) {
(async () => {
try {
const sessionId = getLocalData("sessionId");
const virtualId = getLocalData("virtualId");
const lang = getLocalData("lang");
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);
} catch (error) {
setOpenMessageDialog({
message:
"Error retrieving local data",
isError: true,
dontShowHeader:true
});
}
})();
}
}, []);
Expand Down Expand Up @@ -244,20 +253,19 @@ const SpeakSentenceComponent = () => {
}
}
} catch (error) {
console.log(error);
setOpenMessageDialog({
message:
"An error occurred. Please try again later.",
isError: true,
dontShowHeader:true
});
}
};

useEffect(() => {
(async () => {
let quesArr = [];
try {
// const resSentence = await axios.get(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/scores/GetContent/sentence/${UserID}`);
// quesArr = [...quesArr, ...(resSentence?.data?.content?.splice(0, 5) || [])];
// const resWord = await axios.get(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/scores/GetContent/word/${UserID}`);
// quesArr = [...quesArr, ...(resWord?.data?.content?.splice(0, 5) || [])];
// const resPara = await axios.get(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/scores/GetContent/paragraph/${UserID}`);
// quesArr = [...quesArr, ...(resPara?.data?.content || [])];
const lang = getLocalData("lang");
const resAssessment = await axios.post(
`${process.env.REACT_APP_CONTENT_SERVICE_APP_HOST}/${config.URLS.GET_ASSESSMENT}`,
Expand All @@ -269,6 +277,16 @@ const SpeakSentenceComponent = () => {
const sentences = resAssessment?.data?.data?.find(
(elem) => elem.category === "Sentence"
);

if (!sentences) {
setOpenMessageDialog({
message:
"No sentences found in assessment data",
isError: true,
dontShowHeader:true
});
return;
}

const resPagination = await axios.get(
`${process.env.REACT_APP_CONTENT_SERVICE_APP_HOST}/${config.URLS.GET_PAGINATION}?page=1&limit=5&collectionId=${sentences?.collectionId}`
Expand All @@ -279,12 +297,16 @@ const SpeakSentenceComponent = () => {
setAssessmentResponse(resAssessment);
localStorage.setItem("storyTitle", sentences?.name);
quesArr = [...quesArr, ...(resPagination?.data?.data || [])];
// quesArr[1].contentType = 'image';
// quesArr[0].contentType = 'phonics';
console.log("quesArr", quesArr);
setQuestions(quesArr);
} catch (error) {
console.log("err", error);
setOpenMessageDialog({
message:
"Error fetching assessment",
isError: true,
dontShowHeader:true
});
return;
}
})();
}, []);
Expand All @@ -305,6 +327,9 @@ const SpeakSentenceComponent = () => {
closeDialog={() => {
setOpenMessageDialog("");
setDisableScreen(false);
if (openMessageDialog.isError) {
window.location.reload();
}
}}
isError={openMessageDialog.isError}
dontShowHeader={openMessageDialog.dontShowHeader}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const routData = [
];

// add login route for test rig
if (process.env.REACT_APP_IS_APP_TEST_RIG === 'true') {
if (process.env.REACT_APP_IS_IN_APP_AUTHORISATION === 'true') {
routData.push(
{
id: "route-001",
Expand Down
7 changes: 6 additions & 1 deletion src/utils/VoiceAnalyser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,12 @@ function VoiceAnalyser(props) {
}
} catch (error) {
setLoader(false);
setOpenMessageDialog({
message:
"Error fetching update learner profile details:",
isError: true,
dontShowHeader:true
});
if(props.handleNext){
props.handleNext();
}
Expand All @@ -421,7 +427,6 @@ function VoiceAnalyser(props) {
}
setRecordedAudioBase64("");
setApiResponse("error");
console.log("err", error);
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/utils/constants.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 25 additions & 3 deletions src/views/LoginPage/LoginPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import { useNavigate } from 'react-router-dom';
import { Container, Typography, TextField, Button, Grid } from '@mui/material';
import config from "../../utils/urlConstants.json";
import './LoginPage.css'; // Import the CSS file
import { MessageDialog } from '../../components/Assesment/Assesment';

const LoginPage = () => {
const navigate = useNavigate();
const [username, setUsername] = useState('');
const [password, setPassword] = useState('');
const [openMessageDialog, setOpenMessageDialog] = useState("");

const handleSubmit = async (e) => {
e.preventDefault();
Expand All @@ -20,7 +22,7 @@ const LoginPage = () => {

try {
const usernameDetails = await axios.post(
`${process.env.REACT_APP_VIRTUAL_ID_HOST}/${config.URLS.GET_VIRTUAL_ID}?username=${username}`
`${process.env.REACT_APP_VIRTUAL_ID_HOST}/${config. URLS.GET_VIRTUAL_ID}?username=${username}`
);

if (usernameDetails?.data?.result?.virtualID) {
Expand All @@ -31,12 +33,31 @@ const LoginPage = () => {
alert("Enter correct username and password");
}
} catch (error) {
console.error("Error occurred:", error);
alert("An error occurred. Please try again later.");
setOpenMessageDialog({
message:
"An error occurred. Please try again later.",
isError: true,
dontShowHeader:true
});
}
};

return (
<>
{!!openMessageDialog && (
<MessageDialog
message={openMessageDialog.message}
closeDialog={() => {
setOpenMessageDialog("");
if (openMessageDialog.isError) {
window.location.reload();
}
}}
isError={openMessageDialog.isError}
dontShowHeader={openMessageDialog.dontShowHeader}
/>
)}

<Container className="container">
<div className="loginBox">
<Typography variant="h4" align="center" gutterBottom>
Expand Down Expand Up @@ -74,6 +95,7 @@ const LoginPage = () => {
</form>
</div>
</Container>
</>
);
};

Expand Down
Loading