@instructure/quiz-core 20.11.4-rc.4 → 20.11.4-rc.6

package/es/banks/api/copyingBanksPoller.js

@@ -62,7 +62,7 @@ var handlePollingBanks = /*#__PURE__*/function () {
               });
 
               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.', {
+                dispatch(addSuccess(t('Created "{name}" successfully! Duplicate can be seen in \'Shared with Me\' filter.', {
                   name: bank.title
                 })));
               } else if (!bankInfo) {

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

@@ -20,7 +20,6 @@ function mapStateToProps(state, props) {
   return {
     itemBankSearchTableEnabled: featureOn('item_bank_search_table'),
     improvedBankSharingEnabled: featureOn('improved_bank_sharing'),
-    newItemBankFilterNamesEnabled: featureOn('new_item_bank_filter_names'),
     usedByCourseEnabled: featureOn('filter_item_banks_used_by_course'),
     subAccountBankSharingEnabled: featureOn('sub_account_bank_sharing'),
     scopeType: scopeType,

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

@@ -56,10 +56,14 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
     _this = _super.apply(this, arguments);
 
     _this.hideAccountSearch = function () {
-      return _this.props.scopeType === 'courses' || _this.props.scopeType === 'course' || _this.props.scopeType === 'account' && _this.displayThisAccount();
+      if (_this.props.scopeType === 'course' || _this.props.scopeType === 'courses' || _this.props.scopeType === 'this_account') {
+        return true;
+      }
+
+      return false;
     };
 
-    _this.displayThisAccount = function () {
+    _this.isSubAccountLaunch = 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;
     };
 
@@ -102,8 +106,9 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         params['search'] = _this.props.searchTerms;
       }
 
-      if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+      if (_this.props.scopeType === 'this_account') {
         params['account_uuids'] = [_this.props.scope.launch_context_uuid];
+        params['scope'] = 'account';
       } else if (_this.props.searchSelection.length > 0) {
         params['account_uuids'] = _this.props.searchSelection.map(function (account) {
           return account.uuid;
@@ -219,13 +224,17 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         var message;
 
         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\"");
+          message = t("Your filter is set to \"Courses\" which will narrow what you can search for.\n          Try adjusting the filter to \"{ topLevelBankFilter }\"", {
+            topLevelBankFilter: _this.topLevelBankFilterName()
+          });
+        } else if (_this.props.scopeType === 'this_account') {
+          message = t("Your filter is set to \"This Account\" which will narrow what you can search for.\n            Try adjusting the filter to \"{ topLevelBankFilter }\"", {
+            topLevelBankFilter: _this.topLevelBankFilterName()
+          });
         } else if (_this.props.scopeType === 'account') {
-          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\"");
-          }
+          message = t("Your filter is set to \"Institution\" which will narrow what you can search for.\n          Try adjusting the filter to \"{ topLevelBankFilter }\"", {
+            topLevelBankFilter: _this.topLevelBankFilterName()
+          });
         }
 
         return jsx(Billboard, {
@@ -256,26 +265,39 @@ 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);
       }
-    } // Only display the account search for the account and all banks filters
+    } // We only care about displaying the account search for the Institution Banks and Shared with Me filters
 
+  }, {
+    key: "topLevelBankFilterName",
+    value: function topLevelBankFilterName() {
+      return this.props.subAccountBankSharingEnabled ? t('Shared with Me') : t('All Banks');
+    }
   }, {
     key: "renderFilters",
     value: function renderFilters() {
       var scopeOptions = [{
         slug: 'user',
-        translation: this.props.newItemBankFilterNamesEnabled ? t('All Banks') : t('All My Banks')
+        translation: this.topLevelBankFilterName()
       }, {
         slug: 'account',
-        translation: this.props.subAccountBankSharingEnabled && this.displayThisAccount() ? t('This Account') : t('Institution Banks')
+        translation: t('Institution Banks')
       }, {
         slug: 'courses',
-        translation: this.props.newItemBankFilterNamesEnabled ? t('Banks Shared to Course') : t('All My Course Banks')
+        translation: this.props.subAccountBankSharingEnabled ? t('Shared with Courses') : t('Banks Shared to Course')
       }];
 
       if (this.props.scope.uuid) {
         scopeOptions.push({
           slug: 'course',
-          translation: this.props.newItemBankFilterNamesEnabled ? t('This Course') : t('Course Banks')
+          translation: t('This Course')
+        });
+      }
+
+      if (this.props.subAccountBankSharingEnabled && this.isSubAccountLaunch()) {
+        // Put this option below "Insitution Banks"
+        scopeOptions.splice(2, 0, {
+          slug: 'this_account',
+          translation: t('This Account')
         });
       } // display options are displayed when using banks list
       // non-display options are used for sorting of banks table
@@ -494,7 +516,6 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   // can be from consumer
   navigateToBuild: PropTypes.func,
   // from consumer
-  newItemBankFilterNamesEnabled: PropTypes.bool,
   onShare: PropTypes.func,
   // from consumer
   openModal: PropTypes.func.isRequired,
@@ -547,7 +568,6 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   sortOrder: 'ascending',
   searchTerms: null,
   searchSelection: [],
-  newItemBankFilterNamesEnabled: false,
   usedByCourseEnabled: false,
   itemBankSearchTableEnabled: false,
   subAccountBankSharingEnabled: false,

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

@@ -154,7 +154,7 @@ export var BanksList = (_dec = withStyle(generateStyle, generateComponentTheme),
                       name: bank.title
                     }));
 
-                    _this.props.addInfo(t('Creating "{name} Copy". Duplicate will appear in \'All Banks\'  filter.', {
+                    _this.props.addInfo(t('Creating "{name} Copy". Duplicate will appear in \'Shared with Me\' filter.', {
                       name: bank.title
                     }));
 

package/lib/banks/api/copyingBanksPoller.js

@@ -82,7 +82,7 @@ var handlePollingBanks = /*#__PURE__*/function () {
               });
 
               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.', {
+                dispatch((0, _alerts.addSuccess)((0, _formatMessage.default)('Created "{name}" successfully! Duplicate can be seen in \'Shared with Me\' filter.', {
                   name: bank.title
                 })));
               } else if (!bankInfo) {

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

@@ -38,7 +38,6 @@ function mapStateToProps(state, props) {
   return {
     itemBankSearchTableEnabled: (0, _featureCheck.featureOn)('item_bank_search_table'),
     improvedBankSharingEnabled: (0, _featureCheck.featureOn)('improved_bank_sharing'),
-    newItemBankFilterNamesEnabled: (0, _featureCheck.featureOn)('new_item_bank_filter_names'),
     usedByCourseEnabled: (0, _featureCheck.featureOn)('filter_item_banks_used_by_course'),
     subAccountBankSharingEnabled: (0, _featureCheck.featureOn)('sub_account_bank_sharing'),
     scopeType: scopeType,

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

@@ -96,10 +96,14 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
     _this = _super.apply(this, arguments);
 
     _this.hideAccountSearch = function () {
-      return _this.props.scopeType === 'courses' || _this.props.scopeType === 'course' || _this.props.scopeType === 'account' && _this.displayThisAccount();
+      if (_this.props.scopeType === 'course' || _this.props.scopeType === 'courses' || _this.props.scopeType === 'this_account') {
+        return true;
+      }
+
+      return false;
     };
 
-    _this.displayThisAccount = function () {
+    _this.isSubAccountLaunch = 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;
     };
 
@@ -142,8 +146,9 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
         params['search'] = _this.props.searchTerms;
       }
 
-      if (_this.props.subAccountBankSharingEnabled && _this.hideAccountSearch()) {
+      if (_this.props.scopeType === 'this_account') {
         params['account_uuids'] = [_this.props.scope.launch_context_uuid];
+        params['scope'] = 'account';
       } else if (_this.props.searchSelection.length > 0) {
         params['account_uuids'] = _this.props.searchSelection.map(function (account) {
           return account.uuid;
@@ -259,13 +264,17 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
         var message;
 
         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\"");
+          message = (0, _formatMessage.default)("Your filter is set to \"Courses\" which will narrow what you can search for.\n          Try adjusting the filter to \"{ topLevelBankFilter }\"", {
+            topLevelBankFilter: _this.topLevelBankFilterName()
+          });
+        } else if (_this.props.scopeType === 'this_account') {
+          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 \"{ topLevelBankFilter }\"", {
+            topLevelBankFilter: _this.topLevelBankFilterName()
+          });
         } else if (_this.props.scopeType === 'account') {
-          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\"");
-          }
+          message = (0, _formatMessage.default)("Your filter is set to \"Institution\" which will narrow what you can search for.\n          Try adjusting the filter to \"{ topLevelBankFilter }\"", {
+            topLevelBankFilter: _this.topLevelBankFilterName()
+          });
         }
 
         return (0, _emotion.jsx)(_uiBillboard.Billboard, {
@@ -296,26 +305,39 @@ 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);
       }
-    } // Only display the account search for the account and all banks filters
+    } // We only care about displaying the account search for the Institution Banks and Shared with Me filters
 
+  }, {
+    key: "topLevelBankFilterName",
+    value: function topLevelBankFilterName() {
+      return this.props.subAccountBankSharingEnabled ? (0, _formatMessage.default)('Shared with Me') : (0, _formatMessage.default)('All Banks');
+    }
   }, {
     key: "renderFilters",
     value: function renderFilters() {
       var scopeOptions = [{
         slug: 'user',
-        translation: this.props.newItemBankFilterNamesEnabled ? (0, _formatMessage.default)('All Banks') : (0, _formatMessage.default)('All My Banks')
+        translation: this.topLevelBankFilterName()
       }, {
         slug: 'account',
-        translation: this.props.subAccountBankSharingEnabled && this.displayThisAccount() ? (0, _formatMessage.default)('This Account') : (0, _formatMessage.default)('Institution Banks')
+        translation: (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')
+        translation: this.props.subAccountBankSharingEnabled ? (0, _formatMessage.default)('Shared with Courses') : (0, _formatMessage.default)('Banks Shared to Course')
       }];
 
       if (this.props.scope.uuid) {
         scopeOptions.push({
           slug: 'course',
-          translation: this.props.newItemBankFilterNamesEnabled ? (0, _formatMessage.default)('This Course') : (0, _formatMessage.default)('Course Banks')
+          translation: (0, _formatMessage.default)('This Course')
+        });
+      }
+
+      if (this.props.subAccountBankSharingEnabled && this.isSubAccountLaunch()) {
+        // Put this option below "Insitution Banks"
+        scopeOptions.splice(2, 0, {
+          slug: 'this_account',
+          translation: (0, _formatMessage.default)('This Account')
         });
       } // display options are displayed when using banks list
       // non-display options are used for sorting of banks table
@@ -533,7 +555,6 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
   // can be from consumer
   navigateToBuild: _propTypes.default.func,
   // from consumer
-  newItemBankFilterNamesEnabled: _propTypes.default.bool,
   onShare: _propTypes.default.func,
   // from consumer
   openModal: _propTypes.default.func.isRequired,
@@ -586,7 +607,6 @@ var Banks = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
   sortOrder: 'ascending',
   searchTerms: null,
   searchSelection: [],
-  newItemBankFilterNamesEnabled: false,
   usedByCourseEnabled: false,
   itemBankSearchTableEnabled: false,
   subAccountBankSharingEnabled: false,

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

@@ -189,7 +189,7 @@ var BanksList = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default)
                       name: bank.title
                     }));
 
-                    _this.props.addInfo((0, _formatMessage.default)('Creating "{name} Copy". Duplicate will appear in \'All Banks\'  filter.', {
+                    _this.props.addInfo((0, _formatMessage.default)('Creating "{name} Copy". Duplicate will appear in \'Shared with Me\' filter.', {
                       name: bank.title
                     }));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.11.4-rc.4+6259006fa",
+  "version": "20.11.4-rc.6+d2dbe1927",
   "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.4+6259006fa",
-    "@instructure/quiz-i18n": "20.11.4-rc.4+6259006fa",
-    "@instructure/quiz-interactions": "20.11.4-rc.4+6259006fa",
-    "@instructure/quiz-number-input": "20.11.4-rc.4+6259006fa",
-    "@instructure/quiz-rce": "20.11.4-rc.4+6259006fa",
+    "@instructure/quiz-common": "20.11.4-rc.6+d2dbe1927",
+    "@instructure/quiz-i18n": "20.11.4-rc.6+d2dbe1927",
+    "@instructure/quiz-interactions": "20.11.4-rc.6+d2dbe1927",
+    "@instructure/quiz-number-input": "20.11.4-rc.6+d2dbe1927",
+    "@instructure/quiz-rce": "20.11.4-rc.6+d2dbe1927",
     "@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.4+6259006fa",
+    "instructure-validations": "20.11.4-rc.6+d2dbe1927",
     "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.4+6259006fa",
+    "quiz-presets": "20.11.4-rc.6+d2dbe1927",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6259006faed5c298b839380c74085fe49a9b2c53"
+  "gitHead": "d2dbe1927e1efad37b079a892f68a637f3017d94"
 }