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

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/components/shared/spinner/Spinner.js

@@ -7,20 +7,19 @@ var _dec, _class, _class2, _temp;
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { Text } from '@instructure/ui-text';
 import { Spinner } from '@instructure/ui-spinner';
-import { Heading } from '@instructure/ui-heading';
 import { PresentationContent } from '@instructure/ui-a11y-content';
 import { themeable } from '@instructure/ui-themeable';
 import t from '@instructure/quiz-i18n/es/format-message';
 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'
 };
 import theme from "./theme.js";
 export var QuizzesSpinner = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
@@ -37,34 +36,50 @@ export var QuizzesSpinner = (_dec = themeable(theme, styles), _dec(_class = (_te
   _createClass(QuizzesSpinner, [{
     key: "mainText",
     value: function mainText() {
-      return this.props.mainText || t('Loading...');
+      var _this$props = this.props,
+          color = _this$props.color,
+          mainText = _this$props.mainText,
+          fontSize = _this$props.fontSize;
+      return /*#__PURE__*/React.createElement(Text, {
+        size: fontSize,
+        color: color
+      }, mainText || t('Loading...'));
     }
   }, {
     key: "render",
     value: function render() {
+      var _this$props2 = this.props,
+          size = _this$props2.size,
+          minHeight = _this$props2.minHeight;
       return /*#__PURE__*/React.createElement("div", {
-        className: styles.wrapper
+        className: styles.wrapper,
+        style: {
+          minHeight: minHeight
+        }
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.left
       }, /*#__PURE__*/React.createElement(Spinner, {
         renderTitle: this.mainText(),
-        size: "large"
+        size: size
       })), /*#__PURE__*/React.createElement("div", {
         className: styles.right
-      }, /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement(Heading, {
-        level: "h2",
-        as: "h1"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: styles.mainText
-      }, this.mainText())))));
+      }, /*#__PURE__*/React.createElement(PresentationContent, null, this.mainText())));
     }
   }]);
 
   QuizzesSpinner.displayName = "QuizzesSpinner";
   return QuizzesSpinner;
 }(Component), _class2.propTypes = {
-  mainText: PropTypes.string
+  mainText: PropTypes.string,
+  fontSize: PropTypes.oneOf(['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']),
+  size: PropTypes.oneOf(['x-small', 'small', 'medium', 'large']),
+  color: PropTypes.string,
+  minHeight: PropTypes.string
 }, _class2.defaultProps = {
-  mainText: null
+  mainText: null,
+  size: 'large',
+  fontSize: 'xx-large',
+  minHeight: '500px',
+  color: 'primary'
 }, _temp)) || _class);
 export default QuizzesSpinner;

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

@@ -1,6 +1,3 @@
-export default function generator(_ref) {
-  var typography = _ref.typography;
-  return {
-    mainTextFontSize: typography.fontSizeXXLarge
-  };
+export default function generator() {
+  return {};
 }

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/ReportCard/presenter.js

@@ -14,22 +14,22 @@ import { Flex } from '@instructure/ui-flex';
 import { themeable } from '@instructure/ui-themeable';
 import Card from "../../../../../common/components/shared/Card/index.js";
 var styles = {
-  componentId: 'eJSiT',
+  componentId: 'boQPo',
   template: function template(theme) {
-    return "\n\n.eJSiT_bqdH{column-gap:5px;display:flex;justify-content:space-between;padding:".concat(theme.metricsPadding || 'inherit', " 0}\n\n.eJSiT_fbIL{border-radius:").concat(theme.cardBorderRadius || 'inherit', ";box-shadow:").concat(theme.cardBoxShadow || 'inherit', ";display:inline-flex;flex-direction:column;margin:").concat(theme.cardMargin || 'inherit', ";padding:").concat(theme.cardPadding || 'inherit', ";width:").concat(theme.cardWidth || 'inherit', "}\n\n.eJSiT_blRb{max-width:160px;padding-right:10px}");
+    return "\n\n.boQPo_bqdH{column-gap:5px;display:flex;justify-content:space-between;padding-bottom:".concat(theme.metricsPadding || 'inherit', "}\n\n.boQPo_PFlN{border-radius:").concat(theme.cardBorderRadius || 'inherit', ";box-shadow:").concat(theme.cardBoxShadow || 'inherit', ";display:inline-flex;flex-direction:column;margin:").concat(theme.cardMargin || 'inherit', ";padding:").concat(theme.cardPadding || 'inherit', ";width:").concat(theme.cardWidth || 'inherit', "}\n\n.boQPo_blRb{max-width:160px;padding-right:10px}\n\n.boQPo_bxzy{border-bottom:1px solid ").concat(theme.quizSummaryBorderBottomColor || 'inherit', ";margin-bottom:15px;padding-bottom:15px}\n\n.boQPo_dKIc{padding-bottom:15px}\n\n.boQPo_cGHR{align-self:flex-end}");
   },
-  'metricsContainer': 'eJSiT_bqdH',
-  'card': 'eJSiT_fbIL',
-  'dateContainer': 'eJSiT_blRb'
+  'metricsContainer': 'boQPo_bqdH',
+  'reportCard': 'boQPo_PFlN',
+  'dateContainer': 'boQPo_blRb',
+  'quizAnalysisSummary': 'boQPo_bxzy',
+  'titleContainer': 'boQPo_dKIc',
+  'spinnerContainer': 'boQPo_cGHR'
 };
 import theme from "./theme.js";
 import AnalysisMetric from "../AnalysisMetric/index.js";
 import Spinner from "../../../../../common/components/shared/spinner/Spinner.js";
 import { AnalysisUpdateDate } from "../AnalysisUpdateDate/index.js";
-import { quizAnalysisPropType } from "../propTypes.js";
-
-var _ref = /*#__PURE__*/React.createElement(Spinner, null);
-
+import { itemAnalysisPropType, quizAnalysisPropType } from "../propTypes.js";
 export var NewQuizAndItemAnalysisReportCardPresenter = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
   _inherits(NewQuizAndItemAnalysisReportCardPresenter, _Component);
 
@@ -70,20 +70,14 @@ export var NewQuizAndItemAnalysisReportCardPresenter = (_dec = themeable(theme,
       }));
     };
 
-    return _this;
-  }
-
-  _createClass(NewQuizAndItemAnalysisReportCardPresenter, [{
-    key: "renderContent",
-    value: function renderContent() {
-      var _this$props = this.props,
-          name = _this$props.name,
-          href = _this$props.href,
-          quizAnalysis = _this$props.quizAnalysis;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
-        size: "medium",
-        weight: "bold"
-      }, name), this.renderMetrics(), /*#__PURE__*/React.createElement(Flex, {
+    _this.renderQuizAnalysisSummary = function () {
+      var _this$props = _this.props,
+          quizAnalysis = _this$props.quizAnalysis,
+          itemAnalyses = _this$props.itemAnalyses,
+          href = _this$props.href;
+      return /*#__PURE__*/React.createElement("div", {
+        className: styles.quizAnalysisSummary
+      }, _this.renderMetrics(), /*#__PURE__*/React.createElement(Flex, {
         direction: "row",
         justifyItems: "space-between"
       }, /*#__PURE__*/React.createElement("div", {
@@ -91,18 +85,66 @@ export var NewQuizAndItemAnalysisReportCardPresenter = (_dec = themeable(theme,
       }, /*#__PURE__*/React.createElement(AnalysisUpdateDate, {
         date: quizAnalysis.created_timestamp,
         multiline: true
-      })), /*#__PURE__*/React.createElement(Link, {
+      })), quizAnalysis && itemAnalyses && /*#__PURE__*/React.createElement(Link, {
         href: href
       }, /*#__PURE__*/React.createElement(Text, {
         size: "small"
       }, t('View Report')))));
-    }
-  }, {
+    };
+
+    _this.renderSpinner = function (mainText) {
+      return /*#__PURE__*/React.createElement(Spinner, {
+        size: "x-small",
+        color: "brand",
+        minHeight: "0",
+        mainText: mainText,
+        fontSize: "x-small"
+      });
+    };
+
+    _this.renderReportCardFooter = function () {
+      var _this$props2 = _this.props,
+          generationInProgress = _this$props2.generationInProgress,
+          generateReports = _this$props2.generateReports,
+          analysisError = _this$props2.analysisError;
+      return /*#__PURE__*/React.createElement(Flex, {
+        direction: "row",
+        justifyItems: "space-between"
+      }, /*#__PURE__*/React.createElement(Flex.Item, {
+        shouldShrink: true
+      }, analysisError && !generationInProgress && /*#__PURE__*/React.createElement(Text, {
+        size: "x-small",
+        lineHeight: "fit",
+        weight: "bold",
+        color: "danger"
+      }, analysisError)), /*#__PURE__*/React.createElement(Flex.Item, null, generationInProgress ? _this.renderSpinner(t('Generation In Progress')) : /*#__PURE__*/React.createElement(Link, {
+        onClick: generateReports,
+        role: "button"
+      }, /*#__PURE__*/React.createElement(Text, {
+        size: "small"
+      }, t('Generate Report')))));
+    };
+
+    return _this;
+  }
+
+  _createClass(NewQuizAndItemAnalysisReportCardPresenter, [{
     key: "render",
     value: function render() {
+      var _this$props3 = this.props,
+          fetchInProgress = _this$props3.fetchInProgress,
+          name = _this$props3.name,
+          quizAnalysis = _this$props3.quizAnalysis;
       return /*#__PURE__*/React.createElement(Card, {
-        className: styles.card
-      }, this.props.quizAnalysis ? this.renderContent() : _ref);
+        className: styles.reportCard
+      }, /*#__PURE__*/React.createElement("div", {
+        className: styles.titleContainer
+      }, /*#__PURE__*/React.createElement(Text, {
+        size: "medium",
+        weight: "bold"
+      }, name)), !fetchInProgress && quizAnalysis && this.renderQuizAnalysisSummary(), fetchInProgress && /*#__PURE__*/React.createElement("div", {
+        className: styles.spinnerContainer
+      }, this.renderSpinner()), !fetchInProgress && this.renderReportCardFooter());
     }
   }]);
 
@@ -111,9 +153,17 @@ export var NewQuizAndItemAnalysisReportCardPresenter = (_dec = themeable(theme,
 }(Component), _class2.propTypes = {
   name: PropTypes.node,
   href: PropTypes.string,
-  quizAnalysis: quizAnalysisPropType
+  quizAnalysis: quizAnalysisPropType,
+  itemAnalyses: PropTypes.arrayOf(itemAnalysisPropType),
+  fetchInProgress: PropTypes.bool.isRequired,
+  generationInProgress: PropTypes.bool.isRequired,
+  analysisError: PropTypes.string,
+  generateReports: PropTypes.func.isRequired
 }, _class2.defaultProps = {
   name: void 0,
   href: void 0,
-  quizAnalysis: void 0
+  analysisError: void 0,
+  generationInProgress: void 0,
+  quizAnalysis: void 0,
+  itemAnalyses: void 0
 }, _temp)) || _class);

package/es/reporting/components/resources/NewQuizAndItemAnalysis/ReportCard/theme.js

@@ -1,12 +1,14 @@
 export default function generator(_ref) {
   var spacing = _ref.spacing,
-      borders = _ref.borders;
+      borders = _ref.borders,
+      colors = _ref.colors;
   return {
     metricsPadding: spacing.medium,
     cardWidth: '16rem',
     cardPadding: spacing.medium,
     cardMargin: spacing.xSmall,
     cardBoxShadow: '1px 1px 3px 0 #ddd',
-    cardBorderRadius: borders.radiusMedium
+    cardBorderRadius: borders.radiusMedium,
+    quizSummaryBorderBottomColor: colors.tiara
   };
 }

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,