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

package/es/common/actions/analyses.js

@@ -1,4 +1,4 @@
-import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_ANALYSIS_ERROR } from '@instructure/quiz-common';
+import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_ANALYSIS_ERROR, SET_STATUS_POLLING_IN_PROGRESS } from '@instructure/quiz-common';
 export function setQuizAnalysis(quizAnalysis) {
   return {
     type: SET_QUIZ_ANALYSIS,
@@ -17,6 +17,12 @@ export function setFetchInProgress(inProgress) {
     payload: inProgress
   };
 }
+export function setStatusPollingInProgress(inProgress) {
+  return {
+    type: SET_STATUS_POLLING_IN_PROGRESS,
+    payload: inProgress
+  };
+}
 export function setGenerationInProgress(inProgress) {
   return {
     type: SET_ANALYSIS_GENERATION_IN_PROGRESS,

package/es/common/reducers/analyses.js

@@ -1,17 +1,16 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+var _fromJS;
+
 import { fromJS } from 'immutable';
-import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_ANALYSIS_ERROR } from '@instructure/quiz-common';
+import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_STATUS_POLLING_IN_PROGRESS, SET_ANALYSIS_ERROR } from '@instructure/quiz-common';
 export var quizAnalysisKey = 'quizAnalysis';
 export var itemAnalysesKey = 'itemAnalyses';
 export var fetchInProgressKey = 'fetchInProgress';
 export var generationInProgressKey = 'generationInProgress';
+export var statusPollingInProgressKey = 'statusPollingInProgress';
 export var errorKey = 'analysisError';
-export var defaultState = fromJS({
-  quizAnalysisKey: void 0,
-  itemAnalysesKey: void 0,
-  fetchStateKey: false,
-  generationStateKey: false,
-  errorKey: void 0
-});
+export var defaultState = fromJS((_fromJS = {}, _defineProperty(_fromJS, quizAnalysisKey, void 0), _defineProperty(_fromJS, itemAnalysesKey, void 0), _defineProperty(_fromJS, fetchInProgressKey, false), _defineProperty(_fromJS, generationInProgressKey, false), _defineProperty(_fromJS, statusPollingInProgressKey, false), _defineProperty(_fromJS, errorKey, void 0), _fromJS));
 export default (function () {
   var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : defaultState;
   var action = arguments.length > 1 ? arguments[1] : void 0;
@@ -29,6 +28,9 @@ export default (function () {
     case SET_ANALYSIS_GENERATION_IN_PROGRESS:
       return state.set(generationInProgressKey, action.payload);
 
+    case SET_STATUS_POLLING_IN_PROGRESS:
+      return state.set(statusPollingInProgressKey, action.payload);
+
     case SET_ANALYSIS_ERROR:
       return state.set(errorKey, action.payload);
 

package/es/common/selectors/analyses.js

@@ -12,6 +12,9 @@ export var getItemAnalyses = function getItemAnalyses(state) {
 export var getFetchInProgress = function getFetchInProgress(state) {
   return state.getIn([path, 'fetchInProgress'], false);
 };
+export var getStatusPollingInProgress = function getStatusPollingInProgress(state) {
+  return state.getIn([path, 'statusPollingInProgress'], false);
+};
 export var getGenerationInProgress = function getGenerationInProgress(state) {
   return state.getIn([path, 'generationInProgress'], false);
 };

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/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,11 @@
 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";
 export var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalComponent) {
   var WithAnalysisStatePresenter = function WithAnalysisStatePresenter(_ref) {
     var quizAnalysis = _ref.quizAnalysis,
@@ -22,19 +23,39 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
         generateReport = _ref.generateReport,
         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", "generateReport", "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() {
@@ -72,7 +93,7 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
                   }
 
                   _context.next = 4;
-                  return fetchReports(reportFetchingConfig);
+                  return instrumentedFetchReports();
 
                 case 4:
                 case "end":
@@ -89,6 +110,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,16 +140,20 @@ 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,
+    pollingInterval: PropTypes.number.isRequired,
     // can be required after passed from LTI
     generateReport: PropTypes.func
   };

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/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);
 };

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

@@ -17,13 +17,13 @@ var _errorMessages = require("./errorMessages.js");
 
 var fetchReports = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.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 _regenerator.default.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;
@@ -34,33 +34,36 @@ var fetchReports = /*#__PURE__*/function () {
             _yield$Promise$all2 = (0, _slicedToArray2.default)(_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((0, _errorMessages.getLastReportGenerationFailed)());
             }
 
-            _context.next = 18;
+            _context.next = 21;
             break;
 
-          case 15:
-            _context.prev = 15;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](1);
             addError((0, _errorMessages.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/lib/reporting/components/resources/NewQuizAndItemAnalysis/fetchReportsStatus.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchReportsStatus = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _errorMessages = require("./errorMessages.js");
+
+var fetchReportsStatus = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
+    var activeQuizId, addError, fetchAnalysesStatus, instrumentedFetchReports, setStatusPollingInProgress, setGenerationInProgress, status, isReportGenerationReady;
+    return _regenerator.default.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((0, _errorMessages.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);
+  };
+}();
+
+exports.fetchReportsStatus = fetchReportsStatus;

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

@@ -16,6 +16,8 @@ var _getQuizAnalysis = require("../../../api/getQuizAnalysis.js");
 
 var _getItemAnalyses = require("../../../api/getItemAnalyses.js");
 
+var _getAnalysesStatus = require("../../../api/getAnalysesStatus.js");
+
 var _reactRedux = require("../../../../common/react-redux.js");
 
 var _redux = require("redux");
@@ -24,16 +26,21 @@ var _quizzes = require("../../../../common/selectors/quizzes.js");
 
 var _alerts = require("../../../../common/actions/alerts.js");
 
+var DEFAULT_POLLING_INTERVAL = 3000;
+
 function mapStateToProps(state, ownProps) {
   return {
     quizAnalysis: (0, _analyses.getQuizAnalysis)(state),
     itemAnalyses: (0, _analyses.getItemAnalyses)(state),
     fetchInProgress: (0, _analyses.getFetchInProgress)(state),
     generationInProgress: (0, _analyses.getGenerationInProgress)(state),
+    statusPollingInProgress: (0, _analyses.getStatusPollingInProgress)(state),
     analysisError: (0, _analyses.getAnalysisError)(state),
     activeQuizId: ownProps.activeQuizId || (0, _quizzes.getActiveQuizId)(state),
     fetchQuizAnalysis: _getQuizAnalysis.getQuizAnalysis,
-    fetchItemAnalyses: _getItemAnalyses.getItemAnalyses
+    fetchItemAnalyses: _getItemAnalyses.getItemAnalyses,
+    fetchAnalysesStatus: _getAnalysesStatus.getAnalysesStatus,
+    pollingInterval: ownProps.pollingInterval || DEFAULT_POLLING_INTERVAL
   };
 }
 
@@ -43,7 +50,8 @@ var mapDispatchToProps = {
   setFetchInProgress: _analyses2.setFetchInProgress,
   setGenerationInProgress: _analyses2.setGenerationInProgress,
   setAnalysisError: _analyses2.setAnalysisError,
-  addError: _alerts.addError
+  addError: _alerts.addError,
+  setStatusPollingInProgress: _analyses2.setStatusPollingInProgress
 };
 var withAnalysisState = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), _withAnalysisStatePresenter.withAnalysisStatePresenter);
 exports.withAnalysisState = withAnalysisState;

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

@@ -23,6 +23,8 @@ var _propTypes2 = require("./propTypes.js");
 
 var _fetchReports = require("./fetchReports.js");
 
+var _fetchReportsStatus = require("./fetchReportsStatus.js");
+
 var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalComponent) {
   var WithAnalysisStatePresenter = function WithAnalysisStatePresenter(_ref) {
     var quizAnalysis = _ref.quizAnalysis,
@@ -40,18 +42,38 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
         generateReport = _ref.generateReport,
         fetchQuizAnalysis = _ref.fetchQuizAnalysis,
         fetchItemAnalyses = _ref.fetchItemAnalyses,
-        passThroughProps = (0, _objectWithoutProperties2.default)(_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 = (0, _objectWithoutProperties2.default)(_ref, ["quizAnalysis", "itemAnalyses", "fetchInProgress", "generationInProgress", "analysisError", "setQuizAnalysis", "addError", "setItemAnalyses", "setFetchInProgress", "setGenerationInProgress", "setAnalysisError", "activeQuizId", "generateReport", "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 = (0, _react.useRef)(null);
+
+    var instrumentedFetchReports = function instrumentedFetchReports() {
+      return (0, _fetchReports.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 (0, _fetchReportsStatus.fetchReportsStatus)({
+        activeQuizId: activeQuizId,
+        addError: addError,
+        setGenerationInProgress: setGenerationInProgress,
+        setStatusPollingInProgress: setStatusPollingInProgress,
+        fetchAnalysesStatus: fetchAnalysesStatus,
+        instrumentedFetchReports: instrumentedFetchReports
+      });
     };
 
     function generateReports() {
@@ -89,7 +111,7 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
                   }
 
                   _context.next = 4;
-                  return (0, _fetchReports.fetchReports)(reportFetchingConfig);
+                  return instrumentedFetchReports();
 
                 case 4:
                 case "end":
@@ -106,6 +128,21 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
 
       fetchIfNeeded();
     }, []);
+    (0, _react.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.default.createElement(OriginalComponent, Object.assign({
       quizAnalysis: quizAnalysis,
       itemAnalyses: itemAnalyses,
@@ -121,16 +158,20 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
     itemAnalyses: _propTypes.default.arrayOf(_propTypes2.itemAnalysisPropType),
     fetchInProgress: _propTypes.default.bool.isRequired,
     generationInProgress: _propTypes.default.bool.isRequired,
+    statusPollingInProgress: _propTypes.default.bool.isRequired,
     analysisError: _propTypes.default.string,
     setQuizAnalysis: _propTypes.default.func.isRequired,
     setItemAnalyses: _propTypes.default.func.isRequired,
     setFetchInProgress: _propTypes.default.func.isRequired,
     setGenerationInProgress: _propTypes.default.func.isRequired,
     setAnalysisError: _propTypes.default.func.isRequired,
+    setStatusPollingInProgress: _propTypes.default.func.isRequired,
     activeQuizId: _propTypes.default.string.isRequired,
     fetchQuizAnalysis: _propTypes.default.func.isRequired,
     fetchItemAnalyses: _propTypes.default.func.isRequired,
+    fetchAnalysesStatus: _propTypes.default.func.isRequired,
     addError: _propTypes.default.func.isRequired,
+    pollingInterval: _propTypes.default.number.isRequired,
     // can be required after passed from LTI
     generateReport: _propTypes.default.func
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.63.1-rc.1+70beebd5f",
+  "version": "17.63.1-rc.3+bb9038eca",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
   ],
   "dependencies": {
     "@instructure/outcomes-ui": "^2.1.9",
-    "@instructure/quiz-common": "17.63.1-rc.1+70beebd5f",
-    "@instructure/quiz-i18n": "17.63.1-rc.1+70beebd5f",
-    "@instructure/quiz-interactions": "17.63.1-rc.1+70beebd5f",
-    "@instructure/quiz-number-input": "17.63.1-rc.1+70beebd5f",
-    "@instructure/quiz-rce": "17.63.1-rc.1+70beebd5f",
+    "@instructure/quiz-common": "17.63.1-rc.3+bb9038eca",
+    "@instructure/quiz-i18n": "17.63.1-rc.3+bb9038eca",
+    "@instructure/quiz-interactions": "17.63.1-rc.3+bb9038eca",
+    "@instructure/quiz-number-input": "17.63.1-rc.3+bb9038eca",
+    "@instructure/quiz-rce": "17.63.1-rc.3+bb9038eca",
     "@instructure/ui-a11y-content": "^7.20.0",
     "@instructure/ui-alerts": "^7.20.0",
     "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.63.1-rc.1+70beebd5f",
+    "instructure-validations": "17.63.1-rc.3+bb9038eca",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -157,7 +157,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.63.1-rc.1+70beebd5f",
+    "quiz-presets": "17.63.1-rc.3+bb9038eca",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -173,5 +173,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "70beebd5f9c207e03df9942938452b5389ef3881"
+  "gitHead": "bb9038eca17319245eda3bfde7b7a77b61c8498a"
 }