@instructure/quiz-core 20.31.1 → 20.31.2-rc.28

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

@@ -10,13 +10,11 @@ import * as uiActions from "../../../common/actions/ui.js";
 import Bank from "../../../common/records/Bank.js";
 import { ADD_TO_BANK_MODAL_BANK_SELECTION, ADD_TO_BANK_MODAL } from '@instructure/quiz-common';
 import { getModalTrigger } from "../../../common/util/modalHelpers.js";
-import { featureOn } from "../../../common/util/featureCheck.js";
 export function mapStateToProps(state, props) {
   var selectedBankOption = state.getIn(['ui', ADD_TO_BANK_MODAL_BANK_SELECTION]);
   var selectedBank = selectedBankOption && new Bank(state.getIn(['banks', selectedBankOption]));
   return {
     canvasOrigin: state.getIn(['config', 'canvasOrigin']),
-    checkBankedContentShareabilityEnabled: featureOn('check_banked_content_shareability'),
     checkContentShareability: props.entryType === 'Item' ? checkItemShareability : checkStimulusShareability,
     selectedBank: selectedBank,
     modalTrigger: getModalTrigger(state),

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

@@ -107,11 +107,10 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
       var _this2 = this;
       var _this$props = this.props,
         canvasOrigin = _this$props.canvasOrigin,
-        checkBankedContentShareabilityEnabled = _this$props.checkBankedContentShareabilityEnabled,
         modalOpen = _this$props.modalOpen,
         checkContentShareability = _this$props.checkContentShareability,
         workingEntry = _this$props.workingEntry;
-      if (checkBankedContentShareabilityEnabled && modalOpen && !prevProps.modalOpen) {
+      if (modalOpen && !prevProps.modalOpen) {
         this.setState({
           contentShareable: 'loading'
         });
@@ -168,9 +167,8 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
         bankType = _this$state.bankType,
         newBankTitle = _this$state.newBankTitle,
         contentShareable = _this$state.contentShareable;
-      var checkBankedContentShareabilityEnabled = this.props.checkBankedContentShareabilityEnabled;
       var contentShareableLoading = contentShareable === 'loading';
-      var disabled = bankType === 'existing' && !this.props.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim()) || checkBankedContentShareabilityEnabled && contentShareableLoading;
+      var disabled = bankType === 'existing' && !this.props.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim()) || contentShareableLoading;
       return /*#__PURE__*/React.createElement(Button, {
         type: "button",
         color: "primary",
@@ -178,7 +176,7 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
         disabled: disabled,
         margin: XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-add-to-bank-button"
-      }, checkBankedContentShareabilityEnabled && !contentShareableLoading && contentShareable !== 'true' ? t('Add anyway') : t('Add'));
+      }, !contentShareableLoading && contentShareable !== 'true' ? t('Add anyway') : t('Add'));
     }
   }, {
     key: "renderBankTypeContent",
@@ -200,33 +198,31 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderContentShareabilityMessage",
     value: function renderContentShareabilityMessage() {
-      if (this.props.checkBankedContentShareabilityEnabled) {
-        var content = null;
-        if (this.state.contentShareable === 'loading') {
-          content = /*#__PURE__*/React.createElement(Text, null, /*#__PURE__*/React.createElement(Spinner, {
-            size: "x-small",
-            renderTitle: t('Checking content shareability...')
-          }), "\xA0", t('Validating content...'));
-        } else if (this.state.contentShareable === 'true') {
-          // No message needed. The API call to check shareability is very fast in most cases,
-          // so the user may be distracted by a message here.
-          content = null;
-        } else if (this.state.contentShareable === 'false') {
-          content = /*#__PURE__*/React.createElement(Flex, null, _ref2, /*#__PURE__*/React.createElement(Flex.Item, {
-            shouldShrink: true
-          }, /*#__PURE__*/React.createElement(Text, {
-            color: "danger"
-          }, t('You are attempting to add content containing course links which may not work when used in other courses.'))));
-        } else {
-          content = /*#__PURE__*/React.createElement(Text, {
-            color: "warning"
-          }, _ref3, "\xA0", t('There was an error attempting to validate shareability.'));
-        }
-        return /*#__PURE__*/React.createElement(View, {
-          as: "div",
-          margin: "small 0 0 0"
-        }, content);
+      var content = null;
+      if (this.state.contentShareable === 'loading') {
+        content = /*#__PURE__*/React.createElement(Text, null, /*#__PURE__*/React.createElement(Spinner, {
+          size: "x-small",
+          renderTitle: t('Checking content shareability...')
+        }), "\xA0", t('Validating content...'));
+      } else if (this.state.contentShareable === 'true') {
+        // No message needed. The API call to check shareability is very fast in most cases,
+        // so the user may be distracted by a message here.
+        content = null;
+      } else if (this.state.contentShareable === 'false') {
+        content = /*#__PURE__*/React.createElement(Flex, null, _ref2, /*#__PURE__*/React.createElement(Flex.Item, {
+          shouldShrink: true
+        }, /*#__PURE__*/React.createElement(Text, {
+          color: "danger"
+        }, t('You are attempting to add content containing course links which may not work when used in other courses.'))));
+      } else {
+        content = /*#__PURE__*/React.createElement(Text, {
+          color: "warning"
+        }, _ref3, "\xA0", t('There was an error attempting to validate shareability.'));
       }
+      return /*#__PURE__*/React.createElement(View, {
+        as: "div",
+        margin: "small 0 0 0"
+      }, content);
     }
   }, {
     key: "renderContent",
@@ -269,7 +265,6 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
 }(Component);
 AddToBankModal.propTypes = {
   canvasOrigin: PropTypes.string,
-  checkBankedContentShareabilityEnabled: PropTypes.bool,
   checkContentShareability: PropTypes.func.isRequired,
   closeModal: PropTypes.func.isRequired,
   createBank: PropTypes.func.isRequired,
@@ -295,7 +290,6 @@ AddToBankModal.propTypes = {
 };
 AddToBankModal.defaultProps = {
   canvasOrigin: '',
-  checkBankedContentShareabilityEnabled: false,
   handleValidationErrorsFromApi: function handleValidationErrorsFromApi() {},
   onAdd: function onAdd() {},
   onContinue: function onContinue() {},

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

@@ -153,7 +153,7 @@ export var AsyncSearch = /*#__PURE__*/function (_Component) {
           });
         });
       }
-      if (_this.props.improvedBankSharingEnabled && shouldSearchCourses) {
+      if (shouldSearchCourses) {
         _this.props.getShareableCourses(value).then(function (shareableCourses) {
           var filteredCourses = _this.filterOptions(shareableCourses);
           _this.setState({
@@ -357,7 +357,6 @@ export var AsyncSearch = /*#__PURE__*/function (_Component) {
 }(Component);
 AsyncSearch.propTypes = {
   debounceDelay: PropTypes.number,
-  improvedBankSharingEnabled: PropTypes.bool.isRequired,
   minChars: PropTypes.number,
   onSelectionChange: PropTypes.func.isRequired,
   getShareableCourses: PropTypes.func,

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

@@ -18,7 +18,6 @@ function mapStateToProps(state, props) {
   var rootAccountUuid = state.getIn(['outcomes', 'externalAccountUuid']);
   return {
     itemBankSearchTableEnabled: featureOn('item_bank_search_table'),
-    improvedBankSharingEnabled: featureOn('improved_bank_sharing'),
     usedByCourseEnabled: featureOn('filter_item_banks_used_by_course'),
     subAccountBankSharingEnabled: featureOn('sub_account_bank_sharing'),
     scopeType: scopeType,

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

@@ -308,7 +308,6 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         width: 4
       }, jsx(AsyncSearch, {
         getShareableSubaccounts: this.props.getShareableSubaccounts,
-        improvedBankSharingEnabled: this.props.improvedBankSharingEnabled,
         minChars: this.props.minChars,
         onSelectionChange: this.handleSearchSelectionChange,
         searchType: SHARED_WITH_ACCOUNT,
@@ -368,7 +367,7 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
     key: "renderHeader",
     value: function renderHeader() {
       return jsx("div", {
-        css: [this.props.styles.header, !this.props.improvedBankSharingEnabled ? this.props.styles.borderedBottom : {}]
+        css: [this.props.styles.header]
       }, jsx(Heading, {
         as: this.props.isCompact ? 'h2' : 'h1',
         level: "h1"
@@ -423,7 +422,7 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
         returnToUrl: this.props.returnToUrl,
         scope: this.props.scope,
         navigateToBuild: this.props.navigateToBuild
-      })), this.renderHeader(), this.props.improvedBankSharingEnabled && this.renderFilters(), this.renderBanksSearchResults(), jsx(CreateBankModal, {
+      })), this.renderHeader(), this.renderFilters(), this.renderBanksSearchResults(), jsx(CreateBankModal, {
         itemBanksScope: this.props.scope
       })));
     }
@@ -444,7 +443,6 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   }),
   // from consumer
   clear: PropTypes.func.isRequired,
-  improvedBankSharingEnabled: PropTypes.bool,
   getBanks: PropTypes.func.isRequired,
   getCourseInfo: PropTypes.func,
   // from consumer
@@ -512,7 +510,6 @@ export var Banks = (_dec = withStyle(generateStyle, generateComponentTheme), _de
   onShare: function onShare() {},
   scope: {},
   returnToUrl: null,
-  improvedBankSharingEnabled: false,
   scopeType: 'user',
   sortBy: 'name',
   sortOrder: 'ascending',

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

@@ -4,7 +4,6 @@ import BanksList from "./presenter.js";
 import Bank from "../../../common/records/Bank.js";
 import { openModal, withConfirm } from "../../../common/actions/modal.js";
 import { deleteBank, createBankCloneJob } from "../../api/banks.js";
-import { featureOn } from "../../../common/util/featureCheck.js";
 import { addInfo } from "../../../common/actions/alerts.js";
 import { addToPolling } from "../../api/copyingBanksPoller.js";
 export function mapStateToProps(state, props) {
@@ -12,8 +11,7 @@ export function mapStateToProps(state, props) {
     appContainer: state.getIn(['ui', 'appContainer']),
     banks: List(props.recordIds).map(function (id) {
       return Bank.create(state.getIn(['banks', id]));
-    }),
-    duplicateItemBanks: featureOn('duplicate_item_banks')
+    })
   };
 }
 export default connect(mapStateToProps, {

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

@@ -263,21 +263,6 @@ export var BanksList = (_dec = withStyle(generateStyle, generateComponentTheme),
           name: bank.title
         })
       }));
-      var duplicateBankOption = jsx(IconButton, {
-        onClick: _this.openDuplicateBankModal(bank),
-        name: "Duplicate",
-        size: "small",
-        "data-automation": "sdk-duplicate-bank-button",
-        renderIcon: IconCopyLine,
-        withBackground: false,
-        withBorder: false,
-        title: t('Duplicate bank {name}', {
-          name: bank.title
-        }),
-        screenReaderLabel: t('Duplicate bank {name}', {
-          name: bank.title
-        })
-      });
       if (bank.status === 'copying') {
         return jsx("div", {
           css: _this.props.styles.bankOptions
@@ -289,7 +274,21 @@ export var BanksList = (_dec = withStyle(generateStyle, generateComponentTheme),
       } else {
         return jsx("div", {
           css: _this.props.styles.bankOptions
-        }, _this.props.duplicateItemBanks ? duplicateBankOption : null, jsx(IfFeature, {
+        }, jsx(IconButton, {
+          onClick: _this.openDuplicateBankModal(bank),
+          name: "Duplicate",
+          size: "small",
+          "data-automation": "sdk-duplicate-bank-button",
+          renderIcon: IconCopyLine,
+          withBackground: false,
+          withBorder: false,
+          title: t('Duplicate bank {name}', {
+            name: bank.title
+          }),
+          screenReaderLabel: t('Duplicate bank {name}', {
+            name: bank.title
+          })
+        }), jsx(IfFeature, {
           name: "item_bank_sharing"
         }, jsx(IconButton, {
           onClick: _this.openSharingModal(bank),
@@ -479,7 +478,6 @@ export var BanksList = (_dec = withStyle(generateStyle, generateComponentTheme),
   }),
   focusCreateBankButton: PropTypes.func.isRequired,
   deleteBank: PropTypes.func.isRequired,
-  duplicateItemBanks: PropTypes.bool,
   getCourseInfo: PropTypes.func,
   getUserInfo: PropTypes.func,
   getShareableCourses: PropTypes.func,
@@ -503,8 +501,7 @@ export var BanksList = (_dec = withStyle(generateStyle, generateComponentTheme),
   minChars: void 0,
   locale: null,
   timezone: null,
-  onShare: function onShare() {},
-  duplicateItemBanks: false
+  onShare: function onShare() {}
 }, _BanksList.contextTypes = {
   locale: PropTypes.string,
   timezone: PropTypes.string

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

@@ -78,7 +78,7 @@ export var ShareList = (_dec = withStyle(generateStyle, null), _dec(_class = (_S
       })), 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 && jsx(Grid.Col, {
+      }, entity.get('title'))), jsx(Grid.Col, {
         width: "auto"
       }, jsx(SimpleSelect, {
         onChange: _this.handlePermissionChange(entity),
@@ -95,7 +95,7 @@ export var ShareList = (_dec = withStyle(generateStyle, null), _dec(_class = (_S
         value: CAN_EDIT
       }, t('Can edit')))), jsx(Grid.Col, {
         width: "auto"
-      }, _this.props.canEdit && (_this.props.improvedBankSharingEnabled || !isCourse) && _this.renderRemoveButton(entity, isEntityRemoved)));
+      }, _this.props.canEdit && _this.renderRemoveButton(entity, isEntityRemoved)));
     };
     return _this;
   }
@@ -117,7 +117,6 @@ export var ShareList = (_dec = withStyle(generateStyle, null), _dec(_class = (_S
     permission: PropTypes.string.isRequired,
     id: PropTypes.string.isRequired
   })).isRequired,
-  improvedBankSharingEnabled: PropTypes.bool.isRequired,
   onPermissionChange: PropTypes.func.isRequired,
   onEntityRemove: PropTypes.func.isRequired,
   sharedBanks: ImmutablePropTypes.list,

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

@@ -11,7 +11,6 @@ function mapStateToProps(state, ownProps) {
     return sharedBank.get('bankId') === ownProps.bank.id;
   }).toList();
   return {
-    improvedBankSharingEnabled: featureOn('improved_bank_sharing'),
     subAccountBankSharingEnabled: featureOn('sub_account_bank_sharing'),
     sharedBanks: sharedBanks
   };

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

@@ -325,13 +325,12 @@ export var SharingModalPresenter = (_dec = withStyle(generateStyle, generateComp
           getShareableCourses: _this.props.getShareableCourses,
           getShareableUsers: _this.props.getShareableUsers,
           getShareableSubaccounts: _this.props.getShareableSubaccounts,
-          improvedBankSharingEnabled: _this.props.improvedBankSharingEnabled,
           minChars: _this.props.minChars,
           onSelectionChange: _this.handleSearchSelectionChange,
           searchType: searchType,
           selectedOption: _this.state.searchSelection,
           selectionFilter: _this.handleSearchFilter
-        })), _this.props.improvedBankSharingEnabled && jsx(Grid.Col, {
+        })), jsx(Grid.Col, {
           width: "auto"
         }, jsx(SimpleSelect, {
           onChange: _this.handleSearchPermissionChange,
@@ -359,7 +358,6 @@ export var SharingModalPresenter = (_dec = withStyle(generateStyle, generateComp
       return jsx(ShareList, {
         canEdit: _this.props.bank.canEdit(),
         entities: entities,
-        improvedBankSharingEnabled: _this.props.improvedBankSharingEnabled,
         onPermissionChange: _this.handleEntityPermissionChange,
         onEntityRemove: _this.handleEntityRemove,
         sharedBanks: _this.props.sharedBanks
@@ -574,7 +572,6 @@ export var SharingModalPresenter = (_dec = withStyle(generateStyle, generateComp
   getUserInfo: PropTypes.func.isRequired,
   getShareableSubaccounts: PropTypes.func.isRequired,
   getSubaccountInfo: PropTypes.func.isRequired,
-  improvedBankSharingEnabled: PropTypes.bool,
   isOpen: PropTypes.bool,
   minChars: PropTypes.number,
   modalTrigger: PropTypes.node,
@@ -593,7 +590,6 @@ export var SharingModalPresenter = (_dec = withStyle(generateStyle, generateComp
 }, _SharingModalPresenter.defaultProps = {
   bank: null,
   currentUser: null,
-  improvedBankSharingEnabled: false,
   isOpen: false,
   minChars: void 0,
   modalTrigger: null,

package/es/common/components/layout/Page/index.js

@@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
 import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
+import t from '@instructure/quiz-i18n/es/format-message';
 export var Page = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_Page = /*#__PURE__*/function (_Component) {
   _inherits(Page, _Component);
   var _super = _createSuper(Page);
@@ -50,7 +51,8 @@ export var Page = (_dec = withStyle(generateStyle, generateComponentTheme), _dec
         tabIndex: "-1",
         ref: this.props.childrenWrapperRef,
         role: this.props.contentRole,
-        css: this.props.styles.childrenWrapper
+        css: this.props.styles.childrenWrapper,
+        "aria-label": t('Quiz content')
       }, this.props.children));
     }
   }]);
@@ -68,7 +70,7 @@ export var Page = (_dec = withStyle(generateStyle, generateComponentTheme), _dec
   makeStyles: PropTypes.func
 }, _Page.defaultProps = {
   childrenWrapperRef: function childrenWrapperRef() {},
-  contentRole: 'main',
+  contentRole: 'region',
   sidebarComponent: null,
   sidebarOpen: null,
   sidebarRole: 'navigation',

package/es/common/components/layout/sidebar/Sidebar/index.js

@@ -290,7 +290,8 @@ export var Sidebar = (_dec = withStyle(generateStyle, generateComponentTheme), _
         // take the click and scroll to itself when the nav is clicked by SR
         ,
         onClick: noop,
-        id: SIDEBAR_NAV_ID
+        id: SIDEBAR_NAV_ID,
+        "aria-label": t('Question Navigator')
       }, this.renderSidebarHeader(), this.renderTotalPointsPossible(), this.renderPinned(), this.renderTitle(), this.renderInstructions(), this.renderResults(), jsx("div", {
         css: this.props.styles.sidebarContent
       }, this.props.children)))));

package/es/common/components/resources/entry/EntrySave/index.js

@@ -6,7 +6,6 @@ import { showError, hideError } from "../../../../actions/errorsShowing.js";
 import { screenreaderNotification } from "../../../../actions/alerts.js";
 import { clearNextQuizEntry } from "../../../../actions/modifications.js";
 import { withConfirm } from "../../../../actions/modal.js";
-import { featureOn } from "../../../../util/featureCheck.js";
 import EntrySave from "./presenter.js";
 export function mapStateToProps(state, props) {
   // Error Related:
@@ -14,7 +13,6 @@ export function mapStateToProps(state, props) {
   var isValid = props.isValid !== void 0 ? props.isValid : workingEntry.isValid();
   return {
     canvasOrigin: state.getIn(['config', 'canvasOrigin']),
-    checkBankedContentShareabilityEnabled: featureOn('check_banked_content_shareability'),
     checkContentShareability: props.entry.isStimulus ? checkStimulusShareability : checkItemShareability,
     isValid: isValid
   };

package/es/common/components/resources/entry/EntrySave/presenter.js

@@ -95,7 +95,7 @@ export var EntrySave = /*#__PURE__*/function (_Component) {
                   _context2.next = 5;
                   break;
                 }
-                if (_this.props.checkBankedContentShareabilityEnabled && _this.props.shouldValidateShareableContent) {
+                if (_this.props.shouldValidateShareableContent) {
                   _this.confirmShareableContent();
                 } else {
                   _this.successfulSubmit();
@@ -228,7 +228,6 @@ export var EntrySave = /*#__PURE__*/function (_Component) {
 EntrySave.propTypes = {
   cancelHandler: PropTypes.func,
   canvasOrigin: PropTypes.string,
-  checkBankedContentShareabilityEnabled: PropTypes.bool,
   checkContentShareability: PropTypes.func.isRequired,
   clearChanges: PropTypes.func.isRequired,
   // From connected component
@@ -253,7 +252,6 @@ EntrySave.propTypes = {
 EntrySave.defaultProps = {
   cancelHandler: noop,
   canvasOrigin: '',
-  checkBankedContentShareabilityEnabled: false,
   displayPosition: null,
   disableSubmit: false,
   guid: null,

package/es/common/components/resources/item/ItemEdit/index.js

@@ -38,7 +38,6 @@ export function mapStateToProps(state, props) {
     partialDeepScoringEnabled: featureOn('partial_deep_scoring'),
     partialScoringEnabled: featureOn('partial_scoring'),
     quizId: getActiveQuizId(state),
-    showCalculator: featureOn('calculator_per_question'),
     scope: props.scope,
     rootAccountUuid: state.getIn(['outcomes', 'externalAccountUuid'])
   };

package/es/common/components/resources/item/ItemEdit/presenter.js

@@ -173,7 +173,6 @@ ItemEdit.propTypes = {
   setOneQuestionAtATime: PropTypes.func.isRequired,
   setUploadStatus: PropTypes.func.isRequired,
   initialFocusId: PropTypes.string,
-  showCalculator: PropTypes.bool,
   clearValidationErrorsFromApi: PropTypes.func.isRequired,
   validationErrorsFromApi: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.shape({
     type: PropTypes.string,
@@ -200,7 +199,6 @@ ItemEdit.defaultProps = {
   partialScoringEnabled: false,
   quizId: null,
   initialFocusId: null,
-  showCalculator: false,
   validationErrorsFromApi: {},
   scope: {},
   rootAccountUuid: null

package/es/common/components/shared/PrintTrigger/index.js

@@ -6,13 +6,11 @@ import { PRINT_FONT_SIZE_MODAL, QUIZ_SESSION_GRADE_SCOPE } from '@instructure/qu
 import * as printingActions from "../../../actions/printing.js";
 import * as modalActions from "../../../actions/modal.js";
 import * as quizEntriesApiActions from "../../../../building/api/quizEntries.js";
-import { featureOn } from "../../../util/featureCheck.js";
 import { getConfigTokenScope } from "../../../selectors/config.js";
 export function mapStateToProps(state) {
   return {
     activeQuizId: state.getIn(['quizzes', 'activeQuizId']),
     appContainer: state.getIn(['ui', 'appContainer']),
-    asyncSampleItemsEnabled: featureOn('async_sample_items'),
     bankQuizEntryIds: state.get('quizEntries', Map()).filter(function (quizEntry) {
       return quizEntry.get('entryType') === 'Bank';
     }).keySeq().toArray(),

package/es/common/components/shared/PrintTrigger/presenter.js

@@ -34,7 +34,7 @@ export var PrintTrigger = /*#__PURE__*/function (_Component) {
         waitingForPrintingToBeReady: true
       });
       var sampleItemFetchPromises = [];
-      if (_this.props.asyncSampleItemsEnabled && !_this.props.isGrading) {
+      if (!_this.props.isGrading) {
         var _this$props = _this.props,
           activeQuizId = _this$props.activeQuizId,
           bankQuizEntryIds = _this$props.bankQuizEntryIds,
@@ -108,7 +108,6 @@ export var PrintTrigger = /*#__PURE__*/function (_Component) {
 PrintTrigger.propTypes = {
   activeQuizId: PropTypes.string,
   appContainer: CustomPropTypes.selectors,
-  asyncSampleItemsEnabled: PropTypes.bool,
   bankQuizEntryIds: PropTypes.arrayOf(PropTypes.string),
   closePrintFontSizeModal: PropTypes.func.isRequired,
   getSampleItemsForQuizEntry: PropTypes.func.isRequired,
@@ -124,7 +123,6 @@ PrintTrigger.propTypes = {
 PrintTrigger.defaultProps = {
   activeQuizId: null,
   appContainer: null,
-  asyncSampleItemsEnabled: false,
   bankQuizEntryIds: [],
   isGrading: false,
   persistedPrintFontSize: 'medium',

package/es/common/selectors/calculator.js

@@ -1,4 +1,3 @@
-import { featureOn } from "../util/featureCheck.js";
 import { getCurrentSessionItemPosition } from "./taking.js";
 import { getItemByPosition } from "./sessionItems.js";
 import { isOneQuestionAtATime } from "../selectors/quizSessions.js"; // Helpers
@@ -11,9 +10,6 @@ function anyActiveSessionItemsHaveCalculators(state) {
 
 // Exports
 export function hasVisibleQuestionCalculator(state) {
-  if (!featureOn('calculator_per_question')) {
-    return false;
-  }
   if (isOneQuestionAtATime(state)) {
     // If one question at a time, does current question have a calculator?
     var position = getCurrentSessionItemPosition(state);

package/es/common/util/interactionTypePropsHelper.js

@@ -1,5 +1,6 @@
 import { RichContentInput } from '@instructure/quiz-rce';
 import t from '@instructure/quiz-i18n/es/format-message';
+import { featureOn } from "./featureCheck.js";
 export var propsForInteractionEdit = function propsForInteractionEdit(props, additionalOptions) {
   var item = props.workingItem.toJS();
   var changeItemState = function changeItemState(newState, inputId) {
@@ -31,9 +32,6 @@ export var propsForInteractionEdit = function propsForInteractionEdit(props, add
     validationErrorsFromApi: props.validationErrorsFromApi,
     errorsAreShowing: props.errorsAreShowing,
     fitbCommonWordbankEnabled: props.fitbCommonWordbankEnabled,
-    hiddenOptions: {
-      calculator: !props.showCalculator
-    },
     interactionData: item.interactionData,
     interactionType: props.entry.getInteractionType(),
     // SHIM: canvas-rce breaks on null values now
@@ -61,7 +59,8 @@ export var propsForInteractionEdit = function propsForInteractionEdit(props, add
     setOneQuestionAtATime: setOneQuestionAtATime,
     stemErrors: props.workingItem.errorsFor('itemBody').toJS(),
     initialFocusId: props.initialFocusId,
-    calculatorType: item.calculatorType
+    calculatorType: item.calculatorType,
+    multipleHotSpotEnabled: featureOn('multiple_hotspot_selections')
   };
 };
 export var propsForInteractionShow = function propsForInteractionShow(item) {