questionlayoutrefactoring 0.0.77 → 0.0.78
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -19,9 +19,8 @@ const answerLayoutContainerStyle = {
|
|
|
19
19
|
marginLeft: { base: "14px", md: "14px", lg: "12px" },
|
|
20
20
|
};
|
|
21
21
|
const QuestionsLayout = (props = {}) => {
|
|
22
|
-
const { questionObject, userAnswer, onAnswerChanged, isDontAllow, allowToCopy, taskType, isAnswerSubmitted, displayedQues, isComprehension, isOpen, isUser, questionLayoutStyles, commonProps, passphrase, isStudent, learningStepData, isReviewScreen
|
|
22
|
+
const { questionObject, userAnswer, onAnswerChanged, isDontAllow, allowToCopy, taskType, isAnswerSubmitted, displayedQues, isComprehension, isOpen, isUser, questionLayoutStyles, commonProps, passphrase, isStudent, learningStepData, isReviewScreen } = props;
|
|
23
23
|
const showToast = (0, useCustomToast_1.useCustomToast)();
|
|
24
|
-
const styles = props?.commonProps?.questionLayoutStyle;
|
|
25
24
|
const [currentQuestion, setCurrentQuestion] = (0, react_2.useState)({});
|
|
26
25
|
const [layoutType, setLayoutType] = (0, react_2.useState)(null);
|
|
27
26
|
const hasNoOptions = () => {
|
|
@@ -30,31 +29,12 @@ const QuestionsLayout = (props = {}) => {
|
|
|
30
29
|
(0, react_2.useEffect)(() => {
|
|
31
30
|
let quesObj = questionObject;
|
|
32
31
|
const questionObjCopy = { ...quesObj };
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
: quesObj?.answers_layout
|
|
40
|
-
? quesObj.answers_layout.map((item) => (0, common_utils_1.handleRemoveExtraSpaceInBubbles)(item))
|
|
41
|
-
: [];
|
|
42
|
-
quesObj.options_layout = optionLayouts;
|
|
43
|
-
quesObj.answers_layout = answerLayouts;
|
|
44
|
-
setCurrentQuestion({
|
|
45
|
-
...quesObj,
|
|
46
|
-
history: props?.history,
|
|
47
|
-
tutor_mode: tutor_mode,
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
let optionLayouts = questionObjCopy?.options_layout?.map((item) => {
|
|
52
|
-
return (0, common_utils_1.handleRemoveExtraSpaceInBubbles)(item);
|
|
53
|
-
});
|
|
54
|
-
quesObj.modified_options_layout = optionLayouts;
|
|
55
|
-
setCurrentQuestion(quesObj);
|
|
56
|
-
}
|
|
57
|
-
}, [isReviewScreen, props.questionObject, props?.history]);
|
|
32
|
+
let optionLayouts = questionObjCopy?.options_layout?.map((item) => {
|
|
33
|
+
return (0, common_utils_1.handleRemoveExtraSpaceInBubbles)(item);
|
|
34
|
+
});
|
|
35
|
+
quesObj.modified_options_layout = optionLayouts;
|
|
36
|
+
setCurrentQuestion(quesObj);
|
|
37
|
+
}, []);
|
|
58
38
|
const resolvedAnswers = () => {
|
|
59
39
|
return (0, common_utils_1.isNotEmptyOrNull)(currentQuestion?.answers_index_hashed_keys)
|
|
60
40
|
? currentQuestion?.answers_index_hashed_keys
|
|
@@ -62,6 +42,7 @@ const QuestionsLayout = (props = {}) => {
|
|
|
62
42
|
? currentQuestion?.answers_key
|
|
63
43
|
: currentQuestion?.answers_layout;
|
|
64
44
|
};
|
|
45
|
+
console.log("curr ques:", currentQuestion);
|
|
65
46
|
const optionContainerClass = (0, react_2.useMemo)(() => {
|
|
66
47
|
const baseClass = currentQuestion?.question_type !== LearningPathUtils_1.questionTypes.fib
|
|
67
48
|
? Question_styles_1.styles?.optionsContainer || "optionsContainer"
|
|
@@ -73,19 +54,16 @@ const QuestionsLayout = (props = {}) => {
|
|
|
73
54
|
return `${baseClass} ${compClass || ""}`;
|
|
74
55
|
}, [currentQuestion, isComprehension]);
|
|
75
56
|
const onSend = (0, react_2.useCallback)((item) => {
|
|
76
|
-
if (
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
onAnswerChanged(item?.answer, currentQuestion, item?.hashedIndexAnswer, item?.selectedIndex, isComprehension, "");
|
|
82
|
-
}
|
|
57
|
+
if (isComprehension) {
|
|
58
|
+
props?.setSelectedAnswer(item?.answer, item?.hashedIndexAnswer, item?.selectedIndex);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
onAnswerChanged(item?.answer, currentQuestion, item?.hashedIndexAnswer, item?.selectedIndex, isComprehension, "");
|
|
83
62
|
}
|
|
84
|
-
}, [
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
currentQuestion?.question_type !== LearningPathUtils_1.questionTypes.fib && ((0, jsx_runtime_1.jsx)(react_1.Box, { marginBottom: hasNoOptions ? "0px" : "20px", id: "question-display-container", children: (0, jsx_runtime_1.jsx)(Assistant_1.default, { "data-testid": "question-assistant", moreQuestionsAvailable: isReviewScreen ? moreQuestionsAvailable : ' ', questionIndex: isReviewScreen ? questionIndex : ' ', selectionStatus: isReviewScreen ? selectionStatus : ' ', presenterLogic: isReviewScreen ? presenterLogic : ' ', handleSelectionStatus: isReviewScreen ? handleSelectionStatus : ' ', handleMoreQuestions: isReviewScreen ? handleMoreQuestions : ' ', text: currentQuestion?.question_layout || "", isUser: isReviewScreen ? ' ' : isUser, handleCopy: allowToCopy
|
|
63
|
+
}, [isComprehension, props, onAnswerChanged, currentQuestion]);
|
|
64
|
+
return ((0, jsx_runtime_1.jsx)(react_1.Box, { id: "question-factual-component", children: (0, jsx_runtime_1.jsxs)(react_1.Box, { id: "question-content-container", children: [!props?.isFactual &&
|
|
65
|
+
learningStepData?.dialog_entry_script?.content && ((0, jsx_runtime_1.jsx)(Assistant_1.default, { "data-testid": "dialog-entry-assistant", text: "", assistantImg: commonProps?.icons?.AssistantImg, isCopy: false, isDialogScript: true, scriptData: learningStepData.dialog_entry_script.content })), (0, jsx_runtime_1.jsxs)(react_1.Box, { className: isComprehension ? Question_styles_1.styles?.contentColumn : "", children: [(0, common_utils_1.isNotEmptyOrNull)(currentQuestion?.question_type) &&
|
|
66
|
+
currentQuestion?.question_type !== LearningPathUtils_1.questionTypes.fib && ((0, jsx_runtime_1.jsx)(react_1.Box, { marginBottom: hasNoOptions ? "0px" : "20px", id: "question-display-container", children: (0, jsx_runtime_1.jsx)(Assistant_1.default, { "data-testid": "question-assistant", text: currentQuestion?.question_layout || "", isUser: isUser, handleCopy: allowToCopy
|
|
89
67
|
? () => {
|
|
90
68
|
(0, TutorConstants_1.handleCopyClick)(questionObject?.uuid);
|
|
91
69
|
showToast({
|
|
@@ -93,18 +71,9 @@ const QuestionsLayout = (props = {}) => {
|
|
|
93
71
|
duration: 1000,
|
|
94
72
|
});
|
|
95
73
|
}
|
|
96
|
-
:
|
|
97
|
-
? !props?.isTeacher && isComprehension
|
|
98
|
-
: isComprehension, fromStudent: isReviewScreen ? ' ' : true, assistantImg: commonProps?.icons?.AssistantImg, showDiscussLabel: isReviewScreen ? props?.showDiscussLabel : ' ', discussIcon: isReviewScreen ? props?.discussIcon : ' ', isFromParentApp: isReviewScreen ? isFromParentApp : ' ', isRevision: isReviewScreen ? isRevision : ' ', qindex: isReviewScreen ? qindex : ' ', isRevisionBasedQuestion: isReviewScreen ? isRevisionBasedQuestion : ' ', onCancelMoreQuestions: isReviewScreen ? onCancelMoreQuestions : ' ', isReplaceClicked: isReviewScreen ? isReplaceClicked : ' ', setReplaceClickedState: isReviewScreen ? setReplaceClickedState : ' ' }) })), (0, jsx_runtime_1.jsx)(react_1.Box, { id: "options-container", className: isReviewScreen
|
|
99
|
-
? `${styles[currentQuestion?.question_type !== LearningPathUtils_1.questionTypes.fib
|
|
100
|
-
? "optionsContainer"
|
|
101
|
-
: "optionsContainerForFIB"]} ${isComprehension &&
|
|
102
|
-
styles["comprehensionOptionContainer"]}`
|
|
103
|
-
: optionContainerClass, children: (0, jsx_runtime_1.jsx)(react_1.Box, { sx: !isComprehension &&
|
|
74
|
+
: undefined, assistantStyle: commonProps?.assistantStyle, questionType: currentQuestion?.question_type, isQuestion: true, imagesList: currentQuestion?.images_details, hideVin: isComprehension, isComprehension: isComprehension, fromStudent: true, assistantImg: commonProps?.icons?.AssistantImg }) })), (0, jsx_runtime_1.jsx)(react_1.Box, { id: "options-container", className: optionContainerClass, children: (0, jsx_runtime_1.jsx)(react_1.Box, { sx: !isComprehension &&
|
|
104
75
|
questionLayoutStyles &&
|
|
105
|
-
|
|
106
|
-
? ' '
|
|
107
|
-
: currentQuestion?.modified_options_layout, answers: resolvedAnswers(), question: currentQuestion?.question, option_image_details: currentQuestion?.option_image_details, commonProps: commonProps, isDisabled: false, images_details: currentQuestion?.images_details, onSend: onSend, onAnswerSubmitted: isAnswerSubmitted, isDontAllow: isDontAllow, allowToCopy: allowToCopy, currentQuestion: currentQuestion, taskType: taskType, isComprehension: isComprehension, isStudent: isReviewScreen ? isStudentRole : isStudent, isReviewScreen: isReviewScreen, passphrase: isReviewScreen ? ' ' : passphrase, setLayoutType: setLayoutType, presenterLogic: isReviewScreen ? presenterLogic : ' ' })) }) })] })] }) }));
|
|
76
|
+
answerLayoutContainerStyle, children: (!isComprehension || isOpen) && ((0, jsx_runtime_1.jsx)(AnswerView_1.AnswersLayout, { "data-testid": "answers-layout", displayedQues: displayedQues, userAnswer: userAnswer, question_type: currentQuestion?.question_type, question_id: (0, Helper_1.getQuestionID)(currentQuestion), options: currentQuestion?.options_layout, modifiedOptions: currentQuestion?.modified_options_layout, answers: resolvedAnswers(), question: currentQuestion?.question, option_image_details: currentQuestion?.option_image_details, commonProps: commonProps, isDisabled: false, images_details: currentQuestion?.images_details, onSend: onSend, onAnswerSubmitted: isAnswerSubmitted, isDontAllow: isDontAllow, allowToCopy: allowToCopy, currentQuestion: currentQuestion, taskType: taskType, isComprehension: isComprehension, isStudent: isStudent, isReviewScreen: isReviewScreen, passphrase: passphrase, setLayoutType: setLayoutType })) }) })] })] }) }));
|
|
108
77
|
};
|
|
109
78
|
exports.QuestionsLayout = QuestionsLayout;
|
|
110
79
|
exports.default = exports.QuestionsLayout;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuestionView.js","sourceRoot":"","sources":["../../../../src/components/Molecules/questionLayouts/QuestionView.js"],"names":[],"mappings":";;;;;;;AAAA,4CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"QuestionView.js","sourceRoot":"","sources":["../../../../src/components/Molecules/questionLayouts/QuestionView.js"],"names":[],"mappings":"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"}
|