@instructure/quiz-core 22.17.0 → 22.18.0

package/es/building/api/items.js

@@ -126,10 +126,10 @@ function _ts_generator(thisArg, body) {
     }
 }
 import first from 'lodash/first';
-import { CREATE_ITEM_CALL, CREATE_BULK_ITEMS_CALL, UPDATE_ITEM_CALL, PARENT_TYPE_ADDING_TO_BANK } from '@instructure/quiz-common';
+import { CREATE_ITEM_CALL, CREATE_BULK_ITEMS_CALL, UPDATE_ITEM_CALL, PARENT_TYPE_ADDING_TO_BANK } from '@instructure/quiz-common/constants';
 import { addError } from '../../common/actions/alerts';
 import { handleError, errorsAllFromValidation, processApiError, getOnErrorWithDelayedValidationMessage } from '../../common/api/helpers';
-import Fetcher from '../../common/util/Fetcher';
+import { createFetcher } from '../../common/util/Fetcher';
 import { handleItemsResponse } from '../../common/api/callHandlers';
 import t from '@instructure/quiz-i18n/format-message';
 // =====================
@@ -140,7 +140,7 @@ import t from '@instructure/quiz-i18n/format-message';
 export function getItem(itemId) {
     var url = "/api/items/".concat(itemId);
     return function(dispatch, getState) {
-        var fetcher = new Fetcher();
+        var fetcher = createFetcher(dispatch, getState);
         return fetcher.get(url).then(function(itemData) {
             dispatch(handleItemsResponse([
                 itemData
@@ -234,7 +234,7 @@ export function createItem(item, parentId, parentType) {
         if (parentType === 'bank') {
             onError = handleError(dispatch, errorMessage);
         }
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: CREATE_ITEM_CALL,
             cloneResponseForError: true,
             onError: onError
@@ -275,11 +275,11 @@ export function createItem(item, parentId, parentType) {
             items: items
         })
     };
-    return function(dispatch) {
+    return function(dispatch, getState) {
         return _async_to_generator(function() {
             var fetcher;
             return _ts_generator(this, function(_state) {
-                fetcher = new Fetcher({
+                fetcher = createFetcher(dispatch, getState, {
                     callType: CREATE_BULK_ITEMS_CALL,
                     cloneResponseForError: true,
                     onError: function(param) {
@@ -381,7 +381,7 @@ export function updateItem(item, parentId, parentType) {
         var _$updateItemParams = {
             body: reqBody
         };
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: UPDATE_ITEM_CALL,
             cloneResponseForError: true,
             onError: function(param) {

package/es/building/api/qtiImports.js

@@ -1,5 +1,5 @@
-import Fetcher from '../../common/util/Fetcher';
-import { CREATE_QTI_IMPORT, FILE_UPLOAD_SUCCESS, FILE_UPLOAD_FAILURE, PARENT_TYPE_QUIZ, PARENT_TYPE_BANK } from '@instructure/quiz-common';
+import { createFetcher } from '../../common/util/Fetcher';
+import { CREATE_QTI_IMPORT, FILE_UPLOAD_SUCCESS, FILE_UPLOAD_FAILURE, PARENT_TYPE_QUIZ, PARENT_TYPE_BANK } from '@instructure/quiz-common/constants';
 import { handleQtiImportsResponse } from '../../common/api/callHandlers';
 import { getExistingQuizAndItems } from '../../common/api/quizzes';
 import { getUploadUrl, sendFileToS3 } from '../../common/api/fileUpload';
@@ -7,7 +7,7 @@ import { getExistingBankAndEntries } from '../../banks/api/banks';
 import { uploadStatus as setUploadStatus } from '../../common/actions/upload';
 export var getQTIInfo = function(quizId) {
     return function(dispatch, getState) {
-        var fetcher = new Fetcher();
+        var fetcher = createFetcher(dispatch, getState);
         var url = "/api/quizzes/".concat(quizId, "/qti_imports");
         var addImportsToStore = function(importsList) {
             dispatch(handleQtiImportsResponse(importsList));
@@ -24,7 +24,7 @@ export var pollForQtiInfo = function(parentId, parentType, waitForAssignmentSett
     return function(dispatch, getState) {
         return new Promise(function(resolve, reject) {
             setTimeout(function() {
-                var fetcher = new Fetcher();
+                var fetcher = createFetcher(dispatch, getState);
                 var url;
                 if (parentType === PARENT_TYPE_QUIZ) {
                     url = "/api/quizzes/".concat(parentId, "/qti_imports");
@@ -67,9 +67,9 @@ export var pollForQtiInfo = function(parentId, parentType, waitForAssignmentSett
 // This fxn is curried twice to allow for setting the creation url, then for receiving
 // the url from the first response, and finally receives the promise.
 // Exported for testing purposes
-export var postQtiCreate = function(qtiImportUrl, dispatch, onError, waitForAssignmentSettingsImported) {
+export var postQtiCreate = function(qtiImportUrl, dispatch, getState, onError, waitForAssignmentSettingsImported) {
     return function(url) {
-        var qtiCreateFetcher = new Fetcher({
+        var qtiCreateFetcher = createFetcher(dispatch, getState, {
             callType: CREATE_QTI_IMPORT,
             onError: onError
         });
@@ -91,6 +91,7 @@ export var postQtiCreate = function(qtiImportUrl, dispatch, onError, waitForAssi
 export var qtiFileUpload = function(file, parentId, parentType, onError, waitForAssignmentSettingsImported) {
     var withUrlCallback = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : sendFileToS3, qtiCreateFxn = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : postQtiCreate;
     return function(dispatch, getState) {
+        var _state_config_get, _state_config, _state_config_get1, _state_config1;
         var qtiImportUrl;
         if (parentType === PARENT_TYPE_QUIZ) {
             qtiImportUrl = "/api/quizzes/".concat(parentId, "/qti_imports");
@@ -98,7 +99,13 @@ export var qtiFileUpload = function(file, parentId, parentType, onError, waitFor
             qtiImportUrl = "/api/banks/".concat(parentId, "/qti_imports");
         }
         var pathToGetUrl = "".concat(qtiImportUrl, "/upload_url");
-        var onSuccess = qtiCreateFxn(qtiImportUrl, dispatch, onError, waitForAssignmentSettingsImported);
-        return getUploadUrl(pathToGetUrl).then(withUrlCallback(file, onSuccess, onError));
+        var onSuccess = qtiCreateFxn(qtiImportUrl, dispatch, getState, onError, waitForAssignmentSettingsImported);
+        var state = typeof getState === 'function' ? getState() : getState;
+        var fetcherConfig = {
+            getState: typeof getState === 'function' ? getState : undefined,
+            apiEndpoint: (state === null || state === void 0 ? void 0 : (_state_config = state.config) === null || _state_config === void 0 ? void 0 : (_state_config_get = _state_config.get) === null || _state_config_get === void 0 ? void 0 : _state_config_get.call(_state_config, 'apiEndpoint')) || '',
+            userToken: state === null || state === void 0 ? void 0 : (_state_config1 = state.config) === null || _state_config1 === void 0 ? void 0 : (_state_config_get1 = _state_config1.get) === null || _state_config_get1 === void 0 ? void 0 : _state_config_get1.call(_state_config1, 'userToken')
+        };
+        return getUploadUrl(pathToGetUrl, fetcherConfig).then(withUrlCallback(file, onSuccess, onError, undefined, fetcherConfig));
     };
 };

package/es/building/api/quizEntries.js

@@ -208,13 +208,13 @@ import pick from 'lodash/pick';
 import pickBy from 'lodash/pickBy';
 import { decamelize } from 'humps';
 import { fromJS } from 'immutable';
-import Fetcher from '../../common/util/Fetcher';
+import { createFetcher } from '../../common/util/Fetcher';
 import ExhaustivePaginatedFetcher from '../../common/util/ExhaustivePaginatedFetcher';
 import { scrollToItem } from '../../common/actions/scrolling';
 import ThunkQueue from '../../common/util/ThunkQueue';
 import noop from '../../common/util/noop';
 import camelizedVals from '../../common/api/camelizeHelpers';
-import { CLONE_QUIZ_ENTRY_CALL, CREATE_QUIZ_ENTRY_CALL, CREATE_BULK_QUIZ_ENTRIES_CALL, DELETE_QUIZ_ENTRY_CALL, DO_NOTHING, UPDATE_QUIZ_ENTRY_CALL, DELETED_QUIZ_ENTRY, MOVED_QUIZ_ENTRY } from '@instructure/quiz-common';
+import { CLONE_QUIZ_ENTRY_CALL, CREATE_QUIZ_ENTRY_CALL, CREATE_BULK_QUIZ_ENTRIES_CALL, DELETE_QUIZ_ENTRY_CALL, DO_NOTHING, UPDATE_QUIZ_ENTRY_CALL, DELETED_QUIZ_ENTRY, MOVED_QUIZ_ENTRY } from '@instructure/quiz-common/constants';
 import { createItem } from './items';
 import { createStimulus } from './stimuli';
 import { addError } from '../../common/actions/alerts';
@@ -231,10 +231,7 @@ import t from '@instructure/quiz-i18n/format-message';
 // wait for previous requests to finish, without preventing UI updates.
 var queue = new ThunkQueue(function(error, dispatch, getState) {
     // If an action fails, re-fetch all quiz entries from the backend
-    var activeQuizId = getState().getIn([
-        'quizzes',
-        'activeQuizId'
-    ]);
+    var activeQuizId = getState().quizzes.get('activeQuizId');
     dispatch(getQuizEntries(activeQuizId));
     throw error;
 });
@@ -253,7 +250,7 @@ var handleQuizEntriesGet = function(dispatch, quizId, quizEntries) {
 export function getQuizEntry(quizId, quizEntryId) {
     var url = "/api/quizzes/".concat(quizId, "/quiz_entries/").concat(quizEntryId);
     return function(dispatch, getState) {
-        var fetcher = new Fetcher();
+        var fetcher = createFetcher(dispatch, getState);
         return fetcher.get(url).then(function(data) {
             return handleQuizEntriesGet(dispatch, quizId, [
                 data
@@ -265,7 +262,14 @@ export function getQuizEntries(quizId) {
     var cb = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop;
     var url = "/api/quizzes/".concat(quizId, "/quiz_entries");
     return function(dispatch, getState) {
-        var fetcher = new ExhaustivePaginatedFetcher();
+        var _state_config_get, _state_config, _state_config_get1, _state_config1;
+        var state = typeof getState === 'function' ? getState() : getState;
+        var fetcher = ExhaustivePaginatedFetcher({
+            dispatch: dispatch,
+            getState: typeof getState === 'function' ? getState : undefined,
+            apiEndpoint: (state === null || state === void 0 ? void 0 : (_state_config = state.config) === null || _state_config === void 0 ? void 0 : (_state_config_get = _state_config.get) === null || _state_config_get === void 0 ? void 0 : _state_config_get.call(_state_config, 'apiEndpoint')) || '',
+            userToken: state === null || state === void 0 ? void 0 : (_state_config1 = state.config) === null || _state_config1 === void 0 ? void 0 : (_state_config_get1 = _state_config1.get) === null || _state_config_get1 === void 0 ? void 0 : _state_config_get1.call(_state_config1, 'userToken')
+        });
         return fetcher.get(url).then(function(data) {
             return handleQuizEntriesGet(dispatch, quizId, data);
         }).then(cb);
@@ -274,7 +278,14 @@ export function getQuizEntries(quizId) {
 export function getSampleItemsForQuizEntry(quizId, quizEntryId) {
     var url = "/api/quizzes/".concat(quizId, "/quiz_entries/").concat(quizEntryId, "/sample_items");
     return function(dispatch, getState) {
-        var fetcher = new ExhaustivePaginatedFetcher();
+        var _state_config_get, _state_config, _state_config_get1, _state_config1;
+        var state = typeof getState === 'function' ? getState() : getState;
+        var fetcher = ExhaustivePaginatedFetcher({
+            dispatch: dispatch,
+            getState: typeof getState === 'function' ? getState : undefined,
+            apiEndpoint: (state === null || state === void 0 ? void 0 : (_state_config = state.config) === null || _state_config === void 0 ? void 0 : (_state_config_get = _state_config.get) === null || _state_config_get === void 0 ? void 0 : _state_config_get.call(_state_config, 'apiEndpoint')) || '',
+            userToken: state === null || state === void 0 ? void 0 : (_state_config1 = state.config) === null || _state_config1 === void 0 ? void 0 : (_state_config_get1 = _state_config1.get) === null || _state_config_get1 === void 0 ? void 0 : _state_config_get1.call(_state_config1, 'userToken')
+        });
         return fetcher.get(url).then(function(data) {
             var sampleItems = camelizedVals(data);
             dispatch(updateSampleItemsAction(quizEntryId, fromJS(sampleItems)));
@@ -311,7 +322,7 @@ export function createQuizEntry(quizId, entryId, entryType, entryProperties) {
         entryId: entryId
     }, entryProperties));
     return function(dispatch, getState) {
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: CREATE_QUIZ_ENTRY_CALL,
             onError: function() {
                 return addError(t('Failed to create quiz entry.'));
@@ -372,11 +383,11 @@ export function createBulkQuizEntries(items, param) {
             quiz_entries: quizEntries
         })
     };
-    return function(dispatch) {
+    return function(dispatch, getState) {
         return _async_to_generator(function() {
             var fetcher;
             return _ts_generator(this, function(_state) {
-                fetcher = new Fetcher({
+                fetcher = createFetcher(dispatch, getState, {
                     callType: CREATE_BULK_QUIZ_ENTRIES_CALL,
                     onError: function() {
                         return addError(t('Failed to create quiz entries.'));
@@ -439,19 +450,19 @@ function updateBody(updatedProperties) {
 export function updateQuizEntry(quizId, quizEntryId, updatedProperties) {
     var _ref = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {}, _ref_handleResponse = _ref.handleResponse, handleResponse = _ref_handleResponse === void 0 ? true : _ref_handleResponse;
     var url = "/api/quizzes/".concat(quizId, "/quiz_entries/").concat(quizEntryId);
-    var fetcher = new Fetcher({
-        callType: UPDATE_QUIZ_ENTRY_CALL,
-        onError: function() {
-            return addError(t('Failed to update quiz entry.'));
-        }
-    });
     var body = updateBody(updatedProperties);
     return function(dispatch, getState) {
         return _async_to_generator(function() {
-            var response;
+            var fetcher, response;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
+                        fetcher = createFetcher(dispatch, getState, {
+                            callType: UPDATE_QUIZ_ENTRY_CALL,
+                            onError: function() {
+                                return addError(t('Failed to update quiz entry.'));
+                            }
+                        });
                         return [
                             4,
                             fetcher.patch(url, {
@@ -473,14 +484,14 @@ export function updateQuizEntry(quizId, quizEntryId, updatedProperties) {
 }
 export function cloneQuizEntry(quizId, quizEntryId, updatedProperties) {
     var url = "/api/quizzes/".concat(quizId, "/quiz_entries/").concat(quizEntryId, "/clone");
-    var fetcher = new Fetcher({
-        callType: CLONE_QUIZ_ENTRY_CALL,
-        onError: function() {
-            return addError(t('Failed to clone quiz entry.'));
-        }
-    });
     var body = updateBody(updatedProperties);
     return function(dispatch, getState) {
+        var fetcher = createFetcher(dispatch, getState, {
+            callType: CLONE_QUIZ_ENTRY_CALL,
+            onError: function() {
+                return addError(t('Failed to clone quiz entry.'));
+            }
+        });
         return fetcher.post(url, {
             body: body
         }).then(function(qeData) {
@@ -530,10 +541,7 @@ export function moveImmutableQuizEntry(quizId, position, stimulusQuizEntryId, qu
 var createItemAndMoveQuizEntry = queue.wrapActionCreator(function(quizId, position, stimulusQuizEntryId, quizEntryId) {
     var createItemAction = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : createItem, updateAction = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : updateQuizEntry;
     return function(dispatch, getState) {
-        var quizEntry = QuizEntry.create(getState().getIn([
-            'quizEntries',
-            quizEntryId
-        ]));
+        var quizEntry = QuizEntry.create(getState().quizEntries.get(quizEntryId));
         var workingItem = quizEntry.getEntry().getWorkingInstance();
         return dispatch(createItemAction(workingItem, quizId, 'quiz', workingItem.id)).then(function(param) {
             var id = param.id;
@@ -562,7 +570,7 @@ function quizEntryDeleted(dispatch, quizEntry) {
 }
 var deleteQuizEntry = queue.wrapActionCreator(function(url, params) {
     return function(dispatch, getState) {
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: DELETE_QUIZ_ENTRY_CALL,
             onError: function() {
                 return addError(t('Failed to remove quiz entry.'));

package/es/building/api/quizzes.js

@@ -1,7 +1,7 @@
 import { Map } from 'immutable';
 import { noop } from 'lodash';
-import { DO_NOTHING, NEW_QUIZ_ID, QUIZ_SAVE_CALL, PARENT_TYPE_BANK, PARENT_TYPE_QUIZ, PARENT_TYPE_QUIZ_SESSION } from '@instructure/quiz-common';
-import Fetcher from '../../common/util/Fetcher';
+import { DO_NOTHING, NEW_QUIZ_ID, QUIZ_SAVE_CALL, PARENT_TYPE_BANK, PARENT_TYPE_QUIZ, PARENT_TYPE_QUIZ_SESSION } from '@instructure/quiz-common/constants';
+import { createFetcher } from '../../common/util/Fetcher';
 import { getQTIInfo } from './qtiImports';
 import { changeQuizAllowBacktracking, changeQuizAllowClearMCSelection, changeQuizChoiceElimination, changeQuizHasTimeLimit, changeQuizOneAtATimeType, changeQuizDefaultRceSettings, changeQuizShuffleQuestions, changeQuizShuffleAnswers, changeQuizRequireStudentAccessCode, changeQuizStudentAccessCode, changeSessionTimeLimitInSeconds, changeQuizFilterIpAddress, changeQuizIpFilters, changeQuizCalculatorType, changeResultsFeedback, changeResultsFeedbackEnabled, changeQuizDisableDocumentAccess, changeQuizDetectMultipleSessions } from '../../common/actions/modifications';
 import { handleQuizResponse } from '../../common/api/callHandlers';
@@ -34,11 +34,9 @@ export function quizBuildingSession(routerParams) {
             return dispatch(startNewQuiz(contextId));
         }
         // do nothing if already on quiz and questions are loaded
-        var currentQuizId = getState().getIn([
-            'quizzes',
-            'activeQuizId'
-        ]);
-        var quizEntries = getState().get('quizEntries', Map());
+        var currentQuizId = getState().quizzes.get('activeQuizId');
+        var _getState_quizEntries;
+        var quizEntries = (_getState_quizEntries = getState().quizEntries) !== null && _getState_quizEntries !== void 0 ? _getState_quizEntries : Map();
         if (currentQuizId === quizId && quizEntries.size > 0) {
             return {
                 type: DO_NOTHING
@@ -65,7 +63,7 @@ export function saveQuizChange(workingQuiz, quiz) {
         var params = {
             body: quizData
         };
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: QUIZ_SAVE_CALL
         });
         return fetcher.patch(url, params).then(function(quizData) {
@@ -86,7 +84,7 @@ export function startNewQuiz(contextId) {
         var params = {
             body: newQuizData
         };
-        var fetcher = new Fetcher();
+        var fetcher = createFetcher(dispatch, getState);
         return fetcher.post(quizApiEndpoint, params).then(function(quizData) {
             handleQuizFetch(dispatch, quizData);
         }).then(function() {
@@ -100,8 +98,6 @@ export function startNewQuiz(contextId) {
 // ====================================
 export function getExistingQuizAndItemsForBuilding(quizId) {
     var fetchTags = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-    // TODO: handleQuizFetch is not handled in getExistingQuizAndItems,
-    //       so determine impact of getQTIInfo not being dispatched
     return getExistingQuizAndItems(quizId, fetchTags, handleQuizFetch);
 }
 // =========================================
@@ -120,8 +116,15 @@ function getPathToGetUrl(parentType, parentId) {
 export function interactionFileUpload(parentType, parentId, file, onSuccess, onError, uploadPath) {
     var withUrlCallback = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : sendFileToS3;
     return function(dispatch, getState) {
+        var _state_config_get, _state_config, _state_config_get1, _state_config1;
+        var state = typeof getState === 'function' ? getState() : getState;
+        var fetcherConfig = {
+            getState: typeof getState === 'function' ? getState : undefined,
+            apiEndpoint: (state === null || state === void 0 ? void 0 : (_state_config = state.config) === null || _state_config === void 0 ? void 0 : (_state_config_get = _state_config.get) === null || _state_config_get === void 0 ? void 0 : _state_config_get.call(_state_config, 'apiEndpoint')) || '',
+            userToken: state === null || state === void 0 ? void 0 : (_state_config1 = state.config) === null || _state_config1 === void 0 ? void 0 : (_state_config_get1 = _state_config1.get) === null || _state_config_get1 === void 0 ? void 0 : _state_config_get1.call(_state_config1, 'userToken')
+        };
         var pathToGetUrl = uploadPath || getPathToGetUrl(parentType, parentId);
-        return getUploadUrl(pathToGetUrl).then(withUrlCallback(file, onSuccess, onError));
+        return getUploadUrl(pathToGetUrl, fetcherConfig).then(withUrlCallback(file, onSuccess, onError, undefined, fetcherConfig));
     };
 }
 // ====================================
@@ -138,7 +141,7 @@ function setQuizProperty(quizId, properties, action) {
         var params = {
             body: body
         };
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: QUIZ_SAVE_CALL
         });
         if (action !== null) {

package/es/building/api/stimuli.js

@@ -1,7 +1,7 @@
-import { CREATE_STIMULUS_CALL, UPDATE_STIMULUS_CALL } from '@instructure/quiz-common';
+import { CREATE_STIMULUS_CALL, UPDATE_STIMULUS_CALL } from '@instructure/quiz-common/constants';
 import { addError } from '../../common/actions/alerts';
 import { handleStimuliResponse } from '../../common/api/callHandlers';
-import Fetcher from '../../common/util/Fetcher';
+import { createFetcher } from '../../common/util/Fetcher';
 import t from '@instructure/quiz-i18n/format-message';
 // =====================
 // =====================
@@ -26,7 +26,7 @@ export function createStimulus(stimulus, parentId, parentType) {
         stimulus: stimulusParams
     });
     return function(dispatch, getState) {
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: CREATE_STIMULUS_CALL,
             onError: function() {
                 return addError(t('Failed to create stimulus.'));
@@ -67,7 +67,7 @@ export function updateStimulus(stimulus, parentId, parentType) {
         var _$updateStimulusParams = {
             body: reqBody
         };
-        var fetcher = new Fetcher({
+        var fetcher = createFetcher(dispatch, getState, {
             callType: UPDATE_STIMULUS_CALL,
             onError: function() {
                 return addError(t('Failed to update stimulus.'));

package/es/building/components/QTIImportModal/index.js

@@ -2,7 +2,7 @@ import { bindActionCreators } from 'redux';
 import { connect } from '../../../common/react-redux';
 import { clearQtiImports } from '../../../common/actions/qtiImports';
 import { qtiFileUpload } from '../../api/qtiImports';
-import { CREATE_QTI_IMPORT, FILE_UPLOAD_URL_CALL, FILE_UPLOAD_CALL } from '@instructure/quiz-common';
+import { CREATE_QTI_IMPORT, FILE_UPLOAD_URL_CALL, FILE_UPLOAD_CALL } from '@instructure/quiz-common/constants';
 import { ImportModal, progressValue } from '../../../common/components/ImportModal';
 import t from '@instructure/quiz-i18n/format-message';
 var callsToCheck = [
@@ -13,7 +13,7 @@ var callsToCheck = [
 // Consuming Components must pass in qtiImportRecord, parentType, and parentId
 export var mapStateToProps = function(state, props) {
     var qtiImportRecord = props.qtiImport;
-    var pv = progressValue(qtiImportRecord.progressNumber(), state.get('calls'), callsToCheck);
+    var pv = progressValue(qtiImportRecord.progressNumber(), state.calls, callsToCheck);
     return {
         failureMessage: qtiImportRecord.message || '',
         importMessage: t('QTI 1.2 and 2.x (.zip) files only'),

package/es/building/components/layout/Sidebar/SidebarItem/index.js

@@ -1,8 +1,60 @@
-import { DragSource } from 'react-dnd';
-import { bindActionCreators, compose } from 'redux';
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import React, { useRef } from 'react';
+import { bindActionCreators } from 'redux';
 import { connect } from '../../../../../common/react-redux';
-import { SIDEBAR_ITEM_REF } from '@instructure/quiz-common';
-import { ItemTypes, dragSource, collectDrag, DropTargetCreator } from '../../../../../common/components/shared/drag_and_drop/dragAndDropUtils';
+import { SIDEBAR_ITEM_REF } from '@instructure/quiz-common/constants';
+import { useQuizEntryDropTarget, useQuizEntryDragSource } from '../../../../../common/components/shared/drag_and_drop/dragAndDropUtils';
 import { newHoverPosition as newHoverPositionAction } from '../../../../../common/actions/dragAndDrop';
 import { set as setUI } from '../../../../../common/actions/ui';
 import { openMoveImmutableModal } from '../../../../../common/actions/modal';
@@ -13,19 +65,13 @@ import disableDraggingOverride from '../../../../../common/components/shared/fun
 import SidebarItem from './presenter';
 import { getActiveQuiz } from '../../../../../common/selectors/quizzes';
 export var mapStateToProps = function() {
-    var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : Map(), props = arguments.length > 1 ? arguments[1] : void 0;
+    var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, props = arguments.length > 1 ? arguments[1] : void 0;
     var activeQuiz = getActiveQuiz(state);
-    var dndPosition = state.getIn([
-        'dragAndDrop',
-        'position'
-    ]);
-    var draggingAboveHalf = state.getIn([
-        'dragAndDrop',
-        'aboveHalf'
-    ], false);
+    var dndPosition = state.dragAndDrop.get('position');
+    var draggingAboveHalf = state.dragAndDrop.get('aboveHalf', false);
     var draggingOver = dndPosition === props.quizEntry.position;
     return {
-        dndPositionObj: draggingOver ? state.get('dragAndDrop') : null,
+        dndPositionObj: draggingOver ? state.dragAndDrop : null,
         draggingOver: draggingOver && props.draggingInSidebar,
         draggingAboveHalf: draggingOver && draggingAboveHalf,
         quizId: activeQuiz.id
@@ -41,10 +87,18 @@ export var mapDispatchToProps = function(dispatch, props) {
         scrollToItem: props.scrollToItem || bindActionCreators(scrollToItemAction, dispatch)
     };
 };
-export var connectToDragSource = function(Component) {
-    return DragSource(// ItemTypes.QUIZ_ENTRY associates this component drag source with a name
-    // dragSource specifies functions React DnD will call for events with this component
-    // collectDrag injects props into component
-    ItemTypes.QUIZ_ENTRY, dragSource, collectDrag)(Component);
-};
-export default compose(connect(mapStateToProps, mapDispatchToProps), DropTargetCreator(SIDEBAR_ITEM_REF), connectToDragSource, disableDraggingOverride)(SidebarItem);
+function SidebarItemDnd(props) {
+    var instanceRef = useRef(null);
+    var _useQuizEntryDropTarget = useQuizEntryDropTarget(SIDEBAR_ITEM_REF, props, instanceRef), connectDropTarget = _useQuizEntryDropTarget.connectDropTarget, isOver = _useQuizEntryDropTarget.isOver;
+    var _useQuizEntryDragSource = useQuizEntryDragSource(props), connectDragSource = _useQuizEntryDragSource.connectDragSource, connectDragPreview = _useQuizEntryDragSource.connectDragPreview, isDragging = _useQuizEntryDragSource.isDragging;
+    return /*#__PURE__*/ React.createElement(SidebarItem, _object_spread_props(_object_spread({}, props), {
+        ref: instanceRef,
+        connectDropTarget: connectDropTarget,
+        isOver: isOver,
+        connectDragSource: connectDragSource,
+        connectDragPreview: connectDragPreview,
+        isDragging: isDragging
+    }));
+}
+var ConnectedSidebarItem = connect(mapStateToProps, mapDispatchToProps)(SidebarItemDnd);
+export default disableDraggingOverride(ConnectedSidebarItem);

package/es/building/components/layout/Sidebar/SidebarItem/presenter.js

@@ -139,7 +139,7 @@ import DragAndDropZone from '../../../../../common/components/shared/drag_and_dr
 import CommonSidebarItem from '../../../../../common/components/layout/sidebar/SidebarItem';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 export var BuildingSidebarItem = /*#__PURE__*/ function(Component) {
     "use strict";
     _inherits(BuildingSidebarItem, Component);