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

package/lib/common/components/RceConfigProvider/rceConfigErrorMessages.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.userAlertMsgBuilding = exports.userAlertMsgTaking = exports.quizLogMsgFailedConfigFetch = exports.quizLogMsgInvalidParams = exports.quizLogMsgErrorDuringTaking = void 0;
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
+var _quizInteractions = require("@instructure/quiz-interactions");
+
+var quizLogMsgErrorDuringTaking = function quizLogMsgErrorDuringTaking(stem) {
+  var normalizedStem = stem !== null && stem !== void 0 ? stem : 'Unknown stem';
+  var extractedText = (0, _quizInteractions.extractTextFromHtml)(normalizedStem);
+  return (0, _formatMessage.default)('Error while answering "{stem}": Full functionality of the Rich Content Editor may not have been available to the user.', {
+    stem: extractedText
+  });
+};
+
+exports.quizLogMsgErrorDuringTaking = quizLogMsgErrorDuringTaking;
+
+var quizLogMsgInvalidParams = function quizLogMsgInvalidParams() {
+  return (0, _formatMessage.default)('Error: Full functionality of the Rich Content Editor may not have been available to the user.');
+};
+
+exports.quizLogMsgInvalidParams = quizLogMsgInvalidParams;
+
+var quizLogMsgFailedConfigFetch = function quizLogMsgFailedConfigFetch() {
+  return (0, _formatMessage.default)('Error: Full functionality of the Rich Content Editor including accessibility features may not have been available to the user.');
+};
+
+exports.quizLogMsgFailedConfigFetch = quizLogMsgFailedConfigFetch;
+
+var userAlertMsgTaking = function userAlertMsgTaking() {
+  return (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.');
+};
+
+exports.userAlertMsgTaking = userAlertMsgTaking;
+
+var userAlertMsgBuilding = function userAlertMsgBuilding() {
+  return (0, _formatMessage.default)('The Rich Content Editor has encountered an issue. Please refresh and try again.');
+};
+
+exports.userAlertMsgBuilding = userAlertMsgBuilding;

package/lib/common/components/RceConfigProvider/rceConfigFetcher.js

@@ -0,0 +1,67 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchRceConfig = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var buildRceConfigUrl = function buildRceConfigUrl(host, contextType, contextId) {
+  var base = host.match(/^https?:\/\//) ? host : "".concat(window.location.protocol, "//").concat(host);
+  var url = new URL('/api/rceConfig', base);
+  contextType && url.searchParams.append('contextType', contextType);
+  contextId && url.searchParams.append('contextId', contextId);
+  return url;
+};
+
+var fetchRceConfig = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(rcsHost, contextType, contextId, jwt) {
+    var rceConfigUrl, response;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            rceConfigUrl = buildRceConfigUrl(rcsHost, contextType, contextId);
+            _context.next = 3;
+            return fetch(rceConfigUrl.href, {
+              headers: {
+                'Authorization': "Bearer ".concat(jwt)
+              }
+            });
+
+          case 3:
+            response = _context.sent;
+
+            if (response.ok) {
+              _context.next = 6;
+              break;
+            }
+
+            throw "Failed to fetch, response status: ".concat(response.status);
+
+          case 6:
+            _context.next = 8;
+            return response.json();
+
+          case 8:
+            return _context.abrupt("return", _context.sent);
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function fetchRceConfig(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.fetchRceConfig = fetchRceConfig;

package/lib/common/components/RceConfigProvider/rceConfigMapper.js

@@ -0,0 +1,44 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mapParamsToRceConfigContext = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _quizCommon = require("@instructure/quiz-common");
+
+var _rceConfigUtils = require("./rceConfigUtils.js");
+
+var mapFeatureFlags = function mapFeatureFlags(flags) {
+  var _ref;
+
+  return _ref = {}, (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.isNewRCEEnabled, (flags === null || flags === void 0 ? void 0 : flags.isNewRCEEnabled) || false), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.isNewRCERendererEnabled, (flags === null || flags === void 0 ? void 0 : flags.isNewRCERendererEnabled) || false), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, (flags === null || flags === void 0 ? void 0 : flags.isNewRCEAppsEnabled) || false), _ref;
+};
+
+var mapRcs = function mapRcs(rcsParams, canvasConfig) {
+  if (rcsParams && (0, _rceConfigUtils.hasAllPropsForRcs)(rcsParams) && canvasConfig) {
+    var _ref2;
+
+    return _ref2 = {}, (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasUserId, rcsParams.canvasUserId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextId, rcsParams.contextId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextType, rcsParams.contextType), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsHost, rcsParams.rcsHost), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwt, rcsParams.jwt), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, rcsParams.refreshToken), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasConfig, canvasConfig), _ref2;
+  } else {
+    return null;
+  }
+};
+
+var rendererEnhancement = function rendererEnhancement(rendererParams) {
+  return (0, _defineProperty2.default)({}, _quizCommon.RceConfigKeys.canvasOrigin, (rendererParams === null || rendererParams === void 0 ? void 0 : rendererParams.canvasOrigin) || null);
+};
+
+var mapParamsToRceConfigContext = function mapParamsToRceConfigContext(flags, rcsParams, rendererParams, canvasConfig) {
+  return {
+    featureFlags: mapFeatureFlags(flags),
+    rcs: mapRcs(rcsParams, canvasConfig),
+    rendererEnhancement: rendererEnhancement(rendererParams)
+  };
+};
+
+exports.mapParamsToRceConfigContext = mapParamsToRceConfigContext;

package/lib/common/components/RceConfigProvider/rceConfigUtils.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isRce5Disabled = exports.hasAllPropsForRcs = void 0;
+
+var hasAllPropsForRcs = function hasAllPropsForRcs(rcsParams) {
+  return !!((rcsParams === null || rcsParams === void 0 ? void 0 : rcsParams.contextId) && (rcsParams === null || rcsParams === void 0 ? void 0 : rcsParams.contextType) && (rcsParams === null || rcsParams === void 0 ? void 0 : rcsParams.canvasUserId) && (rcsParams === null || rcsParams === void 0 ? void 0 : rcsParams.rcsHost) && (rcsParams === null || rcsParams === void 0 ? void 0 : rcsParams.refreshToken) && (rcsParams === null || rcsParams === void 0 ? void 0 : rcsParams.jwt));
+};
+
+exports.hasAllPropsForRcs = hasAllPropsForRcs;
+
+var isRce5Disabled = function isRce5Disabled(flags) {
+  return !(flags === null || flags === void 0 ? void 0 : flags.isNewRCEEnabled) && !(flags === null || flags === void 0 ? void 0 : flags.isNewRCERendererEnabled);
+};
+
+exports.isRce5Disabled = isRce5Disabled;

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

@@ -53,9 +53,9 @@ var _index = _interopRequireDefault(require("../ConfirmationModal/index.js"));
 
 var _setupFormatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/util/setupFormatMessage"));
 
-var _RceConfigProvider = require("../RceConfigProvider/RceConfigProvider.js");
+var _index2 = _interopRequireDefault(require("../RceConfigProvider/index.js"));
 
-var _index2 = require("../ApiFeatureFlagInitializer/index.js");
+var _index3 = require("../ApiFeatureFlagInitializer/index.js");
 
 var _dec, _class, _class2, _temp;
 
@@ -169,7 +169,7 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
           context = this.context;
       return /*#__PURE__*/_react.default.createElement(_reactRedux.Provider, {
         store: store
-      }, /*#__PURE__*/_react.default.createElement(_index2.ApiFeatureFlagInitializer, null, /*#__PURE__*/_react.default.createElement(_RceConfigProvider.RceConfigProvider, this.props.rceConfig, /*#__PURE__*/_react.default.createElement(_uiI18n.ApplyLocale, {
+      }, /*#__PURE__*/_react.default.createElement(_index3.ApiFeatureFlagInitializer, null, /*#__PURE__*/_react.default.createElement(_index2.default, this.props.rceConfig, /*#__PURE__*/_react.default.createElement(_uiI18n.ApplyLocale, {
         locale: (0, _quizCommon.getLocale)(props, context),
         timezone: props.timeZone
       }, /*#__PURE__*/_react.default.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.48.1-rc.2+0a6290ae1",
+  "version": "17.48.1-rc.4+a1a5f4bd4",
   "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.48.1-rc.2+0a6290ae1",
-    "@instructure/quiz-i18n": "17.48.1-rc.2+0a6290ae1",
-    "@instructure/quiz-interactions": "17.48.1-rc.2+0a6290ae1",
-    "@instructure/quiz-number-input": "17.48.1-rc.2+0a6290ae1",
-    "@instructure/quiz-rce": "17.48.1-rc.2+0a6290ae1",
+    "@instructure/quiz-common": "17.48.1-rc.4+a1a5f4bd4",
+    "@instructure/quiz-i18n": "17.48.1-rc.4+a1a5f4bd4",
+    "@instructure/quiz-interactions": "17.48.1-rc.4+a1a5f4bd4",
+    "@instructure/quiz-number-input": "17.48.1-rc.4+a1a5f4bd4",
+    "@instructure/quiz-rce": "17.48.1-rc.4+a1a5f4bd4",
     "@instructure/ui-a11y-content": "^7.20.0",
     "@instructure/ui-alerts": "^7.20.0",
     "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.48.1-rc.2+0a6290ae1",
+    "instructure-validations": "17.48.1-rc.4+a1a5f4bd4",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.48.1-rc.2+0a6290ae1",
+    "quiz-presets": "17.48.1-rc.4+a1a5f4bd4",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0a6290ae1235332fcee05f798dcc28e17e0d2a58"
+  "gitHead": "a1a5f4bd423c24d047e62909bc5c624172439856"
 }

package/es/common/components/RceConfigProvider/RceConfigProvider.js

@@ -1,261 +0,0 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from "../../react-redux.js";
-import store from "../../../reduxStore.js";
-import { setRCEError } from "../../actions/rce.js";
-import { isNewRCEEnabled, isNewRCEAppsEnabled, isNewRCERendererEnabled } from "../../util/rceChecker.js";
-import { QuizzesSpinner as Spinner } from "../shared/spinner/Spinner.js";
-import { Card } from "../shared/Card/index.js";
-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 { isQuizTaking, isQuizBuilding } from "../../util/windowChecks.js";
-
-var _ref4 = /*#__PURE__*/React.createElement(Card, {
-  wrapped: true
-}, /*#__PURE__*/React.createElement(Spinner, null));
-
-export var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
-  var _useState = useState(props.rcsJwt),
-      _useState2 = _slicedToArray(_useState, 2),
-      jwt = _useState2[0],
-      setJwt = _useState2[1];
-
-  var _useState3 = useState(null),
-      _useState4 = _slicedToArray(_useState3, 2),
-      canvasConfig = _useState4[0],
-      setCanvasConfig = _useState4[1];
-
-  var _useState5 = useState(true),
-      _useState6 = _slicedToArray(_useState5, 2),
-      canvasConfigLoading = _useState6[0],
-      setCanvasConfigLoading = _useState6[1];
-
-  var hasAllPropsForRcs = function hasAllPropsForRcs() {
-    return !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn && props.rcsJwt);
-  };
-
-  var isRce5Disabled = function isRce5Disabled() {
-    return !props.isNewRCEEnabled && !props.isNewRCERendererEnabled;
-  };
-
-  var refreshToken = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(setTokenFn, questionStem) {
-      var _response$json;
-
-      var response, refreshedToken, normalizedStem, extractedText;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (hasAllPropsForRcs()) {
-                _context.next = 2;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 2:
-              _context.next = 4;
-              return props.rcsJwtRefreshFn(jwt);
-
-            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 = 11;
-                break;
-              }
-
-              normalizedStem = questionStem !== null && questionStem !== void 0 ? questionStem : 'Unknown stem';
-              extractedText = extractTextFromHtml(normalizedStem);
-              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 11:
-              setJwt(refreshedToken);
-              setTokenFn(refreshedToken);
-
-            case 13:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    return function refreshToken(_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var handleError = function handleError(quizLogMessage) {
-    if (shouldAlertUser()) {
-      alertTheUser(alertMessage());
-    }
-
-    if (shouldsetEventToQuizLog()) {
-      setEventToQuizLog(quizLogMessage);
-    }
-  };
-
-  var alertTheUser = function alertTheUser(message) {
-    store.dispatch(addError(message));
-  };
-
-  var setEventToQuizLog = function setEventToQuizLog(message) {
-    props.setEventToQuizLog(message);
-  };
-
-  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;
-
-    return {
-      featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), _defineProperty(_featureFlags, RceConfigKeys.isNewRCERendererEnabled, props.isNewRCERendererEnabled), _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 () {
-    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var host, base, url, response, json;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!isRce5Disabled()) {
-                _context2.next = 2;
-                break;
-              }
-
-              return _context2.abrupt("return");
-
-            case 2:
-              _context2.prev = 2;
-
-              if (hasAllPropsForRcs()) {
-                _context2.next = 6;
-                break;
-              }
-
-              handleError(t('Error: Full functionality of the Rich Content Editor may not have been available to the user.'));
-              return _context2.abrupt("return");
-
-            case 6:
-              host = props.rcsHost;
-              base = host.match(/^https?:\/\//) ? host : "".concat(window.location.protocol, "//").concat(host);
-              url = new URL('/api/rceConfig', base);
-              url.searchParams.append('contextType', props.contextType);
-              url.searchParams.append('contextId', props.contextId);
-              _context2.next = 13;
-              return fetch(url.href, {
-                headers: {
-                  'Authorization': "Bearer ".concat(props.rcsJwt)
-                }
-              });
-
-            case 13:
-              response = _context2.sent;
-              _context2.next = 16;
-              return response.json();
-
-            case 16:
-              json = _context2.sent;
-              setCanvasConfig(json);
-              setEventToQuizLog(null);
-              _context2.next = 25;
-              break;
-
-            case 21:
-              _context2.prev = 21;
-              _context2.t0 = _context2["catch"](2);
-              setCanvasConfig(null);
-              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;
-              setCanvasConfigLoading(false);
-              return _context2.finish(25);
-
-            case 28:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2, null, [[2, 21, 25, 28]]);
-    }))();
-  }, [props.isNewRCEEnabled, props.isNewRCERendererEnabled]);
-
-  if (isRce5Disabled()) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
-  }
-
-  if (!canvasConfigLoading) {
-    return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
-      value: getConfig()
-    }, props.children);
-  } else {
-    return _ref4;
-  }
-};
-RceConfigProviderComponent.propTypes = {
-  children: PropTypes.node.isRequired,
-  isNewRCEEnabled: PropTypes.bool.isRequired,
-  isNewRCERendererEnabled: PropTypes.bool.isRequired,
-  isNewRCEAppsEnabled: PropTypes.bool,
-  setEventToQuizLog: PropTypes.func.isRequired,
-  contextId: PropTypes.string,
-  contextType: PropTypes.string,
-  canvasUserId: PropTypes.string,
-  rcsHost: PropTypes.string,
-  rcsJwt: PropTypes.string,
-  rcsJwtRefreshFn: PropTypes.func,
-  canvasOrigin: PropTypes.string
-};
-RceConfigProviderComponent.defaultProps = {
-  contextId: null,
-  contextType: null,
-  canvasUserId: null,
-  rcsHost: null,
-  rcsJwt: null,
-  rcsJwtRefreshFn: null,
-  canvasOrigin: null,
-  isNewRCEEnabled: false,
-  isNewRCERendererEnabled: false,
-  isNewRCEAppsEnabled: false
-};
-
-var mapStateToProps = function mapStateToProps() {
-  return {
-    isNewRCEEnabled: isNewRCEEnabled(),
-    isNewRCERendererEnabled: isNewRCERendererEnabled(),
-    isNewRCEAppsEnabled: isNewRCEAppsEnabled()
-  };
-};
-
-var mapDispatchToProps = {
-  setEventToQuizLog: setRCEError
-};
-var RceConfigProvider = connect(mapStateToProps, mapDispatchToProps)(RceConfigProviderComponent);
-export { RceConfigProvider };