@instructure/quiz-core 17.61.0 → 17.61.1-rc.1

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

@@ -7,11 +7,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.NewQuizAndItemAnalysis = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+exports.default = exports.NewQuizAndItemAnalysisPresenter = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -23,107 +19,42 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _uiHeading = require("@instructure/ui-heading");
 
 var _index = _interopRequireDefault(require("./NewItemAnalysis/index.js"));
 
-var _Spinner = _interopRequireDefault(require("../../../../common/components/shared/spinner/Spinner.js"));
-
 var _index2 = _interopRequireDefault(require("./NewQuizAnalysis/index.js"));
 
+var _Spinner = _interopRequireDefault(require("../../../../common/components/shared/spinner/Spinner.js"));
+
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _uiFlex = require("@instructure/ui-flex");
 
 var _index3 = require("./AnalysisUpdateDate/index.js");
 
-var _ref3 = /*#__PURE__*/_react.default.createElement(_Spinner.default, null);
-
-var NewQuizAndItemAnalysis = /*#__PURE__*/function (_Component) {
-  (0, _inherits2.default)(NewQuizAndItemAnalysis, _Component);
-
-  var _super = (0, _createSuper2.default)(NewQuizAndItemAnalysis);
-
-  function NewQuizAndItemAnalysis(props) {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, NewQuizAndItemAnalysis);
-    _this = _super.call(this, props);
-    _this.fetchQuizAnalysis = /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _this$props, activeQuizId, getQuizAnalysis, response;
-
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _this$props = _this.props, activeQuizId = _this$props.activeQuizId, getQuizAnalysis = _this$props.getQuizAnalysis;
-              _context.next = 3;
-              return getQuizAnalysis(activeQuizId);
-
-            case 3:
-              response = _context.sent;
-
-              if (response) {
-                _this.setState({
-                  quizAnalysis: response.last_successful_analysis
-                });
-              }
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-    _this.fetchItemAnalyses = /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-      var _this$props2, activeQuizId, getItemAnalyses, response;
-
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _this$props2 = _this.props, activeQuizId = _this$props2.activeQuizId, getItemAnalyses = _this$props2.getItemAnalyses;
-              _context2.next = 3;
-              return getItemAnalyses(activeQuizId);
-
-            case 3:
-              response = _context2.sent;
-
-              if (response) {
-                _this.setState({
-                  itemAnalyses: response.last_successful_analysis
-                });
-              }
-
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-    _this.state = {
-      quizAnalysis: null,
-      itemAnalyses: null
-    };
-    return _this;
+var _propTypes = require("./propTypes.js");
+
+var _propTypes2 = _interopRequireDefault(require("prop-types"));
+
+var _ref = /*#__PURE__*/_react.default.createElement(_Spinner.default, null);
+
+var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(NewQuizAndItemAnalysisPresenter, _Component);
+
+  var _super = (0, _createSuper2.default)(NewQuizAndItemAnalysisPresenter);
+
+  function NewQuizAndItemAnalysisPresenter() {
+    (0, _classCallCheck2.default)(this, NewQuizAndItemAnalysisPresenter);
+    return _super.apply(this, arguments);
   }
 
-  (0, _createClass2.default)(NewQuizAndItemAnalysis, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.fetchQuizAnalysis();
-      this.fetchItemAnalyses();
-    }
-  }, {
+  (0, _createClass2.default)(NewQuizAndItemAnalysisPresenter, [{
     key: "renderContent",
     value: function renderContent() {
-      var _this$state = this.state,
-          quizAnalysis = _this$state.quizAnalysis,
-          itemAnalyses = _this$state.itemAnalyses;
+      var _this$props = this.props,
+          quizAnalysis = _this$props.quizAnalysis,
+          itemAnalyses = _this$props.itemAnalyses;
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "fs-mask"
       }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
@@ -147,26 +78,29 @@ var NewQuizAndItemAnalysis = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$state2 = this.state,
-          quizAnalysis = _this$state2.quizAnalysis,
-          itemAnalyses = _this$state2.itemAnalyses;
+      var _this$props2 = this.props,
+          quizAnalysis = _this$props2.quizAnalysis,
+          itemAnalyses = _this$props2.itemAnalyses;
 
       if (quizAnalysis && itemAnalyses) {
         return this.renderContent();
       } else {
-        return _ref3;
+        return _ref;
       }
     }
   }]);
-  NewQuizAndItemAnalysis.displayName = "NewQuizAndItemAnalysis";
-  return NewQuizAndItemAnalysis;
+  NewQuizAndItemAnalysisPresenter.displayName = "NewQuizAndItemAnalysisPresenter";
+  return NewQuizAndItemAnalysisPresenter;
 }(_react.Component);
 
-exports.NewQuizAndItemAnalysis = NewQuizAndItemAnalysis;
-NewQuizAndItemAnalysis.propTypes = {
-  activeQuizId: _propTypes.default.string.isRequired,
-  getQuizAnalysis: _propTypes.default.func.isRequired,
-  getItemAnalyses: _propTypes.default.func.isRequired
+exports.NewQuizAndItemAnalysisPresenter = NewQuizAndItemAnalysisPresenter;
+NewQuizAndItemAnalysisPresenter.propTypes = {
+  quizAnalysis: _propTypes.quizAnalysisPropType,
+  itemAnalyses: _propTypes2.default.arrayOf(_propTypes.itemAnalysisPropType)
+};
+NewQuizAndItemAnalysisPresenter.defaultProps = {
+  quizAnalysis: void 0,
+  itemAnalyses: void 0
 };
-var _default = NewQuizAndItemAnalysis;
+var _default = NewQuizAndItemAnalysisPresenter;
 exports.default = _default;

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.quizAnalysisPropType = void 0;
+exports.itemAnalysisPropType = exports.quizAnalysisPropType = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -30,6 +30,30 @@ var quizAnalysisPropType = _propTypes.default.shape({
     students_without_attempt: _propTypes.default.number,
     average_attempts: _propTypes.default.number
   }).isRequired
-}).isRequired;
+});
+
+exports.quizAnalysisPropType = quizAnalysisPropType;
+
+var itemAnalysisPropType = _propTypes.default.shape({
+  attempts: _propTypes.default.shape({
+    students_responded: _propTypes.default.number,
+    students_without_response: _propTypes.default.number
+  }),
+  metadata: _propTypes.default.shape({
+    interaction_type: _propTypes.default.string,
+    item_body: _propTypes.default.string,
+    item_id: _propTypes.default.string,
+    item_title: _propTypes.default.string
+  }),
+  scores: _propTypes.default.shape({
+    difficulty_index: _propTypes.default.number,
+    discrimination_index: _propTypes.default.number,
+    mean: _propTypes.default.number,
+    median: _propTypes.default.number,
+    pearson_correlation: _propTypes.default.number,
+    points_possible: _propTypes.default.number,
+    quartile_distribution: _propTypes.default.arrayOf(_propTypes.default.number)
+  })
+});
 
-exports.quizAnalysisPropType = quizAnalysisPropType;
+exports.itemAnalysisPropType = itemAnalysisPropType;

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

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mapStateToProps = mapStateToProps;
+exports.default = exports.withAnalysisState = void 0;
+
+var _withAnalysisStatePresenter = require("./withAnalysisStatePresenter.js");
+
+var _analyses = require("../../../../common/selectors/analyses.js");
+
+var _analyses2 = require("../../../../common/actions/analyses.js");
+
+var _newQuizAnalysis = require("../../../api/newQuizAnalysis.js");
+
+var _newItemAnalyses = require("../../../api/newItemAnalyses.js");
+
+var _reactRedux = require("../../../../common/react-redux.js");
+
+var _redux = require("redux");
+
+function mapStateToProps(state) {
+  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
+  };
+}
+
+var mapDispatchToProps = {
+  setQuizAnalysis: _analyses2.setQuizAnalysis,
+  setItemAnalyses: _analyses2.setItemAnalyses,
+  setFetchInProgress: _analyses2.setFetchInProgress,
+  setGenerationInProgress: _analyses2.setGenerationInProgress,
+  setAnalysisError: _analyses2.setAnalysisError
+};
+var withAnalysisState = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), _withAnalysisStatePresenter.withAnalysisStatePresenter);
+exports.withAnalysisState = withAnalysisState;
+var _default = withAnalysisState;
+exports.default = _default;

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

@@ -0,0 +1,220 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.withAnalysisStatePresenter = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _propTypes2 = require("./propTypes.js");
+
+var withAnalysisStatePresenter = function withAnalysisStatePresenter(OriginalComponent) {
+  var WithAnalysisStatePresenter = function WithAnalysisStatePresenter(_ref) {
+    var quizAnalysis = _ref.quizAnalysis,
+        itemAnalyses = _ref.itemAnalyses,
+        fetchInProgress = _ref.fetchInProgress,
+        generationInProgress = _ref.generationInProgress,
+        analysisError = _ref.analysisError,
+        setQuizAnalysis = _ref.setQuizAnalysis,
+        setItemAnalyses = _ref.setItemAnalyses,
+        setFetchInProgress = _ref.setFetchInProgress,
+        setGenerationInProgress = _ref.setGenerationInProgress,
+        setAnalysisError = _ref.setAnalysisError,
+        activeQuizId = _ref.activeQuizId,
+        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"]);
+    WithAnalysisStatePresenter.displayName = "WithAnalysisStatePresenter(".concat(OriginalComponent.displayName || OriginalComponent.name, ")");
+
+    function fetchReports() {
+      return _fetchReports.apply(this, arguments);
+    }
+
+    function _fetchReports() {
+      _fetchReports = (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);
+    }
+
+    (0, _react.useEffect)(function () {
+      var fetchIfNeeded = /*#__PURE__*/function () {
+        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+          var hasStoredAnalyses;
+          return _regenerator.default.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  hasStoredAnalyses = quizAnalysis && itemAnalyses;
+
+                  if (!(!hasStoredAnalyses && !fetchInProgress)) {
+                    _context.next = 4;
+                    break;
+                  }
+
+                  _context.next = 4;
+                  return fetchReports();
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        return function fetchIfNeeded() {
+          return _ref2.apply(this, arguments);
+        };
+      }();
+
+      fetchIfNeeded();
+    }, []);
+    return /*#__PURE__*/_react.default.createElement(OriginalComponent, Object.assign({
+      quizAnalysis: quizAnalysis,
+      itemAnalyses: itemAnalyses,
+      fetchInProgress: fetchInProgress,
+      generationInProgress: generationInProgress,
+      analysisError: analysisError,
+      generateReports: generateReports
+    }, passThroughProps));
+  };
+
+  WithAnalysisStatePresenter.propTypes = {
+    quizAnalysis: _propTypes2.quizAnalysisPropType,
+    itemAnalyses: _propTypes.default.arrayOf(_propTypes2.itemAnalysisPropType),
+    fetchInProgress: _propTypes.default.bool.isRequired,
+    generationInProgress: _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,
+    activeQuizId: _propTypes.default.string.isRequired,
+    fetchQuizAnalysis: _propTypes.default.func.isRequired,
+    fetchItemAnalyses: _propTypes.default.func.isRequired,
+    // can be required after passed from LTI
+    generateReport: _propTypes.default.func
+  };
+  WithAnalysisStatePresenter.defaultProps = {
+    quizAnalysis: void 0,
+    itemAnalyses: void 0,
+    analysisError: '',
+    generateReport: Function.prototype
+  };
+  return WithAnalysisStatePresenter;
+};
+
+exports.withAnalysisStatePresenter = withAnalysisStatePresenter;

package/lib/reporting/components/resources/ReportCard/index.js

@@ -31,6 +31,10 @@ var _index = _interopRequireDefault(require("../../../../common/components/share
 
 var _theme = _interopRequireDefault(require("./theme.js"));
 
+var _uiFlex = require("@instructure/ui-flex");
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
 var _dec, _class, _class2, _temp;
 
 var styles = {
@@ -60,17 +64,25 @@ var ReportCard = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _d
           href = _this$props.href;
       return /*#__PURE__*/_react.default.createElement(_index.default, {
         className: styles.card
-      }, /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
-        href: href
       }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
         size: "medium",
         weight: "bold"
-      }, name)), /*#__PURE__*/_react.default.createElement("div", {
+      }, name), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.details
       }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
         size: "small",
         color: "secondary"
-      }, details)));
+      }, details)), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
+        direction: "row",
+        justifyItems: "end",
+        alignItems: "end",
+        height: "100%"
+      }, /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
+        href: href
+      }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
+        size: "small",
+        "data-automation": name
+      }, (0, _formatMessage.default)('View Report')))));
     }
   }]);
   ReportCard.displayName = "ReportCard";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.61.0",
+  "version": "17.61.1-rc.1+6f2ff8632",
   "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.8",
-    "@instructure/quiz-common": "^17.61.0",
-    "@instructure/quiz-i18n": "^17.61.0",
-    "@instructure/quiz-interactions": "^17.61.0",
-    "@instructure/quiz-number-input": "^17.61.0",
-    "@instructure/quiz-rce": "^17.61.0",
+    "@instructure/quiz-common": "17.61.1-rc.1+6f2ff8632",
+    "@instructure/quiz-i18n": "17.61.1-rc.1+6f2ff8632",
+    "@instructure/quiz-interactions": "17.61.1-rc.1+6f2ff8632",
+    "@instructure/quiz-number-input": "17.61.1-rc.1+6f2ff8632",
+    "@instructure/quiz-rce": "17.61.1-rc.1+6f2ff8632",
     "@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.61.0",
+    "instructure-validations": "17.61.1-rc.1+6f2ff8632",
     "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.61.0",
+    "@instructure/quiz-scripts": "17.61.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.61.0",
+    "quiz-presets": "17.61.1-rc.1+6f2ff8632",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -173,5 +173,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fab3bffde3be24175a6bab765ea425ae5b0e8d9b"
+  "gitHead": "6f2ff8632f00893795b7cd725f65a6299d5e3f49"
 }