@instructure/quiz-core 17.25.2-rc.9 → 17.26.1-rc.1

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [17.26.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.25.1...v17.26.0) (2022-02-23)
+
+
+### Features
+
+* **banks:** update 'All My Banks' to 'All Banks' ([4a5ecfc](https://gerrit.instructure.com/quizzes-ui/commits/4a5ecfc0502909ecba675687813e70aa361dd997))
+* **FITB:** add rich FITB edit ([d227a60](https://gerrit.instructure.com/quizzes-ui/commits/d227a60b245f8fc6bacb118ac778521e2dc76c54))
+* **itembanks:** Update item bank filter name ([774962a](https://gerrit.instructure.com/quizzes-ui/commits/774962ad4ad71c98347d503f24e677409984f394))
+* **quizzes-ui:** Reintroduce TinyMCE v5 to load based on a feature flag ([aaf1c83](https://gerrit.instructure.com/quizzes-ui/commits/aaf1c83ce9a2ba93f62fe9e4b6219596543709b2))
+* **revert:** Reintroduce TinyMCE v5 to load based on a feature flag" ([8813246](https://gerrit.instructure.com/quizzes-ui/commits/88132463640fe5aad9267ed0096dfd22d40fd552))
+
+
+
+
+
 ## [17.25.1](https://gerrit.instructure.com/quizzes-ui/compare/v17.25.0...v17.25.1) (2022-02-09)
 
 **Note:** Version bump only for package @instructure/quiz-core

package/es/banks/components/Banks/index.js

@@ -11,7 +11,7 @@ import { BANKS_BANK_FILTERS } from '@instructure/quiz-common';
 
 function mapStateToProps(state, props) {
   var pageData = state.getIn(['ui', BANKS_BANK_FILTERS], Map());
-  var scopeType = pageData.get('scopeType', (state.scope || {}).type || 'user');
+  var scopeType = pageData.get('scopeType', (props.scope || {}).type || 'user');
   var sortBy = pageData.get('sortBy', 'name');
   var sortOrder = pageData.get('sortOrder', 'ASC');
   var searchTerms = pageData.get('searchTerms', null);

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

@@ -235,7 +235,7 @@ export var Banks = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cla
       if (this.props.scopeType == 'course') {
         scopeOptions.push({
           slug: 'course',
-          translation: t('Course Banks')
+          translation: this.props.newItemBankFilterNamesEnabled ? t('This Course') : t('Course Banks')
         });
       }
 

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

@@ -12,7 +12,6 @@ import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../common/util/rceChecker.js";
 import RichContentInput from "../../../../common/components/RichContentInput/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Modal, ModalHeader, ModalBody, ModalFooter, ITEM_FEEDBACK_MODAL, ITEM_FEEDBACK_MODAL_FEEDBACK, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
@@ -104,8 +103,7 @@ export var ItemFeedbackModal = (_dec = themeable(theme, styles), _dec(_class = (
         onChange: this.onFeedbackChange,
         parentType: this.props.parentType,
         parentId: this.props.parentId,
-        importModalCloseOverride: this.returnToFeedback,
-        useNewRce: isNewRCEEnabled()
+        importModalCloseOverride: this.returnToFeedback
       }));
     }
   }, {

package/es/building/components/resources/quiz/instructions/Edit/presenter.js

@@ -11,7 +11,6 @@ import { Button } from '@instructure/ui-buttons';
 import { themeable } from '@instructure/ui-themeable';
 import t from '@instructure/quiz-i18n/es/format-message';
 import RichContentInput from "../../../../../../common/components/RichContentInput/index.js";
-import { isNewRCEEnabled } from "../../../../../../common/util/rceChecker.js";
 import wrapWithOutsideClick from "../../../../../../common/components/shared/functionality/componentWithOutsideClick.js";
 import CustomPropTypes from "../../../../../../common/util/CustomPropTypes.js";
 import elementsForSelectors from "../../../../../../common/util/ElementsForSelectors.js";
@@ -89,8 +88,7 @@ var QuizInstructionsEdit = (_dec = themeable(theme, styles), _dec(_class = (_tem
         onKeyUp: this.props.onInputChange,
         onChange: this.props.onInputChange,
         parentType: PARENT_TYPE_QUIZ,
-        parentId: this.props.quizId,
-        useNewRce: isNewRCEEnabled()
+        parentId: this.props.quizId
       }), /*#__PURE__*/React.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/React.createElement(Button, {

package/es/building/components/resources/quizEntry/QuizEntryEdit/Header/index.js

@@ -14,8 +14,10 @@ import partial from 'lodash/partial';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { TextInput } from '@instructure/ui-text-input';
 import { themeable } from '@instructure/ui-themeable';
+import { FillBlankInteractionType } from '@instructure/quiz-interactions';
 import { IconBankLine } from '@instructure/ui-icons';
 import t from '@instructure/quiz-i18n/es/format-message';
+import { convertFITBtoRich } from "../../../../../../common/util/fitbCopyHelper.js";
 import PositionBox from "../../../../../../common/components/resources/positionBox/PositionBox.js";
 import Item from "../../../../../../common/records/Item.js";
 import ActionButtons from "../../../ActionButtons/index.js";
@@ -103,19 +105,19 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
 
     _this.copyItem = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(e) {
-        var _this$props, quizId, workingQuizEntry, workingEntry, msg, validationResult, interactionTypeData;
+        var _this$props, quizId, workingQuizEntry, workingEntry, richFITBEnabled, richFITBInteractionID, msg, validationResult, interactionTypeData;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _this$props = _this.props, quizId = _this$props.quizId, workingQuizEntry = _this$props.workingQuizEntry, workingEntry = _this$props.workingEntry;
+                _this$props = _this.props, quizId = _this$props.quizId, workingQuizEntry = _this$props.workingQuizEntry, workingEntry = _this$props.workingEntry, richFITBEnabled = _this$props.richFITBEnabled, richFITBInteractionID = _this$props.richFITBInteractionID;
                 msg = t('Item {displayPosition} cannot be saved due to invalid input data.', {
                   displayPosition: _this.props.displayPosition
                 });
 
                 if (!_this.props.isValid) {
-                  _context.next = 13;
+                  _context.next = 14;
                   break;
                 }
 
@@ -149,17 +151,21 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
                   title: workingEntry.title
                 };
 
+                if (richFITBEnabled && workingEntry.getInteractionType() instanceof FillBlankInteractionType) {
+                  interactionTypeData = convertFITBtoRich(interactionTypeData, richFITBInteractionID);
+                }
+
                 _this.props.createTempItem(quizId, Math.round(workingQuizEntry.position + 1), interactionTypeData, workingQuizEntry.stimulusQuizEntryId, workingEntry.stimulusId, workingQuizEntry.pointsPossible);
 
-                _context.next = 15;
+                _context.next = 16;
                 break;
 
-              case 13:
+              case 14:
                 _this.props.screenreaderNotification(msg);
 
                 _this.props.showError(_this.props.guid);
 
-              case 15:
+              case 16:
               case "end":
                 return _context.stop();
             }
@@ -319,6 +325,8 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
   quizId: PropTypes.string.isRequired,
   removeQuizEntry: PropTypes.func.isRequired,
   // from connected component
+  richFITBEnabled: PropTypes.bool,
+  richFITBInteractionID: PropTypes.string,
   screenreaderNotification: PropTypes.func.isRequired,
   setUi: PropTypes.func.isRequired,
   shouldClone: PropTypes.bool,
@@ -331,6 +339,8 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
   disabledForRegrade: false,
   initialFocusId: null,
   name: null,
+  richFITBEnabled: false,
+  richFITBInteractionID: '',
   shouldClone: false
 }, _temp)) || _class);
 export default QuizEntryHeader;

package/es/building/components/resources/quizEntry/QuizEntryEdit/index.js

@@ -9,6 +9,7 @@ import * as modalActions from "../../../../../common/actions/modal.js";
 import { set as setUI } from "../../../../../common/actions/ui.js";
 import * as modificationActions from "../../../../../common/actions/modifications.js";
 import * as quizEntryApiActions from "../../../../api/quizEntries.js";
+import { featureOn } from "../../../../../common/util/featureCheck.js";
 import { ADD_CONTENT_POPOVER_KEY } from '@instructure/quiz-common';
 import QuizEntryEdit from "./presenter.js";
 
@@ -23,8 +24,12 @@ function mapStateToProps(state, props) {
   var dndPosition = state.getIn(['dragAndDrop', 'position']);
   var draggingAboveHalf = state.getIn(['dragAndDrop', 'aboveHalf'], false);
   var draggingOver = props.draggingOnBuild && dndPosition === props.quizEntry.position;
+  var richFITBInteraction = state.getIn(['interactionTypes'], Map()).find(function (interactionType) {
+    return interactionType.get('slug') === 'rich-fill-blank';
+  });
   return {
     addContentPopoverOpen: Boolean(addContentPopoverOpen),
+    appContainer: state.getIn(['ui', 'appContainer']),
     draggingAboveHalf: draggingOver && draggingAboveHalf,
     draggingOver: draggingOver,
     editable: true,
@@ -34,10 +39,11 @@ function mapStateToProps(state, props) {
     isOccluded: state.getIn(['ui', 'quizEntriesOccluded'], false),
     nextQuizEntry: state.getIn(['modifications', 'nextQuizEntry'], null),
     notifyScreenReader: true,
+    richFITBEnabled: featureOn('interaction_type_rich_fill_blank'),
+    richFITBInteractionID: (richFITBInteraction || Map()).get('id'),
     stemErrors: workingEntry.errorsFor('itemBody').toJS(),
     workingEntry: workingEntry,
-    workingQuizEntry: props.quizEntry.getWorkingInstance(),
-    appContainer: state.getIn(['ui', 'appContainer'])
+    workingQuizEntry: props.quizEntry.getWorkingInstance()
   };
 }
 

package/es/building/components/resources/quizEntry/QuizEntryEdit/presenter.js

@@ -398,7 +398,7 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   }, {
     key: "renderHeader",
     value: function renderHeader() {
-      var headerProps = pick(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
+      var headerProps = pick(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'richFITBEnabled', 'richFITBInteractionID', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
       return /*#__PURE__*/React.createElement(QuizEntryEditHeader, Object.assign({
         isValid: this.isValid(),
         successfulSubmit: this.successfulSubmit,
@@ -425,6 +425,13 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   QuizEntryEdit.displayName = "QuizEntryEdit";
   return QuizEntryEdit;
 }(Component), _class2.propTypes = {
+  addContentPopoverOpen: PropTypes.bool.isRequired,
+  alternativeRightFooter: PropTypes.func,
+  appContainer: CustomPropTypes.selectors.isRequired,
+  changeItemTitle: PropTypes.func.isRequired,
+  // from connected component
+  changeQuizEntryPoints: PropTypes.func.isRequired,
+  // from connected component
   children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
   clearModifications: PropTypes.func.isRequired,
   // from connected component
@@ -434,6 +441,7 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   // from connected component
   cloneQuizEntry: PropTypes.func.isRequired,
   // from connected component
+  clearValidationErrorsFromApi: PropTypes.func.isRequired,
   connectDragPreview: PropTypes.func.isRequired,
   // inserted from React DnD
   connectDragSource: PropTypes.func.isRequired,
@@ -447,17 +455,29 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   createQuizEntry: PropTypes.func.isRequired,
   // from connected component
   disabledForRegrade: PropTypes.bool,
+  displayPosition: PropTypes.number.isRequired,
   draggingAboveHalf: PropTypes.bool.isRequired,
   draggingOver: PropTypes.bool.isRequired,
   entry: ImmutablePropTypes.record.isRequired,
   guid: PropTypes.string.isRequired,
-  addContentPopoverOpen: PropTypes.bool.isRequired,
+  handleValidationErrorsFromApi: PropTypes.func.isRequired,
+  haveValidationErrorsFromApi: PropTypes.bool,
+  hideError: PropTypes.func.isRequired,
+  // from connected component
+  initialFocusId: PropTypes.string,
   isOccluded: PropTypes.bool,
+  name: PropTypes.string,
   nextQuizEntry: ImmutablePropTypes.map,
   openRegradeModal: PropTypes.func.isRequired,
   quizEntries: ImmutablePropTypes.listOf(ImmutablePropTypes.record).isRequired,
+  onEditQuizEntryToggle: PropTypes.func,
+  openModal: PropTypes.func.isRequired,
   quizEntry: ImmutablePropTypes.record.isRequired,
   quizId: PropTypes.string.isRequired,
+  removeQuizEntry: PropTypes.func.isRequired,
+  // from connected component
+  richFITBEnabled: PropTypes.bool,
+  richFITBInteractionID: PropTypes.string,
   screenreaderNotification: PropTypes.func.isRequired,
   // from connected component
   setUi: PropTypes.func.isRequired,
@@ -469,38 +489,22 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   // from connected component
   updateItem: PropTypes.func.isRequired,
   // from connected component
-  workingEntry: ImmutablePropTypes.record.isRequired,
-  workingQuizEntry: ImmutablePropTypes.record.isRequired,
-  appContainer: CustomPropTypes.selectors.isRequired,
-  alternativeRightFooter: PropTypes.func,
-  changeItemTitle: PropTypes.func.isRequired,
-  // from connected component
-  changeQuizEntryPoints: PropTypes.func.isRequired,
-  // from connected component
-  displayPosition: PropTypes.number.isRequired,
-  hideError: PropTypes.func.isRequired,
-  // from connected component
-  name: PropTypes.string,
-  openModal: PropTypes.func.isRequired,
-  removeQuizEntry: PropTypes.func.isRequired,
-  // from connected component
   withConfirm: PropTypes.func.isRequired,
-  initialFocusId: PropTypes.string,
-  onEditQuizEntryToggle: PropTypes.func,
-  clearValidationErrorsFromApi: PropTypes.func.isRequired,
-  handleValidationErrorsFromApi: PropTypes.func.isRequired,
-  haveValidationErrorsFromApi: PropTypes.bool
+  workingEntry: ImmutablePropTypes.record.isRequired,
+  workingQuizEntry: ImmutablePropTypes.record.isRequired
 }, _class2.defaultProps = {
   alternativeRightFooter: null,
   children: null,
   disabledForRegrade: false,
+  haveValidationErrorsFromApi: false,
   initialFocusId: null,
   isOccluded: false,
   name: null,
   nextQuizEntry: null,
   onEditQuizEntryToggle: Function.prototype,
-  shouldClone: false,
-  haveValidationErrorsFromApi: false
+  richFITBEnabled: false,
+  richFITBInteractionID: '',
+  shouldClone: false
 }, _temp)) || _class);
 export var UndecoratedQuizEntryEdit = QuizEntryEdit;
 export var QuizEntryEditRaw = wrapWithOutsideClick(QuizEntryEdit);

package/es/building/components/resources/quizEntry/QuizEntryShow/index.js

@@ -7,6 +7,7 @@ import { withConfirm } from "../../../../../common/actions/modal.js";
 import { QuizEntryShowPresenter } from "./presenter.js";
 import { getQuizEntryWithErrorsShowing } from "../../../../../common/selectors/quizzes.js";
 import { CREATE_ITEM_CALL, UPDATE_ITEM_CALL } from '@instructure/quiz-common';
+import { featureOn } from "../../../../../common/util/featureCheck.js";
 
 function mapStateToProps(state, props) {
   var dndPosition = state.getIn(['dragAndDrop', 'position']);
@@ -14,13 +15,18 @@ function mapStateToProps(state, props) {
   var draggingOver = props.draggingOnBuild && dndPosition === props.quizEntry.position;
   var itemModsClear = state.getIn(['modifications', 'items'], Map()).isEmpty();
   var quizEntryModsClear = state.getIn(['modifications', 'quizEntries'], Map()).isEmpty();
+  var richFITBInteraction = state.getIn(['interactionTypes'], Map()).find(function (interactionType) {
+    return interactionType.get('slug') === 'rich-fill-blank';
+  });
   return {
     createItemCallStatus: state.getIn(['calls', CREATE_ITEM_CALL, 'requestStatus'], ''),
-    updateItemCallStatus: state.getIn(['calls', UPDATE_ITEM_CALL, 'requestStatus'], ''),
     draggingAboveHalf: draggingOver && draggingAboveHalf,
     draggingOver: draggingOver,
     modificationsClear: itemModsClear && quizEntryModsClear,
-    quizEntryWithErrorsShowing: getQuizEntryWithErrorsShowing(state) || props.haveValidationErrorsFromApi
+    quizEntryWithErrorsShowing: getQuizEntryWithErrorsShowing(state) || props.haveValidationErrorsFromApi,
+    richFITBEnabled: featureOn('interaction_type_rich_fill_blank'),
+    richFITBInteractionID: (richFITBInteraction || Map()).get('id'),
+    updateItemCallStatus: state.getIn(['calls', UPDATE_ITEM_CALL, 'requestStatus'], '')
   };
 }
 

package/es/building/components/resources/quizEntry/QuizEntryShow/presenter.js

@@ -13,8 +13,10 @@ import { DragSource } from 'react-dnd';
 import { IconBankLine } from '@instructure/ui-icons';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { themeable } from '@instructure/ui-themeable';
+import { FillBlankInteractionType } from '@instructure/quiz-interactions';
 import { TOP } from '@instructure/quiz-common';
 import t from '@instructure/quiz-i18n/es/format-message';
+import { convertFITBtoRich } from "../../../../../common/util/fitbCopyHelper.js";
 import Item from "../../../../../common/records/Item.js";
 import Overlay from "../../../../../common/components/shared/overlay/Overlay.js";
 import ActionButtons from "../../ActionButtons/index.js";
@@ -106,7 +108,9 @@ var QuizEntryShow = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
       var _this$props = _this.props,
           quizId = _this$props.quizId,
           quizEntry = _this$props.quizEntry,
-          entry = _this$props.entry;
+          entry = _this$props.entry,
+          richFITBEnabled = _this$props.richFITBEnabled,
+          richFITBInteractionID = _this$props.richFITBInteractionID;
       var interactionTypeData = {
         answerFeedback: entry.answerFeedback,
         calculatorType: entry.calculatorType,
@@ -121,6 +125,10 @@ var QuizEntryShow = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
         title: entry.title
       };
 
+      if (richFITBEnabled && entry.getInteractionType() instanceof FillBlankInteractionType) {
+        interactionTypeData = convertFITBtoRich(interactionTypeData, richFITBInteractionID);
+      }
+
       _this.props.createItem(quizId, Math.round(quizEntry.position + 1), interactionTypeData, quizEntry.stimulusQuizEntryId, entry.stimulusId, quizEntry.pointsPossible);
     };
 
@@ -316,7 +324,11 @@ var QuizEntryShow = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   displayPosition: PropTypes.number.isRequired,
   draggingOver: PropTypes.bool.isRequired,
   draggingAboveHalf: PropTypes.bool.isRequired,
+  editQuizEntryToggle: PropTypes.bool.isRequired,
   entry: ImmutablePropTypes.record.isRequired,
+  haveValidationErrorsFromApi: PropTypes.bool,
+  // only used in index.js
+  interactionTypeName: PropTypes.string,
   modificationsClear: PropTypes.bool.isRequired,
   quizEntryWithErrorsShowing: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
   quizEntries: ImmutablePropTypes.listOf(ImmutablePropTypes.record).isRequired,
@@ -324,18 +336,16 @@ var QuizEntryShow = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   quizId: PropTypes.string.isRequired,
   removeQuizEntry: PropTypes.func.isRequired,
   // from connected component
+  richFITBEnabled: PropTypes.bool,
+  richFITBInteractionID: PropTypes.string,
   screenreaderNotification: PropTypes.func.isRequired,
   // from connected component
   scrollKey: PropTypes.string,
+  stimulusOrientation: PropTypes.string,
   switchOnEditing: PropTypes.func.isRequired,
   // from QuizEntry
   updateItemCallStatus: PropTypes.string.isRequired,
-  withConfirm: PropTypes.func.isRequired,
-  editQuizEntryToggle: PropTypes.bool.isRequired,
-  haveValidationErrorsFromApi: PropTypes.bool,
-  // only used in index.js
-  interactionTypeName: PropTypes.string,
-  stimulusOrientation: PropTypes.string
+  withConfirm: PropTypes.func.isRequired
 }, _class2.defaultProps = {
   children: null,
   draggingOver: false,
@@ -345,6 +355,8 @@ var QuizEntryShow = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   editQuizEntryToggle: false,
   haveValidationErrorsFromApi: false,
   interactionTypeName: null,
+  richFITBEnabled: false,
+  richFITBInteractionID: '',
   stimulusOrientation: null
 }, _temp)) || _class);
 export var QuizEntryShowRaw = QuizEntryShow;

package/es/common/components/resources/item/ItemEdit/index.js

@@ -36,8 +36,7 @@ export function mapStateToProps(state, props) {
     partialDeepScoringEnabled: featureOn('partial_deep_scoring'),
     partialScoringEnabled: featureOn('partial_scoring'),
     quizId: getActiveQuizId(state),
-    showCalculator: featureOn('calculator_per_question'),
-    useNewRce: featureOn('use_new_rce')
+    showCalculator: featureOn('calculator_per_question')
   };
 }
 

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

@@ -179,7 +179,6 @@ ItemEdit.propTypes = {
   setUploadStatus: PropTypes.func.isRequired,
   initialFocusId: PropTypes.string,
   showCalculator: PropTypes.bool,
-  useNewRce: PropTypes.bool,
   clearValidationErrorsFromApi: PropTypes.func.isRequired,
   validationErrorsFromApi: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.shape({
     type: PropTypes.string,
@@ -197,7 +196,6 @@ ItemEdit.defaultProps = {
   partialScoringEnabled: false,
   initialFocusId: null,
   showCalculator: false,
-  useNewRce: false,
   validationErrorsFromApi: {}
 };
 export default ItemEdit;

package/es/common/components/resources/item/ItemOverride/index.js

@@ -18,8 +18,7 @@ function mapStateToProps(state, props) {
     oneQuestionAtATime: isActiveQuizWorkingInstanceOneQuestionAtATime(state),
     partialDeepScoringEnabled: featureOn('partial_deep_scoring'),
     partialScoringEnabled: featureOn('partial_scoring'),
-    quizId: getActiveQuizId(state),
-    useNewRce: featureOn('use_new_rce')
+    quizId: getActiveQuizId(state)
   };
 }
 

package/es/common/components/resources/item/ItemOverride/presenter.js

@@ -76,13 +76,11 @@ ItemOverride.propTypes = {
   partialScoringEnabled: PropTypes.bool,
   quizId: PropTypes.string.isRequired,
   screenreaderNotification: PropTypes.func.isRequired,
-  setOneQuestionAtATime: PropTypes.func.isRequired,
-  useNewRce: PropTypes.bool
+  setOneQuestionAtATime: PropTypes.func.isRequired
 };
 ItemOverride.defaultProps = {
   errorsAreShowing: false,
   partialScoringEnabled: false,
-  partialDeepScoringEnabled: false,
-  useNewRce: false
+  partialDeepScoringEnabled: false
 };
 export default ItemOverride;

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

@@ -16,7 +16,6 @@ import { themeable } from '@instructure/ui-themeable';
 import { Heading } from '@instructure/ui-heading';
 import RichContentInput from "../../../RichContentInput/index.js";
 import { toErrors } from "../../../../util/instUIMessages.js";
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import Errors from "../../../shared/errors/Errors.js";
 import { SimpleSelect } from '@instructure/ui-simple-select';
 import { IconUpdownLine } from '@instructure/ui-icons';
@@ -175,8 +174,7 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
         defaultContent: stimulus.get('body'),
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
-        uploadPath: this.fileUploadUrl(),
-        useNewRce: isNewRCEEnabled()
+        uploadPath: this.fileUploadUrl()
       }), /*#__PURE__*/React.createElement(Errors, {
         errorList: this.errorsList('body')
       })), /*#__PURE__*/React.createElement("div", {

package/es/common/util/fitbCopyHelper.js

@@ -0,0 +1,29 @@
+import { List, Map } from 'immutable';
+export function convertFITBtoRich(interactionTypeData, richFITBInteractionID) {
+  var interactionData = interactionTypeData.interactionData,
+      scoringData = interactionTypeData.scoringData;
+  var sortedStemItems = interactionData.get('stemItems').sort(function (a, b) {
+    return a.get('position') - b.get('position');
+  });
+  var workingItemBody = sortedStemItems.reduce(function (itemBody, stemItem) {
+    if (stemItem.get('type') === 'text') {
+      return itemBody + stemItem.get('value', '');
+    } else {
+      var blankScoringData = scoringData.get('value', List()).find(function (blank) {
+        return blank.get('id') === stemItem.get('blankId');
+      }) || Map();
+      return itemBody + "`".concat(blankScoringData.getIn(['scoringData', 'blankText']), "`");
+    }
+  }, '');
+  return Object.assign({}, interactionTypeData, {
+    id: richFITBInteractionID,
+    itemBody: '',
+    interactionData: {
+      blanks: interactionData.get('blanks', [])
+    },
+    scoringData: {
+      workingItemBody: "".concat(interactionData.get('prompt', ''), "<p>").concat(workingItemBody, "</p>"),
+      value: scoringData.get('value', [])
+    }
+  });
+}

package/es/common/util/interactionTypePropsHelper.js

@@ -66,8 +66,7 @@ export var propsForInteractionEdit = function propsForInteractionEdit(props, add
     setOneQuestionAtATime: setOneQuestionAtATime,
     stemErrors: props.workingItem.errorsFor('itemBody').toJS(),
     initialFocusId: props.initialFocusId,
-    calculatorType: item.calculatorType,
-    useNewRce: props.useNewRce
+    calculatorType: item.calculatorType
   };
 };
 export var propsForInteractionShow = function propsForInteractionShow(item) {

package/es/index.js

@@ -89,8 +89,7 @@ export { formatTime } from "./common/util/formatTimespan.js";
 export { connect } from "./common/react-redux.js";
 export { breakdownSeconds, HOUR_IN_SECONDS } from "./common/components/shared/FormattedDuration/index.js";
 export { sessionStore } from "./common/util/sessionStore.js";
-export { printWithCss, ensureImagesLoaded } from "./common/util/printUtils.js";
-export { isNewRCEEnabled } from "./common/util/rceChecker.js"; // APIs
+export { printWithCss, ensureImagesLoaded } from "./common/util/printUtils.js"; // APIs
 
 export { createQuizEntryRegrade } from "./grading/api/quizEntryRegrades.js";
 export { getQuizEntry } from "./building/api/quizEntries.js";

package/lib/banks/components/Banks/index.js

@@ -29,7 +29,7 @@ var _quizCommon = require("@instructure/quiz-common");
 
 function mapStateToProps(state, props) {
   var pageData = state.getIn(['ui', _quizCommon.BANKS_BANK_FILTERS], (0, _immutable.Map)());
-  var scopeType = pageData.get('scopeType', (state.scope || {}).type || 'user');
+  var scopeType = pageData.get('scopeType', (props.scope || {}).type || 'user');
   var sortBy = pageData.get('sortBy', 'name');
   var sortOrder = pageData.get('sortOrder', 'ASC');
   var searchTerms = pageData.get('searchTerms', null);

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

@@ -271,7 +271,7 @@ var Banks = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_c
       if (this.props.scopeType == 'course') {
         scopeOptions.push({
           slug: 'course',
-          translation: (0, _formatMessage.default)('Course Banks')
+          translation: this.props.newItemBankFilterNamesEnabled ? (0, _formatMessage.default)('This Course') : (0, _formatMessage.default)('Course Banks')
         });
       }
 

package/lib/building/components/resources/ItemFeedbackModal/presenter.js

@@ -31,8 +31,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../common/util/rceChecker.js");
-
 var _index = _interopRequireDefault(require("../../../../common/components/RichContentInput/index.js"));
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -130,8 +128,7 @@ var ItemFeedbackModal = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
         onChange: this.onFeedbackChange,
         parentType: this.props.parentType,
         parentId: this.props.parentId,
-        importModalCloseOverride: this.returnToFeedback,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        importModalCloseOverride: this.returnToFeedback
       }));
     }
   }, {

package/lib/building/components/resources/quiz/instructions/Edit/presenter.js

@@ -29,8 +29,6 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 
 var _index = _interopRequireDefault(require("../../../../../../common/components/RichContentInput/index.js"));
 
-var _rceChecker = require("../../../../../../common/util/rceChecker.js");
-
 var _componentWithOutsideClick = _interopRequireDefault(require("../../../../../../common/components/shared/functionality/componentWithOutsideClick.js"));
 
 var _CustomPropTypes = _interopRequireDefault(require("../../../../../../common/util/CustomPropTypes.js"));
@@ -115,8 +113,7 @@ var QuizInstructionsEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, s
         onKeyUp: this.props.onInputChange,
         onChange: this.props.onInputChange,
         parentType: _quizCommon.PARENT_TYPE_QUIZ,
-        parentId: this.props.quizId,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        parentId: this.props.quizId
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.footer
       }, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {

package/lib/building/components/resources/quizEntry/QuizEntryEdit/Header/index.js

@@ -35,10 +35,14 @@ var _uiTextInput = require("@instructure/ui-text-input");
 
 var _uiThemeable = require("@instructure/ui-themeable");
 
+var _quizInteractions = require("@instructure/quiz-interactions");
+
 var _uiIcons = require("@instructure/ui-icons");
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
+var _fitbCopyHelper = require("../../../../../../common/util/fitbCopyHelper.js");
+
 var _PositionBox = _interopRequireDefault(require("../../../../../../common/components/resources/positionBox/PositionBox.js"));
 
 var _Item = _interopRequireDefault(require("../../../../../../common/records/Item.js"));
@@ -133,19 +137,19 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
 
     _this.copyItem = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(e) {
-        var _this$props, quizId, workingQuizEntry, workingEntry, msg, validationResult, interactionTypeData;
+        var _this$props, quizId, workingQuizEntry, workingEntry, richFITBEnabled, richFITBInteractionID, msg, validationResult, interactionTypeData;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _this$props = _this.props, quizId = _this$props.quizId, workingQuizEntry = _this$props.workingQuizEntry, workingEntry = _this$props.workingEntry;
+                _this$props = _this.props, quizId = _this$props.quizId, workingQuizEntry = _this$props.workingQuizEntry, workingEntry = _this$props.workingEntry, richFITBEnabled = _this$props.richFITBEnabled, richFITBInteractionID = _this$props.richFITBInteractionID;
                 msg = (0, _formatMessage.default)('Item {displayPosition} cannot be saved due to invalid input data.', {
                   displayPosition: _this.props.displayPosition
                 });
 
                 if (!_this.props.isValid) {
-                  _context.next = 13;
+                  _context.next = 14;
                   break;
                 }
 
@@ -179,17 +183,21 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
                   title: workingEntry.title
                 };
 
+                if (richFITBEnabled && workingEntry.getInteractionType() instanceof _quizInteractions.FillBlankInteractionType) {
+                  interactionTypeData = (0, _fitbCopyHelper.convertFITBtoRich)(interactionTypeData, richFITBInteractionID);
+                }
+
                 _this.props.createTempItem(quizId, Math.round(workingQuizEntry.position + 1), interactionTypeData, workingQuizEntry.stimulusQuizEntryId, workingEntry.stimulusId, workingQuizEntry.pointsPossible);
 
-                _context.next = 15;
+                _context.next = 16;
                 break;
 
-              case 13:
+              case 14:
                 _this.props.screenreaderNotification(msg);
 
                 _this.props.showError(_this.props.guid);
 
-              case 15:
+              case 16:
               case "end":
                 return _context.stop();
             }
@@ -348,6 +356,8 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   quizId: _propTypes.default.string.isRequired,
   removeQuizEntry: _propTypes.default.func.isRequired,
   // from connected component
+  richFITBEnabled: _propTypes.default.bool,
+  richFITBInteractionID: _propTypes.default.string,
   screenreaderNotification: _propTypes.default.func.isRequired,
   setUi: _propTypes.default.func.isRequired,
   shouldClone: _propTypes.default.bool,
@@ -360,6 +370,8 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   disabledForRegrade: false,
   initialFocusId: null,
   name: null,
+  richFITBEnabled: false,
+  richFITBInteractionID: '',
   shouldClone: false
 }, _temp)) || _class);
 var _default = QuizEntryHeader;

package/lib/building/components/resources/quizEntry/QuizEntryEdit/index.js

@@ -31,6 +31,8 @@ var modificationActions = _interopRequireWildcard(require("../../../../../common
 
 var quizEntryApiActions = _interopRequireWildcard(require("../../../../api/quizEntries.js"));
 
+var _featureCheck = require("../../../../../common/util/featureCheck.js");
+
 var _quizCommon = require("@instructure/quiz-common");
 
 var _presenter = _interopRequireDefault(require("./presenter.js"));
@@ -46,8 +48,12 @@ function mapStateToProps(state, props) {
   var dndPosition = state.getIn(['dragAndDrop', 'position']);
   var draggingAboveHalf = state.getIn(['dragAndDrop', 'aboveHalf'], false);
   var draggingOver = props.draggingOnBuild && dndPosition === props.quizEntry.position;
+  var richFITBInteraction = state.getIn(['interactionTypes'], (0, _immutable.Map)()).find(function (interactionType) {
+    return interactionType.get('slug') === 'rich-fill-blank';
+  });
   return {
     addContentPopoverOpen: Boolean(addContentPopoverOpen),
+    appContainer: state.getIn(['ui', 'appContainer']),
     draggingAboveHalf: draggingOver && draggingAboveHalf,
     draggingOver: draggingOver,
     editable: true,
@@ -57,10 +63,11 @@ function mapStateToProps(state, props) {
     isOccluded: state.getIn(['ui', 'quizEntriesOccluded'], false),
     nextQuizEntry: state.getIn(['modifications', 'nextQuizEntry'], null),
     notifyScreenReader: true,
+    richFITBEnabled: (0, _featureCheck.featureOn)('interaction_type_rich_fill_blank'),
+    richFITBInteractionID: (richFITBInteraction || (0, _immutable.Map)()).get('id'),
     stemErrors: workingEntry.errorsFor('itemBody').toJS(),
     workingEntry: workingEntry,
-    workingQuizEntry: props.quizEntry.getWorkingInstance(),
-    appContainer: state.getIn(['ui', 'appContainer'])
+    workingQuizEntry: props.quizEntry.getWorkingInstance()
   };
 }
 

package/lib/building/components/resources/quizEntry/QuizEntryEdit/presenter.js

@@ -432,7 +432,7 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   }, {
     key: "renderHeader",
     value: function renderHeader() {
-      var headerProps = (0, _pick.default)(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
+      var headerProps = (0, _pick.default)(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'richFITBEnabled', 'richFITBInteractionID', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
       return /*#__PURE__*/_react.default.createElement(_index3.default, Object.assign({
         isValid: this.isValid(),
         successfulSubmit: this.successfulSubmit,
@@ -458,6 +458,13 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   QuizEntryEdit.displayName = "QuizEntryEdit";
   return QuizEntryEdit;
 }(_react.Component), _class2.propTypes = {
+  addContentPopoverOpen: _propTypes.default.bool.isRequired,
+  alternativeRightFooter: _propTypes.default.func,
+  appContainer: _CustomPropTypes.default.selectors.isRequired,
+  changeItemTitle: _propTypes.default.func.isRequired,
+  // from connected component
+  changeQuizEntryPoints: _propTypes.default.func.isRequired,
+  // from connected component
   children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
   clearModifications: _propTypes.default.func.isRequired,
   // from connected component
@@ -467,6 +474,7 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   // from connected component
   cloneQuizEntry: _propTypes.default.func.isRequired,
   // from connected component
+  clearValidationErrorsFromApi: _propTypes.default.func.isRequired,
   connectDragPreview: _propTypes.default.func.isRequired,
   // inserted from React DnD
   connectDragSource: _propTypes.default.func.isRequired,
@@ -480,17 +488,29 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   createQuizEntry: _propTypes.default.func.isRequired,
   // from connected component
   disabledForRegrade: _propTypes.default.bool,
+  displayPosition: _propTypes.default.number.isRequired,
   draggingAboveHalf: _propTypes.default.bool.isRequired,
   draggingOver: _propTypes.default.bool.isRequired,
   entry: _reactImmutableProptypes.default.record.isRequired,
   guid: _propTypes.default.string.isRequired,
-  addContentPopoverOpen: _propTypes.default.bool.isRequired,
+  handleValidationErrorsFromApi: _propTypes.default.func.isRequired,
+  haveValidationErrorsFromApi: _propTypes.default.bool,
+  hideError: _propTypes.default.func.isRequired,
+  // from connected component
+  initialFocusId: _propTypes.default.string,
   isOccluded: _propTypes.default.bool,
+  name: _propTypes.default.string,
   nextQuizEntry: _reactImmutableProptypes.default.map,
   openRegradeModal: _propTypes.default.func.isRequired,
   quizEntries: _reactImmutableProptypes.default.listOf(_reactImmutableProptypes.default.record).isRequired,
+  onEditQuizEntryToggle: _propTypes.default.func,
+  openModal: _propTypes.default.func.isRequired,
   quizEntry: _reactImmutableProptypes.default.record.isRequired,
   quizId: _propTypes.default.string.isRequired,
+  removeQuizEntry: _propTypes.default.func.isRequired,
+  // from connected component
+  richFITBEnabled: _propTypes.default.bool,
+  richFITBInteractionID: _propTypes.default.string,
   screenreaderNotification: _propTypes.default.func.isRequired,
   // from connected component
   setUi: _propTypes.default.func.isRequired,
@@ -502,38 +522,22 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   // from connected component
   updateItem: _propTypes.default.func.isRequired,
   // from connected component
-  workingEntry: _reactImmutableProptypes.default.record.isRequired,
-  workingQuizEntry: _reactImmutableProptypes.default.record.isRequired,
-  appContainer: _CustomPropTypes.default.selectors.isRequired,
-  alternativeRightFooter: _propTypes.default.func,
-  changeItemTitle: _propTypes.default.func.isRequired,
-  // from connected component
-  changeQuizEntryPoints: _propTypes.default.func.isRequired,
-  // from connected component
-  displayPosition: _propTypes.default.number.isRequired,
-  hideError: _propTypes.default.func.isRequired,
-  // from connected component
-  name: _propTypes.default.string,
-  openModal: _propTypes.default.func.isRequired,
-  removeQuizEntry: _propTypes.default.func.isRequired,
-  // from connected component
   withConfirm: _propTypes.default.func.isRequired,
-  initialFocusId: _propTypes.default.string,
-  onEditQuizEntryToggle: _propTypes.default.func,
-  clearValidationErrorsFromApi: _propTypes.default.func.isRequired,
-  handleValidationErrorsFromApi: _propTypes.default.func.isRequired,
-  haveValidationErrorsFromApi: _propTypes.default.bool
+  workingEntry: _reactImmutableProptypes.default.record.isRequired,
+  workingQuizEntry: _reactImmutableProptypes.default.record.isRequired
 }, _class2.defaultProps = {
   alternativeRightFooter: null,
   children: null,
   disabledForRegrade: false,
+  haveValidationErrorsFromApi: false,
   initialFocusId: null,
   isOccluded: false,
   name: null,
   nextQuizEntry: null,
   onEditQuizEntryToggle: Function.prototype,
-  shouldClone: false,
-  haveValidationErrorsFromApi: false
+  richFITBEnabled: false,
+  richFITBInteractionID: '',
+  shouldClone: false
 }, _temp)) || _class);
 var UndecoratedQuizEntryEdit = QuizEntryEdit;
 exports.UndecoratedQuizEntryEdit = UndecoratedQuizEntryEdit;

package/lib/building/components/resources/quizEntry/QuizEntryShow/index.js

@@ -23,19 +23,26 @@ var _quizzes = require("../../../../../common/selectors/quizzes.js");
 
 var _quizCommon = require("@instructure/quiz-common");
 
+var _featureCheck = require("../../../../../common/util/featureCheck.js");
+
 function mapStateToProps(state, props) {
   var dndPosition = state.getIn(['dragAndDrop', 'position']);
   var draggingAboveHalf = state.getIn(['dragAndDrop', 'aboveHalf'], false);
   var draggingOver = props.draggingOnBuild && dndPosition === props.quizEntry.position;
   var itemModsClear = state.getIn(['modifications', 'items'], (0, _immutable.Map)()).isEmpty();
   var quizEntryModsClear = state.getIn(['modifications', 'quizEntries'], (0, _immutable.Map)()).isEmpty();
+  var richFITBInteraction = state.getIn(['interactionTypes'], (0, _immutable.Map)()).find(function (interactionType) {
+    return interactionType.get('slug') === 'rich-fill-blank';
+  });
   return {
     createItemCallStatus: state.getIn(['calls', _quizCommon.CREATE_ITEM_CALL, 'requestStatus'], ''),
-    updateItemCallStatus: state.getIn(['calls', _quizCommon.UPDATE_ITEM_CALL, 'requestStatus'], ''),
     draggingAboveHalf: draggingOver && draggingAboveHalf,
     draggingOver: draggingOver,
     modificationsClear: itemModsClear && quizEntryModsClear,
-    quizEntryWithErrorsShowing: (0, _quizzes.getQuizEntryWithErrorsShowing)(state) || props.haveValidationErrorsFromApi
+    quizEntryWithErrorsShowing: (0, _quizzes.getQuizEntryWithErrorsShowing)(state) || props.haveValidationErrorsFromApi,
+    richFITBEnabled: (0, _featureCheck.featureOn)('interaction_type_rich_fill_blank'),
+    richFITBInteractionID: (richFITBInteraction || (0, _immutable.Map)()).get('id'),
+    updateItemCallStatus: state.getIn(['calls', _quizCommon.UPDATE_ITEM_CALL, 'requestStatus'], '')
   };
 }
 

package/lib/building/components/resources/quizEntry/QuizEntryShow/presenter.js

@@ -33,10 +33,14 @@ var _uiA11yContent = require("@instructure/ui-a11y-content");
 
 var _uiThemeable = require("@instructure/ui-themeable");
 
+var _quizInteractions = require("@instructure/quiz-interactions");
+
 var _quizCommon = require("@instructure/quiz-common");
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
+var _fitbCopyHelper = require("../../../../../common/util/fitbCopyHelper.js");
+
 var _Item = _interopRequireDefault(require("../../../../../common/records/Item.js"));
 
 var _Overlay = _interopRequireDefault(require("../../../../../common/components/shared/overlay/Overlay.js"));
@@ -137,7 +141,9 @@ var QuizEntryShow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
       var _this$props = _this.props,
           quizId = _this$props.quizId,
           quizEntry = _this$props.quizEntry,
-          entry = _this$props.entry;
+          entry = _this$props.entry,
+          richFITBEnabled = _this$props.richFITBEnabled,
+          richFITBInteractionID = _this$props.richFITBInteractionID;
       var interactionTypeData = {
         answerFeedback: entry.answerFeedback,
         calculatorType: entry.calculatorType,
@@ -152,6 +158,10 @@ var QuizEntryShow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
         title: entry.title
       };
 
+      if (richFITBEnabled && entry.getInteractionType() instanceof _quizInteractions.FillBlankInteractionType) {
+        interactionTypeData = (0, _fitbCopyHelper.convertFITBtoRich)(interactionTypeData, richFITBInteractionID);
+      }
+
       _this.props.createItem(quizId, Math.round(quizEntry.position + 1), interactionTypeData, quizEntry.stimulusQuizEntryId, entry.stimulusId, quizEntry.pointsPossible);
     };
 
@@ -346,7 +356,11 @@ var QuizEntryShow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   displayPosition: _propTypes.default.number.isRequired,
   draggingOver: _propTypes.default.bool.isRequired,
   draggingAboveHalf: _propTypes.default.bool.isRequired,
+  editQuizEntryToggle: _propTypes.default.bool.isRequired,
   entry: _reactImmutableProptypes.default.record.isRequired,
+  haveValidationErrorsFromApi: _propTypes.default.bool,
+  // only used in index.js
+  interactionTypeName: _propTypes.default.string,
   modificationsClear: _propTypes.default.bool.isRequired,
   quizEntryWithErrorsShowing: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.object]),
   quizEntries: _reactImmutableProptypes.default.listOf(_reactImmutableProptypes.default.record).isRequired,
@@ -354,18 +368,16 @@ var QuizEntryShow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   quizId: _propTypes.default.string.isRequired,
   removeQuizEntry: _propTypes.default.func.isRequired,
   // from connected component
+  richFITBEnabled: _propTypes.default.bool,
+  richFITBInteractionID: _propTypes.default.string,
   screenreaderNotification: _propTypes.default.func.isRequired,
   // from connected component
   scrollKey: _propTypes.default.string,
+  stimulusOrientation: _propTypes.default.string,
   switchOnEditing: _propTypes.default.func.isRequired,
   // from QuizEntry
   updateItemCallStatus: _propTypes.default.string.isRequired,
-  withConfirm: _propTypes.default.func.isRequired,
-  editQuizEntryToggle: _propTypes.default.bool.isRequired,
-  haveValidationErrorsFromApi: _propTypes.default.bool,
-  // only used in index.js
-  interactionTypeName: _propTypes.default.string,
-  stimulusOrientation: _propTypes.default.string
+  withConfirm: _propTypes.default.func.isRequired
 }, _class2.defaultProps = {
   children: null,
   draggingOver: false,
@@ -375,6 +387,8 @@ var QuizEntryShow = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   editQuizEntryToggle: false,
   haveValidationErrorsFromApi: false,
   interactionTypeName: null,
+  richFITBEnabled: false,
+  richFITBInteractionID: '',
   stimulusOrientation: null
 }, _temp)) || _class);
 var QuizEntryShowRaw = QuizEntryShow;

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

@@ -64,8 +64,7 @@ function mapStateToProps(state, props) {
     partialDeepScoringEnabled: (0, _featureCheck.featureOn)('partial_deep_scoring'),
     partialScoringEnabled: (0, _featureCheck.featureOn)('partial_scoring'),
     quizId: (0, _quizzes2.getActiveQuizId)(state),
-    showCalculator: (0, _featureCheck.featureOn)('calculator_per_question'),
-    useNewRce: (0, _featureCheck.featureOn)('use_new_rce')
+    showCalculator: (0, _featureCheck.featureOn)('calculator_per_question')
   };
 }
 

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

@@ -210,7 +210,6 @@ ItemEdit.propTypes = {
   setUploadStatus: _propTypes.default.func.isRequired,
   initialFocusId: _propTypes.default.string,
   showCalculator: _propTypes.default.bool,
-  useNewRce: _propTypes.default.bool,
   clearValidationErrorsFromApi: _propTypes.default.func.isRequired,
   validationErrorsFromApi: _propTypes.default.objectOf(_propTypes.default.arrayOf(_propTypes.default.shape({
     type: _propTypes.default.string,
@@ -228,7 +227,6 @@ ItemEdit.defaultProps = {
   partialScoringEnabled: false,
   initialFocusId: null,
   showCalculator: false,
-  useNewRce: false,
   validationErrorsFromApi: {}
 };
 var _default = ItemEdit;

package/lib/common/components/resources/item/ItemOverride/index.js

@@ -38,8 +38,7 @@ function mapStateToProps(state, props) {
     oneQuestionAtATime: (0, _quizzes2.isActiveQuizWorkingInstanceOneQuestionAtATime)(state),
     partialDeepScoringEnabled: (0, _featureCheck.featureOn)('partial_deep_scoring'),
     partialScoringEnabled: (0, _featureCheck.featureOn)('partial_scoring'),
-    quizId: (0, _quizzes2.getActiveQuizId)(state),
-    useNewRce: (0, _featureCheck.featureOn)('use_new_rce')
+    quizId: (0, _quizzes2.getActiveQuizId)(state)
   };
 }
 

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

@@ -99,14 +99,12 @@ ItemOverride.propTypes = {
   partialScoringEnabled: _propTypes.default.bool,
   quizId: _propTypes.default.string.isRequired,
   screenreaderNotification: _propTypes.default.func.isRequired,
-  setOneQuestionAtATime: _propTypes.default.func.isRequired,
-  useNewRce: _propTypes.default.bool
+  setOneQuestionAtATime: _propTypes.default.func.isRequired
 };
 ItemOverride.defaultProps = {
   errorsAreShowing: false,
   partialScoringEnabled: false,
-  partialDeepScoringEnabled: false,
-  useNewRce: false
+  partialDeepScoringEnabled: false
 };
 var _default = ItemOverride;
 exports.default = _default;

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

@@ -39,8 +39,6 @@ var _index = _interopRequireDefault(require("../../../RichContentInput/index.js"
 
 var _instUIMessages = require("../../../../util/instUIMessages.js");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _Errors = _interopRequireDefault(require("../../../shared/errors/Errors.js"));
 
 var _uiSimpleSelect = require("@instructure/ui-simple-select");
@@ -208,8 +206,7 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         defaultContent: stimulus.get('body'),
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
-        uploadPath: this.fileUploadUrl(),
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        uploadPath: this.fileUploadUrl()
       }), /*#__PURE__*/_react.default.createElement(_Errors.default, {
         errorList: this.errorsList('body')
       })), /*#__PURE__*/_react.default.createElement("div", {

package/lib/common/util/fitbCopyHelper.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertFITBtoRich = convertFITBtoRich;
+
+var _immutable = require("immutable");
+
+function convertFITBtoRich(interactionTypeData, richFITBInteractionID) {
+  var interactionData = interactionTypeData.interactionData,
+      scoringData = interactionTypeData.scoringData;
+  var sortedStemItems = interactionData.get('stemItems').sort(function (a, b) {
+    return a.get('position') - b.get('position');
+  });
+  var workingItemBody = sortedStemItems.reduce(function (itemBody, stemItem) {
+    if (stemItem.get('type') === 'text') {
+      return itemBody + stemItem.get('value', '');
+    } else {
+      var blankScoringData = scoringData.get('value', (0, _immutable.List)()).find(function (blank) {
+        return blank.get('id') === stemItem.get('blankId');
+      }) || (0, _immutable.Map)();
+      return itemBody + "`".concat(blankScoringData.getIn(['scoringData', 'blankText']), "`");
+    }
+  }, '');
+  return Object.assign({}, interactionTypeData, {
+    id: richFITBInteractionID,
+    itemBody: '',
+    interactionData: {
+      blanks: interactionData.get('blanks', [])
+    },
+    scoringData: {
+      workingItemBody: "".concat(interactionData.get('prompt', ''), "<p>").concat(workingItemBody, "</p>"),
+      value: scoringData.get('value', [])
+    }
+  });
+}

package/lib/common/util/interactionTypePropsHelper.js

@@ -77,8 +77,7 @@ var propsForInteractionEdit = function propsForInteractionEdit(props, additional
     setOneQuestionAtATime: setOneQuestionAtATime,
     stemErrors: props.workingItem.errorsFor('itemBody').toJS(),
     initialFocusId: props.initialFocusId,
-    calculatorType: item.calculatorType,
-    useNewRce: props.useNewRce
+    calculatorType: item.calculatorType
   };
 };
 

package/lib/index.js

@@ -103,7 +103,6 @@ var _exportNames = {
   sessionStore: true,
   printWithCss: true,
   ensureImagesLoaded: true,
-  isNewRCEEnabled: true,
   createQuizEntryRegrade: true,
   getQuizEntry: true,
   moveQuizEntry: true,
@@ -774,12 +773,6 @@ Object.defineProperty(exports, "ensureImagesLoaded", {
     return _printUtils.ensureImagesLoaded;
   }
 });
-Object.defineProperty(exports, "isNewRCEEnabled", {
-  enumerable: true,
-  get: function get() {
-    return _rceChecker.isNewRCEEnabled;
-  }
-});
 Object.defineProperty(exports, "createQuizEntryRegrade", {
   enumerable: true,
   get: function get() {
@@ -1460,8 +1453,6 @@ var _sessionStore = require("./common/util/sessionStore.js");
 
 var _printUtils = require("./common/util/printUtils.js");
 
-var _rceChecker = require("./common/util/rceChecker.js");
-
 var _quizEntryRegrades = require("./grading/api/quizEntryRegrades.js");
 
 var _quizEntries = require("./building/api/quizEntries.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.25.2-rc.9+b569b0794",
+  "version": "17.26.1-rc.1+d79040c52",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
   ],
   "dependencies": {
     "@instructure/outcomes-ui": "^2.1.2",
-    "@instructure/quiz-common": "17.25.2-rc.9+b569b0794",
-    "@instructure/quiz-i18n": "17.25.2-rc.9+b569b0794",
-    "@instructure/quiz-interactions": "17.25.2-rc.9+b569b0794",
-    "@instructure/quiz-number-input": "17.25.2-rc.9+b569b0794",
-    "@instructure/quiz-rce": "17.25.2-rc.9+b569b0794",
+    "@instructure/quiz-common": "17.26.1-rc.1+d79040c52",
+    "@instructure/quiz-i18n": "17.26.1-rc.1+d79040c52",
+    "@instructure/quiz-interactions": "17.26.1-rc.1+d79040c52",
+    "@instructure/quiz-number-input": "17.26.1-rc.1+d79040c52",
+    "@instructure/quiz-rce": "17.26.1-rc.1+d79040c52",
     "@instructure/ui-a11y-content": "^7.11.0",
     "@instructure/ui-alerts": "^7.11.0",
     "@instructure/ui-avatar": "^7.11.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.25.2-rc.9+b569b0794",
+    "instructure-validations": "17.26.1-rc.1+d79040c52",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "17.25.2-rc.9+b569b0794",
+    "@instructure/quiz-scripts": "17.26.1-rc.1+d79040c52",
     "@instructure/ui-axe-check": "^7.11.0",
     "@instructure/ui-babel-preset": "^7.11.0",
     "@instructure/ui-karma-config": "^7.11.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.25.2-rc.9+b569b0794",
+    "quiz-presets": "17.26.1-rc.1+d79040c52",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b569b0794de2b36de8749d7ece61ebb432ec033b"
+  "gitHead": "d79040c52784e570123138f420acf792e9a5213c"
 }

package/es/common/util/rceChecker.js

@@ -1,6 +0,0 @@
-import { featureOn } from "./featureCheck.js";
-var newRCEFeatureName = 'use_new_rce';
-export function isNewRCEEnabled() {
-  return featureOn(newRCEFeatureName);
-}
-export default isNewRCEEnabled;

package/lib/common/util/rceChecker.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isNewRCEEnabled = isNewRCEEnabled;
-exports.default = void 0;
-
-var _featureCheck = require("./featureCheck.js");
-
-var newRCEFeatureName = 'use_new_rce';
-
-function isNewRCEEnabled() {
-  return (0, _featureCheck.featureOn)(newRCEFeatureName);
-}
-
-var _default = isNewRCEEnabled;
-exports.default = _default;