@instructure/quiz-core 20.10.1-rc.6 → 20.10.1-rc.7

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

@@ -16,6 +16,7 @@ function mapStateToProps(state, props) {
   var sortOrder = pageData.get('sortOrder', 'ascending');
   var searchTerms = pageData.get('searchTerms', null);
   var searchSelection = pageData.get('searchSelection', []);
+  var rootAccountUuid = state.getIn(['outcomes', 'contextUuid']);
   return {
     itemBankSearchTableEnabled: featureOn('item_bank_search_table'),
     improvedBankSharingEnabled: featureOn('improved_bank_sharing'),
@@ -26,7 +27,8 @@ function mapStateToProps(state, props) {
     sortBy: sortBy,
     sortOrder: sortOrder,
     searchTerms: searchTerms,
-    searchSelection: searchSelection
+    searchSelection: searchSelection,
+    rootAccountUuid: rootAccountUuid
   };
 }
 

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

@@ -55,6 +55,10 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
 
     _this = _super.apply(this, arguments);
 
+    _this.hideAccountSearch = function () {
+      return _this.props.scopeType === 'account' && _this.props.scope.type === 'account' && _this.props.scope.launch_context_uuid && _this.props.rootAccountUuid && _this.props.scope.launch_context_uuid !== _this.props.rootAccountUuid;
+    };
+
     _this.onCreateBank = function () {
       _this.props.createBank({
         language: _this.context.locale
@@ -94,7 +98,9 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         params['search'] = _this.props.searchTerms;
       }
 
-      if (_this.props.searchSelection.length > 0) {
+      if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+        params['account_uuids'] = [_this.props.scope.launch_context_uuid];
+      } else if (_this.props.searchSelection.length > 0) {
         params['account_uuids'] = _this.props.searchSelection.map(function (account) {
           return account.uuid;
         });
@@ -125,6 +131,12 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
       _this.props.merge(BANKS_BANK_FILTERS, {
         scopeType: scopeType
       });
+
+      if (scopeType === 'account') {
+        _this.setState({
+          hiddenAccountSearch: true
+        });
+      }
     };
 
     _this.getSortingOrderIcon = function () {
@@ -211,7 +223,11 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         if (_this.props.scopeType === 'course') {
           message = t("Your filter is set to \"Courses\" which will narrow what you can search for.\n          Try adjusting the filter to \"Institution\" or \"All My Banks\"");
         } else if (_this.props.scopeType === 'account') {
-          message = t("Your filter is set to \"Institution\" which will narrow what you can search for.\n          Try adjusting the filter to \"All My Banks\"");
+          if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+            message = t("Your filter is set to \"This Account\" which will narrow what you can search for.\n            Try adjusting the filter to \"All My Banks\"");
+          } else {
+            message = t("Your filter is set to \"Institution\" which will narrow what you can search for.\n            Try adjusting the filter to \"All My Banks\"");
+          }
         }
 
         return jsx(Billboard, {
@@ -242,7 +258,9 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
       if (prevProps.sortBy !== this.props.sortBy || prevProps.sortOrder !== this.props.sortOrder || prevProps.searchTerms !== this.props.searchTerms || prevProps.scopeType !== this.props.scopeType || !isEqual(prevProps.searchSelection, this.props.searchSelection)) {
         this.props.clear(BANKS_BANK_PAGINATION);
       }
-    }
+    } // When the launch is from a subaccount, we want to silently add the subaccount to the account search
+    // if the user is on the "This Account" filter
+
   }, {
     key: "renderFilters",
     value: function renderFilters() {
@@ -251,7 +269,7 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         translation: this.props.newItemBankFilterNamesEnabled ? t('All Banks') : t('All My Banks')
       }, {
         slug: 'account',
-        translation: t('Institution Banks')
+        translation: this.props.subAccountBankSharingEnabled && this.hideAccountSearch() ? t('This Account') : t('Institution Banks')
       }, {
         slug: 'courses',
         translation: this.props.newItemBankFilterNamesEnabled ? t('Banks Shared to Course') : t('All My Course Banks')
@@ -314,7 +332,7 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         onChange: this.handleSearchInputChange,
         placeholder: t('Search Banks'),
         "data-automation": "sdk-search-bank-textinput"
-      })), this.props.subAccountBankSharingEnabled && jsx(Grid.Col, {
+      })), this.props.subAccountBankSharingEnabled && !this.hideAccountSearch() && jsx(Grid.Col, {
         width: 4
       }, jsx(AsyncSearch, {
         getShareableSubaccounts: this.props.getShareableSubaccounts,
@@ -488,7 +506,9 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   scope: PropTypes.shape({
     type: PropTypes.string,
     uuid: PropTypes.string,
-    title: PropTypes.string
+    title: PropTypes.string,
+    launch_context_uuid: PropTypes.string,
+    root_account_name: PropTypes.string
   }).isRequired,
   scopeType: PropTypes.string,
   searchTerms: PropTypes.string,
@@ -506,7 +526,8 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   subAccountBankSharingEnabled: PropTypes.bool,
   iceTopNavBarEnabled: PropTypes.bool,
   // eslint-disable-next-line react/require-default-props,react/forbid-prop-types
-  styles: PropTypes.object
+  styles: PropTypes.object,
+  rootAccountUuid: PropTypes.string
 }, _class2.defaultProps = {
   closeTray: null,
   currentUser: null,
@@ -533,7 +554,8 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   usedByCourseEnabled: false,
   itemBankSearchTableEnabled: false,
   subAccountBankSharingEnabled: false,
-  iceTopNavBarEnabled: false
+  iceTopNavBarEnabled: false,
+  rootAccountUuid: null
 }, _class2.contextTypes = {
   locale: PropTypes.string
 }, _temp)) || _class);

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

@@ -34,6 +34,7 @@ function mapStateToProps(state, props) {
   var sortOrder = pageData.get('sortOrder', 'ascending');
   var searchTerms = pageData.get('searchTerms', null);
   var searchSelection = pageData.get('searchSelection', []);
+  var rootAccountUuid = state.getIn(['outcomes', 'contextUuid']);
   return {
     itemBankSearchTableEnabled: (0, _featureCheck.featureOn)('item_bank_search_table'),
     improvedBankSharingEnabled: (0, _featureCheck.featureOn)('improved_bank_sharing'),
@@ -44,7 +45,8 @@ function mapStateToProps(state, props) {
     sortBy: sortBy,
     sortOrder: sortOrder,
     searchTerms: searchTerms,
-    searchSelection: searchSelection
+    searchSelection: searchSelection,
+    rootAccountUuid: rootAccountUuid
   };
 }
 

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

@@ -95,6 +95,10 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
     (0, _classCallCheck2.default)(this, Banks);
     _this = _super.apply(this, arguments);
 
+    _this.hideAccountSearch = function () {
+      return _this.props.scopeType === 'account' && _this.props.scope.type === 'account' && _this.props.scope.launch_context_uuid && _this.props.rootAccountUuid && _this.props.scope.launch_context_uuid !== _this.props.rootAccountUuid;
+    };
+
     _this.onCreateBank = function () {
       _this.props.createBank({
         language: _this.context.locale
@@ -134,7 +138,9 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
         params['search'] = _this.props.searchTerms;
       }
 
-      if (_this.props.searchSelection.length > 0) {
+      if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+        params['account_uuids'] = [_this.props.scope.launch_context_uuid];
+      } else if (_this.props.searchSelection.length > 0) {
         params['account_uuids'] = _this.props.searchSelection.map(function (account) {
           return account.uuid;
         });
@@ -165,6 +171,12 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
       _this.props.merge(_quizCommon.BANKS_BANK_FILTERS, {
         scopeType: scopeType
       });
+
+      if (scopeType === 'account') {
+        _this.setState({
+          hiddenAccountSearch: true
+        });
+      }
     };
 
     _this.getSortingOrderIcon = function () {
@@ -251,7 +263,11 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
         if (_this.props.scopeType === 'course') {
           message = (0, _formatMessage.default)("Your filter is set to \"Courses\" which will narrow what you can search for.\n          Try adjusting the filter to \"Institution\" or \"All My Banks\"");
         } else if (_this.props.scopeType === 'account') {
-          message = (0, _formatMessage.default)("Your filter is set to \"Institution\" which will narrow what you can search for.\n          Try adjusting the filter to \"All My Banks\"");
+          if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+            message = (0, _formatMessage.default)("Your filter is set to \"This Account\" which will narrow what you can search for.\n            Try adjusting the filter to \"All My Banks\"");
+          } else {
+            message = (0, _formatMessage.default)("Your filter is set to \"Institution\" which will narrow what you can search for.\n            Try adjusting the filter to \"All My Banks\"");
+          }
         }
 
         return (0, _emotion.jsx)(_uiBillboard.Billboard, {
@@ -282,7 +298,9 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
       if (prevProps.sortBy !== this.props.sortBy || prevProps.sortOrder !== this.props.sortOrder || prevProps.searchTerms !== this.props.searchTerms || prevProps.scopeType !== this.props.scopeType || !(0, _isEqual.default)(prevProps.searchSelection, this.props.searchSelection)) {
         this.props.clear(_quizCommon.BANKS_BANK_PAGINATION);
       }
-    }
+    } // When the launch is from a subaccount, we want to silently add the subaccount to the account search
+    // if the user is on the "This Account" filter
+
   }, {
     key: "renderFilters",
     value: function renderFilters() {
@@ -291,7 +309,7 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
         translation: this.props.newItemBankFilterNamesEnabled ? (0, _formatMessage.default)('All Banks') : (0, _formatMessage.default)('All My Banks')
       }, {
         slug: 'account',
-        translation: (0, _formatMessage.default)('Institution Banks')
+        translation: this.props.subAccountBankSharingEnabled && this.hideAccountSearch() ? (0, _formatMessage.default)('This Account') : (0, _formatMessage.default)('Institution Banks')
       }, {
         slug: 'courses',
         translation: this.props.newItemBankFilterNamesEnabled ? (0, _formatMessage.default)('Banks Shared to Course') : (0, _formatMessage.default)('All My Course Banks')
@@ -354,7 +372,7 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
         onChange: this.handleSearchInputChange,
         placeholder: (0, _formatMessage.default)('Search Banks'),
         "data-automation": "sdk-search-bank-textinput"
-      })), this.props.subAccountBankSharingEnabled && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
+      })), this.props.subAccountBankSharingEnabled && !this.hideAccountSearch() && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
         width: 4
       }, (0, _emotion.jsx)(_index7.default, {
         getShareableSubaccounts: this.props.getShareableSubaccounts,
@@ -527,7 +545,9 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
   scope: _propTypes.default.shape({
     type: _propTypes.default.string,
     uuid: _propTypes.default.string,
-    title: _propTypes.default.string
+    title: _propTypes.default.string,
+    launch_context_uuid: _propTypes.default.string,
+    root_account_name: _propTypes.default.string
   }).isRequired,
   scopeType: _propTypes.default.string,
   searchTerms: _propTypes.default.string,
@@ -545,7 +565,8 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
   subAccountBankSharingEnabled: _propTypes.default.bool,
   iceTopNavBarEnabled: _propTypes.default.bool,
   // eslint-disable-next-line react/require-default-props,react/forbid-prop-types
-  styles: _propTypes.default.object
+  styles: _propTypes.default.object,
+  rootAccountUuid: _propTypes.default.string
 }, _class2.defaultProps = {
   closeTray: null,
   currentUser: null,
@@ -572,7 +593,8 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
   usedByCourseEnabled: false,
   itemBankSearchTableEnabled: false,
   subAccountBankSharingEnabled: false,
-  iceTopNavBarEnabled: false
+  iceTopNavBarEnabled: false,
+  rootAccountUuid: null
 }, _class2.contextTypes = {
   locale: _propTypes.default.string
 }, _temp)) || _class);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.10.1-rc.6+608228b5c",
+  "version": "20.10.1-rc.7+c0ed1ff3f",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -44,11 +44,11 @@
     "@instructure/emotion": "^8.51.0",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^3.1.0",
-    "@instructure/quiz-common": "20.10.1-rc.6+608228b5c",
-    "@instructure/quiz-i18n": "20.10.1-rc.6+608228b5c",
-    "@instructure/quiz-interactions": "20.10.1-rc.6+608228b5c",
-    "@instructure/quiz-number-input": "20.10.1-rc.6+608228b5c",
-    "@instructure/quiz-rce": "20.10.1-rc.6+608228b5c",
+    "@instructure/quiz-common": "20.10.1-rc.7+c0ed1ff3f",
+    "@instructure/quiz-i18n": "20.10.1-rc.7+c0ed1ff3f",
+    "@instructure/quiz-interactions": "20.10.1-rc.7+c0ed1ff3f",
+    "@instructure/quiz-number-input": "20.10.1-rc.7+c0ed1ff3f",
+    "@instructure/quiz-rce": "20.10.1-rc.7+c0ed1ff3f",
     "@instructure/ui-a11y-content": "^8.51.0",
     "@instructure/ui-alerts": "^8.51.0",
     "@instructure/ui-avatar": "^8.51.0",
@@ -112,7 +112,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "20.10.1-rc.6+608228b5c",
+    "instructure-validations": "20.10.1-rc.7+c0ed1ff3f",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -163,7 +163,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "20.10.1-rc.6+608228b5c",
+    "quiz-presets": "20.10.1-rc.7+c0ed1ff3f",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "608228b5cd5d4366f332cd20ec0eb7e6676b488d"
+  "gitHead": "c0ed1ff3f93fd948f16d8073e223cbb46dab4a74"
 }