@instructure/quiz-core 17.58.2-rc.6 → 17.58.2-rc.7

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

@@ -19,8 +19,6 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _uiHeading = require("@instructure/ui-heading");
 
-var _uiMetric = require("@instructure/ui-metric");
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -33,43 +31,39 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _theme = _interopRequireDefault(require("./theme.js"));
 
-var _utils = require("../utils.js");
-
-var _index2 = _interopRequireDefault(require("../MetricPopover/index.js"));
-
 var _formatTimespan = require("../../../../../common/util/formatTimespan.js");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _index3 = _interopRequireDefault(require("../../../../../common/components/shared/Card/index.js"));
+var _index2 = _interopRequireDefault(require("../../../../../common/components/shared/Card/index.js"));
+
+var _index3 = _interopRequireDefault(require("../AnalysisPopoverMetric/index.js"));
+
+var _index4 = _interopRequireDefault(require("../AnalysisMetric/index.js"));
 
 var _presenter = require("../charts/ScoreDistribution/presenter.js");
 
 var _dec, _class, _class2, _temp;
 
 var styles = {
-  componentId: 'bsfUh',
+  componentId: 'ePPpE',
   template: function template(theme) {
-    return "\n\n.bsfUh_eDnN{display:flex;justify-content:space-between;padding-bottom:".concat(theme.headingPadding || 'inherit', "}\n\n.bsfUh_eKXQ{padding:").concat(theme.cardWrapperPadding || 'inherit', ";position:relative}\n\n.bsfUh_crZr{padding-top:").concat(theme.metricGroupPaddingTop || 'inherit', "}\n\n.bsfUh_eckF{text-transform:uppercase}\n\n.bsfUh_dPzc,.bsfUh_cpZE{column-gap:").concat(theme.metricsColumnGap || 'inherit', ";display:flex;flex-wrap:wrap;justify-content:flex-start;row-gap:1.5rem}\n\n.bsfUh_dPzc{margin-left:-8px}\n\n.bsfUh_dqHR{padding-left:5px}\n\n.bsfUh_bTHH{position:absolute;right:").concat(theme.viewPadding || 'inherit', ";top:").concat(theme.viewPadding || 'inherit', "}");
+    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}");
   },
-  'heading': 'bsfUh_eDnN',
-  'cardWrapper': 'bsfUh_eKXQ',
-  'container': 'bsfUh_crZr',
-  'metricLabel': 'bsfUh_eckF',
-  'metricGroup': 'bsfUh_dPzc',
-  'metricsWrapper': 'bsfUh_cpZE',
-  'popoverContainer': 'bsfUh_dqHR',
-  'expandButtonContainer': 'bsfUh_bTHH'
+  'heading': 'ePPpE_eDnN',
+  'cardWrapper': 'ePPpE_eKXQ',
+  'container': 'ePPpE_crZr',
+  'expandButtonContainer': 'ePPpE_bTHH',
+  'metricGroup': 'ePPpE_dPzc',
+  'metricsWrapper': 'ePPpE_cpZE'
 };
 var stdDevPopoverTexts = {
-  metricLabel: 'standard deviation',
   title: 'Lorem ipsum ',
   subtitle: 'subtitle',
   body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor',
   screenReaderLabel: 'standard deviation tooltip'
 };
 var cronbachsAlphaPopoverTexts = {
-  metricLabel: 'cronbach\'s alpha',
   title: 'Lorem ipsum ',
   subtitle: 'subtitle',
   body: 'cronbach\'s alpha description',
@@ -109,50 +103,28 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         className: styles.container
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.metricGroup
-      }, _this.renderMetric('median_percentage', (0, _formatMessage.default)('median score'), _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.median_percentage), '%'), _this.renderMetricWithPopover('stddev', stdDevPopoverTexts, _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.stddev)), _this.renderMetricWithPopover('cronbachs_alpha', cronbachsAlphaPopoverTexts, _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.cronbachs_alpha))));
+      }, /*#__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, {
+        metricKey: "stddev",
+        value: _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.stddev),
+        label: (0, _formatMessage.default)('Standard Deviation'),
+        popoverDescription: stdDevPopoverTexts
+      }), /*#__PURE__*/_react.default.createElement(_index3.default, {
+        metricKey: "cronbachs_alpha",
+        value: _formatMessage.default.number(scores === null || scores === void 0 ? void 0 : scores.cronbachs_alpha),
+        label: (0, _formatMessage.default)('Cronbach\'s Alpha'),
+        popoverDescription: cronbachsAlphaPopoverTexts
+      })));
     };
 
     return _this;
   }
 
   (0, _createClass2.default)(NewQuizAnalysis, [{
-    key: "renderLabelWithPopover",
-    value: function renderLabelWithPopover(texts) {
-      return /*#__PURE__*/_react.default.createElement("span", {
-        className: styles.metricLabel
-      }, texts.metricLabel, /*#__PURE__*/_react.default.createElement("span", {
-        className: styles.popoverContainer
-      }, /*#__PURE__*/_react.default.createElement(_index2.default, texts)));
-    }
-  }, {
-    key: "renderMetric",
-    value: function renderMetric(key, label, value, suffix) {
-      return /*#__PURE__*/_react.default.createElement(_uiMetric.Metric, {
-        theme: {
-          valueFontWeight: 500
-        },
-        textAlign: "start",
-        key: key,
-        renderLabel: /*#__PURE__*/_react.default.createElement("span", {
-          className: styles.metricLabel
-        }, label),
-        renderValue: (0, _utils.getSanitizedMetricValue)(value, suffix)
-      });
-    }
-  }, {
-    key: "renderMetricWithPopover",
-    value: function renderMetricWithPopover(key, texts, value) {
-      return /*#__PURE__*/_react.default.createElement(_uiMetric.Metric, {
-        theme: {
-          valueFontWeight: 500
-        },
-        textAlign: "start",
-        key: key,
-        renderLabel: this.renderLabelWithPopover(texts),
-        renderValue: (0, _utils.getSanitizedMetricValue)(value)
-      });
-    }
-  }, {
     key: "render",
     value: function render() {
       var quizAnalysis = this.props.quizAnalysis;
@@ -160,7 +132,7 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
           attempts = quizAnalysis.attempts,
           metadata = quizAnalysis.metadata;
       var expanded = this.state.expanded;
-      return /*#__PURE__*/_react.default.createElement(_index3.default, {
+      return /*#__PURE__*/_react.default.createElement(_index2.default, {
         className: styles.cardWrapper
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.heading
@@ -171,9 +143,32 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         className: styles.metricGroup
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.metricsWrapper
-      }, this.renderMetric('highscore', (0, _formatMessage.default)('high score'), scores === null || scores === void 0 ? void 0 : scores.max_percentage, '%'), this.renderMetric('lowscore', (0, _formatMessage.default)('low score'), scores === null || scores === void 0 ? void 0 : scores.min_percentage, '%'), this.renderMetric('meanscore', (0, _formatMessage.default)('mean score'), scores === null || scores === void 0 ? void 0 : scores.mean_percentage, '%')), /*#__PURE__*/_react.default.createElement("div", {
+      }, /*#__PURE__*/_react.default.createElement(_index4.default, {
+        metricKey: "highscore",
+        label: (0, _formatMessage.default)('high score'),
+        value: scores === null || scores === void 0 ? void 0 : scores.max_percentage,
+        suffix: "%"
+      }), /*#__PURE__*/_react.default.createElement(_index4.default, {
+        metricKey: "lowscore",
+        label: (0, _formatMessage.default)('low score'),
+        value: scores === null || scores === void 0 ? void 0 : scores.min_percentage,
+        suffix: "%"
+      }), /*#__PURE__*/_react.default.createElement(_index4.default, {
+        metricKey: "meanscore",
+        label: (0, _formatMessage.default)('mean score'),
+        value: scores === null || scores === void 0 ? void 0 : scores.mean_percentage,
+        suffix: "%"
+      })), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.metricsWrapper
-      }, this.renderMetric('average_attempts', (0, _formatMessage.default)('average attempts'), _formatMessage.default.number(attempts === null || attempts === void 0 ? void 0 : attempts.average_attempts)), this.renderMetric('mean_elapsed_sec', (0, _formatMessage.default)('mean elapsed time'), (0, _formatTimespan.formatTimeToFullNumeric)(attempts === null || attempts === void 0 ? void 0 : attempts.mean_elapsed_sec))), /*#__PURE__*/_react.default.createElement("div", {
+      }, /*#__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)
+      }), /*#__PURE__*/_react.default.createElement(_index4.default, {
+        metricKey: "mean_elapsed_sec",
+        label: (0, _formatMessage.default)('mean elapsed time'),
+        value: (0, _formatTimespan.formatTimeToFullNumeric)(attempts === null || attempts === void 0 ? void 0 : attempts.mean_elapsed_sec)
+      })), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.expandButtonContainer
       }, /*#__PURE__*/_react.default.createElement(_index.default, {
         onClick: this.handleToggle,
@@ -190,10 +185,10 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   return NewQuizAnalysis;
 }(_react.Component), _class2.propTypes = {
   quizAnalysis: _propTypes.default.shape({
-    created_timestamp: _propTypes.default.string,
+    created_timestamp: _propTypes.default.string.isRequired,
     metadata: _propTypes.default.shape({
       quiz_title: _propTypes.default.string
-    }),
+    }).isRequired,
     scores: _propTypes.default.shape({
       decile_distribution: _propTypes.default.arrayOf(_propTypes.default.number),
       cronbachs_alpha: _propTypes.default.number,
@@ -211,5 +206,7 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
       average_attempts: _propTypes.default.number
     }).isRequired
   }).isRequired
+}, _class2.defaultProps = {
+  quizAnalysis: {}
 }, _temp)) || _class);
 exports.NewQuizAnalysis = NewQuizAnalysis;

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

@@ -21,11 +21,11 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _uiHeading = require("@instructure/ui-heading");
 
-var _uiMetric = require("@instructure/ui-metric");
+var _index = _interopRequireDefault(require("./NewItemAnalysis/index.js"));
 
 var _Spinner = _interopRequireDefault(require("../../../../common/components/shared/spinner/Spinner.js"));
 
-var _index = _interopRequireDefault(require("./NewQuizAnalysis/index.js"));
+var _index2 = _interopRequireDefault(require("./NewQuizAnalysis/index.js"));
 
 var _ref5 = /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
   level: "h3",
@@ -116,7 +116,7 @@ var NewQuizAndItemAnalysis = function NewQuizAndItemAnalysis(_ref) {
     fetch();
   }, []);
 
-  var _ref4 = /*#__PURE__*/_react.default.createElement(_index.default, {
+  var _ref4 = /*#__PURE__*/_react.default.createElement(_index2.default, {
     quizAnalysis: quizAnalysis
   });
 
@@ -125,21 +125,10 @@ var NewQuizAndItemAnalysis = function NewQuizAndItemAnalysis(_ref) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "fs-mask"
     }, _ref4, _ref5, itemAnalyses === null || itemAnalyses === void 0 ? void 0 : itemAnalyses.map(function (itemAnalysis) {
-      return /*#__PURE__*/_react.default.createElement(_uiMetric.MetricGroup, {
-        key: itemAnalysis.metadata.item_id
-      }, /*#__PURE__*/_react.default.createElement(_uiMetric.Metric, {
-        key: "itemdifficulty",
-        renderLabel: "ITEM DIFFICULTY",
-        renderValue: itemAnalysis.scores.difficulty_index
-      }), /*#__PURE__*/_react.default.createElement(_uiMetric.Metric, {
-        key: "responded",
-        renderLabel: "RESPONDED",
-        renderValue: itemAnalysis.attempts.students_responded
-      }), /*#__PURE__*/_react.default.createElement(_uiMetric.Metric, {
-        key: "skipped",
-        renderLabel: "SKIPPED/NO RESPONSE",
-        renderValue: itemAnalysis.attempts.students_without_response
-      }));
+      return /*#__PURE__*/_react.default.createElement(_index.default, {
+        key: itemAnalysis.metadata.item_id,
+        itemAnalysis: itemAnalysis
+      });
     }));
     /* eslint-enable react/jsx-no-literals */
   }; // TODO: distinguish between loading and empty item analyses (eg. when there is no items in a quiz)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.58.2-rc.6+2291f061e",
+  "version": "17.58.2-rc.7+623c562cd",
   "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.58.2-rc.6+2291f061e",
-    "@instructure/quiz-i18n": "17.58.2-rc.6+2291f061e",
-    "@instructure/quiz-interactions": "17.58.2-rc.6+2291f061e",
-    "@instructure/quiz-number-input": "17.58.2-rc.6+2291f061e",
-    "@instructure/quiz-rce": "17.58.2-rc.6+2291f061e",
+    "@instructure/quiz-common": "17.58.2-rc.7+623c562cd",
+    "@instructure/quiz-i18n": "17.58.2-rc.7+623c562cd",
+    "@instructure/quiz-interactions": "17.58.2-rc.7+623c562cd",
+    "@instructure/quiz-number-input": "17.58.2-rc.7+623c562cd",
+    "@instructure/quiz-rce": "17.58.2-rc.7+623c562cd",
     "@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.58.2-rc.6+2291f061e",
+    "instructure-validations": "17.58.2-rc.7+623c562cd",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.58.2-rc.6+2291f061e",
+    "quiz-presets": "17.58.2-rc.7+623c562cd",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2291f061ed85f10cd0648eef4a254b8b2975fb50"
+  "gitHead": "623c562cd0e8f4d89e5c5480e383e8c8ddc01546"
 }