@instructure/quiz-core 17.54.2-rc.7 → 17.55.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [17.55.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.54.1...v17.55.0) (2023-05-31)
+
+
+### Bug Fixes
+
+* **Banks:** hide tray close button on manage banks page ([a5030d7](https://gerrit.instructure.com/quizzes-ui/commits/a5030d786b6a0663caf283879009227ac8cf6012))
+
+
+### Features
+
+* **Reports:** Adjust report mock for demo app ([b07c30a](https://gerrit.instructure.com/quizzes-ui/commits/b07c30aced5b736b1d626cba3a2968784be12017))
+* **SharingModal:** redesign to prep for sub-account sharing ([46e46bb](https://gerrit.instructure.com/quizzes-ui/commits/46e46bb0b613359393148b22d82fffa59643b660))
+
+
+
+
+
 ## [17.54.1](https://gerrit.instructure.com/quizzes-ui/compare/v17.54.0...v17.54.1) (2023-05-16)
 
 

package/es/banks/api/banks.js

@@ -66,8 +66,12 @@ export var getBank = function getBank(bankId) {
     });
     return fetcher.get("".concat(banksApiEndpoint, "/").concat(bankId)).then(function (response) {
       return dispatch(handleBanksResponse([response]));
-    }).catch(function () {// Do nothing because this case is handled elsewhere.
+    }).catch(function (err) {
+      if (err.response.status === 404) {
+        dispatch(clear(BANKS_BANK_PAGINATION));
+      } // Do nothing because this case is handled elsewhere.
       // This catch is to suppress an console error for "unhandled in promise".
+
     });
   };
 };
@@ -199,7 +203,7 @@ export var shareBank = function shareBank(_shareBank, getUserInfo) {
         var sharedBank = {
           id: sharedBankInfo.id,
           entityType: SHARED_WITH_COURSE,
-          entityId: _shareBank.uuid,
+          entityId: _shareBank.entityId,
           title: _shareBank.title,
           permission: sharedBankInfo.permission,
           bankId: _shareBank.bankId
@@ -296,7 +300,6 @@ export var updateSharedBankPermission = function updateSharedBankPermission(bank
       body: shareBankData
     }).then(function (sharedBank) {
       if (permission === REMOVED_ACCESS) {
-        dispatch(clear(BANKS_BANK_PAGINATION));
         dispatch(removeSharedBank(sharedBankId));
       } else {
         dispatch(updateSharedBankPermissionAction(sharedBankId, permission));

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

@@ -263,6 +263,23 @@ export var BanksList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
   }
 
   _createClass(BanksList, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate() {
+      var _this2 = this;
+
+      if (this.state.sharingModalBank) {
+        var bankFromList = this.props.banks.find(function (bank) {
+          return bank.get('id') === _this2.state.sharingModalBank.get('id');
+        });
+
+        if (!this.state.sharingModalBank.equals(bankFromList)) {
+          this.setState({
+            sharingModalBank: bankFromList
+          });
+        }
+      }
+    }
+  }, {
     key: "renderDetails",
     value: function renderDetails(bank) {
       var separator = ' | ';

package/es/banks/components/SharingModal/ShareList/index.js

@@ -65,7 +65,7 @@ export var ShareList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
       var entity = _ref2.entity,
           isEntityRemoved = _ref2.isEntityRemoved;
 
-      _this.props.onEntityRemove(entity.get('id'), isEntityRemoved);
+      _this.props.onEntityRemove(entity, isEntityRemoved);
     };
 
     _this.handlePermissionChange = function (entity) {
@@ -153,7 +153,9 @@ export var ShareList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
   }, {
     key: "render",
     value: function render() {
-      var shares = this.props.shares;
+      var _this$props = this.props,
+          shares = _this$props.shares,
+          subAccountBankSharingEnabled = _this$props.subAccountBankSharingEnabled;
       var newEntityIds = this.props.newEntities.map(function (e) {
         return e.get('id');
       });
@@ -168,30 +170,37 @@ export var ShareList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
       });
       return /*#__PURE__*/React.createElement("div", {
         className: "fs-mask"
-      }, /*#__PURE__*/React.createElement(Text, {
+      }, !subAccountBankSharingEnabled && /*#__PURE__*/React.createElement(Text, {
         as: "div",
         weight: "bold"
       }, t('Currently shared with')), /*#__PURE__*/React.createElement(View, {
         as: "div",
-        padding: "small 0 0 0",
         "data-automation": "sdk-shared-bank-user-list"
-      }, this.renderNewEntities(), /*#__PURE__*/React.createElement(Tabs, {
+      }, !subAccountBankSharingEnabled && this.renderNewEntities(), /*#__PURE__*/React.createElement(Tabs, {
         onRequestTabChange: this.handleTabChange
       }, /*#__PURE__*/React.createElement(Tabs.Panel, {
         renderTitle: t('People ({ peopleCount })', {
           peopleCount: existingPeople.size
         }),
         isSelected: this.state.selectedTabIndex === 0,
-        padding: "small none"
-      }, /*#__PURE__*/React.createElement(Grid, {
+        padding: "large 0 0 0"
+      }, subAccountBankSharingEnabled && this.props.renderSearchSection(SHARED_WITH_USER), subAccountBankSharingEnabled && /*#__PURE__*/React.createElement(Text, {
+        as: "div",
+        weight: "bold",
+        lineHeight: "double"
+      }, t('Currently shared with')), /*#__PURE__*/React.createElement(Grid, {
         vAlign: "middle"
-      }, existingPeople.map(this.renderEntity))), !existingCourses.isEmpty() && /*#__PURE__*/React.createElement(Tabs.Panel, {
+      }, existingPeople.map(this.renderEntity))), (!existingCourses.isEmpty() || subAccountBankSharingEnabled) && /*#__PURE__*/React.createElement(Tabs.Panel, {
         renderTitle: t('Courses ({ coursesCount })', {
           coursesCount: existingCourses.size
         }),
         isSelected: this.state.selectedTabIndex === 1,
-        padding: "small none"
-      }, /*#__PURE__*/React.createElement(Grid, {
+        padding: "large 0 0 0"
+      }, subAccountBankSharingEnabled && this.props.renderSearchSection(SHARED_WITH_COURSE), subAccountBankSharingEnabled && /*#__PURE__*/React.createElement(Text, {
+        as: "div",
+        weight: "bold",
+        lineHeight: "double"
+      }, t('Currently shared with')), /*#__PURE__*/React.createElement(Grid, {
         vAlign: "middle"
       }, existingCourses.map(this.renderEntity))))));
     }
@@ -203,6 +212,9 @@ export var ShareList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
   canEdit: PropTypes.bool.isRequired,
   improvedBankSharingEnabled: PropTypes.bool.isRequired,
   newEntities: ImmutablePropTypes.list,
+  onEntityRemove: PropTypes.func.isRequired,
+  onPermissionChange: PropTypes.func.isRequired,
+  renderSearchSection: PropTypes.func.isRequired,
   sharedBanks: ImmutablePropTypes.list,
   shares: ImmutablePropTypes.listOf(ImmutablePropTypes.contains({
     avatar: PropTypes.string,
@@ -212,8 +224,7 @@ export var ShareList = (_dec = themeable(theme, styles), _dec(_class = (_temp =
     permission: PropTypes.string.isRequired,
     id: PropTypes.string.isRequired
   })).isRequired,
-  onPermissionChange: PropTypes.func.isRequired,
-  onEntityRemove: PropTypes.func.isRequired
+  subAccountBankSharingEnabled: PropTypes.bool.isRequired
 }, _class2.defaultProps = {
   newEntities: List(),
   sharedBanks: List()

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

@@ -171,18 +171,22 @@ export var AsyncSearch = /*#__PURE__*/function (_Component) {
     };
 
     _this.search = debounce(_this.props.debounceDelay, function (value) {
-      // TODO add the promise cancellation for avoiding having disordered requests
-      _this.props.getShareableUsers(value).then(function (shareableUsers) {
-        var filteredUsers = _this.filterOptions(shareableUsers);
+      var shouldSearchPeople = !_this.props.searchType || _this.props.searchType === SHARED_WITH_USER;
+      var shouldSearchCourses = !_this.props.searchType || _this.props.searchType === SHARED_WITH_COURSE; // TODO add the promise cancellation for avoiding having disordered requests
 
-        _this.setState({
-          shareableUsers: shareableUsers,
-          highlightedOptionId: filteredUsers.length ? filteredUsers[0].uuid : _this.state.highlightedOptionId,
-          isLoading: false
+      if (shouldSearchPeople) {
+        _this.props.getShareableUsers(value).then(function (shareableUsers) {
+          var filteredUsers = _this.filterOptions(shareableUsers);
+
+          _this.setState({
+            shareableUsers: shareableUsers,
+            highlightedOptionId: filteredUsers.length ? filteredUsers[0].uuid : _this.state.highlightedOptionId,
+            isLoading: false
+          });
         });
-      });
+      }
 
-      if (_this.props.improvedBankSharingEnabled) {
+      if (_this.props.improvedBankSharingEnabled && shouldSearchCourses) {
         _this.props.getShareableCourses(value).then(function (shareableCourses) {
           var filteredCourses = _this.filterOptions(shareableCourses);
 
@@ -326,10 +330,11 @@ export var AsyncSearch = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
           inputValue = _this$state.inputValue,
           isShowingOptions = _this$state.isShowingOptions;
+      var placeholder = this.props.searchType === SHARED_WITH_COURSE ? t('Enter course name or course id') : t('Enter name or login id');
       return /*#__PURE__*/React.createElement(Select, {
         "data-automation": "sdk-item-bank-share-input",
         renderLabel: t('Share With'),
-        placeholder: t('Enter name or login id...'),
+        placeholder: placeholder,
         inputValue: inputValue,
         isShowingOptions: isShowingOptions,
         inputRef: this.setInputRef,
@@ -355,6 +360,7 @@ AsyncSearch.propTypes = {
   onSelectionChange: PropTypes.func.isRequired,
   getShareableCourses: PropTypes.func.isRequired,
   getShareableUsers: PropTypes.func.isRequired,
+  searchType: PropTypes.string,
   selectedOption: PropTypes.arrayOf(PropTypes.shape({
     avatar: PropTypes.string,
     fullName: PropTypes.string,
@@ -366,6 +372,7 @@ AsyncSearch.propTypes = {
 AsyncSearch.defaultProps = {
   debounceDelay: 500,
   minChars: 1,
+  searchType: null,
   selectionFilter: function selectionFilter(value) {
     return value;
   }

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

@@ -3,6 +3,7 @@ import { Map } from 'immutable';
 import { connect } from "../../../common/react-redux.js";
 import { shareBank, getSharedBanks, updateSharedBankPermission, getBank, updateBank } from "../../api/banks.js";
 import { removeSharedBank } from "../../../common/actions/sharedBanks.js";
+import { withConfirm } from "../../../common/actions/modal.js";
 import { featureOn } from "../../../common/util/featureCheck.js";
 import SharingModal from "./presenter.js";
 
@@ -12,6 +13,7 @@ function mapStateToProps(state, ownProps) {
   }).toList();
   return {
     improvedBankSharingEnabled: featureOn('improved_bank_sharing'),
+    subAccountBankSharingEnabled: featureOn('sub_account_bank_sharing'),
     sharedBanks: sharedBanks
   };
 }
@@ -22,6 +24,7 @@ var mapDispatchToProps = {
   updateSharedBankPermission: updateSharedBankPermission,
   getBank: getBank,
   removeSharedBank: removeSharedBank,
-  updateBank: updateBank
+  updateBank: updateBank,
+  withConfirm: withConfirm
 };
 export default compose(connect(mapStateToProps, mapDispatchToProps))(SharingModal);