@instructure/quiz-core 22.16.1 → 22.18.0

package/lib/reporting/components/resources/StudentAnalysis/fetchReport.js

@@ -120,9 +120,9 @@ function _ts_generator(thisArg, body) {
 }
 import { getFailedToFetchReports, getLastReportGenerationFailed } from '../common/errorMessages';
 export var fetchReport = function(param) {
-    var activeQuizId = param.activeQuizId, setFetchInProgress = param.setFetchInProgress, setStudentAnalyses = param.setStudentAnalyses, setStatusPollingInProgress = param.setStatusPollingInProgress, setAnalysisError = param.setAnalysisError, setGenerationInProgress = param.setGenerationInProgress, addError = param.addError, fetchStudentAnalyses = param.fetchStudentAnalyses, setAnalysisFetchError = param.setAnalysisFetchError, getErrorMessageForCode = param.getErrorMessageForCode;
+    var activeQuizId = param.activeQuizId, setFetchInProgress = param.setFetchInProgress, setStudentAnalyses = param.setStudentAnalyses, setStatusPollingInProgress = param.setStatusPollingInProgress, setAnalysisError = param.setAnalysisError, setGenerationInProgress = param.setGenerationInProgress, addError = param.addError, fetchStudentAnalyses = param.fetchStudentAnalyses, setAnalysisFetchError = param.setAnalysisFetchError, getErrorMessageForCode = param.getErrorMessageForCode, allAttemptsEnabled = param.allAttemptsEnabled;
     return _async_to_generator(function() {
-        var studentAnalyses, isAnalysisInProgress, isAnalysisFailed, analysisErrorCode, e;
+        var filter, studentAnalyses, isAnalysisInProgress, isAnalysisFailed, analysisErrorCode, e;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -134,9 +134,10 @@ export var fetchReport = function(param) {
                     ]);
                     setAnalysisFetchError(false);
                     setFetchInProgress(true);
+                    filter = allAttemptsEnabled ? 'all_attempts' : 'last_attempt';
                     return [
                         4,
-                        fetchStudentAnalyses(activeQuizId)
+                        fetchStudentAnalyses(activeQuizId, filter)
                     ];
                 case 1:
                     studentAnalyses = _state.sent();

package/lib/reporting/components/resources/StudentAnalysis/fetchReportStatus.js

@@ -119,11 +119,11 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { getFailedToFetchReports } from '../common/errorMessages';
-import { STUDENT_ANALYSES } from '@instructure/quiz-common';
+import { STUDENT_ANALYSES } from '@instructure/quiz-common/constants';
 export var fetchReportStatus = function(param) {
-    var activeQuizId = param.activeQuizId, addError = param.addError, fetchAnalysesStatus = param.fetchAnalysesStatus, instrumentedFetchReports = param.instrumentedFetchReports, setStatusPollingInProgress = param.setStatusPollingInProgress, setGenerationInProgress = param.setGenerationInProgress;
+    var activeQuizId = param.activeQuizId, addError = param.addError, fetchAnalysesStatus = param.fetchAnalysesStatus, instrumentedFetchReports = param.instrumentedFetchReports, setStatusPollingInProgress = param.setStatusPollingInProgress, setGenerationInProgress = param.setGenerationInProgress, allAttemptsEnabled = param.allAttemptsEnabled;
     return _async_to_generator(function() {
-        var status, isReportGenerationReady, e;
+        var filter, status, isReportGenerationReady, e;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -133,9 +133,10 @@ export var fetchReportStatus = function(param) {
                         ,
                         3
                     ]);
+                    filter = allAttemptsEnabled ? 'all_attempts' : 'last_attempt';
                     return [
                         4,
-                        fetchAnalysesStatus(activeQuizId, 'last_attempt', STUDENT_ANALYSES)
+                        fetchAnalysesStatus(activeQuizId, filter, STUDENT_ANALYSES)
                     ];
                 case 1:
                     status = _state.sent();

package/lib/reporting/components/resources/StudentAnalysis/withStudentAnalysisReportState.js

@@ -1,5 +1,5 @@
 import { connect } from '../../../../common/react-redux';
-import { featureOn } from '../../../../common/util/featureCheck';
+import { Set } from 'immutable';
 import { withStudentAnalysisReportStatePresenter } from './withStudentAnalysisReportStatePresenter';
 import { bindActionCreators, compose } from 'redux';
 import { getStudentAnalyses, getStudentAnalysisFetchInProgress, getStudentAnalysisGenerationInProgress, getStudentAnalysisError, getStudentAnalysisStatusPollingInProgress } from '../../../../common/selectors/analyses';
@@ -11,6 +11,9 @@ import { getActiveQuizId } from '../../../../common/selectors/quizzes';
 import { getAnalysesExport } from '../../../api/getAnalysesExport';
 var DEFAULT_POLLING_INTERVAL = 3000;
 function mapStateToProps(state, ownProps) {
+    var _state_features;
+    var features = (_state_features = state.features) !== null && _state_features !== void 0 ? _state_features : Set();
+    var _ownProps_allAttemptsEnabled;
     return {
         studentAnalyses: getStudentAnalyses(state),
         fetchInProgress: getStudentAnalysisFetchInProgress(state),
@@ -22,8 +25,8 @@ function mapStateToProps(state, ownProps) {
         fetchStudentAnalyses: fetchStudentAnalyses,
         fetchAnalysesStatus: fetchAnalysesStatus,
         pollingInterval: ownProps.pollingInterval || DEFAULT_POLLING_INTERVAL,
-        exportEnabled: featureOn('student_analysis_csv'),
-        allAttemptsEnabled: featureOn('student_analysis_multiple_attempts')
+        exportEnabled: features.includes('student_analysis_csv'),
+        allAttemptsEnabled: (_ownProps_allAttemptsEnabled = ownProps.allAttemptsEnabled) !== null && _ownProps_allAttemptsEnabled !== void 0 ? _ownProps_allAttemptsEnabled : features.includes('student_analysis_multiple_attempts')
     };
 }
 export function mapDispatchToProps(dispatch, ownProps) {

package/lib/reporting/components/resources/StudentAnalysis/withStudentAnalysisReportStatePresenter.js

@@ -227,12 +227,11 @@ import { getErrorMessageForCode } from '../common/errorCodes';
 import { saveFile } from '../common/utils';
 import { fetchReport } from './fetchReport';
 import { fetchReportStatus } from './fetchReportStatus';
-import { STUDENT_ANALYSES } from '@instructure/quiz-common';
+import { STUDENT_ANALYSES } from '@instructure/quiz-common/constants';
 import { studentAnalysesPropType } from '../common/propTypes';
-import { featureOn } from '../../../../common/util/featureCheck';
 export var withStudentAnalysisReportStatePresenter = function(OriginalComponent) {
-    var StudentAnalysisReportStatePresenter = function(_param) {
-        var studentAnalyses = _param.studentAnalyses, fetchInProgress = _param.fetchInProgress, generationInProgress = _param.generationInProgress, analysisError = _param.analysisError, setStudentAnalyses = _param.setStudentAnalyses, addError = _param.addError, setFetchInProgress = _param.setFetchInProgress, setGenerationInProgress = _param.setGenerationInProgress, setAnalysisError = _param.setAnalysisError, activeQuizId = _param.activeQuizId, generateAnalysis = _param.generateAnalysis, fetchStudentAnalyses = _param.fetchStudentAnalyses, getAnalysesExport = _param.getAnalysesExport, fetchAnalysesStatus = _param.fetchAnalysesStatus, statusPollingInProgress = _param.statusPollingInProgress, setStatusPollingInProgress = _param.setStatusPollingInProgress, pollingInterval = _param.pollingInterval, disableReportsCache = _param.disableReportsCache, passThroughProps = _object_without_properties(_param, [
+    function StudentAnalysisReportStatePresenter(_param) {
+        var studentAnalyses = _param.studentAnalyses, fetchInProgress = _param.fetchInProgress, generationInProgress = _param.generationInProgress, analysisError = _param.analysisError, setStudentAnalyses = _param.setStudentAnalyses, addError = _param.addError, setFetchInProgress = _param.setFetchInProgress, setGenerationInProgress = _param.setGenerationInProgress, setAnalysisError = _param.setAnalysisError, activeQuizId = _param.activeQuizId, generateAnalysis = _param.generateAnalysis, fetchStudentAnalyses = _param.fetchStudentAnalyses, getAnalysesExport = _param.getAnalysesExport, fetchAnalysesStatus = _param.fetchAnalysesStatus, statusPollingInProgress = _param.statusPollingInProgress, setStatusPollingInProgress = _param.setStatusPollingInProgress, pollingInterval = _param.pollingInterval, disableReportsCache = _param.disableReportsCache, allAttemptsEnabled = _param.allAttemptsEnabled, passThroughProps = _object_without_properties(_param, [
             "studentAnalyses",
             "fetchInProgress",
             "generationInProgress",
@@ -250,7 +249,8 @@ export var withStudentAnalysisReportStatePresenter = function(OriginalComponent)
             "statusPollingInProgress",
             "setStatusPollingInProgress",
             "pollingInterval",
-            "disableReportsCache"
+            "disableReportsCache",
+            "allAttemptsEnabled"
         ]);
         StudentAnalysisReportStatePresenter.displayName = "StudentAnalysisReportStatePresenter(".concat(OriginalComponent.displayName || OriginalComponent.name, ")");
         var _useState = _sliced_to_array(useState(false), 2), analysisFetchError = _useState[0], setAnalysisFetchError = _useState[1];
@@ -265,7 +265,8 @@ export var withStudentAnalysisReportStatePresenter = function(OriginalComponent)
                 setFetchInProgress: setFetchInProgress,
                 setStudentAnalyses: setStudentAnalyses,
                 getErrorMessageForCode: getErrorMessageForCode,
-                setAnalysisFetchError: setAnalysisFetchError
+                setAnalysisFetchError: setAnalysisFetchError,
+                allAttemptsEnabled: allAttemptsEnabled
             });
         };
         var instrumentedStatusFetching = function() {
@@ -275,21 +276,19 @@ export var withStudentAnalysisReportStatePresenter = function(OriginalComponent)
                 setGenerationInProgress: setGenerationInProgress,
                 setStatusPollingInProgress: setStatusPollingInProgress,
                 fetchAnalysesStatus: fetchAnalysesStatus,
-                instrumentedFetchReports: instrumentedFetchReports
+                instrumentedFetchReports: instrumentedFetchReports,
+                allAttemptsEnabled: allAttemptsEnabled
             });
         };
         function generateReport() {
             var filter = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 'last_attempt', analysisType = arguments.length > 1 ? arguments[1] : void 0;
             return _async_to_generator(function() {
-                var isMultiAttemptEnabled, isStudentAnalysis, selectedFilter, generationConfig;
+                var generationConfig;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            isMultiAttemptEnabled = featureOn('student_analysis_multiple_attempts');
-                            isStudentAnalysis = analysisType === STUDENT_ANALYSES;
-                            selectedFilter = isMultiAttemptEnabled && isStudentAnalysis ? 'all_attempts' : filter;
                             generationConfig = {
-                                filter: selectedFilter,
+                                filter: filter,
                                 analysisType: analysisType,
                                 setGenerationInProgress: setGenerationInProgress,
                                 setStatusPollingInProgress: setStatusPollingInProgress,
@@ -311,23 +310,21 @@ export var withStudentAnalysisReportStatePresenter = function(OriginalComponent)
         }
         function exportReport(_0) {
             return _async_to_generator(function(format) {
-                var filter, analysisType, isMultiAttemptEnabled, isStudentAnalysis, selectedFilter, exportConfig;
+                var filter, analysisType, isAnonymous, exportConfig;
                 var _arguments = arguments;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            filter = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : 'last_attempt', analysisType = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : STUDENT_ANALYSES;
-                            isMultiAttemptEnabled = featureOn('student_analysis_multiple_attempts');
-                            isStudentAnalysis = analysisType === STUDENT_ANALYSES;
-                            selectedFilter = isMultiAttemptEnabled && isStudentAnalysis ? 'all_attempts' : filter;
+                            filter = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : 'last_attempt', analysisType = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : STUDENT_ANALYSES, isAnonymous = _arguments.length > 3 && _arguments[3] !== void 0 ? _arguments[3] : false;
                             exportConfig = {
                                 getAnalysesExport: getAnalysesExport,
                                 format: format,
-                                filter: selectedFilter,
+                                filter: filter,
                                 activeQuizId: activeQuizId,
                                 addError: addError,
                                 saveFile: saveFile,
-                                analysisType: analysisType
+                                analysisType: analysisType,
+                                isAnonymous: isAnonymous
                             };
                             return [
                                 4,
@@ -401,9 +398,10 @@ export var withStudentAnalysisReportStatePresenter = function(OriginalComponent)
             analysisError: analysisError,
             exportReport: exportReport,
             generateReport: generateReport,
-            analysisFetchError: analysisFetchError
+            analysisFetchError: analysisFetchError,
+            allAttemptsEnabled: allAttemptsEnabled
         }, passThroughProps));
-    };
+    }
     StudentAnalysisReportStatePresenter.propTypes = {
         studentAnalyses: studentAnalysesPropType,
         fetchInProgress: PropTypes.bool.isRequired,
@@ -422,7 +420,8 @@ export var withStudentAnalysisReportStatePresenter = function(OriginalComponent)
         addError: PropTypes.func.isRequired,
         pollingInterval: PropTypes.number.isRequired,
         generateAnalysis: PropTypes.func.isRequired,
-        disableReportsCache: PropTypes.bool
+        disableReportsCache: PropTypes.bool,
+        allAttemptsEnabled: PropTypes.bool
     };
     StudentAnalysisReportStatePresenter.defaultProps = {
         studentAnalyses: void 0,

package/lib/reporting/components/resources/common/AnalysisUpdateDate/index.js

@@ -89,7 +89,7 @@ import PropTypes from 'prop-types';
 import t from '@instructure/quiz-i18n/format-message';
 import { displayDateAndTimeInTimezone } from '../../../../../common/util/formatTimespan';
 import { Text } from '@instructure/ui-text';
-import { Flex } from '@instructure/quiz-common';
+import { Flex } from '@instructure/quiz-common/components/Flex/index';
 export var AnalysisUpdateDate = /*#__PURE__*/ function(Component) {
     "use strict";
     _inherits(AnalysisUpdateDate, Component);

package/lib/reporting/components/resources/common/ExportButton/index.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import t from '@instructure/quiz-i18n/format-message';
 import { Text } from '@instructure/ui-text';
 import { Button } from '@instructure/ui-buttons';
-export var ExportButton = function(param) {
+export function ExportButton(param) {
     var enabled = param.enabled, handleExport = param.handleExport;
     return /*#__PURE__*/ React.createElement(Button, {
         color: enabled ? 'secondary' : 'primary-inverse',
@@ -16,7 +16,7 @@ export var ExportButton = function(param) {
     }, /*#__PURE__*/ React.createElement(Text, {
         size: "medium"
     }, t('Export CSV')));
-};
+}
 ExportButton.propTypes = {
     enabled: PropTypes.bool.isRequired,
     handleExport: PropTypes.func.isRequired

package/lib/reporting/components/resources/common/errorCodes.js

@@ -1,6 +1,7 @@
-import { getReportGenerationFailure, getInsufficientSubmissionNumberError, getOngoingReportGenerationError, getMinimumThreeGradedSubmissionError, getNotEnoughDataAvailableError } from './errorMessages';
-import { DEFAULT_ALERT_TIME } from '@instructure/quiz-common';
+import { getReportGenerationFailure, getInsufficientSubmissionNumberError, getOngoingReportGenerationError, getMinimumThreeGradedSubmissionError, getNotEnoughDataAvailableError, getInsufficientSubmissionNumberSarError } from './errorMessages';
+import { DEFAULT_ALERT_TIME } from '@instructure/quiz-common/constants';
 export var INSUFFICIENT_NUMBER_OF_SESSIONS = 'INSUFFICIENT_NUMBER_OF_SESSIONS';
+export var INSUFFICIENT_NUMBER_OF_SESSIONS_SAR = 'INSUFFICIENT_NUMBER_OF_SESSIONS_SAR';
 export var ANALYSIS_GENERATION_IN_PROGRESS = 'ANALYSIS_GENERATION_IN_PROGRESS';
 export var GENERAL_ANALYSIS_ERROR = 'GENERAL_ANALYSIS_ERROR';
 export var NOT_ENOUGH_FULLY_GRADED_SUBMISSION = 'NOT_ENOUGH_FULLY_GRADED_SUBMISSION';
@@ -10,6 +11,8 @@ export var getErrorMessageForCode = function(code) {
     switch(code){
         case INSUFFICIENT_NUMBER_OF_SESSIONS:
             return getInsufficientSubmissionNumberError();
+        case INSUFFICIENT_NUMBER_OF_SESSIONS_SAR:
+            return getInsufficientSubmissionNumberSarError();
         case ANALYSIS_GENERATION_IN_PROGRESS:
             return getOngoingReportGenerationError();
         case GENERAL_ANALYSIS_ERROR:

package/lib/reporting/components/resources/common/errorMessages.js

@@ -14,6 +14,9 @@ export var getReportGenerationFailure = function() {
 export var getInsufficientSubmissionNumberError = function() {
     return t('There is not enough data available to generate this report. A minimum of 3 submissions is required to generate. Please try again when more submissions are available.');
 };
+export var getInsufficientSubmissionNumberSarError = function() {
+    return t('There is not enough data available to generate this report. At least 1 submission is required to generate. Please try again when more submissions are available.');
+};
 export var getOngoingReportGenerationError = function() {
     return t('A report for this quiz is currently being generated by another user. Please try again later.');
 };

package/lib/reporting/components/resources/common/exportReports.js

@@ -120,9 +120,9 @@ function _ts_generator(thisArg, body) {
 }
 import { getFailedToExportReports } from './errorMessages';
 import contentDisposition from 'content-disposition';
-import { ITEM_ANALYSES } from '@instructure/quiz-common';
+import { ITEM_ANALYSES } from '@instructure/quiz-common/constants';
 export var exportReports = function(param) {
-    var getAnalysesExport = param.getAnalysesExport, activeQuizId = param.activeQuizId, filter = param.filter, format = param.format, saveFile = param.saveFile, addError = param.addError, _param_analysisType = param.analysisType, analysisType = _param_analysisType === void 0 ? ITEM_ANALYSES : _param_analysisType;
+    var getAnalysesExport = param.getAnalysesExport, activeQuizId = param.activeQuizId, filter = param.filter, format = param.format, saveFile = param.saveFile, addError = param.addError, _param_analysisType = param.analysisType, analysisType = _param_analysisType === void 0 ? ITEM_ANALYSES : _param_analysisType, _param_isAnonymous = param.isAnonymous, isAnonymous = _param_isAnonymous === void 0 ? false : _param_isAnonymous;
     return _async_to_generator(function() {
         var response, dispositionHeader, disposition, filename, blob, e;
         return _ts_generator(this, function(_state) {
@@ -136,7 +136,7 @@ export var exportReports = function(param) {
                     ]);
                     return [
                         4,
-                        getAnalysesExport(activeQuizId, format, filter, analysisType)
+                        getAnalysesExport(activeQuizId, format, filter, analysisType, isAnonymous)
                     ];
                 case 1:
                     response = _state.sent();

package/lib/reporting/components/resources/common/generateReports.js

@@ -120,7 +120,7 @@ function _ts_generator(thisArg, body) {
 }
 import { getReportGenerationFailure } from './errorMessages';
 import { getErrorMessageForCode, getAlertTimeoutMsForCode } from './errorCodes';
-import { DEFAULT_ALERT_TIME } from '@instructure/quiz-common';
+import { DEFAULT_ALERT_TIME } from '@instructure/quiz-common/constants';
 var DEFAULT_ERROR_MSG = getReportGenerationFailure();
 export var generateReports = function(param) {
     var setGenerationInProgress = param.setGenerationInProgress, setStatusPollingInProgress = param.setStatusPollingInProgress, generateAnalysis = param.generateAnalysis, analysisType = param.analysisType, filter = param.filter, addError = param.addError;

package/lib/taking/api/taking.js

@@ -127,22 +127,23 @@ function _ts_generator(thisArg, body) {
 }
 import React from 'react';
 import partial from 'lodash/partial';
-import { Map } from 'immutable';
+import { Map, Set } from 'immutable';
 import { camelizeKeys } from 'humps';
 import t from '@instructure/quiz-i18n/format-message';
 import noop from '../../common/util/noop';
 import { addInfo, screenreaderNotification } from '../../common/actions/alerts';
 import Item from '../../common/records/Item';
-import { featureOn } from '../../common/util/featureCheck';
 import { fetchLogger } from '../../common/kinesis/QuizEventsLogger';
-import { POLITE, STUDENT_ACCESS_CODE_STATUS } from '@instructure/quiz-common';
+import { POLITE, STUDENT_ACCESS_CODE_STATUS } from '@instructure/quiz-common/constants';
 import * as uiActions from '../../common/actions/ui';
 import { fetchQuizSession, fetchResumeData, fetchTime, recordTime, singleResponseSubmit, submitQuizSession, submitStudentAccessCode as submitStudentAccessCodeApi, takeQuizSession } from '../../common/api/quizSessions';
 import { getSessionItems, handleQuizSessionFetch } from '../../common/actions/quizSessions';
 import { handleSessionItemsResponse, handleResumeDataResponse, handleQuizSessionResponse } from '../../common/api/callHandlers';
 import * as modalActions from '../../common/actions/modal';
 import { backtrackingNextQuestion, sessionStartOrResumeEvent, setCurrentSessionItemPosition, submitQuizSessionEvent, updateQuizSubmitFlag, updateQuizSessionStatusOnPageLoad, updateTimerInfo } from '../../common/actions/taking';
+import { getActiveQuiz } from '../../common/selectors/quizzes';
 import { getClientIpAddress } from '../../common/util/getClientIpAddress';
+import { createFetcher } from '../../common/util/Fetcher';
 var getQuizSessionConfig = function(quizSession) {
     // these should be handled by existing functions
     var oneQuestionAtATime = quizSession.isOneQuestionAtATime();
@@ -159,7 +160,7 @@ export var getResumeData = function(quizSessionId) {
         var responseCb = function(resumeData) {
             return dispatch(handleResumeDataResponse(resumeData, quizSessionId));
         };
-        return fetchResumeData(quizSessionId, responseCb);
+        return dispatch(fetchResumeData(quizSessionId, responseCb));
     };
 };
 export var makeSessionItemCall = function(quizSession) {
@@ -180,7 +181,7 @@ export var submitStudentAccessCode = function(quizSessionId, accessCode) {
             }
             return dispatch(handleQuizSessionResponse(sessionData, quizSessionId));
         };
-        return submitStudentAccessCodeApi(quizSessionId, accessCode, responseCb);
+        return dispatch(submitStudentAccessCodeApi(quizSessionId, accessCode, responseCb));
     };
 };
 // ====================================
@@ -215,10 +216,10 @@ var noBacktrackingNextQuestion = function(quizSessionId, itemId, position, userR
         };
         var errorCb = function(errorCode) {
             if (errorCode === 400) {
-                return singleResponseSubmit(quizSessionId, {}, responseCb);
+                return dispatch(singleResponseSubmit(quizSessionId, {}, responseCb));
             }
         };
-        return singleResponseSubmit(quizSessionId, params, responseCb, errorCb);
+        return dispatch(singleResponseSubmit(quizSessionId, params, responseCb, errorCb));
     };
 };
 // ====================================
@@ -240,8 +241,8 @@ export var nextQuestion = function(quizSessionId, allowBacktracking, currentQues
 // ====================================
 export function confirmSessionStartPage(quizSessionId) {
     var cb = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop, authRedirectCb = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : noop;
-    return function(dispatch) {
-        return fetchQuizSession(quizSessionId, partial(handleQuizSessionFetch, dispatch)).then(cb).catch(function(e) {
+    return function(dispatch, getState) {
+        return dispatch(fetchQuizSession(quizSessionId, partial(handleQuizSessionFetch, dispatch, getState))).then(cb).catch(function(e) {
             if (e.response && e.response.status === 403) {
                 authRedirectCb();
             }
@@ -253,8 +254,8 @@ export function confirmSessionStartPage(quizSessionId) {
 // ====================================
 export function newQuizTakingSession(quizSessionId) {
     var cb = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop, authRedirectCb = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : noop;
-    return function(dispatch) {
-        return takeQuizSession(quizSessionId, partial(handleQuizSessionFetch, dispatch)).then(cb).catch(function(e) {
+    return function(dispatch, getState) {
+        return dispatch(takeQuizSession(quizSessionId, partial(handleQuizSessionFetch, dispatch, getState))).then(cb).catch(function(e) {
             if (e.response.status === 403) {
                 authRedirectCb();
             }
@@ -262,15 +263,16 @@ export function newQuizTakingSession(quizSessionId) {
     };
 }
 export function onQuizSessionReadyForTaking(quizSession) {
-    return function(dispatch) {
+    return function(dispatch, getState) {
         return _async_to_generator(function() {
-            var ipAddress;
+            var fetcher, ipAddress;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
+                        fetcher = createFetcher(dispatch, getState);
                         return [
                             4,
-                            getClientIpAddress(quizSession.id)
+                            getClientIpAddress(quizSession.id, fetcher)
                         ];
                     case 1:
                         ipAddress = _state.sent();
@@ -291,14 +293,21 @@ export function onQuizSessionReadyForTaking(quizSession) {
 // ====================================
 // show submit confirmation modal
 // ====================================
-export var messageForSubmitModal = function(positions) {
+export var messageForSubmitModal = function(positions, isSurvey) {
+    var invalidInputWarning = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     if (!positions || positions.length === 0) {
         return t('Upon submission you will not be able to change your answers. Are you ready to submit?');
     }
+    if (isSurvey) {
+        return messageForSurveySubmitModal(positions);
+    }
+    return messageForQuizSubmitModal(positions, invalidInputWarning);
+};
+var messageForQuizSubmitModal = function(positions, invalidInputWarning) {
     if (positions.length >= 10) {
-        return featureOn('invalid_input_warning') ? t('Multiple questions have either not been answered or have invalid answers. Upon submission you will not be able to change your answers. Are you ready to submit?') : t('Multiple questions have not been answered. Upon submission you will not be able to change your answers. Are you ready to submit?');
+        return invalidInputWarning ? t('Multiple questions have either not been answered or have invalid answers. Upon submission you will not be able to change your answers. Are you ready to submit?') : t('Multiple questions have not been answered. Upon submission you will not be able to change your answers. Are you ready to submit?');
     }
-    var message = featureOn('invalid_input_warning') ? t('The following questions have either not been answered or have invalid answers:') : t('The following questions have not been answered:');
+    var message = invalidInputWarning ? t('The following questions have either not been answered or have invalid answers:') : t('The following questions have not been answered:');
     return /*#__PURE__*/ React.createElement("div", null, /*#__PURE__*/ React.createElement("p", null, message), /*#__PURE__*/ React.createElement("ul", null, positions.map(function(position) {
         return /*#__PURE__*/ React.createElement("li", {
             key: position
@@ -307,25 +316,45 @@ export var messageForSubmitModal = function(positions) {
         }));
     })), /*#__PURE__*/ React.createElement("p", null, t('Upon submission you will not be able to change your answers. Are you ready to submit?')));
 };
+var messageForSurveySubmitModal = function(positions) {
+    if (positions.length >= 10) {
+        return t('Please complete all the required questions to submit.');
+    }
+    var message = t('You need to answer the following questions before you can submit this survey:');
+    return /*#__PURE__*/ React.createElement("div", null, /*#__PURE__*/ React.createElement("p", null, message), /*#__PURE__*/ React.createElement("ul", null, positions.map(function(position) {
+        return /*#__PURE__*/ React.createElement("li", {
+            key: position
+        }, t('Question { position, number }', {
+            position: position
+        }));
+    })), /*#__PURE__*/ React.createElement("p", null, t('Please complete all the required questions to submit.')));
+};
 var __getResponseForSessionItem = function(sessionItem, responses) {
+    var invalidInputWarning = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     var resp = responses.find(function(r) {
         return r.get('position') === sessionItem.get('position');
     });
-    if (featureOn('invalid_input_warning') && resp && resp.get('invalid')) {
+    if (invalidInputWarning && resp && resp.get('invalid')) {
         return null;
     }
     return resp && resp.get('userResponse').toJS();
 };
-var __remainingQuestionPositions = function(sessionItems, responses) {
+var __remainingQuestionPositions = function(sessionItems, responses, isSurvey) {
+    var invalidInputWarning = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
     return sessionItems.toList().sortBy(function(si) {
         return si.get('position');
     }).filterNot(function(si) {
         var item = si.get('item');
         var interactionType = item.get('interactionType');
         return typeof interactionType === 'undefined' || interactionType === 'no-interaction';
+    }).filter(function(si) {
+        if (isSurvey) {
+            return si.get('required');
+        }
+        return true;
     }).filterNot(function(si) {
         var item = new Item(si.get('item'));
-        var itemUserResponse = __getResponseForSessionItem(si, responses);
+        var itemUserResponse = __getResponseForSessionItem(si, responses, invalidInputWarning);
         return item.hasResponse(itemUserResponse);
     }).map(function(si) {
         return si.get('questionNumber');
@@ -334,16 +363,22 @@ var __remainingQuestionPositions = function(sessionItems, responses) {
 export function showSubmitConfirmModal(quizSessionId) {
     var onSubmitQuizSession = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop;
     return function(dispatch, getState) {
-        var needResponse = getQuestionsNeedingAResponse(getState(), quizSessionId);
-        var title = titleForSubmitModal(needResponse);
-        var message = messageForSubmitModal(needResponse);
+        var state = getState();
+        var quiz = getActiveQuiz(state);
+        var isSurvey = quiz.isSurvey();
+        var _state_features;
+        var invalidInputWarning = ((_state_features = state.features) !== null && _state_features !== void 0 ? _state_features : Set()).includes('invalid_input_warning');
+        var needResponse = getQuestionsNeedingAResponse(state, quizSessionId, isSurvey, invalidInputWarning);
+        var title = titleForSubmitModal(needResponse, isSurvey);
+        var message = messageForSubmitModal(needResponse, isSurvey, invalidInputWarning);
         var modalAction = modalActions.withConfirm(function() {
             return dispatch(postQuizSession(quizSessionId, onSubmitQuizSession));
         }, {
             title: title,
             text: message,
             continueText: t('Submit'),
-            cancelText: t('Cancel')
+            cancelText: t('Cancel'),
+            submitButtonDisabled: isSurvey && needResponse.length > 0
         });
         return dispatch(modalAction);
     };
@@ -355,8 +390,14 @@ export function closeSubmitConfirmModal(quizSessionId) {
         return dispatch(modalActions.closeModal(title));
     };
 }
-function titleForSubmitModal(needResponse) {
-    return needResponse.length > 0 ? t('Unanswered Questions!') : t('Confirm Submission');
+function titleForSubmitModal(needResponse, isSurvey) {
+    if (needResponse.length === 0) {
+        return t('Confirm Submission');
+    }
+    if (isSurvey) {
+        return t('Required Questions!');
+    }
+    return t('Unanswered Questions!');
 }
 // ==============================================
 // check for unanswered questions or override
@@ -388,45 +429,36 @@ export function updateTime(timeInSeconds, timerRunning) {
         }));
     };
 }
-function getQuestionsNeedingAResponse(state, quizSessionId) {
-    var responses = state.getIn([
-        'taking',
-        'responses'
-    ], Map());
-    var sessionItems = state.get('sessionItems', Map()).filter(function(record) {
+function getQuestionsNeedingAResponse(state, quizSessionId, isSurvey) {
+    var invalidInputWarning = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
+    var responses = state.taking.get('responses', Map());
+    var _state_sessionItems;
+    var sessionItems = ((_state_sessionItems = state.sessionItems) !== null && _state_sessionItems !== void 0 ? _state_sessionItems : Map()).filter(function(record) {
         return record.get('quizSessionId') === quizSessionId;
     });
-    return __remainingQuestionPositions(sessionItems, responses);
+    return __remainingQuestionPositions(sessionItems, responses, isSurvey, invalidInputWarning);
 }
 // ====================================
 // submit the data for the quiz
 // ====================================
 export function postQuizSession(quizSessionId) {
     var onSubmitQuizSession = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop;
-    // send kinesis credentials request before submit quiz when it is still
-    //   in quiz.taking scope, we don't mind when responses are coming back (
-    //   before/after the scope is switched)
-    // after submit quiz response is received, kinesis refresh is forbidden for
-    //   quiz.results scope
-    fetchLogger(quizSessionId);
     return function(dispatch, getState) {
-        var submitFlag = getState().getIn([
-            'taking',
-            'submitFlag'
-        ]);
+        // send kinesis credentials request before submit quiz when it is still
+        //   in quiz.taking scope, we don't mind when responses are coming back (
+        //   before/after the scope is switched)
+        // after submit quiz response is received, kinesis refresh is forbidden for
+        //   quiz.results scope
+        var fetcher = createFetcher(dispatch, getState);
+        fetchLogger(quizSessionId, undefined, fetcher);
+        var submitFlag = getState().taking.get('submitFlag');
         if (!submitFlag) {
             dispatch(updateQuizSubmitFlag(true));
-            var takingResponses = getState().getIn([
-                'taking',
-                'responses'
-            ], Map()).valueSeq().toJS();
+            var takingResponses = getState().taking.get('responses', Map()).valueSeq().toJS();
             var params = {
                 body: JSON.stringify({
                     session_item_responses: takingResponses,
-                    submission_source: "browser_session_id:".concat(getState().getIn([
-                        'taking',
-                        'browserSessionId'
-                    ]))
+                    submission_source: "browser_session_id:".concat(getState().taking.get('browserSessionId'))
                 })
             };
             var submitQuizSessionEventAction = submitQuizSessionEvent();
@@ -440,7 +472,7 @@ export function postQuizSession(quizSessionId) {
                     dispatch(updateQuizSubmitFlag(false));
                 }, 10000);
             };
-            return submitQuizSession(quizSessionId, params, responseCb, errorCb);
+            return dispatch(submitQuizSession(quizSessionId, params, responseCb, errorCb));
         }
     };
 }
@@ -449,9 +481,9 @@ export function postQuizSession(quizSessionId) {
 // ====================================
 export function getTimeRemaining(quizSessionId, cb) {
     return function(dispatch) {
-        return fetchTime(quizSessionId, function(result) {
+        return dispatch(fetchTime(quizSessionId, function(result) {
             return cb(camelizeKeys(result));
-        });
+        }));
     };
 }
 // ====================================
@@ -459,8 +491,8 @@ export function getTimeRemaining(quizSessionId, cb) {
 // ====================================
 export function recordQuizTime(quizSessionId, cb) {
     return function(dispatch) {
-        return recordTime(quizSessionId, function(result) {
+        return dispatch(recordTime(quizSessionId, function(result) {
             return cb(camelizeKeys(result));
-        });
+        }));
     };
 }

package/lib/taking/learnosity/index.js

@@ -143,7 +143,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import Fetcher from '../../common/util/Fetcher';
+import { Fetcher } from '../../common/util/Fetcher';
 var questionsApp;
 var authPromise;
 export function appendFeature(quizSessionId, feature, timeout) {