@instructure/quiz-core 18.1.2-rc.3 → 18.1.2-rc.5

package/es/common/actions/rce.js

@@ -1,9 +1,15 @@
-import { RCE_EVENT, SET_RCE_ERROR } from '@instructure/quiz-common';
+import { RCE_EVENT, SET_RCE_ERROR, SET_RCE_CONFIG } from '@instructure/quiz-common';
 export var setRCEError = function setRCEError(rceError) {
   return {
     type: SET_RCE_ERROR,
     payload: rceError
   };
+};
+export var setStoredRCEConfig = function setStoredRCEConfig(rceConfig) {
+  return {
+    type: SET_RCE_CONFIG,
+    payload: rceConfig
+  };
 }; // This is not consumed by its reducer
 // Instead it is processed by the eventLoggerMiddleware
 

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

@@ -1,14 +1,20 @@
 import { isNewRCEEnabled, isNewRCEAppsEnabled, isNewRCERendererEnabled } from "../../util/rceChecker.js";
 import { connect } from "../../react-redux.js";
 import RceConfigProviderComponent from "./presenter.js";
+import { getRCEConfig } from "../../selectors/rce.js";
+import { setStoredRCEConfig } from "../../actions/rce.js";
 
-var mapStateToProps = function mapStateToProps() {
+var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
     isNewRCEEnabled: isNewRCEEnabled(),
     isNewRCERendererEnabled: isNewRCERendererEnabled(),
-    isNewRCEAppsEnabled: isNewRCEAppsEnabled()
+    isNewRCEAppsEnabled: isNewRCEAppsEnabled(),
+    storedRCEConfig: getRCEConfig(state)
   };
 };
 
-var RceConfigProvider = connect(mapStateToProps)(RceConfigProviderComponent);
+var mapDispatchToProps = {
+  setStoredRCEConfig: setStoredRCEConfig
+};
+var RceConfigProvider = connect(mapStateToProps, mapDispatchToProps)(RceConfigProviderComponent);
 export default RceConfigProvider;

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

@@ -72,19 +72,23 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(_ref2) {
       rcsHost = _ref2.rcsHost,
       rcsJwt = _ref2.rcsJwt,
       rcsJwtRefreshFn = _ref2.rcsJwtRefreshFn,
-      canvasOrigin = _ref2.canvasOrigin;
+      canvasOrigin = _ref2.canvasOrigin,
+      storedRCEConfig = _ref2.storedRCEConfig,
+      setStoredRCEConfig = _ref2.setStoredRCEConfig;
 
   var _useState = useState(rcsJwt),
       _useState2 = _slicedToArray(_useState, 2),
       jwt = _useState2[0],
       setJwt = _useState2[1];
 
-  var _useState3 = useState(null),
+  var _useState3 = useState(storedRCEConfig),
       _useState4 = _slicedToArray(_useState3, 2),
       canvasConfig = _useState4[0],
       setCanvasConfig = _useState4[1];
 
-  var _useState5 = useState(true),
+  var rceConfigAvailable = storedRCEConfig ? false : true;
+
+  var _useState5 = useState(rceConfigAvailable),
       _useState6 = _slicedToArray(_useState5, 2),
       canvasConfigLoading = _useState6[0],
       setCanvasConfigLoading = _useState6[1];
@@ -135,35 +139,48 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(_ref2) {
               return _context2.abrupt("return");
 
             case 6:
-              _context2.next = 8;
+              if (!storedRCEConfig) {
+                _context2.next = 10;
+                break;
+              }
+
+              setCanvasConfig(storedRCEConfig);
+              _context2.next = 16;
+              break;
+
+            case 10:
+              _context2.next = 12;
               return fetchRceConfig(rcsHost, contextType, contextId, jwt);
 
-            case 8:
+            case 12:
               json = _context2.sent;
+              setStoredRCEConfig(json);
               setCanvasConfig(json);
               setEventToQuizLog(null);
-              _context2.next = 17;
+
+            case 16:
+              _context2.next = 22;
               break;
 
-            case 13:
-              _context2.prev = 13;
+            case 18:
+              _context2.prev = 18;
               _context2.t0 = _context2["catch"](2);
               setCanvasConfig(null);
               handleError(quizLogMsgFailedConfigFetch());
 
-            case 17:
-              _context2.prev = 17;
+            case 22:
+              _context2.prev = 22;
               setCanvasConfigLoading(false);
-              return _context2.finish(17);
+              return _context2.finish(22);
 
-            case 20:
+            case 25:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[2, 13, 17, 20]]);
+      }, _callee2, null, [[2, 18, 22, 25]]);
     }))();
-  }, [isNewRCEEnabled, isNewRCERendererEnabled]);
+  }, [isNewRCEEnabled, isNewRCERendererEnabled, storedRCEConfig]);
   useEffect(function () {
     if (isRce5Disabled(flags)) {
       return;
@@ -201,7 +218,18 @@ RceConfigProviderComponent.propTypes = {
   rcsHost: PropTypes.string,
   rcsJwt: PropTypes.string,
   rcsJwtRefreshFn: PropTypes.func,
-  canvasOrigin: PropTypes.string
+  canvasOrigin: PropTypes.string,
+  storedRCEConfig: PropTypes.shape({
+    contextId: PropTypes.string,
+    contextType: PropTypes.string,
+    canvasOrigin: PropTypes.string,
+    canvasUserId: PropTypes.string,
+    canvasToolId: PropTypes.string,
+    rcsHost: PropTypes.string,
+    rcsJwt: PropTypes.string,
+    rcsJwtRefreshFn: PropTypes.func
+  }),
+  setStoredRCEConfig: PropTypes.func.isRequired
 };
 RceConfigProviderComponent.defaultProps = {
   contextId: null,
@@ -214,6 +242,8 @@ RceConfigProviderComponent.defaultProps = {
   canvasOrigin: null,
   isNewRCEEnabled: false,
   isNewRCERendererEnabled: false,
-  isNewRCEAppsEnabled: false
+  isNewRCEAppsEnabled: false,
+  storedRCEConfig: null,
+  setStoredRCEConfig: null
 };
 export default RceConfigProviderComponent;

package/es/common/reducers/rce.js

@@ -1,10 +1,14 @@
 import { Map } from 'immutable';
-import { SET_RCE_ERROR } from '@instructure/quiz-common';
+import { SET_RCE_ERROR, SET_RCE_CONFIG } from '@instructure/quiz-common';
 
 var setRceError = function setRceError(state, payload) {
   return state.set('rceError', payload);
 };
 
+var setStoredRCEConfig = function setStoredRCEConfig(state, payload) {
+  return state.set('rceConfig', payload);
+};
+
 export default (function () {
   var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : Map();
   var action = arguments.length > 1 ? arguments[1] : void 0;
@@ -13,6 +17,9 @@ export default (function () {
     case SET_RCE_ERROR:
       return setRceError(state, action.payload);
 
+    case SET_RCE_CONFIG:
+      return setStoredRCEConfig(state, action.payload);
+
     default:
       return state;
   }

package/es/common/selectors/rce.js

@@ -1,3 +1,6 @@
 export var getRCEError = function getRCEError(state) {
   return state.getIn(['rce', 'rceError'], null);
+};
+export var getRCEConfig = function getRCEConfig(state) {
+  return state.getIn(['rce', 'rceConfig'], null);
 };

package/lib/common/actions/rce.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reportRCEEvent = exports.setRCEError = void 0;
+exports.reportRCEEvent = exports.setStoredRCEConfig = exports.setRCEError = void 0;
 
 var _quizCommon = require("@instructure/quiz-common");
 
@@ -12,11 +12,20 @@ var setRCEError = function setRCEError(rceError) {
     type: _quizCommon.SET_RCE_ERROR,
     payload: rceError
   };
+};
+
+exports.setRCEError = setRCEError;
+
+var setStoredRCEConfig = function setStoredRCEConfig(rceConfig) {
+  return {
+    type: _quizCommon.SET_RCE_CONFIG,
+    payload: rceConfig
+  };
 }; // This is not consumed by its reducer
 // Instead it is processed by the eventLoggerMiddleware
 
 
-exports.setRCEError = setRCEError;
+exports.setStoredRCEConfig = setStoredRCEConfig;
 
 var reportRCEEvent = function reportRCEEvent(eventMessage) {
   return {

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

@@ -13,14 +13,22 @@ var _reactRedux = require("../../react-redux.js");
 
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 
-var mapStateToProps = function mapStateToProps() {
+var _rce = require("../../selectors/rce.js");
+
+var _rce2 = require("../../actions/rce.js");
+
+var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
     isNewRCEEnabled: (0, _rceChecker.isNewRCEEnabled)(),
     isNewRCERendererEnabled: (0, _rceChecker.isNewRCERendererEnabled)(),
-    isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)()
+    isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)(),
+    storedRCEConfig: (0, _rce.getRCEConfig)(state)
   };
 };
 
-var RceConfigProvider = (0, _reactRedux.connect)(mapStateToProps)(_presenter.default);
+var mapDispatchToProps = {
+  setStoredRCEConfig: _rce2.setStoredRCEConfig
+};
+var RceConfigProvider = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_presenter.default);
 var _default = RceConfigProvider;
 exports.default = _default;

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

@@ -96,19 +96,23 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(_ref2) {
       rcsHost = _ref2.rcsHost,
       rcsJwt = _ref2.rcsJwt,
       rcsJwtRefreshFn = _ref2.rcsJwtRefreshFn,
-      canvasOrigin = _ref2.canvasOrigin;
+      canvasOrigin = _ref2.canvasOrigin,
+      storedRCEConfig = _ref2.storedRCEConfig,
+      setStoredRCEConfig = _ref2.setStoredRCEConfig;
 
   var _useState = (0, _react.useState)(rcsJwt),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       jwt = _useState2[0],
       setJwt = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(null),
+  var _useState3 = (0, _react.useState)(storedRCEConfig),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       canvasConfig = _useState4[0],
       setCanvasConfig = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(true),
+  var rceConfigAvailable = storedRCEConfig ? false : true;
+
+  var _useState5 = (0, _react.useState)(rceConfigAvailable),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       canvasConfigLoading = _useState6[0],
       setCanvasConfigLoading = _useState6[1];
@@ -159,35 +163,48 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(_ref2) {
               return _context2.abrupt("return");
 
             case 6:
-              _context2.next = 8;
+              if (!storedRCEConfig) {
+                _context2.next = 10;
+                break;
+              }
+
+              setCanvasConfig(storedRCEConfig);
+              _context2.next = 16;
+              break;
+
+            case 10:
+              _context2.next = 12;
               return (0, _rceConfigFetcher.fetchRceConfig)(rcsHost, contextType, contextId, jwt);
 
-            case 8:
+            case 12:
               json = _context2.sent;
+              setStoredRCEConfig(json);
               setCanvasConfig(json);
               (0, _rceConfigErrorHandler.setEventToQuizLog)(null);
-              _context2.next = 17;
+
+            case 16:
+              _context2.next = 22;
               break;
 
-            case 13:
-              _context2.prev = 13;
+            case 18:
+              _context2.prev = 18;
               _context2.t0 = _context2["catch"](2);
               setCanvasConfig(null);
               (0, _rceConfigErrorHandler.handleError)((0, _rceConfigErrorMessages.quizLogMsgFailedConfigFetch)());
 
-            case 17:
-              _context2.prev = 17;
+            case 22:
+              _context2.prev = 22;
               setCanvasConfigLoading(false);
-              return _context2.finish(17);
+              return _context2.finish(22);
 
-            case 20:
+            case 25:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[2, 13, 17, 20]]);
+      }, _callee2, null, [[2, 18, 22, 25]]);
     }))();
-  }, [isNewRCEEnabled, isNewRCERendererEnabled]);
+  }, [isNewRCEEnabled, isNewRCERendererEnabled, storedRCEConfig]);
   (0, _react.useEffect)(function () {
     if ((0, _rceConfigUtils.isRce5Disabled)(flags)) {
       return;
@@ -225,7 +242,18 @@ RceConfigProviderComponent.propTypes = {
   rcsHost: _propTypes.default.string,
   rcsJwt: _propTypes.default.string,
   rcsJwtRefreshFn: _propTypes.default.func,
-  canvasOrigin: _propTypes.default.string
+  canvasOrigin: _propTypes.default.string,
+  storedRCEConfig: _propTypes.default.shape({
+    contextId: _propTypes.default.string,
+    contextType: _propTypes.default.string,
+    canvasOrigin: _propTypes.default.string,
+    canvasUserId: _propTypes.default.string,
+    canvasToolId: _propTypes.default.string,
+    rcsHost: _propTypes.default.string,
+    rcsJwt: _propTypes.default.string,
+    rcsJwtRefreshFn: _propTypes.default.func
+  }),
+  setStoredRCEConfig: _propTypes.default.func.isRequired
 };
 RceConfigProviderComponent.defaultProps = {
   contextId: null,
@@ -238,7 +266,9 @@ RceConfigProviderComponent.defaultProps = {
   canvasOrigin: null,
   isNewRCEEnabled: false,
   isNewRCERendererEnabled: false,
-  isNewRCEAppsEnabled: false
+  isNewRCEAppsEnabled: false,
+  storedRCEConfig: null,
+  setStoredRCEConfig: null
 };
 var _default = RceConfigProviderComponent;
 exports.default = _default;

package/lib/common/reducers/rce.js

@@ -13,6 +13,10 @@ var setRceError = function setRceError(state, payload) {
   return state.set('rceError', payload);
 };
 
+var setStoredRCEConfig = function setStoredRCEConfig(state, payload) {
+  return state.set('rceConfig', payload);
+};
+
 var _default = function _default() {
   var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : (0, _immutable.Map)();
   var action = arguments.length > 1 ? arguments[1] : void 0;
@@ -21,6 +25,9 @@ var _default = function _default() {
     case _quizCommon.SET_RCE_ERROR:
       return setRceError(state, action.payload);
 
+    case _quizCommon.SET_RCE_CONFIG:
+      return setStoredRCEConfig(state, action.payload);
+
     default:
       return state;
   }

package/lib/common/selectors/rce.js

@@ -3,10 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRCEError = void 0;
+exports.getRCEConfig = exports.getRCEError = void 0;
 
 var getRCEError = function getRCEError(state) {
   return state.getIn(['rce', 'rceError'], null);
 };
 
-exports.getRCEError = getRCEError;
+exports.getRCEError = getRCEError;
+
+var getRCEConfig = function getRCEConfig(state) {
+  return state.getIn(['rce', 'rceConfig'], null);
+};
+
+exports.getRCEConfig = getRCEConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "18.1.2-rc.3+0ae4e9004",
+  "version": "18.1.2-rc.5+c2d444eff",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -42,11 +42,11 @@
   "dependencies": {
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^2.1.9",
-    "@instructure/quiz-common": "18.1.2-rc.3+0ae4e9004",
-    "@instructure/quiz-i18n": "18.1.2-rc.3+0ae4e9004",
-    "@instructure/quiz-interactions": "18.1.2-rc.3+0ae4e9004",
-    "@instructure/quiz-number-input": "18.1.2-rc.3+0ae4e9004",
-    "@instructure/quiz-rce": "18.1.2-rc.3+0ae4e9004",
+    "@instructure/quiz-common": "18.1.2-rc.5+c2d444eff",
+    "@instructure/quiz-i18n": "18.1.2-rc.5+c2d444eff",
+    "@instructure/quiz-interactions": "18.1.2-rc.5+c2d444eff",
+    "@instructure/quiz-number-input": "18.1.2-rc.5+c2d444eff",
+    "@instructure/quiz-rce": "18.1.2-rc.5+c2d444eff",
     "@instructure/ui-a11y-content": "^7.20.0",
     "@instructure/ui-alerts": "^7.20.0",
     "@instructure/ui-avatar": "^7.20.0",
@@ -107,7 +107,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "18.1.2-rc.3+0ae4e9004",
+    "instructure-validations": "18.1.2-rc.5+c2d444eff",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -158,7 +158,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "18.1.2-rc.3+0ae4e9004",
+    "quiz-presets": "18.1.2-rc.5+c2d444eff",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -174,5 +174,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0ae4e9004a0d366c6fc27581d6791cb23a377ed3"
+  "gitHead": "c2d444effa119968b746267dafd99495edf9cbca"
 }