@instructure/quiz-core 17.63.1-rc.1 → 17.63.1-rc.13

package/es/reporting/components/resources/NewQuizAndItemAnalysis/fetchReports.js

@@ -4,13 +4,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { getFailedToFetchReports, getLastReportGenerationFailed } from "./errorMessages.js";
 export var fetchReports = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
-    var activeQuizId, setFetchInProgress, setQuizAnalysis, setItemAnalyses, setAnalysisError, setGenerationInProgress, addError, fetchQuizAnalysis, fetchItemAnalyses, _yield$Promise$all, _yield$Promise$all2, quizAnalysis, itemAnalyses;
+    var activeQuizId, setFetchInProgress, setQuizAnalysis, setItemAnalyses, setStatusPollingInProgress, setAnalysisError, setGenerationInProgress, addError, fetchQuizAnalysis, fetchItemAnalyses, _yield$Promise$all, _yield$Promise$all2, quizAnalysis, itemAnalyses, areAnalysesInProgress, areAnalysesFailed;
 
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            activeQuizId = _ref.activeQuizId, setFetchInProgress = _ref.setFetchInProgress, setQuizAnalysis = _ref.setQuizAnalysis, setItemAnalyses = _ref.setItemAnalyses, setAnalysisError = _ref.setAnalysisError, setGenerationInProgress = _ref.setGenerationInProgress, addError = _ref.addError, fetchQuizAnalysis = _ref.fetchQuizAnalysis, fetchItemAnalyses = _ref.fetchItemAnalyses;
+            activeQuizId = _ref.activeQuizId, setFetchInProgress = _ref.setFetchInProgress, setQuizAnalysis = _ref.setQuizAnalysis, setItemAnalyses = _ref.setItemAnalyses, setStatusPollingInProgress = _ref.setStatusPollingInProgress, setAnalysisError = _ref.setAnalysisError, setGenerationInProgress = _ref.setGenerationInProgress, addError = _ref.addError, fetchQuizAnalysis = _ref.fetchQuizAnalysis, fetchItemAnalyses = _ref.fetchItemAnalyses;
             _context.prev = 1;
             setFetchInProgress(true);
             _context.next = 5;
@@ -21,33 +21,36 @@ export var fetchReports = /*#__PURE__*/function () {
             _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
             quizAnalysis = _yield$Promise$all2[0];
             itemAnalyses = _yield$Promise$all2[1];
+            areAnalysesInProgress = quizAnalysis.new_analysis_in_progress || itemAnalyses.new_analysis_in_progress;
+            areAnalysesFailed = quizAnalysis.last_analysis_failed || itemAnalyses.last_analysis_failed;
+            setGenerationInProgress(areAnalysesInProgress);
+            setStatusPollingInProgress(areAnalysesInProgress);
             setQuizAnalysis(quizAnalysis.last_successful_analysis);
             setItemAnalyses(itemAnalyses.last_successful_analysis);
-            setGenerationInProgress(quizAnalysis.new_analysis_in_progress || itemAnalyses.new_analysis_in_progress);
 
-            if (quizAnalysis.last_analysis_failed || itemAnalyses.last_analysis_failed) {
+            if (areAnalysesFailed) {
               setAnalysisError(getLastReportGenerationFailed());
             }
 
-            _context.next = 18;
+            _context.next = 21;
             break;
 
-          case 15:
-            _context.prev = 15;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](1);
             addError(getFailedToFetchReports());
 
-          case 18:
-            _context.prev = 18;
+          case 21:
+            _context.prev = 21;
             setFetchInProgress(false);
-            return _context.finish(18);
+            return _context.finish(21);
 
-          case 21:
+          case 24:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 15, 18, 21]]);
+    }, _callee, null, [[1, 18, 21, 24]]);
   }));
 
   return function fetchReports(_x) {

package/es/reporting/components/resources/NewQuizAndItemAnalysis/fetchReportsStatus.js

@@ -0,0 +1,45 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { getFailedToFetchReports } from "./errorMessages.js";
+export var fetchReportsStatus = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+    var activeQuizId, addError, fetchAnalysesStatus, instrumentedFetchReports, setStatusPollingInProgress, setGenerationInProgress, status, isReportGenerationReady;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            activeQuizId = _ref.activeQuizId, addError = _ref.addError, fetchAnalysesStatus = _ref.fetchAnalysesStatus, instrumentedFetchReports = _ref.instrumentedFetchReports, setStatusPollingInProgress = _ref.setStatusPollingInProgress, setGenerationInProgress = _ref.setGenerationInProgress;
+            _context.prev = 1;
+            _context.next = 4;
+            return fetchAnalysesStatus(activeQuizId);
+
+          case 4:
+            status = _context.sent;
+            isReportGenerationReady = !status.quiz_analysis_in_progress && !status.item_analyses_in_progress;
+
+            if (isReportGenerationReady) {
+              instrumentedFetchReports();
+            }
+
+            _context.next = 14;
+            break;
+
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](1);
+            addError(getFailedToFetchReports());
+            setStatusPollingInProgress(false);
+            setGenerationInProgress(false);
+
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[1, 9]]);
+  }));
+
+  return function fetchReportsStatus(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/es/reporting/components/resources/NewQuizAndItemAnalysis/generateReports.js

@@ -0,0 +1,52 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { getReportGenerationFailure } from "./errorMessages.js";
+export var generateReports = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+    var setGenerationInProgress, setStatusPollingInProgress, generateAnalysis, filter, addError, response;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            setGenerationInProgress = _ref.setGenerationInProgress, setStatusPollingInProgress = _ref.setStatusPollingInProgress, generateAnalysis = _ref.generateAnalysis, filter = _ref.filter, addError = _ref.addError;
+            _context.prev = 1;
+            setGenerationInProgress(true);
+            _context.next = 5;
+            return generateAnalysis(filter);
+
+          case 5:
+            response = _context.sent;
+
+            if (response) {
+              _context.next = 10;
+              break;
+            }
+
+            addError(getReportGenerationFailure());
+            setGenerationInProgress(false);
+            return _context.abrupt("return");
+
+          case 10:
+            setStatusPollingInProgress(true);
+            _context.next = 17;
+            break;
+
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](1);
+            addError(getReportGenerationFailure());
+            setGenerationInProgress(false);
+
+          case 17:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[1, 13]]);
+  }));
+
+  return function generateReports(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+export default generateReports;

package/es/reporting/components/resources/NewQuizAndItemAnalysis/withAnalysisState.js

@@ -1,22 +1,27 @@
 import { withAnalysisStatePresenter } from "./withAnalysisStatePresenter.js";
-import { getQuizAnalysis, getItemAnalyses, getFetchInProgress, getGenerationInProgress, getAnalysisError } from "../../../../common/selectors/analyses.js";
-import { setQuizAnalysis, setItemAnalyses, setFetchInProgress, setGenerationInProgress, setAnalysisError } from "../../../../common/actions/analyses.js";
+import { getQuizAnalysis, getItemAnalyses, getFetchInProgress, getGenerationInProgress, getAnalysisError, getStatusPollingInProgress } from "../../../../common/selectors/analyses.js";
+import { setQuizAnalysis, setItemAnalyses, setFetchInProgress, setGenerationInProgress, setAnalysisError, setStatusPollingInProgress } from "../../../../common/actions/analyses.js";
 import { getQuizAnalysis as fetchQuizAnalysis } from "../../../api/getQuizAnalysis.js";
 import { getItemAnalyses as fetchItemAnalyses } from "../../../api/getItemAnalyses.js";
+import { getAnalysesStatus as fetchAnalysesStatus } from "../../../api/getAnalysesStatus.js";
 import { connect } from "../../../../common/react-redux.js";
 import { compose } from 'redux';
 import { getActiveQuizId } from "../../../../common/selectors/quizzes.js";
 import { addError } from "../../../../common/actions/alerts.js";
+var DEFAULT_POLLING_INTERVAL = 3000;
 export function mapStateToProps(state, ownProps) {
   return {
     quizAnalysis: getQuizAnalysis(state),
     itemAnalyses: getItemAnalyses(state),
     fetchInProgress: getFetchInProgress(state),
     generationInProgress: getGenerationInProgress(state),
+    statusPollingInProgress: getStatusPollingInProgress(state),
     analysisError: getAnalysisError(state),
     activeQuizId: ownProps.activeQuizId || getActiveQuizId(state),
     fetchQuizAnalysis: fetchQuizAnalysis,
-    fetchItemAnalyses: fetchItemAnalyses
+    fetchItemAnalyses: fetchItemAnalyses,
+    fetchAnalysesStatus: fetchAnalysesStatus,
+    pollingInterval: ownProps.pollingInterval || DEFAULT_POLLING_INTERVAL
   };
 }
 var mapDispatchToProps = {
@@ -25,7 +30,8 @@ var mapDispatchToProps = {
   setFetchInProgress: setFetchInProgress,
   setGenerationInProgress: setGenerationInProgress,
   setAnalysisError: setAnalysisError,
-  addError: addError
+  addError: addError,
+  setStatusPollingInProgress: setStatusPollingInProgress
 };
 export var withAnalysisState = compose(connect(mapStateToProps, mapDispatchToProps), withAnalysisStatePresenter);
 export default withAnalysisState;

package/es/reporting/components/resources/NewQuizAndItemAnalysis/withAnalysisStatePresenter.js

@@ -1,10 +1,12 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { itemAnalysisPropType, quizAnalysisPropType } from "./propTypes.js";
 import { fetchReports } from "./fetchReports.js";
+import { fetchReportsStatus } from "./fetchReportsStatus.js";
+import { generateReports as triggerReportGeneration } from "./generateReports.js";
 export var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalComponent) {
   var WithAnalysisStatePresenter = function WithAnalysisStatePresenter(_ref) {
     var quizAnalysis = _ref.quizAnalysis,
@@ -19,22 +21,42 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
         setGenerationInProgress = _ref.setGenerationInProgress,
         setAnalysisError = _ref.setAnalysisError,
         activeQuizId = _ref.activeQuizId,
-        generateReport = _ref.generateReport,
+        generateAnalysis = _ref.generateAnalysis,
         fetchQuizAnalysis = _ref.fetchQuizAnalysis,
         fetchItemAnalyses = _ref.fetchItemAnalyses,
-        passThroughProps = _objectWithoutProperties(_ref, ["quizAnalysis", "itemAnalyses", "fetchInProgress", "generationInProgress", "analysisError", "setQuizAnalysis", "addError", "setItemAnalyses", "setFetchInProgress", "setGenerationInProgress", "setAnalysisError", "activeQuizId", "generateReport", "fetchQuizAnalysis", "fetchItemAnalyses"]);
+        fetchAnalysesStatus = _ref.fetchAnalysesStatus,
+        statusPollingInProgress = _ref.statusPollingInProgress,
+        setStatusPollingInProgress = _ref.setStatusPollingInProgress,
+        pollingInterval = _ref.pollingInterval,
+        passThroughProps = _objectWithoutProperties(_ref, ["quizAnalysis", "itemAnalyses", "fetchInProgress", "generationInProgress", "analysisError", "setQuizAnalysis", "addError", "setItemAnalyses", "setFetchInProgress", "setGenerationInProgress", "setAnalysisError", "activeQuizId", "generateAnalysis", "fetchQuizAnalysis", "fetchItemAnalyses", "fetchAnalysesStatus", "statusPollingInProgress", "setStatusPollingInProgress", "pollingInterval"]);
 
     WithAnalysisStatePresenter.displayName = "WithAnalysisStatePresenter(".concat(OriginalComponent.displayName || OriginalComponent.name, ")");
-    var reportFetchingConfig = {
-      activeQuizId: activeQuizId,
-      addError: addError,
-      fetchQuizAnalysis: fetchQuizAnalysis,
-      fetchItemAnalyses: fetchItemAnalyses,
-      setAnalysisError: setAnalysisError,
-      setItemAnalyses: setItemAnalyses,
-      setGenerationInProgress: setGenerationInProgress,
-      setFetchInProgress: setFetchInProgress,
-      setQuizAnalysis: setQuizAnalysis
+    var runningInterval = useRef(null);
+
+    var instrumentedFetchReports = function instrumentedFetchReports() {
+      return fetchReports({
+        activeQuizId: activeQuizId,
+        addError: addError,
+        fetchQuizAnalysis: fetchQuizAnalysis,
+        fetchItemAnalyses: fetchItemAnalyses,
+        setAnalysisError: setAnalysisError,
+        setStatusPollingInProgress: setStatusPollingInProgress,
+        setItemAnalyses: setItemAnalyses,
+        setGenerationInProgress: setGenerationInProgress,
+        setFetchInProgress: setFetchInProgress,
+        setQuizAnalysis: setQuizAnalysis
+      });
+    };
+
+    var instrumentedStatusFetching = function instrumentedStatusFetching() {
+      return fetchReportsStatus({
+        activeQuizId: activeQuizId,
+        addError: addError,
+        setGenerationInProgress: setGenerationInProgress,
+        setStatusPollingInProgress: setStatusPollingInProgress,
+        fetchAnalysesStatus: fetchAnalysesStatus,
+        instrumentedFetchReports: instrumentedFetchReports
+      });
     };
 
     function generateReports() {
@@ -43,10 +65,25 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
 
     function _generateReports() {
       _generateReports = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var filter,
+            generationConfig,
+            _args2 = arguments;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
+                filter = _args2.length > 0 && _args2[0] !== void 0 ? _args2[0] : 'last_attempt';
+                generationConfig = {
+                  filter: filter,
+                  generateAnalysis: generateAnalysis,
+                  setGenerationInProgress: setGenerationInProgress,
+                  setStatusPollingInProgress: setStatusPollingInProgress,
+                  addError: addError
+                };
+                _context2.next = 4;
+                return triggerReportGeneration(generationConfig);
+
+              case 4:
               case "end":
                 return _context2.stop();
             }
@@ -72,7 +109,7 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
                   }
 
                   _context.next = 4;
-                  return fetchReports(reportFetchingConfig);
+                  return instrumentedFetchReports();
 
                 case 4:
                 case "end":
@@ -89,6 +126,21 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
 
       fetchIfNeeded();
     }, []);
+    useEffect(function () {
+      if (statusPollingInProgress && !runningInterval.current) {
+        runningInterval.current = setInterval(instrumentedStatusFetching, pollingInterval);
+      }
+
+      if (!statusPollingInProgress && runningInterval.current) {
+        clearInterval(runningInterval.current);
+        runningInterval.current = null;
+      } // unmount cleanup
+
+
+      return function () {
+        return clearInterval(runningInterval.current);
+      };
+    }, [statusPollingInProgress]);
     return /*#__PURE__*/React.createElement(OriginalComponent, Object.assign({
       quizAnalysis: quizAnalysis,
       itemAnalyses: itemAnalyses,
@@ -104,24 +156,27 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
     itemAnalyses: PropTypes.arrayOf(itemAnalysisPropType),
     fetchInProgress: PropTypes.bool.isRequired,
     generationInProgress: PropTypes.bool.isRequired,
+    statusPollingInProgress: PropTypes.bool.isRequired,
     analysisError: PropTypes.string,
     setQuizAnalysis: PropTypes.func.isRequired,
     setItemAnalyses: PropTypes.func.isRequired,
     setFetchInProgress: PropTypes.func.isRequired,
     setGenerationInProgress: PropTypes.func.isRequired,
     setAnalysisError: PropTypes.func.isRequired,
+    setStatusPollingInProgress: PropTypes.func.isRequired,
     activeQuizId: PropTypes.string.isRequired,
     fetchQuizAnalysis: PropTypes.func.isRequired,
     fetchItemAnalyses: PropTypes.func.isRequired,
+    fetchAnalysesStatus: PropTypes.func.isRequired,
     addError: PropTypes.func.isRequired,
-    // can be required after passed from LTI
-    generateReport: PropTypes.func
+    pollingInterval: PropTypes.number.isRequired,
+    generateAnalysis: PropTypes.func.isRequired // from LTI, f(filter: string)
+
   };
   WithAnalysisStatePresenter.defaultProps = {
     quizAnalysis: void 0,
     itemAnalyses: void 0,
-    analysisError: '',
-    generateReport: Function.prototype
+    analysisError: ''
   };
   return WithAnalysisStatePresenter;
 };

package/lib/building/api/qtiImports.js

@@ -36,8 +36,8 @@ var getQTIInfo = function getQTIInfo(quizId) {
 
 exports.getQTIInfo = getQTIInfo;
 
-var pollForQtiInfo = function pollForQtiInfo(parentId, parentType) {
-  var opts = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
+var pollForQtiInfo = function pollForQtiInfo(parentId, parentType, waitForAssignmentSettingsImported) {
+  var opts = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {
     getExistingBankAndEntries: _banks.getExistingBankAndEntries,
     getExistingQuizAndItems: _quizzes.getExistingQuizAndItems,
     pollForQtiInfo: pollForQtiInfo
@@ -66,11 +66,17 @@ var pollForQtiInfo = function pollForQtiInfo(parentId, parentType) {
               dispatch(opts.getExistingBankAndEntries(parentId));
             }
 
-            dispatch((0, _upload.uploadStatus)(_quizCommon.FILE_UPLOAD_SUCCESS));
+            if (waitForAssignmentSettingsImported) {
+              waitForAssignmentSettingsImported().then(function () {
+                dispatch((0, _upload.uploadStatus)(_quizCommon.FILE_UPLOAD_SUCCESS));
+              });
+            } else {
+              dispatch((0, _upload.uploadStatus)(_quizCommon.FILE_UPLOAD_SUCCESS));
+            }
           } else if (importsList.find(function (qtiImport) {
             return qtiImport.status !== 'failed';
           })) {
-            dispatch(opts.pollForQtiInfo(parentId, parentType, opts));
+            dispatch(opts.pollForQtiInfo(parentId, parentType, waitForAssignmentSettingsImported, opts));
           } else {
             dispatch((0, _upload.uploadStatus)(_quizCommon.FILE_UPLOAD_FAILURE));
           }
@@ -90,7 +96,7 @@ var pollForQtiInfo = function pollForQtiInfo(parentId, parentType) {
 
 exports.pollForQtiInfo = pollForQtiInfo;
 
-var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onError) {
+var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onError, waitForAssignmentSettingsImported) {
   return function (url) {
     var qtiCreateFetcher = new _Fetcher.default({
       callType: _quizCommon.CREATE_QTI_IMPORT,
@@ -103,7 +109,7 @@ var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onError) {
     var addImportToStore = function addImportToStore(importData) {
       dispatch((0, _callHandlers.handleQtiImportsResponse)([importData]));
       var parentType = importData.parent_type === 'Quiz' ? _quizCommon.PARENT_TYPE_QUIZ : _quizCommon.PARENT_TYPE_BANK;
-      dispatch(pollForQtiInfo(importData.parent_id, parentType));
+      dispatch(pollForQtiInfo(importData.parent_id, parentType, waitForAssignmentSettingsImported));
     };
 
     return qtiCreateFetcher.post(qtiImportUrl, {
@@ -114,9 +120,9 @@ var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onError) {
 
 exports.postQtiCreate = postQtiCreate;
 
-var qtiFileUpload = function qtiFileUpload(file, parentId, parentType, onError) {
-  var withUrlCallback = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : _fileUpload.sendFileToS3;
-  var qtiCreateFxn = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : postQtiCreate;
+var qtiFileUpload = function qtiFileUpload(file, parentId, parentType, onError, waitForAssignmentSettingsImported) {
+  var withUrlCallback = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : _fileUpload.sendFileToS3;
+  var qtiCreateFxn = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : postQtiCreate;
   return function (dispatch, getState) {
     var qtiImportUrl;
 
@@ -127,7 +133,7 @@ var qtiFileUpload = function qtiFileUpload(file, parentId, parentType, onError)
     }
 
     var pathToGetUrl = "".concat(qtiImportUrl, "/upload_url");
-    var onSuccess = qtiCreateFxn(qtiImportUrl, dispatch, onError);
+    var onSuccess = qtiCreateFxn(qtiImportUrl, dispatch, onError, waitForAssignmentSettingsImported);
     return (0, _fileUpload.getUploadUrl)(pathToGetUrl).then(withUrlCallback(file, onSuccess, onError));
   };
 };

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

@@ -42,7 +42,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, props) {
   return {
     onContinue: (0, _redux.bindActionCreators)(_qtiImports.clearQtiImports, dispatch),
     fileUpload: function fileUpload(file, cancelAction) {
-      boundQtiFileUpload(file, props.parentId, props.parentType, cancelAction);
+      boundQtiFileUpload(file, props.parentId, props.parentType, cancelAction, props.waitForAssignmentSettingsImported);
     }
   };
 };

package/lib/common/actions/analyses.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.setQuizAnalysis = setQuizAnalysis;
 exports.setItemAnalyses = setItemAnalyses;
 exports.setFetchInProgress = setFetchInProgress;
+exports.setStatusPollingInProgress = setStatusPollingInProgress;
 exports.setGenerationInProgress = setGenerationInProgress;
 exports.setAnalysisError = setAnalysisError;
 
@@ -32,6 +33,13 @@ function setFetchInProgress(inProgress) {
   };
 }
 
+function setStatusPollingInProgress(inProgress) {
+  return {
+    type: _quizCommon.SET_STATUS_POLLING_IN_PROGRESS,
+    payload: inProgress
+  };
+}
+
 function setGenerationInProgress(inProgress) {
   return {
     type: _quizCommon.SET_ANALYSIS_GENERATION_IN_PROGRESS,

package/lib/common/components/shared/spinner/Spinner.js

@@ -21,9 +21,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _uiSpinner = require("@instructure/ui-spinner");
+var _uiText = require("@instructure/ui-text");
 
-var _uiHeading = require("@instructure/ui-heading");
+var _uiSpinner = require("@instructure/ui-spinner");
 
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 
@@ -36,14 +36,13 @@ var _theme = _interopRequireDefault(require("./theme.js"));
 var _dec, _class, _class2, _temp;
 
 var styles = {
-  componentId: 'ebGcj',
+  componentId: 'cJgyM',
   template: function template(theme) {
-    return "\n\n.ebGcj_gasz{align-items:center;display:inline-flex;flex:1 1 auto;height:100%;justify-content:center;min-height:500px;width:100%}\n\n:root .ebGcj_gasz,_:-ms-fullscreen{height:10rem}\n\n.ebGcj_bZBM .ebGcj_qrQc{flex:1 1 auto}\n\n.ebGcj_fBqo{font-size:".concat(theme.mainTextFontSize || 'inherit', "}");
+    return "\n\n.cJgyM_gasz{align-items:center;column-gap:10px;display:inline-flex;flex:1 1 auto;height:100%;justify-content:center;width:100%}\n\n:root .cJgyM_gasz,_:-ms-fullscreen{height:10rem}\n\n.cJgyM_bZBM .cJgyM_qrQc{flex:1 1 auto}";
   },
-  'wrapper': 'ebGcj_gasz',
-  'left': 'ebGcj_bZBM',
-  'right': 'ebGcj_qrQc',
-  'mainText': 'ebGcj_fBqo'
+  'wrapper': 'cJgyM_gasz',
+  'left': 'cJgyM_bZBM',
+  'right': 'cJgyM_qrQc'
 };
 var QuizzesSpinner = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(QuizzesSpinner, _Component);
@@ -58,34 +57,50 @@ var QuizzesSpinner = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles)
   (0, _createClass2.default)(QuizzesSpinner, [{
     key: "mainText",
     value: function mainText() {
-      return this.props.mainText || (0, _formatMessage.default)('Loading...');
+      var _this$props = this.props,
+          color = _this$props.color,
+          mainText = _this$props.mainText,
+          fontSize = _this$props.fontSize;
+      return /*#__PURE__*/_react.default.createElement(_uiText.Text, {
+        size: fontSize,
+        color: color
+      }, mainText || (0, _formatMessage.default)('Loading...'));
     }
   }, {
     key: "render",
     value: function render() {
+      var _this$props2 = this.props,
+          size = _this$props2.size,
+          minHeight = _this$props2.minHeight;
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: styles.wrapper
+        className: styles.wrapper,
+        style: {
+          minHeight: minHeight
+        }
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.left
       }, /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
         renderTitle: this.mainText(),
-        size: "large"
+        size: size
       })), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.right
-      }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
-        level: "h2",
-        as: "h1"
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: styles.mainText
-      }, this.mainText())))));
+      }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.PresentationContent, null, this.mainText())));
     }
   }]);
   QuizzesSpinner.displayName = "QuizzesSpinner";
   return QuizzesSpinner;
 }(_react.Component), _class2.propTypes = {
-  mainText: _propTypes.default.string
+  mainText: _propTypes.default.string,
+  fontSize: _propTypes.default.oneOf(['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']),
+  size: _propTypes.default.oneOf(['x-small', 'small', 'medium', 'large']),
+  color: _propTypes.default.string,
+  minHeight: _propTypes.default.string
 }, _class2.defaultProps = {
-  mainText: null
+  mainText: null,
+  size: 'large',
+  fontSize: 'xx-large',
+  minHeight: '500px',
+  color: 'primary'
 }, _temp)) || _class);
 exports.QuizzesSpinner = QuizzesSpinner;
 var _default = QuizzesSpinner;

package/lib/common/components/shared/spinner/theme.js

@@ -5,9 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = generator;
 
-function generator(_ref) {
-  var typography = _ref.typography;
-  return {
-    mainTextFontSize: typography.fontSizeXXLarge
-  };
+function generator() {
+  return {};
 }

package/lib/common/reducers/analyses.js

@@ -1,14 +1,20 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.defaultState = exports.errorKey = exports.generationInProgressKey = exports.fetchInProgressKey = exports.itemAnalysesKey = exports.quizAnalysisKey = void 0;
+exports.default = exports.defaultState = exports.errorKey = exports.statusPollingInProgressKey = exports.generationInProgressKey = exports.fetchInProgressKey = exports.itemAnalysesKey = exports.quizAnalysisKey = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _immutable = require("immutable");
 
 var _quizCommon = require("@instructure/quiz-common");
 
+var _fromJS;
+
 var quizAnalysisKey = 'quizAnalysis';
 exports.quizAnalysisKey = quizAnalysisKey;
 var itemAnalysesKey = 'itemAnalyses';
@@ -17,15 +23,11 @@ var fetchInProgressKey = 'fetchInProgress';
 exports.fetchInProgressKey = fetchInProgressKey;
 var generationInProgressKey = 'generationInProgress';
 exports.generationInProgressKey = generationInProgressKey;
+var statusPollingInProgressKey = 'statusPollingInProgress';
+exports.statusPollingInProgressKey = statusPollingInProgressKey;
 var errorKey = 'analysisError';
 exports.errorKey = errorKey;
-var defaultState = (0, _immutable.fromJS)({
-  quizAnalysisKey: void 0,
-  itemAnalysesKey: void 0,
-  fetchStateKey: false,
-  generationStateKey: false,
-  errorKey: void 0
-});
+var defaultState = (0, _immutable.fromJS)((_fromJS = {}, (0, _defineProperty2.default)(_fromJS, quizAnalysisKey, void 0), (0, _defineProperty2.default)(_fromJS, itemAnalysesKey, void 0), (0, _defineProperty2.default)(_fromJS, fetchInProgressKey, false), (0, _defineProperty2.default)(_fromJS, generationInProgressKey, false), (0, _defineProperty2.default)(_fromJS, statusPollingInProgressKey, false), (0, _defineProperty2.default)(_fromJS, errorKey, void 0), _fromJS));
 exports.defaultState = defaultState;
 
 var _default = function _default() {
@@ -45,6 +47,9 @@ var _default = function _default() {
     case _quizCommon.SET_ANALYSIS_GENERATION_IN_PROGRESS:
       return state.set(generationInProgressKey, action.payload);
 
+    case _quizCommon.SET_STATUS_POLLING_IN_PROGRESS:
+      return state.set(statusPollingInProgressKey, action.payload);
+
     case _quizCommon.SET_ANALYSIS_ERROR:
       return state.set(errorKey, action.payload);
 

package/lib/common/selectors/analyses.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAnalysisError = exports.getGenerationInProgress = exports.getFetchInProgress = exports.getItemAnalyses = exports.getQuizAnalysis = void 0;
+exports.getAnalysisError = exports.getGenerationInProgress = exports.getStatusPollingInProgress = exports.getFetchInProgress = exports.getItemAnalyses = exports.getQuizAnalysis = void 0;
 var path = 'analyses';
 
 var getQuizAnalysis = function getQuizAnalysis(state) {
@@ -28,6 +28,12 @@ var getFetchInProgress = function getFetchInProgress(state) {
 
 exports.getFetchInProgress = getFetchInProgress;
 
+var getStatusPollingInProgress = function getStatusPollingInProgress(state) {
+  return state.getIn([path, 'statusPollingInProgress'], false);
+};
+
+exports.getStatusPollingInProgress = getStatusPollingInProgress;
+
 var getGenerationInProgress = function getGenerationInProgress(state) {
   return state.getIn([path, 'generationInProgress'], false);
 };