@instructure/quiz-core 17.50.0 → 17.50.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [17.50.1](https://gerrit.instructure.com/quizzes-ui/compare/v17.50.0...v17.50.1) (2023-03-16)
+
+**Note:** Version bump only for package @instructure/quiz-core
+
+
+
+
+
 # [17.50.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.49.0...v17.50.0) (2023-03-16)
 
 

package/es/moderating/components/resources/ModerateTableRow/presenter.js

@@ -56,18 +56,6 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
       _this.moderateButton = node;
     };
 
-    _this.generateAttemptSRMessage = function (attemptNumber) {
-      var studentName = "".concat(t('Student'), " ").concat(_this.props.rowData.name, ", ");
-      var message = t('Attempt { attemptNumber }', {
-        attemptNumber: attemptNumber
-      });
-      return " ".concat(studentName).concat(message, ", ");
-    };
-
-    _this.generateAttemptSRC = function (attemptNumber) {
-      return _this.props.rowData.name && attemptNumber ? /*#__PURE__*/React.createElement(ScreenReaderContent, null, _this.generateAttemptSRMessage(attemptNumber)) : null;
-    };
-
     _this.onModerateButtonClick = function () {
       _this.props.onModerateButtonClick(_this.props.rowData);
     };
@@ -77,9 +65,6 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
     };
 
     _this.generateAttemptLink = function (autogradefailed, message, quizSessionId, attemptNumber) {
-      var studentName = "".concat(t('Student'), " ").concat(_this.props.rowData.name, ", "); // A screenreader message is available if student has more than one attempt
-
-      var attemptSRMessage = attemptNumber > 1 && /*#__PURE__*/React.createElement(ScreenReaderContent, null, studentName);
       var iconTitle = t('Autograde error on attempt { attemptNumber }.', {
         attemptNumber: attemptNumber
       });
@@ -90,9 +75,9 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
           title: iconTitle
         }),
         iconPlacement: "end"
-      }, attemptSRMessage, message) : /*#__PURE__*/React.createElement(Link, {
+      }, message) : /*#__PURE__*/React.createElement(Link, {
         onClick: _this.onResultsLinkClick(quizSessionId)
-      }, attemptSRMessage, message);
+      }, message);
       return /*#__PURE__*/React.createElement("div", {
         key: quizSessionId,
         className: styles.tableDataItem
@@ -100,9 +85,6 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
     };
 
     _this.generateAttemptText = function (autogradefailed, message, quizSessionId, attemptNumber) {
-      var studentName = "".concat(t('Student'), " ").concat(_this.props.rowData.name, ", "); // A screenreader message is available if student has more than one attempt
-
-      var attemptSRMessage = attemptNumber > 1 && /*#__PURE__*/React.createElement(ScreenReaderContent, null, studentName);
       var iconTitle = t('Autograde error on attempt { attemptNumber }.', {
         attemptNumber: attemptNumber
       });
@@ -113,7 +95,7 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
       return /*#__PURE__*/React.createElement("div", {
         key: quizSessionId,
         className: styles.tableDataItem
-      }, attemptSRMessage, /*#__PURE__*/React.createElement(View, {
+      }, /*#__PURE__*/React.createElement(View, {
         margin: "0 x-small 0 0"
       }, message), icon);
     };
@@ -160,8 +142,6 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
 
         var message = t('No Score');
 
-        var attemptSRMessage = _this3.generateAttemptSRMessage(renderedScores.length + 1);
-
         if (result.get('score') != null) {
           var percentage = result.get('score') / result.get('pointsPossible');
           message = _this3.formatPercentMax2FractionDigits(percentage);
@@ -181,7 +161,7 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
         renderedScores.push( /*#__PURE__*/React.createElement("div", {
           key: result.get('id'),
           className: styles.tableDataItem
-        }, /*#__PURE__*/React.createElement(ScreenReaderContent, null, attemptSRMessage, message), /*#__PURE__*/React.createElement(AccessibleContent, null, message)));
+        }, message));
         return renderedScores;
       }, []);
     }
@@ -220,23 +200,20 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
 
       return quizSessions.map(function (quizSession, idx) {
         var quizSessionId = quizSession.get('id');
+        var hasAutogradeFailure = quizSession.findAuthoritativeResult().status === 'autograding_failed';
 
-        var message = _this4.attemptMessage(idx, maxAttempts);
-
-        var hasAutoGradeFailure = quizSession.findAuthoritativeResult().status === 'autograding_failed';
+        var message = _this4.attemptMessage(idx, maxAttempts, hasAutogradeFailure);
 
         if (_this4.props.onResultsLinkClick && quizSession.graded()) {
-          return _this4.generateAttemptLink(hasAutoGradeFailure, message, quizSessionId, idx + 1);
+          return _this4.generateAttemptLink(hasAutogradeFailure, message, quizSessionId, idx + 1);
         } else {
-          return _this4.generateAttemptText(hasAutoGradeFailure, message, quizSessionId, idx + 1);
+          return _this4.generateAttemptText(hasAutogradeFailure, message, quizSessionId, idx + 1);
         }
       });
     }
   }, {
     key: "renderTimes",
     value: function renderTimes(quizSessions) {
-      var _this5 = this;
-
       if (!quizSessions.length) {
         return /*#__PURE__*/React.createElement("div", {
           className: styles.tableDataItem
@@ -250,8 +227,6 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
           seconds: quizSession.elapsedTime
         });
 
-        var attemptSRMessage = _this5.generateAttemptSRC(idx + 1);
-
         if (quizSession.inProgress() || quizSession.reopeningGraded()) {
           var alt = t('In progress, time not available');
           message = /*#__PURE__*/React.createElement(AccessibleContent, {
@@ -262,14 +237,12 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
         return /*#__PURE__*/React.createElement("div", {
           key: quizSession.get('id'),
           className: styles.tableDataItem
-        }, attemptSRMessage, message);
+        }, message);
       });
     }
   }, {
     key: "renderLogLinks",
     value: function renderLogLinks(quizSessions) {
-      var _this6 = this;
-
       if (!quizSessions.length) {
         return /*#__PURE__*/React.createElement("div", {
           className: styles.tableDataItem
@@ -281,11 +254,8 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
       var _this$props = this.props,
           onModerateLogClick = _this$props.onModerateLogClick,
           id = _this$props.rowData.id;
-      return quizSessions.map(function (quizSession, idx) {
+      return quizSessions.map(function (quizSession) {
         var quizSessionId = quizSession.get('id');
-
-        var attemptSRMessage = _this6.generateAttemptSRC(idx + 1);
-
         var message = quizSession.inProgress() || quizSession.reopeningGraded() ? t('In Progress') : t('View Log');
 
         function onClick(event) {
@@ -301,7 +271,7 @@ export var ModerateTableRow = (_dec = themeable(theme, styles), _dec(_class = (_
           className: styles.tableDataItem
         }, /*#__PURE__*/React.createElement(Link, {
           onClick: onClick
-        }, attemptSRMessage, message));
+        }, message));
       });
     }
   }, {

package/lib/moderating/components/resources/ModerateTableRow/presenter.js

@@ -87,18 +87,6 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
       _this.moderateButton = node;
     };
 
-    _this.generateAttemptSRMessage = function (attemptNumber) {
-      var studentName = "".concat((0, _formatMessage.default)('Student'), " ").concat(_this.props.rowData.name, ", ");
-      var message = (0, _formatMessage.default)('Attempt { attemptNumber }', {
-        attemptNumber: attemptNumber
-      });
-      return " ".concat(studentName).concat(message, ", ");
-    };
-
-    _this.generateAttemptSRC = function (attemptNumber) {
-      return _this.props.rowData.name && attemptNumber ? /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, _this.generateAttemptSRMessage(attemptNumber)) : null;
-    };
-
     _this.onModerateButtonClick = function () {
       _this.props.onModerateButtonClick(_this.props.rowData);
     };
@@ -108,10 +96,6 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
     };
 
     _this.generateAttemptLink = function (autogradefailed, message, quizSessionId, attemptNumber) {
-      var studentName = "".concat((0, _formatMessage.default)('Student'), " ").concat(_this.props.rowData.name, ", "); // A screenreader message is available if student has more than one attempt
-
-      var attemptSRMessage = attemptNumber > 1 && /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, studentName);
-
       var iconTitle = (0, _formatMessage.default)('Autograde error on attempt { attemptNumber }.', {
         attemptNumber: attemptNumber
       });
@@ -122,9 +106,9 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
           title: iconTitle
         }),
         iconPlacement: "end"
-      }, attemptSRMessage, message) : /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
+      }, message) : /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
         onClick: _this.onResultsLinkClick(quizSessionId)
-      }, attemptSRMessage, message);
+      }, message);
       return /*#__PURE__*/_react.default.createElement("div", {
         key: quizSessionId,
         className: styles.tableDataItem
@@ -132,10 +116,6 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
     };
 
     _this.generateAttemptText = function (autogradefailed, message, quizSessionId, attemptNumber) {
-      var studentName = "".concat((0, _formatMessage.default)('Student'), " ").concat(_this.props.rowData.name, ", "); // A screenreader message is available if student has more than one attempt
-
-      var attemptSRMessage = attemptNumber > 1 && /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, studentName);
-
       var iconTitle = (0, _formatMessage.default)('Autograde error on attempt { attemptNumber }.', {
         attemptNumber: attemptNumber
       });
@@ -146,7 +126,7 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
       return /*#__PURE__*/_react.default.createElement("div", {
         key: quizSessionId,
         className: styles.tableDataItem
-      }, attemptSRMessage, /*#__PURE__*/_react.default.createElement(_uiView.View, {
+      }, /*#__PURE__*/_react.default.createElement(_uiView.View, {
         margin: "0 x-small 0 0"
       }, message), icon);
     };
@@ -194,8 +174,6 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
 
         var message = (0, _formatMessage.default)('No Score');
 
-        var attemptSRMessage = _this3.generateAttemptSRMessage(renderedScores.length + 1);
-
         if (result.get('score') != null) {
           var percentage = result.get('score') / result.get('pointsPossible');
           message = _this3.formatPercentMax2FractionDigits(percentage);
@@ -215,7 +193,7 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         renderedScores.push( /*#__PURE__*/_react.default.createElement("div", {
           key: result.get('id'),
           className: styles.tableDataItem
-        }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, attemptSRMessage, message), /*#__PURE__*/_react.default.createElement(_uiA11yContent.AccessibleContent, null, message)));
+        }, message));
         return renderedScores;
       }, []);
     }
@@ -254,23 +232,20 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
 
       return quizSessions.map(function (quizSession, idx) {
         var quizSessionId = quizSession.get('id');
+        var hasAutogradeFailure = quizSession.findAuthoritativeResult().status === 'autograding_failed';
 
-        var message = _this4.attemptMessage(idx, maxAttempts);
-
-        var hasAutoGradeFailure = quizSession.findAuthoritativeResult().status === 'autograding_failed';
+        var message = _this4.attemptMessage(idx, maxAttempts, hasAutogradeFailure);
 
         if (_this4.props.onResultsLinkClick && quizSession.graded()) {
-          return _this4.generateAttemptLink(hasAutoGradeFailure, message, quizSessionId, idx + 1);
+          return _this4.generateAttemptLink(hasAutogradeFailure, message, quizSessionId, idx + 1);
         } else {
-          return _this4.generateAttemptText(hasAutoGradeFailure, message, quizSessionId, idx + 1);
+          return _this4.generateAttemptText(hasAutogradeFailure, message, quizSessionId, idx + 1);
         }
       });
     }
   }, {
     key: "renderTimes",
     value: function renderTimes(quizSessions) {
-      var _this5 = this;
-
       if (!quizSessions.length) {
         return /*#__PURE__*/_react.default.createElement("div", {
           className: styles.tableDataItem
@@ -284,8 +259,6 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
           seconds: quizSession.elapsedTime
         });
 
-        var attemptSRMessage = _this5.generateAttemptSRC(idx + 1);
-
         if (quizSession.inProgress() || quizSession.reopeningGraded()) {
           var alt = (0, _formatMessage.default)('In progress, time not available');
           message = /*#__PURE__*/_react.default.createElement(_uiA11yContent.AccessibleContent, {
@@ -296,14 +269,12 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         return /*#__PURE__*/_react.default.createElement("div", {
           key: quizSession.get('id'),
           className: styles.tableDataItem
-        }, attemptSRMessage, message);
+        }, message);
       });
     }
   }, {
     key: "renderLogLinks",
     value: function renderLogLinks(quizSessions) {
-      var _this6 = this;
-
       if (!quizSessions.length) {
         return /*#__PURE__*/_react.default.createElement("div", {
           className: styles.tableDataItem
@@ -315,11 +286,8 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
       var _this$props = this.props,
           onModerateLogClick = _this$props.onModerateLogClick,
           id = _this$props.rowData.id;
-      return quizSessions.map(function (quizSession, idx) {
+      return quizSessions.map(function (quizSession) {
         var quizSessionId = quizSession.get('id');
-
-        var attemptSRMessage = _this6.generateAttemptSRC(idx + 1);
-
         var message = quizSession.inProgress() || quizSession.reopeningGraded() ? (0, _formatMessage.default)('In Progress') : (0, _formatMessage.default)('View Log');
 
         function onClick(event) {
@@ -335,7 +303,7 @@ var ModerateTableRow = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
           className: styles.tableDataItem
         }, /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
           onClick: onClick
-        }, attemptSRMessage, message));
+        }, message));
       });
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.50.0",
+  "version": "17.50.1",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
   ],
   "dependencies": {
     "@instructure/outcomes-ui": "^2.1.2",
-    "@instructure/quiz-common": "^17.50.0",
-    "@instructure/quiz-i18n": "^17.50.0",
-    "@instructure/quiz-interactions": "^17.50.0",
-    "@instructure/quiz-number-input": "^17.50.0",
-    "@instructure/quiz-rce": "^17.50.0",
+    "@instructure/quiz-common": "^17.50.1",
+    "@instructure/quiz-i18n": "^17.50.1",
+    "@instructure/quiz-interactions": "^17.50.1",
+    "@instructure/quiz-number-input": "^17.50.1",
+    "@instructure/quiz-rce": "^17.50.1",
     "@instructure/ui-a11y-content": "^7.20.0",
     "@instructure/ui-alerts": "^7.20.0",
     "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "^17.50.0",
+    "instructure-validations": "^17.50.1",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "^17.50.0",
+    "@instructure/quiz-scripts": "^17.50.1",
     "@instructure/ui-axe-check": "^7.20.0",
     "@instructure/ui-babel-preset": "^7.20.0",
     "@instructure/ui-karma-config": "^7.20.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^17.50.0",
+    "quiz-presets": "^17.50.1",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "869c125bbdacee137fc532ee403d89e0dbb07807"
+  "gitHead": "4e510b5728d557557ce187d883ebee7100ef8f4b"
 }