@instructure/quiz-core 20.23.0 → 20.25.0

package/es/common/kinesis/StreamQueue.js

@@ -5,6 +5,8 @@ var ERROR_STATE = 'error';
 var WAITING_STATE = 'waiting';
 var SENDING_STATE = 'sending';
 var SENT_STATE = 'sent';
+var REACHED_MAX_FAILURES = 'reached_max_failures';
+var MAX_FAILED_ATTEMPTS = 3;
 var StreamQueue = /*#__PURE__*/function () {
   function StreamQueue(_ref) {
     var config = _ref.config,
@@ -115,9 +117,13 @@ var StreamQueue = /*#__PURE__*/function () {
         _this.kinesis.putRecords(params, function (err, data) {
           if (err) {
             _this.pageQueue[i].status = ERROR_STATE;
+            _this.pageQueue[i].errorCount = (_this.pageQueue[i].errorCount || 0) + 1;
             // eslint-disable-next-line no-console
             console.error("KINESIS STREAM ".concat(_this.config.stream, " ERROR: "), err);
-            _this._sendRecordsViaProxy(params);
+            if (_this.pageQueue[i].errorCount >= MAX_FAILED_ATTEMPTS) {
+              _this.pageQueue[i].status = REACHED_MAX_FAILURES;
+              _this._sendRecordsViaProxy(params);
+            }
           } else {
             _this.pageQueue[i].status = SENT_STATE;
             // eslint-disable-next-line no-console

package/es/moderating/components/resources/AccommodationsModal/ReduceAnswerChoicesSettings/index.js

@@ -0,0 +1,78 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { Checkbox } from '@instructure/ui-checkbox';
+import { IconButton } from '@instructure/ui-buttons';
+import { IconInfoLine as IconInfo } from '@instructure/ui-icons';
+import { Tooltip } from '@instructure/ui-tooltip';
+import { View } from '@instructure/ui-view';
+import t from '@instructure/quiz-i18n/es/format-message';
+export var ReduceAnswerChoicesSettings = /*#__PURE__*/function (_Component) {
+  _inherits(ReduceAnswerChoicesSettings, _Component);
+  var _super = _createSuper(ReduceAnswerChoicesSettings);
+  function ReduceAnswerChoicesSettings() {
+    var _this;
+    _classCallCheck(this, ReduceAnswerChoicesSettings);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
+    _this.onChangeReduceChoices = function () {
+      var update = _objectSpread(_objectSpread({}, _this.props.courseAccommodationSettings), {}, {
+        reduceChoicesEnabled: !_this.props.courseAccommodationSettings.reduceChoicesEnabled
+      });
+      _this.props.onChange(update);
+    };
+    _this.renderSettingLabel = function (label, tooltip) {
+      return /*#__PURE__*/React.createElement("span", null, label, /*#__PURE__*/React.createElement(Tooltip, {
+        color: "primary-inverse",
+        renderTip: tooltip,
+        placement: "bottom",
+        on: ['click', 'hover', 'focus']
+      }, /*#__PURE__*/React.createElement(IconButton, {
+        renderIcon: IconInfo,
+        color: "secondary",
+        size: "small",
+        shape: "circle",
+        withBackground: false,
+        withBorder: false,
+        interaction: "readonly",
+        screenReaderLabel: tooltip
+      })));
+    };
+    return _this;
+  }
+  _createClass(ReduceAnswerChoicesSettings, [{
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/React.createElement(View, {
+        display: "block",
+        margin: "medium none"
+      }, /*#__PURE__*/React.createElement(Checkbox, {
+        variant: "toggle",
+        checked: this.props.courseAccommodationSettings.reduceChoicesEnabled || false,
+        label: this.renderSettingLabel(t('Reduced answer choices'), t('Removes one incorrect answer from all multiple-choice questions that have 4 or more answer choices.')),
+        onChange: this.onChangeReduceChoices,
+        value: "reduce_choices_enabled"
+      }));
+    }
+  }]);
+  ReduceAnswerChoicesSettings.displayName = "ReduceAnswerChoicesSettings";
+  return ReduceAnswerChoicesSettings;
+}(Component);
+ReduceAnswerChoicesSettings.propTypes = {
+  courseAccommodationSettings: PropTypes.shape({
+    reduceChoicesEnabled: PropTypes.bool
+  }).isRequired,
+  onChange: PropTypes.func.isRequired
+};
+ReduceAnswerChoicesSettings.defaultProps = {
+  courseAccommodationSettings: {
+    reduceChoicesEnabled: false
+  }
+};
+export default ReduceAnswerChoicesSettings;

package/es/moderating/components/resources/ModerateTableRow/presenter.js

@@ -261,9 +261,6 @@ export var ModerateTableRow = (_dec = withStyle(generateStyle, generateComponent
             }, t('{ name }: { value }', elem)));
           }));
         }
-
-        // Display the Accommodations and the button in a flex container with reverse order
-        // so that the screen reader will read the accommodations first, and then the button
         return jsx(Table.Cell, {
           "data-automation": "sdk-moderate-accommodations-text"
         }, displayContent);

package/es/moderating/components/sidebar/ResetQuiz/index.js

@@ -7,20 +7,27 @@ import { reopenQuizSession } from "../../../api/quizSessions.js";
 import { getQuizSessionsByIds } from "../../../../common/selectors/quizSessions.js";
 export function mapStateToProps(state) {
   var quizSessionIds = state.getIn(['moderation', 'selectedSessions']);
-  var sessions = getQuizSessionsByIds(state, quizSessionIds).filter(function (qs) {
+  var quizSessions = getQuizSessionsByIds(state, quizSessionIds).filter(function (qs) {
     return qs.isLoaded() && !qs.pending();
   }).sort(function (qs1, qs2) {
     return qs2.id - qs1.id;
   });
-  var sessionId, session;
-  if (sessions.size > 0) {
-    session = sessions.get(0);
-    sessionId = session.id;
+  var quizSessionId,
+    quizSession,
+    reopenOverride = false;
+  if (quizSessions.size > 0) {
+    quizSession = quizSessions.get(0);
+    var _ref = [quizSession.allowBacktracking, quizSession.isOneQuestionAtATime()],
+      allowBacktracking = _ref[0],
+      isOneQuestionAtATime = _ref[1];
+    quizSessionId = quizSession.id;
+    reopenOverride = !allowBacktracking && isOneQuestionAtATime;
   }
   return {
-    sessionId: sessionId || null,
-    isComplete: session ? !(session.inProgress() || session.reopeningGraded()) : false,
-    reopenOn: featureOn('reopen_session')
+    sessionId: quizSessionId || null,
+    isComplete: quizSession ? !(quizSession.inProgress() || quizSession.reopeningGraded()) : false,
+    reopenOn: featureOn('reopen_session'),
+    reopenOverride: reopenOverride
   };
 }
 export default connect(mapStateToProps, {

package/es/moderating/components/sidebar/ResetQuiz/presenter.js

@@ -9,6 +9,8 @@ import PropTypes from 'prop-types';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Button } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
+import { Tooltip } from '@instructure/ui-tooltip';
+import { AccessibleContent } from '@instructure/ui-a11y-content';
 export var ResetQuiz = /*#__PURE__*/function (_Component) {
   _inherits(ResetQuiz, _Component);
   var _super = _createSuper(ResetQuiz);
@@ -57,18 +59,31 @@ export var ResetQuiz = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       if (!this.props.reopenOn) return null;
-      if (!this.props.sessionId) {
+      var _this$props = this.props,
+        reopenOverride = _this$props.reopenOverride,
+        sessionId = _this$props.sessionId;
+      if (!sessionId) {
         return /*#__PURE__*/React.createElement("span", null, t('No attempts have been recorded yet.'));
       }
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Heading, {
+      var reOpen = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Heading, {
         level: "h3"
       }, t('Manage current attempt')), this.props.reopenOn ? /*#__PURE__*/React.createElement(Button, {
         ref: this.reopenButtonRef,
         onClick: this.reopenQuizSession,
-        disabled: !this.props.isComplete,
+        disabled: !this.props.isComplete || reopenOverride,
         margin: "small none",
         "data-automation": "sdk-reopen-quiz-button"
       }, t('Reopen')) : null);
+      if (reopenOverride) {
+        var text = t('One Question at Time Quizzes with Backtracking disabled cannot be reopened.');
+        return /*#__PURE__*/React.createElement(AccessibleContent, {
+          alt: text
+        }, /*#__PURE__*/React.createElement(Tooltip, {
+          renderTip: text,
+          placement: "start"
+        }, reOpen));
+      }
+      return reOpen;
     }
   }]);
   ResetQuiz.displayName = "ResetQuiz";
@@ -81,6 +96,7 @@ ResetQuiz.propTypes = {
   reopenQuizSession: PropTypes.func.isRequired,
   reopenOn: PropTypes.bool.isRequired,
   screenreaderNotification: PropTypes.func.isRequired,
-  withConfirm: PropTypes.func.isRequired
+  withConfirm: PropTypes.func.isRequired,
+  reopenOverride: PropTypes.bool.isRequired
 };
 export default ResetQuiz;

package/lib/common/kinesis/StreamQueue.js

@@ -12,6 +12,8 @@ var ERROR_STATE = 'error';
 var WAITING_STATE = 'waiting';
 var SENDING_STATE = 'sending';
 var SENT_STATE = 'sent';
+var REACHED_MAX_FAILURES = 'reached_max_failures';
+var MAX_FAILED_ATTEMPTS = 3;
 var StreamQueue = /*#__PURE__*/function () {
   function StreamQueue(_ref) {
     var config = _ref.config,
@@ -122,9 +124,13 @@ var StreamQueue = /*#__PURE__*/function () {
         _this.kinesis.putRecords(params, function (err, data) {
           if (err) {
             _this.pageQueue[i].status = ERROR_STATE;
+            _this.pageQueue[i].errorCount = (_this.pageQueue[i].errorCount || 0) + 1;
             // eslint-disable-next-line no-console
             console.error("KINESIS STREAM ".concat(_this.config.stream, " ERROR: "), err);
-            _this._sendRecordsViaProxy(params);
+            if (_this.pageQueue[i].errorCount >= MAX_FAILED_ATTEMPTS) {
+              _this.pageQueue[i].status = REACHED_MAX_FAILURES;
+              _this._sendRecordsViaProxy(params);
+            }
           } else {
             _this.pageQueue[i].status = SENT_STATE;
             // eslint-disable-next-line no-console

package/lib/moderating/components/resources/AccommodationsModal/ReduceAnswerChoicesSettings/index.js

@@ -0,0 +1,88 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.ReduceAnswerChoicesSettings = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
+var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _uiCheckbox = require("@instructure/ui-checkbox");
+var _uiButtons = require("@instructure/ui-buttons");
+var _uiIcons = require("@instructure/ui-icons");
+var _uiTooltip = require("@instructure/ui-tooltip");
+var _uiView = require("@instructure/ui-view");
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+var ReduceAnswerChoicesSettings = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(ReduceAnswerChoicesSettings, _Component);
+  var _super = (0, _createSuper2.default)(ReduceAnswerChoicesSettings);
+  function ReduceAnswerChoicesSettings() {
+    var _this;
+    (0, _classCallCheck2.default)(this, ReduceAnswerChoicesSettings);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
+    _this.onChangeReduceChoices = function () {
+      var update = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _this.props.courseAccommodationSettings), {}, {
+        reduceChoicesEnabled: !_this.props.courseAccommodationSettings.reduceChoicesEnabled
+      });
+      _this.props.onChange(update);
+    };
+    _this.renderSettingLabel = function (label, tooltip) {
+      return /*#__PURE__*/_react.default.createElement("span", null, label, /*#__PURE__*/_react.default.createElement(_uiTooltip.Tooltip, {
+        color: "primary-inverse",
+        renderTip: tooltip,
+        placement: "bottom",
+        on: ['click', 'hover', 'focus']
+      }, /*#__PURE__*/_react.default.createElement(_uiButtons.IconButton, {
+        renderIcon: _uiIcons.IconInfoLine,
+        color: "secondary",
+        size: "small",
+        shape: "circle",
+        withBackground: false,
+        withBorder: false,
+        interaction: "readonly",
+        screenReaderLabel: tooltip
+      })));
+    };
+    return _this;
+  }
+  (0, _createClass2.default)(ReduceAnswerChoicesSettings, [{
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/_react.default.createElement(_uiView.View, {
+        display: "block",
+        margin: "medium none"
+      }, /*#__PURE__*/_react.default.createElement(_uiCheckbox.Checkbox, {
+        variant: "toggle",
+        checked: this.props.courseAccommodationSettings.reduceChoicesEnabled || false,
+        label: this.renderSettingLabel((0, _formatMessage.default)('Reduced answer choices'), (0, _formatMessage.default)('Removes one incorrect answer from all multiple-choice questions that have 4 or more answer choices.')),
+        onChange: this.onChangeReduceChoices,
+        value: "reduce_choices_enabled"
+      }));
+    }
+  }]);
+  ReduceAnswerChoicesSettings.displayName = "ReduceAnswerChoicesSettings";
+  return ReduceAnswerChoicesSettings;
+}(_react.Component);
+exports.ReduceAnswerChoicesSettings = ReduceAnswerChoicesSettings;
+ReduceAnswerChoicesSettings.propTypes = {
+  courseAccommodationSettings: _propTypes.default.shape({
+    reduceChoicesEnabled: _propTypes.default.bool
+  }).isRequired,
+  onChange: _propTypes.default.func.isRequired
+};
+ReduceAnswerChoicesSettings.defaultProps = {
+  courseAccommodationSettings: {
+    reduceChoicesEnabled: false
+  }
+};
+var _default = ReduceAnswerChoicesSettings;
+exports.default = _default;

package/lib/moderating/components/resources/ModerateTableRow/presenter.js

@@ -268,9 +268,6 @@ var ModerateTableRow = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.d
             }, (0, _formatMessage.default)('{ name }: { value }', elem)));
           }));
         }
-
-        // Display the Accommodations and the button in a flex container with reverse order
-        // so that the screen reader will read the accommodations first, and then the button
         return (0, _emotion.jsx)(_uiTable.Table.Cell, {
           "data-automation": "sdk-moderate-accommodations-text"
         }, displayContent);

package/lib/moderating/components/sidebar/ResetQuiz/index.js

@@ -15,20 +15,27 @@ var _quizSessions = require("../../../api/quizSessions.js");
 var _quizSessions2 = require("../../../../common/selectors/quizSessions.js");
 function mapStateToProps(state) {
   var quizSessionIds = state.getIn(['moderation', 'selectedSessions']);
-  var sessions = (0, _quizSessions2.getQuizSessionsByIds)(state, quizSessionIds).filter(function (qs) {
+  var quizSessions = (0, _quizSessions2.getQuizSessionsByIds)(state, quizSessionIds).filter(function (qs) {
     return qs.isLoaded() && !qs.pending();
   }).sort(function (qs1, qs2) {
     return qs2.id - qs1.id;
   });
-  var sessionId, session;
-  if (sessions.size > 0) {
-    session = sessions.get(0);
-    sessionId = session.id;
+  var quizSessionId,
+    quizSession,
+    reopenOverride = false;
+  if (quizSessions.size > 0) {
+    quizSession = quizSessions.get(0);
+    var _ref = [quizSession.allowBacktracking, quizSession.isOneQuestionAtATime()],
+      allowBacktracking = _ref[0],
+      isOneQuestionAtATime = _ref[1];
+    quizSessionId = quizSession.id;
+    reopenOverride = !allowBacktracking && isOneQuestionAtATime;
   }
   return {
-    sessionId: sessionId || null,
-    isComplete: session ? !(session.inProgress() || session.reopeningGraded()) : false,
-    reopenOn: (0, _featureCheck.featureOn)('reopen_session')
+    sessionId: quizSessionId || null,
+    isComplete: quizSession ? !(quizSession.inProgress() || quizSession.reopeningGraded()) : false,
+    reopenOn: (0, _featureCheck.featureOn)('reopen_session'),
+    reopenOverride: reopenOverride
   };
 }
 var _default = (0, _reactRedux.connect)(mapStateToProps, {

package/lib/moderating/components/sidebar/ResetQuiz/presenter.js

@@ -17,6 +17,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _uiButtons = require("@instructure/ui-buttons");
 var _uiHeading = require("@instructure/ui-heading");
+var _uiTooltip = require("@instructure/ui-tooltip");
+var _uiA11yContent = require("@instructure/ui-a11y-content");
 var ResetQuiz = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(ResetQuiz, _Component);
   var _super = (0, _createSuper2.default)(ResetQuiz);
@@ -65,18 +67,31 @@ var ResetQuiz = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       if (!this.props.reopenOn) return null;
-      if (!this.props.sessionId) {
+      var _this$props = this.props,
+        reopenOverride = _this$props.reopenOverride,
+        sessionId = _this$props.sessionId;
+      if (!sessionId) {
         return /*#__PURE__*/_react.default.createElement("span", null, (0, _formatMessage.default)('No attempts have been recorded yet.'));
       }
-      return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
+      var reOpen = /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
         level: "h3"
       }, (0, _formatMessage.default)('Manage current attempt')), this.props.reopenOn ? /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         ref: this.reopenButtonRef,
         onClick: this.reopenQuizSession,
-        disabled: !this.props.isComplete,
+        disabled: !this.props.isComplete || reopenOverride,
         margin: "small none",
         "data-automation": "sdk-reopen-quiz-button"
       }, (0, _formatMessage.default)('Reopen')) : null);
+      if (reopenOverride) {
+        var text = (0, _formatMessage.default)('One Question at Time Quizzes with Backtracking disabled cannot be reopened.');
+        return /*#__PURE__*/_react.default.createElement(_uiA11yContent.AccessibleContent, {
+          alt: text
+        }, /*#__PURE__*/_react.default.createElement(_uiTooltip.Tooltip, {
+          renderTip: text,
+          placement: "start"
+        }, reOpen));
+      }
+      return reOpen;
     }
   }]);
   ResetQuiz.displayName = "ResetQuiz";
@@ -90,7 +105,8 @@ ResetQuiz.propTypes = {
   reopenQuizSession: _propTypes.default.func.isRequired,
   reopenOn: _propTypes.default.bool.isRequired,
   screenreaderNotification: _propTypes.default.func.isRequired,
-  withConfirm: _propTypes.default.func.isRequired
+  withConfirm: _propTypes.default.func.isRequired,
+  reopenOverride: _propTypes.default.bool.isRequired
 };
 var _default = ResetQuiz;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.23.0",
+  "version": "20.25.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.23.0",
-    "@instructure/quiz-i18n": "^20.23.0",
-    "@instructure/quiz-interactions": "^20.23.0",
-    "@instructure/quiz-number-input": "^20.23.0",
-    "@instructure/quiz-rce": "^20.23.0",
+    "@instructure/quiz-common": "^20.25.0",
+    "@instructure/quiz-i18n": "^20.25.0",
+    "@instructure/quiz-interactions": "^20.25.0",
+    "@instructure/quiz-number-input": "^20.25.0",
+    "@instructure/quiz-rce": "^20.25.0",
     "@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.23.0",
+    "instructure-validations": "^20.25.0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -143,7 +143,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "^20.23.0",
+    "@instructure/quiz-scripts": "^20.25.0",
     "@instructure/ui-axe-check": "^8.51.0",
     "@instructure/ui-babel-preset": "^7.22.1",
     "@instructure/ui-test-utils": "^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.23.0",
+    "quiz-presets": "^20.25.0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",