@instructure/quiz-core 20.36.2 → 20.38.0

package/lib/common/components/resources/stimulus/StimulusShow/styles.js

@@ -22,13 +22,6 @@ var generateStyle = function generateStyle(componentTheme) {
       display: 'flex',
       overflow: 'hidden'
     },
-    stimulusLabel: {
-      color: componentTheme.stimulusLabelColor,
-      fontSize: componentTheme.stimulusLabelFontSize,
-      margin: "0 ".concat(componentTheme.stimulusLabelMargin),
-      overflow: 'hidden',
-      textOverflow: 'ellipsis'
-    },
     stimulusContent: {
       height: '10%0',
       padding: "".concat(componentTheme.stimulusContentPaddingTop, " ").concat(componentTheme.stimulusContentPaddingLeftRight, " ").concat(componentTheme.stimulusContentPaddingBottom)

package/lib/common/components/resources/stimulus/StimulusShow/theme.js

@@ -11,9 +11,6 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     stimulusPadding: spacing.large,
     headerPadding: spacing.small,
-    stimulusLabelColor: colors.ash,
-    stimulusLabelFontSize: typography.fontSizeSmall,
-    stimulusLabelMargin: spacing.xSmall,
     stimulusContentPaddingTop: spacing.large,
     stimulusContentPaddingBottom: spacing.small,
     stimulusContentPaddingLeftRight: spacing.small

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

@@ -13,7 +13,6 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _debounce = _interopRequireDefault(require("lodash/fp/debounce"));
-var _uiSelect = require("@instructure/ui-select");
 var _uiSpinner = require("@instructure/ui-spinner");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _quizCommon = require("@instructure/quiz-common");
@@ -91,7 +90,7 @@ var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
     };
     _this.actualOptions = function () {
       return _this.state.options.map(function (option) {
-        return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+        return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
           id: option.id,
           key: option.id,
           isHighlighted: option.id === _this.state.highlightedOptionId
@@ -107,7 +106,7 @@ var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
       return _this.state.inputValue === '' ? (0, _formatMessage.default)('Write to search') : (0, _formatMessage.default)('No Results');
     };
     _this.emptyOrLoadingOption = function () {
-      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
         id: _quizCommon.SELECT_EMPTY_OPTION,
         key: _quizCommon.SELECT_EMPTY_OPTION
       }, _this.state.isLoading ? /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
@@ -141,7 +140,7 @@ var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select, {
         "data-automation": this.props.selectAutomation,
         renderLabel: this.props.label,
         placeholder: this.props.placeholder,

package/lib/common/components/shared/InteractionTypes/index.js

@@ -7,8 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactRedux = require("../../../react-redux.js");
 var _presenter = _interopRequireDefault(require("./presenter.js"));
+var _featureCheck = require("../../../../common/util/featureCheck.js");
 function mapStateToProps(state) {
-  return {};
+  return {
+    allowPassageCreation: (0, _featureCheck.featureOn)('passage')
+  };
 }
 var _default = (0, _reactRedux.connect)(mapStateToProps)(_presenter.default);
 exports.default = _default;

package/lib/common/components/shared/InteractionTypes/presenter.js

@@ -39,21 +39,37 @@ var InteractionTypes = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
     _this = _super.call.apply(_super, [this].concat(args));
     _this.renderInteractionTypeButton = function (intType, i) {
       var onClick, Icon, name, title, automation;
-      if (intType.name === 'Stimulus') {
-        onClick = _this.props.addStimulus;
-        Icon = _uiIcons.IconPlusLine;
-        name = (0, _formatMessage.default)('Stimulus');
-        title = (0, _formatMessage.default)('Add Stimulus');
-        automation = 'sdk-interaction-button-stimulus';
-      } else {
-        onClick = (0, _partial.default)(_this.props.addItem, intType);
-        var metadata = (0, _interactionTypeMetadata.interactionTypeMetadata)(intType);
-        Icon = metadata.icon;
-        name = metadata.name;
-        title = (0, _formatMessage.default)('Add {name} Question', {
-          name: name
-        });
-        automation = "sdk-interaction-button-".concat(intType.slug);
+      switch (intType.name) {
+        case 'Stimulus':
+          onClick = function onClick() {
+            return _this.props.addStimulus(false);
+          };
+          Icon = _uiIcons.IconPlusLine;
+          name = (0, _formatMessage.default)('Stimulus');
+          title = (0, _formatMessage.default)('Add Stimulus');
+          automation = 'sdk-interaction-button-stimulus';
+          break;
+        case 'Passage':
+          onClick = function onClick() {
+            return _this.props.addStimulus(true);
+          };
+          Icon = _uiIcons.IconPlusLine;
+          name = (0, _formatMessage.default)('Passage');
+          title = (0, _formatMessage.default)('Add Passage');
+          automation = 'sdk-interaction-button-passage';
+          break;
+        default:
+          {
+            onClick = (0, _partial.default)(_this.props.addItem, intType);
+            var metadata = (0, _interactionTypeMetadata.interactionTypeMetadata)(intType);
+            Icon = metadata.icon;
+            name = metadata.name;
+            title = (0, _formatMessage.default)('Add {name} Question', {
+              name: name
+            });
+            automation = "sdk-interaction-button-".concat(intType.slug);
+            break;
+          }
       }
       return (0, _emotion.jsx)(_uiButtons.Button, {
         key: intType.slug,
@@ -123,6 +139,12 @@ var InteractionTypes = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         }, _this.renderInteractionTypeButton({
           name: 'Stimulus',
           slug: 'stimulus'
+        })), _this.props.allowPassageCreation && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
+          width: 12 / _this.props.columns,
+          key: "passage"
+        }, _this.renderInteractionTypeButton({
+          name: 'Passage',
+          slug: 'passage'
         })));
         return [dividerRow, stimulusRow];
       }
@@ -146,6 +168,7 @@ var InteractionTypes = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
   addItem: _propTypes.default.func.isRequired,
   addStimulus: _propTypes.default.func.isRequired,
   allowStimulusCreation: _propTypes.default.bool,
+  allowPassageCreation: _propTypes.default.bool,
   types: _reactImmutableProptypes.default.list,
   styles: _propTypes.default.object
 }, _InteractionTypes.defaultProps = {

package/lib/common/components/shared/TagSelect/presenter.js

@@ -13,7 +13,6 @@ 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 _uiSelect = require("@instructure/ui-select");
 var _index = _interopRequireDefault(require("../TagWrapper/index.js"));
 var _differenceBy = _interopRequireDefault(require("lodash/differenceBy"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -181,7 +180,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
         tagSuggestions = _this$props2.tagSuggestions;
       var notSelectedTagSuggestions = (0, _differenceBy.default)(tagSuggestions, tags, 'value');
       var options = notSelectedTagSuggestions.map(function (tag) {
-        return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+        return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
           key: _this3.encodeTag(tag),
           id: _this3.encodeTag(tag),
           isHighlighted: _this3.encodeTag(tag) === _this3.state.highlightedOptionId
@@ -193,7 +192,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
         return tag.value === inputValue;
       })) {
         if (allowNewTags && inputValue.length > 0) {
-          options.push(/*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+          options.push(/*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
             id: this.encodeTag({
               value: inputValue
             }),
@@ -207,7 +206,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
         }
       }
       if (options.length === 0) {
-        options.push(/*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+        options.push(/*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
           id: _quizCommon.SELECT_EMPTY_OPTION,
           key: _quizCommon.SELECT_EMPTY_OPTION
         }, this.emptyOption()));
@@ -220,7 +219,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         inputValue = _this$state.inputValue,
         isShowingOptions = _this$state.isShowingOptions;
-      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select, {
         renderLabel: (0, _formatMessage.default)('Tags and Metadata'),
         inputValue: inputValue,
         isShowingOptions: isShowingOptions,

package/lib/common/components/shared/TimeUnitsInput/index.js

@@ -12,10 +12,9 @@ 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 _uiFormField = require("@instructure/ui-form-field");
+var _quizCommon = require("@instructure/quiz-common");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _uiView = require("@instructure/ui-view");
-var _Errors = _interopRequireDefault(require("../../../../common/components/shared/errors/Errors.js"));
 var _immutable = require("immutable");
 var _index = require("../FormattedDuration/index.js");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -144,7 +143,8 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
         newHours = _breakdownSeconds4.hours,
         newMinutes = _breakdownSeconds4.minutes;
       if (_this.state.shouldResetOnNormalize) {
-        _this.props.onReset();
+        var _this$props$onReset, _this$props;
+        (_this$props$onReset = (_this$props = _this.props).onReset) === null || _this$props$onReset === void 0 ? void 0 : _this$props$onReset.call(_this$props);
       }
       _this.setState({
         days: newDays,
@@ -175,7 +175,12 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
       daysError && errorArray.push(daysError);
       hoursError && errorArray.push(hoursError);
       minutesError && errorArray.push(minutesError);
-      return (0, _immutable.List)(errorArray);
+      return errorArray.map(function (error) {
+        return {
+          type: 'error',
+          text: error
+        };
+      });
     };
     return _this;
   }
@@ -242,11 +247,12 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/_react.default.createElement(_uiView.View, {
         display: "block",
         margin: this.props.margin
-      }, /*#__PURE__*/_react.default.createElement(_uiFormField.FormFieldGroup, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.FormFieldGroup, {
         description: /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, this.props.description),
         layout: "columns",
         vAlign: "top",
-        startAt: "small"
+        startAt: "small",
+        messages: this.getErrorList()
       }, this.props.includeDays && /*#__PURE__*/_react.default.createElement(_quizNumberInput.NumberInput, {
         renderLabel: this.props.daysLabel,
         min: 0,
@@ -279,10 +285,6 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
         }] : null,
         "data-automation": this.props.minutesDataAutomation,
         width: this.props.inputWidth
-      })), /*#__PURE__*/_react.default.createElement(_uiView.View, {
-        display: "block"
-      }, /*#__PURE__*/_react.default.createElement(_Errors.default, {
-        errorList: this.getErrorList()
       })));
     }
   }]);

package/lib/common/components/shared/drag_and_drop/dragAndDropUtils.js

@@ -46,6 +46,9 @@ var posObjFromQuizEntry = (0, _cachePreviousArgs.default)(function (quizEntryDra
   // handle dragging items over stimulus
   if (!quizEntryDragging.hasStimulus && quizEntryHovered.hasStimulus && (onRightHalf || inSidebar)) {
     if (deepInsideEntry && quizEntryHovered.getNestedEntries().size === 0) {
+      if (quizEntryHovered.isPassage) {
+        return null;
+      }
       newPositionObj.intoEmptyStimulus = true;
       return newPositionObj;
     } else if (deepInsideEntry) {

package/lib/common/records/QuizEntry.js

@@ -365,6 +365,11 @@ var QuizEntry = (_dec = (0, _withStateCache.default)(function () {
     get: function get() {
       return this.entryType === 'Stimulus';
     }
+  }, {
+    key: "isPassage",
+    get: function get() {
+      return Boolean(this.isStimulus && this.getEntry() && this.getEntry().passage);
+    }
   }, {
     key: "isItem",
     get: function get() {

package/lib/common/records/Stimulus.js

@@ -78,7 +78,8 @@ var Stimulus = /*#__PURE__*/function (_ReduxRecord) {
   body: '',
   sourceUrl: '',
   status: 'mutable',
-  orientation: 'left'
+  orientation: 'left',
+  passage: false
 }));
 exports.Stimulus = Stimulus;
 var _default = Stimulus;

package/lib/common/reducers/modifications.js

@@ -80,9 +80,12 @@ var _default = function _default() {
           quizEntries: [_quizCommon.TEMPORARY_QUIZ_ENTRY_ID]
         };
         var stateWithStimulusQuizMods = updateObjectOfType(state, action.payload.quizId, stimulusQuizMods, 'quizzes');
-        var tempStimulus = new _Stimulus.default({
-          id: _quizCommon.TEMPORARY_STIMULUS_ID
-        }).toJS();
+        var tempStimulus = new _Stimulus.default((0, _objectSpread2.default)({
+          id: _quizCommon.TEMPORARY_STIMULUS_ID,
+          passage: action.payload.isPassage
+        }, action.payload.isPassage && {
+          orientation: 'top'
+        })).toJS();
         var stateWithStimulusMods = updateObjectOfType(stateWithStimulusQuizMods, _quizCommon.TEMPORARY_STIMULUS_ID, tempStimulus, 'stimuli');
         var stimulusPosition = action.payload.position === 0 ? 0.9 : action.payload.position - 0.1;
         var stimulusQuizEntryMods = {

package/lib/common/util/warningHelpers.js

@@ -8,6 +8,7 @@ exports.propsForBankEntryUnauthorizedEdit = exports.propsForStimulusBankEntryEdi
 var _react = _interopRequireDefault(require("react"));
 var _partial = _interopRequireDefault(require("lodash/partial"));
 var _uiText = require("@instructure/ui-text");
+var _uiView = require("@instructure/ui-view");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var propsForVersioningWrapper = function propsForVersioningWrapper(copyDescription, immutableDescription, isImmutable, shouldClone, setShouldClone, switchOffEditing, isEditing) {
   var alertType = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : 'warning';
@@ -94,12 +95,21 @@ var propsForItemBankEntryEditPrompt = function propsForItemBankEntryEditPrompt()
 };
 exports.propsForItemBankEntryEditPrompt = propsForItemBankEntryEditPrompt;
 var propsForStimulusBankEntryEditPrompt = function propsForStimulusBankEntryEditPrompt() {
-  for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-    args[_key5] = arguments[_key5];
-  }
-  return propsForBankEntryEditPrompt.apply(void 0, args.concat([/*#__PURE__*/_react.default.createElement(_uiText.Text, {
+  var isPassage = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
+  var title = isPassage ? (0, _formatMessage.default)('Banked Passage.') : (0, _formatMessage.default)('Banked Stimulus.');
+  var content = isPassage ? (0, _formatMessage.default)('Editing of this passage must take place within the bank.') : (0, _formatMessage.default)('Editing of this stimulus must take place within the bank.');
+  var promptComponent = /*#__PURE__*/_react.default.createElement(_uiView.View, {
+    as: "div",
     "data-automation": "sdk-editInBanks-warning"
-  }, /*#__PURE__*/_react.default.createElement("b", null, (0, _formatMessage.default)('Banked Stimulus.')), "\xA0", (0, _formatMessage.default)('Editing of this stimulus must take place within the bank.'))]));
+  }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
+    weight: "bold"
+  }, title), /*#__PURE__*/_react.default.createElement(_uiView.View, {
+    margin: "0 0 0 xx-small"
+  }, /*#__PURE__*/_react.default.createElement(_uiText.Text, null, content)));
+  for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
+    args[_key5 - 1] = arguments[_key5];
+  }
+  return propsForBankEntryEditPrompt.apply(void 0, args.concat([promptComponent]));
 };
 exports.propsForStimulusBankEntryEditPrompt = propsForStimulusBankEntryEditPrompt;
 var propsForBankEntryUnauthorizedEdit = function propsForBankEntryUnauthorizedEdit(isEditing) {

package/lib/index.js

@@ -82,6 +82,8 @@ var _exportNames = {
   TagWrapper: true,
   RetryGradePassbackButton: true,
   GenericAsyncSearch: true,
+  MaskedTextInput: true,
+  AccessCodeTextInput: true,
   config: true,
   Fetcher: true,
   httpHeaders: true,
@@ -673,6 +675,18 @@ Object.defineProperty(exports, "GenericAsyncSearch", {
     return _GenericAsyncSearch.GenericAsyncSearch;
   }
 });
+Object.defineProperty(exports, "MaskedTextInput", {
+  enumerable: true,
+  get: function get() {
+    return _index58.MaskedTextInput;
+  }
+});
+Object.defineProperty(exports, "AccessCodeTextInput", {
+  enumerable: true,
+  get: function get() {
+    return _index59.AccessCodeTextInput;
+  }
+});
 Object.defineProperty(exports, "config", {
   enumerable: true,
   get: function get() {
@@ -784,7 +798,7 @@ Object.defineProperty(exports, "formatTime", {
 Object.defineProperty(exports, "generateImportModalId", {
   enumerable: true,
   get: function get() {
-    return _index58.generateImportModalId;
+    return _index60.generateImportModalId;
   }
 });
 Object.defineProperty(exports, "TimerService", {
@@ -1533,6 +1547,8 @@ var _index55 = require("./common/components/shared/FormattedDuration/index.js");
 var _index56 = _interopRequireDefault(require("./common/components/shared/TagWrapper/index.js"));
 var _index57 = require("./moderating/components/resources/RetryGradePassbackButton/index.js");
 var _GenericAsyncSearch = require("./common/components/shared/GenericAsyncSearch/GenericAsyncSearch.js");
+var _index58 = require("./common/components/MaskedTextInput/index.js");
+var _index59 = require("./common/components/AccessCodeTextInput/index.js");
 var _config = require("./config.js");
 var _Fetcher = require("./common/util/Fetcher.js");
 var _httpHeaders = require("./common/util/httpHeaders.js");
@@ -1545,7 +1561,7 @@ var _interactionTypePropsHelper = require("./common/util/interactionTypePropsHel
 var _generateDisplayPositions = require("./common/util/generateDisplayPositions.js");
 var _makeScrollable = require("./common/components/shared/functionality/makeScrollable.js");
 var _formatTimespan = require("./common/util/formatTimespan.js");
-var _index58 = require("./common/components/ImportModal/index.js");
+var _index60 = require("./common/components/ImportModal/index.js");
 var _TimerService = require("./common/util/TimerService.js");
 var _TimeRecordingService = require("./common/util/TimeRecordingService.js");
 var _windowChecks = require("./common/util/windowChecks.js");
@@ -1592,15 +1608,15 @@ var _rce2 = require("./common/selectors/rce.js");
 var _quizSessions4 = require("./common/selectors/quizSessions.js");
 var _sessionItems = require("./common/selectors/sessionItems.js");
 var _sessionItemResults = require("./common/selectors/sessionItemResults.js");
-var _index59 = require("./common/records/index.js");
-Object.keys(_index59).forEach(function (key) {
+var _index61 = require("./common/records/index.js");
+Object.keys(_index61).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _index59[key]) return;
+  if (key in exports && exports[key] === _index61[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _index59[key];
+      return _index61[key];
     }
   });
 });

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

@@ -14,7 +14,7 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiView = require("@instructure/ui-view");
-var _uiSimpleSelect = require("@instructure/ui-simple-select");
+var _quizCommon = require("@instructure/quiz-common");
 var _index = _interopRequireDefault(require("../../../../../common/components/shared/TimeUnitsInput/index.js"));
 var _index2 = _interopRequireDefault(require("../ExtraTimeMultiplier/index.js"));
 var _index3 = require("../../../../../common/components/shared/FormattedDuration/index.js");
@@ -75,22 +75,22 @@ var ExtraTimeSettings = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/_react.default.createElement(_uiView.View, {
         display: "block",
         margin: "medium none"
-      }, /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect, {
         renderLabel: (0, _formatMessage.default)('Time adjustments'),
         assistiveText: (0, _formatMessage.default)('4 options available. Use arrow keys to navigate options.'),
         value: timeAdjustmentType,
         onChange: this.onChangeTimeAdjustmentType,
         "data-automation": "sdk-moderation-time-dropdown"
-      }, /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect.Option, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect.Option, {
         id: "extra-time-settings-select-option-none",
         value: "none"
-      }, (0, _formatMessage.default)('None')), /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _formatMessage.default)('None')), /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect.Option, {
         id: "extra-time-settings-select-option-additional-time",
         value: "extraTimeEnabled"
-      }, (0, _formatMessage.default)('Give additional time')), /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _formatMessage.default)('Give additional time')), /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect.Option, {
         id: "extra-time-settings-select-option-remove-time",
         value: "disableTimer"
-      }, (0, _formatMessage.default)('Remove time limit (unlimited)')), /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _formatMessage.default)('Remove time limit (unlimited)')), /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect.Option, {
         id: "extra-time-settings-select-option-time-multiplier",
         value: "timerMultiplierEnabled"
       }, (0, _formatMessage.default)('Time limit multiplier'))), timeAdjustmentType === 'extraTimeEnabled' && /*#__PURE__*/_react.default.createElement(_index.default, {
@@ -102,7 +102,7 @@ var ExtraTimeSettings = /*#__PURE__*/function (_Component) {
         minutesLabel: (0, _formatMessage.default)('Minutes'),
         minutesDataAutomation: "sdk-moderation-time-minutes",
         description: (0, _formatMessage.default)('Additional time'),
-        margin: "medium none"
+        margin: "medium none none none"
       }), timeAdjustmentType === 'timerMultiplierEnabled' && /*#__PURE__*/_react.default.createElement(_index2.default, {
         onChange: this.onChangeMultiplier,
         timerMultiplierValue: timerSettings.timerMultiplierValue,

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

@@ -12,7 +12,6 @@ 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 _uiText = require("@instructure/ui-text");
 var _uiTooltip = require("@instructure/ui-tooltip");
 var _uiModal = require("@instructure/ui-modal");
 var _uiTruncateText = require("@instructure/ui-truncate-text");
@@ -21,8 +20,6 @@ var _uiView = require("@instructure/ui-view");
 var _uiButtons = require("@instructure/ui-buttons");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _uiA11yContent = require("@instructure/ui-a11y-content");
-var _featureCheck = require("../../../../common/util/featureCheck.js");
-var _index = require("../../../../common/components/shared/IfFeature/index.js");
 var AccommodationModal = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(AccommodationModal, _Component);
   var _super = (0, _createSuper2.default)(AccommodationModal);
@@ -65,7 +62,7 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
       }, _this.props.studentName));
     };
     _this.renderHeading = function () {
-      if ((0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (_this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, null, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Student Accommodation')), (0, _formatMessage.default)('Student Accommodation'));
       }
       var _this$props = _this.props,
@@ -92,7 +89,7 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
   (0, _createClass2.default)(AccommodationModal, [{
     key: "labelText",
     value: function labelText() {
-      if ((0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return (0, _formatMessage.default)('Student Accommodation');
       }
       return this.props.studentName || (0, _formatMessage.default)('Accommodations Modal');
@@ -101,7 +98,6 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
-        studentName = _this$props2.studentName,
         open = _this$props2.open,
         closeModal = _this$props2.closeModal,
         mountNode = _this$props2.mountNode,
@@ -117,12 +113,7 @@ var AccommodationModal = /*#__PURE__*/function (_Component) {
         placement: "end",
         offset: "medium",
         screenReaderLabel: (0, _formatMessage.default)('Close')
-      }), this.renderHeading()), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Body, null, /*#__PURE__*/_react.default.createElement(_index.IfFeature, {
-        name: "atteq_apply_changes_to_current_quiz_attempts"
-      }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
-        weight: "bold",
-        as: "h2"
-      }, studentName)), children), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Footer, null, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
+      }), this.renderHeading()), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Body, null, children), /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Footer, null, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         onClick: this.cancelAction,
         margin: "xxx-small",
         "data-automation": "sdk-moderation-cancel"
@@ -146,7 +137,8 @@ AccommodationModal.propTypes = {
   onDismiss: _propTypes.default.func,
   mountNode: _propTypes.default.string,
   // this is just to fix chromatic
-  children: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.arrayOf(_propTypes.default.node)])
+  children: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.arrayOf(_propTypes.default.node)]),
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: _propTypes.default.bool.isRequired
 };
 AccommodationModal.defaultProps = {
   children: [],

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

@@ -16,7 +16,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiText = require("@instructure/ui-text");
 var _uiLink = require("@instructure/ui-link");
-var _uiFlex = require("@instructure/ui-flex");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _uiTable = require("@instructure/ui-table");
 var _uiButtons = require("@instructure/ui-buttons");
@@ -35,7 +34,7 @@ var _quizCommon = require("@instructure/quiz-common");
 var _lodash = require("lodash");
 var _dec, _class, _ModerateTable;
 /** @jsx jsx */
-var _ref2 = (0, _emotion.jsx)(_uiFlex.Flex.Item, null, (0, _emotion.jsx)(_uiIcons.IconInfoLine, null));
+var _ref2 = (0, _emotion.jsx)(_quizCommon.Flex.Item, null, (0, _emotion.jsx)(_uiIcons.IconInfoLine, null));
 var _ref4 = (0, _emotion.jsx)(_uiIcons.IconConfigureLine, null);
 var _ref5 = (0, _emotion.jsx)(_Spinner.default, null);
 var _ref6 = (0, _emotion.jsx)(_index5.default, null);
@@ -247,7 +246,7 @@ var ModerateTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
       var _this3 = this;
       return (0, _emotion.jsx)("div", null, (0, _emotion.jsx)(_index2.default, {
         name: "manual_submission"
-      }, (0, _emotion.jsx)(_uiFlex.Flex, null, _ref2, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex, null, _ref2, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         padding: "xx-small"
       }, _formatMessage.default.rich('This assessment has <0>{count, plural, one {# attempt} other {# attempts}}</0> in progress.', {
         count: outstandingAttemptsCount,
@@ -332,8 +331,9 @@ var ModerateTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         css: this.props.styles.page
       }, (0, _emotion.jsx)(_index4.default, {
         onClose: this.onCloseTray,
-        onSave: this.props.onSaveTray
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
+        onSave: this.props.onSaveTray,
+        atteqApplyChangesToCurrentQuizAttemptsEnabled: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
     }
   }]);
   ModerateTable.displayName = "ModerateTable";
@@ -387,7 +387,8 @@ var ModerateTable = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   getQuizSessions: _propTypes.default.func.isRequired,
   addSuccess: _propTypes.default.func.isRequired,
   styles: _propTypes.default.object,
-  makeStyles: _propTypes.default.func
+  makeStyles: _propTypes.default.func,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: _propTypes.default.bool.isRequired
 }, _ModerateTable.defaultProps = {
   anonymousGrading: false,
   children: void 0,