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

package/es/banks/api/banks.js

@@ -13,18 +13,35 @@ import { handleError } from "../../common/api/helpers.js";
 import { BANKS_BANK_PAGINATION, BANKS_BANK_ENTRY_PAGINATION, DELETE_BANK_CALL, UPDATE_BANK_CALL, CAN_EDIT, REMOVED_ACCESS, SHARED_WITH_USER, SHARED_WITH_COURSE } from '@instructure/quiz-common';
 var banksApiEndpoint = '/api/banks';
 var DEFAULT_PAGE_SIZE = 100;
+
+var _fetchBanks = function _fetchBanks(dispatch) {
+  var params = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var fetcher = new PaginatedFetcher();
+  return fetcher.get(banksApiEndpoint, params).then(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        response = _ref2[0],
+        pageData = _ref2[1];
+
+    dispatch(handleBanksResponse(response));
+    return pageData;
+  });
+};
+
 export var getBanks = function getBanks() {
   var params = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+  var getCourseAssignments = arguments.length > 1 ? arguments[1] : void 0;
   return function (dispatch, getState) {
-    var fetcher = new PaginatedFetcher();
-    return fetcher.get(banksApiEndpoint, params).then(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-          response = _ref2[0],
-          pageData = _ref2[1];
-
-      dispatch(handleBanksResponse(response));
-      return pageData;
-    });
+    if (params['course_id'] && getCourseAssignments) {
+      return getCourseAssignments(params['course_id']).then(function (assignments) {
+        return _fetchBanks(dispatch, _objectSpread(_objectSpread({}, params), {}, {
+          quiz_ids: assignments.json.map(function (a) {
+            return a.quiz_api_quiz_id;
+          })
+        }));
+      });
+    } else {
+      return _fetchBanks(dispatch, params);
+    }
   };
 };
 export var getAllBanks = function getAllBanks() {

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

@@ -106,7 +106,7 @@ export var Banks = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cla
 
       return _this.props.getBanks(_objectSpread({
         page: page
-      }, params));
+      }, params), _this.props.getCourseAssignments);
     };
 
     _this.focusCreateBankButton = function () {
@@ -232,7 +232,7 @@ export var Banks = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cla
         translation: this.props.newItemBankFilterNamesEnabled ? t('Banks Shared to Course') : t('All My Course Banks')
       }];
 
-      if (this.props.scopeType == 'course') {
+      if (this.props.scope.uuid) {
         scopeOptions.push({
           slug: 'course',
           translation: this.props.newItemBankFilterNamesEnabled ? t('This Course') : t('Course Banks')
@@ -392,6 +392,8 @@ export var Banks = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cla
   getShareableCourses: PropTypes.func,
   // from consumer
   getShareableUsers: PropTypes.func,
+  // from consumer,
+  getCourseAssignments: PropTypes.func,
   // from consumer
   minChars: PropTypes.number,
   isCompact: PropTypes.bool,
@@ -406,7 +408,7 @@ export var Banks = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cla
     type: PropTypes.string,
     uuid: PropTypes.string,
     title: PropTypes.string
-  })),
+  })).isRequired,
   returnToUrl: PropTypes.string,
   // from consumer
   filtersEnabled: PropTypes.bool,
@@ -422,6 +424,7 @@ export var Banks = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cla
   getUserInfo: null,
   getShareableCourses: null,
   getShareableUsers: null,
+  getCourseAssignments: null,
   minChars: void 0,
   isCompact: false,
   navigateToBuild: null,

package/es/building/components/resources/BanksTray/presenter.js

@@ -105,11 +105,13 @@ export var BanksTray = /*#__PURE__*/function (_Component) {
           currentUser: this.props.currentUser,
           navigateToBank: this.props.newActiveBank,
           getCourseInfo: this.props.getCourseInfo,
+          getCourseAssignments: this.props.getCourseAssignments,
           getUserInfo: this.props.getUserInfo,
           getShareableCourses: this.props.getShareableCourses,
           getShareableUsers: this.props.getShareableUsers,
           minChars: this.props.minChars,
-          onShare: this.props.onShare
+          onShare: this.props.onShare,
+          scope: this.props.itemBanksScope
         });
       }
     }
@@ -174,6 +176,7 @@ BanksTray.propTypes = {
     account_name: PropTypes.string
   }),
   getCourseInfo: PropTypes.func,
+  getCourseAssignments: PropTypes.func,
   getUserInfo: PropTypes.func,
   getShareableCourses: PropTypes.func,
   getShareableUsers: PropTypes.func,
@@ -186,6 +189,11 @@ BanksTray.propTypes = {
   trayOpen: PropTypes.bool.isRequired,
   trayTrigger: PropTypes.shape({
     focus: PropTypes.func
+  }),
+  itemBanksScope: PropTypes.shape({
+    type: PropTypes.string,
+    uuid: PropTypes.string,
+    title: PropTypes.string
   })
 };
 BanksTray.defaultProps = {
@@ -196,8 +204,10 @@ BanksTray.defaultProps = {
   getShareableUsers: null,
   minChars: void 0,
   getCourseInfo: null,
+  getCourseAssignments: null,
   getUserInfo: null,
   onShare: function onShare() {},
-  trayTrigger: null
+  trayTrigger: null,
+  itemBanksScope: {}
 };
 export default BanksTray;

package/lib/banks/api/banks.js

@@ -37,18 +37,34 @@ var _quizCommon = require("@instructure/quiz-common");
 var banksApiEndpoint = '/api/banks';
 var DEFAULT_PAGE_SIZE = 100;
 
+var _fetchBanks = function _fetchBanks(dispatch) {
+  var params = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var fetcher = new _PaginatedFetcher.default();
+  return fetcher.get(banksApiEndpoint, params).then(function (_ref) {
+    var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+        response = _ref2[0],
+        pageData = _ref2[1];
+
+    dispatch((0, _callHandlers.handleBanksResponse)(response));
+    return pageData;
+  });
+};
+
 var getBanks = function getBanks() {
   var params = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+  var getCourseAssignments = arguments.length > 1 ? arguments[1] : void 0;
   return function (dispatch, getState) {
-    var fetcher = new _PaginatedFetcher.default();
-    return fetcher.get(banksApiEndpoint, params).then(function (_ref) {
-      var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-          response = _ref2[0],
-          pageData = _ref2[1];
-
-      dispatch((0, _callHandlers.handleBanksResponse)(response));
-      return pageData;
-    });
+    if (params['course_id'] && getCourseAssignments) {
+      return getCourseAssignments(params['course_id']).then(function (assignments) {
+        return _fetchBanks(dispatch, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+          quiz_ids: assignments.json.map(function (a) {
+            return a.quiz_api_quiz_id;
+          })
+        }));
+      });
+    } else {
+      return _fetchBanks(dispatch, params);
+    }
   };
 };
 

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

@@ -142,7 +142,7 @@ var Banks = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_c
 
       return _this.props.getBanks((0, _objectSpread2.default)({
         page: page
-      }, params));
+      }, params), _this.props.getCourseAssignments);
     };
 
     _this.focusCreateBankButton = function () {
@@ -268,7 +268,7 @@ var Banks = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_c
         translation: this.props.newItemBankFilterNamesEnabled ? (0, _formatMessage.default)('Banks Shared to Course') : (0, _formatMessage.default)('All My Course Banks')
       }];
 
-      if (this.props.scopeType == 'course') {
+      if (this.props.scope.uuid) {
         scopeOptions.push({
           slug: 'course',
           translation: this.props.newItemBankFilterNamesEnabled ? (0, _formatMessage.default)('This Course') : (0, _formatMessage.default)('Course Banks')
@@ -430,6 +430,8 @@ var Banks = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_c
   getShareableCourses: _propTypes.default.func,
   // from consumer
   getShareableUsers: _propTypes.default.func,
+  // from consumer,
+  getCourseAssignments: _propTypes.default.func,
   // from consumer
   minChars: _propTypes.default.number,
   isCompact: _propTypes.default.bool,
@@ -444,7 +446,7 @@ var Banks = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_c
     type: _propTypes.default.string,
     uuid: _propTypes.default.string,
     title: _propTypes.default.string
-  })),
+  })).isRequired,
   returnToUrl: _propTypes.default.string,
   // from consumer
   filtersEnabled: _propTypes.default.bool,
@@ -460,6 +462,7 @@ var Banks = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_c
   getUserInfo: null,
   getShareableCourses: null,
   getShareableUsers: null,
+  getCourseAssignments: null,
   minChars: void 0,
   isCompact: false,
   navigateToBuild: null,

package/lib/building/components/resources/BanksTray/presenter.js

@@ -133,11 +133,13 @@ var BanksTray = /*#__PURE__*/function (_Component) {
           currentUser: this.props.currentUser,
           navigateToBank: this.props.newActiveBank,
           getCourseInfo: this.props.getCourseInfo,
+          getCourseAssignments: this.props.getCourseAssignments,
           getUserInfo: this.props.getUserInfo,
           getShareableCourses: this.props.getShareableCourses,
           getShareableUsers: this.props.getShareableUsers,
           minChars: this.props.minChars,
-          onShare: this.props.onShare
+          onShare: this.props.onShare,
+          scope: this.props.itemBanksScope
         });
       }
     }
@@ -203,6 +205,7 @@ BanksTray.propTypes = {
     account_name: _propTypes.default.string
   }),
   getCourseInfo: _propTypes.default.func,
+  getCourseAssignments: _propTypes.default.func,
   getUserInfo: _propTypes.default.func,
   getShareableCourses: _propTypes.default.func,
   getShareableUsers: _propTypes.default.func,
@@ -215,6 +218,11 @@ BanksTray.propTypes = {
   trayOpen: _propTypes.default.bool.isRequired,
   trayTrigger: _propTypes.default.shape({
     focus: _propTypes.default.func
+  }),
+  itemBanksScope: _propTypes.default.shape({
+    type: _propTypes.default.string,
+    uuid: _propTypes.default.string,
+    title: _propTypes.default.string
   })
 };
 BanksTray.defaultProps = {
@@ -225,9 +233,11 @@ BanksTray.defaultProps = {
   getShareableUsers: null,
   minChars: void 0,
   getCourseInfo: null,
+  getCourseAssignments: null,
   getUserInfo: null,
   onShare: function onShare() {},
-  trayTrigger: null
+  trayTrigger: null,
+  itemBanksScope: {}
 };
 var _default = BanksTray;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.28.2-rc.1+c89471e1f",
+  "version": "17.28.2-rc.2+b632a9c42",
   "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.2",
-    "@instructure/quiz-common": "17.28.2-rc.1+c89471e1f",
-    "@instructure/quiz-i18n": "17.28.2-rc.1+c89471e1f",
-    "@instructure/quiz-interactions": "17.28.2-rc.1+c89471e1f",
-    "@instructure/quiz-number-input": "17.28.2-rc.1+c89471e1f",
-    "@instructure/quiz-rce": "17.28.2-rc.1+c89471e1f",
+    "@instructure/quiz-common": "17.28.2-rc.2+b632a9c42",
+    "@instructure/quiz-i18n": "17.28.2-rc.2+b632a9c42",
+    "@instructure/quiz-interactions": "17.28.2-rc.2+b632a9c42",
+    "@instructure/quiz-number-input": "17.28.2-rc.2+b632a9c42",
+    "@instructure/quiz-rce": "17.28.2-rc.2+b632a9c42",
     "@instructure/ui-a11y-content": "^7.11.0",
     "@instructure/ui-alerts": "^7.11.0",
     "@instructure/ui-avatar": "^7.11.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.28.2-rc.1+c89471e1f",
+    "instructure-validations": "17.28.2-rc.2+b632a9c42",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "17.28.2-rc.1+c89471e1f",
+    "@instructure/quiz-scripts": "17.28.2-rc.2+b632a9c42",
     "@instructure/ui-axe-check": "^7.11.0",
     "@instructure/ui-babel-preset": "^7.11.0",
     "@instructure/ui-karma-config": "^7.11.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.28.2-rc.1+c89471e1f",
+    "quiz-presets": "17.28.2-rc.2+b632a9c42",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c89471e1fa85bbf18abb341503f405c45ce63a4b"
+  "gitHead": "b632a9c42fe35cd0371865e435dec8d1762100e9"
 }