@instructure/quiz-core 20.22.0 → 20.24.0

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 (7) hide show
  1. package/es/common/kinesis/StreamQueue.js +8 -2
  2. package/es/moderating/components/sidebar/ResetQuiz/index.js +15 -8
  3. package/es/moderating/components/sidebar/ResetQuiz/presenter.js +20 -4
  4. package/lib/common/kinesis/StreamQueue.js +8 -2
  5. package/lib/moderating/components/sidebar/ResetQuiz/index.js +15 -8
  6. package/lib/moderating/components/sidebar/ResetQuiz/presenter.js +20 -4
  7. package/package.json +9 -9
package/es/common/kinesis/StreamQueue.js CHANGED
@@ -5,6 +5,8 @@ var ERROR_STATE = 'error';
5
5
  var WAITING_STATE = 'waiting';
6
6
  var SENDING_STATE = 'sending';
7
7
  var SENT_STATE = 'sent';
8
+ var REACHED_MAX_FAILURES = 'reached_max_failures';
9
+ var MAX_FAILED_ATTEMPTS = 3;
8
10
  var StreamQueue = /*#__PURE__*/function () {
9
11
  function StreamQueue(_ref) {
10
12
  var config = _ref.config,
@@ -20,7 +22,7 @@ var StreamQueue = /*#__PURE__*/function () {
20
22
  accessKeyId: kinesis.config.credentials.accessKeyId,
21
23
  secretAccessKey: kinesis.config.credentials.secretAccessKey,
22
24
  sessionToken: kinesis.config.credentials.sessionToken,
23
- region: kinesis.config.client_configuration.region,
25
+ region: kinesis.config.region,
24
26
  service: 'execute-api'
25
27
  });
26
28
  this._addPage();
@@ -115,9 +117,13 @@ var StreamQueue = /*#__PURE__*/function () {
115
117
  _this.kinesis.putRecords(params, function (err, data) {
116
118
  if (err) {
117
119
  _this.pageQueue[i].status = ERROR_STATE;
120
+ _this.pageQueue[i].errorCount = (_this.pageQueue[i].errorCount || 0) + 1;
118
121
  // eslint-disable-next-line no-console
119
122
  console.error("KINESIS STREAM ".concat(_this.config.stream, " ERROR: "), err);
120
- _this._sendRecordsViaProxy(params);
123
+ if (_this.pageQueue[i].errorCount >= MAX_FAILED_ATTEMPTS) {
124
+ _this.pageQueue[i].status = REACHED_MAX_FAILURES;
125
+ _this._sendRecordsViaProxy(params);
126
+ }
121
127
  } else {
122
128
  _this.pageQueue[i].status = SENT_STATE;
123
129
  // eslint-disable-next-line no-console
package/es/moderating/components/sidebar/ResetQuiz/index.js CHANGED
@@ -7,20 +7,27 @@ import { reopenQuizSession } from "../../../api/quizSessions.js";
7
7
  import { getQuizSessionsByIds } from "../../../../common/selectors/quizSessions.js";
8
8
  export function mapStateToProps(state) {
9
9
  var quizSessionIds = state.getIn(['moderation', 'selectedSessions']);
10
- var sessions = getQuizSessionsByIds(state, quizSessionIds).filter(function (qs) {
10
+ var quizSessions = getQuizSessionsByIds(state, quizSessionIds).filter(function (qs) {
11
11
  return qs.isLoaded() && !qs.pending();
12
12
  }).sort(function (qs1, qs2) {
13
13
  return qs2.id - qs1.id;
14
14
  });
15
- var sessionId, session;
16
- if (sessions.size > 0) {
17
- session = sessions.get(0);
18
- sessionId = session.id;
15
+ var quizSessionId,
16
+ quizSession,
17
+ reopenOverride = false;
18
+ if (quizSessions.size > 0) {
19
+ quizSession = quizSessions.get(0);
20
+ var _ref = [quizSession.allowBacktracking, quizSession.isOneQuestionAtATime()],
21
+ allowBacktracking = _ref[0],
22
+ isOneQuestionAtATime = _ref[1];
23
+ quizSessionId = quizSession.id;
24
+ reopenOverride = !allowBacktracking && isOneQuestionAtATime;
19
25
  }
20
26
  return {
21
- sessionId: sessionId || null,
22
- isComplete: session ? !(session.inProgress() || session.reopeningGraded()) : false,
23
- reopenOn: featureOn('reopen_session')
27
+ sessionId: quizSessionId || null,
28
+ isComplete: quizSession ? !(quizSession.inProgress() || quizSession.reopeningGraded()) : false,
29
+ reopenOn: featureOn('reopen_session'),
30
+ reopenOverride: reopenOverride
24
31
  };
25
32
  }
26
33
  export default connect(mapStateToProps, {
package/es/moderating/components/sidebar/ResetQuiz/presenter.js CHANGED
@@ -9,6 +9,8 @@ import PropTypes from 'prop-types';
9
9
  import t from '@instructure/quiz-i18n/es/format-message';
10
10
  import { Button } from '@instructure/ui-buttons';
11
11
  import { Heading } from '@instructure/ui-heading';
12
+ import { Tooltip } from '@instructure/ui-tooltip';
13
+ import { AccessibleContent } from '@instructure/ui-a11y-content';
12
14
  export var ResetQuiz = /*#__PURE__*/function (_Component) {
13
15
  _inherits(ResetQuiz, _Component);
14
16
  var _super = _createSuper(ResetQuiz);
@@ -57,18 +59,31 @@ export var ResetQuiz = /*#__PURE__*/function (_Component) {
57
59
  key: "render",
58
60
  value: function render() {
59
61
  if (!this.props.reopenOn) return null;
60
- if (!this.props.sessionId) {
62
+ var _this$props = this.props,
63
+ reopenOverride = _this$props.reopenOverride,
64
+ sessionId = _this$props.sessionId;
65
+ if (!sessionId) {
61
66
  return /*#__PURE__*/React.createElement("span", null, t('No attempts have been recorded yet.'));
62
67
  }
63
- return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Heading, {
68
+ var reOpen = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Heading, {
64
69
  level: "h3"
65
70
  }, t('Manage current attempt')), this.props.reopenOn ? /*#__PURE__*/React.createElement(Button, {
66
71
  ref: this.reopenButtonRef,
67
72
  onClick: this.reopenQuizSession,
68
- disabled: !this.props.isComplete,
73
+ disabled: !this.props.isComplete || reopenOverride,
69
74
  margin: "small none",
70
75
  "data-automation": "sdk-reopen-quiz-button"
71
76
  }, t('Reopen')) : null);
77
+ if (reopenOverride) {
78
+ var text = t('One Question at Time Quizzes with Backtracking disabled cannot be reopened.');
79
+ return /*#__PURE__*/React.createElement(AccessibleContent, {
80
+ alt: text
81
+ }, /*#__PURE__*/React.createElement(Tooltip, {
82
+ renderTip: text,
83
+ placement: "start"
84
+ }, reOpen));
85
+ }
86
+ return reOpen;
72
87
  }
73
88
  }]);
74
89
  ResetQuiz.displayName = "ResetQuiz";
@@ -81,6 +96,7 @@ ResetQuiz.propTypes = {
81
96
  reopenQuizSession: PropTypes.func.isRequired,
82
97
  reopenOn: PropTypes.bool.isRequired,
83
98
  screenreaderNotification: PropTypes.func.isRequired,
84
- withConfirm: PropTypes.func.isRequired
99
+ withConfirm: PropTypes.func.isRequired,
100
+ reopenOverride: PropTypes.bool.isRequired
85
101
  };
86
102
  export default ResetQuiz;
package/lib/common/kinesis/StreamQueue.js CHANGED
@@ -12,6 +12,8 @@ var ERROR_STATE = 'error';
12
12
  var WAITING_STATE = 'waiting';
13
13
  var SENDING_STATE = 'sending';
14
14
  var SENT_STATE = 'sent';
15
+ var REACHED_MAX_FAILURES = 'reached_max_failures';
16
+ var MAX_FAILED_ATTEMPTS = 3;
15
17
  var StreamQueue = /*#__PURE__*/function () {
16
18
  function StreamQueue(_ref) {
17
19
  var config = _ref.config,
@@ -27,7 +29,7 @@ var StreamQueue = /*#__PURE__*/function () {
27
29
  accessKeyId: kinesis.config.credentials.accessKeyId,
28
30
  secretAccessKey: kinesis.config.credentials.secretAccessKey,
29
31
  sessionToken: kinesis.config.credentials.sessionToken,
30
- region: kinesis.config.client_configuration.region,
32
+ region: kinesis.config.region,
31
33
  service: 'execute-api'
32
34
  });
33
35
  this._addPage();
@@ -122,9 +124,13 @@ var StreamQueue = /*#__PURE__*/function () {
122
124
  _this.kinesis.putRecords(params, function (err, data) {
123
125
  if (err) {
124
126
  _this.pageQueue[i].status = ERROR_STATE;
127
+ _this.pageQueue[i].errorCount = (_this.pageQueue[i].errorCount || 0) + 1;
125
128
  // eslint-disable-next-line no-console
126
129
  console.error("KINESIS STREAM ".concat(_this.config.stream, " ERROR: "), err);
127
- _this._sendRecordsViaProxy(params);
130
+ if (_this.pageQueue[i].errorCount >= MAX_FAILED_ATTEMPTS) {
131
+ _this.pageQueue[i].status = REACHED_MAX_FAILURES;
132
+ _this._sendRecordsViaProxy(params);
133
+ }
128
134
  } else {
129
135
  _this.pageQueue[i].status = SENT_STATE;
130
136
  // eslint-disable-next-line no-console
package/lib/moderating/components/sidebar/ResetQuiz/index.js CHANGED
@@ -15,20 +15,27 @@ var _quizSessions = require("../../../api/quizSessions.js");
15
15
  var _quizSessions2 = require("../../../../common/selectors/quizSessions.js");
16
16
  function mapStateToProps(state) {
17
17
  var quizSessionIds = state.getIn(['moderation', 'selectedSessions']);
18
- var sessions = (0, _quizSessions2.getQuizSessionsByIds)(state, quizSessionIds).filter(function (qs) {
18
+ var quizSessions = (0, _quizSessions2.getQuizSessionsByIds)(state, quizSessionIds).filter(function (qs) {
19
19
  return qs.isLoaded() && !qs.pending();
20
20
  }).sort(function (qs1, qs2) {
21
21
  return qs2.id - qs1.id;
22
22
  });
23
- var sessionId, session;
24
- if (sessions.size > 0) {
25
- session = sessions.get(0);
26
- sessionId = session.id;
23
+ var quizSessionId,
24
+ quizSession,
25
+ reopenOverride = false;
26
+ if (quizSessions.size > 0) {
27
+ quizSession = quizSessions.get(0);
28
+ var _ref = [quizSession.allowBacktracking, quizSession.isOneQuestionAtATime()],
29
+ allowBacktracking = _ref[0],
30
+ isOneQuestionAtATime = _ref[1];
31
+ quizSessionId = quizSession.id;
32
+ reopenOverride = !allowBacktracking && isOneQuestionAtATime;
27
33
  }
28
34
  return {
29
- sessionId: sessionId || null,
30
- isComplete: session ? !(session.inProgress() || session.reopeningGraded()) : false,
31
- reopenOn: (0, _featureCheck.featureOn)('reopen_session')
35
+ sessionId: quizSessionId || null,
36
+ isComplete: quizSession ? !(quizSession.inProgress() || quizSession.reopeningGraded()) : false,
37
+ reopenOn: (0, _featureCheck.featureOn)('reopen_session'),
38
+ reopenOverride: reopenOverride
32
39
  };
33
40
  }
34
41
  var _default = (0, _reactRedux.connect)(mapStateToProps, {
package/lib/moderating/components/sidebar/ResetQuiz/presenter.js CHANGED
@@ -17,6 +17,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
17
17
  var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
18
18
  var _uiButtons = require("@instructure/ui-buttons");
19
19
  var _uiHeading = require("@instructure/ui-heading");
20
+ var _uiTooltip = require("@instructure/ui-tooltip");
21
+ var _uiA11yContent = require("@instructure/ui-a11y-content");
20
22
  var ResetQuiz = /*#__PURE__*/function (_Component) {
21
23
  (0, _inherits2.default)(ResetQuiz, _Component);
22
24
  var _super = (0, _createSuper2.default)(ResetQuiz);
@@ -65,18 +67,31 @@ var ResetQuiz = /*#__PURE__*/function (_Component) {
65
67
  key: "render",
66
68
  value: function render() {
67
69
  if (!this.props.reopenOn) return null;
68
- if (!this.props.sessionId) {
70
+ var _this$props = this.props,
71
+ reopenOverride = _this$props.reopenOverride,
72
+ sessionId = _this$props.sessionId;
73
+ if (!sessionId) {
69
74
  return /*#__PURE__*/_react.default.createElement("span", null, (0, _formatMessage.default)('No attempts have been recorded yet.'));
70
75
  }
71
- return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
76
+ var reOpen = /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
72
77
  level: "h3"
73
78
  }, (0, _formatMessage.default)('Manage current attempt')), this.props.reopenOn ? /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
74
79
  ref: this.reopenButtonRef,
75
80
  onClick: this.reopenQuizSession,
76
- disabled: !this.props.isComplete,
81
+ disabled: !this.props.isComplete || reopenOverride,
77
82
  margin: "small none",
78
83
  "data-automation": "sdk-reopen-quiz-button"
79
84
  }, (0, _formatMessage.default)('Reopen')) : null);
85
+ if (reopenOverride) {
86
+ var text = (0, _formatMessage.default)('One Question at Time Quizzes with Backtracking disabled cannot be reopened.');
87
+ return /*#__PURE__*/_react.default.createElement(_uiA11yContent.AccessibleContent, {
88
+ alt: text
89
+ }, /*#__PURE__*/_react.default.createElement(_uiTooltip.Tooltip, {
90
+ renderTip: text,
91
+ placement: "start"
92
+ }, reOpen));
93
+ }
94
+ return reOpen;
80
95
  }
81
96
  }]);
82
97
  ResetQuiz.displayName = "ResetQuiz";
@@ -90,7 +105,8 @@ ResetQuiz.propTypes = {
90
105
  reopenQuizSession: _propTypes.default.func.isRequired,
91
106
  reopenOn: _propTypes.default.bool.isRequired,
92
107
  screenreaderNotification: _propTypes.default.func.isRequired,
93
- withConfirm: _propTypes.default.func.isRequired
108
+ withConfirm: _propTypes.default.func.isRequired,
109
+ reopenOverride: _propTypes.default.bool.isRequired
94
110
  };
95
111
  var _default = ResetQuiz;
96
112
  exports.default = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/quiz-core",
3
- "version": "20.22.0",
3
+ "version": "20.24.0",
4
4
  "license": "MIT",
5
5
  "description": "The Quiz React SDK by Instructure Inc.",
6
6
  "author": "Instructure, Inc. Engineering and Product Design",
@@ -44,11 +44,11 @@
44
44
  "@instructure/emotion": "^8.51.0",
45
45
  "@instructure/grading-utils": "^1.0.0",
46
46
  "@instructure/outcomes-ui": "^3.2.2",
47
- "@instructure/quiz-common": "^20.22.0",
48
- "@instructure/quiz-i18n": "^20.22.0",
49
- "@instructure/quiz-interactions": "^20.22.0",
50
- "@instructure/quiz-number-input": "^20.22.0",
51
- "@instructure/quiz-rce": "^20.22.0",
47
+ "@instructure/quiz-common": "^20.24.0",
48
+ "@instructure/quiz-i18n": "^20.24.0",
49
+ "@instructure/quiz-interactions": "^20.24.0",
50
+ "@instructure/quiz-number-input": "^20.24.0",
51
+ "@instructure/quiz-rce": "^20.24.0",
52
52
  "@instructure/ui-a11y-content": "^8.51.0",
53
53
  "@instructure/ui-alerts": "^8.51.0",
54
54
  "@instructure/ui-avatar": "^8.51.0",
@@ -112,7 +112,7 @@
112
112
  "file-saver": "~2.0.5",
113
113
  "humps": "^2.0.0",
114
114
  "immutable": "^3.8.1",
115
- "instructure-validations": "^20.22.0",
115
+ "instructure-validations": "^20.24.0",
116
116
  "ipaddr.js": "^1.5.4",
117
117
  "isomorphic-fetch": "^2.2.0",
118
118
  "isuuid": "^0.1.0",
@@ -143,7 +143,7 @@
143
143
  "uuid": "^3.2.1"
144
144
  },
145
145
  "devDependencies": {
146
- "@instructure/quiz-scripts": "^20.22.0",
146
+ "@instructure/quiz-scripts": "^20.24.0",
147
147
  "@instructure/ui-axe-check": "^8.51.0",
148
148
  "@instructure/ui-babel-preset": "^7.22.1",
149
149
  "@instructure/ui-test-utils": "^7.22.1",
@@ -161,7 +161,7 @@
161
161
  "jquery": "^2.2.3",
162
162
  "karma-junit-reporter": "^2.0.1",
163
163
  "most-subject": "^5.3.0",
164
- "quiz-presets": "^20.22.0",
164
+ "quiz-presets": "^20.24.0",
165
165
  "react": "^16.8.6",
166
166
  "react-addons-test-utils": "^15.6.2",
167
167
  "react-dom": "^16.8.6",