@instructure/quiz-core 22.1.0 → 22.2.1

package/lib/common/records/BankEntry.js

@@ -74,7 +74,15 @@ var BankEntry = exports.BankEntry = /*#__PURE__*/function (_ReduxRecord) {
   }, {
     key: "isStimulus",
     get: function get() {
-      return this.entryType === 'Stimulus';
+      var _this$getEntry;
+      return this.entryType === 'Stimulus' && !((_this$getEntry = this.getEntry()) !== null && _this$getEntry !== void 0 && _this$getEntry.isPassage);
+    }
+  }, {
+    key: "isPassage",
+    get: function get() {
+      var _this$getEntry2;
+      if (!this.isStimulus) return false;
+      return (_this$getEntry2 = this.getEntry()) === null || _this$getEntry2 === void 0 ? void 0 : _this$getEntry2.isPassage;
     }
   }]);
 }((0, _reduxRecord["default"])({

package/lib/common/records/QuizEntry.js

@@ -376,7 +376,7 @@ var QuizEntry = exports.QuizEntry = (_dec = (0, _withStateCache["default"])(func
       var type;
       if (this.hasStimulus || this.isBank) {
         if (this.isPassage) {
-          type = (0, _formatMessage["default"])('Passage');
+          type = (0, _formatMessage["default"])('Text Block');
           var opts = {
             type: type,
             start: displayPosition - 1

package/lib/common/reducers/modifications.js

@@ -144,19 +144,28 @@ var _default = exports["default"] = function _default() {
           entryType: action.payload.bankEntryType
         };
         var stateWithBankEntryMods = updateObjectOfType(stateWithBankMods, _quizCommon.TEMPORARY_BANK_ENTRY_ID, bankEntryMods, 'bankEntries');
-        var bankItemMods = action.payload.bankEntryType === 'Item' ? {
-          interactionData: action.payload.interactionTypeData.interactionData,
-          interactionType: action.payload.interactionTypeData.id,
-          itemBody: action.payload.interactionTypeData.itemBody,
-          properties: action.payload.interactionTypeData.properties,
-          scoringData: action.payload.interactionTypeData.scoringData,
-          title: null
-        } : {
-          title: ''
-        };
+        var bankItemMods;
+        if (action.payload.bankEntryType === 'Item') {
+          bankItemMods = {
+            interactionData: action.payload.interactionTypeData.interactionData,
+            interactionType: action.payload.interactionTypeData.id,
+            itemBody: action.payload.interactionTypeData.itemBody,
+            properties: action.payload.interactionTypeData.properties,
+            scoringData: action.payload.interactionTypeData.scoringData,
+            title: null
+          };
+        } else {
+          var isPassage = action.payload.interactionTypeData.passage;
+          bankItemMods = isPassage ? {
+            title: '',
+            passage: true,
+            orientation: 'top'
+          } : {
+            title: ''
+          };
+        }
         var collection = action.payload.bankEntryType === 'Item' ? 'items' : 'stimuli';
-        var stateWithMods = updateObjectOfType(stateWithBankEntryMods, tempId, bankItemMods, collection);
-        return stateWithMods;
+        return updateObjectOfType(stateWithBankEntryMods, tempId, bankItemMods, collection);
       }();
     case _quizCommon.CLEAR_NEXT_QUIZ_ENTRY:
       return state["delete"]('nextQuizEntry');

package/lib/common/util/warningHelpers.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.propsForStimulusVersioningWrapper = exports.propsForStimulusBankEntryEditPrompt = exports.propsForItemVersioningWrapper = exports.propsForItemBankEntryEditPrompt = exports.propsForBankEntryVersioningWrapper = exports.propsForBankEntryUnauthorizedEdit = exports.propsForBankEntryEditPrompt = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _partial = _interopRequireDefault(require("lodash/partial"));
 var _uiText = require("@instructure/ui-text");
@@ -52,11 +53,20 @@ var propsForStimulusVersioningWrapper = exports.propsForStimulusVersioningWrappe
   for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
     args[_key2] = arguments[_key2];
   }
+  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
+  });
   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, {
     color: "primary"
-  }, /*#__PURE__*/_react["default"].createElement("b", null, (0, _formatMessage["default"])('Some students have already submitted answers for this stimulus!')), "\xA0", (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.'))].concat(args));
+  }, /*#__PURE__*/_react["default"].createElement("b", null, title), "\xA0", content)].concat((0, _toConsumableArray2["default"])(restArgs)));
 };
 var propsForBankEntryVersioningWrapper = exports.propsForBankEntryVersioningWrapper = function propsForBankEntryVersioningWrapper() {
   for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
@@ -91,8 +101,8 @@ var propsForItemBankEntryEditPrompt = exports.propsForItemBankEntryEditPrompt =
 };
 var propsForStimulusBankEntryEditPrompt = exports.propsForStimulusBankEntryEditPrompt = function propsForStimulusBankEntryEditPrompt() {
   var isPassage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var title = isPassage ? (0, _formatMessage["default"])('Banked Passage.') : (0, _formatMessage["default"])('Banked Stimulus.');
-  var content = isPassage ? (0, _formatMessage["default"])('Editing of this passage must take place within the bank.') : (0, _formatMessage["default"])('Editing of this stimulus must take place within the bank.');
+  var title = isPassage ? (0, _formatMessage["default"])('Banked Text Block.') : (0, _formatMessage["default"])('Banked Stimulus.');
+  var content = isPassage ? (0, _formatMessage["default"])('Editing of this text block must take place within the bank.') : (0, _formatMessage["default"])('Editing of this stimulus must take place within the bank.');
   var promptComponent = /*#__PURE__*/_react["default"].createElement(_uiView.View, {
     as: "div",
     "data-automation": "sdk-editInBanks-warning"

package/lib/moderating/components/resources/EventDetails.js

@@ -37,13 +37,13 @@ var EventDetails = exports.EventDetails = function EventDetails(_ref) {
     id: "system-details-attribute"
   }, (0, _formatMessage["default"])('Attribute')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.ColHeader, {
     id: "system-details-value"
-  }, (0, _formatMessage["default"])('Value')))), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Body, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Client IP address')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, /*#__PURE__*/_react["default"].createElement(_uiText.Text, {
+  }, (0, _formatMessage["default"])('Value')))), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Body, null, currentEventData.ipAddress && /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Client IP address')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, /*#__PURE__*/_react["default"].createElement(_uiText.Text, {
     color: validationErrors.ipAddress ? 'danger' : 'primary'
   }, currentEventData.ipAddress), validationErrors.ipAddress && renderTooltip(validationErrors.ipAddress))), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Browser session ID')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, /*#__PURE__*/_react["default"].createElement(_uiText.Text, {
     color: validationErrors.browserSessionID ? 'danger' : 'primary'
-  }, currentEventData.browserSessionID), validationErrors.browserSessionID && renderTooltip(validationErrors.browserSessionID))), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Browser')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, /*#__PURE__*/_react["default"].createElement(_uiText.Text, {
+  }, currentEventData.browserSessionID), validationErrors.browserSessionID && renderTooltip(validationErrors.browserSessionID))), currentEventData.browserString && /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Browser')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, /*#__PURE__*/_react["default"].createElement(_uiText.Text, {
     color: validationErrors.browserString ? 'danger' : 'primary'
-  }, currentEventData.browserString), validationErrors.browserString && renderTooltip(validationErrors.browserString))), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Operating System')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, /*#__PURE__*/_react["default"].createElement(_uiText.Text, {
+  }, currentEventData.browserString), renderTooltip(validationErrors.browserString))), currentEventData.userPlatform && /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Operating System')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, /*#__PURE__*/_react["default"].createElement(_uiText.Text, {
     color: validationErrors.userPlatform ? 'danger' : 'primary'
   }, currentEventData.userPlatform), validationErrors.userPlatform && renderTooltip(validationErrors.userPlatform))), answerValue && /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Row, null, /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, (0, _formatMessage["default"])('Answer value')), /*#__PURE__*/_react["default"].createElement(_uiTable.Table.Cell, null, answerValue)))));
 };

package/lib/moderating/components/resources/SessionBreachAlert.js

@@ -12,5 +12,5 @@ var SessionBreachAlert = exports.SessionBreachAlert = function SessionBreachAler
   return /*#__PURE__*/_react["default"].createElement(_uiAlerts.Alert, {
     variant: "warning",
     margin: "small"
-  }, (0, _formatMessage["default"])('Potential breach: This Quiz appears to have been accessed from multiple devices or browsers.'), /*#__PURE__*/_react["default"].createElement("br", null), (0, _formatMessage["default"])('Review the activity log and take appropriate action.'));
+  }, (0, _formatMessage["default"])('This Quiz appears to have been accessed from multiple devices or browsers.'), /*#__PURE__*/_react["default"].createElement("br", null), (0, _formatMessage["default"])('Review the activity log and take appropriate action.'));
 };

package/lib/moderating/components/resources/util/checkIsBreach.js

@@ -26,7 +26,7 @@ var checkIsBreach = exports.checkIsBreach = function checkIsBreach(firstEventDat
   checks.forEach(function (_ref) {
     var key = _ref.key,
       message = _ref.message;
-    if (currentEventData[key] !== firstEventData[key]) {
+    if (currentEventData[key] && currentEventData[key] !== firstEventData[key]) {
       result.isBreach = true;
       result[key] = message;
     }

package/lib/moderating/components/resources/util/extractSessionData.js

@@ -16,12 +16,16 @@ var extractSessionData = exports.extractSessionData = function extractSessionDat
     userPlatform: ''
   };
   var clientTimestamp = sourceData.getIn(['eventData', 'clientTimestamp']);
-  var userPlatform = _platform["default"].parse(sourceData.getIn(['eventData', 'userAgent']));
+  var userAgent = sourceData.getIn(['eventData', 'userAgent']);
+  var userPlatform = null;
+  if (userAgent) {
+    userPlatform = _platform["default"].parse(userAgent);
+  }
   return {
     ipAddress: sourceData.getIn(['eventData', 'ipAddress']),
     browserSessionID: sourceData.getIn(['eventData', 'browserSessionId']),
     eventDate: clientTimestamp ? (0, _quizI18n.formatDateTimeSeconds)(clientTimestamp) : '',
-    browserString: "".concat(userPlatform.name, " ").concat(userPlatform.version),
-    userPlatform: userPlatform.os.toString()
+    browserString: userPlatform ? "".concat(userPlatform.name, " ").concat(userPlatform.version) : null,
+    userPlatform: userPlatform ? userPlatform.os.toString() : null
   };
 };

package/lib/moderating/components/sidebar/ModerateTray/presenter.js

@@ -229,14 +229,14 @@ var ModerateTray = exports.ModerateTray = /*#__PURE__*/function (_Component) {
         as: "div",
         direction: "column",
         height: "100vh"
-      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react["default"].createElement(_quizCommon.Flex.Item, {
+      }, this.renderTitleAndCloseButton(), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_quizCommon.Flex.Item, {
         padding: "medium medium 0 medium"
       }, this.renderNameWithTooltip()), /*#__PURE__*/_react["default"].createElement(_quizCommon.Flex.Item, {
-        padding: "medium"
-      }, (0, _formatMessage["default"])('These settings apply to current and all future attempts.')), /*#__PURE__*/_react["default"].createElement(_quizCommon.Flex.Item, {
+        padding: "medium medium 0"
+      }, (0, _formatMessage["default"])('These settings apply to current and all future attempts.'))), /*#__PURE__*/_react["default"].createElement(_quizCommon.Flex.Item, {
         shouldGrow: true,
-        padding: "0 medium"
-      }, this.renderChildren()), this.props.atteqApplyChangesToCurrentQuizAttemptsEnabled && /*#__PURE__*/_react["default"].createElement(_quizCommon.Flex.Item, null, this.renderFooter())));
+        padding: "medium medium 0"
+      }, this.renderChildren()), /*#__PURE__*/_react["default"].createElement(_quizCommon.Flex.Item, null, this.renderFooter())));
     }
   }]);
 }(_react.Component);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "22.1.0",
+  "version": "22.2.1",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -111,12 +111,12 @@
     "store": "^1.3.20",
     "striptags": "^2.0.0",
     "uuid": "^3.2.1",
-    "@instructure/quiz-common": "22.1.0",
-    "@instructure/quiz-i18n": "22.1.0",
-    "@instructure/quiz-interactions": "22.1.0",
-    "@instructure/quiz-rce": "22.1.0",
-    "@instructure/quiz-number-input": "22.1.0",
-    "instructure-validations": "22.1.0"
+    "@instructure/quiz-i18n": "22.2.1",
+    "@instructure/quiz-common": "22.2.1",
+    "@instructure/quiz-interactions": "22.2.1",
+    "@instructure/quiz-number-input": "22.2.1",
+    "@instructure/quiz-rce": "22.2.1",
+    "instructure-validations": "22.2.1"
   },
   "devDependencies": {
     "@instructure/ui-axe-check": "10.14.0",
@@ -144,8 +144,8 @@
     "request": "^2.74.0",
     "sinon": "^6.1.3",
     "sinon-chai": "^3.3.0",
-    "quiz-presets": "22.1.0",
-    "@instructure/quiz-scripts": "21.0.0"
+    "@instructure/quiz-scripts": "21.0.0",
+    "quiz-presets": "22.2.1"
   },
   "peerDependencies": {
     "react": "^15 || ^16"