@instructure/quiz-core 20.11.4-rc.0 → 20.11.4-rc.2

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

@@ -56,7 +56,11 @@ 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;
+      return _this.props.scopeType === 'courses' || _this.props.scopeType === 'course' || _this.props.scopeType === 'account' && _this.displayThisAccount();
+    };
+
+    _this.displayThisAccount = function () {
+      return _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 () {
@@ -217,7 +221,7 @@ 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') {
-          if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+          if (_this.props.subAccountBankSharingEnabled && _this.displayThisAccount()) {
             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\"");
@@ -252,8 +256,7 @@ 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
+    } // Only display the account search for the account and all banks filters
 
   }, {
     key: "renderFilters",
@@ -263,7 +266,7 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         translation: this.props.newItemBankFilterNamesEnabled ? t('All Banks') : t('All My Banks')
       }, {
         slug: 'account',
-        translation: this.props.subAccountBankSharingEnabled && this.hideAccountSearch() ? t('This Account') : t('Institution Banks')
+        translation: this.props.subAccountBankSharingEnabled && this.displayThisAccount() ? t('This Account') : t('Institution Banks')
       }, {
         slug: 'courses',
         translation: this.props.newItemBankFilterNamesEnabled ? t('Banks Shared to Course') : t('All My Course Banks')

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

@@ -96,7 +96,11 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
     _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;
+      return _this.props.scopeType === 'courses' || _this.props.scopeType === 'course' || _this.props.scopeType === 'account' && _this.displayThisAccount();
+    };
+
+    _this.displayThisAccount = function () {
+      return _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 () {
@@ -257,7 +261,7 @@ 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') {
-          if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+          if (_this.props.subAccountBankSharingEnabled && _this.displayThisAccount()) {
             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\"");
@@ -292,8 +296,7 @@ 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
+    } // Only display the account search for the account and all banks filters
 
   }, {
     key: "renderFilters",
@@ -303,7 +306,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: this.props.subAccountBankSharingEnabled && this.hideAccountSearch() ? (0, _formatMessage.default)('This Account') : (0, _formatMessage.default)('Institution Banks')
+        translation: this.props.subAccountBankSharingEnabled && this.displayThisAccount() ? (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')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.11.4-rc.0+4dda23638",
+  "version": "20.11.4-rc.2+551dd5b47",
   "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.2.1",
-    "@instructure/quiz-common": "20.11.4-rc.0+4dda23638",
-    "@instructure/quiz-i18n": "20.11.4-rc.0+4dda23638",
-    "@instructure/quiz-interactions": "20.11.4-rc.0+4dda23638",
-    "@instructure/quiz-number-input": "20.11.4-rc.0+4dda23638",
-    "@instructure/quiz-rce": "20.11.4-rc.0+4dda23638",
+    "@instructure/quiz-common": "20.11.4-rc.2+551dd5b47",
+    "@instructure/quiz-i18n": "20.11.4-rc.2+551dd5b47",
+    "@instructure/quiz-interactions": "20.11.4-rc.2+551dd5b47",
+    "@instructure/quiz-number-input": "20.11.4-rc.2+551dd5b47",
+    "@instructure/quiz-rce": "20.11.4-rc.2+551dd5b47",
     "@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.11.4-rc.0+4dda23638",
+    "instructure-validations": "20.11.4-rc.2+551dd5b47",
     "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.11.4-rc.0+4dda23638",
+    "quiz-presets": "20.11.4-rc.2+551dd5b47",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4dda2363876be59480e71c6d35c73cf703797e9d"
+  "gitHead": "551dd5b477a4d76280ae3c35fb5321decc34a49c"
 }