@instructure/quiz-core 22.0.0 → 22.1.0

package/es/common/components/resources/stimulus/StimulusEdit/presenter.js

@@ -145,73 +145,74 @@ export var StimulusEdit = (_dec = withStyleOverrides(generateStyle, generateComp
     });
     _defineProperty(_this2, "onSubmit", /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(e) {
-        var _this2$props2, stimulus, workingStimulus, quizId, quizEntry, stimulusData;
+        var _this2$props2, stimulus, workingStimulus, quizId, quizEntry, message, stimulusData;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _this2$props2 = _this2.props, stimulus = _this2$props2.stimulus, workingStimulus = _this2$props2.workingStimulus, quizId = _this2$props2.quizId, quizEntry = _this2$props2.quizEntry;
               if (workingStimulus.isValid()) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
-              _context2.next = 4;
+              message = _this2.isPassage() ? t('Passage not saved due to validation errors with the data.') : t('Stimulus not saved due to validation errors with the data.');
+              _context2.next = 5;
               return _this2.props.showError(_this2.props.guid);
-            case 4:
-              _this2.props.screenreaderNotification(t('Simulus not saved due to validation errors with the data.'));
+            case 5:
+              _this2.props.screenreaderNotification(message);
               _this2.props.clearNextQuizEntry();
               _this2.focusFirstErrorField();
               return _context2.abrupt("return");
-            case 8:
+            case 9:
               _this2.setState({
                 canSubmit: false
               });
               _this2.props.hideError(_this2.props.guid);
-              _context2.prev = 10;
+              _context2.prev = 11;
               if (!stimulus.isTemporary()) {
-                _context2.next = 17;
+                _context2.next = 18;
                 break;
               }
-              _context2.next = 14;
+              _context2.next = 15;
               return _this2.props.createStimulusAndQuizEntry(quizId, workingStimulus.toJS(), quizEntry);
-            case 14:
+            case 15:
               _this2.props.clearTemporaryStimulus(quizId);
-              _context2.next = 28;
+              _context2.next = 29;
               break;
-            case 17:
+            case 18:
               if (!_this2.props.shouldClone) {
-                _context2.next = 26;
+                _context2.next = 27;
                 break;
               }
-              _context2.next = 20;
+              _context2.next = 21;
               return _this2.props.createStimulus(workingStimulus, _this2.props.quizId, 'quiz', workingStimulus.id);
-            case 20:
+            case 21:
               stimulusData = _context2.sent;
-              _context2.next = 23;
+              _context2.next = 24;
               return _this2.handleStimulusCreated(stimulusData);
-            case 23:
+            case 24:
               _this2.props.clearTemporaryStimulus(quizId);
-              _context2.next = 28;
+              _context2.next = 29;
               break;
-            case 26:
-              _context2.next = 28;
+            case 27:
+              _context2.next = 29;
               return _this2.props.updateStimulus(workingStimulus.toJS(), quizId);
-            case 28:
-              _context2.next = 34;
+            case 29:
+              _context2.next = 35;
               break;
-            case 30:
-              _context2.prev = 30;
-              _context2.t0 = _context2["catch"](10);
+            case 31:
+              _context2.prev = 31;
+              _context2.t0 = _context2["catch"](11);
               _this2.setState({
                 canSubmit: true
               });
               throw _context2.t0;
-            case 34:
-              _this2.afterSubmit();
             case 35:
+              _this2.afterSubmit();
+            case 36:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[10, 30]]);
+        }, _callee2, null, [[11, 31]]);
       }));
       return function (_x2) {
         return _ref2.apply(this, arguments);
@@ -315,10 +316,11 @@ export var StimulusEdit = (_dec = withStyleOverrides(generateStyle, generateComp
   }, {
     key: "afterSubmit",
     value: function afterSubmit() {
+      var message = this.isPassage() ? t('Changes to passage saved.') : t('Changes to stimulus saved.');
       this.props.switchOffEditing();
       this.clearModifications();
       this.props.setUi(SHOULD_CLONE_ITEM, false);
-      this.props.screenreaderNotification(t('Changes to stimulus saved.'));
+      this.props.screenreaderNotification(message);
       if (this.props.nextQuizEntry) {
         this.createNextQuizEntry();
       }

package/es/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -164,9 +164,10 @@ export var StimulusEditInfo = (_dec = withStyleOverrides(generateStyle, generate
       var textAreaId = "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent);
       var stimulusBodyId = "stimulusBodyEdit_".concat(stimulus.id, "_body");
       var automationPrefix = stimulus.passage ? 'passage' : 'stimulus';
+      var message = stimulus.passage ? t('Edit Passage') : t('Edit Stimulus');
       return jsx(FormFieldGroup, {
         messages: this.inputErrors('onSelf'),
-        description: jsx(ScreenReaderContent, null, t('Edit Stimulus'))
+        description: jsx(ScreenReaderContent, null, message)
       }, jsx(Heading, {
         level: "h3",
         as: "h2"

package/es/common/components/shared/GenericAsyncSearch/GenericAsyncSearch.js

@@ -30,7 +30,9 @@ export var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
     _classCallCheck(this, GenericAsyncSearch);
     _this2 = _callSuper(this, GenericAsyncSearch, arguments);
     _defineProperty(_this2, "setInputRef", function (inputRef) {
+      var _this2$props$inputRef, _this2$props;
       _this2.inputRef = inputRef;
+      (_this2$props$inputRef = (_this2$props = _this2.props).inputRef) === null || _this2$props$inputRef === void 0 || _this2$props$inputRef.call(_this2$props, inputRef);
     });
     _defineProperty(_this2, "state", {
       inputValue: _this2.props.selectedOption ? _this2.props.selectedOption.text : '',
@@ -161,7 +163,8 @@ export var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
         onRequestHighlightOption: this.handleHighlightOption,
         onRequestSelectOption: this.handleSelectOption,
         onKeyDown: this.handleKeyDown,
-        messages: this.props.messages
+        messages: this.props.messages,
+        isRequired: this.props.isRequired
       }, this.renderOptions());
     }
   }]);
@@ -178,13 +181,17 @@ _defineProperty(GenericAsyncSearch, "propTypes", {
   }),
   messages: PropTypes.array,
   selectAutomation: PropTypes.string,
-  getOptions: PropTypes.func.isRequired
+  getOptions: PropTypes.func.isRequired,
+  inputRef: PropTypes.func,
+  isRequired: PropTypes.bool
 });
 _defineProperty(GenericAsyncSearch, "defaultProps", {
   debounceDelay: 500,
   minChars: 3,
   label: null,
   placeholder: null,
-  selectAutomation: null
+  selectAutomation: null,
+  inputRef: function inputRef() {},
+  isRequired: false
 });
 export default GenericAsyncSearch;

package/es/common/records/QuizEntry.js

@@ -366,51 +366,63 @@ export var QuizEntry = (_dec = withStateCache(function () {
       // their own possible string so that translators can better translate the meaning
       var type;
       if (this.hasStimulus || this.isBank) {
+        if (this.isPassage) {
+          type = t('Passage');
+          var opts = {
+            type: type,
+            start: displayPosition - 1
+          };
+          return {
+            Remove: t('Remove {type} located after position {start, number}.', opts),
+            Edit: t('Edit {type} located after position {start, number}.', opts),
+            Move: t('Move {type} located after position {start, number}.', opts)
+          }[verb];
+        }
         type = this.hasStimulus ? t('Stimulus') : t('Bank');
         if (this.numItems > 1) {
-          var opts = {
+          var _opts = {
             type: type,
             start: displayPosition,
             end: displayPosition + this.numItems - 1
           };
           return {
-            Remove: t('Remove {type} containing questions {start, number} through {end, number}.', opts),
-            Edit: t('Edit {type} containing questions {start, number} through {end, number}.', opts),
-            Move: t('Move {type} containing questions {start, number} through {end, number}.', opts)
+            Remove: t('Remove {type} containing questions {start, number} through {end, number}.', _opts),
+            Edit: t('Edit {type} containing questions {start, number} through {end, number}.', _opts),
+            Move: t('Move {type} containing questions {start, number} through {end, number}.', _opts)
           }[verb];
         } else if (this.numItems === 1) {
-          var _opts = {
+          var _opts2 = {
             type: type,
             start: displayPosition
           };
           return {
-            Remove: t('Remove {type} containing question {start, number}.', _opts),
-            Edit: t('Edit {type} containing question {start, number}.', _opts),
-            Move: t('Move {type} containing question {start, number}.', _opts)
+            Remove: t('Remove {type} containing question {start, number}.', _opts2),
+            Edit: t('Edit {type} containing question {start, number}.', _opts2),
+            Move: t('Move {type} containing question {start, number}.', _opts2)
           }[verb];
         } else {
-          var _opts2 = {
+          var _opts3 = {
             type: type,
             start: displayPosition - 1
           };
           return {
-            Remove: t('Remove empty {type} located after position {start, number}.', _opts2),
-            Edit: t('Edit empty {type} located after position {start, number}.', _opts2),
-            Move: t('Move empty {type} located after position {start, number}.', _opts2)
+            Remove: t('Remove empty {type} located after position {start, number}.', _opts3),
+            Edit: t('Edit empty {type} located after position {start, number}.', _opts3),
+            Move: t('Move empty {type} located after position {start, number}.', _opts3)
           }[verb];
         }
       } else {
         type = t('Question');
-        var _opts3 = {
+        var _opts4 = {
           verb: verb,
           type: type,
           position: displayPosition
         };
         return {
-          Remove: t('Remove {type} at position {position, number}.', _opts3),
-          Edit: t('Edit {type} at position {position, number}.', _opts3),
-          Move: t('Move {type} at position {position, number}.', _opts3),
-          Copy: t('Copy {type} at position {position, number}.', _opts3)
+          Remove: t('Remove {type} at position {position, number}.', _opts4),
+          Edit: t('Edit {type} at position {position, number}.', _opts4),
+          Move: t('Move {type} at position {position, number}.', _opts4),
+          Copy: t('Copy {type} at position {position, number}.', _opts4)
         }[verb];
       }
     }

package/es/common/records/SessionItem.js

@@ -85,6 +85,11 @@ export var SessionItem = /*#__PURE__*/function (_ReduxRecord) {
     get: function get() {
       return this.type === 'Stimulus';
     }
+  }, {
+    key: "isPassage",
+    get: function get() {
+      return this.isStimulus && this.stimulusRecord.isPassage;
+    }
   }, {
     key: "stimulusRecord",
     get: function get() {
@@ -123,6 +128,7 @@ export var SessionItem = /*#__PURE__*/function (_ReduxRecord) {
   item: {},
   pointsPossible: null,
   position: null,
+  questionNumber: null,
   quizEntryId: null,
   quizSessionId: null,
   scoringData: {},

package/es/taking/api/taking.js

@@ -211,7 +211,7 @@ var __remainingQuestionPositions = function __remainingQuestionPositions(session
     var itemUserResponse = __getResponseForSessionItem(si, responses);
     return item.hasResponse(itemUserResponse);
   }).map(function (si) {
-    return si.get('position');
+    return si.get('questionNumber');
   }).toSet().toJS();
 };
 export function showSubmitConfirmModal(quizSessionId) {

package/lib/banks/components/CopyMoveBankEntryModal/presenter.js

@@ -40,17 +40,27 @@ function _callSuper(_this, derived, args) {
   return (0, _possibleConstructorReturn2["default"])(_this, isNativeReflectConstruct() ? Reflect.construct(derived, args || [], (0, _getPrototypeOf2["default"])(_this).constructor) : derived.apply(_this, args));
 }
 var CopyMoveBankEntryModal = exports.CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
-  function CopyMoveBankEntryModal() {
+  function CopyMoveBankEntryModal(props) {
     var _this2;
     (0, _classCallCheck2["default"])(this, CopyMoveBankEntryModal);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this2 = _callSuper(this, CopyMoveBankEntryModal, [].concat(args));
+    _this2 = _callSuper(this, CopyMoveBankEntryModal, [props]);
+    /**
+     * @type {React.RefObject<RadioInput> | null}
+     */
+    (0, _defineProperty2["default"])(_this2, "radioInputRef", null);
+    /**
+     * @type {React.RefObject<TextInput> | null}
+     */
+    (0, _defineProperty2["default"])(_this2, "textInputRef", null);
     (0, _defineProperty2["default"])(_this2, "state", {
       bankType: 'existing',
       newBankTitle: '',
-      selectedBank: null
+      selectedBank: null,
+      radioValidationError: null,
+      selectValidationError: null
+    });
+    (0, _defineProperty2["default"])(_this2, "setBankInputRef", function (ref) {
+      _this2.bankSelectionInputRef = ref;
     });
     (0, _defineProperty2["default"])(_this2, "copyOrMove", function (newBankId) {
       if (_this2.props.keepCopy) {
@@ -60,7 +70,55 @@ var CopyMoveBankEntryModal = exports.CopyMoveBankEntryModal = /*#__PURE__*/funct
       }
       _this2.closeAction();
     });
+    (0, _defineProperty2["default"])(_this2, "clearValidationErrors", function () {
+      _this2.setState({
+        radioValidationError: null,
+        selectValidationError: null
+      });
+    });
+    (0, _defineProperty2["default"])(_this2, "validateAction", function () {
+      var _this2$state = _this2.state,
+        bankType = _this2$state.bankType,
+        newBankTitle = _this2$state.newBankTitle,
+        selectedBank = _this2$state.selectedBank;
+      if (!bankType) {
+        var _this2$radioInputRef;
+        (_this2$radioInputRef = _this2.radioInputRef) === null || _this2$radioInputRef === void 0 || (_this2$radioInputRef = _this2$radioInputRef.current) === null || _this2$radioInputRef === void 0 || _this2$radioInputRef.focus();
+        _this2.setState({
+          radioValidationError: [{
+            text: (0, _formatMessage["default"])('Please choose a Copy/Move option'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      if (bankType === 'existing' && !selectedBank) {
+        _this2.bankSelectionInputRef.focus();
+        _this2.setState({
+          selectValidationError: [{
+            text: (0, _formatMessage["default"])('Please select a bank'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      if (bankType === 'new' && (!newBankTitle || !newBankTitle.trim())) {
+        var _this2$textInputRef;
+        (_this2$textInputRef = _this2.textInputRef) === null || _this2$textInputRef === void 0 || (_this2$textInputRef = _this2$textInputRef.current) === null || _this2$textInputRef === void 0 || _this2$textInputRef.focus();
+        _this2.setState({
+          selectValidationError: [{
+            text: (0, _formatMessage["default"])('Please enter a new bank title'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      return true;
+    });
     (0, _defineProperty2["default"])(_this2, "continueAction", function () {
+      if (!_this2.validateAction()) {
+        return;
+      }
       if (_this2.state.bankType === 'new') {
         var newBank = _Bank["default"].create({
           title: _this2.state.newBankTitle,
@@ -101,12 +159,14 @@ var CopyMoveBankEntryModal = exports.CopyMoveBankEntryModal = /*#__PURE__*/funct
       return _this2.initiateCopy(newBankId).then(_this2.props.onAdd);
     });
     (0, _defineProperty2["default"])(_this2, "closeAction", function () {
+      _this2.clearValidationErrors();
       if (_this2.props.modalTrigger) {
         _this2.props.modalTrigger.focus();
       }
       _this2.props.closeModal();
     });
     (0, _defineProperty2["default"])(_this2, "onBankSelection", function (e, option) {
+      _this2.clearValidationErrors();
       _this2.setState({
         selectedBank: new _Bank["default"](option)
       });
@@ -115,15 +175,20 @@ var CopyMoveBankEntryModal = exports.CopyMoveBankEntryModal = /*#__PURE__*/funct
       _this2.props.uiSet(_quizCommon.COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, e.target.checked);
     });
     (0, _defineProperty2["default"])(_this2, "handleRadioChange", function (event, value) {
+      _this2.clearValidationErrors();
       _this2.setState({
         bankType: value
       });
     });
     (0, _defineProperty2["default"])(_this2, "onTitleChange", function (e) {
+      _this2.clearValidationErrors();
       _this2.setState({
         newBankTitle: e.target.value
       });
     });
+    _this2.radioInputRef = _react["default"].createRef();
+    _this2.textInputRef = _react["default"].createRef();
+    _this2.bankSelectionInputRef = _react["default"].createRef();
     return _this2;
   }
   (0, _inherits2["default"])(CopyMoveBankEntryModal, _Component);
@@ -138,14 +203,9 @@ var CopyMoveBankEntryModal = exports.CopyMoveBankEntryModal = /*#__PURE__*/funct
   }, {
     key: "addToBankButton",
     value: function addToBankButton() {
-      var _this$state = this.state,
-        bankType = _this$state.bankType,
-        newBankTitle = _this$state.newBankTitle;
-      var disabled = bankType === 'existing' && !this.state.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim());
       return /*#__PURE__*/_react["default"].createElement(_uiButtons.Button, {
         color: "primary",
         onClick: this.continueAction,
-        disabled: disabled,
         margin: _quizCommon.XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-add-to-bank-button"
       }, (0, _formatMessage["default"])('Add'));
@@ -155,16 +215,22 @@ var CopyMoveBankEntryModal = exports.CopyMoveBankEntryModal = /*#__PURE__*/funct
     value: function renderBankTypeContent() {
       if (this.state.bankType === 'existing') {
         return /*#__PURE__*/_react["default"].createElement(_presenter["default"], {
+          inputRef: this.setBankInputRef,
           onBankSelection: this.onBankSelection,
           selectedBank: this.state.selectedBank,
-          "data-automation": "sdk-bank-selection"
+          "data-automation": "sdk-bank-selection",
+          externalError: this.state.selectValidationError,
+          isRequired: true
         });
       }
       return /*#__PURE__*/_react["default"].createElement(_quizCommon.TextInput, {
         onChange: this.onTitleChange,
         value: this.state.newBankTitle,
         renderLabel: (0, _formatMessage["default"])('New Bank Title'),
-        type: "text"
+        type: "text",
+        messages: this.state.selectValidationError,
+        ref: this.textInputRef,
+        isRequired: true
       });
     }
   }, {
@@ -174,10 +240,13 @@ var CopyMoveBankEntryModal = exports.CopyMoveBankEntryModal = /*#__PURE__*/funct
         onChange: this.handleRadioChange,
         name: (0, _formatMessage["default"])('Bank Type'),
         defaultValue: this.state.bankType,
-        description: /*#__PURE__*/_react["default"].createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage["default"])('Bank Type'))
+        description: /*#__PURE__*/_react["default"].createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage["default"])('Bank Type')),
+        messages: this.state.radioValidationError,
+        isRequired: true
       }, /*#__PURE__*/_react["default"].createElement(_uiRadioInput.RadioInput, {
         value: "existing",
-        label: (0, _formatMessage["default"])('Existing item bank')
+        label: (0, _formatMessage["default"])('Existing item bank'),
+        ref: this.radioInputRef
       }), /*#__PURE__*/_react["default"].createElement(_uiRadioInput.RadioInput, {
         value: "new",
         label: (0, _formatMessage["default"])('New item bank')

package/lib/common/components/layout/sidebar/Stimulus/Collection/presenter.js

@@ -96,6 +96,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         }, _this3.props.renderSidebarItem(item, displayPosition, sidebarOpen));
       });
       var transitionType = isShowingItems ? 'slide-down' : 'slide-up';
+      var screenReaderText = this.props.isPassage ? (0, _formatMessage["default"])('Collapse passage questions') : (0, _formatMessage["default"])('Collapse stimulus questions');
       return (0, _emotion.jsx)(_uiMotion.Transition, {
         "in": isShowingItems || this.shouldDisplayAllItems(),
         type: transitionType
@@ -107,7 +108,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         withBackground: false,
         withBorder: false,
         renderIcon: _uiIcons.IconArrowOpenUpLine,
-        screenReaderLabel: (0, _formatMessage["default"])('Collapse stimulus questions')
+        screenReaderLabel: screenReaderText
       })), (0, _emotion.jsx)("div", null, itemComponents)));
     }
   }, {
@@ -118,6 +119,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         itemCollection = _this$props2.itemCollection,
         isShowingItems = _this$props2.isShowingItems;
       var transitionType = !isShowingItems ? 'slide-up' : 'slide-down';
+      var screenReaderText = this.props.isPassage ? (0, _formatMessage["default"])('Expand passage questions') : (0, _formatMessage["default"])('Expand stimulus questions');
       return (0, _emotion.jsx)(_uiMotion.Transition, {
         "in": !isShowingItems,
         type: transitionType
@@ -131,7 +133,7 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
         withBackground: false,
         withBorder: false,
         renderIcon: _uiIcons.IconArrowOpenDownLine,
-        screenReaderLabel: (0, _formatMessage["default"])('Expand stimulus questions')
+        screenReaderLabel: screenReaderText
       })));
     }
   }, {
@@ -162,7 +164,8 @@ var Collection = exports.Collection = (_dec = (0, _quizCommon.withStyleOverrides
   // set in connect
   setSidebarStimulusIsShowing: _propTypes["default"].func.isRequired,
   styles: _propTypes["default"].object,
-  makeStyles: _propTypes["default"].func
+  makeStyles: _propTypes["default"].func,
+  isPassage: _propTypes["default"].bool
 }), (0, _defineProperty2["default"])(_Collection, "defaultProps", {
   isShowingItems: false
 }), _Collection)) || _class);