@instructure/quiz-core 20.20.1-rc.2 → 20.20.1-snapshot.11

package/lib/taking/api/taking.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -19,48 +17,33 @@ exports.postQuizSession = postQuizSession;
 exports.getTimeRemaining = getTimeRemaining;
 exports.recordQuizTime = recordQuizTime;
 exports.messageForSubmitModal = exports.nextQuestion = exports.submitStudentAccessCode = exports.makeSessionItemCall = exports.getResumeData = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _partial = _interopRequireDefault(require("lodash/partial"));
-
 var _immutable = require("immutable");
-
 var _humps = require("humps");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
-
 var _noop = _interopRequireDefault(require("../../common/util/noop.js"));
-
 var _alerts = require("../../common/actions/alerts.js");
-
 var _Item = _interopRequireDefault(require("../../common/records/Item.js"));
-
 var _featureCheck = require("../../common/util/featureCheck.js");
-
 var _QuizEventsLogger = require("../../common/kinesis/QuizEventsLogger.js");
-
 var _quizCommon = require("@instructure/quiz-common");
-
 var uiActions = _interopRequireWildcard(require("../../common/actions/ui.js"));
-
 var _quizSessions = require("../../common/api/quizSessions.js");
-
 var _quizSessions2 = require("../../common/actions/quizSessions.js");
-
 var _callHandlers = require("../../common/api/callHandlers.js");
-
 var modalActions = _interopRequireWildcard(require("../../common/actions/modal.js"));
-
 var _taking = require("../../common/actions/taking.js");
-
 // =============================================
 // =============================================
+
 //  this file is in charge of coordinating the
 //  dispatching of actions necessary to interact
 //  with quizzes via the api for taking purposes
+
 // =============================================
 // =============================================
+
 var getQuizSessionConfig = function getQuizSessionConfig(quizSession) {
   // these should be handled by existing functions
   var oneQuestionAtATime = quizSession.isOneQuestionAtATime();
@@ -72,19 +55,15 @@ var getQuizSessionConfig = function getQuizSessionConfig(quizSession) {
     useSessionItemIndex: useSessionItemIndex
   };
 };
-
 var getResumeData = function getResumeData(quizSessionId) {
   return function (dispatch) {
     var responseCb = function responseCb(resumeData) {
       return dispatch((0, _callHandlers.handleResumeDataResponse)(resumeData, quizSessionId));
     };
-
     return (0, _quizSessions.fetchResumeData)(quizSessionId, responseCb);
   };
 };
-
 exports.getResumeData = getResumeData;
-
 var makeSessionItemCall = function makeSessionItemCall(quizSession) {
   var index = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _quizSessions2.getSessionItems;
   var next = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : nextQuestion;
@@ -93,36 +72,29 @@ var makeSessionItemCall = function makeSessionItemCall(quizSession) {
     return dispatch(action);
   };
 };
-
 exports.makeSessionItemCall = makeSessionItemCall;
-
 var submitStudentAccessCode = function submitStudentAccessCode(quizSessionId, accessCode) {
   return function (dispatch) {
     var responseCb = function responseCb(sessionData) {
       dispatch(uiActions.set(_quizCommon.STUDENT_ACCESS_CODE_STATUS, sessionData.accepted_student_access_code));
-
       if (sessionData.accepted_student_access_code) {
         dispatch((0, _alerts.screenreaderNotification)((0, _formatMessage.default)('Access code successful. You may now begin this assessment'), _quizCommon.POLITE));
       } else {
         dispatch((0, _alerts.screenreaderNotification)((0, _formatMessage.default)('Invalid access code')));
       }
-
       return dispatch((0, _callHandlers.handleQuizSessionResponse)(sessionData, quizSessionId));
     };
-
     return (0, _quizSessions.submitStudentAccessCode)(quizSessionId, accessCode, responseCb);
   };
-}; // ====================================
+};
+
+// ====================================
 // OQAAT no backtracking call
 // ====================================
-
-
 exports.submitStudentAccessCode = submitStudentAccessCode;
-
 var noBacktrackingNextQuestion = function noBacktrackingNextQuestion(quizSessionId, itemId, position, userResponse, largeFormatResponse, submit) {
   return function (dispatch) {
     var params = {};
-
     if (itemId) {
       params.body = JSON.stringify({
         sessionItemResponse: {
@@ -133,7 +105,6 @@ var noBacktrackingNextQuestion = function noBacktrackingNextQuestion(quizSession
         }
       });
     }
-
     var responseCb = function responseCb(nextItem) {
       if (nextItem) {
         dispatch([(0, _callHandlers.handleSessionItemsResponse)([nextItem], quizSessionId), (0, _taking.setCurrentSessionItemPosition)(nextItem.position), getResumeData(quizSessionId)]);
@@ -141,23 +112,20 @@ var noBacktrackingNextQuestion = function noBacktrackingNextQuestion(quizSession
         submit();
       }
     };
-
     var errorCb = function errorCb(errorCode) {
       if (errorCode === 400) {
         return (0, _quizSessions.singleResponseSubmit)(quizSessionId, {}, responseCb);
       }
     };
-
     return (0, _quizSessions.singleResponseSubmit)(quizSessionId, params, responseCb, errorCb);
   };
-}; // ====================================
+};
+
+// ====================================
 // OQAAT no backtracking call
 // ====================================
-
-
 var nextQuestion = function nextQuestion(quizSessionId, allowBacktracking, currentQuestionIsLast, position, itemId, userResponse, largeFormatResponse) {
   var submit = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : submitQuiz;
-
   if (allowBacktracking) {
     return function (dispatch) {
       var action = currentQuestionIsLast ? submit(quizSessionId) : (0, _taking.backtrackingNextQuestion)();
@@ -166,13 +134,12 @@ var nextQuestion = function nextQuestion(quizSessionId, allowBacktracking, curre
   } else {
     return noBacktrackingNextQuestion(quizSessionId, itemId, position, userResponse, largeFormatResponse, submit);
   }
-}; // ====================================
+};
+
+// ====================================
 // load up the quiz session for the taking page
 // ====================================
-
-
 exports.nextQuestion = nextQuestion;
-
 function confirmSessionStartPage(quizSessionId) {
   var cb = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _noop.default;
   var authRedirectCb = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : _noop.default;
@@ -183,11 +150,11 @@ function confirmSessionStartPage(quizSessionId) {
       }
     });
   };
-} // ====================================
+}
+
+// ====================================
 // fetch the data for a new quiz_session
 // ====================================
-
-
 function newQuizTakingSession(quizSessionId) {
   var cb = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _noop.default;
   var authRedirectCb = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : _noop.default;
@@ -199,25 +166,23 @@ function newQuizTakingSession(quizSessionId) {
     });
   };
 }
-
 function onQuizSessionReadyForTaking(quizSession) {
   return function (dispatch) {
     dispatch([makeSessionItemCall(quizSession), getResumeData(quizSession.id), (0, _taking.sessionStartOrResumeEvent)(navigator.userAgent), (0, _taking.updateQuizSessionStatusOnPageLoad)(quizSession.status)]);
   };
-} // ====================================
+}
+
+// ====================================
 // show submit confirmation modal
 // ====================================
 
-
 var messageForSubmitModal = function messageForSubmitModal(positions) {
   if (!positions || positions.length === 0) {
     return (0, _formatMessage.default)('Upon submission you will not be able to change your answers. Are you ready to submit?');
   }
-
   if (positions.length >= 10) {
     return (0, _featureCheck.featureOn)('invalid_input_warning') ? (0, _formatMessage.default)('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?') : (0, _formatMessage.default)('Multiple questions have not been answered. Upon submission you will not be able to change your answers. Are you ready to submit?');
   }
-
   var message = (0, _featureCheck.featureOn)('invalid_input_warning') ? (0, _formatMessage.default)('The following questions have either not been answered or have invalid answers:') : (0, _formatMessage.default)('The following questions have not been answered:');
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("p", null, message), /*#__PURE__*/_react.default.createElement("ul", null, positions.map(function (position) {
     return /*#__PURE__*/_react.default.createElement("li", {
@@ -227,35 +192,27 @@ var messageForSubmitModal = function messageForSubmitModal(positions) {
     }));
   })), /*#__PURE__*/_react.default.createElement("p", null, (0, _formatMessage.default)('Upon submission you will not be able to change your answers. Are you ready to submit?')));
 };
-
 exports.messageForSubmitModal = messageForSubmitModal;
-
 var __getResponseForSessionItem = function __getResponseForSessionItem(sessionItem, responses) {
   var resp = responses.find(function (r) {
     return r.get('position') === sessionItem.get('position');
   });
-
   if ((0, _featureCheck.featureOn)('invalid_input_warning') && resp && resp.get('invalid')) {
     return null;
   }
-
   return resp && resp.get('userResponse').toJS();
 };
-
 var __remainingQuestionPositions = function __remainingQuestionPositions(sessionItems, responses) {
   return sessionItems.toList().sortBy(function (si) {
     return si.get('position');
   }).filterNot(function (si) {
     var item = new _Item.default(si.get('item'));
-
     var itemUserResponse = __getResponseForSessionItem(si, responses);
-
     return item.hasResponse(itemUserResponse);
   }).map(function (si) {
     return si.get('position');
   }).toSet().toJS();
 };
-
 function showSubmitConfirmModal(quizSessionId) {
   var onSubmitQuizSession = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _noop.default;
   return function (dispatch, getState) {
@@ -273,7 +230,6 @@ function showSubmitConfirmModal(quizSessionId) {
     return dispatch(modalAction);
   };
 }
-
 function closeSubmitConfirmModal(quizSessionId) {
   return function (dispatch, getState) {
     var needResponse = getQuestionsNeedingAResponse(getState(), quizSessionId);
@@ -281,14 +237,14 @@ function closeSubmitConfirmModal(quizSessionId) {
     return dispatch(modalActions.closeModal(title));
   };
 }
-
 function titleForSubmitModal(needResponse) {
   return needResponse.length > 0 ? (0, _formatMessage.default)('Unanswered Questions!') : (0, _formatMessage.default)('Confirm Submission');
-} // ==============================================
+}
+
+// ==============================================
 // check for unanswered questions or override
 // ==============================================
 
-
 function submitQuiz(quizSessionId) {
   var onSubmitQuizSession = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _noop.default;
   var overrideConfirmation = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
@@ -300,7 +256,6 @@ function submitQuiz(quizSessionId) {
     }
   };
 }
-
 function notifyTimeAdded(isUnlimited, extraTime) {
   return function (dispatch) {
     var message = isUnlimited ? (0, _formatMessage.default)('Your original time limit has been extended by { extraTime }', {
@@ -309,7 +264,6 @@ function notifyTimeAdded(isUnlimited, extraTime) {
     return dispatch((0, _alerts.addInfo)(message));
   };
 }
-
 function updateTime(timeInSeconds, timerRunning) {
   return function (dispatch) {
     return dispatch((0, _taking.updateTimerInfo)({
@@ -319,18 +273,18 @@ function updateTime(timeInSeconds, timerRunning) {
     }));
   };
 }
-
 function getQuestionsNeedingAResponse(state, quizSessionId) {
   var responses = state.getIn(['taking', 'responses'], (0, _immutable.Map)());
   var sessionItems = state.get('sessionItems', (0, _immutable.Map)()).filter(function (record) {
     return record.get('quizSessionId') === quizSessionId;
   });
   return __remainingQuestionPositions(sessionItems, responses);
-} // ====================================
+}
+
+// ====================================
 // submit the data for the quiz
 // ====================================
 
-
 function postQuizSession(quizSessionId) {
   var onSubmitQuizSession = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _noop.default;
   // send kinesis credentials request before submit quiz when it is still
@@ -341,7 +295,6 @@ function postQuizSession(quizSessionId) {
   (0, _QuizEventsLogger.fetchLogger)(quizSessionId);
   return function (dispatch, getState) {
     var submitFlag = getState().getIn(['taking', 'submitFlag']);
-
     if (!submitFlag) {
       dispatch((0, _taking.updateQuizSubmitFlag)(true));
       var takingResponses = getState().getIn(['taking', 'responses'], (0, _immutable.Map)()).valueSeq().toJS();
@@ -352,38 +305,37 @@ function postQuizSession(quizSessionId) {
         })
       };
       var submitQuizSessionEventAction = (0, _taking.submitQuizSessionEvent)();
-
       var responseCb = function responseCb() {
         dispatch((0, _alerts.screenreaderNotification)((0, _formatMessage.default)('Quiz submitted')));
         onSubmitQuizSession();
         dispatch(submitQuizSessionEventAction);
       };
-
       var errorCb = function errorCb(errorCode) {
         setTimeout(function () {
           dispatch((0, _taking.updateQuizSubmitFlag)(false));
         }, 10000);
       };
-
       return (0, _quizSessions.submitQuizSession)(quizSessionId, params, responseCb, errorCb);
     }
   };
-} // ====================================
+}
+
+// ====================================
 //  getting the remaining time
 // ====================================
 
-
 function getTimeRemaining(quizSessionId, cb) {
   return function (dispatch) {
     return (0, _quizSessions.fetchTime)(quizSessionId, function (result) {
       return cb((0, _humps.camelizeKeys)(result));
     });
   };
-} // ====================================
+}
+
+// ====================================
 //  tracking time taken
 // ====================================
 
-
 function recordQuizTime(quizSessionId, cb) {
   return function (dispatch) {
     return (0, _quizSessions.recordTime)(quizSessionId, function (result) {

package/lib/taking/learnosity/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,27 +8,20 @@ exports.appendFeature = appendFeature;
 exports.destroyFeature = destroyFeature;
 exports.toggleFeature = toggleFeature;
 exports.reset = reset;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _Fetcher = _interopRequireDefault(require("../../common/util/Fetcher.js"));
-
 var questionsApp;
 var authPromise;
-
 function appendFeature(_x, _x2, _x3) {
   return _appendFeature.apply(this, arguments);
 }
-
 function _appendFeature() {
-  _appendFeature = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(quizSessionId, feature, timeout) {
+  _appendFeature = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(quizSessionId, feature, timeout) {
     var _len,
-        args,
-        _key,
-        _args = arguments;
-
+      args,
+      _key,
+      _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -38,36 +30,28 @@ function _appendFeature() {
               _context.next = 5;
               break;
             }
-
             for (_len = _args.length, args = new Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) {
               args[_key - 3] = _args[_key];
             }
-
             _context.next = 4;
             return authenticate.apply(void 0, [quizSessionId].concat(args));
-
           case 4:
             questionsApp = _context.sent;
-
           case 5:
             if (!featureContainer(feature.feature_id)) {
               _context.next = 11;
               break;
             }
-
             questionsApp.append({
               features: [feature]
             });
             _context.next = 9;
             return waitForLearnosityReadyCallback(timeout, feature.feature_id);
-
           case 9:
             _context.next = 12;
             break;
-
           case 11:
             throw new Error('Learnosity feature container element not found');
-
           case 12:
           case "end":
             return _context.stop();
@@ -77,29 +61,23 @@ function _appendFeature() {
   }));
   return _appendFeature.apply(this, arguments);
 }
-
 function destroyFeature(featureId) {
   if (!questionsApp) return;
   var feature = questionsApp.feature(featureId);
-
   if (feature) {
     feature.destroy();
   }
 }
-
 function toggleFeature(featureId, onOff) {
   if (!questionsApp) return;
   var feature = questionsApp.feature(featureId);
-
   if (feature) {
     feature.toggle(onOff);
   }
 }
-
 function featureContainer(featureId) {
   return document.querySelector(".learnosity-feature.feature-".concat(featureId));
 }
-
 function authenticate(quizSessionId) {
   var fetcher = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
   authPromise = authPromise || new Promise(function (resolve, reject) {
@@ -122,50 +100,42 @@ function authenticate(quizSessionId) {
     });
   });
   return authPromise;
-} // Learnosity calls readyListener when it has finished loading, and again when
+}
+
+// Learnosity calls readyListener when it has finished loading, and again when
 // a feature has been appended to the DOM. The following is gross, but it
 // allows us to await until a feature is ready.
-
-
 var pendingFeaturesPromise, pendingFeatures, pendingCount;
-
 function resetPending() {
   pendingFeaturesPromise = null;
   pendingFeatures = {};
   pendingCount = 0;
 }
-
 resetPending();
-
 function learnosityReady() {
   // We can't know which feature is ready, so only resolve once there are
   // no more pending features
   if (pendingCount > 0) {
     pendingCount -= 1;
-
     if (pendingCount === 0) {
       pendingFeaturesPromise.resolve();
       resetPending();
     }
   }
 }
-
 function waitForLearnosityReadyCallback() {
   var timeout = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 5000;
   var featureId = arguments.length > 1 ? arguments[1] : void 0;
-
   if (!pendingFeatures[featureId]) {
     pendingCount += 1;
     pendingFeatures[featureId] = true;
     var res;
-
     if (!pendingFeaturesPromise) {
       pendingFeaturesPromise = new Promise(function (resolve, reject) {
         var timer = setTimeout(function () {
           reject(new Error('Timed out waiting for learnosity ready callback'));
           resetPending();
         }, timeout);
-
         res = function res() {
           clearTimeout(timer);
           resolve();
@@ -174,11 +144,10 @@ function waitForLearnosityReadyCallback() {
       pendingFeaturesPromise.resolve = res;
     }
   }
-
   return pendingFeaturesPromise;
-} // Only used to reset singleton state for tests
-
+}
 
+// Only used to reset singleton state for tests
 function reset() {
   questionsApp = null;
   authPromise = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.20.1-rc.2+31245886a",
+  "version": "20.20.1-snapshot.11+567f86bb0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -19,8 +19,8 @@
     "lint": "ui-test --lint",
     "lint:fix": "ui-test --lint --fix",
     "eslint:fix": "eslint --fix .",
-    "prelint": "cd ../..; yarn build",
-    "pretest": "cd ../..; yarn build",
+    "prelint": "yarn build",
+    "pretest": "yarn build",
     "test": "yarn test:karma",
     "test:karma": "ui-test",
     "test:watch": "ui-test --watch",
@@ -44,11 +44,11 @@
     "@instructure/emotion": "^8.51.0",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^3.2.2",
-    "@instructure/quiz-common": "20.20.1-rc.2+31245886a",
-    "@instructure/quiz-i18n": "20.20.1-rc.2+31245886a",
-    "@instructure/quiz-interactions": "20.20.1-rc.2+31245886a",
-    "@instructure/quiz-number-input": "20.20.1-rc.2+31245886a",
-    "@instructure/quiz-rce": "20.20.1-rc.2+31245886a",
+    "@instructure/quiz-common": "20.20.1-snapshot.11+567f86bb0",
+    "@instructure/quiz-i18n": "20.20.1-snapshot.11+567f86bb0",
+    "@instructure/quiz-interactions": "20.20.1-snapshot.11+567f86bb0",
+    "@instructure/quiz-number-input": "20.20.1-snapshot.11+567f86bb0",
+    "@instructure/quiz-rce": "20.20.1-snapshot.11+567f86bb0",
     "@instructure/ui-a11y-content": "^8.51.0",
     "@instructure/ui-alerts": "^8.51.0",
     "@instructure/ui-avatar": "^8.51.0",
@@ -112,7 +112,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "20.20.1-rc.2+31245886a",
+    "instructure-validations": "20.20.1-snapshot.11+567f86bb0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -143,10 +143,9 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "20.20.0",
+    "@instructure/quiz-scripts": "20.22.0",
     "@instructure/ui-axe-check": "^8.51.0",
     "@instructure/ui-babel-preset": "^7.22.1",
-    "@instructure/ui-scripts": "^7.22.1",
     "@instructure/ui-test-utils": "^7.22.1",
     "@testing-library/react": "^12.1.5",
     "chai": "^4.1.2",
@@ -162,7 +161,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "20.20.1-rc.2+31245886a",
+    "quiz-presets": "20.20.1-snapshot.11+567f86bb0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -178,5 +177,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "31245886a8ec22bb6c6824024d760fe44afdd266"
+  "gitHead": "567f86bb066ffb04b23703a63b0551742d49670a"
 }