@instructure/quiz-core 22.5.1-rc.0 → 22.5.1-rc.3

package/es/banks/components/BankEntry/presenter.js

@@ -251,16 +251,14 @@ export var BankEntry = (_dec = withStyleOverrides(generateStyle, generateCompone
   }, {
     key: "isStimulusEntry",
     value: function isStimulusEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && !entry.isPassage;
+      var _this$props$bankEntry;
+      return (_this$props$bankEntry = this.props.bankEntry) === null || _this$props$bankEntry === void 0 ? void 0 : _this$props$bankEntry.isStimulusEntry;
     }
   }, {
     key: "isPassageEntry",
     value: function isPassageEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && entry.isPassage;
+      var _this$props$bankEntry2;
+      return (_this$props$bankEntry2 = this.props.bankEntry) === null || _this$props$bankEntry2 === void 0 ? void 0 : _this$props$bankEntry2.isPassageEntry;
     }
   }, {
     key: "getEditWarning",

package/es/banks/components/BankEntryRow/presenter.js

@@ -154,16 +154,14 @@ export var BankEntryRow = (_dec = withStyleOverrides(generateStyle, generateComp
   }, {
     key: "isStimulusEntry",
     value: function isStimulusEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && !entry.isPassage;
+      var _this$props$bankEntry;
+      return (_this$props$bankEntry = this.props.bankEntry) === null || _this$props$bankEntry === void 0 ? void 0 : _this$props$bankEntry.isStimulusEntry;
     }
   }, {
     key: "isPassageEntry",
     value: function isPassageEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && entry.isPassage;
+      var _this$props$bankEntry2;
+      return (_this$props$bankEntry2 = this.props.bankEntry) === null || _this$props$bankEntry2 === void 0 ? void 0 : _this$props$bankEntry2.isPassageEntry;
     }
   }, {
     key: "type",

package/es/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -166,6 +166,7 @@ export var StimulusEditInfo = (_dec = withStyleOverrides(generateStyle, generate
       var automationPrefix = stimulus.passage ? 'text-block' : 'stimulus';
       var message = stimulus.passage ? t('Edit Text Block') : t('Edit Stimulus');
       return jsx(FormFieldGroup, {
+        "data-automation": "stimulus-edit-info",
         messages: this.inputErrors('onSelf'),
         description: jsx(ScreenReaderContent, null, message)
       }, jsx(Heading, {

package/es/common/records/BankEntry.js

@@ -77,6 +77,20 @@ export var BankEntry = /*#__PURE__*/function (_ReduxRecord) {
       if (!this.isStimulus) return false;
       return (_this$getEntry2 = this.getEntry()) === null || _this$getEntry2 === void 0 ? void 0 : _this$getEntry2.isPassage;
     }
+  }, {
+    key: "isStimulusEntry",
+    get: function get() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && !entry.isPassage;
+    }
+  }, {
+    key: "isPassageEntry",
+    get: function get() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && entry.isPassage;
+    }
   }]);
 }(ReduxRecord({
   id: '0',

package/es/common/records/QuizSession.js

@@ -207,6 +207,7 @@ export var QuizSession = /*#__PURE__*/function (_ReduxRecord) {
   user: Map(),
   // Good candidate for another Record - Still relevant?
   bolaSessionItemsCount: null,
-  buildOnLastAttempt: null
+  buildOnLastAttempt: null,
+  multipleSessionAttempt: false
 }));
 export default QuizSession;

package/es/common/util/warningHelpers.js

@@ -48,13 +48,8 @@ export var propsForStimulusVersioningWrapper = function propsForStimulusVersioni
   }
   var isPassage = args[args.length - 1];
   var restArgs = args.slice(0, -1);
-  var itemName = isPassage ? 'text block' : 'stimulus';
-  var title = t('Some students have already submitted answers for this {itemName}!', {
-    itemName: itemName
-  });
-  var content = t('You can apply your edits to a copy of this {itemName}' + ' which will only be seen by students that have not taken the assessment.' + ' Attached questions will be copied as well.', {
-    itemName: itemName
-  });
+  var title = isPassage ? t('Some students have already submitted answers for this text block!') : t('Some students have already submitted answers for this stimulus!');
+  var content = isPassage ? t('You can apply your edits to a copy of this text block' + ' which will only be seen by students that have not taken the assessment.' + ' Attached questions will be copied as well.') : t('You can apply your edits to a copy of this stimulus' + ' which will only be seen by students that have not taken the assessment.' + ' Attached questions will be copied as well.');
   return propsForVersioningWrapper.apply(void 0, [/*#__PURE__*/React.createElement(Text, {
     color: "primary"
   }, /*#__PURE__*/React.createElement("b", null, t('Editing a copy.')), "\xA0", t('Statistics from this new copy will appear separate from the previous version.')), /*#__PURE__*/React.createElement(Text, {

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

@@ -21,7 +21,7 @@ function _callSuper(_this, derived, args) {
 }
 /** @jsx jsx */
 /* eslint "array-callback-return": "warn" */
-import { Component } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { AccessibleContent, PresentationContent } from '@instructure/ui-a11y-content';
@@ -31,7 +31,7 @@ import { Link } from '@instructure/ui-link';
 import { Avatar } from '@instructure/ui-avatar';
 import { View } from '@instructure/ui-view';
 import { Table } from '@instructure/ui-table';
-import { IconEditLine, IconWarningLine } from '@instructure/ui-icons';
+import { IconEditLine, IconWarningLine, IconWarningSolid } from '@instructure/ui-icons';
 import { IconButton } from '@instructure/ui-buttons';
 import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
@@ -39,6 +39,7 @@ import { withI18nSupport, withStyleOverrides } from '@instructure/quiz-common';
 import FormattedDuration from '../../../../common/components/shared/FormattedDuration';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
+import { Tooltip } from '@instructure/ui-tooltip';
 var DASHES = '---';
 export var ModerateTableRow = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_ModerateTableRow = /*#__PURE__*/function (_withI18nSupport) {
   function ModerateTableRow() {
@@ -223,6 +224,26 @@ export var ModerateTableRow = (_dec = withStyleOverrides(generateStyle, generate
         }, message);
       });
     }
+  }, {
+    key: "renderLogMessage",
+    value: function renderLogMessage() {
+      var multipleSessionAttempt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      var message = arguments.length > 1 ? arguments[1] : undefined;
+      return jsx(React.Fragment, null, jsx(Text, {
+        color: multipleSessionAttempt ? 'danger' : 'brand'
+      }, message), multipleSessionAttempt && jsx(Tooltip, {
+        renderTip: t('Multiple sessions detected'),
+        placement: "end",
+        on: ['click', 'hover', 'focus']
+      }, jsx(IconButton, {
+        screenReaderLabel: t('Multiple sessions detected'),
+        color: 'danger',
+        size: 'small',
+        renderIcon: IconWarningSolid,
+        withBackground: false,
+        withBorder: false
+      })));
+    }
   }, {
     key: "renderLogLinks",
     value: function renderLogLinks(quizSessions) {
@@ -240,6 +261,7 @@ export var ModerateTableRow = (_dec = withStyleOverrides(generateStyle, generate
       return quizSessions.map(function (quizSession) {
         var quizSessionId = quizSession.get('id');
         var message = quizSession.inProgress() || quizSession.reopeningGraded() ? t('In Progress') : t('View Log');
+        var logMessage = _this7.renderLogMessage(quizSession.get('multipleSessionAttempt'), message);
         function onClick(event) {
           onModerateLogClick({
             id: id,
@@ -253,7 +275,7 @@ export var ModerateTableRow = (_dec = withStyleOverrides(generateStyle, generate
         }, jsx(Link, {
           onClick: onClick,
           "data-automation": "sdk-moderation-moderate-session-log-link"
-        }, message));
+        }, logMessage));
       });
     }
   }, {

package/lib/banks/components/BankEntry/presenter.js

@@ -258,16 +258,14 @@ var BankEntry = exports.BankEntry = (_dec = (0, _quizCommon.withStyleOverrides)(
   }, {
     key: "isStimulusEntry",
     value: function isStimulusEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && !entry.isPassage;
+      var _this$props$bankEntry;
+      return (_this$props$bankEntry = this.props.bankEntry) === null || _this$props$bankEntry === void 0 ? void 0 : _this$props$bankEntry.isStimulusEntry;
     }
   }, {
     key: "isPassageEntry",
     value: function isPassageEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && entry.isPassage;
+      var _this$props$bankEntry2;
+      return (_this$props$bankEntry2 = this.props.bankEntry) === null || _this$props$bankEntry2 === void 0 ? void 0 : _this$props$bankEntry2.isPassageEntry;
     }
   }, {
     key: "getEditWarning",

package/lib/banks/components/BankEntryRow/presenter.js

@@ -163,16 +163,14 @@ var BankEntryRow = exports.BankEntryRow = (_dec = (0, _quizCommon.withStyleOverr
   }, {
     key: "isStimulusEntry",
     value: function isStimulusEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && !entry.isPassage;
+      var _this$props$bankEntry;
+      return (_this$props$bankEntry = this.props.bankEntry) === null || _this$props$bankEntry === void 0 ? void 0 : _this$props$bankEntry.isStimulusEntry;
     }
   }, {
     key: "isPassageEntry",
     value: function isPassageEntry() {
-      var entry = this.getEntry();
-      if (!entry) return false;
-      return entry.isStimulus && entry.isPassage;
+      var _this$props$bankEntry2;
+      return (_this$props$bankEntry2 = this.props.bankEntry) === null || _this$props$bankEntry2 === void 0 ? void 0 : _this$props$bankEntry2.isPassageEntry;
     }
   }, {
     key: "type",

package/lib/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -173,6 +173,7 @@ var StimulusEditInfo = exports.StimulusEditInfo = (_dec = (0, _quizCommon.withSt
       var automationPrefix = stimulus.passage ? 'text-block' : 'stimulus';
       var message = stimulus.passage ? (0, _formatMessage["default"])('Edit Text Block') : (0, _formatMessage["default"])('Edit Stimulus');
       return (0, _emotion.jsx)(_quizCommon.FormFieldGroup, {
+        "data-automation": "stimulus-edit-info",
         messages: this.inputErrors('onSelf'),
         description: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, message)
       }, (0, _emotion.jsx)(_uiHeading.Heading, {

package/lib/common/records/BankEntry.js

@@ -84,6 +84,20 @@ var BankEntry = exports.BankEntry = /*#__PURE__*/function (_ReduxRecord) {
       if (!this.isStimulus) return false;
       return (_this$getEntry2 = this.getEntry()) === null || _this$getEntry2 === void 0 ? void 0 : _this$getEntry2.isPassage;
     }
+  }, {
+    key: "isStimulusEntry",
+    get: function get() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && !entry.isPassage;
+    }
+  }, {
+    key: "isPassageEntry",
+    get: function get() {
+      var entry = this.getEntry();
+      if (!entry) return false;
+      return entry.isStimulus && entry.isPassage;
+    }
   }]);
 }((0, _reduxRecord["default"])({
   id: '0',

package/lib/common/records/QuizSession.js

@@ -214,6 +214,7 @@ var QuizSession = exports.QuizSession = /*#__PURE__*/function (_ReduxRecord) {
   user: (0, _immutable.Map)(),
   // Good candidate for another Record - Still relevant?
   bolaSessionItemsCount: null,
-  buildOnLastAttempt: null
+  buildOnLastAttempt: null,
+  multipleSessionAttempt: false
 }));
 var _default = exports["default"] = QuizSession;

package/lib/common/util/warningHelpers.js

@@ -55,13 +55,8 @@ var propsForStimulusVersioningWrapper = exports.propsForStimulusVersioningWrappe
   }
   var isPassage = args[args.length - 1];
   var restArgs = args.slice(0, -1);
-  var itemName = isPassage ? 'text block' : 'stimulus';
-  var title = (0, _formatMessage["default"])('Some students have already submitted answers for this {itemName}!', {
-    itemName: itemName
-  });
-  var content = (0, _formatMessage["default"])('You can apply your edits to a copy of this {itemName}' + ' which will only be seen by students that have not taken the assessment.' + ' Attached questions will be copied as well.', {
-    itemName: itemName
-  });
+  var title = isPassage ? (0, _formatMessage["default"])('Some students have already submitted answers for this text block!') : (0, _formatMessage["default"])('Some students have already submitted answers for this stimulus!');
+  var content = isPassage ? (0, _formatMessage["default"])('You can apply your edits to a copy of this text block' + ' which will only be seen by students that have not taken the assessment.' + ' Attached questions will be copied as well.') : (0, _formatMessage["default"])('You can apply your edits to a copy of this stimulus' + ' which will only be seen by students that have not taken the assessment.' + ' Attached questions will be copied as well.');
   return propsForVersioningWrapper.apply(void 0, [/*#__PURE__*/_react["default"].createElement(_uiText.Text, {
     color: "primary"
   }, /*#__PURE__*/_react["default"].createElement("b", null, (0, _formatMessage["default"])('Editing a copy.')), "\xA0", (0, _formatMessage["default"])('Statistics from this new copy will appear separate from the previous version.')), /*#__PURE__*/_react["default"].createElement(_uiText.Text, {

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

@@ -11,7 +11,7 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiA11yContent = require("@instructure/ui-a11y-content");
@@ -29,9 +29,12 @@ var _quizCommon = require("@instructure/quiz-common");
 var _FormattedDuration = _interopRequireDefault(require("../../../../common/components/shared/FormattedDuration"));
 var _styles = _interopRequireDefault(require("./styles"));
 var _theme = _interopRequireDefault(require("./theme"));
+var _uiTooltip = require("@instructure/ui-tooltip");
 var _dec, _class, _ModerateTableRow;
 /** @jsx jsx */
 /* eslint "array-callback-return": "warn" */
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _callSuper(_this, derived, args) {
   function isNativeReflectConstruct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
@@ -230,6 +233,26 @@ var ModerateTableRow = exports.ModerateTableRow = (_dec = (0, _quizCommon.withSt
         }, message);
       });
     }
+  }, {
+    key: "renderLogMessage",
+    value: function renderLogMessage() {
+      var multipleSessionAttempt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      var message = arguments.length > 1 ? arguments[1] : undefined;
+      return (0, _emotion.jsx)(_react["default"].Fragment, null, (0, _emotion.jsx)(_uiText.Text, {
+        color: multipleSessionAttempt ? 'danger' : 'brand'
+      }, message), multipleSessionAttempt && (0, _emotion.jsx)(_uiTooltip.Tooltip, {
+        renderTip: (0, _formatMessage["default"])('Multiple sessions detected'),
+        placement: "end",
+        on: ['click', 'hover', 'focus']
+      }, (0, _emotion.jsx)(_uiButtons.IconButton, {
+        screenReaderLabel: (0, _formatMessage["default"])('Multiple sessions detected'),
+        color: 'danger',
+        size: 'small',
+        renderIcon: _uiIcons.IconWarningSolid,
+        withBackground: false,
+        withBorder: false
+      })));
+    }
   }, {
     key: "renderLogLinks",
     value: function renderLogLinks(quizSessions) {
@@ -247,6 +270,7 @@ var ModerateTableRow = exports.ModerateTableRow = (_dec = (0, _quizCommon.withSt
       return quizSessions.map(function (quizSession) {
         var quizSessionId = quizSession.get('id');
         var message = quizSession.inProgress() || quizSession.reopeningGraded() ? (0, _formatMessage["default"])('In Progress') : (0, _formatMessage["default"])('View Log');
+        var logMessage = _this7.renderLogMessage(quizSession.get('multipleSessionAttempt'), message);
         function onClick(event) {
           onModerateLogClick({
             id: id,
@@ -260,7 +284,7 @@ var ModerateTableRow = exports.ModerateTableRow = (_dec = (0, _quizCommon.withSt
         }, (0, _emotion.jsx)(_uiLink.Link, {
           onClick: onClick,
           "data-automation": "sdk-moderation-moderate-session-log-link"
-        }, message));
+        }, logMessage));
       });
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "22.5.1-rc.0+a38ba1888",
+  "version": "22.5.1-rc.3+9e80eae7f",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -46,11 +46,11 @@
     "@instructure/emotion": "10.14.0",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "3.2.3",
-    "@instructure/quiz-common": "22.5.1-rc.0+a38ba1888",
-    "@instructure/quiz-i18n": "22.5.1-rc.0+a38ba1888",
-    "@instructure/quiz-interactions": "22.5.1-rc.0+a38ba1888",
-    "@instructure/quiz-number-input": "22.5.1-rc.0+a38ba1888",
-    "@instructure/quiz-rce": "22.5.1-rc.0+a38ba1888",
+    "@instructure/quiz-common": "22.5.1-rc.3+9e80eae7f",
+    "@instructure/quiz-i18n": "22.5.1-rc.3+9e80eae7f",
+    "@instructure/quiz-interactions": "22.5.1-rc.3+9e80eae7f",
+    "@instructure/quiz-number-input": "22.5.1-rc.3+9e80eae7f",
+    "@instructure/quiz-rce": "22.5.1-rc.3+9e80eae7f",
     "@instructure/ui-a11y-content": "10.14.0",
     "@instructure/ui-alerts": "10.14.0",
     "@instructure/ui-avatar": "10.14.0",
@@ -109,7 +109,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "22.5.1-rc.0+a38ba1888",
+    "instructure-validations": "22.5.1-rc.3+9e80eae7f",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -158,7 +158,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "22.5.1-rc.0+a38ba1888",
+    "quiz-presets": "22.5.1-rc.3+9e80eae7f",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -174,5 +174,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a38ba18881a7196bb841d679072efe03d3cdddbc"
+  "gitHead": "9e80eae7f4e99735bd7692001dfec5eaeae9ea31"
 }