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

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

@@ -6,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Button } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
 import { API_INPUT_VALIDATION_ERROR } from '@instructure/quiz-common';
@@ -39,11 +40,75 @@ export 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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(err) {
+          var _err$response, _err$response2;
+
+          var body, text;
+          return _regeneratorRuntime.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 = t('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 = t('You are attempting to save content containing course links which may not work when used in other courses.');
+                  }
+
+                  withConfirm(function () {
+                    _this.successfulSubmit();
+                  }, {
+                    title: t('Are you sure?'),
+                    text: text,
+                    continueText: t('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();
 
@@ -87,24 +152,24 @@ export var EntrySave = /*#__PURE__*/function (_Component) {
   }, {
     key: "successfulSubmit",
     value: function () {
-      var _successfulSubmit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var _successfulSubmit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var validationResult;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.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 === API_INPUT_VALIDATION_ERROR)) {
-                  _context.next = 8;
+                  _context2.next = 8;
                   break;
                 }
 
@@ -112,16 +177,16 @@ export 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();
@@ -130,10 +195,10 @@ export 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() {
@@ -168,28 +233,37 @@ export var EntrySave = /*#__PURE__*/function (_Component) {
   return EntrySave;
 }(Component);
 EntrySave.propTypes = {
-  displayPosition: PropTypes.number,
-  disableSubmit: PropTypes.bool,
-  guid: PropTypes.string,
-  submitHandler: PropTypes.func.isRequired,
   cancelHandler: PropTypes.func,
+  canvasOrigin: PropTypes.string,
+  checkBankedContentShareabilityEnabled: PropTypes.bool,
+  checkContentShareability: PropTypes.func.isRequired,
   clearChanges: PropTypes.func.isRequired,
   // From connected component
   clearNextQuizEntry: PropTypes.func.isRequired,
+  disableSubmit: PropTypes.bool,
+  displayPosition: PropTypes.number,
+  entry: ImmutablePropTypes.record.isRequired,
+  guid: PropTypes.string,
   hideError: PropTypes.func.isRequired,
+  initialFocusId: PropTypes.string,
   isValid: PropTypes.bool.isRequired,
   showError: PropTypes.func.isRequired,
   screenreaderNotification: PropTypes.func.isRequired,
+  shouldValidateShareableContent: PropTypes.bool,
+  submitHandler: PropTypes.func.isRequired,
   // from makescrollable / from props being passed in occasionally
   switchOnEditing: PropTypes.func.isRequired,
   switchOffEditing: PropTypes.func.isRequired,
-  initialFocusId: PropTypes.string
+  withConfirm: PropTypes.func.isRequired
 };
 EntrySave.defaultProps = {
-  displayPosition: null,
   cancelHandler: noop,
+  canvasOrigin: '',
+  checkBankedContentShareabilityEnabled: false,
+  displayPosition: null,
   disableSubmit: false,
   guid: null,
-  initialFocusId: null
+  initialFocusId: null,
+  shouldValidateShareableContent: false
 };
 export default EntrySave;

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

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

@@ -180,7 +180,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,
@@ -199,7 +198,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/quiz/instructions/Instructions.js

@@ -10,7 +10,6 @@ import React, { Component } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import makeScrollable from "../../../shared/functionality/makeScrollable.js"; // ================================
 // renders the quiz instructions on
 // the Preview and Take pages
@@ -44,8 +43,7 @@ export var QuizInstructions = (_dec = themeable(theme, styles), _dec(_class = (_
         tabIndex: "-1"
       }, /*#__PURE__*/React.createElement(RichContentRenderer, {
         customStyles: styles.text,
-        content: this.props.quiz.instructions,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.quiz.instructions
       }));
     }
   }]);

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

@@ -10,7 +10,6 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 var styles = {
   componentId: 'fcFqb',
@@ -66,8 +65,7 @@ export var ResultStimulus = (_dec = themeable(theme, styles), _dec(_class = (_te
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.title
       }, title)), /*#__PURE__*/React.createElement(RichContentRenderer, {
-        content: body,
-        useNewRce: isNewRCEEnabled()
+        content: body
       }));
     }
   }, {

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

@@ -18,7 +18,6 @@ import { View } from '@instructure/ui-view';
 import { PresentationContent } from '@instructure/ui-a11y-content';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import PositionBox from "../../positionBox/PositionBox.js";
 import { COMPONENT_RESULT } from '@instructure/quiz-common';
@@ -191,8 +190,7 @@ export var SessionItemResult = (_dec = themeable(theme, styles), _dec(_class = (
           className: styles.textPadding
         }, /*#__PURE__*/React.createElement(RichContentRenderer, {
           customStyles: styles.itemFeedbackText,
-          content: feedbackContent,
-          useNewRce: isNewRCEEnabled()
+          content: feedbackContent
         })));
       }
     }
@@ -236,8 +234,7 @@ export var SessionItemResult = (_dec = themeable(theme, styles), _dec(_class = (
             className: styles.itemFeedbackLabel
           }, t('Feedback from grader')), /*#__PURE__*/React.createElement(RichContentRenderer, {
             customStyles: styles.itemFeedbackText,
-            content: graderFeedback.content,
-            useNewRce: isNewRCEEnabled()
+            content: graderFeedback.content
           }));
         } else {
           return this.renderFeedbackBox(graderFeedback.content, t('Feedback from grader'));
@@ -277,8 +274,7 @@ export var SessionItemResult = (_dec = themeable(theme, styles), _dec(_class = (
         properties: simpleItem.properties || {},
         scoringData: simpleSessionItem.scoringData,
         scoredData: simpleSessionItemResult.scoredData,
-        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id],
-        useNewRce: isNewRCEEnabled()
+        itemResultsModifications: simpleResultsModifications[simpleSessionItem.id]
       })), this.renderItemFeedback(simpleSessionItemResult));
     }
   }, {

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

@@ -376,6 +376,7 @@ export var StimulusEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp
         onAdd: this.handleAddToBank,
         onContinue: this.handleAddToBankContinue,
         getEntry: this.getEntryForBank,
+        workingEntry: this.props.workingStimulus,
         entryId: this.props.guid,
         entryType: this.props.quizEntry.entryType
       });

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';
@@ -177,8 +176,7 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
         onChange: 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/components/resources/stimulus/StimulusShowInfo/index.js

@@ -8,7 +8,6 @@ import { Heading } from '@instructure/ui-heading';
 import { Text } from '@instructure/ui-text';
 import { View } from '@instructure/ui-view';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../util/rceChecker.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 
 var StimulusShowInfo = /*#__PURE__*/function (_Component) {
@@ -58,8 +57,7 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
       }, this.props.stimulus.title), instructions, /*#__PURE__*/React.createElement("div", {
         "data-automation": "sdk-stimulus-LeftPanelShow-content"
       }, /*#__PURE__*/React.createElement(RichContentRenderer, {
-        content: this.props.stimulus.body,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.stimulus.body
       })));
     }
   }]);

package/es/common/reducers/config.js

@@ -1,5 +1,5 @@
 import { fromJS } from 'immutable';
-import { SET_API_ENDPOINT, SET_USER_TOKEN } from '@instructure/quiz-common';
+import { SET_API_ENDPOINT, SET_CANVAS_ORIGIN, SET_USER_TOKEN } from '@instructure/quiz-common';
 var defaultState = fromJS({
   apiEndpoint: ''
 });
@@ -11,6 +11,9 @@ export default (function () {
     case SET_API_ENDPOINT:
       return state.set('apiEndpoint', action.payload);
 
+    case SET_CANVAS_ORIGIN:
+      return state.set('canvasOrigin', action.payload);
+
     case SET_USER_TOKEN:
       return state.set('userToken', action.payload);
 

package/es/common/util/RceConfigProvider.js

@@ -14,7 +14,7 @@ import { RceConfigContext, RceConfigKeys } from '@instructure/quiz-common';
 import { addError } from "../actions/alerts.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
-import { isDuringQuizTake } from "./windowChecks.js";
+import { isQuizTaking, isQuizBuilding } from "./windowChecks.js";
 
 var _ref4 = /*#__PURE__*/React.createElement(Card, {
   wrapped: true
@@ -50,39 +50,37 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
           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 = extractTextFromHtml(normalizedStem);
-              setErrorIfDuringTaking(t('Error while answering "{stem}": Full functionality of the Rich Content Editor may not have been available to the user.', {
+              handleError(t('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();
           }
@@ -95,26 +93,44 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
     };
   }();
 
-  var handleErrorFunc = function handleErrorFunc(errorMessage) {
-    store.dispatch(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) {
+    store.dispatch(addError(message));
+  };
 
-    return {
-      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, _defineProperty(_ref2, RceConfigKeys.useNewRce, props.useNewRce), _defineProperty(_ref2, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_ref2, RceConfigKeys.contextId, props.contextId), _defineProperty(_ref2, RceConfigKeys.contextType, props.contextType), _defineProperty(_ref2, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_ref2, RceConfigKeys.rcsJwt, jwt), _defineProperty(_ref2, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _defineProperty(_ref2, RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
-      rendererEnhancement: _defineProperty({}, RceConfigKeys.canvasOrigin, props.canvasOrigin),
-      featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _defineProperty(_featureFlags, RceConfigKeys.rce5Renderer, props.rce5Renderer), _featureFlags)
-    };
+  var setEventToQuizLog = function setEventToQuizLog(message) {
+    props.setEventToQuizLog(message);
   };
 
-  var setErrorIfDuringTaking = function setErrorIfDuringTaking(errorMessage) {
-    if (!isDuringQuizTake()) {
-      return;
-    }
+  var alertMessage = function alertMessage() {
+    return isQuizTaking() ? t('The Rich Content Editor has encountered an issue. ' + 'It has been logged for your instructor to review. Please refresh and try again.') : t('The Rich Content Editor has encountered an issue. Please refresh and try again.');
+  };
+
+  var shouldAlertUser = function shouldAlertUser() {
+    return isQuizTaking() || isQuizBuilding();
+  };
+
+  var shouldsetEventToQuizLog = function shouldsetEventToQuizLog() {
+    return isQuizTaking();
+  };
+
+  var getConfig = function getConfig() {
+    var _featureFlags, _ref2;
 
-    props.setRCEError(errorMessage);
+    return {
+      featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), _defineProperty(_featureFlags, RceConfigKeys.rce5Renderer, props.rce5Renderer), _defineProperty(_featureFlags, RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _featureFlags),
+      rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, _defineProperty(_ref2, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_ref2, RceConfigKeys.contextId, props.contextId), _defineProperty(_ref2, RceConfigKeys.contextType, props.contextType), _defineProperty(_ref2, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_ref2, RceConfigKeys.rcsJwt, jwt), _defineProperty(_ref2, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _defineProperty(_ref2, RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
+      rendererEnhancement: _defineProperty({}, RceConfigKeys.canvasOrigin, props.canvasOrigin)
+    };
   };
 
   useEffect(function () {
@@ -124,7 +140,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!props.useNewRce && !props.rce5Renderer)) {
+              if (!(!props.isNewRCEEnabled && !props.rce5Renderer)) {
                 _context2.next = 2;
                 break;
               }
@@ -139,7 +155,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
                 break;
               }
 
-              setErrorIfDuringTaking(t('Error: Full functionality of the Rich Content Editor may not have been available to the user.'));
+              handleError(t('Error: Full functionality of the Rich Content Editor may not have been available to the user.'));
               return _context2.abrupt("return");
 
             case 6:
@@ -163,7 +179,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
             case 16:
               json = _context2.sent;
               setCanvasConfig(json);
-              setErrorIfDuringTaking(null);
+              setEventToQuizLog(null);
               _context2.next = 25;
               break;
 
@@ -171,7 +187,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
               _context2.prev = 21;
               _context2.t0 = _context2["catch"](2);
               setCanvasConfig(null);
-              setErrorIfDuringTaking(t('Error: Full functionality of the Rich Content Editor including accessibility features may not have been available to the user.'));
+              handleError(t('Error: Full functionality of the Rich Content Editor including accessibility features may not have been available to the user.'));
 
             case 25:
               _context2.prev = 25;
@@ -185,10 +201,10 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
         }
       }, _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.createElement(RceConfigContext.Provider, {
           value: getConfig()
@@ -203,10 +219,10 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
 };
 RceConfigProviderComponent.propTypes = {
   children: PropTypes.node.isRequired,
-  useNewRce: PropTypes.bool.isRequired,
+  isNewRCEEnabled: PropTypes.bool.isRequired,
   rce5Renderer: PropTypes.bool.isRequired,
   isNewRCEAppsEnabled: PropTypes.bool,
-  setRCEError: PropTypes.func.isRequired,
+  setEventToQuizLog: PropTypes.func.isRequired,
   contextId: PropTypes.string,
   contextType: PropTypes.string,
   canvasUserId: PropTypes.string,
@@ -230,7 +246,7 @@ RceConfigProviderComponent.defaultProps = {
 
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
-    useNewRce: isNewRCEEnabled(),
+    isNewRCEEnabled: isNewRCEEnabled(),
     rce5Renderer: isRCE5RendererEnabled(),
     isNewRCEAppsEnabled: isNewRCEAppsEnabled(),
     loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
@@ -238,7 +254,7 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
 };
 
 var mapDispatchToProps = {
-  setRCEError: setRCEError
+  setEventToQuizLog: setRCEError
 };
 var RceConfigProvider = connect(mapStateToProps, mapDispatchToProps)(RceConfigProviderComponent);
 export { RceConfigProvider };

package/es/common/util/interactionTypePropsHelper.js

@@ -1,6 +1,5 @@
 import RichContentInput from "../components/RichContentInput/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
-import { isNewRCEEnabled } from "../../common/util/rceChecker.js";
 export var propsForInteractionEdit = function propsForInteractionEdit(props, additionalOptions) {
   var item = props.workingItem.toJS();
 
@@ -69,8 +68,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) {
@@ -83,7 +81,6 @@ export var propsForInteractionShow = function propsForInteractionShow(item) {
     itemBody: item.itemBody || '',
     properties: item.properties,
     notifyScreenreader: true,
-    scoringData: item.scoringData,
-    useNewRce: isNewRCEEnabled()
+    scoringData: item.scoringData
   };
 };

package/es/common/util/rceChecker.js

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

package/es/common/util/windowChecks.js

@@ -1,3 +1,4 @@
+import { isDuringQuizTake, isDuringQuizBuild } from '@instructure/quiz-common';
 export var media = {
   'phone-break-point': 'only screen and (max-width: 48rem)',
   'tablet-break-point': 'only screen and (max-width: 64rem)'
@@ -12,9 +13,9 @@ export var onTablet = function onTablet() {
   var mediaQueryString = media['tablet-break-point'];
   return !onPhone(windowObj) && windowObj.matchMedia(mediaQueryString).matches;
 };
-export 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);
+export var isQuizTaking = function isQuizTaking() {
+  return isDuringQuizTake();
+};
+export var isQuizBuilding = function isQuizBuilding() {
+  return isDuringQuizBuild();
 };

package/es/reporting/components/itemAnalysis/ItemAnalysisRow/presenter.js

@@ -14,7 +14,6 @@ import { Heading } from '@instructure/ui-heading';
 import { ScreenReaderContent, PresentationContent } from '@instructure/ui-a11y-content';
 import { themeable } from '@instructure/ui-themeable';
 import { RichContentRenderer } from '@instructure/quiz-rce';
-import { isNewRCEEnabled } from "../../../../common/util/rceChecker.js";
 import Card from "../../../../common/components/shared/Card/index.js";
 import ExpandButton from "../../../../common/components/shared/ExpandButton/index.js";
 import Spinner from "../../../../common/components/shared/spinner/Spinner.js";
@@ -127,8 +126,7 @@ export var ItemAnalysisRow = (_dec = themeable(theme, styles), _dec(_class = (_t
     value: function renderStem() {
       return /*#__PURE__*/React.createElement(RichContentRenderer, {
         customStyles: styles.stem,
-        content: this.props.itemAnalysis.itemBody,
-        useNewRce: isNewRCEEnabled()
+        content: this.props.itemAnalysis.itemBody
       });
     }
   }, {