@instructure/quiz-core 20.11.3 → 20.11.4-rc.1

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 === '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\"");
@@ -263,7 +267,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/es/banks/components/SharingModal/ShareList/index.js

@@ -78,7 +78,6 @@ export var ShareList = (_dec = withStyle(generateStyle, null), _dec(_class = (_t
     _this.renderEntity = function (entity) {
       var isEntityRemoved = entity.get('permission') === REMOVED_ACCESS;
       var isCourse = entity.get('entityType') === SHARED_WITH_COURSE;
-      var isOnlyEntity = _this.props.shares.size <= 1;
       var originalEntity = _this.props.sharedBanks.find(function (sb) {
         return sb.get('id') == entity.get('id');
       }) || Map();
@@ -95,7 +94,7 @@ export var ShareList = (_dec = withStyle(generateStyle, null), _dec(_class = (_t
       })), jsx(Grid.Col, null, jsx("span", {
         css: isEntityRemoved ? _this.props.styles.labelRemoved : null,
         "data-automation": isEntityRemoved ? 'sdk-shared-entity-removed' : null
-      }, entity.get('title'))), _this.props.improvedBankSharingEnabled && !isOnlyEntity && jsx(Grid.Col, {
+      }, entity.get('title'))), _this.props.improvedBankSharingEnabled && jsx(Grid.Col, {
         width: "auto"
       }, jsx(SimpleSelect, {
         onChange: _this.handlePermissionChange(entity),
@@ -112,7 +111,7 @@ export var ShareList = (_dec = withStyle(generateStyle, null), _dec(_class = (_t
         value: CAN_EDIT
       }, t('Can edit')))), jsx(Grid.Col, {
         width: "auto"
-      }, !isOnlyEntity && _this.props.canEdit && (_this.props.improvedBankSharingEnabled || !isCourse) && _this.renderRemoveButton(entity, isEntityRemoved)));
+      }, _this.props.canEdit && (_this.props.improvedBankSharingEnabled || !isCourse) && _this.renderRemoveButton(entity, isEntityRemoved)));
     };
 
     return _this;
@@ -141,14 +140,6 @@ export var ShareList = (_dec = withStyle(generateStyle, null), _dec(_class = (_t
   onPermissionChange: PropTypes.func.isRequired,
   onEntityRemove: PropTypes.func.isRequired,
   sharedBanks: ImmutablePropTypes.list,
-  shares: ImmutablePropTypes.listOf(ImmutablePropTypes.contains({
-    avatar: PropTypes.string,
-    title: PropTypes.string.isRequired,
-    entityType: PropTypes.string.isRequired,
-    entityId: PropTypes.string.isRequired,
-    permission: PropTypes.string.isRequired,
-    id: PropTypes.string.isRequired
-  })).isRequired,
   // eslint-disable-next-line react/require-default-props,react/forbid-prop-types
   styles: PropTypes.object
 }, _temp)) || _class);

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

@@ -419,8 +419,7 @@ export var SharingModalPresenter = (_dec = withStyle(generateStyle, generateComp
         improvedBankSharingEnabled: _this.props.improvedBankSharingEnabled,
         onPermissionChange: _this.handleEntityPermissionChange,
         onEntityRemove: _this.handleEntityRemove,
-        sharedBanks: _this.props.sharedBanks,
-        shares: _this.state.shares
+        sharedBanks: _this.props.sharedBanks
       });
     };
 

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 === '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\"");
@@ -303,7 +307,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/lib/banks/components/SharingModal/ShareList/index.js

@@ -104,7 +104,6 @@ var ShareList = (_dec = (0, _emotion.withStyle)(_styles.default, null), _dec(_cl
 
       var isCourse = entity.get('entityType') === _quizCommon.SHARED_WITH_COURSE;
 
-      var isOnlyEntity = _this.props.shares.size <= 1;
       var originalEntity = _this.props.sharedBanks.find(function (sb) {
         return sb.get('id') == entity.get('id');
       }) || (0, _immutable.Map)();
@@ -121,7 +120,7 @@ var ShareList = (_dec = (0, _emotion.withStyle)(_styles.default, null), _dec(_cl
       })), (0, _emotion.jsx)(_uiGrid.Grid.Col, null, (0, _emotion.jsx)("span", {
         css: isEntityRemoved ? _this.props.styles.labelRemoved : null,
         "data-automation": isEntityRemoved ? 'sdk-shared-entity-removed' : null
-      }, entity.get('title'))), _this.props.improvedBankSharingEnabled && !isOnlyEntity && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
+      }, entity.get('title'))), _this.props.improvedBankSharingEnabled && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
         width: "auto"
       }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
         onChange: _this.handlePermissionChange(entity),
@@ -138,7 +137,7 @@ var ShareList = (_dec = (0, _emotion.withStyle)(_styles.default, null), _dec(_cl
         value: _quizCommon.CAN_EDIT
       }, (0, _formatMessage.default)('Can edit')))), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
         width: "auto"
-      }, !isOnlyEntity && _this.props.canEdit && (_this.props.improvedBankSharingEnabled || !isCourse) && _this.renderRemoveButton(entity, isEntityRemoved)));
+      }, _this.props.canEdit && (_this.props.improvedBankSharingEnabled || !isCourse) && _this.renderRemoveButton(entity, isEntityRemoved)));
     };
 
     return _this;
@@ -166,14 +165,6 @@ var ShareList = (_dec = (0, _emotion.withStyle)(_styles.default, null), _dec(_cl
   onPermissionChange: _propTypes.default.func.isRequired,
   onEntityRemove: _propTypes.default.func.isRequired,
   sharedBanks: _reactImmutableProptypes.default.list,
-  shares: _reactImmutableProptypes.default.listOf(_reactImmutableProptypes.default.contains({
-    avatar: _propTypes.default.string,
-    title: _propTypes.default.string.isRequired,
-    entityType: _propTypes.default.string.isRequired,
-    entityId: _propTypes.default.string.isRequired,
-    permission: _propTypes.default.string.isRequired,
-    id: _propTypes.default.string.isRequired
-  })).isRequired,
   // eslint-disable-next-line react/require-default-props,react/forbid-prop-types
   styles: _propTypes.default.object
 }, _temp)) || _class);

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

@@ -457,8 +457,7 @@ var SharingModalPresenter = (_dec = (0, _emotion.withStyle)(_styles.default, _th
         improvedBankSharingEnabled: _this.props.improvedBankSharingEnabled,
         onPermissionChange: _this.handleEntityPermissionChange,
         onEntityRemove: _this.handleEntityRemove,
-        sharedBanks: _this.props.sharedBanks,
-        shares: _this.state.shares
+        sharedBanks: _this.props.sharedBanks
       });
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.11.3",
+  "version": "20.11.4-rc.1+6f88b53e9",
   "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.3",
-    "@instructure/quiz-i18n": "^20.11.3",
-    "@instructure/quiz-interactions": "^20.11.3",
-    "@instructure/quiz-number-input": "^20.11.3",
-    "@instructure/quiz-rce": "^20.11.3",
+    "@instructure/quiz-common": "20.11.4-rc.1+6f88b53e9",
+    "@instructure/quiz-i18n": "20.11.4-rc.1+6f88b53e9",
+    "@instructure/quiz-interactions": "20.11.4-rc.1+6f88b53e9",
+    "@instructure/quiz-number-input": "20.11.4-rc.1+6f88b53e9",
+    "@instructure/quiz-rce": "20.11.4-rc.1+6f88b53e9",
     "@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.3",
+    "instructure-validations": "20.11.4-rc.1+6f88b53e9",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -143,7 +143,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "^20.11.3",
+    "@instructure/quiz-scripts": "20.11.3",
     "@instructure/ui-axe-check": "^8.51.0",
     "@instructure/ui-babel-preset": "^7.22.1",
     "@instructure/ui-karma-config": "^7.22.1",
@@ -163,7 +163,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^20.11.3",
+    "quiz-presets": "20.11.4-rc.1+6f88b53e9",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "82650fb1ff86ce3b6766f4b919ad72922f029e3d"
+  "gitHead": "6f88b53e91fdb3b7e66d04147d27b7fdc271df81"
 }