@instructure/quiz-core 17.47.1-rc.0 → 17.47.1-rc.2
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.
|
@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
|
|
|
7
7
|
import { connect } from "../../react-redux.js";
|
|
8
8
|
import store from "../../../reduxStore.js";
|
|
9
9
|
import { setRCEError } from "../../actions/rce.js";
|
|
10
|
-
import { isNewRCEEnabled, isNewRCEAppsEnabled,
|
|
10
|
+
import { isNewRCEEnabled, isNewRCEAppsEnabled, isNewRCERendererEnabled } from "../../util/rceChecker.js";
|
|
11
11
|
import { QuizzesSpinner as Spinner } from "../shared/spinner/Spinner.js";
|
|
12
12
|
import { Card } from "../shared/Card/index.js";
|
|
13
13
|
import { RceConfigContext, RceConfigKeys } from '@instructure/quiz-common';
|
|
@@ -41,7 +41,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
|
|
|
41
41
|
};
|
|
42
42
|
|
|
43
43
|
var isRce5Disabled = function isRce5Disabled() {
|
|
44
|
-
return !props.isNewRCEEnabled && !props.
|
|
44
|
+
return !props.isNewRCEEnabled && !props.isNewRCERendererEnabled;
|
|
45
45
|
};
|
|
46
46
|
|
|
47
47
|
var refreshToken = /*#__PURE__*/function () {
|
|
@@ -131,7 +131,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
|
|
|
131
131
|
var _featureFlags, _ref2;
|
|
132
132
|
|
|
133
133
|
return {
|
|
134
|
-
featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), _defineProperty(_featureFlags, RceConfigKeys.
|
|
134
|
+
featureFlags: (_featureFlags = {}, _defineProperty(_featureFlags, RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), _defineProperty(_featureFlags, RceConfigKeys.isNewRCERendererEnabled, props.isNewRCERendererEnabled), _defineProperty(_featureFlags, RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _featureFlags),
|
|
135
135
|
rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, _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,
|
|
136
136
|
rendererEnhancement: _defineProperty({}, RceConfigKeys.canvasOrigin, props.canvasOrigin)
|
|
137
137
|
};
|
|
@@ -205,7 +205,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
|
|
|
205
205
|
}
|
|
206
206
|
}, _callee2, null, [[2, 21, 25, 28]]);
|
|
207
207
|
}))();
|
|
208
|
-
}, [props.isNewRCEEnabled, props.
|
|
208
|
+
}, [props.isNewRCEEnabled, props.isNewRCERendererEnabled]);
|
|
209
209
|
|
|
210
210
|
if (isRce5Disabled()) {
|
|
211
211
|
return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
|
|
@@ -222,7 +222,7 @@ export var RceConfigProviderComponent = function RceConfigProviderComponent(prop
|
|
|
222
222
|
RceConfigProviderComponent.propTypes = {
|
|
223
223
|
children: PropTypes.node.isRequired,
|
|
224
224
|
isNewRCEEnabled: PropTypes.bool.isRequired,
|
|
225
|
-
|
|
225
|
+
isNewRCERendererEnabled: PropTypes.bool.isRequired,
|
|
226
226
|
isNewRCEAppsEnabled: PropTypes.bool,
|
|
227
227
|
setEventToQuizLog: PropTypes.func.isRequired,
|
|
228
228
|
contextId: PropTypes.string,
|
|
@@ -241,13 +241,15 @@ RceConfigProviderComponent.defaultProps = {
|
|
|
241
241
|
rcsJwt: null,
|
|
242
242
|
rcsJwtRefreshFn: null,
|
|
243
243
|
canvasOrigin: null,
|
|
244
|
+
isNewRCEEnabled: false,
|
|
245
|
+
isNewRCERendererEnabled: false,
|
|
244
246
|
isNewRCEAppsEnabled: false
|
|
245
247
|
};
|
|
246
248
|
|
|
247
249
|
var mapStateToProps = function mapStateToProps() {
|
|
248
250
|
return {
|
|
249
251
|
isNewRCEEnabled: isNewRCEEnabled(),
|
|
250
|
-
|
|
252
|
+
isNewRCERendererEnabled: isNewRCERendererEnabled(),
|
|
251
253
|
isNewRCEAppsEnabled: isNewRCEAppsEnabled()
|
|
252
254
|
};
|
|
253
255
|
};
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { featureOn } from "./featureCheck.js";
|
|
2
2
|
var newRCEFeatureName = 'use_new_rce';
|
|
3
3
|
var newRCEAppsFeatureName = 'rce5_apps';
|
|
4
|
-
var
|
|
4
|
+
var newRCERendererFeatureName = 'rce5_renderer';
|
|
5
5
|
export function isNewRCEEnabled() {
|
|
6
6
|
return featureOn(newRCEFeatureName);
|
|
7
7
|
}
|
|
8
8
|
export function isNewRCEAppsEnabled() {
|
|
9
9
|
return featureOn(newRCEAppsFeatureName);
|
|
10
10
|
}
|
|
11
|
-
export function
|
|
12
|
-
return featureOn(
|
|
11
|
+
export function isNewRCERendererEnabled() {
|
|
12
|
+
return featureOn(newRCERendererFeatureName);
|
|
13
13
|
}
|
|
14
14
|
export default isNewRCEEnabled;
|
|
@@ -68,7 +68,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
|
68
68
|
};
|
|
69
69
|
|
|
70
70
|
var isRce5Disabled = function isRce5Disabled() {
|
|
71
|
-
return !props.isNewRCEEnabled && !props.
|
|
71
|
+
return !props.isNewRCEEnabled && !props.isNewRCERendererEnabled;
|
|
72
72
|
};
|
|
73
73
|
|
|
74
74
|
var refreshToken = /*#__PURE__*/function () {
|
|
@@ -158,7 +158,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
|
158
158
|
var _featureFlags, _ref2;
|
|
159
159
|
|
|
160
160
|
return {
|
|
161
|
-
featureFlags: (_featureFlags = {}, (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.
|
|
161
|
+
featureFlags: (_featureFlags = {}, (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEEnabled, props.isNewRCEEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCERendererEnabled, props.isNewRCERendererEnabled), (0, _defineProperty2.default)(_featureFlags, _quizCommon.RceConfigKeys.isNewRCEAppsEnabled, props.isNewRCEAppsEnabled), _featureFlags),
|
|
162
162
|
rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, (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,
|
|
163
163
|
rendererEnhancement: (0, _defineProperty2.default)({}, _quizCommon.RceConfigKeys.canvasOrigin, props.canvasOrigin)
|
|
164
164
|
};
|
|
@@ -232,7 +232,7 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
|
232
232
|
}
|
|
233
233
|
}, _callee2, null, [[2, 21, 25, 28]]);
|
|
234
234
|
}))();
|
|
235
|
-
}, [props.isNewRCEEnabled, props.
|
|
235
|
+
}, [props.isNewRCEEnabled, props.isNewRCERendererEnabled]);
|
|
236
236
|
|
|
237
237
|
if (isRce5Disabled()) {
|
|
238
238
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
|
|
@@ -251,7 +251,7 @@ exports.RceConfigProviderComponent = RceConfigProviderComponent;
|
|
|
251
251
|
RceConfigProviderComponent.propTypes = {
|
|
252
252
|
children: _propTypes.default.node.isRequired,
|
|
253
253
|
isNewRCEEnabled: _propTypes.default.bool.isRequired,
|
|
254
|
-
|
|
254
|
+
isNewRCERendererEnabled: _propTypes.default.bool.isRequired,
|
|
255
255
|
isNewRCEAppsEnabled: _propTypes.default.bool,
|
|
256
256
|
setEventToQuizLog: _propTypes.default.func.isRequired,
|
|
257
257
|
contextId: _propTypes.default.string,
|
|
@@ -270,13 +270,15 @@ RceConfigProviderComponent.defaultProps = {
|
|
|
270
270
|
rcsJwt: null,
|
|
271
271
|
rcsJwtRefreshFn: null,
|
|
272
272
|
canvasOrigin: null,
|
|
273
|
+
isNewRCEEnabled: false,
|
|
274
|
+
isNewRCERendererEnabled: false,
|
|
273
275
|
isNewRCEAppsEnabled: false
|
|
274
276
|
};
|
|
275
277
|
|
|
276
278
|
var mapStateToProps = function mapStateToProps() {
|
|
277
279
|
return {
|
|
278
280
|
isNewRCEEnabled: (0, _rceChecker.isNewRCEEnabled)(),
|
|
279
|
-
|
|
281
|
+
isNewRCERendererEnabled: (0, _rceChecker.isNewRCERendererEnabled)(),
|
|
280
282
|
isNewRCEAppsEnabled: (0, _rceChecker.isNewRCEAppsEnabled)()
|
|
281
283
|
};
|
|
282
284
|
};
|
|
@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.isNewRCEEnabled = isNewRCEEnabled;
|
|
7
7
|
exports.isNewRCEAppsEnabled = isNewRCEAppsEnabled;
|
|
8
|
-
exports.
|
|
8
|
+
exports.isNewRCERendererEnabled = isNewRCERendererEnabled;
|
|
9
9
|
exports.default = void 0;
|
|
10
10
|
|
|
11
11
|
var _featureCheck = require("./featureCheck.js");
|
|
12
12
|
|
|
13
13
|
var newRCEFeatureName = 'use_new_rce';
|
|
14
14
|
var newRCEAppsFeatureName = 'rce5_apps';
|
|
15
|
-
var
|
|
15
|
+
var newRCERendererFeatureName = 'rce5_renderer';
|
|
16
16
|
|
|
17
17
|
function isNewRCEEnabled() {
|
|
18
18
|
return (0, _featureCheck.featureOn)(newRCEFeatureName);
|
|
@@ -22,8 +22,8 @@ function isNewRCEAppsEnabled() {
|
|
|
22
22
|
return (0, _featureCheck.featureOn)(newRCEAppsFeatureName);
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
function
|
|
26
|
-
return (0, _featureCheck.featureOn)(
|
|
25
|
+
function isNewRCERendererEnabled() {
|
|
26
|
+
return (0, _featureCheck.featureOn)(newRCERendererFeatureName);
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
var _default = isNewRCEEnabled;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/quiz-core",
|
|
3
|
-
"version": "17.47.1-rc.
|
|
3
|
+
"version": "17.47.1-rc.2+4969154db",
|
|
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.47.1-rc.
|
|
45
|
-
"@instructure/quiz-i18n": "17.47.1-rc.
|
|
46
|
-
"@instructure/quiz-interactions": "17.47.1-rc.
|
|
47
|
-
"@instructure/quiz-number-input": "17.47.1-rc.
|
|
48
|
-
"@instructure/quiz-rce": "17.47.1-rc.
|
|
44
|
+
"@instructure/quiz-common": "17.47.1-rc.2+4969154db",
|
|
45
|
+
"@instructure/quiz-i18n": "17.47.1-rc.2+4969154db",
|
|
46
|
+
"@instructure/quiz-interactions": "17.47.1-rc.2+4969154db",
|
|
47
|
+
"@instructure/quiz-number-input": "17.47.1-rc.2+4969154db",
|
|
48
|
+
"@instructure/quiz-rce": "17.47.1-rc.2+4969154db",
|
|
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.47.1-rc.
|
|
109
|
+
"instructure-validations": "17.47.1-rc.2+4969154db",
|
|
110
110
|
"ipaddr.js": "^1.5.4",
|
|
111
111
|
"isomorphic-fetch": "^2.2.0",
|
|
112
112
|
"isuuid": "^0.1.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.47.1-rc.
|
|
159
|
+
"quiz-presets": "17.47.1-rc.2+4969154db",
|
|
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": "
|
|
175
|
+
"gitHead": "4969154dbaf081f00f3a5c871d62d6599509b9df"
|
|
176
176
|
}
|