@instructure/quiz-core 22.0.0 → 22.2.0

package/es/banks/components/AddBankEntryModal/presenter.js

@@ -53,7 +53,10 @@ export var AddBankEntryModal = /*#__PURE__*/function (_Component) {
       _this2.props.navigateToBankEntry('new', _this2.props.bankId);
     });
     _defineProperty(_this2, "addStimulus", function () {
-      _this2.props.createBankItem(_this2.props.bankId, 'Stimulus');
+      var isPassage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      _this2.props.createBankItem(_this2.props.bankId, 'Stimulus', {
+        passage: isPassage
+      });
       _this2.closeAction();
       _this2.props.navigateToBankEntry('new', _this2.props.bankId);
     });

package/es/banks/components/BankEntry/presenter.js

@@ -233,18 +233,69 @@ export var BankEntry = (_dec = withStyleOverrides(generateStyle, generateCompone
     value: function isTemporary() {
       return this.props.entry && this.props.entry.isTemporary();
     }
+  }, {
+    key: "getBankEntryTypeSlug",
+    value: function getBankEntryTypeSlug() {
+      return this.props.bankEntry.entryType;
+    }
+  }, {
+    key: "getEntry",
+    value: function getEntry() {
+      return this.props.entry;
+    }
   }, {
     key: "isItemEntry",
     value: function isItemEntry() {
       return this.props.bankEntry.entryType === 'Item';
     }
+  }, {
+    key: "isStimulusEntry",
+    value: function isStimulusEntry() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && !entry.isPassage;
+    }
+  }, {
+    key: "isPassageEntry",
+    value: function isPassageEntry() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && entry.isPassage;
+    }
+  }, {
+    key: "getEditWarning",
+    value: function getEditWarning() {
+      if (this.isStimulusEntry()) {
+        return t('Edits made here will appear on any assessment using this stimulus.');
+      }
+      if (this.isPassageEntry()) {
+        return t('Edits made here will appear on any assessment using this text block.');
+      }
+      return t('Edits made here will appear on any assessment using this question.');
+    }
   }, {
     key: "entryLinkName",
     value: function entryLinkName() {
-      if (this.isTemporary()) {
-        return this.isItemEntry() ? t('New Question') : t('New Stimulus');
-      } else {
-        return this.isItemEntry() ? t('Edit Question') : t('Edit Stimulus');
+      var translations = {
+        "new": {
+          question: t('New Question'),
+          stimulus: t('New Stimulus'),
+          passage: t('New Text Block')
+        },
+        edit: {
+          question: t('Edit Question'),
+          stimulus: t('Edit Stimulus'),
+          passage: t('Edit Text Block')
+        }
+      };
+      var operation = this.isTemporary() ? 'new' : 'edit';
+      switch (true) {
+        case this.isItemEntry():
+          return translations[operation]['question'];
+        case this.isStimulusEntry():
+          return translations[operation]['stimulus'];
+        case this.isPassageEntry():
+          return translations[operation]['passage'];
       }
     }
   }, {
@@ -297,19 +348,66 @@ export var BankEntry = (_dec = withStyleOverrides(generateStyle, generateCompone
         });
       }
     }
+  }, {
+    key: "getIdentifier",
+    value: function getIdentifier(entry) {
+      if (!entry) return;
+      switch (true) {
+        case this.isItemEntry():
+          return t('Question { id }', {
+            id: entry.id
+          });
+        case this.isStimulusEntry():
+          return t('Stimulus { id }', {
+            id: entry.id
+          });
+        case this.isPassageEntry():
+          return t('Text Block { id }', {
+            id: entry.id
+          });
+        default:
+          return;
+      }
+    }
+  }, {
+    key: "getTemporaryIdentifier",
+    value: function getTemporaryIdentifier() {
+      switch (true) {
+        case this.isItemEntry():
+          return t('New Question');
+        case this.isStimulusEntry():
+          return t('New Stimulus');
+        case this.isPassageEntry():
+          return t('New Text Block');
+        default:
+          return;
+      }
+    }
+  }, {
+    key: "getEntryName",
+    value: function getEntryName(entry) {
+      var _entry$getInteraction;
+      if (!entry) return;
+      switch (true) {
+        case this.isItemEntry():
+          return (_entry$getInteraction = entry.getInteractionType()) === null || _entry$getInteraction === void 0 ? void 0 : _entry$getInteraction.name;
+        case this.isStimulusEntry():
+          return t('Stimulus');
+        case this.isPassageEntry():
+          return t('Text Block');
+        default:
+          return;
+      }
+    }
   }, {
     key: "renderHeader",
     value: function renderHeader(entry) {
       if (!entry) return;
       var props = this.editProps(entry);
-      var identifier = this.isItemEntry() ? t('Question { id }', {
-        id: entry.id
-      }) : t('Stimulus { id }', {
-        id: entry.id
-      });
-      var tempIdentifier = this.isItemEntry() ? t('New Question') : t('New Stimulus');
+      var identifier = this.getIdentifier(entry);
+      var tempIdentifier = this.getTemporaryIdentifier();
       var itemIdentifier = this.isTemporary() ? tempIdentifier : identifier;
-      var entryName = this.isItemEntry() ? entry.getInteractionType().name : t('Stimulus');
+      var entryName = this.getEntryName(entry);
       var separator = ' | ';
       return jsx("div", {
         css: this.props.styles.header
@@ -543,7 +641,7 @@ export var BankEntry = (_dec = withStyleOverrides(generateStyle, generateCompone
           tags: _this3.visibleTags()
         });
       };
-      var editWarning = this.isItemEntry() ? t('Edits made here will appear on any assessment using this question.') : t('Edits made here will appear on any assessment using this stimulus.');
+      var editWarning = this.getEditWarning();
       return jsx("div", null, jsx("div", {
         css: this.props.styles.entryEdit
       }, jsx(WarningWrapper, versioningProps, canEdit && jsx(Alert, {

package/es/banks/components/BankEntryRow/presenter.js

@@ -58,7 +58,6 @@ export var BankEntryRow = (_dec = withStyleOverrides(generateStyle, generateComp
       _this2.props.setUi(BUILD_TRAY_POSITION, _this2.props.position + 1);
     });
     _defineProperty(_this2, "deleteBankEntry", function () {
-      var deletePreface = _this2.isItemEntry() ? t('Deleting this question:') : t('Deleting this stimulus:');
       var confirmBody = jsx(Alert, {
         variant: "error",
         padding: "0"
@@ -66,7 +65,7 @@ export var BankEntryRow = (_dec = withStyleOverrides(generateStyle, generateComp
         css: _this2.props.styles.deleteAlert
       }, jsx("div", {
         css: _this2.props.styles.deletePreface
-      }, deletePreface), jsx(List, null, jsx(List.Item, null, t.rich('will <0>NOT</0> remove it from any assessments', [function (_ref) {
+      }, _this2.getDeletePreface()), jsx(List, null, jsx(List.Item, null, t.rich('will <0>NOT</0> remove it from any assessments', [function (_ref) {
         var children = _ref.children;
         return jsx(Text, {
           weight: "bold",
@@ -152,20 +151,60 @@ export var BankEntryRow = (_dec = withStyleOverrides(generateStyle, generateComp
     value: function isItemEntry() {
       return this.props.bankEntry.entryType === 'Item';
     }
+  }, {
+    key: "isStimulusEntry",
+    value: function isStimulusEntry() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && !entry.isPassage;
+    }
+  }, {
+    key: "isPassageEntry",
+    value: function isPassageEntry() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && entry.isPassage;
+    }
   }, {
     key: "type",
     value: function type() {
-      return this.isItemEntry() ? t('Question') : t('Stimulus');
+      if (this.isStimulusEntry()) {
+        return t('Stimulus');
+      }
+      if (this.isPassageEntry()) {
+        return t('Text Block');
+      }
+      return t('Question');
     }
   }, {
     key: "entryIdentifier",
     value: function entryIdentifier() {
-      return this.isItemEntry() ? t('Question { itemBody }', {
-        itemBody: extractTextFromHtml(this.getEntry().title)
-      }) : t('Stimulus { title }', {
-        title: this.getEntry().title
+      var title = this.getEntry().title;
+      if (this.isStimulusEntry()) {
+        return t('Stimulus { title }', {
+          title: title
+        });
+      }
+      if (this.isPassageEntry()) {
+        return t('Text Block { title }', {
+          title: title
+        });
+      }
+      return t('Question { itemBody }', {
+        itemBody: extractTextFromHtml(title)
       });
     }
+  }, {
+    key: "getDeletePreface",
+    value: function getDeletePreface() {
+      if (this.isStimulusEntry()) {
+        return t('Deleting this stimulus:');
+      }
+      if (this.isPassageEntry()) {
+        return t('Deleting this text block:');
+      }
+      return t('Deleting this question:');
+    }
   }, {
     key: "moveModalTitle",
     value: function moveModalTitle() {
@@ -234,7 +273,12 @@ export var BankEntryRow = (_dec = withStyleOverrides(generateStyle, generateComp
   }, {
     key: "entryHeader",
     value: function entryHeader() {
-      return this.isItemEntry() ? this.getEntry().getInteractionType().name : t('Stimulus');
+      var entry = this.getEntry();
+      if (this.isItemEntry()) {
+        return entry.getInteractionType().name;
+      } else {
+        return entry.isPassage ? t('Text Block') : t('Stimulus');
+      }
     }
   }, {
     key: "renderHeader",

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

@@ -31,17 +31,27 @@ import BankSelection from '../../../common/components/resources/BankSelection/pr
 import { Modal, ModalHeader, ModalBody, ModalFooter, COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import { featureOn } from '../../../common/util/featureCheck';
 export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
-  function CopyMoveBankEntryModal() {
+  function CopyMoveBankEntryModal(props) {
     var _this2;
     _classCallCheck(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}
+     */
+    _defineProperty(_this2, "radioInputRef", null);
+    /**
+     * @type {React.RefObject<TextInput> | null}
+     */
+    _defineProperty(_this2, "textInputRef", null);
     _defineProperty(_this2, "state", {
       bankType: 'existing',
       newBankTitle: '',
-      selectedBank: null
+      selectedBank: null,
+      radioValidationError: null,
+      selectValidationError: null
+    });
+    _defineProperty(_this2, "setBankInputRef", function (ref) {
+      _this2.bankSelectionInputRef = ref;
     });
     _defineProperty(_this2, "copyOrMove", function (newBankId) {
       if (_this2.props.keepCopy) {
@@ -51,7 +61,55 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
       }
       _this2.closeAction();
     });
+    _defineProperty(_this2, "clearValidationErrors", function () {
+      _this2.setState({
+        radioValidationError: null,
+        selectValidationError: null
+      });
+    });
+    _defineProperty(_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: t('Please choose a Copy/Move option'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      if (bankType === 'existing' && !selectedBank) {
+        _this2.bankSelectionInputRef.focus();
+        _this2.setState({
+          selectValidationError: [{
+            text: t('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: t('Please enter a new bank title'),
+            type: 'newError'
+          }]
+        });
+        return false;
+      }
+      return true;
+    });
     _defineProperty(_this2, "continueAction", function () {
+      if (!_this2.validateAction()) {
+        return;
+      }
       if (_this2.state.bankType === 'new') {
         var newBank = Bank.create({
           title: _this2.state.newBankTitle,
@@ -92,12 +150,14 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
       return _this2.initiateCopy(newBankId).then(_this2.props.onAdd);
     });
     _defineProperty(_this2, "closeAction", function () {
+      _this2.clearValidationErrors();
       if (_this2.props.modalTrigger) {
         _this2.props.modalTrigger.focus();
       }
       _this2.props.closeModal();
     });
     _defineProperty(_this2, "onBankSelection", function (e, option) {
+      _this2.clearValidationErrors();
       _this2.setState({
         selectedBank: new Bank(option)
       });
@@ -106,15 +166,20 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
       _this2.props.uiSet(COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, e.target.checked);
     });
     _defineProperty(_this2, "handleRadioChange", function (event, value) {
+      _this2.clearValidationErrors();
       _this2.setState({
         bankType: value
       });
     });
     _defineProperty(_this2, "onTitleChange", function (e) {
+      _this2.clearValidationErrors();
       _this2.setState({
         newBankTitle: e.target.value
       });
     });
+    _this2.radioInputRef = React.createRef();
+    _this2.textInputRef = React.createRef();
+    _this2.bankSelectionInputRef = React.createRef();
     return _this2;
   }
   _inherits(CopyMoveBankEntryModal, _Component);
@@ -129,14 +194,9 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
   }, {
     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.createElement(Button, {
         color: "primary",
         onClick: this.continueAction,
-        disabled: disabled,
         margin: XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-add-to-bank-button"
       }, t('Add'));
@@ -146,16 +206,22 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
     value: function renderBankTypeContent() {
       if (this.state.bankType === 'existing') {
         return /*#__PURE__*/React.createElement(BankSelection, {
+          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.createElement(TextInput, {
         onChange: this.onTitleChange,
         value: this.state.newBankTitle,
         renderLabel: t('New Bank Title'),
-        type: "text"
+        type: "text",
+        messages: this.state.selectValidationError,
+        ref: this.textInputRef,
+        isRequired: true
       });
     }
   }, {
@@ -165,10 +231,13 @@ export var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
         onChange: this.handleRadioChange,
         name: t('Bank Type'),
         defaultValue: this.state.bankType,
-        description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Bank Type'))
+        description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Bank Type')),
+        messages: this.state.radioValidationError,
+        isRequired: true
       }, /*#__PURE__*/React.createElement(RadioInput, {
         value: "existing",
-        label: t('Existing item bank')
+        label: t('Existing item bank'),
+        ref: this.radioInputRef
       }), /*#__PURE__*/React.createElement(RadioInput, {
         value: "new",
         label: t('New item bank')

package/es/building/components/resources/DeleteStimulusModal/presenter.js

@@ -156,8 +156,14 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
   }, {
     key: "isPassage",
     value: function isPassage() {
-      var _this$props$stimulusE;
-      return (_this$props$stimulusE = this.props.stimulusEntry) === null || _this$props$stimulusE === void 0 ? void 0 : _this$props$stimulusE.getEntry().passage;
+      var _this$props$stimulusE, _this$props$stimulusE3;
+      if (((_this$props$stimulusE = this.props.stimulusEntry) === null || _this$props$stimulusE === void 0 ? void 0 : _this$props$stimulusE.entryType) === 'BankEntry') {
+        var _this$props$stimulusE2;
+        var bankEntry = (_this$props$stimulusE2 = this.props.stimulusEntry) === null || _this$props$stimulusE2 === void 0 ? void 0 : _this$props$stimulusE2.getEntry();
+        var stimulusEntry = bankEntry === null || bankEntry === void 0 ? void 0 : bankEntry.getEntry();
+        return stimulusEntry === null || stimulusEntry === void 0 ? void 0 : stimulusEntry.isPassage;
+      }
+      return (_this$props$stimulusE3 = this.props.stimulusEntry) === null || _this$props$stimulusE3 === void 0 ? void 0 : _this$props$stimulusE3.getEntry().passage;
     }
   }, {
     key: "anyImmutableKeepers",
@@ -188,7 +194,7 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
         onClick: this.closeAction,
         margin: XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-keep-".concat(this.isPassage() ? 'passage' : 'stimulus', "-button")
-      }, this.isPassage() ? t('Keep Passage') : t('Keep Stimulus'));
+      }, this.isPassage() ? t('Keep Text Block') : t('Keep Stimulus'));
     }
   }, {
     key: "doneButton",
@@ -198,7 +204,7 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
         onClick: this.handleSubmit,
         margin: XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-remove-".concat(this.isPassage() ? 'passage' : 'stimulus', "-button")
-      }, this.isPassage() ? t('Remove Passage') : t('Remove Stimulus'));
+      }, this.isPassage() ? t('Remove Text Block') : t('Remove Stimulus'));
     }
   }, {
     key: "renderChooseWhich",
@@ -241,7 +247,7 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
   }, {
     key: "renderContent",
     value: function renderContent() {
-      var message = this.isPassage() ? t('Are you sure you want to remove this passage?') : t('Are you sure you want to remove this stimulus?');
+      var message = this.isPassage() ? t('Are you sure you want to remove this text block?') : t('Are you sure you want to remove this stimulus?');
       var content = this.props.childEntries.size === 0 ? jsx("span", null, message) : this.renderMainMenu();
       var stimulusTitle = this.props.stimulusEntry && this.props.stimulusEntry.getEntry().title;
       return jsx("div", {
@@ -258,11 +264,11 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
         open: this.props.modalOpen,
         onDismiss: this.closeAction,
         size: "small",
-        label: this.isPassage() ? t('Confirm Passage Removal') : t('Confirm Stimulus Removal')
+        label: this.isPassage() ? t('Confirm Text Block Removal') : t('Confirm Stimulus Removal')
       }, jsx(ModalHeader, null, jsx(Heading, {
         level: "reset",
         as: "h2"
-      }, this.isPassage() ? t('Confirm Passage Removal') : t('Confirm Stimulus Removal')), jsx(CloseButton, {
+      }, this.isPassage() ? t('Confirm Text Block Removal') : t('Confirm Stimulus Removal')), jsx(CloseButton, {
         onClick: this.closeAction,
         placement: "end",
         offset: "medium",

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

@@ -89,6 +89,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         }, _this3.props.renderSidebarItem(item, displayPosition, sidebarOpen));
       });
       var transitionType = isShowingItems ? 'slide-down' : 'slide-up';
+      var screenReaderText = this.props.isPassage ? t('Collapse text block questions') : t('Collapse stimulus questions');
       return jsx(Transition, {
         "in": isShowingItems || this.shouldDisplayAllItems(),
         type: transitionType
@@ -100,7 +101,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         withBackground: false,
         withBorder: false,
         renderIcon: IconArrowOpenUpLine,
-        screenReaderLabel: t('Collapse stimulus questions')
+        screenReaderLabel: screenReaderText
       })), jsx("div", null, itemComponents)));
     }
   }, {
@@ -111,6 +112,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         itemCollection = _this$props2.itemCollection,
         isShowingItems = _this$props2.isShowingItems;
       var transitionType = !isShowingItems ? 'slide-up' : 'slide-down';
+      var screenReaderText = this.props.isPassage ? t('Expand text block questions') : t('Expand stimulus questions');
       return jsx(Transition, {
         "in": !isShowingItems,
         type: transitionType
@@ -124,7 +126,7 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
         withBackground: false,
         withBorder: false,
         renderIcon: IconArrowOpenDownLine,
-        screenReaderLabel: t('Expand stimulus questions')
+        screenReaderLabel: screenReaderText
       })));
     }
   }, {
@@ -155,7 +157,8 @@ export var Collection = (_dec = withStyleOverrides(generateStyle, generateCompon
   // set in connect
   setSidebarStimulusIsShowing: PropTypes.func.isRequired,
   styles: PropTypes.object,
-  makeStyles: PropTypes.func
+  makeStyles: PropTypes.func,
+  isPassage: PropTypes.bool
 }), _defineProperty(_Collection, "defaultProps", {
   isShowingItems: false
 }), _Collection)) || _class);