@instructure/quiz-core 17.47.0 → 17.47.1-rc.0

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

@@ -0,0 +1,36 @@
+import React, { useEffect } from 'react';
+import { connect } from "../../react-redux.js";
+import { bool, node, func } from 'prop-types';
+import { getFeatures } from "../../api/features.js";
+import { QuizzesSpinner as Spinner } from "../shared/spinner/Spinner.js";
+import { Card } from "../shared/Card/index.js";
+
+var _ref = /*#__PURE__*/React.createElement(Card, {
+  wrapped: true
+}, /*#__PURE__*/React.createElement(Spinner, null));
+
+export var ApiFeatureFlagInitializerComponent = function ApiFeatureFlagInitializerComponent(props) {
+  useEffect(function () {
+    !props.loadedApiFeatures && props.getFeatures();
+  }, []);
+  return props.loadedApiFeatures ? props.children : _ref;
+};
+ApiFeatureFlagInitializerComponent.propTypes = {
+  children: node.isRequired,
+  getFeatures: func.isRequired,
+  loadedApiFeatures: bool
+};
+ApiFeatureFlagInitializerComponent.defaultProps = {
+  loadedApiFeatures: false
+};
+
+var mapStateToProps = function mapStateToProps(state, ownProps) {
+  return {
+    loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
+  };
+};
+
+var mapDispatchToProps = {
+  getFeatures: getFeatures
+};
+export var ApiFeatureFlagInitializer = connect(mapStateToProps, mapDispatchToProps)(ApiFeatureFlagInitializerComponent);

package/es/common/{util → components/RceConfigProvider}/RceConfigProvider.js

@@ -4,17 +4,17 @@ 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 "../../common/react-redux.js";
-import store from "../../reduxStore.js";
-import { setRCEError } from "../actions/rce.js";
-import { isNewRCEEnabled, isNewRCEAppsEnabled, isRCE5RendererEnabled } from "./rceChecker.js";
-import { QuizzesSpinner as Spinner } from "../components/shared/spinner/Spinner.js";
-import { Card } from "../components/shared/Card/index.js";
+import { connect } from "../../react-redux.js";
+import store from "../../../reduxStore.js";
+import { setRCEError } from "../../actions/rce.js";
+import { isNewRCEEnabled, isNewRCEAppsEnabled, isRCE5RendererEnabled } 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 { addError } from "../../actions/alerts.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
-import { isQuizTaking, isQuizBuilding } from "./windowChecks.js";
+import { isQuizTaking, isQuizBuilding } from "../../util/windowChecks.js";
 
 var _ref4 = /*#__PURE__*/React.createElement(Card, {
   wrapped: true
@@ -40,6 +40,10 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
     return !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn && props.rcsJwt);
   };
 
+  var isRce5Disabled = function isRce5Disabled() {
+    return !props.isNewRCEEnabled && !props.rce5Renderer;
+  };
+
   var refreshToken = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(setTokenFn, questionStem) {
       var _response$json;
@@ -140,7 +144,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!props.isNewRCEEnabled && !props.rce5Renderer)) {
+              if (!isRce5Disabled()) {
                 _context2.next = 2;
                 break;
               }
@@ -203,19 +207,17 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
     }))();
   }, [props.isNewRCEEnabled, props.rce5Renderer]);
 
-  if (props.loadedApiFeatures) {
-    if (props.isNewRCEEnabled || props.rce5Renderer) {
-      if (!canvasConfigLoading) {
-        return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
-          value: getConfig()
-        }, props.children);
-      }
-    } else {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
-    }
+  if (isRce5Disabled()) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
   }
 
-  return _ref4;
+  if (!canvasConfigLoading) {
+    return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
+      value: getConfig()
+    }, props.children);
+  } else {
+    return _ref4;
+  }
 };
 RceConfigProviderComponent.propTypes = {
   children: PropTypes.node.isRequired,
@@ -229,8 +231,7 @@ RceConfigProviderComponent.propTypes = {
   rcsHost: PropTypes.string,
   rcsJwt: PropTypes.string,
   rcsJwtRefreshFn: PropTypes.func,
-  canvasOrigin: PropTypes.string,
-  loadedApiFeatures: PropTypes.bool
+  canvasOrigin: PropTypes.string
 };
 RceConfigProviderComponent.defaultProps = {
   contextId: null,
@@ -240,16 +241,14 @@ RceConfigProviderComponent.defaultProps = {
   rcsJwt: null,
   rcsJwtRefreshFn: null,
   canvasOrigin: null,
-  loadedApiFeatures: false,
   isNewRCEAppsEnabled: false
 };
 
-var mapStateToProps = function mapStateToProps(state, ownProps) {
+var mapStateToProps = function mapStateToProps() {
   return {
     isNewRCEEnabled: isNewRCEEnabled(),
     rce5Renderer: isRCE5RendererEnabled(),
-    isNewRCEAppsEnabled: isNewRCEAppsEnabled(),
-    loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
+    isNewRCEAppsEnabled: isNewRCEAppsEnabled()
   };
 };
 

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

@@ -17,7 +17,6 @@ import { ApplyLocale } from '@instructure/ui-i18n';
 import { Provider } from "../../react-redux.js";
 import store from "../../../reduxStore.js";
 import { getLocale } from '@instructure/quiz-common';
-import { getFeatures } from "../../api/features.js";
 import { set } from "../../actions/ui.js";
 import { setAPIEndpoint, setCanvasOrigin, setUserToken } from "../../actions/config.js";
 import { setContextUuid, setOutcomesEndpoint, setOutcomesToken } from "../../actions/outcomes.js";
@@ -34,7 +33,8 @@ import theme from "./theme.js";
 import CustomPropTypes from "../../../common/util/CustomPropTypes.js";
 import ConfirmationModal from "../ConfirmationModal/index.js";
 import setupFormatMessage from '@instructure/quiz-i18n/es/util/setupFormatMessage';
-import { RceConfigProvider } from "../../util/RceConfigProvider.js";
+import { RceConfigProvider } from "../RceConfigProvider/RceConfigProvider.js";
+import { ApiFeatureFlagInitializer } from "../ApiFeatureFlagInitializer/index.js";
 
 var _ref = /*#__PURE__*/React.createElement(ConfirmationModal, null);
 
@@ -81,7 +81,6 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
       var _this$props$rceConfig;
 
       this.store.dispatch([setAPIEndpoint(this.props.apiEndpoint), setCanvasOrigin((_this$props$rceConfig = this.props.rceConfig) === null || _this$props$rceConfig === void 0 ? void 0 : _this$props$rceConfig.canvasOrigin), this.setAppContainer(this.props.appContainer), setUserToken(this.props.userToken), setOutcomesEndpoint(this.props.outcomesEndpoint), setOutcomesToken(this.props.outcomesToken), setContextUuid(this.props.contextUuid)]);
-      this.store.dispatch(getFeatures());
 
       if (this.props.itemBankSharingEnabled) {
         this.store.dispatch(addFeatures('item_bank_sharing'));
@@ -140,13 +139,13 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
           context = this.context;
       return /*#__PURE__*/React.createElement(Provider, {
         store: store
-      }, /*#__PURE__*/React.createElement(RceConfigProvider, this.props.rceConfig, /*#__PURE__*/React.createElement(ApplyLocale, {
+      }, /*#__PURE__*/React.createElement(ApiFeatureFlagInitializer, null, /*#__PURE__*/React.createElement(RceConfigProvider, this.props.rceConfig, /*#__PURE__*/React.createElement(ApplyLocale, {
         locale: getLocale(props, context),
         timezone: props.timeZone
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.sdk,
         "data-automation": "sdk-app"
-      }, _ref, props.children))));
+      }, _ref, props.children)))));
     }
   }]);
 

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

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ApiFeatureFlagInitializer = exports.ApiFeatureFlagInitializerComponent = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactRedux = require("../../react-redux.js");
+
+var _propTypes = require("prop-types");
+
+var _features = require("../../api/features.js");
+
+var _Spinner = require("../shared/spinner/Spinner.js");
+
+var _index = require("../shared/Card/index.js");
+
+var _ref = /*#__PURE__*/_react.default.createElement(_index.Card, {
+  wrapped: true
+}, /*#__PURE__*/_react.default.createElement(_Spinner.QuizzesSpinner, null));
+
+var ApiFeatureFlagInitializerComponent = function ApiFeatureFlagInitializerComponent(props) {
+  (0, _react.useEffect)(function () {
+    !props.loadedApiFeatures && props.getFeatures();
+  }, []);
+  return props.loadedApiFeatures ? props.children : _ref;
+};
+
+exports.ApiFeatureFlagInitializerComponent = ApiFeatureFlagInitializerComponent;
+ApiFeatureFlagInitializerComponent.propTypes = {
+  children: _propTypes.node.isRequired,
+  getFeatures: _propTypes.func.isRequired,
+  loadedApiFeatures: _propTypes.bool
+};
+ApiFeatureFlagInitializerComponent.defaultProps = {
+  loadedApiFeatures: false
+};
+
+var mapStateToProps = function mapStateToProps(state, ownProps) {
+  return {
+    loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
+  };
+};
+
+var mapDispatchToProps = {
+  getFeatures: _features.getFeatures
+};
+var ApiFeatureFlagInitializer = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ApiFeatureFlagInitializerComponent);
+exports.ApiFeatureFlagInitializer = ApiFeatureFlagInitializer;

package/lib/common/{util → components/RceConfigProvider}/RceConfigProvider.js

@@ -21,27 +21,27 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactRedux = require("../../common/react-redux.js");
+var _reactRedux = require("../../react-redux.js");
 
-var _reduxStore = _interopRequireDefault(require("../../reduxStore.js"));
+var _reduxStore = _interopRequireDefault(require("../../../reduxStore.js"));
 
-var _rce = require("../actions/rce.js");
+var _rce = require("../../actions/rce.js");
 
-var _rceChecker = require("./rceChecker.js");
+var _rceChecker = require("../../util/rceChecker.js");
 
-var _Spinner = require("../components/shared/spinner/Spinner.js");
+var _Spinner = require("../shared/spinner/Spinner.js");
 
-var _index = require("../components/shared/Card/index.js");
+var _index = require("../shared/Card/index.js");
 
 var _quizCommon = require("@instructure/quiz-common");
 
-var _alerts = require("../actions/alerts.js");
+var _alerts = require("../../actions/alerts.js");
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _quizInteractions = require("@instructure/quiz-interactions");
 
-var _windowChecks = require("./windowChecks.js");
+var _windowChecks = require("../../util/windowChecks.js");
 
 var _ref4 = /*#__PURE__*/_react.default.createElement(_index.Card, {
   wrapped: true
@@ -67,6 +67,10 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
     return !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn && props.rcsJwt);
   };
 
+  var isRce5Disabled = function isRce5Disabled() {
+    return !props.isNewRCEEnabled && !props.rce5Renderer;
+  };
+
   var refreshToken = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(setTokenFn, questionStem) {
       var _response$json;
@@ -167,7 +171,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!props.isNewRCEEnabled && !props.rce5Renderer)) {
+              if (!isRce5Disabled()) {
                 _context2.next = 2;
                 break;
               }
@@ -230,19 +234,17 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
     }))();
   }, [props.isNewRCEEnabled, props.rce5Renderer]);
 
-  if (props.loadedApiFeatures) {
-    if (props.isNewRCEEnabled || props.rce5Renderer) {
-      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);
-    }
+  if (isRce5Disabled()) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
   }
 
-  return _ref4;
+  if (!canvasConfigLoading) {
+    return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
+      value: getConfig()
+    }, props.children);
+  } else {
+    return _ref4;
+  }
 };
 
 exports.RceConfigProviderComponent = RceConfigProviderComponent;
@@ -258,8 +260,7 @@ RceConfigProviderComponent.propTypes = {
   rcsHost: _propTypes.default.string,
   rcsJwt: _propTypes.default.string,
   rcsJwtRefreshFn: _propTypes.default.func,
-  canvasOrigin: _propTypes.default.string,
-  loadedApiFeatures: _propTypes.default.bool
+  canvasOrigin: _propTypes.default.string
 };
 RceConfigProviderComponent.defaultProps = {
   contextId: null,
@@ -269,16 +270,14 @@ RceConfigProviderComponent.defaultProps = {
   rcsJwt: null,
   rcsJwtRefreshFn: null,
   canvasOrigin: null,
-  loadedApiFeatures: false,
   isNewRCEAppsEnabled: false
 };
 
-var mapStateToProps = function mapStateToProps(state, ownProps) {
+var mapStateToProps = function mapStateToProps() {
   return {
     isNewRCEEnabled: (0, _rceChecker.isNewRCEEnabled)(),
     rce5Renderer: (0, _rceChecker.isRCE5RendererEnabled)(),
-    isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)(),
-    loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
+    isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)()
   };
 };
 

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

@@ -35,15 +35,13 @@ var _reduxStore = _interopRequireDefault(require("../../../reduxStore.js"));
 
 var _quizCommon = require("@instructure/quiz-common");
 
-var _features = require("../../api/features.js");
-
 var _ui = require("../../actions/ui.js");
 
 var _config = require("../../actions/config.js");
 
 var _outcomes = require("../../actions/outcomes.js");
 
-var _features2 = require("../../actions/features.js");
+var _features = require("../../actions/features.js");
 
 var _renderAlerts = _interopRequireDefault(require("../../util/renderAlerts.js"));
 
@@ -55,7 +53,9 @@ var _index = _interopRequireDefault(require("../ConfirmationModal/index.js"));
 
 var _setupFormatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/util/setupFormatMessage"));
 
-var _RceConfigProvider = require("../../util/RceConfigProvider.js");
+var _RceConfigProvider = require("../RceConfigProvider/RceConfigProvider.js");
+
+var _index2 = require("../ApiFeatureFlagInitializer/index.js");
 
 var _dec, _class, _class2, _temp;
 
@@ -111,10 +111,9 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
       var _this$props$rceConfig;
 
       this.store.dispatch([(0, _config.setAPIEndpoint)(this.props.apiEndpoint), (0, _config.setCanvasOrigin)((_this$props$rceConfig = this.props.rceConfig) === null || _this$props$rceConfig === void 0 ? void 0 : _this$props$rceConfig.canvasOrigin), this.setAppContainer(this.props.appContainer), (0, _config.setUserToken)(this.props.userToken), (0, _outcomes.setOutcomesEndpoint)(this.props.outcomesEndpoint), (0, _outcomes.setOutcomesToken)(this.props.outcomesToken), (0, _outcomes.setContextUuid)(this.props.contextUuid)]);
-      this.store.dispatch((0, _features.getFeatures)());
 
       if (this.props.itemBankSharingEnabled) {
-        this.store.dispatch((0, _features2.addFeatures)('item_bank_sharing'));
+        this.store.dispatch((0, _features.addFeatures)('item_bank_sharing'));
       }
     }
   }, {
@@ -158,7 +157,7 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
       }
 
       if (newProps.itemBankSharingEnabled !== this.props.itemBankSharingEnabled) {
-        var toggleFeature = newProps.itemBankSharingEnabled ? _features2.addFeatures : _features2.removeFeatures;
+        var toggleFeature = newProps.itemBankSharingEnabled ? _features.addFeatures : _features.removeFeatures;
         this.store.dispatch(toggleFeature('item_bank_sharing'));
       }
     }
@@ -170,13 +169,13 @@ 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(_RceConfigProvider.RceConfigProvider, this.props.rceConfig, /*#__PURE__*/_react.default.createElement(_uiI18n.ApplyLocale, {
+      }, /*#__PURE__*/_react.default.createElement(_index2.ApiFeatureFlagInitializer, null, /*#__PURE__*/_react.default.createElement(_RceConfigProvider.RceConfigProvider, this.props.rceConfig, /*#__PURE__*/_react.default.createElement(_uiI18n.ApplyLocale, {
         locale: (0, _quizCommon.getLocale)(props, context),
         timezone: props.timeZone
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.sdk,
         "data-automation": "sdk-app"
-      }, _ref, props.children))));
+      }, _ref, props.children)))));
     }
   }]);
   SDKApp.displayName = "SDKApp";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.47.0",
+  "version": "17.47.1-rc.0+f714f1348",
   "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.47.0",
-    "@instructure/quiz-i18n": "^17.47.0",
-    "@instructure/quiz-interactions": "^17.47.0",
-    "@instructure/quiz-number-input": "^17.47.0",
-    "@instructure/quiz-rce": "^17.47.0",
+    "@instructure/quiz-common": "17.47.1-rc.0+f714f1348",
+    "@instructure/quiz-i18n": "17.47.1-rc.0+f714f1348",
+    "@instructure/quiz-interactions": "17.47.1-rc.0+f714f1348",
+    "@instructure/quiz-number-input": "17.47.1-rc.0+f714f1348",
+    "@instructure/quiz-rce": "17.47.1-rc.0+f714f1348",
     "@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.47.0",
+    "instructure-validations": "17.47.1-rc.0+f714f1348",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "^17.47.0",
+    "@instructure/quiz-scripts": "17.47.0",
     "@instructure/ui-axe-check": "^7.20.0",
     "@instructure/ui-babel-preset": "^7.20.0",
     "@instructure/ui-karma-config": "^7.20.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^17.47.0",
+    "quiz-presets": "17.47.1-rc.0+f714f1348",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "96a94a12f1622e403f065768079884445709a334"
+  "gitHead": "f714f13480c8231391e8f905628fc1696c66980a"
 }