@instructure/quiz-core 20.36.2 → 20.38.0

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

@@ -17,7 +17,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _debounce = _interopRequireDefault(require("lodash/fp/debounce"));
 var _find = _interopRequireDefault(require("lodash/fp/find"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
-var _uiSelect = require("@instructure/ui-select");
 var _uiSpinner = require("@instructure/ui-spinner");
 var _index = _interopRequireDefault(require("../../../common/components/shared/TagWrapper/index.js"));
 var _quizCommon = require("@instructure/quiz-common");
@@ -243,11 +242,11 @@ var AsyncSearch = /*#__PURE__*/function (_Component) {
     key: "renderPeopleOptions",
     value: function renderPeopleOptions(people) {
       var _this4 = this;
-      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Group, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Group, {
         key: _quizCommon.SHARED_WITH_USER,
         renderLabel: (0, _formatMessage.default)('People')
       }, people.map(function (person) {
-        return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+        return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
           "data-automation": "sdk-item-bank-option-user-".concat(person.uuid),
           id: person.uuid,
           key: person.uuid,
@@ -259,11 +258,11 @@ var AsyncSearch = /*#__PURE__*/function (_Component) {
     key: "renderCoursesOptions",
     value: function renderCoursesOptions(courses) {
       var _this5 = this;
-      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Group, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Group, {
         key: _quizCommon.SHARED_WITH_COURSE,
         renderLabel: (0, _formatMessage.default)('Courses')
       }, courses.map(function (course) {
-        return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+        return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
           "data-automation": "sdk-item-bank-option-course-".concat(course.uuid),
           id: course.uuid,
           key: course.uuid,
@@ -275,11 +274,11 @@ var AsyncSearch = /*#__PURE__*/function (_Component) {
     key: "renderSubaccountsOptions",
     value: function renderSubaccountsOptions(subaccounts) {
       var _this6 = this;
-      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Group, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Group, {
         key: _quizCommon.SHARED_WITH_ACCOUNT,
         renderLabel: (0, _formatMessage.default)('Accounts')
       }, subaccounts.map(function (subaccount) {
-        return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+        return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
           "data-automation": "sdk-item-bank-option-subaccount-".concat(subaccount.uuid),
           id: subaccount.uuid,
           key: subaccount.uuid,
@@ -314,7 +313,7 @@ var AsyncSearch = /*#__PURE__*/function (_Component) {
       if (subaccounts.length) {
         groups.push(this.renderSubaccountsOptions(subaccounts));
       }
-      return groups.length ? groups : /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
+      return groups.length ? groups : /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
         id: _quizCommon.SELECT_EMPTY_OPTION,
         key: _quizCommon.SELECT_EMPTY_OPTION
       }, this.state.isLoading ? /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
@@ -342,7 +341,7 @@ var AsyncSearch = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         inputValue = _this$state.inputValue,
         isShowingOptions = _this$state.isShowingOptions;
-      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select, {
         "data-automation": "sdk-item-bank-share-input",
         renderLabel: this.props.searchLabel,
         placeholder: this.placeholder(),

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

@@ -28,7 +28,6 @@ var _uiText = require("@instructure/ui-text");
 var _uiHeading = require("@instructure/ui-heading");
 var _uiIcons = require("@instructure/ui-icons");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
-var _uiTextInput = require("@instructure/ui-text-input");
 var _emotion = require("@instructure/emotion");
 var _index = require("../HeaderBreadCrumb/index.js");
 var _index2 = _interopRequireDefault(require("../../../common/components/resources/entry/EntrySave/index.js"));
@@ -284,7 +283,7 @@ var BankEntry = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _th
     key: "renderTitle",
     value: function renderTitle(entry) {
       if (this.isItemEntry()) {
-        return (0, _emotion.jsx)(_uiTextInput.TextInput, {
+        return (0, _emotion.jsx)(_quizCommon.TextInput, {
           renderLabel: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Edit question title')),
           type: "text",
           placeholder: (0, _formatMessage.default)('Question Title'),

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

@@ -15,10 +15,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiIcons = require("@instructure/ui-icons");
 var _uiButtons = require("@instructure/ui-buttons");
-var _uiTextInput = require("@instructure/ui-text-input");
 var _uiCheckbox = require("@instructure/ui-checkbox");
 var _uiView = require("@instructure/ui-view");
-var _uiFlex = require("@instructure/ui-flex");
 var _uiText = require("@instructure/ui-text");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _emotion = require("@instructure/emotion");
@@ -140,19 +138,19 @@ var BankSearch = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _t
       var _this$props2 = this.props,
         showFilters = _this$props2.showFilters,
         toggleFilters = _this$props2.toggleFilters;
-      return (0, _emotion.jsx)("div", null, (0, _emotion.jsx)(_uiFlex.Flex, {
+      return (0, _emotion.jsx)("div", null, (0, _emotion.jsx)(_quizCommon.Flex, {
         as: "div"
-      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, (0, _emotion.jsx)(_quizCommon.Flex.Item, {
         shouldGrow: true,
         shouldShrink: true
-      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
+      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         renderLabel: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Search')),
         type: "search",
         placeholder: (0, _formatMessage.default)('Search'),
         onChange: this.updateSearch,
         value: this.props.search.get('text', '') || '',
         "data-automation": "sdk-bank-search-input"
-      })), (0, _emotion.jsx)(_uiFlex.Flex.Item, null, (0, _emotion.jsx)(_uiButtons.Button, {
+      })), (0, _emotion.jsx)(_quizCommon.Flex.Item, null, (0, _emotion.jsx)(_uiButtons.Button, {
         onClick: toggleFilters,
         margin: "none none none small",
         renderIcon: _uiIcons.IconPlusLine,

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

@@ -26,7 +26,6 @@ function mapStateToProps(state, props) {
   return {
     itemBankSearchTableEnabled: (0, _featureCheck.featureOn)('item_bank_search_table'),
     usedByCourseEnabled: (0, _featureCheck.featureOn)('filter_item_banks_used_by_course'),
-    subAccountBankSharingEnabled: (0, _featureCheck.featureOn)('sub_account_bank_sharing'),
     scopeType: scopeType,
     sortBy: sortBy,
     sortOrder: sortOrder,

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

@@ -20,8 +20,6 @@ var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _uiIcons = require("@instructure/ui-icons");
 var _uiBillboard = require("@instructure/ui-billboard");
 var _uiButtons = require("@instructure/ui-buttons");
-var _uiTextInput = require("@instructure/ui-text-input");
-var _uiSimpleSelect = require("@instructure/ui-simple-select");
 var _emotion = require("@instructure/emotion");
 var _uiGrid = require("@instructure/ui-grid");
 var _uiView = require("@instructure/ui-view");
@@ -232,7 +230,7 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
   }, {
     key: "topLevelBankFilterName",
     value: function topLevelBankFilterName() {
-      return this.props.subAccountBankSharingEnabled ? (0, _formatMessage.default)('Shared with Me') : (0, _formatMessage.default)('All Banks');
+      return (0, _formatMessage.default)('Shared with Me');
     }
   }, {
     key: "renderFilters",
@@ -245,7 +243,7 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
         translation: (0, _formatMessage.default)('Institution Banks')
       }, {
         slug: 'courses',
-        translation: this.props.subAccountBankSharingEnabled ? (0, _formatMessage.default)('Shared with Courses') : (0, _formatMessage.default)('Banks Shared to Course')
+        translation: (0, _formatMessage.default)('Shared with Courses')
       }];
       if (this.props.scope.uuid) {
         scopeOptions.push({
@@ -253,7 +251,7 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
           translation: (0, _formatMessage.default)('This Course')
         });
       }
-      if (this.props.subAccountBankSharingEnabled && this.isSubAccountLaunch()) {
+      if (this.isSubAccountLaunch()) {
         // Put this option below "Insitution Banks"
         scopeOptions.splice(2, 0, {
           slug: 'this_account',
@@ -291,28 +289,28 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
         vAlign: "bottom"
       }, (0, _emotion.jsx)(_uiGrid.Grid.Row, null, (0, _emotion.jsx)(_uiGrid.Grid.Col, {
         width: "auto"
-      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
+      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect, {
         onChange: this.handleBanksParentChange,
         value: this.props.scopeType,
         renderLabel: (0, _formatMessage.default)('Filter By'),
         width: "13rem",
         "data-automation": "sdk-banks-filter-select"
       }, scopeOptions.map(function (option) {
-        return (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+        return (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
           id: searchFiltersSelectOptionIdPrefix + option.slug,
           key: option.slug,
           value: option.slug
         }, option.translation);
       }))), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
         width: 4
-      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
+      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         renderLabel: (0, _formatMessage.default)('Bank'),
         type: "search",
         value: this.state.searchTerms,
         onChange: this.handleSearchInputChange,
         placeholder: (0, _formatMessage.default)('Search Banks'),
         "data-automation": "sdk-search-bank-textinput"
-      })), this.props.subAccountBankSharingEnabled && !this.hideAccountSearch() && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
+      })), !this.hideAccountSearch() && (0, _emotion.jsx)(_uiGrid.Grid.Col, {
         width: 4
       }, (0, _emotion.jsx)(_index7.default, {
         getShareableSubaccounts: this.props.getShareableSubaccounts,
@@ -329,7 +327,7 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
         style: {
           margin: 'auto 0px auto auto'
         }
-      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
+      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect, {
         renderLabel: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Sort by')),
         value: this.props.sortBy,
         width: "10rem",
@@ -337,7 +335,7 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
       }, sortingCriteriaOptions.filter(function (option) {
         return option.display === true;
       }).map(function (option) {
-        return (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+        return (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
           id: sortingFiltersSelectOptionIdPrefix + option.slug,
           key: option.slug,
           value: option.slug
@@ -498,7 +496,6 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
   usedByCourseEnabled: _propTypes.default.bool,
   itemBankSearchTableEnabled: _propTypes.default.bool,
   setUI: _propTypes.default.func.isRequired,
-  subAccountBankSharingEnabled: _propTypes.default.bool,
   iceTopNavBarEnabled: _propTypes.default.bool,
   styles: _propTypes.default.object,
   rootAccountUuid: _propTypes.default.string
@@ -525,7 +522,6 @@ var Banks = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _theme.
   searchSelection: [],
   usedByCourseEnabled: false,
   itemBankSearchTableEnabled: false,
-  subAccountBankSharingEnabled: false,
   iceTopNavBarEnabled: false,
   rootAccountUuid: null
 }, _Banks.contextTypes = {

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

@@ -13,7 +13,6 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiButtons = require("@instructure/ui-buttons");
-var _uiTextInput = require("@instructure/ui-text-input");
 var _uiRadioInput = require("@instructure/ui-radio-input");
 var _uiCheckbox = require("@instructure/ui-checkbox");
 var _uiHeading = require("@instructure/ui-heading");
@@ -147,7 +146,7 @@ var CopyMoveBankEntryModal = /*#__PURE__*/function (_Component) {
           "data-automation": "sdk-bank-selection"
         });
       }
-      return /*#__PURE__*/_react.default.createElement(_uiTextInput.TextInput, {
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.TextInput, {
         onChange: this.onTitleChange,
         value: this.state.newBankTitle,
         renderLabel: (0, _formatMessage.default)('New Bank Title'),

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

@@ -14,7 +14,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiButtons = require("@instructure/ui-buttons");
 var _uiCheckbox = require("@instructure/ui-checkbox");
 var _uiView = require("@instructure/ui-view");
-var _uiTextInput = require("@instructure/ui-text-input");
 var _uiHeading = require("@instructure/ui-heading");
 var _emotion = require("@instructure/emotion");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -102,7 +101,7 @@ var CreateBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
     value: function renderContent() {
       return (0, _emotion.jsx)("div", {
         css: this.props.styles.bankNameInput
-      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
+      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         messages: this.getErrors(),
         onChange: this.onNameChange,
         renderLabel: (0, _emotion.jsx)("div", {

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

@@ -12,7 +12,6 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiButtons = require("@instructure/ui-buttons");
-var _uiTextInput = require("@instructure/ui-text-input");
 var _uiHeading = require("@instructure/ui-heading");
 var _emotion = require("@instructure/emotion");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -85,7 +84,7 @@ var EditBankModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
     value: function renderContent() {
       return (0, _emotion.jsx)("div", {
         css: this.props.styles.bankNameInput
-      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
+      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         value: this.props.workingBank.title,
         messages: this.getErrors(),
         onChange: this.onNameChange,

package/lib/banks/components/NavWrapper/externalStyles.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateExternalStyle = void 0;
+var generateExternalStyle = function generateExternalStyle() {
+  return {
+    showReturnButton: true
+  };
+};
+exports.generateExternalStyle = generateExternalStyle;

package/lib/banks/components/NavWrapper/styles.js

@@ -1,12 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _externalStyles = require("./externalStyles.js");
 var generateStyle = function generateStyle(componentTheme) {
-  return {
-    showReturnButton: true,
+  return (0, _objectSpread2.default)({
     nav: {
       display: 'flex',
       flexDirection: 'row',
@@ -31,7 +33,7 @@ var generateStyle = function generateStyle(componentTheme) {
     crumbs: {
       flex: 1
     }
-  };
+  }, (0, _externalStyles.generateExternalStyle)());
 };
 var _default = generateStyle;
 exports.default = _default;

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

@@ -18,7 +18,6 @@ var _uiCheckbox = require("@instructure/ui-checkbox");
 var _uiView = require("@instructure/ui-view");
 var _uiGrid = require("@instructure/ui-grid");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
-var _uiSimpleSelect = require("@instructure/ui-simple-select");
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _theme = _interopRequireDefault(require("./theme.js"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -63,14 +62,14 @@ var RootAccountSharing = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.def
         "data-automation": "sdk-share-bank-with-institution-toggle"
       })), this.isSharedWithAccount() && /*#__PURE__*/_react.default.createElement(_uiGrid.Grid.Col, {
         width: "auto"
-      }, /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect, {
         onChange: this.props.onShareTypeChange,
         value: this.props.accountPermission,
         renderLabel: /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Access for account'))
-      }, /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect.Option, {
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect.Option, {
         id: "sharing-modal-account-perm-select-option-can-view",
         value: _quizCommon.READ_ONLY
-      }, (0, _formatMessage.default)('Can view')), /*#__PURE__*/_react.default.createElement(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _formatMessage.default)('Can view')), /*#__PURE__*/_react.default.createElement(_quizCommon.SimpleSelect.Option, {
         id: "sharing-modal-account-perm-select-option-can-edit",
         value: _quizCommon.CAN_EDIT
       }, (0, _formatMessage.default)('Can edit')))))));

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

@@ -16,7 +16,6 @@ var _immutable = require("immutable");
 var _uiIcons = require("@instructure/ui-icons");
 var _uiGrid = require("@instructure/ui-grid");
 var _uiAvatar = require("@instructure/ui-avatar");
-var _uiSimpleSelect = require("@instructure/ui-simple-select");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _emotion = require("@instructure/emotion");
 var _quizCommon = require("@instructure/quiz-common");
@@ -87,17 +86,17 @@ var ShareList = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, nul
         "data-automation": isEntityRemoved ? 'sdk-shared-entity-removed' : null
       }, entity.get('title'))), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
         width: "auto"
-      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
+      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect, {
         onChange: _this.handlePermissionChange(entity),
         value: entity.get('permission') === _quizCommon.REMOVED_ACCESS ? originalPermission : entity.get('permission'),
         renderLabel: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Access for {entity}', {
           entity: entity.get('title')
         })),
         disabled: isEntityRemoved || !_this.props.canEdit
-      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
         id: "share-list-select-option-can-view",
         value: _quizCommon.READ_ONLY
-      }, (0, _formatMessage.default)('Can view')), (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+      }, (0, _formatMessage.default)('Can view')), (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
         id: "share-list-select-option-can-edit",
         value: _quizCommon.CAN_EDIT
       }, (0, _formatMessage.default)('Can edit')))), (0, _emotion.jsx)(_uiGrid.Grid.Col, {

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

@@ -11,14 +11,12 @@ var _reactRedux = require("../../../common/react-redux.js");
 var _banks = require("../../api/banks.js");
 var _sharedBanks = require("../../../common/actions/sharedBanks.js");
 var _modal = require("../../../common/actions/modal.js");
-var _featureCheck = require("../../../common/util/featureCheck.js");
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 function mapStateToProps(state, ownProps) {
   var sharedBanks = state.get('sharedBanks', (0, _immutable.Map)()).filter(function (sharedBank) {
     return sharedBank.get('bankId') === ownProps.bank.id;
   }).toList();
   return {
-    subAccountBankSharingEnabled: (0, _featureCheck.featureOn)('sub_account_bank_sharing'),
     sharedBanks: sharedBanks
   };
 }

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.SharingModalPresenter = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -27,7 +27,6 @@ var _uiView = require("@instructure/ui-view");
 var _uiGrid = require("@instructure/ui-grid");
 var _uiTabs = require("@instructure/ui-tabs");
 var _uiText = require("@instructure/ui-text");
-var _uiSimpleSelect = require("@instructure/ui-simple-select");
 var _emotion = require("@instructure/emotion");
 var _ElementsForSelectors = _interopRequireDefault(require("../../../common/util/ElementsForSelectors.js"));
 var _CustomPropTypes = _interopRequireDefault(require("../../../common/util/CustomPropTypes.js"));
@@ -185,27 +184,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
       return originalEntity.get('permission', _quizCommon.CAN_EDIT);
     };
     _this.handleEntityRemove = function (entity, undoRemove) {
-      if (_this.props.subAccountBankSharingEnabled) {
-        _this.confirmPermissionChange(entity, _quizCommon.REMOVED_ACCESS);
-      } else {
-        var permission = undoRemove ? _this.originalPermissionForEntity(entity) : _quizCommon.REMOVED_ACCESS;
-        _this.setState(function (prevState) {
-          var sharesIndex = prevState.shares.findIndex(function (e) {
-            return e.get('id') == entity.get('id');
-          });
-          var newEntitiesIndex = prevState.newEntities.findIndex(function (e) {
-            return e.get('id') == entity.get('id');
-          });
-          var removedNewEntity = newEntitiesIndex > -1;
-          var newShares = removedNewEntity ? prevState.shares.delete(sharesIndex) : prevState.shares.setIn([sharesIndex, 'permission'], permission);
-          var newEntities = removedNewEntity ? prevState.newEntities.delete(newEntitiesIndex) : prevState.newEntities;
-          return {
-            shares: newShares,
-            newEntities: newEntities,
-            entitiesWithChangedPermission: Object.assign({}, prevState.entitiesWithChangedPermission, (0, _defineProperty2.default)({}, entity.get('id'), permission))
-          };
-        }, _this.updateEntitiesCount);
-      }
+      _this.confirmPermissionChange(entity, _quizCommon.REMOVED_ACCESS);
     };
     _this.handleSearchPermissionChange = function (e, _ref4) {
       var value = _ref4.value;
@@ -232,21 +211,13 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
           permission: _this.state.searchPermission
         });
       }));
-      if (_this.props.subAccountBankSharingEnabled) {
-        newEntities.forEach(function (entity) {
-          _this.props.onShare(entity.toJS());
-          _this.props.shareBank(_this.sharedBankForEntity(entity), _this.props.getUserInfo);
-        });
-        _this.setState({
-          searchSelection: []
-        });
-      } else {
-        _this.setState({
-          searchSelection: [],
-          shares: newEntities.concat(_this.state.shares),
-          newEntities: newEntities.concat(_this.state.newEntities)
-        }, _this.updateEntitiesCount);
-      }
+      newEntities.forEach(function (entity) {
+        _this.props.onShare(entity.toJS());
+        _this.props.shareBank(_this.sharedBankForEntity(entity), _this.props.getUserInfo);
+      });
+      _this.setState({
+        searchSelection: []
+      });
     };
     _this.updatePermission = /*#__PURE__*/function () {
       var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(entity, permission) {
@@ -291,19 +262,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
       });
     };
     _this.handleEntityPermissionChange = function (entity, permission) {
-      if (_this.props.subAccountBankSharingEnabled) {
-        _this.confirmPermissionChange(entity, permission);
-      } else {
-        _this.setState(function (prevState) {
-          var index = prevState.shares.findIndex(function (share) {
-            return share.get('id') === entity.get('id');
-          });
-          return {
-            shares: prevState.shares.setIn([index, 'permission'], permission),
-            entitiesWithChangedPermission: Object.assign({}, prevState.entitiesWithChangedPermission, (0, _defineProperty2.default)({}, entity.get('id'), permission))
-          };
-        });
-      }
+      _this.confirmPermissionChange(entity, permission);
     };
     _this.toggleAccountShare = function (event) {
       _this.setState(function (prevState) {
@@ -340,14 +299,14 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
           selectionFilter: _this.handleSearchFilter
         })), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
           width: "auto"
-        }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
+        }, (0, _emotion.jsx)(_quizCommon.SimpleSelect, {
           onChange: _this.handleSearchPermissionChange,
           value: _this.state.searchPermission,
           renderLabel: (0, _formatMessage.default)('Access')
-        }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+        }, (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
           id: "sharing-modal-search-section-select-option-can-view",
           value: _quizCommon.READ_ONLY
-        }, (0, _formatMessage.default)('Can view')), (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
+        }, (0, _formatMessage.default)('Can view')), (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
           id: "sharing-modal-search-section-select-option-can-edit",
           value: _quizCommon.CAN_EDIT
         }, (0, _formatMessage.default)('Can edit')))), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
@@ -392,7 +351,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      if (this.props.subAccountBankSharingEnabled && this.state.accountPermission !== prevState.accountPermission && this.state.accountPermission !== this.props.bank.accountPermission) {
+      if (this.state.accountPermission !== prevState.accountPermission && this.state.accountPermission !== this.props.bank.accountPermission) {
         var updatedBank = this.props.bank.set('accountPermission', this.state.accountPermission);
         this.props.updateBank(updatedBank, false);
       }
@@ -511,37 +470,20 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
       var existingAccounts = existingShares.filter(function (s) {
         return s.get('entityType') === _quizCommon.SHARED_WITH_ACCOUNT;
       });
-      if (this.props.subAccountBankSharingEnabled) {
-        return this.renderSubaccountSharingEnabledEntities(existingPeople, existingCourses, existingAccounts);
-      }
-      return this.renderOriginalDesignEntities(existingPeople, existingCourses);
+      return this.renderSubaccountSharingEnabledEntities(existingPeople, existingCourses, existingAccounts);
     }
   }, {
     key: "renderFooter",
     value: function renderFooter() {
-      if (this.props.subAccountBankSharingEnabled) {
-        return (0, _emotion.jsx)(_uiButtons.Button, {
-          color: "primary",
-          margin: "0 x-small 0 0",
-          onClick: this.handleDismiss
-        }, (0, _formatMessage.default)('Close'));
-      }
-      return (0, _emotion.jsx)(_react.default.Fragment, null, (0, _emotion.jsx)(_uiButtons.Button, {
-        "data-automation": "sdk-shared-bank-cancel-button",
-        color: "primary-inverse",
-        onClick: this.handleDismiss,
-        margin: "0 x-small 0 0"
-      }, (0, _formatMessage.default)('Cancel')), (0, _emotion.jsx)(_uiButtons.Button, {
-        "data-automation": "sdk-shared-bank-done-button",
+      return (0, _emotion.jsx)(_uiButtons.Button, {
         color: "primary",
-        onClick: this.handleSubmit,
-        margin: "0 x-small 0 0"
-      }, (0, _formatMessage.default)('Done')));
+        margin: "0 x-small 0 0",
+        onClick: this.handleDismiss
+      }, (0, _formatMessage.default)('Close'));
     }
   }, {
     key: "render",
     value: function render() {
-      var subAccountBankSharingEnabled = this.props.subAccountBankSharingEnabled;
       return (0, _emotion.jsx)(_quizCommon.Modal, {
         open: this.props.isOpen,
         onDismiss: this.handleDismiss,
@@ -554,7 +496,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
         placement: "end",
         offset: "medium",
         screenReaderLabel: (0, _formatMessage.default)('Close')
-      })), (0, _emotion.jsx)(_quizCommon.ModalBody, null, !subAccountBankSharingEnabled && this.renderRootAccountSharing(), !subAccountBankSharingEnabled && this.renderSearchSection(), this.state.shares.size >= 0 ? this.renderEntitiesSection() : _ref7), (0, _emotion.jsx)(_quizCommon.ModalFooter, null, this.renderFooter()));
+      })), (0, _emotion.jsx)(_quizCommon.ModalBody, null, this.state.shares.size >= 0 ? this.renderEntitiesSection() : _ref7), (0, _emotion.jsx)(_quizCommon.ModalFooter, null, this.renderFooter()));
     }
   }]);
   SharingModalPresenter.displayName = "SharingModalPresenter";
@@ -589,7 +531,6 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
   removeSharedBank: _propTypes.default.func.isRequired,
   shareBank: _propTypes.default.func.isRequired,
   sharedBanks: _reactImmutableProptypes.default.list,
-  subAccountBankSharingEnabled: _propTypes.default.bool,
   updateBank: _propTypes.default.func.isRequired,
   updateSharedBankPermission: _propTypes.default.func.isRequired,
   updateSharedCount: _propTypes.default.func,
@@ -604,7 +545,6 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
   onDismiss: noop,
   onShare: function onShare() {},
   sharedBanks: (0, _immutable.List)(),
-  subAccountBankSharingEnabled: false,
   updateSharedCount: Function.prototype
 }, _SharingModalPresenter)) || _class);
 exports.SharingModalPresenter = SharingModalPresenter;

package/lib/building/api/stimuli.js

@@ -28,7 +28,8 @@ function createStimulus(stimulus, parentId, parentType) {
     parent_stimulus_id: parentStimulusId,
     source_url: stimulus.sourceUrl,
     stimulus_type: stimulus.stimulusType,
-    title: stimulus.title
+    title: stimulus.title,
+    passage: stimulus.passage
   };
   var requestBody = JSON.stringify({
     stimulus: stimulusParams