@instructure/quiz-core 22.10.2 → 22.11.1-rc.88

package/es/banks/api/bankEntries.js

@@ -10,7 +10,7 @@ import { getBank } from './banks';
 import { handleError } from '../../common/api/helpers';
 import get from 'lodash/get';
 import { BANKS_BANK_ENTRY_PAGINATION, GET_BANK_ENTRIES_CALL, GET_BANK_ENTRY_CALL, UPDATE_BANK_ENTRY_CALL, CREATE_BANK_ENTRY_CALL, COPY_BANK_ENTRY_CALL, REMOVE_BANK_ENTRY_CALL } from '@instructure/quiz-common';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 export var getBankEntries = function getBankEntries(bankId, useBankSearch) {
   var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var page = params.page,

package/es/banks/api/banks.js

@@ -8,12 +8,13 @@ import ExhaustivePaginatedFetcher from '../../common/util/ExhaustivePaginatedFet
 import { handleBanksResponse, handleBankResponse, handleShareBankResponse, handleShareBanksResponse } from '../../common/api/callHandlers';
 import { archiveBankEntry } from '../../common/actions/bankEntries';
 import { archiveBank } from '../../common/actions/banks';
-import { removeSharedBank, updateSharedBankPermission as updateSharedBankPermissionAction } from '../../common/actions/sharedBanks';
+import { removeSharedBank, updateSharedBankPermission as updateSharedBankPermissionAction, getSharedBanksAction } from '../../common/actions/sharedBanks';
+import { sharedBankLoadingAction } from '../../common/actions/sharingModal';
 import { clear, newActiveBankEntry, newActiveBank } from '../../common/actions/ui';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { handleError } from '../../common/api/helpers';
 import { removeFromPolling } from './copyingBanksPoller';
-import { BANKS_BANK_PAGINATION, BANKS_BANK_ENTRY_PAGINATION, DELETE_BANK_CALL, UPDATE_BANK_CALL, CAN_EDIT, READ_ONLY, REMOVED_ACCESS, SHARED_WITH_USER, SHARED_WITH_COURSE, SHARED_WITH_ACCOUNT } from '@instructure/quiz-common';
+import { BANKS_BANK_PAGINATION, BANKS_BANK_ENTRY_PAGINATION, DELETE_BANK_CALL, UPDATE_BANK_CALL, READ_ONLY, REMOVED_ACCESS, SHARED_WITH_USER, SHARED_WITH_COURSE } from '@instructure/quiz-common';
 import { noop } from 'lodash';
 import { NIL } from 'uuid';
 var banksApiEndpoint = '/api/banks';
@@ -268,102 +269,22 @@ export var getSharedBank = function getSharedBank(bankId, entityType, entityId)
   };
 };
 export var getSharedBanks = function getSharedBanks(bank, getUserInfo, getCourseInfo, getAccountInfo) {
-  var url = "".concat(banksApiEndpoint, "/").concat(bank.id, "/shared_banks");
   return function (dispatch, getState) {
-    var fetcher = new Fetcher({
-      onError: handleError(dispatch, t('Failed to fetch shared banks.'))
-    });
-    return fetcher.get(url).then(function (sharedBanksInfo) {
-      // if the API returns no data, we manually add the bank's creator to the response
-      if (sharedBanksInfo.length === 0) {
-        sharedBanksInfo.push({
-          id: '-1',
-          entity_type: SHARED_WITH_USER,
-          entity_id: bank.creator,
-          permission: CAN_EDIT,
-          bank_id: bank.id
-        });
-      }
-
-      // USERS
-      var userSharedBanks = [];
-      var userUuids = sharedBanksInfo.filter(function (sb) {
-        return sb.entity_type === SHARED_WITH_USER;
-      }).map(function (sb) {
-        return sb.entity_id;
-      });
-      getUserInfo(userUuids).then(function (usersInfo) {
-        usersInfo.forEach(function (userInfo) {
-          var sharedBankInfo = sharedBanksInfo.find(function (sb) {
-            return sb.entity_type === SHARED_WITH_USER && sb.entity_id === userInfo.uuid;
-          });
-          if (sharedBankInfo) {
-            userSharedBanks.push({
-              id: sharedBankInfo.id,
-              entityType: sharedBankInfo.entity_type,
-              entityId: sharedBankInfo.entity_id,
-              title: userInfo.fullName,
-              avatar: userInfo.avatar,
-              permission: sharedBankInfo.permission,
-              bankId: sharedBankInfo.bank_id
-            });
-          }
-        });
-        dispatch(handleShareBanksResponse(userSharedBanks));
-      });
-
-      // COURSES
-      var courseSharedBanks = [];
-      var courseUuids = sharedBanksInfo.filter(function (sb) {
-        return sb.entity_type === SHARED_WITH_COURSE;
-      }).map(function (sb) {
-        return sb.entity_id;
-      });
-      getCourseInfo(courseUuids).then(function (coursesInfo) {
-        coursesInfo.forEach(function (courseInfo) {
-          var sharedBankInfo = sharedBanksInfo.find(function (sb) {
-            return sb.entity_type === SHARED_WITH_COURSE && sb.entity_id === courseInfo.uuid;
-          });
-          if (sharedBankInfo) {
-            courseSharedBanks.push({
-              id: sharedBankInfo.id,
-              entityType: sharedBankInfo.entity_type,
-              entityId: sharedBankInfo.entity_id,
-              title: courseInfo.title,
-              permission: sharedBankInfo.permission,
-              bankId: sharedBankInfo.bank_id
-            });
-          }
-        });
-        dispatch(handleShareBanksResponse(courseSharedBanks));
-      });
-
-      // ACCOUNTS
-      var accountSharedBanks = [];
-      var accountUuids = sharedBanksInfo.filter(function (sb) {
-        return sb.entity_type === SHARED_WITH_ACCOUNT;
-      }).map(function (sb) {
-        return sb.entity_id;
-      });
-      getAccountInfo(accountUuids).then(function (accountsInfo) {
-        accountsInfo.forEach(function (accountInfo) {
-          var sharedBankInfo = sharedBanksInfo.find(function (sb) {
-            return sb.entity_type === SHARED_WITH_ACCOUNT && sb.entity_id === accountInfo.uuid;
-          });
-          if (sharedBankInfo) {
-            accountSharedBanks.push({
-              id: sharedBankInfo.id,
-              entityType: sharedBankInfo.entity_type,
-              entityId: sharedBankInfo.entity_id,
-              title: accountInfo.name,
-              permission: sharedBankInfo.permission,
-              bankId: sharedBankInfo.bank_id
-            });
-          }
-        });
-        dispatch(handleShareBanksResponse(accountSharedBanks));
-      });
-    });
+    var payload = {
+      bank: bank,
+      getUserInfo: getUserInfo,
+      getCourseInfo: getCourseInfo,
+      getAccountInfo: getAccountInfo
+    };
+    dispatch(getSharedBanksAction(payload));
+  };
+};
+export var changeSharedBankLoading = function changeSharedBankLoading(isLoading) {
+  return function (dispatch, getState) {
+    var payload = {
+      loading: isLoading
+    };
+    dispatch(sharedBankLoadingAction(payload));
   };
 };
 export var updateSharedBankPermission = function updateSharedBankPermission(bankId, sharedBankId, permission) {

package/es/banks/api/copyingBanksPoller.js

@@ -1,6 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { addError, addSuccess } from '../../common/actions/alerts';
 import { getSpecificBanks } from './banks';
 var pollingBanks = [];

package/es/banks/api/tagAssociations.js

@@ -4,7 +4,7 @@ import Fetcher from '../../common/util/Fetcher';
 import { handleError } from '../../common/api/helpers';
 import { addTagAssociation, removePendingAdditionTagAssociation, removePendingDeletionTagAssociation, removeTagAssociation, setTagSuggestions } from '../../common/actions/tagAssociations';
 import { GET_TAG_SUGGESTIONS, CREATE_TAG_ASSOCIATION, DELETE_TAG_ASSOCIATION } from '@instructure/quiz-common';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 export var getTagSuggestions = function getTagSuggestions(entryType, entryId, text) {
   return function (dispatch, getState) {
     var url = '/api/tags';

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

@@ -25,7 +25,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import first from 'lodash/first';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import InteractionTypes from '../../../common/components/shared/InteractionTypes';
 import { XSMALL_SIDE_MARGIN, Modal, ModalHeader, ModalBody, ModalFooter } from '@instructure/quiz-common';
 export var AddBankEntryModal = /*#__PURE__*/function (_Component) {

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

@@ -26,7 +26,7 @@ import { RadioInputGroup, RadioInput } from '@instructure/ui-radio-input';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import Bank from '../../../common/records/Bank';
 import BankSelection from '../../../common/components/resources/BankSelection/presenter';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import { featureOn } from '../../../common/util/featureCheck';
 export var AddToBankModal = /*#__PURE__*/function (_Component) {

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

@@ -25,7 +25,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import debounce from 'lodash/fp/debounce';
 import find from 'lodash/fp/find';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { Spinner } from '@instructure/ui-spinner';
 import TagWrapper from '../../../common/components/shared/TagWrapper';
 import { SHARED_WITH_USER, SHARED_WITH_COURSE, SHARED_WITH_ACCOUNT, SELECT_EMPTY_OPTION, Select } from '@instructure/quiz-common';

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

@@ -41,7 +41,7 @@ import BankRecord from '../../../common/records/Bank';
 import Page from '../../../common/components/layout/Page';
 import PaginatedCollection from '../../../common/components/shared/PaginatedCollection';
 import QuizEntry from '../../../common/records/QuizEntry';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import debounceLatestPromise from '../../../common/util/debounceLatestPromise';
 import AddBankEntryModal from '../../../banks/components/AddBankEntryModal';
 import BankEntriesList from '../../../banks/components/BankEntriesList';

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

@@ -51,7 +51,7 @@ import StimulusEditInfo from '../../../common/components/resources/stimulus/Stim
 import StimulusShowInfo from '../../../common/components/resources/stimulus/StimulusShowInfo';
 import TagSuggestSelect from '../../../common/components/shared/TagSuggestSelect';
 import WarningWrapper from '../../../common/components/resources/WarningWrapper';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { createItem } from '../../../building/api/items';
 import { createStimulus } from '../../../building/api/stimuli';
 import { propsForItemVersioningWrapper, propsForStimulusVersioningWrapper } from '../../../common/util/warningHelpers';

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

@@ -35,7 +35,7 @@ import { jsx } from '@instructure/emotion';
 import { BUILD_TRAY_POSITION, COPY_MOVE_BANK_ENTRY_MODAL, SET_EDIT_BUTTON_FOCUS, withI18nSupport, withStyleOverrides } from '@instructure/quiz-common';
 import { RichContentRenderer } from '@instructure/quiz-rce';
 import { extractTextFromHtml } from '@instructure/quiz-interactions';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import CopyMoveBankEntryModal from '../CopyMoveBankEntryModal';
 import ExpandButton from '../../../common/components/shared/ExpandButton';
 import QuizEntry from '../../../common/records/QuizEntry';

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

@@ -31,7 +31,7 @@ import { View } from '@instructure/ui-view';
 import { Text } from '@instructure/ui-text';
 import { AccessibleContent, ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { jsx } from '@instructure/emotion';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import TagSuggestSelect from '../../../common/components/shared/TagSuggestSelect';
 import { interactionTypesNameDictionary } from '../../../common/util/interactionTypeMetadata';
 import generateStyle from './styles';

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

@@ -38,7 +38,7 @@ import debounce from 'lodash/fp/debounce';
 import Page from '../../../common/components/layout/Page';
 import { HeaderBreadCrumb } from '../HeaderBreadCrumb';
 import PaginatedCollection from '../../../common/components/shared/PaginatedCollection';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { BANKS_BANK_FILTERS, BANKS_BANK_PAGINATION, CREATE_BANK_MODAL, SHARED_WITH_ACCOUNT, withStyleOverrides, SimpleSelect, TextInput } from '@instructure/quiz-common';
 import BanksList from '../../../banks/components/BanksList';
 import CreateBankModal from '../../../banks/components/CreateBankModal';

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

@@ -42,7 +42,7 @@ import CustomPropTypes from '../../../common/util/CustomPropTypes';
 import IfFeature from '../../../common/components/shared/IfFeature';
 import EditBankModal from '../EditBankModal';
 import SharingModal from '../SharingModal';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
 export var BanksList = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_BanksList = /*#__PURE__*/function (_withI18nSupport) {

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

@@ -25,7 +25,7 @@ import { RadioInputGroup, RadioInput } from '@instructure/ui-radio-input';
 import { Checkbox } from '@instructure/ui-checkbox';
 import { Heading } from '@instructure/ui-heading';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import Bank from '../../../common/records/Bank';
 import BankSelection from '../../../common/components/resources/BankSelection/presenter';
 import { Modal, ModalHeader, ModalBody, ModalFooter, COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';

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

@@ -27,7 +27,7 @@ import { Checkbox } from '@instructure/ui-checkbox';
 import { View } from '@instructure/ui-view';
 import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import Bank from '../../../common/records/Bank';
 import { toErrors } from '../../../common/util/instUIMessages';
 import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';

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

@@ -25,7 +25,7 @@ import PropTypes from 'prop-types';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { toErrors } from '../../../common/util/instUIMessages';
 import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import Bank from '../../../common/records/Bank';

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

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef } from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { Breadcrumb, BreadcrumbLink } from '@instructure/ui-breadcrumb';
 export function HeaderBreadCrumb(_ref) {
   var _ref$returnToUrl = _ref.returnToUrl,

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

@@ -34,7 +34,7 @@ import QTIImportModal from '../../../building/components/QTIImportModal';
 import { PARENT_TYPE_BANK, withStyleOverrides } from '@instructure/quiz-common';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 export var HeaderMenu = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_HeaderMenu = /*#__PURE__*/function (_Component) {
   function HeaderMenu() {
     _classCallCheck(this, HeaderMenu);

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

@@ -33,7 +33,7 @@ import { BreadcrumbLink } from '@instructure/ui-breadcrumb';
 import { IconBankLine } from '@instructure/ui-icons';
 import { View } from '@instructure/ui-view';
 import { jsx, Global } from '@instructure/emotion';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
 import { withStyleOverrides } from '@instructure/quiz-common';

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

@@ -29,7 +29,7 @@ import { Grid } from '@instructure/ui-grid';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 export var RootAccountSharing = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_RootAccountSharing = /*#__PURE__*/function (_Component) {
   function RootAccountSharing() {
     var _this2;

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

@@ -30,7 +30,7 @@ import { Avatar } from '@instructure/ui-avatar';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { jsx } from '@instructure/emotion';
 import { CAN_EDIT, READ_ONLY, REMOVED_ACCESS, SHARED_WITH_COURSE, SimpleSelect, withStyleOverrides } from '@instructure/quiz-common';
-import t from '@instructure/quiz-i18n/es/format-message';
+import t from '@instructure/quiz-i18n/format-message';
 import { ContextualIconButton } from '../ContextualIconButton';
 import generateStyle from './styles';
 export var ShareList = (_dec = withStyleOverrides(generateStyle, null), _dec(_class = (_ShareList = /*#__PURE__*/function (_Component) {

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

@@ -1,7 +1,7 @@
 import { compose } from 'redux';
 import { Map } from 'immutable';
 import { connect } from '../../../common/react-redux';
-import { shareBank, getSharedBanks, updateSharedBankPermission, getBank, updateBank } from '../../api/banks';
+import { shareBank, getSharedBanks, updateSharedBankPermission, getBank, updateBank, changeSharedBankLoading } from '../../api/banks';
 import { removeSharedBank } from '../../../common/actions/sharedBanks';
 import { withConfirm } from '../../../common/actions/modal';
 import SharingModal from './presenter';
@@ -9,8 +9,10 @@ function mapStateToProps(state, ownProps) {
   var sharedBanks = state.get('sharedBanks', Map()).filter(function (sharedBank) {
     return sharedBank.get('bankId') === ownProps.bank.id;
   }).toList();
+  var loading = state.getIn(['sharingModal', 'loading']);
   return {
-    sharedBanks: sharedBanks
+    sharedBanks: sharedBanks,
+    loading: loading
   };
 }
 var mapDispatchToProps = {
@@ -20,6 +22,7 @@ var mapDispatchToProps = {
   getBank: getBank,
   removeSharedBank: removeSharedBank,
   updateBank: updateBank,
-  withConfirm: withConfirm
+  withConfirm: withConfirm,
+  changeSharedBankLoading: changeSharedBankLoading
 };
 export default compose(connect(mapStateToProps, mapDispatchToProps))(SharingModal);