@instructure/quiz-core 17.46.2-rc.5 → 17.47.0

package/lib/common/components/resources/entry/EntrySave/presenter.js

@@ -25,6 +25,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
+
 var _uiButtons = require("@instructure/ui-buttons");
 
 var _uiView = require("@instructure/ui-view");
@@ -63,11 +65,75 @@ var EntrySave = /*#__PURE__*/function (_Component) {
       _this.props.screenreaderNotification(msg);
     };
 
+    _this.confirmShareableContent = function () {
+      var _this$props = _this.props,
+          canvasOrigin = _this$props.canvasOrigin,
+          checkContentShareability = _this$props.checkContentShareability,
+          entry = _this$props.entry,
+          withConfirm = _this$props.withConfirm;
+
+      _this.setState({
+        canSubmit: false
+      });
+
+      checkContentShareability(entry.getWorkingInstance(), canvasOrigin).then(function () {
+        _this.successfulSubmit();
+      }).catch( /*#__PURE__*/function () {
+        var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(err) {
+          var _err$response, _err$response2;
+
+          var body, text;
+          return _regenerator.default.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return (_err$response = err.response) === null || _err$response === void 0 ? void 0 : _err$response.json();
+
+                case 2:
+                  body = _context.sent;
+                  text = (0, _formatMessage.default)('There was an error attempting to validate shareability.');
+
+                  if (((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.status) === 400 && body.shareable === false) {
+                    text = (0, _formatMessage.default)('You are attempting to save content containing course links which may not work when used in other courses.');
+                  }
+
+                  withConfirm(function () {
+                    _this.successfulSubmit();
+                  }, {
+                    title: (0, _formatMessage.default)('Are you sure?'),
+                    text: text,
+                    continueText: (0, _formatMessage.default)('Save anyway'),
+                    onCancel: function onCancel() {
+                      _this.setState({
+                        canSubmit: true
+                      });
+                    }
+                  });
+
+                case 6:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    };
+
     _this.onSubmit = function (e) {
       e.preventDefault();
 
       if (_this.props.isValid) {
-        _this.successfulSubmit();
+        if (_this.props.checkBankedContentShareabilityEnabled && _this.props.shouldValidateShareableContent) {
+          _this.confirmShareableContent();
+        } else {
+          _this.successfulSubmit();
+        }
       } else {
         _this.createScreenReaderNotification();
 
@@ -111,24 +177,24 @@ var EntrySave = /*#__PURE__*/function (_Component) {
   }, {
     key: "successfulSubmit",
     value: function () {
-      var _successfulSubmit = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _successfulSubmit = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var validationResult;
-        return _regenerator.default.wrap(function _callee$(_context) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 this.setState({
                   canSubmit: false
                 });
-                _context.prev = 1;
-                _context.next = 4;
+                _context2.prev = 1;
+                _context2.next = 4;
                 return this.props.submitHandler();
 
               case 4:
-                validationResult = _context.sent;
+                validationResult = _context2.sent;
 
                 if (!(validationResult === _quizCommon.API_INPUT_VALIDATION_ERROR)) {
-                  _context.next = 8;
+                  _context2.next = 8;
                   break;
                 }
 
@@ -136,16 +202,16 @@ var EntrySave = /*#__PURE__*/function (_Component) {
                 throw new Error('User input validation error received from API.');
 
               case 8:
-                _context.next = 14;
+                _context2.next = 14;
                 break;
 
               case 10:
-                _context.prev = 10;
-                _context.t0 = _context["catch"](1);
+                _context2.prev = 10;
+                _context2.t0 = _context2["catch"](1);
                 this.setState({
                   canSubmit: true
                 });
-                return _context.abrupt("return");
+                return _context2.abrupt("return");
 
               case 14:
                 this.props.switchOffEditing();
@@ -154,10 +220,10 @@ var EntrySave = /*#__PURE__*/function (_Component) {
 
               case 17:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this, [[1, 10]]);
+        }, _callee2, this, [[1, 10]]);
       }));
 
       function successfulSubmit() {
@@ -193,29 +259,38 @@ var EntrySave = /*#__PURE__*/function (_Component) {
 
 exports.EntrySave = EntrySave;
 EntrySave.propTypes = {
-  displayPosition: _propTypes.default.number,
-  disableSubmit: _propTypes.default.bool,
-  guid: _propTypes.default.string,
-  submitHandler: _propTypes.default.func.isRequired,
   cancelHandler: _propTypes.default.func,
+  canvasOrigin: _propTypes.default.string,
+  checkBankedContentShareabilityEnabled: _propTypes.default.bool,
+  checkContentShareability: _propTypes.default.func.isRequired,
   clearChanges: _propTypes.default.func.isRequired,
   // From connected component
   clearNextQuizEntry: _propTypes.default.func.isRequired,
+  disableSubmit: _propTypes.default.bool,
+  displayPosition: _propTypes.default.number,
+  entry: _reactImmutableProptypes.default.record.isRequired,
+  guid: _propTypes.default.string,
   hideError: _propTypes.default.func.isRequired,
+  initialFocusId: _propTypes.default.string,
   isValid: _propTypes.default.bool.isRequired,
   showError: _propTypes.default.func.isRequired,
   screenreaderNotification: _propTypes.default.func.isRequired,
+  shouldValidateShareableContent: _propTypes.default.bool,
+  submitHandler: _propTypes.default.func.isRequired,
   // from makescrollable / from props being passed in occasionally
   switchOnEditing: _propTypes.default.func.isRequired,
   switchOffEditing: _propTypes.default.func.isRequired,
-  initialFocusId: _propTypes.default.string
+  withConfirm: _propTypes.default.func.isRequired
 };
 EntrySave.defaultProps = {
-  displayPosition: null,
   cancelHandler: _noop.default,
+  canvasOrigin: '',
+  checkBankedContentShareabilityEnabled: false,
+  displayPosition: null,
   disableSubmit: false,
   guid: null,
-  initialFocusId: null
+  initialFocusId: null,
+  shouldValidateShareableContent: false
 };
 var _default = EntrySave;
 exports.default = _default;

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

@@ -65,8 +65,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

@@ -211,7 +211,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,
@@ -230,7 +229,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/quiz/instructions/Instructions.js

@@ -25,8 +25,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _makeScrollable = _interopRequireDefault(require("../../../shared/functionality/makeScrollable.js"));
 
 var _theme = _interopRequireDefault(require("./theme.js"));
@@ -63,8 +61,7 @@ var QuizInstructions = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         tabIndex: "-1"
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
         customStyles: styles.text,
-        content: this.props.quiz.instructions,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.quiz.instructions
       }));
     }
   }]);

package/lib/common/components/resources/sessionItemResult/ResultStimulus/index.js

@@ -27,8 +27,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _theme = _interopRequireDefault(require("./theme.js"));
@@ -87,8 +85,7 @@ var ResultStimulus = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles)
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.title
       }, title)), /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
-        content: body,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: body
       }));
     }
   }, {

package/lib/common/components/resources/sessionItemResult/SessionItemResult/presenter.js

@@ -41,8 +41,6 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _PositionBox = _interopRequireDefault(require("../../positionBox/PositionBox.js"));
@@ -224,8 +222,7 @@ var SessionItemResult = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
           className: styles.textPadding
         }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
           customStyles: styles.itemFeedbackText,
-          content: feedbackContent,
-          useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+          content: feedbackContent
         })));
       }
     }
@@ -269,8 +266,7 @@ var SessionItemResult = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
             className: styles.itemFeedbackLabel
           }, (0, _formatMessage.default)('Feedback from grader')), /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
             customStyles: styles.itemFeedbackText,
-            content: graderFeedback.content,
-            useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+            content: graderFeedback.content
           }));
         } else {
           return this.renderFeedbackBox(graderFeedback.content, (0, _formatMessage.default)('Feedback from grader'));
@@ -310,8 +306,7 @@ var SessionItemResult = (_dec = (0, _uiThemeable.themeable)(_theme.default, styl
         properties: simpleItem.properties || {},
         scoringData: simpleSessionItem.scoringData,
         scoredData: simpleSessionItemResult.scoredData,
-        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id],
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id]
       })), this.renderItemFeedback(simpleSessionItemResult));
     }
   }, {

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

@@ -413,6 +413,7 @@ var StimulusEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
         onAdd: this.handleAddToBank,
         onContinue: this.handleAddToBankContinue,
         getEntry: this.getEntryForBank,
+        workingEntry: this.props.workingStimulus,
         entryId: this.props.guid,
         entryType: this.props.quizEntry.entryType
       });

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");
@@ -210,8 +208,7 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
         onChange: 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/components/resources/stimulus/StimulusShowInfo/index.js

@@ -29,8 +29,6 @@ var _uiView = require("@instructure/ui-view");
 
 var _quizRce = require("@instructure/quiz-rce");
 
-var _rceChecker = require("../../../../util/rceChecker.js");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var StimulusShowInfo = /*#__PURE__*/function (_Component) {
@@ -80,8 +78,7 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
       }, this.props.stimulus.title), instructions, /*#__PURE__*/_react.default.createElement("div", {
         "data-automation": "sdk-stimulus-LeftPanelShow-content"
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
-        content: this.props.stimulus.body,
-        useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+        content: this.props.stimulus.body
       })));
     }
   }]);

package/lib/common/reducers/config.js

@@ -21,6 +21,9 @@ var _default = function _default() {
     case _quizCommon.SET_API_ENDPOINT:
       return state.set('apiEndpoint', action.payload);
 
+    case _quizCommon.SET_CANVAS_ORIGIN:
+      return state.set('canvasOrigin', action.payload);
+
     case _quizCommon.SET_USER_TOKEN:
       return state.set('userToken', action.payload);
 

package/lib/common/util/RceConfigProvider.js

@@ -77,39 +77,37 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
           switch (_context.prev = _context.next) {
             case 0:
               if (hasAllPropsForRcs()) {
-                _context.next = 3;
+                _context.next = 2;
                 break;
               }
 
-              handleErrorFunc('Invalid RCS configuration');
               return _context.abrupt("return");
 
-            case 3:
-              _context.next = 5;
+            case 2:
+              _context.next = 4;
               return props.rcsJwtRefreshFn(jwt);
 
-            case 5:
+            case 4:
               response = _context.sent;
               refreshedToken = response === null || response === void 0 ? void 0 : (_response$json = response.json) === null || _response$json === void 0 ? void 0 : _response$json.token; // inst-redux-service-middleware response structure
 
               if (refreshedToken) {
-                _context.next = 13;
+                _context.next = 11;
                 break;
               }
 
-              handleErrorFunc('Unable to refresh RCS token');
               normalizedStem = questionStem !== null && questionStem !== void 0 ? questionStem : 'Unknown stem';
               extractedText = (0, _quizInteractions.extractTextFromHtml)(normalizedStem);
-              setErrorIfDuringTaking((0, _formatMessage.default)('Error while answering "{stem}": Full functionality of the Rich Content Editor may not have been available to the user.', {
+              handleError((0, _formatMessage.default)('Error while answering "{stem}": Full functionality of the Rich Content Editor may not have been available to the user.', {
                 stem: extractedText
               }));
               return _context.abrupt("return");
 
-            case 13:
+            case 11:
               setJwt(refreshedToken);
               setTokenFn(refreshedToken);
 
-            case 15:
+            case 13:
             case "end":
               return _context.stop();
           }
@@ -122,26 +120,44 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
     };
   }();
 
-  var handleErrorFunc = function handleErrorFunc(errorMessage) {
-    _reduxStore.default.dispatch((0, _alerts.addError)(errorMessage));
+  var handleError = function handleError(quizLogMessage) {
+    if (shouldAlertUser()) {
+      alertTheUser(alertMessage());
+    }
+
+    if (shouldsetEventToQuizLog()) {
+      setEventToQuizLog(quizLogMessage);
+    }
   };
 
-  var getConfig = function getConfig() {
-    var _ref2, _featureFlags;
+  var alertTheUser = function alertTheUser(message) {
+    _reduxStore.default.dispatch((0, _alerts.addError)(message));
+  };
 
-    return {
-      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.useNewRce, props.useNewRce), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
-      rendererEnhancement: (0, _defineProperty2.default)({}, _quizCommon.RceConfigKeys.canvasOrigin, props.canvasOrigin),
-      featureFlags: (_featureFlags = {}, (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.rce5Renderer, props.rce5Renderer), _featureFlags)
-    };
+  var setEventToQuizLog = function setEventToQuizLog(message) {
+    props.setEventToQuizLog(message);
   };
 
-  var setErrorIfDuringTaking = function setErrorIfDuringTaking(errorMessage) {
-    if (!(0, _windowChecks.isDuringQuizTake)()) {
-      return;
-    }
+  var alertMessage = function alertMessage() {
+    return (0, _windowChecks.isQuizTaking)() ? (0, _formatMessage.default)('The Rich Content Editor has encountered an issue. ' + 'It has been logged for your instructor to review. Please refresh and try again.') : (0, _formatMessage.default)('The Rich Content Editor has encountered an issue. Please refresh and try again.');
+  };
+
+  var shouldAlertUser = function shouldAlertUser() {
+    return (0, _windowChecks.isQuizTaking)() || (0, _windowChecks.isQuizBuilding)();
+  };
+
+  var shouldsetEventToQuizLog = function shouldsetEventToQuizLog() {
+    return (0, _windowChecks.isQuizTaking)();
+  };
+
+  var getConfig = function getConfig() {
+    var _featureFlags, _ref2;
 
-    props.setRCEError(errorMessage);
+    return {
+      featureFlags: (_featureFlags = {}, (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.rce5Renderer, props.rce5Renderer), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _featureFlags),
+      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
+      rendererEnhancement: (0, _defineProperty2.default)({}, _quizCommon.RceConfigKeys.canvasOrigin, props.canvasOrigin)
+    };
   };
 
   (0, _react.useEffect)(function () {
@@ -151,7 +167,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!props.useNewRce && !props.rce5Renderer)) {
+              if (!(!props.isNewRCEEnabled && !props.rce5Renderer)) {
                 _context2.next = 2;
                 break;
               }
@@ -166,7 +182,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
                 break;
               }
 
-              setErrorIfDuringTaking((0, _formatMessage.default)('Error: Full functionality of the Rich Content Editor may not have been available to the user.'));
+              handleError((0, _formatMessage.default)('Error: Full functionality of the Rich Content Editor may not have been available to the user.'));
               return _context2.abrupt("return");
 
             case 6:
@@ -190,7 +206,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
             case 16:
               json = _context2.sent;
               setCanvasConfig(json);
-              setErrorIfDuringTaking(null);
+              setEventToQuizLog(null);
               _context2.next = 25;
               break;
 
@@ -198,7 +214,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
               _context2.prev = 21;
               _context2.t0 = _context2["catch"](2);
               setCanvasConfig(null);
-              setErrorIfDuringTaking((0, _formatMessage.default)('Error: Full functionality of the Rich Content Editor including accessibility features may not have been available to the user.'));
+              handleError((0, _formatMessage.default)('Error: Full functionality of the Rich Content Editor including accessibility features may not have been available to the user.'));
 
             case 25:
               _context2.prev = 25;
@@ -212,10 +228,10 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
         }
       }, _callee2, null, [[2, 21, 25, 28]]);
     }))();
-  }, [props.useNewRce, props.rce5Renderer]);
+  }, [props.isNewRCEEnabled, props.rce5Renderer]);
 
   if (props.loadedApiFeatures) {
-    if (props.useNewRce || props.rce5Renderer) {
+    if (props.isNewRCEEnabled || props.rce5Renderer) {
       if (!canvasConfigLoading) {
         return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
           value: getConfig()
@@ -232,10 +248,10 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
 exports.RceConfigProviderComponent = RceConfigProviderComponent;
 RceConfigProviderComponent.propTypes = {
   children: _propTypes.default.node.isRequired,
-  useNewRce: _propTypes.default.bool.isRequired,
+  isNewRCEEnabled: _propTypes.default.bool.isRequired,
   rce5Renderer: _propTypes.default.bool.isRequired,
   isNewRCEAppsEnabled: _propTypes.default.bool,
-  setRCEError: _propTypes.default.func.isRequired,
+  setEventToQuizLog: _propTypes.default.func.isRequired,
   contextId: _propTypes.default.string,
   contextType: _propTypes.default.string,
   canvasUserId: _propTypes.default.string,
@@ -259,7 +275,7 @@ RceConfigProviderComponent.defaultProps = {
 
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
-    useNewRce: (0, _rceChecker.isNewRCEEnabled)(),
+    isNewRCEEnabled: (0, _rceChecker.isNewRCEEnabled)(),
     rce5Renderer: (0, _rceChecker.isRCE5RendererEnabled)(),
     isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)(),
     loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
@@ -267,7 +283,7 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
 };
 
 var mapDispatchToProps = {
-  setRCEError: _rce.setRCEError
+  setEventToQuizLog: _rce.setRCEError
 };
 var RceConfigProvider = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(RceConfigProviderComponent);
 exports.RceConfigProvider = RceConfigProvider;

package/lib/common/util/interactionTypePropsHelper.js

@@ -11,8 +11,6 @@ var _index = _interopRequireDefault(require("../components/RichContentInput/inde
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
-var _rceChecker = require("../../common/util/rceChecker.js");
-
 var propsForInteractionEdit = function propsForInteractionEdit(props, additionalOptions) {
   var item = props.workingItem.toJS();
 
@@ -81,8 +79,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
   };
 };
 
@@ -98,8 +95,7 @@ var propsForInteractionShow = function propsForInteractionShow(item) {
     itemBody: item.itemBody || '',
     properties: item.properties,
     notifyScreenreader: true,
-    scoringData: item.scoringData,
-    useNewRce: (0, _rceChecker.isNewRCEEnabled)()
+    scoringData: item.scoringData
   };
 };
 

package/lib/common/util/rceChecker.js

@@ -11,7 +11,7 @@ exports.default = void 0;
 var _featureCheck = require("./featureCheck.js");
 
 var newRCEFeatureName = 'use_new_rce';
-var newRCEAppsFeatureName = 'use_new_rce_apps';
+var newRCEAppsFeatureName = 'rce5_apps';
 var rce5RendererFeatureName = 'rce5_renderer';
 
 function isNewRCEEnabled() {

package/lib/common/util/windowChecks.js

@@ -3,7 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isDuringQuizTake = exports.onTablet = exports.onPhone = exports.media = void 0;
+exports.isQuizBuilding = exports.isQuizTaking = exports.onTablet = exports.onPhone = exports.media = void 0;
+
+var _quizCommon = require("@instructure/quiz-common");
+
 var media = {
   'phone-break-point': 'only screen and (max-width: 48rem)',
   'tablet-break-point': 'only screen and (max-width: 64rem)'
@@ -26,11 +29,14 @@ var onTablet = function onTablet() {
 
 exports.onTablet = onTablet;
 
-var isDuringQuizTake = function isDuringQuizTake() {
-  var windowObj = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : window;
-  var locationPath = windowObj.location.pathname;
-  var patternOfQuizTakingPath = /taking\/\d+\/take/;
-  return !!locationPath.match(patternOfQuizTakingPath);
+var isQuizTaking = function isQuizTaking() {
+  return (0, _quizCommon.isDuringQuizTake)();
+};
+
+exports.isQuizTaking = isQuizTaking;
+
+var isQuizBuilding = function isQuizBuilding() {
+  return (0, _quizCommon.isDuringQuizBuild)();
 };
 
-exports.isDuringQuizTake = isDuringQuizTake;
+exports.isQuizBuilding = isQuizBuilding;