@instructure/quiz-core 17.46.0 → 17.46.1-rc.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/common/util/RceConfigProvider.js +8 -6
  2. package/es/common/util/rceChecker.js +4 -0
  3. package/lib/common/util/RceConfigProvider.js +7 -5
  4. package/lib/common/util/rceChecker.js +6 -0
  5. package/package.json +10 -10
package/es/common/util/RceConfigProvider.js CHANGED
@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
7
7
  import { connect } from "../../common/react-redux.js";
8
8
  import store from "../../reduxStore.js";
9
9
  import { setRCEError } from "../actions/rce.js";
10
- import { isNewRCEEnabled, isNewRCEAppsEnabled } from "./rceChecker.js";
10
+ import { isNewRCEEnabled, isNewRCEAppsEnabled, isRCE5RendererEnabled } from "./rceChecker.js";
11
11
  import { QuizzesSpinner as Spinner } from "../components/shared/spinner/Spinner.js";
12
12
  import { Card } from "../components/shared/Card/index.js";
13
13
  import { RceConfigContext, RceConfigKeys } from '@instructure/quiz-common';
@@ -100,12 +100,12 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
100
100
  };
101
101
 
102
102
  var getConfig = function getConfig() {
103
- var _ref2, _rendererEnhancement;
103
+ var _ref2, _rendererEnhancement, _featureFlags;
104
104
 
105
105
  return {
106
106
  rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, _defineProperty(_ref2, RceConfigKeys.useNewRce, props.useNewRce), _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,
107
107
  rendererEnhancement: (_rendererEnhancement = {}, _defineProperty(_rendererEnhancement, RceConfigKeys.handleError, handleErrorFunc), _defineProperty(_rendererEnhancement, RceConfigKeys.canvasOrigin, props.canvasOrigin), _rendererEnhancement),
108
- featureFlags: _defineProperty({}, RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled)
108
+ featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _defineProperty(_featureFlags, RceConfigKeys.rce5Renderer, props.rce5Renderer), _featureFlags)
109
109
  };
110
110
  };
111
111
 
@@ -124,7 +124,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
124
124
  while (1) {
125
125
  switch (_context2.prev = _context2.next) {
126
126
  case 0:
127
- if (props.useNewRce) {
127
+ if (!(!props.useNewRce && !props.rce5Renderer)) {
128
128
  _context2.next = 2;
129
129
  break;
130
130
  }
@@ -185,10 +185,10 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
185
185
  }
186
186
  }, _callee2, null, [[2, 21, 25, 28]]);
187
187
  }))();
188
- }, [props.useNewRce]);
188
+ }, [props.useNewRce, props.rce5Renderer]);
189
189
 
190
190
  if (props.loadedApiFeatures) {
191
- if (props.useNewRce) {
191
+ if (props.useNewRce || props.rce5Renderer) {
192
192
  if (!canvasConfigLoading) {
193
193
  return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
194
194
  value: getConfig()
@@ -204,6 +204,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
204
204
  RceConfigProviderComponent.propTypes = {
205
205
  children: PropTypes.node.isRequired,
206
206
  useNewRce: PropTypes.bool.isRequired,
207
+ rce5Renderer: PropTypes.bool.isRequired,
207
208
  isNewRCEAppsEnabled: PropTypes.bool,
208
209
  setRCEError: PropTypes.func.isRequired,
209
210
  contextId: PropTypes.string,
@@ -230,6 +231,7 @@ RceConfigProviderComponent.defaultProps = {
230
231
  var mapStateToProps = function mapStateToProps(state, ownProps) {
231
232
  return {
232
233
  useNewRce: isNewRCEEnabled(),
234
+ rce5Renderer: isRCE5RendererEnabled(),
233
235
  isNewRCEAppsEnabled: isNewRCEAppsEnabled(),
234
236
  loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
235
237
  };
package/es/common/util/rceChecker.js CHANGED
@@ -1,10 +1,14 @@
1
1
  import { featureOn } from "./featureCheck.js";
2
2
  var newRCEFeatureName = 'use_new_rce';
3
3
  var newRCEAppsFeatureName = 'use_new_rce_apps';
4
+ var rce5RendererFeatureName = 'rce5_renderer';
4
5
  export function isNewRCEEnabled() {
5
6
  return featureOn(newRCEFeatureName);
6
7
  }
7
8
  export function isNewRCEAppsEnabled() {
8
9
  return featureOn(newRCEAppsFeatureName);
9
10
  }
11
+ export function isRCE5RendererEnabled() {
12
+ return featureOn(rce5RendererFeatureName);
13
+ }
10
14
  export default isNewRCEEnabled;
package/lib/common/util/RceConfigProvider.js CHANGED
@@ -127,12 +127,12 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
127
127
  };
128
128
 
129
129
  var getConfig = function getConfig() {
130
- var _ref2, _rendererEnhancement;
130
+ var _ref2, _rendererEnhancement, _featureFlags;
131
131
 
132
132
  return {
133
133
  rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.useNewRce, props.useNewRce), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
134
134
  rendererEnhancement: (_rendererEnhancement = {}, (0, _defineProperty2.default)(_rendererEnhancement, _quizCommon.RceConfigKeys.handleError, handleErrorFunc), (0, _defineProperty2.default)(_rendererEnhancement, _quizCommon.RceConfigKeys.canvasOrigin, props.canvasOrigin), _rendererEnhancement),
135
- featureFlags: (0, _defineProperty2.default)({}, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled)
135
+ featureFlags: (_featureFlags = {}, (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.rce5Renderer, props.rce5Renderer), _featureFlags)
136
136
  };
137
137
  };
138
138
 
@@ -151,7 +151,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
151
151
  while (1) {
152
152
  switch (_context2.prev = _context2.next) {
153
153
  case 0:
154
- if (props.useNewRce) {
154
+ if (!(!props.useNewRce && !props.rce5Renderer)) {
155
155
  _context2.next = 2;
156
156
  break;
157
157
  }
@@ -212,10 +212,10 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
212
212
  }
213
213
  }, _callee2, null, [[2, 21, 25, 28]]);
214
214
  }))();
215
- }, [props.useNewRce]);
215
+ }, [props.useNewRce, props.rce5Renderer]);
216
216
 
217
217
  if (props.loadedApiFeatures) {
218
- if (props.useNewRce) {
218
+ if (props.useNewRce || props.rce5Renderer) {
219
219
  if (!canvasConfigLoading) {
220
220
  return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
221
221
  value: getConfig()
@@ -233,6 +233,7 @@ exports.RceConfigProviderComponent = RceConfigProviderComponent;
233
233
  RceConfigProviderComponent.propTypes = {
234
234
  children: _propTypes.default.node.isRequired,
235
235
  useNewRce: _propTypes.default.bool.isRequired,
236
+ rce5Renderer: _propTypes.default.bool.isRequired,
236
237
  isNewRCEAppsEnabled: _propTypes.default.bool,
237
238
  setRCEError: _propTypes.default.func.isRequired,
238
239
  contextId: _propTypes.default.string,
@@ -259,6 +260,7 @@ RceConfigProviderComponent.defaultProps = {
259
260
  var mapStateToProps = function mapStateToProps(state, ownProps) {
260
261
  return {
261
262
  useNewRce: (0, _rceChecker.isNewRCEEnabled)(),
263
+ rce5Renderer: (0, _rceChecker.isRCE5RendererEnabled)(),
262
264
  isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)(),
263
265
  loadedApiFeatures: state.getIn(['ui', 'loadedApiFeatures']) || ownProps.loadedApiFeatures
264
266
  };
package/lib/common/util/rceChecker.js CHANGED
@@ -5,12 +5,14 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.isNewRCEEnabled = isNewRCEEnabled;
7
7
  exports.isNewRCEAppsEnabled = isNewRCEAppsEnabled;
8
+ exports.isRCE5RendererEnabled = isRCE5RendererEnabled;
8
9
  exports.default = void 0;
9
10
 
10
11
  var _featureCheck = require("./featureCheck.js");
11
12
 
12
13
  var newRCEFeatureName = 'use_new_rce';
13
14
  var newRCEAppsFeatureName = 'use_new_rce_apps';
15
+ var rce5RendererFeatureName = 'rce5_renderer';
14
16
 
15
17
  function isNewRCEEnabled() {
16
18
  return (0, _featureCheck.featureOn)(newRCEFeatureName);
@@ -20,5 +22,9 @@ function isNewRCEAppsEnabled() {
20
22
  return (0, _featureCheck.featureOn)(newRCEAppsFeatureName);
21
23
  }
22
24
 
25
+ function isRCE5RendererEnabled() {
26
+ return (0, _featureCheck.featureOn)(rce5RendererFeatureName);
27
+ }
28
+
23
29
  var _default = isNewRCEEnabled;
24
30
  exports.default = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/quiz-core",
3
- "version": "17.46.0",
3
+ "version": "17.46.1-rc.1+ad2d239f3",
4
4
  "license": "MIT",
5
5
  "description": "The Quiz React SDK by Instructure Inc.",
6
6
  "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
41
41
  ],
42
42
  "dependencies": {
43
43
  "@instructure/outcomes-ui": "^2.1.2",
44
- "@instructure/quiz-common": "^17.46.0",
45
- "@instructure/quiz-i18n": "^17.46.0",
46
- "@instructure/quiz-interactions": "^17.46.0",
47
- "@instructure/quiz-number-input": "^17.46.0",
48
- "@instructure/quiz-rce": "^17.46.0",
44
+ "@instructure/quiz-common": "17.46.1-rc.1+ad2d239f3",
45
+ "@instructure/quiz-i18n": "17.46.1-rc.1+ad2d239f3",
46
+ "@instructure/quiz-interactions": "17.46.1-rc.1+ad2d239f3",
47
+ "@instructure/quiz-number-input": "17.46.1-rc.1+ad2d239f3",
48
+ "@instructure/quiz-rce": "17.46.1-rc.1+ad2d239f3",
49
49
  "@instructure/ui-a11y-content": "^7.20.0",
50
50
  "@instructure/ui-alerts": "^7.20.0",
51
51
  "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
106
106
  "eventemitter3": "^3.1.0",
107
107
  "humps": "^2.0.0",
108
108
  "immutable": "^3.8.1",
109
- "instructure-validations": "^17.46.0",
109
+ "instructure-validations": "17.46.1-rc.1+ad2d239f3",
110
110
  "ipaddr.js": "^1.5.4",
111
111
  "isomorphic-fetch": "^2.2.0",
112
112
  "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
137
137
  "uuid": "^3.2.1"
138
138
  },
139
139
  "devDependencies": {
140
- "@instructure/quiz-scripts": "^17.46.0",
140
+ "@instructure/quiz-scripts": "17.46.0",
141
141
  "@instructure/ui-axe-check": "^7.20.0",
142
142
  "@instructure/ui-babel-preset": "^7.20.0",
143
143
  "@instructure/ui-karma-config": "^7.20.0",
@@ -156,7 +156,7 @@
156
156
  "intl": "^1.2.4",
157
157
  "jquery": "^2.2.3",
158
158
  "most-subject": "^5.3.0",
159
- "quiz-presets": "^17.46.0",
159
+ "quiz-presets": "17.46.1-rc.1+ad2d239f3",
160
160
  "react": "^16.8.6",
161
161
  "react-addons-test-utils": "^15.6.2",
162
162
  "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
172
172
  "publishConfig": {
173
173
  "access": "public"
174
174
  },
175
- "gitHead": "8df1f2a9ae06d50e029393737e47866f7f1821ee"
175
+ "gitHead": "ad2d239f3141db1de35e8da95f22fe91881f4fd6"
176
176
  }