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

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/es/building/components/layout/header/BuildingButtons/presenter.js

@@ -11,12 +11,18 @@ import PropTypes from 'prop-types';
 import { IconButton } from '@instructure/ui-buttons';
 import { Menu } from '@instructure/ui-menu';
 import { IconExportLine, IconMoreSolid, IconImportLine, IconBankLine, IconPrinterLine, IconSpeedGraderLine } from '@instructure/ui-icons';
+import { View } from '@instructure/ui-view';
+import { Drilldown } from '@instructure/ui-drilldown';
+import { TopNavBar } from '@instructure/ui-top-nav-bar';
 import PrintTrigger from "../../../../../common/components/shared/PrintTrigger/index.js";
 import { PRINT_CURRENT_PAGE, PRINT_BLANK } from '@instructure/quiz-common';
 import { withStyle, jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
+
+var _ref = jsx(IconSpeedGraderLine, null);
+
 export var BuildingButtons = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
   _inherits(BuildingButtons, _Component);
 
@@ -73,6 +79,16 @@ export var BuildingButtons = (_dec = withStyle(generateStyle, generateComponentT
   }
 
   _createClass(BuildingButtons, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.props.makeStyles();
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.props.makeStyles();
+    }
+  }, {
     key: "renderSavingMessage",
     value: function renderSavingMessage() {
       if (this.props.quizSaving) {
@@ -86,6 +102,214 @@ export var BuildingButtons = (_dec = withStyle(generateStyle, generateComponentT
     value: function isBuildingPage() {
       return 'building' === this.props.app;
     }
+  }, {
+    key: "renderSpeedGraderButton",
+    value: function renderSpeedGraderButton() {
+      var key = 'speedgrader';
+      var text = t('Speedgrader');
+
+      if (this.props.iceTopNavBarEnabled) {
+        return jsx(Drilldown.Option, {
+          id: key,
+          key: key,
+          onOptionClick: this.openSpeedgraderLink
+        }, _ref, jsx(View, {
+          as: "span",
+          margin: "0 0 0 x-small"
+        }, text));
+      }
+
+      return jsx(Menu.Item, {
+        key: key,
+        onSelect: this.openSpeedgraderLink
+      }, jsx(IconSpeedGraderLine, {
+        css: this.props.styles.menuIcon
+      }), text);
+    }
+  }, {
+    key: "renderImportContentButton",
+    value: function renderImportContentButton() {
+      var key = 'import';
+      var text = t('Import Content');
+      var onClick = this.props.openModal;
+      var disabled = !this.props.canImport;
+      var menuItemDataAutomation = 'sdk-import-content-menuitem';
+      var iconDataAutomation = 'sdk-import-content-icon';
+
+      if (this.props.iceTopNavBarEnabled) {
+        return jsx(Drilldown.Option, {
+          id: key,
+          key: key,
+          disabled: disabled,
+          onOptionClick: onClick,
+          "data-automation": menuItemDataAutomation
+        }, jsx(IconImportLine, {
+          "data-automation": iconDataAutomation
+        }), jsx(View, {
+          as: "span",
+          margin: "0 0 0 x-small"
+        }, text));
+      }
+
+      return jsx(Menu.Item, {
+        key: key,
+        disabled: disabled,
+        onSelect: onClick,
+        "data-automation": menuItemDataAutomation
+      }, jsx(IconImportLine, {
+        css: this.props.styles.menuIcon,
+        "data-automation": iconDataAutomation
+      }), text);
+    }
+  }, {
+    key: "renderContentExportButton",
+    value: function renderContentExportButton() {
+      var key = 'export';
+      var text = t('Export Content');
+      var onClick = this.startQuizExportJob;
+      var disabled = !this.props.canExport;
+      var menuItemDataAutomation = 'sdk-export-content-menuitem';
+      var iconDataAutomation = 'sdk-export-content-icon';
+
+      if (this.props.iceTopNavBarEnabled) {
+        return jsx(Drilldown.Option, {
+          id: key,
+          key: key,
+          disabled: disabled,
+          onOptionClick: onClick,
+          "data-automation": menuItemDataAutomation
+        }, jsx(IconExportLine, {
+          "data-automation": iconDataAutomation
+        }), jsx(View, {
+          as: "span",
+          margin: "0 0 0 x-small"
+        }, text));
+      }
+
+      return jsx(Menu.Item, {
+        key: key,
+        disabled: disabled,
+        onSelect: onClick,
+        "data-automation": menuItemDataAutomation
+      }, jsx(IconExportLine, {
+        css: this.props.styles.menuIcon,
+        "data-automation": iconDataAutomation
+      }), text);
+    }
+  }, {
+    key: "renderManageItemBanksButton",
+    value: function renderManageItemBanksButton() {
+      var key = 'banks';
+      var text = t('Manage Item Banks');
+      var onClick = this.props.navigateToBanks;
+      var menuItemDataAutomation = 'sdk-manage-item-banks-menuitem';
+      var iconDataAutomation = 'sdk-manage-item-banks-icon';
+
+      if (this.props.iceTopNavBarEnabled) {
+        return jsx(Drilldown.Option, {
+          id: key,
+          key: key,
+          onOptionClick: onClick,
+          "data-automation": menuItemDataAutomation
+        }, jsx(IconBankLine, {
+          "data-automation": iconDataAutomation
+        }), jsx(View, {
+          as: "span",
+          margin: "0 0 0 x-small"
+        }, text));
+      }
+
+      return jsx(Menu.Item, {
+        key: key,
+        onSelect: onClick,
+        "data-automation": menuItemDataAutomation
+      }, jsx(IconBankLine, {
+        css: this.props.styles.menuIcon,
+        "data-automation": iconDataAutomation
+      }), text);
+    }
+  }, {
+    key: "renderPrintKeyButton",
+    value: function renderPrintKeyButton(handlePrint) {
+      var key = 'printKey';
+      var text = t('Print Key (With Answers)');
+
+      var onClick = function onClick() {
+        return handlePrint(PRINT_CURRENT_PAGE);
+      };
+
+      var disabled = !this.props.hasQuestions || this.props.isEditing;
+      var menuItemDataAutomation = 'sdk-print-key-menuitem';
+      var iconDataAutomation = 'sdk-print-icon';
+
+      if (this.props.iceTopNavBarEnabled) {
+        return jsx(Drilldown.Option, {
+          id: key,
+          key: key,
+          disabled: disabled,
+          onOptionClick: onClick // eslint-disable-line react/jsx-no-bind
+          ,
+          "data-automation": menuItemDataAutomation
+        }, jsx(IconPrinterLine, {
+          "data-automation": iconDataAutomation
+        }), jsx(View, {
+          as: "span",
+          margin: "0 0 0 x-small"
+        }, text));
+      }
+
+      return jsx(Menu.Item, {
+        key: key,
+        disabled: disabled,
+        onSelect: onClick // eslint-disable-line react/jsx-no-bind
+        ,
+        "data-automation": menuItemDataAutomation
+      }, jsx(IconPrinterLine, {
+        css: this.props.styles.menuIcon,
+        "data-automation": iconDataAutomation
+      }), text);
+    }
+  }, {
+    key: "renderPrintBlankButton",
+    value: function renderPrintBlankButton(handlePrint) {
+      var key = 'printBlank';
+      var text = t('Print Blank Quiz');
+
+      var onClick = function onClick() {
+        return handlePrint(PRINT_BLANK);
+      };
+
+      var disabled = !this.props.hasQuestions || this.props.isEditing;
+      var menuItemDataAutomation = 'sdk-print-blank-menuitem';
+      var iconDataAutomation = 'sdk-print-blank-icon';
+
+      if (this.props.iceTopNavBarEnabled) {
+        return jsx(Drilldown.Option, {
+          id: key,
+          key: key,
+          disabled: disabled,
+          onOptionClick: onClick // eslint-disable-line react/jsx-no-bind
+          ,
+          "data-automation": menuItemDataAutomation
+        }, jsx(IconPrinterLine, {
+          "data-automation": iconDataAutomation
+        }), jsx(View, {
+          as: "span",
+          margin: "0 0 0 x-small"
+        }, text));
+      }
+
+      return jsx(Menu.Item, {
+        key: key,
+        disabled: disabled,
+        onSelect: onClick // eslint-disable-line react/jsx-no-bind
+        ,
+        "data-automation": menuItemDataAutomation
+      }, jsx(IconPrinterLine, {
+        css: this.props.styles.menuIcon,
+        "data-automation": iconDataAutomation
+      }), text);
+    }
   }, {
     key: "renderMenu",
     value: function renderMenu(handlePrint) {
@@ -93,79 +317,40 @@ export var BuildingButtons = (_dec = withStyle(generateStyle, generateComponentT
       var menuItems = [];
 
       if (this.props.speedgraderLink) {
-        menuItems.push(jsx(Menu.Item, {
-          key: "speedgrader",
-          onSelect: this.openSpeedgraderLink
-        }, jsx(IconSpeedGraderLine, {
-          css: this.props.styles.menuIcon
-        }), t('Speedgrader')));
+        menuItems.push(this.renderSpeedGraderButton());
       }
 
-      menuItems.push(jsx(Menu.Item, {
-        key: "import",
-        disabled: !this.props.canImport,
-        onSelect: this.props.openModal,
-        "data-automation": "sdk-import-content-menuitem"
-      }, jsx(IconImportLine, {
-        css: this.props.styles.menuIcon,
-        "data-automation": "sdk-import-content-icon"
-      }), t('Import Content')));
+      menuItems.push(this.renderImportContentButton());
 
       if (this.props.contentExportEnabled) {
-        menuItems.push(jsx(Menu.Item, {
-          key: "export",
-          disabled: !this.props.canExport,
-          onSelect: this.startQuizExportJob,
-          "data-automation": "sdk-export-content-menuitem"
-        }, jsx(IconExportLine, {
-          css: this.props.styles.menuIcon,
-          "data-automation": "sdk-export-content-icon"
-        }), t('Export Content')));
+        menuItems.push(this.renderContentExportButton());
       }
 
       if (this.props.enableItemBanking) {
-        menuItems.push(jsx(Menu.Item, {
-          key: "banks",
-          onSelect: this.props.navigateToBanks,
-          "data-automation": "sdk-manage-item-banks-menuitem"
-        }, jsx(IconBankLine, {
-          css: this.props.styles.menuIcon,
-          "data-automation": "sdk-manage-item-banks-icon"
-        }), t('Manage Item Banks')));
+        menuItems.push(this.renderManageItemBanksButton());
       }
 
       if (this.props.printingEnabled) {
-        {
-          /* eslint-disable react/jsx-no-bind */
-        }
-        menuItems.push(jsx(Menu.Item, {
-          key: "printKey",
-          disabled: !this.props.hasQuestions || this.props.isEditing,
-          onSelect: function onSelect() {
-            return handlePrint(PRINT_CURRENT_PAGE);
-          },
-          "data-automation": "sdk-print-key-menuitem"
-        }, jsx(IconPrinterLine, {
-          css: this.props.styles.menuIcon,
-          "data-automation": "sdk-print-icon"
-        }), t('Print Key (With Answers)')));
-        menuItems.push(jsx(Menu.Item, {
-          key: "printBlank",
-          disabled: !this.props.hasQuestions || this.props.isEditing,
-          onSelect: function onSelect() {
-            return handlePrint(PRINT_BLANK);
-          },
-          "data-automation": "sdk-print-blank-menuitem"
-        }, jsx(IconPrinterLine, {
-          css: this.props.styles.menuIcon,
-          "data-automation": "sdk-print-blank-icon"
-        }), t('Print Blank Quiz')));
-        {
-          /* eslint-enable react/jsx-no-bind */
-        }
+        menuItems.push(this.renderPrintKeyButton(handlePrint));
+        menuItems.push(this.renderPrintBlankButton(handlePrint));
       }
 
       if (menuItems.length < 1) return;
+
+      if (this.props.iceTopNavBarEnabled) {
+        return jsx(TopNavBar.Item, {
+          id: this.props.id,
+          variant: "icon",
+          renderIcon: this.props.renderIcon,
+          showSubmenuChevron: false,
+          renderSubmenu: jsx(Drilldown, {
+            rootPageId: "root"
+          }, jsx(Drilldown.Page, {
+            id: "root"
+          }, menuItems))
+        }, t('More'));
+      }
+
       return jsx(Menu, {
         trigger: jsx(IconButton, {
           renderIcon: IconMoreSolid,
@@ -216,6 +401,10 @@ export var BuildingButtons = (_dec = withStyle(generateStyle, generateComponentT
   speedgraderLink: PropTypes.string,
   startExport: PropTypes.func.isRequired,
   contextUuid: PropTypes.string,
+  iceTopNavBarEnabled: PropTypes.bool,
+  id: PropTypes.string,
+  renderIcon: PropTypes.element,
+  makeStyles: PropTypes.func,
   styles: PropTypes.object
 }, _class2.defaultProps = {
   activeQuizId: null,
@@ -226,6 +415,9 @@ export var BuildingButtons = (_dec = withStyle(generateStyle, generateComponentT
   enableItemBanking: true,
   quizSaving: false,
   speedgraderLink: null,
-  contextUuid: null
+  contextUuid: null,
+  iceTopNavBarEnabled: false,
+  id: 'MoreButton',
+  renderIcon: jsx(IconMoreSolid, null)
 }, _temp)) || _class);
 export default BuildingButtons;

package/es/building/components/layout/header/BuildingButtons/styles.js

@@ -1,15 +1,19 @@
-var generateStyle = function generateStyle(componentTheme) {
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+
+var generateStyle = function generateStyle(componentTheme, props) {
+  var iceTopNavBarEnabled = props.iceTopNavBarEnabled;
   return {
     quizSaving: {
       color: componentTheme.quizSavingColor,
       margin: componentTheme.quizSavingMargin
     },
-    buttonsHolder: {
-      height: '100%',
+    buttonsHolder: _objectSpread({
+      height: '100%'
+    }, !iceTopNavBarEnabled && {
       marginRight: componentTheme.buttonsHolderMargin,
       display: 'flex',
       alignItems: 'center'
-    },
+    }),
     menuIcon: {
       verticalAlign: 'middle',
       marginRight: componentTheme.menuIconMargin,

package/es/index.js

@@ -31,7 +31,6 @@ export { Banks as BanksPage } from "./banks/components/Banks/index.js";
 export { Bank as BankPage } from "./banks/components/Bank/index.js";
 export { BankEntry as BankEntryPage } from "./banks/components/BankEntry/index.js";
 export { SDKBuildingButtons } from "./building/components/layout/header/SDKBuildingButtons/index.js";
-export { default as SDKBuildingButtonsICE } from "./building/components/layout/header/BuildingButtonsICE/index.js";
 export { Paginator } from "./common/components/shared/Paginator/index.js";
 export { SDKMenuButton } from "./common/components/SDKMenuButton.js";
 export { SDKTimer } from "./common/components/SDKTimer.js";

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);