@instructure/quiz-core 20.17.3-rc.8 → 20.18.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [20.18.0](https://gerrit.instructure.com/quizzes-ui/compare/v20.17.2...v20.18.0) (2024-09-26)
+
+
+### Bug Fixes
+
+* **quizzes-ui:** Add data-automation tags for impact integration ([9b710b8](https://gerrit.instructure.com/quizzes-ui/commits/9b710b87929cc2d203de0f9f68e75a5e2b1a3150))
+
+
+### Features
+
+* update remaining time in quiz session ([3a1a914](https://gerrit.instructure.com/quizzes-ui/commits/3a1a91424ba174b7f2a39cf2a8a4d669dae120ab))
+* **quizzes-ui:** add 2-minute alert to timed quiz ([6bb83e9](https://gerrit.instructure.com/quizzes-ui/commits/6bb83e953ae989bc88975922051044bef9e4d7ce))
+* **quizzes-ui:** add page_blurred/page_focused events ([2c6b692](https://gerrit.instructure.com/quizzes-ui/commits/2c6b6928b7a2f7926ab1757884ee63bcff6c4c37))
+* add Cancel and Close button to ModerateTray ([e41ad88](https://gerrit.instructure.com/quizzes-ui/commits/e41ad88aaef2af576f53ff0e212c6d793db74bf4))
+* refactor ingress for AccommodationModal and ModerateTray ([7c49355](https://gerrit.instructure.com/quizzes-ui/commits/7c49355a8b03cd20dabf480c2ba6c8c616a7eb65))
+
+
+
+
+
 ## [20.17.2](https://gerrit.instructure.com/quizzes-ui/compare/v20.17.1...v20.17.2) (2024-09-05)
 
 

package/es/common/actions/taking.js

@@ -1,5 +1,5 @@
 import { v4 as uuid } from 'uuid';
-import { BACKTRACKING_NEXT_QUESTION, CLEAR_FOCUS_CURRENT_SESSION_ITEM, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, QUIZ_SUBMISSION_EVENT, UPDATE_QUIZ_SUBMIT_FLAG, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, SET_FOCUS_TITLE_AND_INSTRUCTIONS, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, UPDATE_TIMER_INFO, PAGE_BLURRED_EVENT, PAGE_FOCUSED_EVENT } from '@instructure/quiz-common';
+import { BACKTRACKING_NEXT_QUESTION, CLEAR_FOCUS_CURRENT_SESSION_ITEM, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, QUIZ_SUBMISSION_EVENT, UPDATE_QUIZ_SUBMIT_FLAG, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, SET_FOCUS_TITLE_AND_INSTRUCTIONS, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, UPDATE_TIMER_INFO, SET_WS_TOKEN, PAGE_BLURRED_EVENT, PAGE_FOCUSED_EVENT } from '@instructure/quiz-common';
 export var setCurrentSessionItemPosition = function setCurrentSessionItemPosition(position) {
   return {
     type: SET_CURRENT_SESSION_ITEM_POSITION,
@@ -135,6 +135,14 @@ export var submitQuizSessionEvent = function submitQuizSessionEvent() {
     payload: {}
   };
 };
+export var setWSToken = function setWSToken(wsToken) {
+  return {
+    type: SET_WS_TOKEN,
+    payload: {
+      wsToken: wsToken
+    }
+  };
+};
 export var updateQuizSubmitFlag = function updateQuizSubmitFlag(value) {
   return {
     type: UPDATE_QUIZ_SUBMIT_FLAG,

package/es/common/middleware/quizTimerWebSocketMiddleware.js

@@ -0,0 +1,91 @@
+import { SET_WS_TOKEN, QUIZ_SUBMISSION_EVENT } from '@instructure/quiz-common';
+import { featureOn } from "../../common/util/featureCheck.js";
+import { formatTime } from "../../common/util/formatTimespan.js";
+import { updateTime, notifyTimeAdded } from "../../taking/api/taking.js";
+import { bindActionCreators } from 'redux';
+var takingApiActions = {
+  updateTime: updateTime,
+  notifyTimeAdded: notifyTimeAdded
+};
+export var createWebsocket = function createWebsocket(url, token) {
+  return new WebSocket("".concat(url, "?token=").concat(token));
+};
+export var handleExtraTime = function handleExtraTime(extraTimeInSeconds, endAt, updateTimeAction, notifyTimeAdded) {
+  var remainingTimeInMs = new Date(endAt) - Date.now();
+  var remainingTimeInSeconds = Math.floor(remainingTimeInMs / 1000);
+  var formattedExtraTimeText = formatTime(extraTimeInSeconds);
+  updateTimeAction(remainingTimeInSeconds);
+  notifyTimeAdded(formattedExtraTimeText);
+};
+export var parseJwt = function parseJwt(token) {
+  try {
+    return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
+  } catch (e) {
+    return null;
+  }
+};
+export var initializeWebSocket = function initializeWebSocket(token, createWebsocketFn) {
+  var jwt = parseJwt(token);
+
+  if (!jwt) {
+    return null;
+  }
+
+  return createWebsocketFn(jwt['aud'], token);
+};
+export var handleWebSocketMessage = function handleWebSocketMessage(webSocketMessage, boundTakingApiActions, handleExtraTimeFn) {
+  var _webSocketMessageData, _webSocketMessageData2, _webSocketMessageData3;
+
+  var webSocketMessageData = JSON.parse(webSocketMessage.data);
+  webSocketMessageData = ((_webSocketMessageData = webSocketMessageData) === null || _webSocketMessageData === void 0 ? void 0 : (_webSocketMessageData2 = _webSocketMessageData.message) === null || _webSocketMessageData2 === void 0 ? void 0 : _webSocketMessageData2.data) || ((_webSocketMessageData3 = webSocketMessageData) === null || _webSocketMessageData3 === void 0 ? void 0 : _webSocketMessageData3.data);
+
+  if (!webSocketMessageData) {
+    return;
+  }
+
+  var extra_time_in_seconds = webSocketMessageData.extra_time_in_seconds;
+  var end_at = webSocketMessageData.end_at;
+
+  if (!extra_time_in_seconds || !end_at) {
+    return;
+  }
+
+  handleExtraTimeFn(extra_time_in_seconds, end_at, boundTakingApiActions.updateTime, boundTakingApiActions.notifyTimeAdded);
+};
+export var createQuizTimerWebSocketMiddleware = function createQuizTimerWebSocketMiddleware() {
+  var createWebsocketFn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : createWebsocket;
+  var featureOnFn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : featureOn;
+  var socket = null;
+  return function (store) {
+    return function (next) {
+      return function (action) {
+        var addTimeToExistingQuizSessionsEnabled = featureOnFn('add_time_to_existing_quiz_sessions');
+
+        if (!addTimeToExistingQuizSessionsEnabled) {
+          return next(action);
+        }
+
+        if (action.type === SET_WS_TOKEN && socket === null) {
+          var token = action.payload.wsToken;
+          socket = initializeWebSocket(token, createWebsocketFn);
+
+          if (!socket) {
+            return next(action);
+          }
+
+          var boundTakingApiActions = bindActionCreators(takingApiActions, store.dispatch);
+          socket.addEventListener('message', function (webSocketMessage) {
+            handleWebSocketMessage(webSocketMessage, boundTakingApiActions, handleExtraTime);
+          });
+        }
+
+        if (action.type === QUIZ_SUBMISSION_EVENT && socket !== null) {
+          socket.close();
+          socket = null;
+        }
+
+        return next(action);
+      };
+    };
+  };
+};

package/es/common/reducers/taking.js

@@ -1,5 +1,5 @@
 import { Map } from 'immutable';
-import { ACTIVE_QUIZ_SESSION_CHANGE, UPDATE_TIMER_INFO, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, BACKTRACKING_NEXT_QUESTION, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, CLEAR_FOCUS_CURRENT_SESSION_ITEM, SET_FOCUS_TITLE_AND_INSTRUCTIONS, UPDATE_QUIZ_SUBMIT_FLAG } from '@instructure/quiz-common';
+import { ACTIVE_QUIZ_SESSION_CHANGE, UPDATE_TIMER_INFO, UPDATE_IS_TAKING, UPDATE_QUIZ_SESSION_STATUS_ON_PAGE_LOAD, UPDATE_TIMER_MINIMIZED, LOAD_RESUME_DATA, PREVIEW_RESPONSE, PREVIOUS_QUESTION, BACKTRACKING_NEXT_QUESTION, RESPONSE, SESSION_STARTED_OR_RESUMED_EVENT, SET_CURRENT_SESSION_ITEM_POSITION, CLEAR_FOCUS_CURRENT_SESSION_ITEM, SET_FOCUS_TITLE_AND_INSTRUCTIONS, UPDATE_QUIZ_SUBMIT_FLAG, SET_WS_TOKEN } from '@instructure/quiz-common';
 
 var defaultResponse = function defaultResponse(payload) {
   return Map({
@@ -53,6 +53,10 @@ var updateTimerInfo = function updateTimerInfo(state, payload) {
   return state.mergeIn(['timerData'], payload);
 };
 
+var setWSToken = function setWSToken(state, payload) {
+  return state.set('wsToken', payload === null || payload === void 0 ? void 0 : payload.wsToken);
+};
+
 var updateTimerMinimized = function updateTimerMinimized(state, payload) {
   return state.setIn(['timerData', 'timerMinimized'], payload.timerMinimized);
 };
@@ -126,6 +130,9 @@ export default (function () {
     case UPDATE_TIMER_INFO:
       return updateTimerInfo(state, action.payload);
 
+    case SET_WS_TOKEN:
+      return setWSToken(state, action.payload);
+
     case SET_CURRENT_SESSION_ITEM_POSITION:
       return setCurrentSessionItemPosition(state, action.payload);
 

package/es/common/util/TimerService.js

@@ -5,7 +5,7 @@ import reduxStore from "../../reduxStore.js";
 export var MAX_SETTIMEOUT_IN_MILLISECONDS = 20 * 24 * 3600 * 1000; // ms of 20 days
 
 export var TimerService = /*#__PURE__*/function () {
-  function TimerService(getTimeRemaining, updateTimeRemaining, getTimerData, submitQuiz, alert) {
+  function TimerService(getTimeRemaining, updateTimeRemaining, getTimerData, submitQuiz, alert, setWsToken) {
     var _this = this;
 
     _classCallCheck(this, TimerService);
@@ -23,6 +23,10 @@ export var TimerService = /*#__PURE__*/function () {
         _this.__onTimerChange(data);
 
         _this.__setApiCallIntervalTime(data.timeLeftInSeconds);
+
+        if (_this._setWsToken) {
+          _this._setWsToken(data.wsToken);
+        }
       });
     };
 
@@ -31,6 +35,7 @@ export var TimerService = /*#__PURE__*/function () {
     this._getTimerData = getTimerData;
     this._submitQuiz = submitQuiz;
     this._alert = alert;
+    this._setWsToken = setWsToken;
     this._stopped = false;
     this._apiInterval = null;
     this._clockInterval = null;

package/es/configureStore.js

@@ -9,7 +9,8 @@ import multi from 'redux-multi';
 import thunkMiddleware from 'redux-thunk';
 import alertTimerMiddleware from "./common/middleware/alertTimerMiddleware.js";
 import crossDomainMessagingMiddleware from "./common/middleware/crossDomainMessagingMiddleware.js";
-import eventLoggerMiddlewareCreator from "./common/middleware/eventLoggerMiddleware.js"; // reducers
+import eventLoggerMiddlewareCreator from "./common/middleware/eventLoggerMiddleware.js";
+import { createQuizTimerWebSocketMiddleware } from "./common/middleware/quizTimerWebSocketMiddleware.js"; // reducers
 
 import alerts from "./common/reducers/alerts.js";
 import banks from "./common/reducers/banks.js";
@@ -69,7 +70,8 @@ export function configureStore(_ref) {
     }
   });
   var kinesisMiddleware = eventLoggerMiddlewareCreator();
-  var baseMiddleware = [alertTimerMiddleware, crossDomainMessagingMiddleware, multi, kinesisMiddleware, thunkMiddleware];
+  var websocketMiddleware = createQuizTimerWebSocketMiddleware();
+  var baseMiddleware = [alertTimerMiddleware, crossDomainMessagingMiddleware, multi, kinesisMiddleware, thunkMiddleware, websocketMiddleware];
   var devMiddleware = [loggerMiddleware];
   var middlewareToApply = inDevelopment ? union(baseMiddleware, devMiddleware) : baseMiddleware;
   middlewareToApply = union(middlewareToApply, extraMiddleware);

package/es/index.js

@@ -1,4 +1,12 @@
 /* eslint "import/newline-after-import": "warn" */
+
+/**
+*
+* In g/356542 we tried importing takingApiActions from here, and it caused a weird karma issue.
+* Nothing from this file should be imported from within quiz-core!
+* These exports are for other packages to use.
+* We should look into configuring an import/no-restricted-paths eslint rule to prevent this.
+*/
 // Components
 export { DragDroppableSDKApp as SDKApp } from "./common/components/SDKApp/index.js";
 export { ModerateTable } from "./moderating/components/resources/ModerateTable/index.js";

package/es/taking/api/taking.js

@@ -11,7 +11,7 @@ import { Map } from 'immutable';
 import { camelizeKeys } from 'humps';
 import t from '@instructure/quiz-i18n/es/format-message';
 import noop from "../../common/util/noop.js";
-import { screenreaderNotification } from "../../common/actions/alerts.js";
+import { addInfo, screenreaderNotification } from "../../common/actions/alerts.js";
 import Item from "../../common/records/Item.js";
 import { featureOn } from "../../common/util/featureCheck.js";
 import { fetchLogger } from "../../common/kinesis/QuizEventsLogger.js";
@@ -21,7 +21,7 @@ import { fetchQuizSession, fetchResumeData, fetchTime, recordTime, singleRespons
 import { getSessionItems, handleQuizSessionFetch } from "../../common/actions/quizSessions.js";
 import { handleSessionItemsResponse, handleResumeDataResponse, handleQuizSessionResponse } from "../../common/api/callHandlers.js";
 import * as modalActions from "../../common/actions/modal.js";
-import { backtrackingNextQuestion, sessionStartOrResumeEvent, setCurrentSessionItemPosition, submitQuizSessionEvent, updateQuizSubmitFlag, updateQuizSessionStatusOnPageLoad } from "../../common/actions/taking.js";
+import { backtrackingNextQuestion, sessionStartOrResumeEvent, setCurrentSessionItemPosition, submitQuizSessionEvent, updateQuizSubmitFlag, updateQuizSessionStatusOnPageLoad, updateTimerInfo } from "../../common/actions/taking.js";
 
 var getQuizSessionConfig = function getQuizSessionConfig(quizSession) {
   // these should be handled by existing functions
@@ -244,6 +244,22 @@ export function submitQuiz(quizSessionId) {
     }
   };
 }
+export function notifyTimeAdded(extraTime) {
+  return function (dispatch) {
+    return dispatch(addInfo(t('Your original time limit has been extended by { extraTime }', {
+      extraTime: extraTime
+    })));
+  };
+}
+export function updateTime(timeInSeconds) {
+  return function (dispatch) {
+    return dispatch(updateTimerInfo({
+      timeLeftInSeconds: timeInSeconds,
+      timerRunning: true,
+      timeRecording: true
+    }));
+  };
+}
 
 function getQuestionsNeedingAResponse(state, quizSessionId) {
   var responses = state.getIn(['taking', 'responses'], Map());

package/lib/common/actions/taking.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateQuizSubmitFlag = exports.submitQuizSessionEvent = exports.reportPageFocusedEvent = exports.reportPageBlurredEvent = exports.sessionStartOrResumeEvent = exports.loadResumeData = exports.editResponse = exports.previewResponse = exports.updateTimerInfo = exports.updateQuizSessionStatusOnPageLoad = exports.updateIsTaking = exports.updateTimerMinimized = exports.backtrackingNextQuestion = exports.previousQuestion = exports.setFocusTitleAndInstructions = exports.clearFocusCurrentSessionItem = exports.setCurrentSessionItemPosition = void 0;
+exports.updateQuizSubmitFlag = exports.setWSToken = exports.submitQuizSessionEvent = exports.reportPageFocusedEvent = exports.reportPageBlurredEvent = exports.sessionStartOrResumeEvent = exports.loadResumeData = exports.editResponse = exports.previewResponse = exports.updateTimerInfo = exports.updateQuizSessionStatusOnPageLoad = exports.updateIsTaking = exports.updateTimerMinimized = exports.backtrackingNextQuestion = exports.previousQuestion = exports.setFocusTitleAndInstructions = exports.clearFocusCurrentSessionItem = exports.setCurrentSessionItemPosition = void 0;
 
 var _uuid = require("uuid");
 
@@ -192,6 +192,17 @@ var submitQuizSessionEvent = function submitQuizSessionEvent() {
 
 exports.submitQuizSessionEvent = submitQuizSessionEvent;
 
+var setWSToken = function setWSToken(wsToken) {
+  return {
+    type: _quizCommon.SET_WS_TOKEN,
+    payload: {
+      wsToken: wsToken
+    }
+  };
+};
+
+exports.setWSToken = setWSToken;
+
 var updateQuizSubmitFlag = function updateQuizSubmitFlag(value) {
   return {
     type: _quizCommon.UPDATE_QUIZ_SUBMIT_FLAG,

package/lib/common/middleware/quizTimerWebSocketMiddleware.js

@@ -0,0 +1,121 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createQuizTimerWebSocketMiddleware = exports.handleWebSocketMessage = exports.initializeWebSocket = exports.parseJwt = exports.handleExtraTime = exports.createWebsocket = void 0;
+
+var _quizCommon = require("@instructure/quiz-common");
+
+var _featureCheck = require("../../common/util/featureCheck.js");
+
+var _formatTimespan = require("../../common/util/formatTimespan.js");
+
+var _taking = require("../../taking/api/taking.js");
+
+var _redux = require("redux");
+
+var takingApiActions = {
+  updateTime: _taking.updateTime,
+  notifyTimeAdded: _taking.notifyTimeAdded
+};
+
+var createWebsocket = function createWebsocket(url, token) {
+  return new WebSocket("".concat(url, "?token=").concat(token));
+};
+
+exports.createWebsocket = createWebsocket;
+
+var handleExtraTime = function handleExtraTime(extraTimeInSeconds, endAt, updateTimeAction, notifyTimeAdded) {
+  var remainingTimeInMs = new Date(endAt) - Date.now();
+  var remainingTimeInSeconds = Math.floor(remainingTimeInMs / 1000);
+  var formattedExtraTimeText = (0, _formatTimespan.formatTime)(extraTimeInSeconds);
+  updateTimeAction(remainingTimeInSeconds);
+  notifyTimeAdded(formattedExtraTimeText);
+};
+
+exports.handleExtraTime = handleExtraTime;
+
+var parseJwt = function parseJwt(token) {
+  try {
+    return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
+  } catch (e) {
+    return null;
+  }
+};
+
+exports.parseJwt = parseJwt;
+
+var initializeWebSocket = function initializeWebSocket(token, createWebsocketFn) {
+  var jwt = parseJwt(token);
+
+  if (!jwt) {
+    return null;
+  }
+
+  return createWebsocketFn(jwt['aud'], token);
+};
+
+exports.initializeWebSocket = initializeWebSocket;
+
+var handleWebSocketMessage = function handleWebSocketMessage(webSocketMessage, boundTakingApiActions, handleExtraTimeFn) {
+  var _webSocketMessageData, _webSocketMessageData2, _webSocketMessageData3;
+
+  var webSocketMessageData = JSON.parse(webSocketMessage.data);
+  webSocketMessageData = ((_webSocketMessageData = webSocketMessageData) === null || _webSocketMessageData === void 0 ? void 0 : (_webSocketMessageData2 = _webSocketMessageData.message) === null || _webSocketMessageData2 === void 0 ? void 0 : _webSocketMessageData2.data) || ((_webSocketMessageData3 = webSocketMessageData) === null || _webSocketMessageData3 === void 0 ? void 0 : _webSocketMessageData3.data);
+
+  if (!webSocketMessageData) {
+    return;
+  }
+
+  var extra_time_in_seconds = webSocketMessageData.extra_time_in_seconds;
+  var end_at = webSocketMessageData.end_at;
+
+  if (!extra_time_in_seconds || !end_at) {
+    return;
+  }
+
+  handleExtraTimeFn(extra_time_in_seconds, end_at, boundTakingApiActions.updateTime, boundTakingApiActions.notifyTimeAdded);
+};
+
+exports.handleWebSocketMessage = handleWebSocketMessage;
+
+var createQuizTimerWebSocketMiddleware = function createQuizTimerWebSocketMiddleware() {
+  var createWebsocketFn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : createWebsocket;
+  var featureOnFn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _featureCheck.featureOn;
+  var socket = null;
+  return function (store) {
+    return function (next) {
+      return function (action) {
+        var addTimeToExistingQuizSessionsEnabled = featureOnFn('add_time_to_existing_quiz_sessions');
+
+        if (!addTimeToExistingQuizSessionsEnabled) {
+          return next(action);
+        }
+
+        if (action.type === _quizCommon.SET_WS_TOKEN && socket === null) {
+          var token = action.payload.wsToken;
+          socket = initializeWebSocket(token, createWebsocketFn);
+
+          if (!socket) {
+            return next(action);
+          }
+
+          var boundTakingApiActions = (0, _redux.bindActionCreators)(takingApiActions, store.dispatch);
+          socket.addEventListener('message', function (webSocketMessage) {
+            handleWebSocketMessage(webSocketMessage, boundTakingApiActions, handleExtraTime);
+          });
+        }
+
+        if (action.type === _quizCommon.QUIZ_SUBMISSION_EVENT && socket !== null) {
+          socket.close();
+          socket = null;
+        }
+
+        return next(action);
+      };
+    };
+  };
+};
+
+exports.createQuizTimerWebSocketMiddleware = createQuizTimerWebSocketMiddleware;

package/lib/common/reducers/taking.js

@@ -61,6 +61,10 @@ var updateTimerInfo = function updateTimerInfo(state, payload) {
   return state.mergeIn(['timerData'], payload);
 };
 
+var setWSToken = function setWSToken(state, payload) {
+  return state.set('wsToken', payload === null || payload === void 0 ? void 0 : payload.wsToken);
+};
+
 var updateTimerMinimized = function updateTimerMinimized(state, payload) {
   return state.setIn(['timerData', 'timerMinimized'], payload.timerMinimized);
 };
@@ -134,6 +138,9 @@ var _default = function _default() {
     case _quizCommon.UPDATE_TIMER_INFO:
       return updateTimerInfo(state, action.payload);
 
+    case _quizCommon.SET_WS_TOKEN:
+      return setWSToken(state, action.payload);
+
     case _quizCommon.SET_CURRENT_SESSION_ITEM_POSITION:
       return setCurrentSessionItemPosition(state, action.payload);
 

package/lib/common/util/TimerService.js

@@ -20,7 +20,7 @@ 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) {
+  function TimerService(getTimeRemaining, updateTimeRemaining, getTimerData, submitQuiz, alert, setWsToken) {
     var _this = this;
 
     (0, _classCallCheck2.default)(this, TimerService);
@@ -38,6 +38,10 @@ var TimerService = /*#__PURE__*/function () {
         _this.__onTimerChange(data);
 
         _this.__setApiCallIntervalTime(data.timeLeftInSeconds);
+
+        if (_this._setWsToken) {
+          _this._setWsToken(data.wsToken);
+        }
       });
     };
 
@@ -46,6 +50,7 @@ var TimerService = /*#__PURE__*/function () {
     this._getTimerData = getTimerData;
     this._submitQuiz = submitQuiz;
     this._alert = alert;
+    this._setWsToken = setWsToken;
     this._stopped = false;
     this._apiInterval = null;
     this._clockInterval = null;

package/lib/configureStore.js

@@ -30,6 +30,8 @@ var _crossDomainMessagingMiddleware = _interopRequireDefault(require("./common/m
 
 var _eventLoggerMiddleware = _interopRequireDefault(require("./common/middleware/eventLoggerMiddleware.js"));
 
+var _quizTimerWebSocketMiddleware = require("./common/middleware/quizTimerWebSocketMiddleware.js");
+
 var _alerts = _interopRequireDefault(require("./common/reducers/alerts.js"));
 
 var _banks = _interopRequireDefault(require("./common/reducers/banks.js"));
@@ -129,7 +131,8 @@ function configureStore(_ref) {
     }
   });
   var kinesisMiddleware = (0, _eventLoggerMiddleware.default)();
-  var baseMiddleware = [_alertTimerMiddleware.default, _crossDomainMessagingMiddleware.default, _reduxMulti.default, kinesisMiddleware, _reduxThunk.default];
+  var websocketMiddleware = (0, _quizTimerWebSocketMiddleware.createQuizTimerWebSocketMiddleware)();
+  var baseMiddleware = [_alertTimerMiddleware.default, _crossDomainMessagingMiddleware.default, _reduxMulti.default, kinesisMiddleware, _reduxThunk.default, websocketMiddleware];
   var devMiddleware = [loggerMiddleware];
   var middlewareToApply = inDevelopment ? (0, _union.default)(baseMiddleware, devMiddleware) : baseMiddleware;
   middlewareToApply = (0, _union.default)(middlewareToApply, extraMiddleware);

package/lib/taking/api/taking.js

@@ -13,6 +13,8 @@ exports.onQuizSessionReadyForTaking = onQuizSessionReadyForTaking;
 exports.showSubmitConfirmModal = showSubmitConfirmModal;
 exports.closeSubmitConfirmModal = closeSubmitConfirmModal;
 exports.submitQuiz = submitQuiz;
+exports.notifyTimeAdded = notifyTimeAdded;
+exports.updateTime = updateTime;
 exports.postQuizSession = postQuizSession;
 exports.getTimeRemaining = getTimeRemaining;
 exports.recordQuizTime = recordQuizTime;
@@ -299,6 +301,24 @@ function submitQuiz(quizSessionId) {
   };
 }
 
+function notifyTimeAdded(extraTime) {
+  return function (dispatch) {
+    return dispatch((0, _alerts.addInfo)((0, _formatMessage.default)('Your original time limit has been extended by { extraTime }', {
+      extraTime: extraTime
+    })));
+  };
+}
+
+function updateTime(timeInSeconds) {
+  return function (dispatch) {
+    return dispatch((0, _taking.updateTimerInfo)({
+      timeLeftInSeconds: timeInSeconds,
+      timerRunning: true,
+      timeRecording: true
+    }));
+  };
+}
+
 function getQuestionsNeedingAResponse(state, quizSessionId) {
   var responses = state.getIn(['taking', 'responses'], (0, _immutable.Map)());
   var sessionItems = state.get('sessionItems', (0, _immutable.Map)()).filter(function (record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.17.3-rc.8+5b0889533",
+  "version": "20.18.0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -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.17.3-rc.8+5b0889533",
-    "@instructure/quiz-i18n": "20.17.3-rc.8+5b0889533",
-    "@instructure/quiz-interactions": "20.17.3-rc.8+5b0889533",
-    "@instructure/quiz-number-input": "20.17.3-rc.8+5b0889533",
-    "@instructure/quiz-rce": "20.17.3-rc.8+5b0889533",
+    "@instructure/quiz-common": "^20.18.0",
+    "@instructure/quiz-i18n": "^20.18.0",
+    "@instructure/quiz-interactions": "^20.18.0",
+    "@instructure/quiz-number-input": "^20.18.0",
+    "@instructure/quiz-rce": "^20.18.0",
     "@instructure/ui-a11y-content": "^8.51.0",
     "@instructure/ui-alerts": "^8.51.0",
     "@instructure/ui-avatar": "^8.51.0",
@@ -111,7 +111,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "20.17.3-rc.8+5b0889533",
+    "instructure-validations": "^20.18.0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -142,7 +142,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "20.17.2",
+    "@instructure/quiz-scripts": "^20.18.0",
     "@instructure/ui-axe-check": "^8.51.0",
     "@instructure/ui-babel-preset": "^7.22.1",
     "@instructure/ui-scripts": "^7.22.1",
@@ -161,7 +161,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "20.17.3-rc.8+5b0889533",
+    "quiz-presets": "^20.18.0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -177,5 +177,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5b08895339358b601d561900f69662645e563629"
+  "gitHead": "912c7147e9aa9aaca1ec571cbb2afb0f28023a6c"
 }