@instructure/quiz-core 20.17.3-rc.0 → 20.17.3-rc.10

package/lib/common/util/PaginatedFetcher.js

@@ -1,42 +1,66 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.PaginatedFetcher = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _callSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/callSuper"));
-var _superPropGet2 = _interopRequireDefault(require("@babel/runtime/helpers/superPropGet"));
+
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
+
 var _map = _interopRequireDefault(require("lodash/map"));
+
 var _omit = _interopRequireDefault(require("lodash/omit"));
-var _Fetcher2 = _interopRequireDefault(require("./Fetcher"));
-var _jsonify = _interopRequireDefault(require("./jsonify"));
-var _excluded = ["getRecordIds"];
-var PaginatedFetcher = exports.PaginatedFetcher = /*#__PURE__*/function (_Fetcher) {
+
+var _Fetcher2 = _interopRequireDefault(require("./Fetcher.js"));
+
+var _jsonify = _interopRequireDefault(require("./jsonify.js"));
+
+var PaginatedFetcher = /*#__PURE__*/function (_Fetcher) {
+  (0, _inherits2.default)(PaginatedFetcher, _Fetcher);
+
+  var _super = (0, _createSuper2.default)(PaginatedFetcher);
+
   function PaginatedFetcher() {
     var _this;
-    var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {},
-      getRecordIds = _ref.getRecordIds,
-      args = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+
+    var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+
+    var getRecordIds = _ref.getRecordIds,
+        args = (0, _objectWithoutProperties2.default)(_ref, ["getRecordIds"]);
     (0, _classCallCheck2.default)(this, PaginatedFetcher);
-    _this = (0, _callSuper2.default)(this, PaginatedFetcher, [args]);
+    _this = _super.call(this, args);
     _this.asyncResponseHandler = _this.paginatedResponseHandler;
+
     _this.getRecordIds = getRecordIds || function (json) {
       return (0, _map.default)(json, 'id');
     };
+
     return _this;
   }
-  (0, _inherits2.default)(PaginatedFetcher, _Fetcher);
-  return (0, _createClass2.default)(PaginatedFetcher, [{
+
+  (0, _createClass2.default)(PaginatedFetcher, [{
     key: "paginatedResponseHandler",
     value: function paginatedResponseHandler(response, request) {
       var _this2 = this;
+
       return (0, _jsonify.default)(response).then(function (json) {
         var total = parseInt(response.headers.get('total'), 10);
         var perPage = parseInt(response.headers.get('per-page'), 10);
@@ -51,27 +75,36 @@ var PaginatedFetcher = exports.PaginatedFetcher = /*#__PURE__*/function (_Fetche
   }, {
     key: "appendQueryParams",
     value: function appendQueryParams(url, params) {
-      return (0, _superPropGet2.default)(PaginatedFetcher, "appendQueryParams", this, 3)([url, (0, _omit.default)(params, 'stateKey')]);
+      return (0, _get2.default)((0, _getPrototypeOf2.default)(PaginatedFetcher.prototype), "appendQueryParams", this).call(this, url, (0, _omit.default)(params, 'stateKey'));
     }
   }, {
     key: "fetch",
     value: function () {
-      var _fetch = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(url, params) {
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", (0, _superPropGet2.default)(PaginatedFetcher, "fetch", this, 3)([url, (0, _omit.default)(params, 'stateKey')]));
-            case 1:
-            case "end":
-              return _context.stop();
+      var _fetch = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, params) {
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", (0, _get2.default)((0, _getPrototypeOf2.default)(PaginatedFetcher.prototype), "fetch", this).call(this, url, (0, _omit.default)(params, 'stateKey')));
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function fetch(_x, _x2) {
         return _fetch.apply(this, arguments);
       }
+
       return fetch;
     }()
   }]);
+  return PaginatedFetcher;
 }(_Fetcher2.default);
-var _default = exports.default = PaginatedFetcher;
+
+exports.PaginatedFetcher = PaginatedFetcher;
+var _default = PaginatedFetcher;
+exports.default = _default;

package/lib/common/util/ThunkQueue.js

@@ -1,15 +1,22 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 /*
  * A queue for redux thunks (see https://github.com/reduxjs/redux-thunk).
  *
@@ -35,17 +42,19 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
  * processed in sequence with optimistic UI updates, and want to reset the UI
  * to match backend state if a request fails.
  */
-var ThunkQueue = exports.default = /*#__PURE__*/function () {
+var ThunkQueue = /*#__PURE__*/function () {
   function ThunkQueue() {
     var errorHandler = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null;
     (0, _classCallCheck2.default)(this, ThunkQueue);
     this.errorHandler = errorHandler;
     this.queue = [];
   }
-  return (0, _createClass2.default)(ThunkQueue, [{
+
+  (0, _createClass2.default)(ThunkQueue, [{
     key: "wrapActionCreator",
     value: function wrapActionCreator(fn) {
       var _this = this;
+
       return function () {
         return _this.wrapThunk(fn.apply(void 0, arguments));
       };
@@ -54,76 +63,101 @@ var ThunkQueue = exports.default = /*#__PURE__*/function () {
     key: "wrapThunk",
     value: function wrapThunk(action) {
       var _this2 = this;
+
       if (typeof action !== 'function') {
         return action;
       }
+
       return function (dispatch, getState) {
-        var promise = _this2._run(action, dispatch, getState);
-        // Attach a reference to the thunk on the promise so we can cancel it if
+        var promise = _this2._run(action, dispatch, getState); // Attach a reference to the thunk on the promise so we can cancel it if
         // an earlier promise fails
+
+
         promise.thunk = action;
+
         _this2.queue.push(promise);
+
         return promise;
       };
     }
   }, {
     key: "_run",
     value: function () {
-      var _run2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(thunk, dispatch, getState) {
+      var _run2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(thunk, dispatch, getState) {
         var _iterator, _step, promise;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return Promise.all(this.queue);
-            case 2:
-              _context.prev = 2;
-              if (!thunk.cancelled) {
-                _context.next = 5;
-                break;
-              }
-              return _context.abrupt("return");
-            case 5:
-              _context.next = 7;
-              return thunk(dispatch, getState);
-            case 7:
-              return _context.abrupt("return", _context.sent);
-            case 10:
-              _context.prev = 10;
-              _context.t0 = _context["catch"](2);
-              // If this thunk fails, cancel all pending thunks
-              _iterator = (0, _createForOfIteratorHelper2.default)(this.queue);
-              try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  promise = _step.value;
-                  promise.thunk.cancelled = true;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return Promise.all(this.queue);
+
+              case 2:
+                _context.prev = 2;
+
+                if (!thunk.cancelled) {
+                  _context.next = 5;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 5:
+                _context.next = 7;
+                return thunk(dispatch, getState);
+
+              case 7:
+                return _context.abrupt("return", _context.sent);
+
+              case 10:
+                _context.prev = 10;
+                _context.t0 = _context["catch"](2);
+                // If this thunk fails, cancel all pending thunks
+                _iterator = (0, _createForOfIteratorHelper2.default)(this.queue);
+
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    promise = _step.value;
+                    promise.thunk.cancelled = true;
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+
+                if (!this.errorHandler) {
+                  _context.next = 18;
+                  break;
                 }
-              } catch (err) {
-                _iterator.e(err);
-              } finally {
-                _iterator.f();
-              }
-              if (!this.errorHandler) {
-                _context.next = 18;
-                break;
-              }
-              return _context.abrupt("return", this.errorHandler(_context.t0, dispatch, getState));
-            case 18:
-              throw _context.t0;
-            case 19:
-              _context.prev = 19;
-              this.queue.shift();
-              return _context.finish(19);
-            case 22:
-            case "end":
-              return _context.stop();
+
+                return _context.abrupt("return", this.errorHandler(_context.t0, dispatch, getState));
+
+              case 18:
+                throw _context.t0;
+
+              case 19:
+                _context.prev = 19;
+                this.queue.shift();
+                return _context.finish(19);
+
+              case 22:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this, [[2, 10, 19, 22]]);
       }));
+
       function _run(_x, _x2, _x3) {
         return _run2.apply(this, arguments);
       }
+
       return _run;
     }()
   }]);
-}();
+  return ThunkQueue;
+}();
+
+exports.default = ThunkQueue;

package/lib/common/util/TimeRecordingService.js

@@ -1,45 +1,59 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.TimeRecordingService = void 0;
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var TimeRecordingService = exports.TimeRecordingService = /*#__PURE__*/function () {
+
+var TimeRecordingService = /*#__PURE__*/function () {
   function TimeRecordingService(recordQuizTime, updateTimerInfo) {
     var _this = this;
+
     (0, _classCallCheck2.default)(this, TimeRecordingService);
+
     this.__performApiCall = function () {
       _this._recordQuizTime(function () {
         var data = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+
         if (_this._stopped) {
           return;
         }
+
         _this._updateTimerInfo({
           timeRecording: data.timeRecording
         });
       });
     };
+
     this._recordQuizTime = recordQuizTime;
     this._updateTimerInfo = updateTimerInfo;
     this._stopped = false;
     this._apiInterval = null;
     this._apiTimeIncrement = 4000;
   }
-  return (0, _createClass2.default)(TimeRecordingService, [{
+
+  (0, _createClass2.default)(TimeRecordingService, [{
     key: "start",
     value: function start() {
       this.__performApiCall();
+
       this.__startApiInterval();
+
       return this;
     }
   }, {
     key: "stop",
     value: function stop() {
       this._stopped = true;
+
       this.__stopApiInterval();
+
       return this;
     }
   }, {
@@ -53,6 +67,7 @@ var TimeRecordingService = exports.TimeRecordingService = /*#__PURE__*/function
     key: "__startApiInterval",
     value: function __startApiInterval() {
       this.__ensureNotStopped();
+
       this._apiInterval = setInterval(this.__performApiCall, this._apiTimeIncrement);
     }
   }, {
@@ -62,5 +77,9 @@ var TimeRecordingService = exports.TimeRecordingService = /*#__PURE__*/function
       this._apiInterval = null;
     }
   }]);
+  return TimeRecordingService;
 }();
-var _default = exports.default = TimeRecordingService;
+
+exports.TimeRecordingService = TimeRecordingService;
+var _default = TimeRecordingService;
+exports.default = _default;

package/lib/common/util/TimerService.js

@@ -1,30 +1,46 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.TimerService = exports.MAX_SETTIMEOUT_IN_MILLISECONDS = void 0;
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
-var _reduxStore = _interopRequireDefault(require("../../reduxStore"));
-var MAX_SETTIMEOUT_IN_MILLISECONDS = exports.MAX_SETTIMEOUT_IN_MILLISECONDS = 20 * 24 * 3600 * 1000; // ms of 20 days
-var TimerService = exports.TimerService = /*#__PURE__*/function () {
+
+var _reduxStore = _interopRequireDefault(require("../../reduxStore.js"));
+
+var MAX_SETTIMEOUT_IN_MILLISECONDS = 20 * 24 * 3600 * 1000; // ms of 20 days
+
+exports.MAX_SETTIMEOUT_IN_MILLISECONDS = MAX_SETTIMEOUT_IN_MILLISECONDS;
+
+var TimerService = /*#__PURE__*/function () {
   function TimerService(getTimeRemaining, updateTimeRemaining, getTimerData, submitQuiz, alert) {
     var _this = this;
+
     (0, _classCallCheck2.default)(this, TimerService);
+
     this.__performApiCall = function () {
       _this._getTimeRemaining(function () {
         var data = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+
         if (_this._stopped) {
           return;
         }
+
         _this.__resetClockInterval(data.timerRunning && data.timeLeftInSeconds >= 0);
+
         _this.__onTimerChange(data);
+
         _this.__setApiCallIntervalTime(data.timeLeftInSeconds);
       });
     };
+
     this._getTimeRemaining = getTimeRemaining;
     this._updateTimeRemaining = updateTimeRemaining;
     this._getTimerData = getTimerData;
@@ -36,19 +52,25 @@ var TimerService = exports.TimerService = /*#__PURE__*/function () {
     this._apiTimeIncrement = 10000;
     this._clockTimeIncrement = 1000;
   }
-  return (0, _createClass2.default)(TimerService, [{
+
+  (0, _createClass2.default)(TimerService, [{
     key: "start",
     value: function start() {
       this.__performApiCall();
+
       this.__startApiInterval();
+
       return this;
     }
   }, {
     key: "stop",
     value: function stop() {
       this._stopped = true;
+
       this.__stopApiInterval();
+
       this.__stopClockInterval();
+
       return this;
     }
   }, {
@@ -62,6 +84,7 @@ var TimerService = exports.TimerService = /*#__PURE__*/function () {
     key: "__startApiInterval",
     value: function __startApiInterval() {
       this.__ensureNotStopped();
+
       this._apiInterval = setInterval(this.__performApiCall, this._apiTimeIncrement);
     }
   }, {
@@ -74,15 +97,19 @@ var TimerService = exports.TimerService = /*#__PURE__*/function () {
     key: "__resetApiCallInterval",
     value: function __resetApiCallInterval() {
       this.__stopApiInterval();
+
       this.__startApiInterval();
     }
   }, {
     key: "__setApiCallIntervalTime",
     value: function __setApiCallIntervalTime(timeLeftInSeconds) {
       var startIncrement = this._apiTimeIncrement;
+
       var newIncrement = this.__nextIncrement(timeLeftInSeconds);
+
       if (startIncrement !== newIncrement) {
         this._apiTimeIncrement = newIncrement;
+
         this.__resetApiCallInterval();
       }
     }
@@ -92,34 +119,44 @@ var TimerService = exports.TimerService = /*#__PURE__*/function () {
       if (Number.isNaN(timeLeftInSeconds - 0)) {
         return 30000;
       }
+
       if (timeLeftInSeconds < 180) {
         return 15000;
       } else if (timeLeftInSeconds < 7200) {
         return 150000;
       }
+
       var interval = Math.max(15000, Math.floor(timeLeftInSeconds * 500)); // timeLeft/2
+
       return Math.min(interval, MAX_SETTIMEOUT_IN_MILLISECONDS);
     }
   }, {
     key: "__startClockInterval",
     value: function __startClockInterval() {
       var _this2 = this;
+
       this.__ensureNotStopped();
+
       var action = function action() {
         var state = _reduxStore.default.getAppState();
+
         var _this2$_getTimerData$ = _this2._getTimerData(state).toJS(),
-          timerRunning = _this2$_getTimerData$.timerRunning,
-          timeLeftInSeconds = _this2$_getTimerData$.timeLeftInSeconds;
+            timerRunning = _this2$_getTimerData$.timerRunning,
+            timeLeftInSeconds = _this2$_getTimerData$.timeLeftInSeconds;
+
         if (!timerRunning || timeLeftInSeconds !== 0 && !timeLeftInSeconds) {
           return;
         }
+
         var delta = Math.round(_this2._clockTimeIncrement / 1000);
         var newTimeLeftInSeconds = timeLeftInSeconds - delta;
+
         _this2.__onTimerChange({
           timerRunning: timerRunning,
           timeLeftInSeconds: newTimeLeftInSeconds
         });
       };
+
       this._clockInterval = setInterval(action, this._clockTimeIncrement);
     }
   }, {
@@ -132,7 +169,9 @@ var TimerService = exports.TimerService = /*#__PURE__*/function () {
     key: "__resetClockInterval",
     value: function __resetClockInterval() {
       var startClock = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true;
+
       this.__stopClockInterval();
+
       if (startClock) {
         this.__startClockInterval();
       }
@@ -141,21 +180,35 @@ var TimerService = exports.TimerService = /*#__PURE__*/function () {
     key: "__onTimerChange",
     value: function __onTimerChange(_ref) {
       var timerRunning = _ref.timerRunning,
-        timeLeftInSeconds = _ref.timeLeftInSeconds;
+          timeLeftInSeconds = _ref.timeLeftInSeconds;
+
       var state = _reduxStore.default.getAppState();
+
       var prevTimerData = this._getTimerData(state);
+
       this._updateTimeRemaining({
         timerRunning: timerRunning,
         timeLeftInSeconds: timeLeftInSeconds
       });
+
+      if (prevTimerData.get('timeLeftInSeconds') > 120 && timeLeftInSeconds <= 120) {
+        this._alert((0, _formatMessage.default)('You have less than 2 minutes remaining.'));
+      }
+
       if (prevTimerData.get('timeLeftInSeconds') > 30 && timeLeftInSeconds <= 30) {
         this._alert((0, _formatMessage.default)('You have less than 30 seconds remaining.'));
       }
+
       if (timeLeftInSeconds !== null && timeLeftInSeconds <= 0) {
         this.stop();
+
         this._submitQuiz();
       }
     }
   }]);
+  return TimerService;
 }();
-var _default = exports.default = TimerService;
+
+exports.TimerService = TimerService;
+var _default = TimerService;
+exports.default = _default;

package/lib/common/util/cachePreviousArgs.js

@@ -1,24 +1,32 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
 var _this = void 0;
-var _default = exports.default = function _default(fn) {
+
+var _default = function _default(fn) {
   var prevArgs = null;
   var cachedValue;
   return function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
+
     if ((0, _isEqual.default)(args, prevArgs)) {
       return cachedValue;
     }
+
     prevArgs = args;
     cachedValue = fn.apply(_this, args);
     return cachedValue;
   };
-};
+};
+
+exports.default = _default;