@instructure/quiz-core 20.36.1-rc.2 → 20.36.1-rc.4

package/lib/common/components/MaskedTextInput/index.js

@@ -0,0 +1,74 @@
+"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.MaskedTextInput = 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 _uiView = require("@instructure/ui-view");
+var _uiCheckbox = require("@instructure/ui-checkbox");
+var _uiReactUtils = require("@instructure/ui-react-utils");
+var _quizCommon = require("@instructure/quiz-common");
+var maskedTextInputPropTypes = {
+  /**
+   * The label to be used for the checkbox that controls whether the input is masked
+   */
+  checkboxLabel: _propTypes.default.string.isRequired,
+  /**
+   * Whether or not the input text is masked
+   */
+  masked: _propTypes.default.bool,
+  /**
+   * The function to call when the user clicks the checkbox to either mask or unmask the input
+   */
+  onMaskedChange: _propTypes.default.func
+};
+var MaskedTextInput = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(MaskedTextInput, _Component);
+  var _super = (0, _createSuper2.default)(MaskedTextInput);
+  function MaskedTextInput() {
+    (0, _classCallCheck2.default)(this, MaskedTextInput);
+    return _super.apply(this, arguments);
+  }
+  (0, _createClass2.default)(MaskedTextInput, [{
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+        checkboxLabel = _this$props.checkboxLabel,
+        masked = _this$props.masked,
+        onMaskedChange = _this$props.onMaskedChange,
+        type = _this$props.type;
+      var textInputProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _uiReactUtils.omitProps)(this.props, maskedTextInputPropTypes)), {}, {
+        type: masked ? 'password' : type
+      });
+      return /*#__PURE__*/_react.default.createElement(_uiView.View, {
+        as: "div"
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.TextInput, textInputProps), /*#__PURE__*/_react.default.createElement(_uiView.View, {
+        as: "div",
+        margin: "small 0"
+      }, /*#__PURE__*/_react.default.createElement(_uiCheckbox.Checkbox, {
+        label: checkboxLabel,
+        checked: !masked,
+        onChange: onMaskedChange
+      })));
+    }
+  }]);
+  MaskedTextInput.displayName = "MaskedTextInput";
+  return MaskedTextInput;
+}(_react.Component);
+exports.MaskedTextInput = MaskedTextInput;
+MaskedTextInput.propTypes = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, maskedTextInputPropTypes), _quizCommon.TextInput.propTypes);
+MaskedTextInput.defaultProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _quizCommon.TextInput.defaultProps), {}, {
+  masked: true,
+  onMaskedChange: Function.prototype
+});
+var _default = MaskedTextInput;
+exports.default = _default;

package/lib/common/components/resources/item/ItemEdit/presenter.js

@@ -15,7 +15,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _OutcomeAlignments = _interopRequireDefault(require("@instructure/outcomes-ui/es/containers/OutcomeAlignments"));
 var _OutcomeCount = _interopRequireDefault(require("@instructure/outcomes-ui/es/containers/OutcomeCount"));
-var _uiFormField = require("@instructure/ui-form-field");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _CustomPropTypes = _interopRequireDefault(require("../../../../../common/util/CustomPropTypes.js"));
 var _componentForItem = _interopRequireDefault(require("../../../../util/componentForItem.js"));
@@ -136,7 +135,7 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
       var interactionType = item.getInteractionType().slug;
       var Interaction = (0, _componentForItem.default)(interactionType, _quizCommon.COMPONENT_EDIT);
       var propsForInteraction = (0, _interactionTypePropsHelper.propsForInteractionEdit)(this.props, this.additionalEditOptions());
-      return /*#__PURE__*/_react.default.createElement(_uiFormField.FormFieldGroup, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.FormFieldGroup, {
         messages: this.getError('onSelf'),
         description: /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Edit question:')),
         name: "edit_item_".concat(this.props.guid)

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

@@ -13,13 +13,11 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiA11yContent = require("@instructure/ui-a11y-content");
-var _uiTextInput = require("@instructure/ui-text-input");
 var _uiFormField = require("@instructure/ui-form-field");
 var _emotion = require("@instructure/emotion");
 var _uiHeading = require("@instructure/ui-heading");
 var _quizRce = require("@instructure/quiz-rce");
 var _instUIMessages = require("../../../../util/instUIMessages.js");
-var _uiSimpleSelect = require("@instructure/ui-simple-select");
 var _uiIcons = require("@instructure/ui-icons");
 var _uiToggleDetails = require("@instructure/ui-toggle-details");
 var _quizCommon = require("@instructure/quiz-common");
@@ -85,18 +83,18 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
       var stimulusOrientation = this.props.workingStimulus.get('orientation');
       return (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
+      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect, {
         renderLabel: (0, _formatMessage.default)('Orientation'),
         onChange: this.onOrientationChange,
         value: stimulusOrientation,
         renderBeforeInput: (0, _emotion.jsx)(_uiIcons.IconUpdownLine, {
           rotate: stimulusOrientation === _quizCommon.TOP ? '0' : '90'
         })
-      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
         renderBeforeLabel: _ref3,
         id: "stimulus-orientation-select-option-left",
         value: "left"
-      }, (0, _formatMessage.default)('Questions to the right')), (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _formatMessage.default)('Questions to the right')), (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
         renderBeforeLabel: _ref4,
         id: "stimulus-orientation-select-option-top",
         value: "top"
@@ -116,7 +114,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         as: "h2"
       }, this.headerText()), (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
+      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         messages: this.inputErrors('title'),
         renderLabel: (0, _formatMessage.default)('Title'),
         type: "text",
@@ -126,7 +124,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         "data-automation": "sdk-stimulus-title-input"
       })), (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
+      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         renderLabel: this.renderOptionalLabel((0, _formatMessage.default)('Instructions')),
         type: "text",
         onChange: this.onTextInputChange('instructions'),
@@ -157,7 +155,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         summary: (0, _formatMessage.default)('Options')
       }, this.props.stimulusOrientationEnabled ? this.renderStimulusOrientationSelect() : null, (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
+      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         renderLabel: this.renderOptionalLabel((0, _formatMessage.default)('Source URL'), (0, _formatMessage.default)('(optional - not visible to students)')),
         type: "text",
         onChange: this.onTextInputChange('sourceUrl'),

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/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

@@ -144,7 +144,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,

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

@@ -332,7 +332,8 @@ 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
+        onSave: this.props.onSaveTray,
+        atteqApplyChangesToCurrentQuizAttemptsEnabled: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled
       }, (0, _emotion.jsx)(_uiFlex.Flex.Item, null, !this.props.anonymousGrading && _ref6), this.props.children), this.renderContent());
     }
   }]);
@@ -387,7 +388,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,

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

@@ -16,6 +16,7 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 var _uiFlex = require("@instructure/ui-flex");
 var _uiView = require("@instructure/ui-view");
 var _uiText = require("@instructure/ui-text");
+var _uiHeading = require("@instructure/ui-heading");
 var _uiTooltip = require("@instructure/ui-tooltip");
 var _uiTray = require("@instructure/ui-tray");
 var _uiButtons = require("@instructure/ui-buttons");
@@ -23,7 +24,6 @@ var _uiTruncateText = require("@instructure/ui-truncate-text");
 var _uiModal = require("@instructure/ui-modal");
 var _quizCommon = require("@instructure/quiz-common");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
-var _featureCheck = require("../../../../common/util/featureCheck.js");
 var ModerateTray = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(ModerateTray, _Component);
   var _super = (0, _createSuper2.default)(ModerateTray);
@@ -75,20 +75,15 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
       _this.props.closeTray();
     };
     _this.renderTitleAndCloseButton = function () {
-      return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
-        justifyItems: "space-between"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
-        shouldGrow: true,
-        shouldShrink: true
-      }, (0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts') ? /*#__PURE__*/_react.default.createElement(_uiText.Text, {
-        as: "h2",
-        size: "large",
-        weight: "bold"
-      }, (0, _formatMessage.default)('In Progress Accommodation')) : _this.renderHeading()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
+      return /*#__PURE__*/_react.default.createElement(_uiModal.Modal.Header, null, /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
         onClick: _this.props.closeTray,
         elementRef: _this.setCloseRef,
+        placement: "end",
+        offset: "medium",
         screenReaderLabel: (0, _formatMessage.default)('Close')
-      })));
+      }), _this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
+        level: "h3"
+      }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('In Progress Accommodation')), (0, _formatMessage.default)('In Progress Accommodation')) : _this.renderHeading());
     };
     _this.renderChildren = function () {
       return _react.default.Children.map(_this.props.children, function (child) {
@@ -136,12 +131,12 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
         /*#__PURE__*/
         // When using TruncateText inside a Tooltip, a focusable wrapper element is required
         // tabIndex={0} makes the div focusable and allows KO users to access the tooltip
-        _react.default.createElement(_uiView.View, {
+        _react.default.createElement(_uiHeading.Heading, {
           display: "block",
           borderRadius: "small",
           position: "relative",
           withFocusOutline: this.state.titleIsTruncated && focused,
-          as: "h2",
+          level: "h3",
           tabIndex: this.state.isTruncated ? 0 : null
         }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, this.labelText()), /*#__PURE__*/_react.default.createElement(_uiTruncateText.TruncateText, {
           "aria-hidden": "true",
@@ -154,9 +149,6 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderName",
     value: function renderName(renderProps) {
-      if (!(0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       var focused = renderProps && renderProps.focused;
       return (
         /*#__PURE__*/
@@ -167,8 +159,7 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
           borderRadius: "small",
           position: "relative",
           withFocusOutline: this.state.participantNameIsTruncated && focused,
-          tabIndex: this.state.participantNameIsTruncated ? 0 : null,
-          margin: "small 0"
+          tabIndex: this.state.participantNameIsTruncated ? 0 : null
         }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, this.props.participantName), /*#__PURE__*/_react.default.createElement(_uiTruncateText.TruncateText, {
           "aria-hidden": "true",
           maxLines: 2,
@@ -183,9 +174,6 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
     key: "renderNameWithTooltip",
     value: function renderNameWithTooltip() {
       var _this3 = this;
-      if (!(0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
-        return null;
-      }
       return this.state.titleIsTruncated ? /*#__PURE__*/_react.default.createElement(_uiTooltip.Tooltip, {
         placement: "start",
         renderTip: this.props.participantName,
@@ -200,7 +188,7 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
   }, {
     key: "labelText",
     value: function labelText() {
-      if ((0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts')) {
+      if (this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled) {
         return (0, _formatMessage.default)('In Progress Accommodation');
       }
       if (this.props.participantName) {
@@ -219,19 +207,21 @@ var ModerateTray = /*#__PURE__*/function (_Component) {
         onExited: this.handleTrayExited,
         open: this.props.isOpen,
         placement: "end",
-        size: (0, _featureCheck.featureOn)('atteq_apply_changes_to_current_quiz_attempts') ? 'regular' : void 0,
+        size: this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled ? 'regular' : void 0,
         shouldCloseOnDocumentClick: true,
         ref: this.setTrayRef
       }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
         as: "div",
         direction: "column",
         height: "100vh"
-      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
-        padding: "small medium"
-      }, this.renderTitleAndCloseButton()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+        padding: "medium medium 0 medium"
+      }, this.renderNameWithTooltip()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+        padding: "medium"
+      }, (0, _formatMessage.default)('These settings apply to current and all future attempts.')), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
         shouldGrow: true,
         padding: "0 medium"
-      }, this.renderNameWithTooltip(), this.renderChildren()), (0, _featureCheck.featureOn)('add_time_to_existing_quiz_sessions') && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderFooter())));
+      }, this.renderChildren()), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, this.renderFooter())));
     }
   }]);
   ModerateTray.displayName = "ModerateTray";
@@ -244,7 +234,8 @@ ModerateTray.propTypes = {
   isOpen: _propTypes.default.bool.isRequired,
   onClose: _propTypes.default.func,
   onSave: _propTypes.default.func.isRequired,
-  participantName: _propTypes.default.string
+  participantName: _propTypes.default.string,
+  atteqApplyChangesToCurrentQuizAttemptsEnabled: _propTypes.default.bool.isRequired
 };
 ModerateTray.defaultProps = {
   onClose: void 0,