@instructure/quiz-core 17.51.1-rc.0 → 17.51.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.
- package/es/common/actions/alerts.js +7 -0
- package/es/common/components/RceConfigProvider/presenter.js +12 -0
- package/es/common/components/RceConfigProvider/rceConfigErrorHandler.js +2 -2
- package/es/common/components/alerts/presenter.js +25 -0
- package/es/common/middleware/alertTimerMiddleware.js +1 -1
- package/es/messages/postMessageService.js +54 -0
- package/es/messages/subjectHandlers/lti.frameResize.js +3 -0
- package/lib/common/actions/alerts.js +9 -0
- package/lib/common/components/RceConfigProvider/presenter.js +13 -0
- package/lib/common/components/RceConfigProvider/rceConfigErrorHandler.js +1 -1
- package/lib/common/components/alerts/presenter.js +25 -0
- package/lib/common/middleware/alertTimerMiddleware.js +1 -1
- package/lib/messages/postMessageService.js +64 -0
- package/lib/messages/subjectHandlers/lti.frameResize.js +11 -0
- package/package.json +9 -9
|
@@ -27,6 +27,13 @@ export function addError(message, removeIn, guid) {
|
|
|
27
27
|
guid: guid
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
|
+
export function addStickyError(message, guid) {
|
|
31
|
+
return addAlert({
|
|
32
|
+
message: message,
|
|
33
|
+
variant: 'stickyerror',
|
|
34
|
+
guid: guid
|
|
35
|
+
});
|
|
36
|
+
}
|
|
30
37
|
export function addSuccess(message) {
|
|
31
38
|
return addAlert({
|
|
32
39
|
message: message,
|
|
@@ -11,6 +11,7 @@ import { mapParamsToRceConfigContext } from "./rceConfigMapper.js";
|
|
|
11
11
|
import { quizLogMsgErrorDuringTaking, quizLogMsgFailedConfigFetch, quizLogMsgInvalidParams } from "./rceConfigErrorMessages.js";
|
|
12
12
|
import { handleError, setEventToQuizLog } from "./rceConfigErrorHandler.js";
|
|
13
13
|
import { fetchRceConfig } from "./rceConfigFetcher.js";
|
|
14
|
+
import PostMessageService from "../../../messages/postMessageService.js";
|
|
14
15
|
|
|
15
16
|
var decorateRcsJwtRefreshFn = function decorateRcsJwtRefreshFn(rcsJwtRefreshFn, jwt, setJwt) {
|
|
16
17
|
return /*#__PURE__*/function () {
|
|
@@ -163,6 +164,17 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(_ref2) {
|
|
|
163
164
|
}, _callee2, null, [[2, 13, 17, 20]]);
|
|
164
165
|
}))();
|
|
165
166
|
}, [isNewRCEEnabled, isNewRCERendererEnabled]);
|
|
167
|
+
useEffect(function () {
|
|
168
|
+
if (isRce5Disabled(flags)) {
|
|
169
|
+
return;
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
var postMessageService = new PostMessageService();
|
|
173
|
+
postMessageService.configurePostMessageListener();
|
|
174
|
+
return function () {
|
|
175
|
+
postMessageService.cleanupPostMessageListener();
|
|
176
|
+
};
|
|
177
|
+
}, [isNewRCEEnabled, isNewRCERendererEnabled]);
|
|
166
178
|
|
|
167
179
|
if (isRce5Disabled(flags)) {
|
|
168
180
|
return children;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import store from "../../../reduxStore.js";
|
|
2
|
-
import {
|
|
2
|
+
import { addStickyError } from "../../actions/alerts.js";
|
|
3
3
|
import { setRCEError } from "../../actions/rce.js";
|
|
4
4
|
import { isQuizBuilding, isQuizTaking } from "../../util/windowChecks.js";
|
|
5
5
|
import { userAlertMsgBuilding, userAlertMsgTaking } from "./rceConfigErrorMessages.js";
|
|
6
6
|
|
|
7
7
|
var alertTheUser = function alertTheUser(message) {
|
|
8
|
-
store.dispatch(
|
|
8
|
+
store.dispatch(addStickyError(message));
|
|
9
9
|
};
|
|
10
10
|
|
|
11
11
|
var getAlertMessage = function getAlertMessage() {
|
|
@@ -45,6 +45,18 @@ export var Alerts = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
|
|
|
45
45
|
return _this.renderScreenreaderAlert(alert);
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
+
if (alert.variant === 'stickyerror') {
|
|
49
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
50
|
+
key: alert.uuid,
|
|
51
|
+
className: styles.alertHolder
|
|
52
|
+
}, /*#__PURE__*/React.createElement(Alert, {
|
|
53
|
+
variant: "error",
|
|
54
|
+
onDismiss: closeAlert,
|
|
55
|
+
closeButtonLabel: t('Close'),
|
|
56
|
+
transition: "none"
|
|
57
|
+
}, alert.message));
|
|
58
|
+
}
|
|
59
|
+
|
|
48
60
|
return /*#__PURE__*/React.createElement("div", {
|
|
49
61
|
key: alert.uuid,
|
|
50
62
|
className: styles.alertHolder
|
|
@@ -74,6 +86,19 @@ export var Alerts = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
|
|
|
74
86
|
}, {
|
|
75
87
|
key: "render",
|
|
76
88
|
value: function render() {
|
|
89
|
+
var hasStickyErrors = this.props.alerts.toJS().find(function (alert) {
|
|
90
|
+
return alert.variant === 'stickyerror';
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
if (hasStickyErrors) {
|
|
94
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
95
|
+
className: styles.alerts,
|
|
96
|
+
style: {
|
|
97
|
+
zIndex: '99999'
|
|
98
|
+
}
|
|
99
|
+
}, this.renderAlerts());
|
|
100
|
+
}
|
|
101
|
+
|
|
77
102
|
return /*#__PURE__*/React.createElement("div", {
|
|
78
103
|
className: styles.alerts
|
|
79
104
|
}, this.renderAlerts());
|
|
@@ -6,7 +6,7 @@ var alertTimerMiddleware = function alertTimerMiddleware(store) {
|
|
|
6
6
|
return function (action) {
|
|
7
7
|
var delay = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : setTimeout;
|
|
8
8
|
|
|
9
|
-
if (action && action.type === ADD_ALERT && action.payload.removeIn) {
|
|
9
|
+
if (action && action.type === ADD_ALERT && action.payload.removeIn && action.payload.variant != 'stickyerror') {
|
|
10
10
|
var remove = function remove() {
|
|
11
11
|
store.dispatch(removeAlert(action.payload.uuid));
|
|
12
12
|
}; // injected for testing
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import handleFrameResize from './subjectHandlers/lti.frameResize';
|
|
4
|
+
|
|
5
|
+
var PostMessageService = function PostMessageService() {
|
|
6
|
+
var _this = this;
|
|
7
|
+
|
|
8
|
+
_classCallCheck(this, PostMessageService);
|
|
9
|
+
|
|
10
|
+
this.SUBJECT_ALLOW_LIST = ['lti.frameResize'];
|
|
11
|
+
|
|
12
|
+
this.subjectNotAllowed = function (subject) {
|
|
13
|
+
return !_this.SUBJECT_ALLOW_LIST.includes(subject);
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
this.messageHandlerDispatcher = function (event) {
|
|
17
|
+
if (_this.subjectNotAllowed(event.data.subject)) {
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
switch (event.data.subject) {
|
|
22
|
+
case 'lti.frameResize':
|
|
23
|
+
return handleFrameResize(event);
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
this.configurePostMessageListener = function () {
|
|
28
|
+
window.addEventListener('message', _this.messageHandlerDispatcher);
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
this.cleanupPostMessageListener = function () {
|
|
32
|
+
window.removeEventListener('message', _this.messageHandlerDispatcher);
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
this.sendResponse = function (subject, data, sourceWindow) {
|
|
36
|
+
sourceWindow.postMessage(_objectSpread({
|
|
37
|
+
subject: subject + '.response'
|
|
38
|
+
}, data));
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
this.sendSuccessPostMessageResponse = function (subject, message, sourceWindow) {
|
|
42
|
+
_this.sendResponse(subject, {
|
|
43
|
+
message: message
|
|
44
|
+
}, sourceWindow);
|
|
45
|
+
};
|
|
46
|
+
|
|
47
|
+
this.sendErrorPostMessageResponse = function (subject, error, sourceWindow) {
|
|
48
|
+
_this.sendResponse(subject, {
|
|
49
|
+
error: error
|
|
50
|
+
}, sourceWindow);
|
|
51
|
+
};
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
export { PostMessageService as default };
|
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.addError = addError;
|
|
7
|
+
exports.addStickyError = addStickyError;
|
|
7
8
|
exports.addSuccess = addSuccess;
|
|
8
9
|
exports.addInfo = addInfo;
|
|
9
10
|
exports.screenreaderNotification = screenreaderNotification;
|
|
@@ -40,6 +41,14 @@ function addError(message, removeIn, guid) {
|
|
|
40
41
|
});
|
|
41
42
|
}
|
|
42
43
|
|
|
44
|
+
function addStickyError(message, guid) {
|
|
45
|
+
return addAlert({
|
|
46
|
+
message: message,
|
|
47
|
+
variant: 'stickyerror',
|
|
48
|
+
guid: guid
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
|
|
43
52
|
function addSuccess(message) {
|
|
44
53
|
return addAlert({
|
|
45
54
|
message: message,
|
|
@@ -35,6 +35,8 @@ var _rceConfigErrorHandler = require("./rceConfigErrorHandler.js");
|
|
|
35
35
|
|
|
36
36
|
var _rceConfigFetcher = require("./rceConfigFetcher.js");
|
|
37
37
|
|
|
38
|
+
var _postMessageService = _interopRequireDefault(require("../../../messages/postMessageService.js"));
|
|
39
|
+
|
|
38
40
|
var decorateRcsJwtRefreshFn = function decorateRcsJwtRefreshFn(rcsJwtRefreshFn, jwt, setJwt) {
|
|
39
41
|
return /*#__PURE__*/function () {
|
|
40
42
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(setTokenFn, questionStem) {
|
|
@@ -186,6 +188,17 @@ var RceConfigProviderComponent = function RceConfigProviderComponent(_ref2) {
|
|
|
186
188
|
}, _callee2, null, [[2, 13, 17, 20]]);
|
|
187
189
|
}))();
|
|
188
190
|
}, [isNewRCEEnabled, isNewRCERendererEnabled]);
|
|
191
|
+
(0, _react.useEffect)(function () {
|
|
192
|
+
if ((0, _rceConfigUtils.isRce5Disabled)(flags)) {
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
var postMessageService = new _postMessageService.default();
|
|
197
|
+
postMessageService.configurePostMessageListener();
|
|
198
|
+
return function () {
|
|
199
|
+
postMessageService.cleanupPostMessageListener();
|
|
200
|
+
};
|
|
201
|
+
}, [isNewRCEEnabled, isNewRCERendererEnabled]);
|
|
189
202
|
|
|
190
203
|
if ((0, _rceConfigUtils.isRce5Disabled)(flags)) {
|
|
191
204
|
return children;
|
|
@@ -18,7 +18,7 @@ var _windowChecks = require("../../util/windowChecks.js");
|
|
|
18
18
|
var _rceConfigErrorMessages = require("./rceConfigErrorMessages.js");
|
|
19
19
|
|
|
20
20
|
var alertTheUser = function alertTheUser(message) {
|
|
21
|
-
_reduxStore.default.dispatch((0, _alerts.
|
|
21
|
+
_reduxStore.default.dispatch((0, _alerts.addStickyError)(message));
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
var getAlertMessage = function getAlertMessage() {
|
|
@@ -68,6 +68,18 @@ var Alerts = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
|
|
|
68
68
|
return _this.renderScreenreaderAlert(alert);
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
if (alert.variant === 'stickyerror') {
|
|
72
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
73
|
+
key: alert.uuid,
|
|
74
|
+
className: styles.alertHolder
|
|
75
|
+
}, /*#__PURE__*/_react.default.createElement(_uiAlerts.Alert, {
|
|
76
|
+
variant: "error",
|
|
77
|
+
onDismiss: closeAlert,
|
|
78
|
+
closeButtonLabel: (0, _formatMessage.default)('Close'),
|
|
79
|
+
transition: "none"
|
|
80
|
+
}, alert.message));
|
|
81
|
+
}
|
|
82
|
+
|
|
71
83
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
72
84
|
key: alert.uuid,
|
|
73
85
|
className: styles.alertHolder
|
|
@@ -97,6 +109,19 @@ var Alerts = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
|
|
|
97
109
|
}, {
|
|
98
110
|
key: "render",
|
|
99
111
|
value: function render() {
|
|
112
|
+
var hasStickyErrors = this.props.alerts.toJS().find(function (alert) {
|
|
113
|
+
return alert.variant === 'stickyerror';
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
if (hasStickyErrors) {
|
|
117
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
118
|
+
className: styles.alerts,
|
|
119
|
+
style: {
|
|
120
|
+
zIndex: '99999'
|
|
121
|
+
}
|
|
122
|
+
}, this.renderAlerts());
|
|
123
|
+
}
|
|
124
|
+
|
|
100
125
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
101
126
|
className: styles.alerts
|
|
102
127
|
}, this.renderAlerts());
|
|
@@ -14,7 +14,7 @@ var alertTimerMiddleware = function alertTimerMiddleware(store) {
|
|
|
14
14
|
return function (action) {
|
|
15
15
|
var delay = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : setTimeout;
|
|
16
16
|
|
|
17
|
-
if (action && action.type === _quizCommon.ADD_ALERT && action.payload.removeIn) {
|
|
17
|
+
if (action && action.type === _quizCommon.ADD_ALERT && action.payload.removeIn && action.payload.variant != 'stickyerror') {
|
|
18
18
|
var remove = function remove() {
|
|
19
19
|
store.dispatch((0, _alerts.removeAlert)(action.payload.uuid));
|
|
20
20
|
}; // injected for testing
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.default = void 0;
|
|
9
|
+
|
|
10
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
11
|
+
|
|
12
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
|
+
|
|
14
|
+
var _lti = _interopRequireDefault(require("./subjectHandlers/lti.frameResize"));
|
|
15
|
+
|
|
16
|
+
var PostMessageService = function PostMessageService() {
|
|
17
|
+
var _this = this;
|
|
18
|
+
|
|
19
|
+
(0, _classCallCheck2.default)(this, PostMessageService);
|
|
20
|
+
this.SUBJECT_ALLOW_LIST = ['lti.frameResize'];
|
|
21
|
+
|
|
22
|
+
this.subjectNotAllowed = function (subject) {
|
|
23
|
+
return !_this.SUBJECT_ALLOW_LIST.includes(subject);
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
this.messageHandlerDispatcher = function (event) {
|
|
27
|
+
if (_this.subjectNotAllowed(event.data.subject)) {
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
switch (event.data.subject) {
|
|
32
|
+
case 'lti.frameResize':
|
|
33
|
+
return (0, _lti.default)(event);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
this.configurePostMessageListener = function () {
|
|
38
|
+
window.addEventListener('message', _this.messageHandlerDispatcher);
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
this.cleanupPostMessageListener = function () {
|
|
42
|
+
window.removeEventListener('message', _this.messageHandlerDispatcher);
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
this.sendResponse = function (subject, data, sourceWindow) {
|
|
46
|
+
sourceWindow.postMessage((0, _objectSpread2.default)({
|
|
47
|
+
subject: subject + '.response'
|
|
48
|
+
}, data));
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
this.sendSuccessPostMessageResponse = function (subject, message, sourceWindow) {
|
|
52
|
+
_this.sendResponse(subject, {
|
|
53
|
+
message: message
|
|
54
|
+
}, sourceWindow);
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
this.sendErrorPostMessageResponse = function (subject, error, sourceWindow) {
|
|
58
|
+
_this.sendResponse(subject, {
|
|
59
|
+
error: error
|
|
60
|
+
}, sourceWindow);
|
|
61
|
+
};
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
exports.default = PostMessageService;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/quiz-core",
|
|
3
|
-
"version": "17.51.1-rc.
|
|
3
|
+
"version": "17.51.1-rc.2+7ff2dabd9",
|
|
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.6",
|
|
44
|
-
"@instructure/quiz-common": "17.51.1-rc.
|
|
45
|
-
"@instructure/quiz-i18n": "17.51.1-rc.
|
|
46
|
-
"@instructure/quiz-interactions": "17.51.1-rc.
|
|
47
|
-
"@instructure/quiz-number-input": "17.51.1-rc.
|
|
48
|
-
"@instructure/quiz-rce": "17.51.1-rc.
|
|
44
|
+
"@instructure/quiz-common": "17.51.1-rc.2+7ff2dabd9",
|
|
45
|
+
"@instructure/quiz-i18n": "17.51.1-rc.2+7ff2dabd9",
|
|
46
|
+
"@instructure/quiz-interactions": "17.51.1-rc.2+7ff2dabd9",
|
|
47
|
+
"@instructure/quiz-number-input": "17.51.1-rc.2+7ff2dabd9",
|
|
48
|
+
"@instructure/quiz-rce": "17.51.1-rc.2+7ff2dabd9",
|
|
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.51.1-rc.
|
|
109
|
+
"instructure-validations": "17.51.1-rc.2+7ff2dabd9",
|
|
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.51.1-rc.
|
|
159
|
+
"quiz-presets": "17.51.1-rc.2+7ff2dabd9",
|
|
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": "7ff2dabd98fb5aab3ec09a4101e35a2bc7735186"
|
|
176
176
|
}
|