@instructure/quiz-core 17.62.1-rc.1 → 17.62.1-rc.2

package/es/banks/api/banks.js

@@ -77,6 +77,21 @@ export var getBank = function getBank(bankId) {
     });
   };
 };
+export var getSpecificBanks = function getSpecificBanks() {
+  var bankIds = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+  return function (dispatch, getState) {
+    var fetcher = new Fetcher({
+      onError: handleError(dispatch, t('Failed to fetch banks.'))
+    });
+    var param = {
+      ids: bankIds
+    };
+    return fetcher.get("".concat(banksApiEndpoint, "/batch_show"), param).then(function (response) {
+      dispatch(handleBanksResponse(response));
+      return response;
+    });
+  };
+};
 export var createBank = function createBank(newBank, shareWithCourseUuid) {
   return function (dispatch, getState) {
     var newBankData = JSON.stringify({

package/es/banks/api/copyingBanksPoller.js

@@ -0,0 +1,99 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import t from '@instructure/quiz-i18n/es/format-message';
+import { addError, addSuccess } from "../../common/actions/alerts.js";
+import { getSpecificBanks } from "./banks.js";
+var pollingBanks = [];
+var currentlyPolling = false;
+export var addToPolling = function addToPolling(bankId, bankTitle) {
+  var getSpecificBanksFn = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : getSpecificBanks;
+  return function (dispatch) {
+    pollingBanks.push({
+      id: bankId,
+      title: bankTitle
+    });
+
+    if (!currentlyPolling) {
+      currentlyPolling = true;
+      handlePollingBanks(dispatch, getSpecificBanksFn);
+    }
+  };
+};
+
+var handlePollingBanks = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(dispatch) {
+    var getSpecificBanksFn,
+        updatedPollingBanks,
+        updatedPollingBankIds,
+        finishedCopying,
+        finishedCopyingIds,
+        _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            getSpecificBanksFn = _args.length > 1 && _args[1] !== void 0 ? _args[1] : getSpecificBanks;
+            _context.next = 3;
+            return getSpecificBanksFn(pollingBanks.map(function (bank) {
+              return bank.id;
+            }))(dispatch);
+
+          case 3:
+            updatedPollingBanks = _context.sent;
+            updatedPollingBankIds = updatedPollingBanks.map(function (updatedBank) {
+              return updatedBank.id;
+            }); // banks that now have status 'waiting' have finished successfully
+            // banks that are no longer in the updated list but were in the previous list have
+            // failed to copy and therefore were archived
+
+            finishedCopying = updatedPollingBanks.filter(function (bank) {
+              return bank.status === 'waiting';
+            }).concat(pollingBanks.filter(function (prevBank) {
+              return !updatedPollingBankIds.includes(prevBank.id);
+            }));
+            finishedCopying.forEach(function (bank) {
+              var bankInfo = updatedPollingBanks.find(function (info) {
+                return info.id == bank.id;
+              });
+
+              if ((bankInfo === null || bankInfo === void 0 ? void 0 : bankInfo.status) === 'waiting') {
+                dispatch(addSuccess(t('Created "{name}" successfully! Duplicate can be seen in \'All Banks\' filter.', {
+                  name: bank.title
+                })));
+              } else if (!bankInfo) {
+                dispatch(addError(t('Failed to create "{name}". Please try again.', {
+                  name: bank.title
+                })));
+              }
+            });
+            finishedCopyingIds = finishedCopying.map(function (bank) {
+              return bank.id;
+            });
+            removeFinishedCopies(finishedCopyingIds);
+
+            if (pollingBanks.length > 0) {
+              setTimeout(function () {
+                handlePollingBanks(dispatch);
+              }, 3000);
+            } else {
+              currentlyPolling = false;
+            }
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function handlePollingBanks(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var removeFinishedCopies = function removeFinishedCopies(finishedCopyingIds) {
+  pollingBanks = pollingBanks.filter(function (bank) {
+    return !finishedCopyingIds.includes(bank.id);
+  });
+};

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

@@ -174,8 +174,7 @@ export var Banks = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cla
         minChars: _this.props.minChars,
         navigateToBank: _this.props.navigateToBank,
         onShare: _this.props.onShare,
-        recordIds: recordIds,
-        redirectAllBanks: _this.handleBankCreated
+        recordIds: recordIds
       });
     };
 

package/es/banks/components/BanksList/index.js

@@ -6,6 +6,7 @@ import { openModal, withConfirm } from "../../../common/actions/modal.js";
 import { deleteBank, createBankCloneJob } from "../../api/banks.js";
 import { featureOn } from "../../../common/util/featureCheck.js";
 import { addInfo } from "../../../common/actions/alerts.js";
+import { addToPolling } from "../../api/copyingBanksPoller.js";
 export function mapStateToProps(state, props) {
   return {
     appContainer: state.getIn(['ui', 'appContainer']),
@@ -20,5 +21,6 @@ export default connect(mapStateToProps, {
   deleteBank: deleteBank,
   withConfirm: withConfirm,
   createBankCloneJob: createBankCloneJob,
-  addInfo: addInfo
+  addInfo: addInfo,
+  addToPolling: addToPolling
 })(BanksList);

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

@@ -44,7 +44,7 @@ var styles = {
 };
 import theme from "./theme.js";
 
-var _ref3 = /*#__PURE__*/React.createElement(Spinner, {
+var _ref4 = /*#__PURE__*/React.createElement(Spinner, {
   renderTitle: "Loading",
   size: "x-small"
 });
@@ -144,18 +144,41 @@ export var BanksList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
 
     _this.openDuplicateBankModal = function (bank) {
       return function () {
-        _this.createCloneJob = function () {
-          _this.props.createBankCloneJob(bank.id, _this.props.currentUser.uuid);
+        var createCloneJob = /*#__PURE__*/function () {
+          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+            var cloneJob;
+            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _context2.next = 2;
+                    return _this.props.createBankCloneJob(bank.id, _this.props.currentUser.uuid);
+
+                  case 2:
+                    cloneJob = _context2.sent;
+
+                    _this.props.addToPolling(cloneJob.cloned_bank_id, t('{name} Copy', {
+                      name: bank.title
+                    }));
+
+                    _this.props.addInfo(t('Creating "{name} Copy". Duplicate will appear in \'All Banks\'  filter.', {
+                      name: bank.title
+                    }));
+
+                  case 5:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }));
 
-          _this.props.addInfo( /*#__PURE__*/React.createElement(React.Fragment, null, t('Creating "{name} Copy". Duplicate will appear in ', {
-            name: bank.title
-          }), /*#__PURE__*/React.createElement(Link, {
-            key: bank.id,
-            onClick: _this.props.redirectAllBanks
-          }, t('\'All Banks\'')), t(' filter.')));
-        };
+          return function createCloneJob() {
+            return _ref3.apply(this, arguments);
+          };
+        }();
 
-        _this.props.withConfirm(partial(_this.createCloneJob), {
+        _this.props.withConfirm(partial(createCloneJob), {
           text: t('Are you sure you want to duplicate this item bank?'),
           title: t('Duplicate Bank'),
           continueText: t('Duplicate'),
@@ -293,7 +316,7 @@ export var BanksList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
       if (bank.status == 'copying') {
         return /*#__PURE__*/React.createElement("div", {
           className: styles.bankOptions
-        }, _ref3);
+        }, _ref4);
       } else {
         return /*#__PURE__*/React.createElement("div", {
           className: styles.bankOptions
@@ -392,6 +415,7 @@ export var BanksList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
   return BanksList;
 }(withI18nSupport(Component)), _class2.propTypes = {
   addInfo: PropTypes.func.isRequired,
+  addToPolling: PropTypes.func.isRequired,
   appContainer: CustomPropTypes.selectors.isRequired,
   banks: ImmutablePropTypes.list.isRequired,
   createBankCloneJob: PropTypes.func.isRequired,
@@ -414,7 +438,6 @@ export var BanksList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
   navigateToBank: PropTypes.func.isRequired,
   onShare: PropTypes.func,
   openModal: PropTypes.func.isRequired,
-  redirectAllBanks: PropTypes.func.isRequired,
   withConfirm: PropTypes.func.isRequired,
   locale: PropTypes.string,
   timezone: PropTypes.string

package/lib/banks/api/banks.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getExistingBankAndEntries = getExistingBankAndEntries;
-exports.createBankCloneJob = exports.updateSharedBankPermission = exports.getSharedBanks = exports.getSharedBank = exports.shareBank = exports.deleteBank = exports.updateBank = exports.createBank = exports.getBank = exports.getAllBanks = exports.getBanks = void 0;
+exports.createBankCloneJob = exports.updateSharedBankPermission = exports.getSharedBanks = exports.getSharedBank = exports.shareBank = exports.deleteBank = exports.updateBank = exports.createBank = exports.getSpecificBanks = exports.getBank = exports.getAllBanks = exports.getBanks = void 0;
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
@@ -111,6 +111,24 @@ var getBank = function getBank(bankId) {
 
 exports.getBank = getBank;
 
+var getSpecificBanks = function getSpecificBanks() {
+  var bankIds = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+  return function (dispatch, getState) {
+    var fetcher = new _Fetcher.default({
+      onError: (0, _helpers.handleError)(dispatch, (0, _formatMessage.default)('Failed to fetch banks.'))
+    });
+    var param = {
+      ids: bankIds
+    };
+    return fetcher.get("".concat(banksApiEndpoint, "/batch_show"), param).then(function (response) {
+      dispatch((0, _callHandlers.handleBanksResponse)(response));
+      return response;
+    });
+  };
+};
+
+exports.getSpecificBanks = getSpecificBanks;
+
 var createBank = function createBank(newBank, shareWithCourseUuid) {
   return function (dispatch, getState) {
     var newBankData = JSON.stringify({

package/lib/banks/api/copyingBanksPoller.js

@@ -0,0 +1,116 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addToPolling = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
+var _alerts = require("../../common/actions/alerts.js");
+
+var _banks = require("./banks.js");
+
+var pollingBanks = [];
+var currentlyPolling = false;
+
+var addToPolling = function addToPolling(bankId, bankTitle) {
+  var getSpecificBanksFn = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : _banks.getSpecificBanks;
+  return function (dispatch) {
+    pollingBanks.push({
+      id: bankId,
+      title: bankTitle
+    });
+
+    if (!currentlyPolling) {
+      currentlyPolling = true;
+      handlePollingBanks(dispatch, getSpecificBanksFn);
+    }
+  };
+};
+
+exports.addToPolling = addToPolling;
+
+var handlePollingBanks = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(dispatch) {
+    var getSpecificBanksFn,
+        updatedPollingBanks,
+        updatedPollingBankIds,
+        finishedCopying,
+        finishedCopyingIds,
+        _args = arguments;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            getSpecificBanksFn = _args.length > 1 && _args[1] !== void 0 ? _args[1] : _banks.getSpecificBanks;
+            _context.next = 3;
+            return getSpecificBanksFn(pollingBanks.map(function (bank) {
+              return bank.id;
+            }))(dispatch);
+
+          case 3:
+            updatedPollingBanks = _context.sent;
+            updatedPollingBankIds = updatedPollingBanks.map(function (updatedBank) {
+              return updatedBank.id;
+            }); // banks that now have status 'waiting' have finished successfully
+            // banks that are no longer in the updated list but were in the previous list have
+            // failed to copy and therefore were archived
+
+            finishedCopying = updatedPollingBanks.filter(function (bank) {
+              return bank.status === 'waiting';
+            }).concat(pollingBanks.filter(function (prevBank) {
+              return !updatedPollingBankIds.includes(prevBank.id);
+            }));
+            finishedCopying.forEach(function (bank) {
+              var bankInfo = updatedPollingBanks.find(function (info) {
+                return info.id == bank.id;
+              });
+
+              if ((bankInfo === null || bankInfo === void 0 ? void 0 : bankInfo.status) === 'waiting') {
+                dispatch((0, _alerts.addSuccess)((0, _formatMessage.default)('Created "{name}" successfully! Duplicate can be seen in \'All Banks\' filter.', {
+                  name: bank.title
+                })));
+              } else if (!bankInfo) {
+                dispatch((0, _alerts.addError)((0, _formatMessage.default)('Failed to create "{name}". Please try again.', {
+                  name: bank.title
+                })));
+              }
+            });
+            finishedCopyingIds = finishedCopying.map(function (bank) {
+              return bank.id;
+            });
+            removeFinishedCopies(finishedCopyingIds);
+
+            if (pollingBanks.length > 0) {
+              setTimeout(function () {
+                handlePollingBanks(dispatch);
+              }, 3000);
+            } else {
+              currentlyPolling = false;
+            }
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function handlePollingBanks(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var removeFinishedCopies = function removeFinishedCopies(finishedCopyingIds) {
+  pollingBanks = pollingBanks.filter(function (bank) {
+    return !finishedCopyingIds.includes(bank.id);
+  });
+};

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

@@ -211,8 +211,7 @@ var Banks = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_c
         minChars: _this.props.minChars,
         navigateToBank: _this.props.navigateToBank,
         onShare: _this.props.onShare,
-        recordIds: recordIds,
-        redirectAllBanks: _this.handleBankCreated
+        recordIds: recordIds
       });
     };
 

package/lib/banks/components/BanksList/index.js

@@ -24,6 +24,8 @@ var _featureCheck = require("../../../common/util/featureCheck.js");
 
 var _alerts = require("../../../common/actions/alerts.js");
 
+var _copyingBanksPoller = require("../../api/copyingBanksPoller.js");
+
 function mapStateToProps(state, props) {
   return {
     appContainer: state.getIn(['ui', 'appContainer']),
@@ -39,7 +41,8 @@ var _default = (0, _reactRedux.connect)(mapStateToProps, {
   deleteBank: _banks.deleteBank,
   withConfirm: _modal.withConfirm,
   createBankCloneJob: _banks.createBankCloneJob,
-  addInfo: _alerts.addInfo
+  addInfo: _alerts.addInfo,
+  addToPolling: _copyingBanksPoller.addToPolling
 })(_presenter.default);
 
 exports.default = _default;

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

@@ -80,7 +80,7 @@ var styles = {
   'deletePreface': 'dgJJi_eTBd'
 };
 
-var _ref3 = /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
+var _ref4 = /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
   renderTitle: "Loading",
   size: "x-small"
 });
@@ -180,18 +180,41 @@ var BanksList = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
 
     _this.openDuplicateBankModal = function (bank) {
       return function () {
-        _this.createCloneJob = function () {
-          _this.props.createBankCloneJob(bank.id, _this.props.currentUser.uuid);
+        var createCloneJob = /*#__PURE__*/function () {
+          var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+            var cloneJob;
+            return _regenerator.default.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _context2.next = 2;
+                    return _this.props.createBankCloneJob(bank.id, _this.props.currentUser.uuid);
+
+                  case 2:
+                    cloneJob = _context2.sent;
+
+                    _this.props.addToPolling(cloneJob.cloned_bank_id, (0, _formatMessage.default)('{name} Copy', {
+                      name: bank.title
+                    }));
+
+                    _this.props.addInfo((0, _formatMessage.default)('Creating "{name} Copy". Duplicate will appear in \'All Banks\'  filter.', {
+                      name: bank.title
+                    }));
+
+                  case 5:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }));
 
-          _this.props.addInfo( /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _formatMessage.default)('Creating "{name} Copy". Duplicate will appear in ', {
-            name: bank.title
-          }), /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
-            key: bank.id,
-            onClick: _this.props.redirectAllBanks
-          }, (0, _formatMessage.default)('\'All Banks\'')), (0, _formatMessage.default)(' filter.')));
-        };
+          return function createCloneJob() {
+            return _ref3.apply(this, arguments);
+          };
+        }();
 
-        _this.props.withConfirm((0, _partial.default)(_this.createCloneJob), {
+        _this.props.withConfirm((0, _partial.default)(createCloneJob), {
           text: (0, _formatMessage.default)('Are you sure you want to duplicate this item bank?'),
           title: (0, _formatMessage.default)('Duplicate Bank'),
           continueText: (0, _formatMessage.default)('Duplicate'),
@@ -330,7 +353,7 @@ var BanksList = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
       if (bank.status == 'copying') {
         return /*#__PURE__*/_react.default.createElement("div", {
           className: styles.bankOptions
-        }, _ref3);
+        }, _ref4);
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
           className: styles.bankOptions
@@ -430,6 +453,7 @@ var BanksList = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
   return BanksList;
 }((0, _quizCommon.withI18nSupport)(_react.Component)), _class2.propTypes = {
   addInfo: _propTypes.default.func.isRequired,
+  addToPolling: _propTypes.default.func.isRequired,
   appContainer: _CustomPropTypes.default.selectors.isRequired,
   banks: _reactImmutableProptypes.default.list.isRequired,
   createBankCloneJob: _propTypes.default.func.isRequired,
@@ -452,7 +476,6 @@ var BanksList = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
   navigateToBank: _propTypes.default.func.isRequired,
   onShare: _propTypes.default.func,
   openModal: _propTypes.default.func.isRequired,
-  redirectAllBanks: _propTypes.default.func.isRequired,
   withConfirm: _propTypes.default.func.isRequired,
   locale: _propTypes.default.string,
   timezone: _propTypes.default.string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.62.1-rc.1+35dd3a71d",
+  "version": "17.62.1-rc.2+89844c065",
   "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.9",
-    "@instructure/quiz-common": "17.62.1-rc.1+35dd3a71d",
-    "@instructure/quiz-i18n": "17.62.1-rc.1+35dd3a71d",
-    "@instructure/quiz-interactions": "17.62.1-rc.1+35dd3a71d",
-    "@instructure/quiz-number-input": "17.62.1-rc.1+35dd3a71d",
-    "@instructure/quiz-rce": "17.62.1-rc.1+35dd3a71d",
+    "@instructure/quiz-common": "17.62.1-rc.2+89844c065",
+    "@instructure/quiz-i18n": "17.62.1-rc.2+89844c065",
+    "@instructure/quiz-interactions": "17.62.1-rc.2+89844c065",
+    "@instructure/quiz-number-input": "17.62.1-rc.2+89844c065",
+    "@instructure/quiz-rce": "17.62.1-rc.2+89844c065",
     "@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.62.1-rc.1+35dd3a71d",
+    "instructure-validations": "17.62.1-rc.2+89844c065",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -157,7 +157,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.62.1-rc.1+35dd3a71d",
+    "quiz-presets": "17.62.1-rc.2+89844c065",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -173,5 +173,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "35dd3a71d48f248d35d44909b90c5ada4bb0ae37"
+  "gitHead": "89844c065c8a4ad7e639856f6a4c52239c6b8386"
 }