@instructure/quiz-core 17.34.1-rc.1 → 17.34.1-rc.13

package/es/banks/components/SharingModal/presenter.js

@@ -222,9 +222,10 @@ export var SharingModalPresenter = (_dec = themeable(theme, styles), _dec(_class
         });
         var removedNewEntity = newEntitiesIndex > -1;
         var newShares = removedNewEntity ? prevState.shares.delete(sharesIndex) : prevState.shares.setIn([sharesIndex, 'permission'], permission);
+        var newEntities = removedNewEntity ? prevState.newEntities.delete(newEntitiesIndex) : prevState.newEntities;
         return {
           shares: newShares,
-          newEntities: prevState.newEntities.delete(newEntitiesIndex),
+          newEntities: newEntities,
           entitiesWithChangedPermission: Object.assign({}, prevState.entitiesWithChangedPermission, _defineProperty({}, id, permission))
         };
       }, _this.updateEntitiesCount);

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

@@ -34,6 +34,7 @@ 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";
 
 var _ref = /*#__PURE__*/React.createElement(ConfirmationModal, null);
 
@@ -131,13 +132,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(ApplyLocale, {
+      }, /*#__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))));
     }
   }]);
 
@@ -160,7 +161,7 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
     contextType: PropTypes.string.isRequired,
     canvasUserId: PropTypes.string.isRequired,
     rcsHost: PropTypes.string.isRequired,
-    tokenFetchFn: PropTypes.func.isRequired
+    rcsJwtRefreshFn: PropTypes.func.isRequired
   }),
   timeZone: PropTypes.string,
   translations: PropTypes.objectOf(PropTypes.shape({

package/es/common/util/RceConfigProvider.js

@@ -0,0 +1,87 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from "../../common/react-redux.js";
+import isNewRCEEnabled from "./rceChecker.js";
+import { RceConfigContext, RceConfigKeys, TokenFetchStatus } from '@instructure/quiz-common';
+
+var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
+  var _useState = useState(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      jwt = _useState2[0],
+      setJwt = _useState2[1];
+
+  var _useState3 = useState(TokenFetchStatus.initial),
+      _useState4 = _slicedToArray(_useState3, 2),
+      status = _useState4[0],
+      setStatus = _useState4[1];
+
+  var hasAllPropsForNewRce = function hasAllPropsForNewRce() {
+    return props.useNewRce && !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn);
+  };
+
+  var getToken = function getToken() {
+    if (!hasAllPropsForNewRce()) return;
+    setStatus(TokenFetchStatus.pending);
+    return new Promise(function (resolve, reject) {
+      props.rcsJwtRefreshFn().then(function (response) {
+        var token = response.token;
+        setStatus(TokenFetchStatus.success);
+        setJwt(token);
+        resolve(response);
+      }, function () {
+        setStatus(TokenFetchStatus.failed);
+        reject();
+      });
+    });
+  };
+
+  var refreshToken = function refreshToken(setTokenFn) {
+    return getToken().then(function (response) {
+      var token = response.token;
+      setTokenFn(token);
+    });
+  };
+
+  var getConfig = function getConfig() {
+    var _config;
+
+    var config = (_config = {}, _defineProperty(_config, RceConfigKeys.useNewRce, props.useNewRce), _defineProperty(_config, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_config, RceConfigKeys.contextId, props.contextId), _defineProperty(_config, RceConfigKeys.contextType, props.contextType), _defineProperty(_config, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_config, RceConfigKeys.rcsJwt, jwt), _defineProperty(_config, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _defineProperty(_config, RceConfigKeys.rcsJwtFetchStatus, status), _config);
+    return config;
+  };
+
+  useEffect(function () {
+    getToken();
+  }, [props.useNewRce]);
+  if (!hasAllPropsForNewRce()) return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+  return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
+    value: getConfig()
+  }, props.children);
+};
+
+RceConfigProviderComponent.propTypes = {
+  children: PropTypes.node.isRequired,
+  useNewRce: PropTypes.bool.isRequired,
+  contextId: PropTypes.string,
+  contextType: PropTypes.string,
+  canvasUserId: PropTypes.string,
+  rcsHost: PropTypes.string,
+  rcsJwtRefreshFn: PropTypes.func
+};
+RceConfigProviderComponent.defaultProps = {
+  contextId: null,
+  contextType: null,
+  canvasUserId: null,
+  rcsHost: null,
+  rcsJwtRefreshFn: null
+};
+
+var mapStateToProps = function mapStateToProps() {
+  return {
+    useNewRce: isNewRCEEnabled()
+  };
+};
+
+var RceConfigProvider = connect(mapStateToProps)(RceConfigProviderComponent);
+export { RceConfigProvider };

package/lib/banks/components/SharingModal/presenter.js

@@ -260,9 +260,10 @@ var SharingModalPresenter = (_dec = (0, _uiThemeable.themeable)(_theme.default,
         });
         var removedNewEntity = newEntitiesIndex > -1;
         var newShares = removedNewEntity ? prevState.shares.delete(sharesIndex) : prevState.shares.setIn([sharesIndex, 'permission'], permission);
+        var newEntities = removedNewEntity ? prevState.newEntities.delete(newEntitiesIndex) : prevState.newEntities;
         return {
           shares: newShares,
-          newEntities: prevState.newEntities.delete(newEntitiesIndex),
+          newEntities: newEntities,
           entitiesWithChangedPermission: Object.assign({}, prevState.entitiesWithChangedPermission, (0, _defineProperty2.default)({}, id, permission))
         };
       }, _this.updateEntitiesCount);

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

@@ -55,6 +55,8 @@ var _index = _interopRequireDefault(require("../ConfirmationModal/index.js"));
 
 var _setupFormatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/util/setupFormatMessage"));
 
+var _RceConfigProvider = require("../../util/RceConfigProvider.js");
+
 var _dec, _class, _class2, _temp;
 
 var styles = {
@@ -160,13 +162,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(_uiI18n.ApplyLocale, {
+      }, /*#__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";
@@ -188,7 +190,7 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
     contextType: _propTypes.default.string.isRequired,
     canvasUserId: _propTypes.default.string.isRequired,
     rcsHost: _propTypes.default.string.isRequired,
-    tokenFetchFn: _propTypes.default.func.isRequired
+    rcsJwtRefreshFn: _propTypes.default.func.isRequired
   }),
   timeZone: _propTypes.default.string,
   translations: _propTypes.default.objectOf(_propTypes.default.shape({

package/lib/common/util/RceConfigProvider.js

@@ -0,0 +1,104 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RceConfigProvider = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactRedux = require("../../common/react-redux.js");
+
+var _rceChecker = _interopRequireDefault(require("./rceChecker.js"));
+
+var _quizCommon = require("@instructure/quiz-common");
+
+var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
+  var _useState = (0, _react.useState)(null),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      jwt = _useState2[0],
+      setJwt = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(_quizCommon.TokenFetchStatus.initial),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      status = _useState4[0],
+      setStatus = _useState4[1];
+
+  var hasAllPropsForNewRce = function hasAllPropsForNewRce() {
+    return props.useNewRce && !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn);
+  };
+
+  var getToken = function getToken() {
+    if (!hasAllPropsForNewRce()) return;
+    setStatus(_quizCommon.TokenFetchStatus.pending);
+    return new Promise(function (resolve, reject) {
+      props.rcsJwtRefreshFn().then(function (response) {
+        var token = response.token;
+        setStatus(_quizCommon.TokenFetchStatus.success);
+        setJwt(token);
+        resolve(response);
+      }, function () {
+        setStatus(_quizCommon.TokenFetchStatus.failed);
+        reject();
+      });
+    });
+  };
+
+  var refreshToken = function refreshToken(setTokenFn) {
+    return getToken().then(function (response) {
+      var token = response.token;
+      setTokenFn(token);
+    });
+  };
+
+  var getConfig = function getConfig() {
+    var _config;
+
+    var config = (_config = {}, (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.useNewRce, props.useNewRce), (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), (0, _defineProperty2.default)(_config, _quizCommon.RceConfigKeys.rcsJwtFetchStatus, status), _config);
+    return config;
+  };
+
+  (0, _react.useEffect)(function () {
+    getToken();
+  }, [props.useNewRce]);
+  if (!hasAllPropsForNewRce()) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
+  return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
+    value: getConfig()
+  }, props.children);
+};
+
+RceConfigProviderComponent.propTypes = {
+  children: _propTypes.default.node.isRequired,
+  useNewRce: _propTypes.default.bool.isRequired,
+  contextId: _propTypes.default.string,
+  contextType: _propTypes.default.string,
+  canvasUserId: _propTypes.default.string,
+  rcsHost: _propTypes.default.string,
+  rcsJwtRefreshFn: _propTypes.default.func
+};
+RceConfigProviderComponent.defaultProps = {
+  contextId: null,
+  contextType: null,
+  canvasUserId: null,
+  rcsHost: null,
+  rcsJwtRefreshFn: null
+};
+
+var mapStateToProps = function mapStateToProps() {
+  return {
+    useNewRce: (0, _rceChecker.default)()
+  };
+};
+
+var RceConfigProvider = (0, _reactRedux.connect)(mapStateToProps)(RceConfigProviderComponent);
+exports.RceConfigProvider = RceConfigProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.34.1-rc.1+7f6b13320",
+  "version": "17.34.1-rc.13+b5a0c9dad",
   "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.34.1-rc.1+7f6b13320",
-    "@instructure/quiz-i18n": "17.34.1-rc.1+7f6b13320",
-    "@instructure/quiz-interactions": "17.34.1-rc.1+7f6b13320",
-    "@instructure/quiz-number-input": "17.34.1-rc.1+7f6b13320",
-    "@instructure/quiz-rce": "17.34.1-rc.1+7f6b13320",
+    "@instructure/quiz-common": "17.34.1-rc.13+b5a0c9dad",
+    "@instructure/quiz-i18n": "17.34.1-rc.13+b5a0c9dad",
+    "@instructure/quiz-interactions": "17.34.1-rc.13+b5a0c9dad",
+    "@instructure/quiz-number-input": "17.34.1-rc.13+b5a0c9dad",
+    "@instructure/quiz-rce": "17.34.1-rc.13+b5a0c9dad",
     "@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.34.1-rc.1+7f6b13320",
+    "instructure-validations": "17.34.1-rc.13+b5a0c9dad",
     "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.34.1-rc.1+7f6b13320",
+    "@instructure/quiz-scripts": "17.34.1-rc.13+b5a0c9dad",
     "@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.34.1-rc.1+7f6b13320",
+    "quiz-presets": "17.34.1-rc.13+b5a0c9dad",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7f6b13320fe7b875959e48d8f92c1792541dd9e2"
+  "gitHead": "b5a0c9dad42511dacf8a79929313c4060c81f2ef"
 }