@instructure/quiz-core 17.45.1-rc.0 → 17.45.1-rc.2

package/es/common/actions/ui.js

@@ -1,4 +1,4 @@
-import { CLEAR_UI, MERGE_UI, SET_UI, TOGGLE_UI, OCCLUDE_QUIZ_ENTRIES, ACTIVE_BANK_CHANGE, ACTIVE_BANK_ENTRY_CHANGE } from '@instructure/quiz-common';
+import { CLEAR_UI, MERGE_UI, SET_UI, TOGGLE_UI, OCCLUDE_QUIZ_ENTRIES, ACTIVE_BANK_CHANGE, ACTIVE_BANK_ENTRY_CHANGE, LOADED_API_FEATURES } from '@instructure/quiz-common';
 export var clear = function clear(key) {
   return {
     payload: key,
@@ -47,6 +47,12 @@ export var newActiveBankEntry = function newActiveBankEntry(activeBankEntryId) {
     payload: activeBankEntryId
   };
 };
+export var loadedApiFeatures = function loadedApiFeatures(loaded) {
+  return {
+    type: LOADED_API_FEATURES,
+    payload: loaded
+  };
+};
 export var setActiveCalculatorId = function setActiveCalculatorId(id) {
   return set('activeCalculatorId', id);
 };

package/es/common/api/features.js

@@ -1,5 +1,6 @@
 import Fetcher from "../util/Fetcher.js";
 import { addFeatures } from "../actions/features.js";
+import { loadedApiFeatures } from "../actions/ui.js";
 export var getFeatures = function getFeatures() {
   var url = '/api/features';
   return function (dispatch, getState) {
@@ -9,6 +10,8 @@ export var getFeatures = function getFeatures() {
       dispatch(addFeatures(featuresList));
     };
 
-    return fetcher.get(url).then(addFeaturesToStore);
+    return fetcher.get(url).then(addFeaturesToStore).then(function () {
+      return dispatch(loadedApiFeatures(true));
+    });
   };
 };

package/es/common/reducers/ui.js

@@ -1,5 +1,5 @@
 import { fromJS } from 'immutable';
-import { ACTIVE_BANK_CHANGE, ACTIVE_BANK_ENTRY_CHANGE, CLEAR_UI, MERGE_UI, SET_UI, TOGGLE_UI, OCCLUDE_QUIZ_ENTRIES } from '@instructure/quiz-common';
+import { ACTIVE_BANK_CHANGE, ACTIVE_BANK_ENTRY_CHANGE, CLEAR_UI, MERGE_UI, SET_UI, TOGGLE_UI, OCCLUDE_QUIZ_ENTRIES, LOADED_API_FEATURES } from '@instructure/quiz-common';
 
 var toggle = function toggle(state, key) {
   return state.update(key, function (value) {
@@ -34,6 +34,9 @@ export default (function () {
     case ACTIVE_BANK_ENTRY_CHANGE:
       return state.set('activeBankEntryId', action.payload);
 
+    case LOADED_API_FEATURES:
+      return state.set('loadedApiFeatures', action.payload);
+
     default:
       return state;
   }

package/es/common/util/RceConfigProvider.js

@@ -185,10 +185,20 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
       }, _callee2, null, [[2, 21, 25, 28]]);
     }))();
   }, [props.useNewRce]);
-  if (!props.useNewRce) return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
-  return canvasConfigLoading ? _ref4 : /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
-    value: getConfig()
-  }, props.children);
+
+  if (props.loadedApiFeatures) {
+    if (props.useNewRce) {
+      if (!canvasConfigLoading) {
+        return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
+          value: getConfig()
+        }, props.children);
+      }
+    } else {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+    }
+  }
+
+  return _ref4;
 };
 RceConfigProviderComponent.propTypes = {
   children: PropTypes.node.isRequired,
@@ -200,7 +210,8 @@ RceConfigProviderComponent.propTypes = {
   rcsHost: PropTypes.string,
   rcsJwt: PropTypes.string,
   rcsJwtRefreshFn: PropTypes.func,
-  canvasOrigin: PropTypes.string
+  canvasOrigin: PropTypes.string,
+  loadedApiFeatures: PropTypes.bool
 };
 RceConfigProviderComponent.defaultProps = {
   contextId: null,
@@ -209,12 +220,14 @@ RceConfigProviderComponent.defaultProps = {
   rcsHost: null,
   rcsJwt: null,
   rcsJwtRefreshFn: null,
-  canvasOrigin: null
+  canvasOrigin: null,
+  loadedApiFeatures: false
 };
 
-var mapStateToProps = function mapStateToProps() {
+var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
-    useNewRce: isNewRCEEnabled()
+    useNewRce: isNewRCEEnabled(),
+    loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
   };
 };
 

package/lib/common/actions/ui.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setActiveCalculatorId = exports.newActiveBankEntry = exports.newActiveBank = exports.occludeQuizEntries = exports.merge = exports.set = exports.toggle = exports.clear = void 0;
+exports.setActiveCalculatorId = exports.loadedApiFeatures = exports.newActiveBankEntry = exports.newActiveBank = exports.occludeQuizEntries = exports.merge = exports.set = exports.toggle = exports.clear = void 0;
 
 var _quizCommon = require("@instructure/quiz-common");
 
@@ -76,6 +76,15 @@ var newActiveBankEntry = function newActiveBankEntry(activeBankEntryId) {
 
 exports.newActiveBankEntry = newActiveBankEntry;
 
+var loadedApiFeatures = function loadedApiFeatures(loaded) {
+  return {
+    type: _quizCommon.LOADED_API_FEATURES,
+    payload: loaded
+  };
+};
+
+exports.loadedApiFeatures = loadedApiFeatures;
+
 var setActiveCalculatorId = function setActiveCalculatorId(id) {
   return set('activeCalculatorId', id);
 };

package/lib/common/api/features.js

@@ -11,6 +11,8 @@ var _Fetcher = _interopRequireDefault(require("../util/Fetcher.js"));
 
 var _features = require("../actions/features.js");
 
+var _ui = require("../actions/ui.js");
+
 var getFeatures = function getFeatures() {
   var url = '/api/features';
   return function (dispatch, getState) {
@@ -20,7 +22,9 @@ var getFeatures = function getFeatures() {
       dispatch((0, _features.addFeatures)(featuresList));
     };
 
-    return fetcher.get(url).then(addFeaturesToStore);
+    return fetcher.get(url).then(addFeaturesToStore).then(function () {
+      return dispatch((0, _ui.loadedApiFeatures)(true));
+    });
   };
 };
 

package/lib/common/reducers/ui.js

@@ -43,6 +43,9 @@ var _default = function _default() {
     case _quizCommon.ACTIVE_BANK_ENTRY_CHANGE:
       return state.set('activeBankEntryId', action.payload);
 
+    case _quizCommon.LOADED_API_FEATURES:
+      return state.set('loadedApiFeatures', action.payload);
+
     default:
       return state;
   }

package/lib/common/util/RceConfigProvider.js

@@ -212,10 +212,20 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
       }, _callee2, null, [[2, 21, 25, 28]]);
     }))();
   }, [props.useNewRce]);
-  if (!props.useNewRce) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
-  return canvasConfigLoading ? _ref4 : /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
-    value: getConfig()
-  }, props.children);
+
+  if (props.loadedApiFeatures) {
+    if (props.useNewRce) {
+      if (!canvasConfigLoading) {
+        return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
+          value: getConfig()
+        }, props.children);
+      }
+    } else {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
+    }
+  }
+
+  return _ref4;
 };
 
 exports.RceConfigProviderComponent = RceConfigProviderComponent;
@@ -229,7 +239,8 @@ RceConfigProviderComponent.propTypes = {
   rcsHost: _propTypes.default.string,
   rcsJwt: _propTypes.default.string,
   rcsJwtRefreshFn: _propTypes.default.func,
-  canvasOrigin: _propTypes.default.string
+  canvasOrigin: _propTypes.default.string,
+  loadedApiFeatures: _propTypes.default.bool
 };
 RceConfigProviderComponent.defaultProps = {
   contextId: null,
@@ -238,12 +249,14 @@ RceConfigProviderComponent.defaultProps = {
   rcsHost: null,
   rcsJwt: null,
   rcsJwtRefreshFn: null,
-  canvasOrigin: null
+  canvasOrigin: null,
+  loadedApiFeatures: false
 };
 
-var mapStateToProps = function mapStateToProps() {
+var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
-    useNewRce: (0, _rceChecker.default)()
+    useNewRce: (0, _rceChecker.default)(),
+    loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.45.1-rc.0+41f7d1000",
+  "version": "17.45.1-rc.2+a59dd404e",
   "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.45.1-rc.0+41f7d1000",
-    "@instructure/quiz-i18n": "17.45.1-rc.0+41f7d1000",
-    "@instructure/quiz-interactions": "17.45.1-rc.0+41f7d1000",
-    "@instructure/quiz-number-input": "17.45.1-rc.0+41f7d1000",
-    "@instructure/quiz-rce": "17.45.1-rc.0+41f7d1000",
+    "@instructure/quiz-common": "17.45.1-rc.2+a59dd404e",
+    "@instructure/quiz-i18n": "17.45.1-rc.2+a59dd404e",
+    "@instructure/quiz-interactions": "17.45.1-rc.2+a59dd404e",
+    "@instructure/quiz-number-input": "17.45.1-rc.2+a59dd404e",
+    "@instructure/quiz-rce": "17.45.1-rc.2+a59dd404e",
     "@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.45.1-rc.0+41f7d1000",
+    "instructure-validations": "17.45.1-rc.2+a59dd404e",
     "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.45.1-rc.0+41f7d1000",
+    "quiz-presets": "17.45.1-rc.2+a59dd404e",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "41f7d100057d4048d5878513765cbc6b437df5cf"
+  "gitHead": "a59dd404e5e28b14b94b79ec1526be2d44e816cb"
 }