@instructure/quiz-core 22.5.1-rc.1 → 22.5.1-rc.5

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/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/configureStore.js

@@ -1,7 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { createStore, applyMiddleware } from 'redux';
 import { combineReducers } from 'redux-immutable';
-import union from 'lodash/union';
 import flowRight from 'lodash/flowRight';
 
 // middleware
@@ -56,10 +55,14 @@ import sharedBanks from './common/reducers/sharedBanks';
 export function configureStore(_ref) {
   var _ref$extraMiddleware = _ref.extraMiddleware,
     extraMiddleware = _ref$extraMiddleware === void 0 ? [] : _ref$extraMiddleware,
+    _ref$initialState = _ref.initialState,
+    initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState,
     _ref$inDevelopment = _ref.inDevelopment,
     inDevelopment = _ref$inDevelopment === void 0 ? false : _ref$inDevelopment,
-    _ref$initialState = _ref.initialState,
-    initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState;
+    _ref$isTest = _ref.isTest,
+    isTest = _ref$isTest === void 0 ? false : _ref$isTest,
+    _ref$middlewareOverri = _ref.middlewareOverrides,
+    middlewareOverrides = _ref$middlewareOverri === void 0 ? {} : _ref$middlewareOverri;
   var loggerMiddleware = createLogger({
     // immutable state returned as raw JS
     // for readability's sake
@@ -71,13 +74,18 @@ export function configureStore(_ref) {
       return "SDK action %c".concat(String(action.type));
     }
   });
-  var kinesisMiddleware = eventLoggerMiddlewareCreator();
-  var websocketMiddleware = createQuizTimerWebSocketMiddleware();
-  var baseMiddleware = [alertTimerMiddleware, crossDomainMessagingMiddleware, multi, kinesisMiddleware, thunkMiddleware, websocketMiddleware];
-  var devMiddleware = [loggerMiddleware];
-  var middlewareToApply = inDevelopment ? union(baseMiddleware, devMiddleware) : baseMiddleware;
-  middlewareToApply = union(middlewareToApply, extraMiddleware);
-  var createStoreWithMiddlewareApplied = flowRight(applyMiddleware.apply(void 0, _toConsumableArray(middlewareToApply)),
+  var getMiddleware = function getMiddleware(implementation, override) {
+    return isTest && override ? override : implementation;
+  };
+  var middlewares = [getMiddleware(alertTimerMiddleware, middlewareOverrides.alertTimerMiddleware), getMiddleware(crossDomainMessagingMiddleware, middlewareOverrides.crossDomainMessagingMiddleware), getMiddleware(multi, middlewareOverrides.multiMiddleware), getMiddleware(eventLoggerMiddlewareCreator(), middlewareOverrides.kinesisMiddleware), getMiddleware(thunkMiddleware, middlewareOverrides.thunkMiddleware), getMiddleware(createQuizTimerWebSocketMiddleware(), middlewareOverrides.websocketMiddleware)];
+  var devMiddleware = [getMiddleware(loggerMiddleware, middlewareOverrides.logger)];
+  if (inDevelopment) {
+    middlewares.push.apply(middlewares, devMiddleware);
+  }
+  if (extraMiddleware && extraMiddleware.length > 0) {
+    middlewares.push.apply(middlewares, _toConsumableArray(extraMiddleware));
+  }
+  var createStoreWithMiddlewareApplied = flowRight(applyMiddleware.apply(void 0, middlewares),
   // todo: tweak middleware to handle (re)routing with devtools
   window.devToolsExtension ? window.devToolsExtension({
     name: 'quiz-core'

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/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/configureStore.js

@@ -9,7 +9,6 @@ exports["default"] = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _redux = require("redux");
 var _reduxImmutable = require("redux-immutable");
-var _union = _interopRequireDefault(require("lodash/union"));
 var _flowRight = _interopRequireDefault(require("lodash/flowRight"));
 var _reduxLogger = _interopRequireDefault(require("redux-logger"));
 var _reduxMulti = _interopRequireDefault(require("redux-multi"));
@@ -64,10 +63,14 @@ var _sharedBanks = _interopRequireDefault(require("./common/reducers/sharedBanks
 function configureStore(_ref) {
   var _ref$extraMiddleware = _ref.extraMiddleware,
     extraMiddleware = _ref$extraMiddleware === void 0 ? [] : _ref$extraMiddleware,
+    _ref$initialState = _ref.initialState,
+    initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState,
     _ref$inDevelopment = _ref.inDevelopment,
     inDevelopment = _ref$inDevelopment === void 0 ? false : _ref$inDevelopment,
-    _ref$initialState = _ref.initialState,
-    initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState;
+    _ref$isTest = _ref.isTest,
+    isTest = _ref$isTest === void 0 ? false : _ref$isTest,
+    _ref$middlewareOverri = _ref.middlewareOverrides,
+    middlewareOverrides = _ref$middlewareOverri === void 0 ? {} : _ref$middlewareOverri;
   var loggerMiddleware = (0, _reduxLogger["default"])({
     // immutable state returned as raw JS
     // for readability's sake
@@ -79,13 +82,18 @@ function configureStore(_ref) {
       return "SDK action %c".concat(String(action.type));
     }
   });
-  var kinesisMiddleware = (0, _eventLoggerMiddleware["default"])();
-  var websocketMiddleware = (0, _quizTimerWebSocketMiddleware.createQuizTimerWebSocketMiddleware)();
-  var baseMiddleware = [_alertTimerMiddleware["default"], _crossDomainMessagingMiddleware["default"], _reduxMulti["default"], kinesisMiddleware, _reduxThunk["default"], websocketMiddleware];
-  var devMiddleware = [loggerMiddleware];
-  var middlewareToApply = inDevelopment ? (0, _union["default"])(baseMiddleware, devMiddleware) : baseMiddleware;
-  middlewareToApply = (0, _union["default"])(middlewareToApply, extraMiddleware);
-  var createStoreWithMiddlewareApplied = (0, _flowRight["default"])(_redux.applyMiddleware.apply(void 0, (0, _toConsumableArray2["default"])(middlewareToApply)),
+  var getMiddleware = function getMiddleware(implementation, override) {
+    return isTest && override ? override : implementation;
+  };
+  var middlewares = [getMiddleware(_alertTimerMiddleware["default"], middlewareOverrides.alertTimerMiddleware), getMiddleware(_crossDomainMessagingMiddleware["default"], middlewareOverrides.crossDomainMessagingMiddleware), getMiddleware(_reduxMulti["default"], middlewareOverrides.multiMiddleware), getMiddleware((0, _eventLoggerMiddleware["default"])(), middlewareOverrides.kinesisMiddleware), getMiddleware(_reduxThunk["default"], middlewareOverrides.thunkMiddleware), getMiddleware((0, _quizTimerWebSocketMiddleware.createQuizTimerWebSocketMiddleware)(), middlewareOverrides.websocketMiddleware)];
+  var devMiddleware = [getMiddleware(loggerMiddleware, middlewareOverrides.logger)];
+  if (inDevelopment) {
+    middlewares.push.apply(middlewares, devMiddleware);
+  }
+  if (extraMiddleware && extraMiddleware.length > 0) {
+    middlewares.push.apply(middlewares, (0, _toConsumableArray2["default"])(extraMiddleware));
+  }
+  var createStoreWithMiddlewareApplied = (0, _flowRight["default"])(_redux.applyMiddleware.apply(void 0, middlewares),
   // todo: tweak middleware to handle (re)routing with devtools
   window.devToolsExtension ? window.devToolsExtension({
     name: 'quiz-core'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "22.5.1-rc.1+4398afa5e",
+  "version": "22.5.1-rc.5+e1fde763f",
   "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.1+4398afa5e",
-    "@instructure/quiz-i18n": "22.5.1-rc.1+4398afa5e",
-    "@instructure/quiz-interactions": "22.5.1-rc.1+4398afa5e",
-    "@instructure/quiz-number-input": "22.5.1-rc.1+4398afa5e",
-    "@instructure/quiz-rce": "22.5.1-rc.1+4398afa5e",
+    "@instructure/quiz-common": "22.5.1-rc.5+e1fde763f",
+    "@instructure/quiz-i18n": "22.5.1-rc.5+e1fde763f",
+    "@instructure/quiz-interactions": "22.5.1-rc.5+e1fde763f",
+    "@instructure/quiz-number-input": "22.5.1-rc.5+e1fde763f",
+    "@instructure/quiz-rce": "22.5.1-rc.5+e1fde763f",
     "@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.1+4398afa5e",
+    "instructure-validations": "22.5.1-rc.5+e1fde763f",
     "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.1+4398afa5e",
+    "quiz-presets": "22.5.1-rc.5+e1fde763f",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -174,5 +174,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4398afa5ecd68d16a7af1bcf65b321ae7feaa17a"
+  "gitHead": "e1fde763f287e302f0b7741e47679a9c05ba5b5d"
 }