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

package/es/reporting/components/resources/NewQuizAndItemAnalysis/NewQuizAnalysis/presenter.js

@@ -8,16 +8,16 @@ var _dec, _class, _class2, _temp;
 import { Heading } from '@instructure/ui-heading';
 import React, { Component } from 'react';
 var styles = {
-  componentId: 'ePPpE',
+  componentId: 'bnEXV',
   template: function template(theme) {
-    return "\n\n.ePPpE_eDnN{display:flex;justify-content:space-between;padding-bottom:".concat(theme.headingPadding || 'inherit', "}\n\n.ePPpE_eKXQ{padding:").concat(theme.cardWrapperPadding || 'inherit', ";position:relative}\n\n.ePPpE_crZr{padding-top:").concat(theme.metricGroupPaddingTop || 'inherit', "}\n\n.ePPpE_bTHH{position:absolute;right:").concat(theme.viewPadding || 'inherit', ";top:").concat(theme.viewPadding || 'inherit', "}\n\n.ePPpE_dPzc,.ePPpE_cpZE{column-gap:").concat(theme.metricsColumnGap || 'inherit', ";display:flex;flex-wrap:wrap;justify-content:flex-start;row-gap:1.5rem}\n\n.ePPpE_dPzc{margin-left:-8px}");
+    return "\n\n.bnEXV_eDnN{display:flex;justify-content:space-between;padding-bottom:".concat(theme.headingPadding || 'inherit', "}\n\n.bnEXV_eKXQ{padding:").concat(theme.cardWrapperPadding || 'inherit', ";position:relative}\n\n.bnEXV_crZr{padding-top:").concat(theme.metricGroupPaddingTop || 'inherit', "}\n\n.bnEXV_bTHH{position:absolute;right:").concat(theme.viewPadding || 'inherit', ";top:").concat(theme.viewPadding || 'inherit', "}\n\n.bnEXV_dPzc,.bnEXV_cpZE{column-gap:").concat(theme.metricsColumnGap || 'inherit', ";display:flex;flex-wrap:wrap;justify-content:flex-start;row-gap:1.5rem}");
   },
-  'heading': 'ePPpE_eDnN',
-  'cardWrapper': 'ePPpE_eKXQ',
-  'container': 'ePPpE_crZr',
-  'expandButtonContainer': 'ePPpE_bTHH',
-  'metricGroup': 'ePPpE_dPzc',
-  'metricsWrapper': 'ePPpE_cpZE'
+  'heading': 'bnEXV_eDnN',
+  'cardWrapper': 'bnEXV_eKXQ',
+  'container': 'bnEXV_crZr',
+  'expandButtonContainer': 'bnEXV_bTHH',
+  'metricGroup': 'bnEXV_dPzc',
+  'metricsWrapper': 'bnEXV_cpZE'
 };
 import t from '@instructure/quiz-i18n/es/format-message';
 import ExpandButton from "../../../../../common/components/shared/ExpandButton/index.js";
@@ -72,12 +72,7 @@ export var NewQuizAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
         className: styles.container
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.metricGroup
-      }, /*#__PURE__*/React.createElement(AnalysisMetric, {
-        metricKey: "median_percentage",
-        label: t('Median Score'),
-        value: t.number(scores === null || scores === void 0 ? void 0 : scores.median_percentage),
-        suffix: "%"
-      }), /*#__PURE__*/React.createElement(AnalysisPopoverMetric, {
+      }, /*#__PURE__*/React.createElement(AnalysisPopoverMetric, {
         metricKey: "stddev",
         value: t.number(scores === null || scores === void 0 ? void 0 : scores.stddev),
         label: t('Standard Deviation'),
@@ -130,9 +125,10 @@ export var NewQuizAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
       })), /*#__PURE__*/React.createElement("div", {
         className: styles.metricsWrapper
       }, /*#__PURE__*/React.createElement(AnalysisMetric, {
-        metricKey: "average_attempts",
-        label: t('average attempts'),
-        value: t.number(attempts === null || attempts === void 0 ? void 0 : attempts.average_attempts)
+        metricKey: "median_percentage",
+        label: t('Median Score'),
+        value: t.number(scores === null || scores === void 0 ? void 0 : scores.median_percentage),
+        suffix: "%"
       }), /*#__PURE__*/React.createElement(AnalysisMetric, {
         metricKey: "mean_elapsed_sec",
         label: t('mean elapsed time'),

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

@@ -0,0 +1,7 @@
+import t from '@instructure/quiz-i18n/es/format-message';
+export var getFailedToFetchReports = function getFailedToFetchReports() {
+  return t('An error has occurred while loading this report. Please try again.');
+};
+export var getLastReportGenerationFailed = function getLastReportGenerationFailed() {
+  return t('Report generation failed. Please try again.');
+};

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

@@ -0,0 +1,56 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+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;
+
+    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;
+            _context.prev = 1;
+            setFetchInProgress(true);
+            _context.next = 5;
+            return Promise.all([fetchQuizAnalysis(activeQuizId), fetchItemAnalyses(activeQuizId)]);
+
+          case 5:
+            _yield$Promise$all = _context.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+            quizAnalysis = _yield$Promise$all2[0];
+            itemAnalyses = _yield$Promise$all2[1];
+            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) {
+              setAnalysisError(getLastReportGenerationFailed());
+            }
+
+            _context.next = 18;
+            break;
+
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](1);
+            addError(getFailedToFetchReports());
+
+          case 18:
+            _context.prev = 18;
+            setFetchInProgress(false);
+            return _context.finish(18);
+
+          case 21:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[1, 15, 18, 21]]);
+  }));
+
+  return function fetchReports(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();

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

@@ -29,7 +29,7 @@ export var itemAnalysisPropType = PropTypes.shape({
   metadata: PropTypes.shape({
     interaction_type: PropTypes.string,
     item_body: PropTypes.string,
-    item_id: PropTypes.string,
+    item_id: PropTypes.number,
     item_title: PropTypes.string
   }),
   scores: PropTypes.shape({

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

@@ -1,17 +1,20 @@
 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 as fetchQuizAnalysis } from "../../../api/newQuizAnalysis.js";
-import { getItemAnalyses as fetchItemAnalyses } from "../../../api/newItemAnalyses.js";
+import { getQuizAnalysis as fetchQuizAnalysis } from "../../../api/getQuizAnalysis.js";
+import { getItemAnalyses as fetchItemAnalyses } from "../../../api/getItemAnalyses.js";
 import { connect } from "../../../../common/react-redux.js";
 import { compose } from 'redux';
-export function mapStateToProps(state) {
+import { getActiveQuizId } from "../../../../common/selectors/quizzes.js";
+import { addError } from "../../../../common/actions/alerts.js";
+export function mapStateToProps(state, ownProps) {
   return {
     quizAnalysis: getQuizAnalysis(state),
     itemAnalyses: getItemAnalyses(state),
     fetchInProgress: getFetchInProgress(state),
     generationInProgress: getGenerationInProgress(state),
     analysisError: getAnalysisError(state),
+    activeQuizId: ownProps.activeQuizId || getActiveQuizId(state),
     fetchQuizAnalysis: fetchQuizAnalysis,
     fetchItemAnalyses: fetchItemAnalyses
   };
@@ -21,7 +24,8 @@ var mapDispatchToProps = {
   setItemAnalyses: setItemAnalyses,
   setFetchInProgress: setFetchInProgress,
   setGenerationInProgress: setGenerationInProgress,
-  setAnalysisError: setAnalysisError
+  setAnalysisError: setAnalysisError,
+  addError: addError
 };
 export var withAnalysisState = compose(connect(mapStateToProps, mapDispatchToProps), withAnalysisStatePresenter);
 export default withAnalysisState;

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

@@ -4,6 +4,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { itemAnalysisPropType, quizAnalysisPropType } from "./propTypes.js";
+import { fetchReports } from "./fetchReports.js";
 export var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalComponent) {
   var WithAnalysisStatePresenter = function WithAnalysisStatePresenter(_ref) {
     var quizAnalysis = _ref.quizAnalysis,
@@ -12,123 +13,46 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
         generationInProgress = _ref.generationInProgress,
         analysisError = _ref.analysisError,
         setQuizAnalysis = _ref.setQuizAnalysis,
+        addError = _ref.addError,
         setItemAnalyses = _ref.setItemAnalyses,
         setFetchInProgress = _ref.setFetchInProgress,
         setGenerationInProgress = _ref.setGenerationInProgress,
         setAnalysisError = _ref.setAnalysisError,
         activeQuizId = _ref.activeQuizId,
+        generateReport = _ref.generateReport,
         fetchQuizAnalysis = _ref.fetchQuizAnalysis,
         fetchItemAnalyses = _ref.fetchItemAnalyses,
-        generateReport = _ref.generateReport,
-        passThroughProps = _objectWithoutProperties(_ref, ["quizAnalysis", "itemAnalyses", "fetchInProgress", "generationInProgress", "analysisError", "setQuizAnalysis", "setItemAnalyses", "setFetchInProgress", "setGenerationInProgress", "setAnalysisError", "activeQuizId", "fetchQuizAnalysis", "fetchItemAnalyses", "generateReport"]);
+        passThroughProps = _objectWithoutProperties(_ref, ["quizAnalysis", "itemAnalyses", "fetchInProgress", "generationInProgress", "analysisError", "setQuizAnalysis", "addError", "setItemAnalyses", "setFetchInProgress", "setGenerationInProgress", "setAnalysisError", "activeQuizId", "generateReport", "fetchQuizAnalysis", "fetchItemAnalyses"]);
 
     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
+    };
 
-    function fetchReports() {
-      return _fetchReports.apply(this, arguments);
+    function generateReports() {
+      return _generateReports.apply(this, arguments);
     }
 
-    function _fetchReports() {
-      _fetchReports = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    function _generateReports() {
+      _generateReports = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return queryQuizAnalysis();
-
-              case 2:
-                _context2.next = 4;
-                return queryItemAnalyses();
-
-              case 4:
               case "end":
                 return _context2.stop();
             }
           }
         }, _callee2);
       }));
-      return _fetchReports.apply(this, arguments);
-    }
-
-    function queryQuizAnalysis() {
-      return _queryQuizAnalysis.apply(this, arguments);
-    }
-
-    function _queryQuizAnalysis() {
-      _queryQuizAnalysis = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var response;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return fetchQuizAnalysis(activeQuizId);
-
-              case 2:
-                response = _context3.sent;
-
-                if (response) {
-                  setQuizAnalysis(response.last_successful_analysis);
-                }
-
-              case 4:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3);
-      }));
-      return _queryQuizAnalysis.apply(this, arguments);
-    }
-
-    function queryItemAnalyses() {
-      return _queryItemAnalyses.apply(this, arguments);
-    }
-
-    function _queryItemAnalyses() {
-      _queryItemAnalyses = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var response;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return fetchItemAnalyses(activeQuizId);
-
-              case 2:
-                response = _context4.sent;
-
-                if (response) {
-                  setItemAnalyses(response.last_successful_analysis);
-                }
-
-              case 4:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4);
-      }));
-      return _queryItemAnalyses.apply(this, arguments);
-    }
-
-    function generateReports() {
-      return _generateReports.apply(this, arguments);
-    }
-
-    function _generateReports() {
-      _generateReports = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-              case "end":
-                return _context5.stop();
-            }
-          }
-        }, _callee5);
-      }));
       return _generateReports.apply(this, arguments);
     }
 
@@ -148,7 +72,7 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
                   }
 
                   _context.next = 4;
-                  return fetchReports();
+                  return fetchReports(reportFetchingConfig);
 
                 case 4:
                 case "end":
@@ -189,6 +113,7 @@ export var withAnalysisStatePresenter = function withAnalysisStatePresenter(Orig
     activeQuizId: PropTypes.string.isRequired,
     fetchQuizAnalysis: PropTypes.func.isRequired,
     fetchItemAnalyses: PropTypes.func.isRequired,
+    addError: PropTypes.func.isRequired,
     // can be required after passed from LTI
     generateReport: PropTypes.func
   };

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/NewQuizAnalysis/presenter.js

@@ -44,16 +44,16 @@ var _propTypes = require("../propTypes.js");
 var _dec, _class, _class2, _temp;
 
 var styles = {
-  componentId: 'ePPpE',
+  componentId: 'bnEXV',
   template: function template(theme) {
-    return "\n\n.ePPpE_eDnN{display:flex;justify-content:space-between;padding-bottom:".concat(theme.headingPadding || 'inherit', "}\n\n.ePPpE_eKXQ{padding:").concat(theme.cardWrapperPadding || 'inherit', ";position:relative}\n\n.ePPpE_crZr{padding-top:").concat(theme.metricGroupPaddingTop || 'inherit', "}\n\n.ePPpE_bTHH{position:absolute;right:").concat(theme.viewPadding || 'inherit', ";top:").concat(theme.viewPadding || 'inherit', "}\n\n.ePPpE_dPzc,.ePPpE_cpZE{column-gap:").concat(theme.metricsColumnGap || 'inherit', ";display:flex;flex-wrap:wrap;justify-content:flex-start;row-gap:1.5rem}\n\n.ePPpE_dPzc{margin-left:-8px}");
+    return "\n\n.bnEXV_eDnN{display:flex;justify-content:space-between;padding-bottom:".concat(theme.headingPadding || 'inherit', "}\n\n.bnEXV_eKXQ{padding:").concat(theme.cardWrapperPadding || 'inherit', ";position:relative}\n\n.bnEXV_crZr{padding-top:").concat(theme.metricGroupPaddingTop || 'inherit', "}\n\n.bnEXV_bTHH{position:absolute;right:").concat(theme.viewPadding || 'inherit', ";top:").concat(theme.viewPadding || 'inherit', "}\n\n.bnEXV_dPzc,.bnEXV_cpZE{column-gap:").concat(theme.metricsColumnGap || 'inherit', ";display:flex;flex-wrap:wrap;justify-content:flex-start;row-gap:1.5rem}");
   },
-  'heading': 'ePPpE_eDnN',
-  'cardWrapper': 'ePPpE_eKXQ',
-  'container': 'ePPpE_crZr',
-  'expandButtonContainer': 'ePPpE_bTHH',
-  'metricGroup': 'ePPpE_dPzc',
-  'metricsWrapper': 'ePPpE_cpZE'
+  'heading': 'bnEXV_eDnN',
+  'cardWrapper': 'bnEXV_eKXQ',
+  'container': 'bnEXV_crZr',
+  'expandButtonContainer': 'bnEXV_bTHH',
+  'metricGroup': 'bnEXV_dPzc',
+  'metricsWrapper': 'bnEXV_cpZE'
 };
 var stdDevPopoverTexts = {
   title: 'Lorem ipsum ',
@@ -98,12 +98,7 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         className: styles.container
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.metricGroup
-      }, /*#__PURE__*/_react.default.createElement(_index4.default, {
-        metricKey: "median_percentage",
-        label: (0, _formatMessage.default)('Median Score'),
-        value: _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.median_percentage),
-        suffix: "%"
-      }), /*#__PURE__*/_react.default.createElement(_index3.default, {
+      }, /*#__PURE__*/_react.default.createElement(_index3.default, {
         metricKey: "stddev",
         value: _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.stddev),
         label: (0, _formatMessage.default)('Standard Deviation'),
@@ -156,9 +151,10 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
       })), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.metricsWrapper
       }, /*#__PURE__*/_react.default.createElement(_index4.default, {
-        metricKey: "average_attempts",
-        label: (0, _formatMessage.default)('average attempts'),
-        value: _formatMessage.default.number(attempts === null || attempts === void 0 ? void 0 : attempts.average_attempts)
+        metricKey: "median_percentage",
+        label: (0, _formatMessage.default)('Median Score'),
+        value: _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.median_percentage),
+        suffix: "%"
       }), /*#__PURE__*/_react.default.createElement(_index4.default, {
         metricKey: "mean_elapsed_sec",
         label: (0, _formatMessage.default)('mean elapsed time'),

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

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLastReportGenerationFailed = exports.getFailedToFetchReports = void 0;
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
+var getFailedToFetchReports = function getFailedToFetchReports() {
+  return (0, _formatMessage.default)('An error has occurred while loading this report. Please try again.');
+};
+
+exports.getFailedToFetchReports = getFailedToFetchReports;
+
+var getLastReportGenerationFailed = function getLastReportGenerationFailed() {
+  return (0, _formatMessage.default)('Report generation failed. Please try again.');
+};
+
+exports.getLastReportGenerationFailed = getLastReportGenerationFailed;

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

@@ -0,0 +1,71 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchReports = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+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;
+
+    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;
+            _context.prev = 1;
+            setFetchInProgress(true);
+            _context.next = 5;
+            return Promise.all([fetchQuizAnalysis(activeQuizId), fetchItemAnalyses(activeQuizId)]);
+
+          case 5:
+            _yield$Promise$all = _context.sent;
+            _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 2);
+            quizAnalysis = _yield$Promise$all2[0];
+            itemAnalyses = _yield$Promise$all2[1];
+            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) {
+              setAnalysisError((0, _errorMessages.getLastReportGenerationFailed)());
+            }
+
+            _context.next = 18;
+            break;
+
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](1);
+            addError((0, _errorMessages.getFailedToFetchReports)());
+
+          case 18:
+            _context.prev = 18;
+            setFetchInProgress(false);
+            return _context.finish(18);
+
+          case 21:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[1, 15, 18, 21]]);
+  }));
+
+  return function fetchReports(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+exports.fetchReports = fetchReports;

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

@@ -42,7 +42,7 @@ var itemAnalysisPropType = _propTypes.default.shape({
   metadata: _propTypes.default.shape({
     interaction_type: _propTypes.default.string,
     item_body: _propTypes.default.string,
-    item_id: _propTypes.default.string,
+    item_id: _propTypes.default.number,
     item_title: _propTypes.default.string
   }),
   scores: _propTypes.default.shape({

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

@@ -12,23 +12,28 @@ var _analyses = require("../../../../common/selectors/analyses.js");
 
 var _analyses2 = require("../../../../common/actions/analyses.js");
 
-var _newQuizAnalysis = require("../../../api/newQuizAnalysis.js");
+var _getQuizAnalysis = require("../../../api/getQuizAnalysis.js");
 
-var _newItemAnalyses = require("../../../api/newItemAnalyses.js");
+var _getItemAnalyses = require("../../../api/getItemAnalyses.js");
 
 var _reactRedux = require("../../../../common/react-redux.js");
 
 var _redux = require("redux");
 
-function mapStateToProps(state) {
+var _quizzes = require("../../../../common/selectors/quizzes.js");
+
+var _alerts = require("../../../../common/actions/alerts.js");
+
+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),
     analysisError: (0, _analyses.getAnalysisError)(state),
-    fetchQuizAnalysis: _newQuizAnalysis.getQuizAnalysis,
-    fetchItemAnalyses: _newItemAnalyses.getItemAnalyses
+    activeQuizId: ownProps.activeQuizId || (0, _quizzes.getActiveQuizId)(state),
+    fetchQuizAnalysis: _getQuizAnalysis.getQuizAnalysis,
+    fetchItemAnalyses: _getItemAnalyses.getItemAnalyses
   };
 }
 
@@ -37,7 +42,8 @@ var mapDispatchToProps = {
   setItemAnalyses: _analyses2.setItemAnalyses,
   setFetchInProgress: _analyses2.setFetchInProgress,
   setGenerationInProgress: _analyses2.setGenerationInProgress,
-  setAnalysisError: _analyses2.setAnalysisError
+  setAnalysisError: _analyses2.setAnalysisError,
+  addError: _alerts.addError
 };
 var withAnalysisState = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), _withAnalysisStatePresenter.withAnalysisStatePresenter);
 exports.withAnalysisState = withAnalysisState;

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

@@ -21,6 +21,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _propTypes2 = require("./propTypes.js");
 
+var _fetchReports = require("./fetchReports.js");
+
 var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalComponent) {
   var WithAnalysisStatePresenter = function WithAnalysisStatePresenter(_ref) {
     var quizAnalysis = _ref.quizAnalysis,
@@ -29,122 +31,45 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
         generationInProgress = _ref.generationInProgress,
         analysisError = _ref.analysisError,
         setQuizAnalysis = _ref.setQuizAnalysis,
+        addError = _ref.addError,
         setItemAnalyses = _ref.setItemAnalyses,
         setFetchInProgress = _ref.setFetchInProgress,
         setGenerationInProgress = _ref.setGenerationInProgress,
         setAnalysisError = _ref.setAnalysisError,
         activeQuizId = _ref.activeQuizId,
+        generateReport = _ref.generateReport,
         fetchQuizAnalysis = _ref.fetchQuizAnalysis,
         fetchItemAnalyses = _ref.fetchItemAnalyses,
-        generateReport = _ref.generateReport,
-        passThroughProps = (0, _objectWithoutProperties2.default)(_ref, ["quizAnalysis", "itemAnalyses", "fetchInProgress", "generationInProgress", "analysisError", "setQuizAnalysis", "setItemAnalyses", "setFetchInProgress", "setGenerationInProgress", "setAnalysisError", "activeQuizId", "fetchQuizAnalysis", "fetchItemAnalyses", "generateReport"]);
+        passThroughProps = (0, _objectWithoutProperties2.default)(_ref, ["quizAnalysis", "itemAnalyses", "fetchInProgress", "generationInProgress", "analysisError", "setQuizAnalysis", "addError", "setItemAnalyses", "setFetchInProgress", "setGenerationInProgress", "setAnalysisError", "activeQuizId", "generateReport", "fetchQuizAnalysis", "fetchItemAnalyses"]);
     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
+    };
 
-    function fetchReports() {
-      return _fetchReports.apply(this, arguments);
+    function generateReports() {
+      return _generateReports.apply(this, arguments);
     }
 
-    function _fetchReports() {
-      _fetchReports = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+    function _generateReports() {
+      _generateReports = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return queryQuizAnalysis();
-
-              case 2:
-                _context2.next = 4;
-                return queryItemAnalyses();
-
-              case 4:
               case "end":
                 return _context2.stop();
             }
           }
         }, _callee2);
       }));
-      return _fetchReports.apply(this, arguments);
-    }
-
-    function queryQuizAnalysis() {
-      return _queryQuizAnalysis.apply(this, arguments);
-    }
-
-    function _queryQuizAnalysis() {
-      _queryQuizAnalysis = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var response;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return fetchQuizAnalysis(activeQuizId);
-
-              case 2:
-                response = _context3.sent;
-
-                if (response) {
-                  setQuizAnalysis(response.last_successful_analysis);
-                }
-
-              case 4:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3);
-      }));
-      return _queryQuizAnalysis.apply(this, arguments);
-    }
-
-    function queryItemAnalyses() {
-      return _queryItemAnalyses.apply(this, arguments);
-    }
-
-    function _queryItemAnalyses() {
-      _queryItemAnalyses = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var response;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return fetchItemAnalyses(activeQuizId);
-
-              case 2:
-                response = _context4.sent;
-
-                if (response) {
-                  setItemAnalyses(response.last_successful_analysis);
-                }
-
-              case 4:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4);
-      }));
-      return _queryItemAnalyses.apply(this, arguments);
-    }
-
-    function generateReports() {
-      return _generateReports.apply(this, arguments);
-    }
-
-    function _generateReports() {
-      _generateReports = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
-        return _regenerator.default.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-              case "end":
-                return _context5.stop();
-            }
-          }
-        }, _callee5);
-      }));
       return _generateReports.apply(this, arguments);
     }
 
@@ -164,7 +89,7 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
                   }
 
                   _context.next = 4;
-                  return fetchReports();
+                  return (0, _fetchReports.fetchReports)(reportFetchingConfig);
 
                 case 4:
                 case "end":
@@ -205,6 +130,7 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
     activeQuizId: _propTypes.default.string.isRequired,
     fetchQuizAnalysis: _propTypes.default.func.isRequired,
     fetchItemAnalyses: _propTypes.default.func.isRequired,
+    addError: _propTypes.default.func.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.0",
+  "version": "17.63.1-rc.1+70beebd5f",
   "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.0",
-    "@instructure/quiz-i18n": "^17.63.0",
-    "@instructure/quiz-interactions": "^17.63.0",
-    "@instructure/quiz-number-input": "^17.63.0",
-    "@instructure/quiz-rce": "^17.63.0",
+    "@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/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.0",
+    "instructure-validations": "17.63.1-rc.1+70beebd5f",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -138,7 +138,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "^17.63.0",
+    "@instructure/quiz-scripts": "17.63.0",
     "@instructure/ui-axe-check": "^7.20.0",
     "@instructure/ui-babel-preset": "^7.20.0",
     "@instructure/ui-karma-config": "^7.20.0",
@@ -157,7 +157,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^17.63.0",
+    "quiz-presets": "17.63.1-rc.1+70beebd5f",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -173,5 +173,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7ce65d5c565e9c6352dbf22c9c2107f99741e82b"
+  "gitHead": "70beebd5f9c207e03df9942938452b5389ef3881"
 }