@instructure/quiz-core 20.18.1-rc.1 → 20.19.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [20.19.0](https://gerrit.instructure.com/quizzes-ui/compare/v20.18.0...v20.19.0) (2024-10-01)
+
+
+### Bug Fixes
+
+* check 'add_time_to_existing_quiz_sessions' only on SET_WS_TOKEN action ([2937efc](https://gerrit.instructure.com/quizzes-ui/commits/2937efc1fed97381567c711156370de5fb0a7375))
+
+
+### Features
+
+* **instfs_links:** fix issue where bank entries... ([70dd69c](https://gerrit.instructure.com/quizzes-ui/commits/70dd69c4d96b54c29d5adb229c7d6b7dad4f602c))
+* **instfs_links:** Shift bank entry copy to use the all in one endpoint ([392e66e](https://gerrit.instructure.com/quizzes-ui/commits/392e66e66be84e073171f29b85edaf54330b3b8f))
+
+
+
+
+
 # [20.18.0](https://gerrit.instructure.com/quizzes-ui/compare/v20.17.2...v20.18.0) (2024-09-26)
 
 

package/es/common/middleware/quizTimerWebSocketMiddleware.js

@@ -14,8 +14,9 @@ export var handleExtraTime = function handleExtraTime(extraTimeInSeconds, endAt,
   var remainingTimeInMs = new Date(endAt) - Date.now();
   var remainingTimeInSeconds = Math.floor(remainingTimeInMs / 1000);
   var formattedExtraTimeText = formatTime(extraTimeInSeconds);
-  updateTimeAction(remainingTimeInSeconds);
-  notifyTimeAdded(formattedExtraTimeText);
+  var isUnlimited = endAt === null && extraTimeInSeconds === null;
+  updateTimeAction(remainingTimeInSeconds, !isUnlimited);
+  notifyTimeAdded(!isUnlimited, !isUnlimited ? formattedExtraTimeText : null);
 };
 export var parseJwt = function parseJwt(token) {
   try {
@@ -43,14 +44,13 @@ export var handleWebSocketMessage = function handleWebSocketMessage(webSocketMes
     return;
   }
 
-  var extra_time_in_seconds = webSocketMessageData.extra_time_in_seconds;
-  var end_at = webSocketMessageData.end_at;
+  var type = webSocketMessageData.type;
 
-  if (!extra_time_in_seconds || !end_at) {
+  if (type !== 'accommodation_changed') {
     return;
   }
 
-  handleExtraTimeFn(extra_time_in_seconds, end_at, boundTakingApiActions.updateTime, boundTakingApiActions.notifyTimeAdded);
+  handleExtraTimeFn(webSocketMessageData.extra_time_in_seconds, webSocketMessageData.end_at, boundTakingApiActions.updateTime, boundTakingApiActions.notifyTimeAdded);
 };
 export var createQuizTimerWebSocketMiddleware = function createQuizTimerWebSocketMiddleware() {
   var createWebsocketFn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : createWebsocket;
@@ -59,13 +59,7 @@ export var createQuizTimerWebSocketMiddleware = function createQuizTimerWebSocke
   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) {
+        if (action.type === SET_WS_TOKEN && featureOnFn('add_time_to_existing_quiz_sessions') && socket === null) {
           var token = action.payload.wsToken;
           socket = initializeWebSocket(token, createWebsocketFn);
 

package/es/taking/api/taking.js

@@ -244,19 +244,20 @@ export function submitQuiz(quizSessionId) {
     }
   };
 }
-export function notifyTimeAdded(extraTime) {
+export function notifyTimeAdded(isUnlimited, extraTime) {
   return function (dispatch) {
-    return dispatch(addInfo(t('Your original time limit has been extended by { extraTime }', {
+    var message = isUnlimited ? t('Your original time limit has been extended by { extraTime }', {
       extraTime: extraTime
-    })));
+    }) : t('Unlimited time accommodation has been added to your quiz');
+    return dispatch(addInfo(message));
   };
 }
-export function updateTime(timeInSeconds) {
+export function updateTime(timeInSeconds, timerRunning) {
   return function (dispatch) {
     return dispatch(updateTimerInfo({
       timeLeftInSeconds: timeInSeconds,
-      timerRunning: true,
-      timeRecording: true
+      timerRunning: timerRunning,
+      timeRecording: false
     }));
   };
 }

package/lib/common/middleware/quizTimerWebSocketMiddleware.js

@@ -30,8 +30,9 @@ var handleExtraTime = function handleExtraTime(extraTimeInSeconds, endAt, update
   var remainingTimeInMs = new Date(endAt) - Date.now();
   var remainingTimeInSeconds = Math.floor(remainingTimeInMs / 1000);
   var formattedExtraTimeText = (0, _formatTimespan.formatTime)(extraTimeInSeconds);
-  updateTimeAction(remainingTimeInSeconds);
-  notifyTimeAdded(formattedExtraTimeText);
+  var isUnlimited = endAt === null && extraTimeInSeconds === null;
+  updateTimeAction(remainingTimeInSeconds, !isUnlimited);
+  notifyTimeAdded(!isUnlimited, !isUnlimited ? formattedExtraTimeText : null);
 };
 
 exports.handleExtraTime = handleExtraTime;
@@ -68,14 +69,13 @@ var handleWebSocketMessage = function handleWebSocketMessage(webSocketMessage, b
     return;
   }
 
-  var extra_time_in_seconds = webSocketMessageData.extra_time_in_seconds;
-  var end_at = webSocketMessageData.end_at;
+  var type = webSocketMessageData.type;
 
-  if (!extra_time_in_seconds || !end_at) {
+  if (type !== 'accommodation_changed') {
     return;
   }
 
-  handleExtraTimeFn(extra_time_in_seconds, end_at, boundTakingApiActions.updateTime, boundTakingApiActions.notifyTimeAdded);
+  handleExtraTimeFn(webSocketMessageData.extra_time_in_seconds, webSocketMessageData.end_at, boundTakingApiActions.updateTime, boundTakingApiActions.notifyTimeAdded);
 };
 
 exports.handleWebSocketMessage = handleWebSocketMessage;
@@ -87,13 +87,7 @@ var createQuizTimerWebSocketMiddleware = function createQuizTimerWebSocketMiddle
   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) {
+        if (action.type === _quizCommon.SET_WS_TOKEN && featureOnFn('add_time_to_existing_quiz_sessions') && socket === null) {
           var token = action.payload.wsToken;
           socket = initializeWebSocket(token, createWebsocketFn);
 

package/lib/taking/api/taking.js

@@ -301,20 +301,21 @@ function submitQuiz(quizSessionId) {
   };
 }
 
-function notifyTimeAdded(extraTime) {
+function notifyTimeAdded(isUnlimited, extraTime) {
   return function (dispatch) {
-    return dispatch((0, _alerts.addInfo)((0, _formatMessage.default)('Your original time limit has been extended by { extraTime }', {
+    var message = isUnlimited ? (0, _formatMessage.default)('Your original time limit has been extended by { extraTime }', {
       extraTime: extraTime
-    })));
+    }) : (0, _formatMessage.default)('Unlimited time accommodation has been added to your quiz');
+    return dispatch((0, _alerts.addInfo)(message));
   };
 }
 
-function updateTime(timeInSeconds) {
+function updateTime(timeInSeconds, timerRunning) {
   return function (dispatch) {
     return dispatch((0, _taking.updateTimerInfo)({
       timeLeftInSeconds: timeInSeconds,
-      timerRunning: true,
-      timeRecording: true
+      timerRunning: timerRunning,
+      timeRecording: false
     }));
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.18.1-rc.1+70dd69c4d",
+  "version": "20.19.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.18.1-rc.1+70dd69c4d",
-    "@instructure/quiz-i18n": "20.18.1-rc.1+70dd69c4d",
-    "@instructure/quiz-interactions": "20.18.1-rc.1+70dd69c4d",
-    "@instructure/quiz-number-input": "20.18.1-rc.1+70dd69c4d",
-    "@instructure/quiz-rce": "20.18.1-rc.1+70dd69c4d",
+    "@instructure/quiz-common": "^20.19.0",
+    "@instructure/quiz-i18n": "^20.19.0",
+    "@instructure/quiz-interactions": "^20.19.0",
+    "@instructure/quiz-number-input": "^20.19.0",
+    "@instructure/quiz-rce": "^20.19.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.18.1-rc.1+70dd69c4d",
+    "instructure-validations": "^20.19.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.18.0",
+    "@instructure/quiz-scripts": "^20.19.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.18.1-rc.1+70dd69c4d",
+    "quiz-presets": "^20.19.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": "70dd69c4d96b54c29d5adb229c7d6b7dad4f602c"
+  "gitHead": "5fe0bb8f61f23f7fa51f93e9f6f6da85e29837e0"
 }