survery-lib 2.1.43 → 2.1.44

package/fesm2022/survery-lib.mjs

@@ -142,25 +142,43 @@ const questionAnswers = createSelector(selectSurveyData, (state) => selectAll$1(
         return {
             SurveyPageIndex: x.surveyPageId,
             QuestionId: x.questionId,
+            QuestionName: x.questionAllInfo.questionTitle,
             QuestionType: x.questionType,
             AnswerId: x.answerLevelId,
             AnswerText: x.answerText,
             AnswerIdArr: x.answerIdArr,
-            AnswerLevelId: x.answerId
+            AnswerLevelId: x.answerId,
+            PassedRuleQuestionId: x.passedRuleQuestionId
         };
     }
     else {
         return {
             SurveyPageIndex: x.surveyPageId,
             QuestionId: x.questionId,
+            QuestionName: x.questionAllInfo.questionTitle,
             QuestionType: x.questionType,
             AnswerId: x.answerId,
             AnswerText: x.answerText,
             AnswerIdArr: x.answerIdArr,
-            AnswerLevelId: x.answerLevelId
+            AnswerLevelId: x.answerLevelId,
+            PassedRuleQuestionId: x.passedRuleQuestionId
         };
     }
-}));
+})
+// .filter(res => {
+//     if (res.PassedRuleQuestionId !== null && res.PassedRuleQuestionId !== undefined) {
+//         var passedRuleQuestion = selectAll(state.questionArr).find(x => x.questionId == res.PassedRuleQuestionId);
+//         if (passedRuleQuestion) {
+//             const hasAnswerId = res.AnswerId !== null && res.AnswerId !== undefined;
+//             const hasAnswerText = res.AnswerText !== null && res.AnswerText !== undefined && res.AnswerText !== '';
+//             const hasAnswerIdArr = Array.isArray(res.AnswerIdArr) && res.AnswerIdArr?.length > 0;
+//              return hasAnswerId || hasAnswerText || hasAnswerIdArr;
+//         }
+//     }
+//     // Keep the item if at least one of them has a valid value
+//     return true;
+// })
+);
 const questionSelectors = {
     allQuestions,
     pageQuestions,
@@ -2528,9 +2546,9 @@ const _surveyReducer = createReducer(initialSurveyState, on(surveyActions.loadSu
         }, state.questionArr)
     };
 }), on(surveyActions.updateQuestionsShow, (state, props) => {
-    const updates = props.questionIds.map(id => ({
-        id,
-        changes: { isShow: props.isShow }
+    const updates = props.questions.map(q => ({
+        id: q.id,
+        changes: { isShow: props.isShow, passedRuleQuestionId: q.passedRuleQuestionId }
     }));
     return {
         ...state,
@@ -2548,9 +2566,9 @@ const _surveyReducer = createReducer(initialSurveyState, on(surveyActions.loadSu
         }, state.questionArr)
     };
 }), on(surveyActions.updateQuestionsDisable, (state, props) => {
-    const updates = props.questionIds.map(id => ({
-        id,
-        changes: { isDisabled: props.isDisabled }
+    const updates = props.questions.map(q => ({
+        id: q.id,
+        changes: { isDisabled: props.isDisabled, passedRuleQuestionId: q.passedRuleQuestionId }
     }));
     return {
         ...state,
@@ -2627,18 +2645,22 @@ class SurveyEffects {
                 }).subscribe(result => {
                     var isPassed = result.exprestionResultArr.filter(x => x == false).length == 0;
                     if (isPassed) {
+                        var passedRuleQuestionId = null;
+                        if (rule.ruleExps?.length > 0) {
+                            passedRuleQuestionId = rule.ruleExps[0]?.questionId;
+                        }
                         rule.ruleResultQuestions.forEach(resultQuestion => {
                             if (rule.logicActionId == LogicActionEnum.Show) {
-                                toggleShowedQuestionIds.push({ questionId: resultQuestion.questionId, isShow: true });
+                                toggleShowedQuestionIds.push({ questionId: resultQuestion.questionId, isShow: true, passedRuleQuestionId });
                             }
                             else if (rule.logicActionId == LogicActionEnum.Hide) {
-                                toggleShowedQuestionIds.push({ questionId: resultQuestion.questionId, isShow: false });
+                                toggleShowedQuestionIds.push({ questionId: resultQuestion.questionId, isShow: false, passedRuleQuestionId });
                             }
                             else if (rule.logicActionId == LogicActionEnum.Enable) {
-                                toggleDisabledQuestionIds.push({ questionId: resultQuestion.questionId, isDisabled: false });
+                                toggleDisabledQuestionIds.push({ questionId: resultQuestion.questionId, isDisabled: false, passedRuleQuestionId });
                             }
                             else if (rule.logicActionId == LogicActionEnum.Disable) {
-                                toggleDisabledQuestionIds.push({ questionId: resultQuestion.questionId, isDisabled: true });
+                                toggleDisabledQuestionIds.push({ questionId: resultQuestion.questionId, isDisabled: true, passedRuleQuestionId });
                             }
                             else if (rule.logicActionId == LogicActionEnum.SetAnswer) {
                             }
@@ -2649,16 +2671,16 @@ class SurveyEffects {
                                     var subQuestions = questionArr.filter(x => x.parentQuestionId == question.questionId);
                                     subQuestions.forEach(subQuestion => {
                                         if (rule.logicActionId == LogicActionEnum.Show) {
-                                            toggleShowedQuestionIds.push({ questionId: subQuestion.questionId, isShow: true });
+                                            toggleShowedQuestionIds.push({ questionId: subQuestion.questionId, isShow: true, passedRuleQuestionId });
                                         }
                                         else if (rule.logicActionId == LogicActionEnum.Hide) {
-                                            toggleShowedQuestionIds.push({ questionId: subQuestion.questionId, isShow: false });
+                                            toggleShowedQuestionIds.push({ questionId: subQuestion.questionId, isShow: false, passedRuleQuestionId });
                                         }
                                         else if (rule.logicActionId == LogicActionEnum.Enable) {
-                                            toggleDisabledQuestionIds.push({ questionId: subQuestion.questionId, isDisabled: false });
+                                            toggleDisabledQuestionIds.push({ questionId: subQuestion.questionId, isDisabled: false, passedRuleQuestionId });
                                         }
                                         else if (rule.logicActionId == LogicActionEnum.Disable) {
-                                            toggleDisabledQuestionIds.push({ questionId: subQuestion.questionId, isDisabled: true });
+                                            toggleDisabledQuestionIds.push({ questionId: subQuestion.questionId, isDisabled: true, passedRuleQuestionId });
                                         }
                                     });
                                 }
@@ -2670,19 +2692,19 @@ class SurveyEffects {
                             const question = questionArr.find(x => x.questionId == resultQuestion.questionId);
                             if (question) {
                                 if (question.isShow != question.isShow_default) {
-                                    toggleShowedQuestionIds.push({ questionId: resultQuestion.questionId, isShow: question.isShow_default });
+                                    toggleShowedQuestionIds.push({ questionId: resultQuestion.questionId, isShow: question.isShow_default, passedRuleQuestionId: null });
                                 }
                                 if (question.isDisabled != question.isDisabled_default) {
-                                    toggleDisabledQuestionIds.push({ questionId: resultQuestion.questionId, isDisabled: question.isDisabled_default });
+                                    toggleDisabledQuestionIds.push({ questionId: resultQuestion.questionId, isDisabled: question.isDisabled_default, passedRuleQuestionId: null });
                                 }
                                 if (question.questionType == QuestionTypeEnum.Matrix && question.isQuestionGroup == true) {
                                     var subQuestions = questionArr.filter(x => x.parentQuestionId == question.questionId);
                                     subQuestions.forEach(subQuestion => {
                                         if (subQuestion.isShow != subQuestion.isShow_default) {
-                                            toggleShowedQuestionIds.push({ questionId: subQuestion.questionId, isShow: subQuestion.isShow_default });
+                                            toggleShowedQuestionIds.push({ questionId: subQuestion.questionId, isShow: subQuestion.isShow_default, passedRuleQuestionId: null });
                                         }
                                         if (subQuestion.isDisabled != subQuestion.isDisabled_default) {
-                                            toggleDisabledQuestionIds.push({ questionId: subQuestion.questionId, isDisabled: question.isDisabled_default });
+                                            toggleDisabledQuestionIds.push({ questionId: subQuestion.questionId, isDisabled: question.isDisabled_default, passedRuleQuestionId: null });
                                         }
                                     });
                                 }
@@ -2691,31 +2713,51 @@ class SurveyEffects {
                     }
                 });
             });
-            const hiddenQuestionIds = toggleShowedQuestionIds.filter(x => x.isShow == false).map(x => x.questionId);
-            if (hiddenQuestionIds.length > 0) {
+            const hiddenQuestions = toggleShowedQuestionIds.filter(x => x.isShow == false);
+            if (hiddenQuestions.length > 0) {
                 this._store.dispatch(surveyActions.updateQuestionsShow({
-                    questionIds: hiddenQuestionIds,
+                    questions: hiddenQuestions.map(x => {
+                        return {
+                            id: x.questionId,
+                            passedRuleQuestionId: x.passedRuleQuestionId
+                        };
+                    }),
                     isShow: false
                 }));
             }
-            const showedQuestionIds = toggleShowedQuestionIds.filter(x => x.isShow == true).map(x => x.questionId);
-            if (showedQuestionIds.length > 0) {
+            const showedQuestions = toggleShowedQuestionIds.filter(x => x.isShow == true);
+            if (showedQuestions.length > 0) {
                 this._store.dispatch(surveyActions.updateQuestionsShow({
-                    questionIds: showedQuestionIds,
+                    questions: showedQuestions.map(x => {
+                        return {
+                            id: x.questionId,
+                            passedRuleQuestionId: x.passedRuleQuestionId
+                        };
+                    }),
                     isShow: true
                 }));
             }
-            const disabledQuestionIds = toggleDisabledQuestionIds.filter(x => x.isDisabled == true).map(x => x.questionId);
-            if (disabledQuestionIds.length > 0) {
+            const disabledQuestions = toggleDisabledQuestionIds.filter(x => x.isDisabled == true);
+            if (disabledQuestions.length > 0) {
                 this._store.dispatch(surveyActions.updateQuestionsDisable({
-                    questionIds: disabledQuestionIds,
+                    questions: disabledQuestions.map(x => {
+                        return {
+                            id: x.questionId,
+                            passedRuleQuestionId: x.passedRuleQuestionId
+                        };
+                    }),
                     isDisabled: true
                 }));
             }
-            const enabledQuestionIds = toggleDisabledQuestionIds.filter(x => x.isDisabled == false).map(x => x.questionId);
-            if (enabledQuestionIds.length > 0) {
+            const enabledQuestions = toggleDisabledQuestionIds.filter(x => x.isDisabled == false);
+            if (enabledQuestions.length > 0) {
                 this._store.dispatch(surveyActions.updateQuestionsDisable({
-                    questionIds: enabledQuestionIds,
+                    questions: enabledQuestions.map(x => {
+                        return {
+                            id: x.questionId,
+                            passedRuleQuestionId: x.passedRuleQuestionId
+                        };
+                    }),
                     isDisabled: false
                 }));
             }