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

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

@@ -7,13 +7,15 @@ exports.default = generator;
 
 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/lib/reporting/components/resources/NewQuizAndItemAnalysis/errorMessages.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLastReportGenerationFailed = exports.getFailedToFetchReports = void 0;
+exports.getReportGenerationFailure = exports.getLastReportGenerationFailed = exports.getFailedToFetchReports = void 0;
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
@@ -19,4 +19,10 @@ var getLastReportGenerationFailed = function getLastReportGenerationFailed() {
   return (0, _formatMessage.default)('Report generation failed. Please try again.');
 };
 
-exports.getLastReportGenerationFailed = getLastReportGenerationFailed;
+exports.getLastReportGenerationFailed = getLastReportGenerationFailed;
+
+var getReportGenerationFailure = function getReportGenerationFailure() {
+  return (0, _formatMessage.default)('An error has occurred while generating this report. Please try again.');
+};
+
+exports.getReportGenerationFailure = getReportGenerationFailure;

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/generateReports.js

@@ -0,0 +1,67 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.generateReports = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _errorMessages = require("./errorMessages.js");
+
+var generateReports = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
+    var setGenerationInProgress, setStatusPollingInProgress, generateAnalysis, filter, addError, response;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            setGenerationInProgress = _ref.setGenerationInProgress, setStatusPollingInProgress = _ref.setStatusPollingInProgress, generateAnalysis = _ref.generateAnalysis, filter = _ref.filter, addError = _ref.addError;
+            _context.prev = 1;
+            setGenerationInProgress(true);
+            _context.next = 5;
+            return generateAnalysis(filter);
+
+          case 5:
+            response = _context.sent;
+
+            if (response) {
+              _context.next = 10;
+              break;
+            }
+
+            addError((0, _errorMessages.getReportGenerationFailure)());
+            setGenerationInProgress(false);
+            return _context.abrupt("return");
+
+          case 10:
+            setStatusPollingInProgress(true);
+            _context.next = 17;
+            break;
+
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](1);
+            addError((0, _errorMessages.getReportGenerationFailure)());
+            setGenerationInProgress(false);
+
+          case 17:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[1, 13]]);
+  }));
+
+  return function generateReports(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+exports.generateReports = generateReports;
+var _default = generateReports;
+exports.default = _default;

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,10 @@ var _propTypes2 = require("./propTypes.js");
 
 var _fetchReports = require("./fetchReports.js");
 
+var _fetchReportsStatus = require("./fetchReportsStatus.js");
+
+var _generateReports2 = require("./generateReports.js");
+
 var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalComponent) {
   var WithAnalysisStatePresenter = function WithAnalysisStatePresenter(_ref) {
     var quizAnalysis = _ref.quizAnalysis,
@@ -37,21 +41,41 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
         setGenerationInProgress = _ref.setGenerationInProgress,
         setAnalysisError = _ref.setAnalysisError,
         activeQuizId = _ref.activeQuizId,
-        generateReport = _ref.generateReport,
+        generateAnalysis = _ref.generateAnalysis,
         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", "generateAnalysis", "fetchQuizAnalysis", "fetchItemAnalyses", "fetchAnalysesStatus", "statusPollingInProgress", "setStatusPollingInProgress", "pollingInterval"]);
     WithAnalysisStatePresenter.displayName = "WithAnalysisStatePresenter(".concat(OriginalComponent.displayName || OriginalComponent.name, ")");
-    var reportFetchingConfig = {
-      activeQuizId: activeQuizId,
-      addError: addError,
-      fetchQuizAnalysis: fetchQuizAnalysis,
-      fetchItemAnalyses: fetchItemAnalyses,
-      setAnalysisError: setAnalysisError,
-      setItemAnalyses: setItemAnalyses,
-      setGenerationInProgress: setGenerationInProgress,
-      setFetchInProgress: setFetchInProgress,
-      setQuizAnalysis: setQuizAnalysis
+    var runningInterval = (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() {
@@ -60,10 +84,25 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
 
     function _generateReports() {
       _generateReports = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var filter,
+            generationConfig,
+            _args2 = arguments;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
+                filter = _args2.length > 0 && _args2[0] !== void 0 ? _args2[0] : 'last_attempt';
+                generationConfig = {
+                  filter: filter,
+                  generateAnalysis: generateAnalysis,
+                  setGenerationInProgress: setGenerationInProgress,
+                  setStatusPollingInProgress: setStatusPollingInProgress,
+                  addError: addError
+                };
+                _context2.next = 4;
+                return (0, _generateReports2.generateReports)(generationConfig);
+
+              case 4:
               case "end":
                 return _context2.stop();
             }
@@ -89,7 +128,7 @@ var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalCom
                   }
 
                   _context.next = 4;
-                  return (0, _fetchReports.fetchReports)(reportFetchingConfig);
+                  return instrumentedFetchReports();
 
                 case 4:
                 case "end":
@@ -106,6 +145,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,24 +175,27 @@ 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,
-    // can be required after passed from LTI
-    generateReport: _propTypes.default.func
+    pollingInterval: _propTypes.default.number.isRequired,
+    generateAnalysis: _propTypes.default.func.isRequired // from LTI, f(filter: string)
+
   };
   WithAnalysisStatePresenter.defaultProps = {
     quizAnalysis: void 0,
     itemAnalyses: void 0,
-    analysisError: '',
-    generateReport: Function.prototype
+    analysisError: ''
   };
   return WithAnalysisStatePresenter;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.63.1-rc.1+70beebd5f",
+  "version": "17.63.1-rc.13+2689d1535",
   "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.13+2689d1535",
+    "@instructure/quiz-i18n": "17.63.1-rc.13+2689d1535",
+    "@instructure/quiz-interactions": "17.63.1-rc.13+2689d1535",
+    "@instructure/quiz-number-input": "17.63.1-rc.13+2689d1535",
+    "@instructure/quiz-rce": "17.63.1-rc.13+2689d1535",
     "@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.13+2689d1535",
     "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.13+2689d1535",
     "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": "2689d153545ce15c011be212105bfc5aae9835db"
 }