@instructure/quiz-core 22.2.2-rc.4 → 22.2.2-rc.6

package/es/building/components/resources/quizEntry/QuizEntryBank/QuizEntryBankEdit/index.js

@@ -2,6 +2,7 @@ import QuizEntryBankEdit from './presenter';
 import { connect } from '../../../../../../common/react-redux';
 import { changeQuizEntryPoints, changeQuizEntryProperties, changeQuizEntryEntry, clearModifications } from '../../../../../../common/actions/modifications';
 import { updateQuizEntry } from '../../../../../api/quizEntries';
+import { addBank } from '../../../../../../common/actions/banks';
 export function mapStateToProps(state, props) {
   var workingQuizEntry = props.quizEntry.getWorkingInstance();
   var properties = workingQuizEntry.properties;
@@ -20,5 +21,6 @@ export default connect(mapStateToProps, {
   changeQuizEntryProperties: changeQuizEntryProperties,
   changeQuizEntryEntry: changeQuizEntryEntry,
   clearModifications: clearModifications,
-  updateQuizEntry: updateQuizEntry
+  updateQuizEntry: updateQuizEntry,
+  addBank: addBank
 })(QuizEntryBankEdit);

package/es/building/components/resources/quizEntry/QuizEntryBank/QuizEntryBankEdit/presenter.js

@@ -70,6 +70,7 @@ export var QuizEntryBankEdit = (_dec = withStyleOverrides(generateStyle, generat
       _this2.props.changeQuizEntryProperties(_this2.props.quizEntry.id, properties);
     });
     _defineProperty(_this2, "onBankSelection", function (event, option) {
+      _this2.props.addBank(option.id, option);
       _this2.props.changeQuizEntryEntry(_this2.props.quizEntry.id, option.id);
     });
     _defineProperty(_this2, "handleQuestionChange", function (event, selection) {
@@ -229,7 +230,8 @@ export var QuizEntryBankEdit = (_dec = withStyleOverrides(generateStyle, generat
   updateQuizEntry: PropTypes.func.isRequired,
   workingBank: PropTypes.instanceOf(Bank).isRequired,
   workingQuizEntry: PropTypes.instanceOf(QuizEntry).isRequired,
-  styles: PropTypes.object
+  styles: PropTypes.object,
+  addBank: PropTypes.func.isRequired
 }), _defineProperty(_QuizEntryBankEdit, "defaultProps", {
   sampleNum: void 0
 }), _QuizEntryBankEdit)) || _class);

package/es/common/actions/banks.js

@@ -1,4 +1,13 @@
-import { ADD_BANKS, SET_BANK_FILTERS, ARCHIVE_BANK, ASSOCIATE_ENTRIES, DISASSOCIATE_ENTRY, REMOVE_BANK } from '@instructure/quiz-common';
+import { ADD_BANK, ADD_BANKS, SET_BANK_FILTERS, ARCHIVE_BANK, ASSOCIATE_ENTRIES, DISASSOCIATE_ENTRY, REMOVE_BANK } from '@instructure/quiz-common';
+export var addBank = function addBank(bankId, selectedBank) {
+  return {
+    type: ADD_BANK,
+    payload: {
+      id: bankId,
+      bank: selectedBank
+    }
+  };
+};
 export var addBanks = function addBanks(banks) {
   return {
     type: ADD_BANKS,

package/es/common/components/resources/BankSelection/index.js

@@ -1,6 +1,5 @@
 import { List } from 'immutable';
 import { connect } from '../../../react-redux';
-import { getAllBanks } from '../../../../banks/api/banks';
 import BankSelection from './presenter';
 import Bank from '../../../records/Bank';
 import { set } from '../../../actions/ui';
@@ -14,6 +13,5 @@ export function mapStateToProps(state, props) {
   };
 }
 export default connect(mapStateToProps, {
-  getAllBanks: getAllBanks,
   setUi: set
 })(BankSelection);

package/es/common/components/resources/BankSelection/presenter.js

@@ -5,6 +5,8 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 function _callSuper(_this, derived, args) {
   function isNativeReflectConstruct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
@@ -43,20 +45,16 @@ export var BankSelection = /*#__PURE__*/function (_Component) {
         var _ref2 = _slicedToArray(_ref, 1),
           banks = _ref2[0];
         return banks.map(function (b) {
-          return {
-            id: b.id,
-            text: b.title,
-            archived: b.archived
-          };
+          return _objectSpread(_objectSpread({}, b), {}, {
+            text: b.title
+          });
         });
       });
     });
     _defineProperty(_this2, "onSelect", function (e, bankOption) {
-      return _this2.props.onBankSelection(e, {
-        id: parseInt(bankOption.id),
-        title: bankOption.text,
-        archived: bankOption.archived
-      });
+      return _this2.props.onBankSelection(e, _objectSpread(_objectSpread({}, bankOption), {}, {
+        title: bankOption.text
+      }));
     });
     _this2.inputRef = null;
     return _this2;
@@ -88,11 +86,9 @@ export var BankSelection = /*#__PURE__*/function (_Component) {
     key: "selectedOption",
     value: function selectedOption() {
       var selectedBank = this.props.selectedBank;
-      return selectedBank ? {
-        id: selectedBank.id,
-        text: selectedBank.title,
-        archived: selectedBank.archived
-      } : null;
+      return selectedBank ? _objectSpread(_objectSpread({}, selectedBank), {}, {
+        text: selectedBank.title
+      }) : null;
     }
   }, {
     key: "render",

package/es/common/reducers/banks.js

@@ -1,9 +1,12 @@
 import keyBy from 'lodash/keyBy';
 import { fromJS, Set } from 'immutable';
-import { ADD_BANKS, SET_BANK_FILTERS, ARCHIVE_BANK, ASSOCIATE_ENTRIES, DISASSOCIATE_ENTRY, REMOVE_BANK } from '@instructure/quiz-common';
+import { ADD_BANK, ADD_BANKS, SET_BANK_FILTERS, ARCHIVE_BANK, ASSOCIATE_ENTRIES, DISASSOCIATE_ENTRY, REMOVE_BANK } from '@instructure/quiz-common';
 var addBanks = function addBanks(state, banks) {
   return state.mergeDeep(fromJS(keyBy(banks, 'id')));
 };
+var addBank = function addBank(state, payload) {
+  return state.set(payload.id, payload.bank);
+};
 var setBankFilters = function setBankFilters(state, _ref) {
   var bankId = _ref.bankId,
     filters = _ref.filters;
@@ -29,6 +32,8 @@ export default (function () {
   switch (action.type) {
     case ADD_BANKS:
       return addBanks(state, action.payload);
+    case ADD_BANK:
+      return addBank(state, action.payload);
     case SET_BANK_FILTERS:
       return setBankFilters(state, action.payload);
     case ASSOCIATE_ENTRIES:

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

@@ -36,7 +36,7 @@ export var EventDetails = function EventDetails(_ref) {
     color: validationErrors.browserSessionID ? 'danger' : 'primary'
   }, currentEventData.browserSessionID), validationErrors.browserSessionID && renderTooltip(validationErrors.browserSessionID))), currentEventData.browserString && /*#__PURE__*/React.createElement(Table.Row, null, /*#__PURE__*/React.createElement(Table.Cell, null, t('Browser')), /*#__PURE__*/React.createElement(Table.Cell, null, /*#__PURE__*/React.createElement(Text, {
     color: validationErrors.browserString ? 'danger' : 'primary'
-  }, currentEventData.browserString), renderTooltip(validationErrors.browserString))), currentEventData.userPlatform && /*#__PURE__*/React.createElement(Table.Row, null, /*#__PURE__*/React.createElement(Table.Cell, null, t('Operating System')), /*#__PURE__*/React.createElement(Table.Cell, null, /*#__PURE__*/React.createElement(Text, {
+  }, currentEventData.browserString), validationErrors.browserString && renderTooltip(validationErrors.browserString))), currentEventData.userPlatform && /*#__PURE__*/React.createElement(Table.Row, null, /*#__PURE__*/React.createElement(Table.Cell, null, t('Operating System')), /*#__PURE__*/React.createElement(Table.Cell, null, /*#__PURE__*/React.createElement(Text, {
     color: validationErrors.userPlatform ? 'danger' : 'primary'
   }, currentEventData.userPlatform), validationErrors.userPlatform && renderTooltip(validationErrors.userPlatform))), answerValue && /*#__PURE__*/React.createElement(Table.Row, null, /*#__PURE__*/React.createElement(Table.Cell, null, t('Answer value')), /*#__PURE__*/React.createElement(Table.Cell, null, answerValue)))));
 };

package/lib/building/components/resources/quizEntry/QuizEntryBank/QuizEntryBankEdit/index.js

@@ -10,6 +10,7 @@ var _presenter = _interopRequireDefault(require("./presenter"));
 var _reactRedux = require("../../../../../../common/react-redux");
 var _modifications = require("../../../../../../common/actions/modifications");
 var _quizEntries = require("../../../../../api/quizEntries");
+var _banks = require("../../../../../../common/actions/banks");
 function mapStateToProps(state, props) {
   var workingQuizEntry = props.quizEntry.getWorkingInstance();
   var properties = workingQuizEntry.properties;
@@ -28,5 +29,6 @@ var _default = exports["default"] = (0, _reactRedux.connect)(mapStateToProps, {
   changeQuizEntryProperties: _modifications.changeQuizEntryProperties,
   changeQuizEntryEntry: _modifications.changeQuizEntryEntry,
   clearModifications: _modifications.clearModifications,
-  updateQuizEntry: _quizEntries.updateQuizEntry
+  updateQuizEntry: _quizEntries.updateQuizEntry,
+  addBank: _banks.addBank
 })(_presenter["default"]);

package/lib/building/components/resources/quizEntry/QuizEntryBank/QuizEntryBankEdit/presenter.js

@@ -77,6 +77,7 @@ var QuizEntryBankEdit = exports.QuizEntryBankEdit = (_dec = (0, _quizCommon.with
       _this2.props.changeQuizEntryProperties(_this2.props.quizEntry.id, properties);
     });
     (0, _defineProperty2["default"])(_this2, "onBankSelection", function (event, option) {
+      _this2.props.addBank(option.id, option);
       _this2.props.changeQuizEntryEntry(_this2.props.quizEntry.id, option.id);
     });
     (0, _defineProperty2["default"])(_this2, "handleQuestionChange", function (event, selection) {
@@ -236,7 +237,8 @@ var QuizEntryBankEdit = exports.QuizEntryBankEdit = (_dec = (0, _quizCommon.with
   updateQuizEntry: _propTypes["default"].func.isRequired,
   workingBank: _propTypes["default"].instanceOf(_Bank["default"]).isRequired,
   workingQuizEntry: _propTypes["default"].instanceOf(_QuizEntry["default"]).isRequired,
-  styles: _propTypes["default"].object
+  styles: _propTypes["default"].object,
+  addBank: _propTypes["default"].func.isRequired
 }), (0, _defineProperty2["default"])(_QuizEntryBankEdit, "defaultProps", {
   sampleNum: void 0
 }), _QuizEntryBankEdit)) || _class);

package/lib/common/actions/banks.js

@@ -3,8 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setBankFilters = exports.removeBank = exports.disassociateEntry = exports.associateEntries = exports.archiveBank = exports.addBanks = void 0;
+exports.setBankFilters = exports.removeBank = exports.disassociateEntry = exports.associateEntries = exports.archiveBank = exports.addBanks = exports.addBank = void 0;
 var _quizCommon = require("@instructure/quiz-common");
+var addBank = exports.addBank = function addBank(bankId, selectedBank) {
+  return {
+    type: _quizCommon.ADD_BANK,
+    payload: {
+      id: bankId,
+      bank: selectedBank
+    }
+  };
+};
 var addBanks = exports.addBanks = function addBanks(banks) {
   return {
     type: _quizCommon.ADD_BANKS,

package/lib/common/components/resources/BankSelection/index.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 exports.mapStateToProps = mapStateToProps;
 var _immutable = require("immutable");
 var _reactRedux = require("../../../react-redux");
-var _banks = require("../../../../banks/api/banks");
 var _presenter = _interopRequireDefault(require("./presenter"));
 var _Bank = _interopRequireDefault(require("../../../records/Bank"));
 var _ui = require("../../../actions/ui");
@@ -22,6 +21,5 @@ function mapStateToProps(state, props) {
   };
 }
 var _default = exports["default"] = (0, _reactRedux.connect)(mapStateToProps, {
-  getAllBanks: _banks.getAllBanks,
   setUi: _ui.set
 })(_presenter["default"]);

package/lib/common/components/resources/BankSelection/presenter.js

@@ -21,6 +21,8 @@ var _banks = require("../../../../banks/api/banks");
 var _GenericAsyncSearch = require("../../shared/GenericAsyncSearch/GenericAsyncSearch");
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 function _callSuper(_this, derived, args) {
   function isNativeReflectConstruct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
@@ -52,20 +54,16 @@ var BankSelection = exports.BankSelection = /*#__PURE__*/function (_Component) {
         var _ref2 = (0, _slicedToArray2["default"])(_ref, 1),
           banks = _ref2[0];
         return banks.map(function (b) {
-          return {
-            id: b.id,
-            text: b.title,
-            archived: b.archived
-          };
+          return _objectSpread(_objectSpread({}, b), {}, {
+            text: b.title
+          });
         });
       });
     });
     (0, _defineProperty2["default"])(_this2, "onSelect", function (e, bankOption) {
-      return _this2.props.onBankSelection(e, {
-        id: parseInt(bankOption.id),
-        title: bankOption.text,
-        archived: bankOption.archived
-      });
+      return _this2.props.onBankSelection(e, _objectSpread(_objectSpread({}, bankOption), {}, {
+        title: bankOption.text
+      }));
     });
     _this2.inputRef = null;
     return _this2;
@@ -97,11 +95,9 @@ var BankSelection = exports.BankSelection = /*#__PURE__*/function (_Component) {
     key: "selectedOption",
     value: function selectedOption() {
       var selectedBank = this.props.selectedBank;
-      return selectedBank ? {
-        id: selectedBank.id,
-        text: selectedBank.title,
-        archived: selectedBank.archived
-      } : null;
+      return selectedBank ? _objectSpread(_objectSpread({}, selectedBank), {}, {
+        text: selectedBank.title
+      }) : null;
     }
   }, {
     key: "render",

package/lib/common/reducers/banks.js

@@ -11,6 +11,9 @@ var _quizCommon = require("@instructure/quiz-common");
 var addBanks = function addBanks(state, banks) {
   return state.mergeDeep((0, _immutable.fromJS)((0, _keyBy["default"])(banks, 'id')));
 };
+var addBank = function addBank(state, payload) {
+  return state.set(payload.id, payload.bank);
+};
 var setBankFilters = function setBankFilters(state, _ref) {
   var bankId = _ref.bankId,
     filters = _ref.filters;
@@ -36,6 +39,8 @@ var _default = exports["default"] = function _default() {
   switch (action.type) {
     case _quizCommon.ADD_BANKS:
       return addBanks(state, action.payload);
+    case _quizCommon.ADD_BANK:
+      return addBank(state, action.payload);
     case _quizCommon.SET_BANK_FILTERS:
       return setBankFilters(state, action.payload);
     case _quizCommon.ASSOCIATE_ENTRIES:

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

@@ -43,7 +43,7 @@ var EventDetails = exports.EventDetails = function EventDetails(_ref) {
     color: validationErrors.browserSessionID ? 'danger' : 'primary'
   }, 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), 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, {
+  }, currentEventData.browserString), validationErrors.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "22.2.2-rc.4+79b4cb282",
+  "version": "22.2.2-rc.6+8e84a4c05",
   "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.2.2-rc.4+79b4cb282",
-    "@instructure/quiz-i18n": "22.2.2-rc.4+79b4cb282",
-    "@instructure/quiz-interactions": "22.2.2-rc.4+79b4cb282",
-    "@instructure/quiz-number-input": "22.2.2-rc.4+79b4cb282",
-    "@instructure/quiz-rce": "22.2.2-rc.4+79b4cb282",
+    "@instructure/quiz-common": "22.2.2-rc.6+8e84a4c05",
+    "@instructure/quiz-i18n": "22.2.2-rc.6+8e84a4c05",
+    "@instructure/quiz-interactions": "22.2.2-rc.6+8e84a4c05",
+    "@instructure/quiz-number-input": "22.2.2-rc.6+8e84a4c05",
+    "@instructure/quiz-rce": "22.2.2-rc.6+8e84a4c05",
     "@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.2.2-rc.4+79b4cb282",
+    "instructure-validations": "22.2.2-rc.6+8e84a4c05",
     "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.2.2-rc.4+79b4cb282",
+    "quiz-presets": "22.2.2-rc.6+8e84a4c05",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -174,5 +174,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "79b4cb2829ad3043d3f58e810ec4747f5caac6fa"
+  "gitHead": "8e84a4c05bff4eda75c07083ba86e4c31d0d8120"
 }