@instructure/quiz-core 17.38.1-rc.2 → 17.38.1-rc.4
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.
|
@@ -162,7 +162,8 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
|
|
|
162
162
|
canvasUserId: PropTypes.string.isRequired,
|
|
163
163
|
rcsHost: PropTypes.string.isRequired,
|
|
164
164
|
rcsJwt: PropTypes.string.isRequired,
|
|
165
|
-
rcsJwtRefreshFn: PropTypes.func.isRequired
|
|
165
|
+
rcsJwtRefreshFn: PropTypes.func.isRequired,
|
|
166
|
+
documentServiceHost: PropTypes.string.isRequired
|
|
166
167
|
}),
|
|
167
168
|
timeZone: PropTypes.string,
|
|
168
169
|
translations: PropTypes.objectOf(PropTypes.shape({
|
|
@@ -3,8 +3,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
|
3
3
|
import React, { useState } from 'react';
|
|
4
4
|
import PropTypes from 'prop-types';
|
|
5
5
|
import { connect } from "../../common/react-redux.js";
|
|
6
|
+
import store from "../../reduxStore.js";
|
|
6
7
|
import isNewRCEEnabled from "./rceChecker.js";
|
|
7
8
|
import { RceConfigContext, RceConfigKeys } from '@instructure/quiz-common';
|
|
9
|
+
import { addError } from "../actions/alerts.js";
|
|
8
10
|
|
|
9
11
|
var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
10
12
|
var _useState = useState(props.rcsJwt),
|
|
@@ -12,12 +14,16 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
|
12
14
|
jwt = _useState2[0],
|
|
13
15
|
setJwt = _useState2[1];
|
|
14
16
|
|
|
15
|
-
var
|
|
16
|
-
return props.useNewRce
|
|
17
|
+
var isNewRceEnabled = function isNewRceEnabled() {
|
|
18
|
+
return props.useNewRce;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
var hasAllPropsForRcs = function hasAllPropsForRcs() {
|
|
22
|
+
return !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn && props.rcsJwt);
|
|
17
23
|
};
|
|
18
24
|
|
|
19
25
|
var getToken = function getToken() {
|
|
20
|
-
if (!
|
|
26
|
+
if (!hasAllPropsForRcs()) return;
|
|
21
27
|
return new Promise(function (resolve, reject) {
|
|
22
28
|
props.rcsJwtRefreshFn().then(function (response) {
|
|
23
29
|
var token = response.token;
|
|
@@ -36,14 +42,20 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
|
36
42
|
});
|
|
37
43
|
};
|
|
38
44
|
|
|
45
|
+
var handleErrorFunc = function handleErrorFunc(errorMessage) {
|
|
46
|
+
store.dispatch(addError(errorMessage));
|
|
47
|
+
};
|
|
48
|
+
|
|
39
49
|
var getConfig = function getConfig() {
|
|
40
|
-
var
|
|
50
|
+
var _ref, _rendererEnhancement;
|
|
41
51
|
|
|
42
|
-
|
|
43
|
-
|
|
52
|
+
return {
|
|
53
|
+
rcs: hasAllPropsForRcs() ? (_ref = {}, _defineProperty(_ref, RceConfigKeys.useNewRce, props.useNewRce), _defineProperty(_ref, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_ref, RceConfigKeys.contextId, props.contextId), _defineProperty(_ref, RceConfigKeys.contextType, props.contextType), _defineProperty(_ref, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_ref, RceConfigKeys.rcsJwt, jwt), _defineProperty(_ref, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _ref) : null,
|
|
54
|
+
rendererEnhancement: (_rendererEnhancement = {}, _defineProperty(_rendererEnhancement, RceConfigKeys.handleError, handleErrorFunc), _defineProperty(_rendererEnhancement, RceConfigKeys.documentServiceHost, props.documentServiceHost), _rendererEnhancement)
|
|
55
|
+
};
|
|
44
56
|
};
|
|
45
57
|
|
|
46
|
-
if (!
|
|
58
|
+
if (!isNewRceEnabled()) return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
|
|
47
59
|
return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
|
|
48
60
|
value: getConfig()
|
|
49
61
|
}, props.children);
|
|
@@ -57,7 +69,8 @@ RceConfigProviderComponent.propTypes = {
|
|
|
57
69
|
canvasUserId: PropTypes.string,
|
|
58
70
|
rcsHost: PropTypes.string,
|
|
59
71
|
rcsJwt: PropTypes.string,
|
|
60
|
-
rcsJwtRefreshFn: PropTypes.func
|
|
72
|
+
rcsJwtRefreshFn: PropTypes.func,
|
|
73
|
+
documentServiceHost: PropTypes.string
|
|
61
74
|
};
|
|
62
75
|
RceConfigProviderComponent.defaultProps = {
|
|
63
76
|
contextId: null,
|
|
@@ -65,7 +78,8 @@ RceConfigProviderComponent.defaultProps = {
|
|
|
65
78
|
canvasUserId: null,
|
|
66
79
|
rcsHost: null,
|
|
67
80
|
rcsJwt: null,
|
|
68
|
-
rcsJwtRefreshFn: null
|
|
81
|
+
rcsJwtRefreshFn: null,
|
|
82
|
+
documentServiceHost: null
|
|
69
83
|
};
|
|
70
84
|
|
|
71
85
|
var mapStateToProps = function mapStateToProps() {
|
|
@@ -191,7 +191,8 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
|
|
|
191
191
|
canvasUserId: _propTypes.default.string.isRequired,
|
|
192
192
|
rcsHost: _propTypes.default.string.isRequired,
|
|
193
193
|
rcsJwt: _propTypes.default.string.isRequired,
|
|
194
|
-
rcsJwtRefreshFn: _propTypes.default.func.isRequired
|
|
194
|
+
rcsJwtRefreshFn: _propTypes.default.func.isRequired,
|
|
195
|
+
documentServiceHost: _propTypes.default.string.isRequired
|
|
195
196
|
}),
|
|
196
197
|
timeZone: _propTypes.default.string,
|
|
197
198
|
translations: _propTypes.default.objectOf(_propTypes.default.shape({
|
|
@@ -19,22 +19,30 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
19
19
|
|
|
20
20
|
var _reactRedux = require("../../common/react-redux.js");
|
|
21
21
|
|
|
22
|
+
var _reduxStore = _interopRequireDefault(require("../../reduxStore.js"));
|
|
23
|
+
|
|
22
24
|
var _rceChecker = _interopRequireDefault(require("./rceChecker.js"));
|
|
23
25
|
|
|
24
26
|
var _quizCommon = require("@instructure/quiz-common");
|
|
25
27
|
|
|
28
|
+
var _alerts = require("../actions/alerts.js");
|
|
29
|
+
|
|
26
30
|
var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
27
31
|
var _useState = (0, _react.useState)(props.rcsJwt),
|
|
28
32
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
29
33
|
jwt = _useState2[0],
|
|
30
34
|
setJwt = _useState2[1];
|
|
31
35
|
|
|
32
|
-
var
|
|
33
|
-
return props.useNewRce
|
|
36
|
+
var isNewRceEnabled = function isNewRceEnabled() {
|
|
37
|
+
return props.useNewRce;
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
var hasAllPropsForRcs = function hasAllPropsForRcs() {
|
|
41
|
+
return !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn && props.rcsJwt);
|
|
34
42
|
};
|
|
35
43
|
|
|
36
44
|
var getToken = function getToken() {
|
|
37
|
-
if (!
|
|
45
|
+
if (!hasAllPropsForRcs()) return;
|
|
38
46
|
return new Promise(function (resolve, reject) {
|
|
39
47
|
props.rcsJwtRefreshFn().then(function (response) {
|
|
40
48
|
var token = response.token;
|
|
@@ -53,14 +61,20 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
|
|
|
53
61
|
});
|
|
54
62
|
};
|
|
55
63
|
|
|
64
|
+
var handleErrorFunc = function handleErrorFunc(errorMessage) {
|
|
65
|
+
_reduxStore.default.dispatch((0, _alerts.addError)(errorMessage));
|
|
66
|
+
};
|
|
67
|
+
|
|
56
68
|
var getConfig = function getConfig() {
|
|
57
|
-
var
|
|
69
|
+
var _ref, _rendererEnhancement;
|
|
58
70
|
|
|
59
|
-
|
|
60
|
-
|
|
71
|
+
return {
|
|
72
|
+
rcs: hasAllPropsForRcs() ? (_ref = {}, (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.useNewRce, props.useNewRce), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), _ref) : null,
|
|
73
|
+
rendererEnhancement: (_rendererEnhancement = {}, (0, _defineProperty2.default)(_rendererEnhancement, _quizCommon.RceConfigKeys.handleError, handleErrorFunc), (0, _defineProperty2.default)(_rendererEnhancement, _quizCommon.RceConfigKeys.documentServiceHost, props.documentServiceHost), _rendererEnhancement)
|
|
74
|
+
};
|
|
61
75
|
};
|
|
62
76
|
|
|
63
|
-
if (!
|
|
77
|
+
if (!isNewRceEnabled()) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
|
|
64
78
|
return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
|
|
65
79
|
value: getConfig()
|
|
66
80
|
}, props.children);
|
|
@@ -74,7 +88,8 @@ RceConfigProviderComponent.propTypes = {
|
|
|
74
88
|
canvasUserId: _propTypes.default.string,
|
|
75
89
|
rcsHost: _propTypes.default.string,
|
|
76
90
|
rcsJwt: _propTypes.default.string,
|
|
77
|
-
rcsJwtRefreshFn: _propTypes.default.func
|
|
91
|
+
rcsJwtRefreshFn: _propTypes.default.func,
|
|
92
|
+
documentServiceHost: _propTypes.default.string
|
|
78
93
|
};
|
|
79
94
|
RceConfigProviderComponent.defaultProps = {
|
|
80
95
|
contextId: null,
|
|
@@ -82,7 +97,8 @@ RceConfigProviderComponent.defaultProps = {
|
|
|
82
97
|
canvasUserId: null,
|
|
83
98
|
rcsHost: null,
|
|
84
99
|
rcsJwt: null,
|
|
85
|
-
rcsJwtRefreshFn: null
|
|
100
|
+
rcsJwtRefreshFn: null,
|
|
101
|
+
documentServiceHost: null
|
|
86
102
|
};
|
|
87
103
|
|
|
88
104
|
var mapStateToProps = function mapStateToProps() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/quiz-core",
|
|
3
|
-
"version": "17.38.1-rc.
|
|
3
|
+
"version": "17.38.1-rc.4+d942652fa",
|
|
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.38.1-rc.
|
|
45
|
-
"@instructure/quiz-i18n": "17.38.1-rc.
|
|
46
|
-
"@instructure/quiz-interactions": "17.38.1-rc.
|
|
47
|
-
"@instructure/quiz-number-input": "17.38.1-rc.
|
|
48
|
-
"@instructure/quiz-rce": "17.38.1-rc.
|
|
44
|
+
"@instructure/quiz-common": "17.38.1-rc.4+d942652fa",
|
|
45
|
+
"@instructure/quiz-i18n": "17.38.1-rc.4+d942652fa",
|
|
46
|
+
"@instructure/quiz-interactions": "17.38.1-rc.4+d942652fa",
|
|
47
|
+
"@instructure/quiz-number-input": "17.38.1-rc.4+d942652fa",
|
|
48
|
+
"@instructure/quiz-rce": "17.38.1-rc.4+d942652fa",
|
|
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.38.1-rc.
|
|
109
|
+
"instructure-validations": "17.38.1-rc.4+d942652fa",
|
|
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.38.1-rc.
|
|
140
|
+
"@instructure/quiz-scripts": "17.38.1-rc.4+d942652fa",
|
|
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.38.1-rc.
|
|
159
|
+
"quiz-presets": "17.38.1-rc.4+d942652fa",
|
|
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": "d942652fa71a0d69ac61e49773cbaf5fb0968f67"
|
|
176
176
|
}
|