@instructure/quiz-core 18.4.1-rc.1 → 18.4.1-rc.11

package/es/common/components/layout/sidebar/SidebarItem/presenter.js

@@ -106,7 +106,13 @@ export var SidebarItem = (_dec = themeable(theme, styles), _dec(_class = (_temp
     value: function renderButton() {
       var _this$props2 = this.props,
           displayPosition = _this$props2.displayPosition,
-          itemId = _this$props2.itemId;
+          itemId = _this$props2.itemId,
+          isAnswered = _this$props2.isAnswered;
+      var screenReaderContent = !isAnswered && isAnswered !== null ? t('Navigate to question at position {displayPosition}, unanswered', {
+        displayPosition: displayPosition
+      }) : t('Navigate to question at position {displayPosition}', {
+        displayPosition: displayPosition
+      });
       return /*#__PURE__*/React.createElement(Link, {
         href: "#",
         size: "small",
@@ -117,9 +123,7 @@ export var SidebarItem = (_dec = themeable(theme, styles), _dec(_class = (_temp
         "data-automation-item-id": itemId,
         "data-automation": "sdk-sidebar-item-button"
       }, /*#__PURE__*/React.createElement(AccessibleContent, {
-        alt: t('Navigate to question at position {displayPosition}', {
-          displayPosition: displayPosition
-        })
+        alt: screenReaderContent
       }, this.renderPosition()));
     }
   }, {
@@ -181,6 +185,7 @@ export var SidebarItem = (_dec = themeable(theme, styles), _dec(_class = (_temp
   itemBody: PropTypes.string,
   itemName: PropTypes.string.isRequired,
   inStimulus: PropTypes.bool,
+  isAnswered: PropTypes.bool,
   position: PropTypes.number.isRequired,
   pointsPossible: PropTypes.number.isRequired,
   preventScrollToItem: PropTypes.bool.isRequired,
@@ -193,6 +198,7 @@ export var SidebarItem = (_dec = themeable(theme, styles), _dec(_class = (_temp
   children: null,
   inStimulus: false,
   itemBody: '',
-  quizEntry: null
+  quizEntry: null,
+  isAnswered: null
 }, _temp)) || _class);
 export default SidebarItem;

package/es/reporting/api/getAnalysesExport.js

@@ -0,0 +1,54 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import Fetcher from "../../common/util/Fetcher.js";
+
+var getFetcher = function getFetcher(format) {
+  var mimeType = formatsToMimeTypes.get(format);
+
+  if (!mimeType) {
+    throw new Error("Unknown export format ".concat(format, "!"));
+  }
+
+  return new Fetcher({
+    headers: {
+      'Accept': mimeType
+    },
+    asyncResponseHandler: function asyncResponseHandler(response) {
+      return response;
+    }
+  });
+};
+
+export var csvFormat = 'csv';
+var formatsToMimeTypes = new Map().set(csvFormat, 'text/csv');
+export var getAnalysesExport = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(quizId, format) {
+    var filter,
+        fetcher,
+        url,
+        _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            filter = _args.length > 2 && _args[2] !== void 0 ? _args[2] : 'last_attempt';
+            fetcher = getFetcher(format);
+            url = "/api/quizzes/".concat(quizId, "/analyses/export?filter=").concat(filter);
+            _context.next = 5;
+            return fetcher.get(url);
+
+          case 5:
+            return _context.abrupt("return", _context.sent);
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getAnalysesExport(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/es/reporting/components/charts/Distribution/theme.js

@@ -6,7 +6,7 @@ export default function generator(_ref) {
     barStarFillColor: colors.fire,
     barLabelColor: colors.textDarkest,
     barLabelFontFamily: typography.fontFamily,
-    barLabelFontSize: typography.fontSizeXSmall,
+    barLabelFontSize: typography.fontSizeSmall,
     xAxisColor: colors.textDarkest
   };
 }

package/es/reporting/components/charts/QuintileDistribution/theme.js

@@ -4,6 +4,6 @@ export default function generator(_ref) {
   return {
     barLabelColor: colors.textDarkest,
     barLabelFontFamily: typography.fontFamily,
-    barLabelFontSize: typography.fontSizeXSmall
+    barLabelFontSize: typography.fontSizeSmall
   };
 }

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

@@ -5,10 +5,6 @@ import React, { Component } from 'react';
 import { PropTypes } from '@instructure/quiz-interactions';
 import { ChoiceType } from "./ChoiceType/presenter.js";
 import { answerSummaryPropType } from "../propTypes.js";
-var afsTableComponentMap = new Map();
-afsTableComponentMap.set('true-false', ChoiceType);
-afsTableComponentMap.set('choice', ChoiceType);
-afsTableComponentMap.set('multi-answer', ChoiceType);
 export var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
   _inherits(AnswerFrequencySummary, _Component);
 
@@ -24,13 +20,22 @@ export var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
+    _this.afsTableComponentMap = new Map();
+
+    _this.addAfsComponentsByFlags = function (afsFlags) {
+      if (afsFlags.formulaEnabled) {// this.afsTableComponentMap.set('formula', Formula)
+      }
+    };
 
     _this.render = function () {
       var _this$props = _this.props,
           itemId = _this$props.itemId,
           answerSummary = _this$props.answerSummary,
-          interactionType = _this$props.interactionType;
-      var AfsTableComponent = afsTableComponentMap.get(interactionType);
+          interactionType = _this$props.interactionType,
+          afsFlags = _this$props.afsFlags;
+      afsFlags && _this.addAfsComponentsByFlags(afsFlags);
+
+      var AfsTableComponent = _this.afsTableComponentMap.get(interactionType);
 
       if (!AfsTableComponent) {
         return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -42,13 +47,23 @@ export var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
       });
     };
 
+    _this.afsTableComponentMap.set('true-false', ChoiceType);
+
+    _this.afsTableComponentMap.set('choice', ChoiceType);
+
+    _this.afsTableComponentMap.set('multi-answer', ChoiceType);
+
     return _this;
   }
 
   return AnswerFrequencySummary;
 }(Component);
 AnswerFrequencySummary.propTypes = {
-  itemId: PropTypes.number,
-  answerSummary: answerSummaryPropType,
-  interactionType: PropTypes.string
+  itemId: PropTypes.number.isRequired,
+  answerSummary: answerSummaryPropType.isRequired,
+  interactionType: PropTypes.string.isRequired,
+  afsFlags: PropTypes.shape({
+    formulaEnabled: PropTypes.bool.isRequired,
+    matchingEnabled: PropTypes.bool.isRequired
+  })
 }.isRequired;

package/es/reporting/components/resources/NewQuizAndItemAnalysis/NewItemAnalysis/index.js

@@ -5,7 +5,11 @@ import { NewItemAnalysis as NewItemAnalysisPresenter } from "./presenter.js";
 function mapStateToProps(_state) {
   return {
     // This would be able to switch of all AFS Tables
-    showFrequencyTable: featureOn('show_improved_item_analysis_frequency_table')
+    showFrequencyTable: featureOn('show_improved_item_analysis_frequency_table'),
+    afsFlags: {
+      formulaEnabled: featureOn('ia_formula_afs'),
+      matchingEnabled: featureOn('ia_matching_afs')
+    }
   };
 }
 

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

@@ -37,7 +37,7 @@ import AnalysisPopoverMetric from "../AnalysisPopoverMetric/index.js";
 import classnames from 'classnames';
 import { interactionTypesNameDictionary } from "../../../../../common/util/interactionTypeMetadata.js";
 import AnswerFrequencySummary from "../AnswerFrequencySummary/index.js";
-import { itemAnalysisPropType } from "../propTypes.js";
+import { afsFlags, itemAnalysisPropType } from "../propTypes.js";
 import { Flex } from '@instructure/ui-flex';
 import { RichContentRenderer } from '@instructure/quiz-rce';
 import { ensureRCEContentIsLoaded } from "../../../../../common/util/rceChecker.js";
@@ -108,7 +108,7 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
 
     _this.renderInteractionType = function (interactionType) {
       return /*#__PURE__*/React.createElement(Text, {
-        size: "small",
+        size: "medium",
         weight: "bold",
         transform: "capitalize"
       }, _this.mapInteractionTypeToTranslation(interactionType));
@@ -201,7 +201,8 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
       }, /*#__PURE__*/React.createElement(AnswerFrequencySummary, {
         itemId: itemId,
         answerSummary: answer_summary,
-        interactionType: interactionType
+        interactionType: interactionType,
+        afsFlags: afsFlags
       }))));
     };
 
@@ -284,5 +285,6 @@ export var NewItemAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
   return NewItemAnalysis;
 }(Component), _class2.propTypes = {
   itemAnalysis: itemAnalysisPropType,
-  showFrequencyTable: PropTypes.bool.isRequired
+  showFrequencyTable: PropTypes.bool.isRequired,
+  afsFlags: afsFlags
 }.isRequired, _temp)) || _class);

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

@@ -5,7 +5,6 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 
 var _dec, _class, _class2, _temp;
 
-import { Heading } from '@instructure/ui-heading';
 import React, { Component } from 'react';
 var styles = {
   componentId: 'eHqQt',
@@ -80,21 +79,11 @@ export var NewQuizAnalysis = (_dec = themeable(theme, styles), _dec(_class = (_t
     _this.renderContent = function () {
       var quizAnalysis = _this.props.quizAnalysis;
       var scores = quizAnalysis.scores,
-          attempts = quizAnalysis.attempts,
-          metadata = quizAnalysis.metadata;
+          attempts = quizAnalysis.attempts;
       var expanded = _this.state.expanded;
       return /*#__PURE__*/React.createElement(Card, {
         className: styles.cardWrapper
       }, /*#__PURE__*/React.createElement("div", {
-        className: styles.heading
-      }, /*#__PURE__*/React.createElement(Heading, {
-        level: "h2",
-        theme: {
-          h2FontWeight: 700
-        },
-        margin: "0 x-large 0 0",
-        color: "primary"
-      }, t('Quiz summary:'), " ", metadata === null || metadata === void 0 ? void 0 : metadata.quiz_title)), /*#__PURE__*/React.createElement("div", {
         className: styles.metricGroup
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.metricsWrapper

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

@@ -47,6 +47,9 @@ export var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component)
       var itemAnalyses = _this.props.itemAnalyses || [];
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Heading, {
         level: "h2",
+        theme: {
+          h2FontWeight: 700
+        },
         color: "primary"
       }, t('Item Analysis')), /*#__PURE__*/React.createElement("div", null, itemAnalyses.map(function (itemAnalysis) {
         return /*#__PURE__*/React.createElement(NewItemAnalysis, {
@@ -85,6 +88,27 @@ export var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component)
       }, getFailedToFetchReports())));
     };
 
+    _this.renderHeader = function () {
+      var _quizAnalysis$metadat;
+
+      var quizAnalysis = _this.props.quizAnalysis;
+      return /*#__PURE__*/React.createElement(Flex, {
+        alignItems: "center",
+        width: "auto",
+        margin: "auto",
+        direction: "column"
+      }, /*#__PURE__*/React.createElement(Flex.Item, {
+        overflowY: "hidden"
+      }, /*#__PURE__*/React.createElement(Heading, {
+        level: "h2",
+        theme: {
+          h2FontWeight: 700
+        },
+        margin: "0 x-large 0 0",
+        color: "primary"
+      }, quizAnalysis === null || quizAnalysis === void 0 ? void 0 : (_quizAnalysis$metadat = quizAnalysis.metadata) === null || _quizAnalysis$metadat === void 0 ? void 0 : _quizAnalysis$metadat.quiz_title)));
+    };
+
     _this.renderTop = function () {
       var _this$props = _this.props,
           analysisError = _this$props.analysisError,
@@ -92,19 +116,28 @@ export var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component)
           quizAnalysis = _this$props.quizAnalysis;
       var shouldShowError = analysisError && !generationInProgress;
       return /*#__PURE__*/React.createElement(Flex, {
-        alignItems: "end",
-        width: "82.5rem",
+        justifyItems: "space-between",
+        alignItems: "center",
+        wrap: "wrap",
+        width: "auto",
         margin: "auto",
-        direction: "column"
+        direction: "row"
+      }, /*#__PURE__*/React.createElement(Flex.Item, null, _this.renderHeader()), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(Flex, {
+        alignItems: "center",
+        width: "auto",
+        margin: "auto",
+        direction: "row"
       }, /*#__PURE__*/React.createElement(Flex.Item, {
+        margin: "small"
+      }, /*#__PURE__*/React.createElement(AnalysisUpdateDate, {
+        date: quizAnalysis === null || quizAnalysis === void 0 ? void 0 : quizAnalysis.created_timestamp
+      })), /*#__PURE__*/React.createElement(Flex.Item, {
         overflowY: "visible"
       }, _this.renderGenerationButton()), /*#__PURE__*/React.createElement(Flex.Item, null, shouldShowError && /*#__PURE__*/React.createElement(Text, {
         size: "x-small",
         weight: "bold",
         color: "danger"
-      }, analysisError)), /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(AnalysisUpdateDate, {
-        date: quizAnalysis === null || quizAnalysis === void 0 ? void 0 : quizAnalysis.created_timestamp
-      })));
+      }, analysisError)))));
     };
 
     _this.renderTopOnFailedFetch = function () {
@@ -148,10 +181,7 @@ export var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component)
     _this.renderGenerationButton = function () {
       var generationInProgress = _this.props.generationInProgress;
       var buttonVariant = generationInProgress ? _this.renderOngoingGenerationButton() : _this.renderStartGenerationButton();
-      return /*#__PURE__*/React.createElement(Flex.Item, {
-        align: "end",
-        padding: "xx-small"
-      }, buttonVariant);
+      return /*#__PURE__*/React.createElement(React.Fragment, null, buttonVariant);
     };
 
     _this.renderBody = function () {

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

@@ -56,4 +56,8 @@ export var choiceTypeAnswerSummaryPropType = PropTypes.shape({
   })),
   no_answer: noAnswerPropType
 });
-export var answerSummaryPropType = PropTypes.oneOfType([choiceTypeAnswerSummaryPropType]);
+export var answerSummaryPropType = PropTypes.oneOfType([choiceTypeAnswerSummaryPropType]);
+export var afsFlags = PropTypes.shape({
+  formulaEnabled: PropTypes.bool.isRequired,
+  matchingEnabled: PropTypes.bool.isRequired
+});

package/lib/common/components/layout/sidebar/SidebarItem/presenter.js

@@ -133,7 +133,13 @@ var SidebarItem = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
     value: function renderButton() {
       var _this$props2 = this.props,
           displayPosition = _this$props2.displayPosition,
-          itemId = _this$props2.itemId;
+          itemId = _this$props2.itemId,
+          isAnswered = _this$props2.isAnswered;
+      var screenReaderContent = !isAnswered && isAnswered !== null ? (0, _formatMessage.default)('Navigate to question at position {displayPosition}, unanswered', {
+        displayPosition: displayPosition
+      }) : (0, _formatMessage.default)('Navigate to question at position {displayPosition}', {
+        displayPosition: displayPosition
+      });
       return /*#__PURE__*/_react.default.createElement(_uiLink.Link, {
         href: "#",
         size: "small",
@@ -144,9 +150,7 @@ var SidebarItem = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
         "data-automation-item-id": itemId,
         "data-automation": "sdk-sidebar-item-button"
       }, /*#__PURE__*/_react.default.createElement(_uiA11yContent.AccessibleContent, {
-        alt: (0, _formatMessage.default)('Navigate to question at position {displayPosition}', {
-          displayPosition: displayPosition
-        })
+        alt: screenReaderContent
       }, this.renderPosition()));
     }
   }, {
@@ -207,6 +211,7 @@ var SidebarItem = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   itemBody: _propTypes.default.string,
   itemName: _propTypes.default.string.isRequired,
   inStimulus: _propTypes.default.bool,
+  isAnswered: _propTypes.default.bool,
   position: _propTypes.default.number.isRequired,
   pointsPossible: _propTypes.default.number.isRequired,
   preventScrollToItem: _propTypes.default.bool.isRequired,
@@ -219,7 +224,8 @@ var SidebarItem = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   children: null,
   inStimulus: false,
   itemBody: '',
-  quizEntry: null
+  quizEntry: null,
+  isAnswered: null
 }, _temp)) || _class);
 exports.SidebarItem = SidebarItem;
 var _default = SidebarItem;

package/lib/reporting/api/getAnalysesExport.js

@@ -0,0 +1,69 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAnalysesExport = exports.csvFormat = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _Fetcher = _interopRequireDefault(require("../../common/util/Fetcher.js"));
+
+var getFetcher = function getFetcher(format) {
+  var mimeType = formatsToMimeTypes.get(format);
+
+  if (!mimeType) {
+    throw new Error("Unknown export format ".concat(format, "!"));
+  }
+
+  return new _Fetcher.default({
+    headers: {
+      'Accept': mimeType
+    },
+    asyncResponseHandler: function asyncResponseHandler(response) {
+      return response;
+    }
+  });
+};
+
+var csvFormat = 'csv';
+exports.csvFormat = csvFormat;
+var formatsToMimeTypes = new Map().set(csvFormat, 'text/csv');
+
+var getAnalysesExport = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(quizId, format) {
+    var filter,
+        fetcher,
+        url,
+        _args = arguments;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            filter = _args.length > 2 && _args[2] !== void 0 ? _args[2] : 'last_attempt';
+            fetcher = getFetcher(format);
+            url = "/api/quizzes/".concat(quizId, "/analyses/export?filter=").concat(filter);
+            _context.next = 5;
+            return fetcher.get(url);
+
+          case 5:
+            return _context.abrupt("return", _context.sent);
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getAnalysesExport(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.getAnalysesExport = getAnalysesExport;

package/lib/reporting/components/charts/Distribution/theme.js

@@ -13,7 +13,7 @@ function generator(_ref) {
     barStarFillColor: colors.fire,
     barLabelColor: colors.textDarkest,
     barLabelFontFamily: typography.fontFamily,
-    barLabelFontSize: typography.fontSizeXSmall,
+    barLabelFontSize: typography.fontSizeSmall,
     xAxisColor: colors.textDarkest
   };
 }

package/lib/reporting/components/charts/QuintileDistribution/theme.js

@@ -11,6 +11,6 @@ function generator(_ref) {
   return {
     barLabelColor: colors.textDarkest,
     barLabelFontFamily: typography.fontFamily,
-    barLabelFontSize: typography.fontSizeXSmall
+    barLabelFontSize: typography.fontSizeSmall
   };
 }

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

@@ -23,11 +23,6 @@ var _presenter = require("./ChoiceType/presenter.js");
 
 var _propTypes = require("../propTypes.js");
 
-var afsTableComponentMap = new Map();
-afsTableComponentMap.set('true-false', _presenter.ChoiceType);
-afsTableComponentMap.set('choice', _presenter.ChoiceType);
-afsTableComponentMap.set('multi-answer', _presenter.ChoiceType);
-
 var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(AnswerFrequencySummary, _Component);
 
@@ -43,13 +38,22 @@ var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
+    _this.afsTableComponentMap = new Map();
+
+    _this.addAfsComponentsByFlags = function (afsFlags) {
+      if (afsFlags.formulaEnabled) {// this.afsTableComponentMap.set('formula', Formula)
+      }
+    };
 
     _this.render = function () {
       var _this$props = _this.props,
           itemId = _this$props.itemId,
           answerSummary = _this$props.answerSummary,
-          interactionType = _this$props.interactionType;
-      var AfsTableComponent = afsTableComponentMap.get(interactionType);
+          interactionType = _this$props.interactionType,
+          afsFlags = _this$props.afsFlags;
+      afsFlags && _this.addAfsComponentsByFlags(afsFlags);
+
+      var AfsTableComponent = _this.afsTableComponentMap.get(interactionType);
 
       if (!AfsTableComponent) {
         return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
@@ -61,6 +65,12 @@ var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
       });
     };
 
+    _this.afsTableComponentMap.set('true-false', _presenter.ChoiceType);
+
+    _this.afsTableComponentMap.set('choice', _presenter.ChoiceType);
+
+    _this.afsTableComponentMap.set('multi-answer', _presenter.ChoiceType);
+
     return _this;
   }
 
@@ -69,7 +79,11 @@ var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
 
 exports.AnswerFrequencySummary = AnswerFrequencySummary;
 AnswerFrequencySummary.propTypes = {
-  itemId: _quizInteractions.PropTypes.number,
-  answerSummary: _propTypes.answerSummaryPropType,
-  interactionType: _quizInteractions.PropTypes.string
+  itemId: _quizInteractions.PropTypes.number.isRequired,
+  answerSummary: _propTypes.answerSummaryPropType.isRequired,
+  interactionType: _quizInteractions.PropTypes.string.isRequired,
+  afsFlags: _quizInteractions.PropTypes.shape({
+    formulaEnabled: _quizInteractions.PropTypes.bool.isRequired,
+    matchingEnabled: _quizInteractions.PropTypes.bool.isRequired
+  })
 }.isRequired;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/NewItemAnalysis/index.js

@@ -14,7 +14,11 @@ var _presenter = require("./presenter.js");
 function mapStateToProps(_state) {
   return {
     // This would be able to switch of all AFS Tables
-    showFrequencyTable: (0, _featureCheck.featureOn)('show_improved_item_analysis_frequency_table')
+    showFrequencyTable: (0, _featureCheck.featureOn)('show_improved_item_analysis_frequency_table'),
+    afsFlags: {
+      formulaEnabled: (0, _featureCheck.featureOn)('ia_formula_afs'),
+      matchingEnabled: (0, _featureCheck.featureOn)('ia_matching_afs')
+    }
   };
 }
 

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

@@ -143,7 +143,7 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
 
     _this.renderInteractionType = function (interactionType) {
       return /*#__PURE__*/_react.default.createElement(_uiText.Text, {
-        size: "small",
+        size: "medium",
         weight: "bold",
         transform: "capitalize"
       }, _this.mapInteractionTypeToTranslation(interactionType));
@@ -236,7 +236,8 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
       }, /*#__PURE__*/_react.default.createElement(_index5.default, {
         itemId: itemId,
         answerSummary: answer_summary,
-        interactionType: interactionType
+        interactionType: interactionType,
+        afsFlags: _propTypes.afsFlags
       }))));
     };
 
@@ -318,6 +319,7 @@ var NewItemAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   return NewItemAnalysis;
 }(_react.Component), _class2.propTypes = {
   itemAnalysis: _propTypes.itemAnalysisPropType,
-  showFrequencyTable: _quizInteractions.PropTypes.bool.isRequired
+  showFrequencyTable: _quizInteractions.PropTypes.bool.isRequired,
+  afsFlags: _propTypes.afsFlags
 }.isRequired, _temp)) || _class);
 exports.NewItemAnalysis = NewItemAnalysis;

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

@@ -17,8 +17,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 
-var _uiHeading = require("@instructure/ui-heading");
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -109,21 +107,11 @@ var NewQuizAnalysis = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
     _this.renderContent = function () {
       var quizAnalysis = _this.props.quizAnalysis;
       var scores = quizAnalysis.scores,
-          attempts = quizAnalysis.attempts,
-          metadata = quizAnalysis.metadata;
+          attempts = quizAnalysis.attempts;
       var expanded = _this.state.expanded;
       return /*#__PURE__*/_react.default.createElement(_index2.default, {
         className: styles.cardWrapper
       }, /*#__PURE__*/_react.default.createElement("div", {
-        className: styles.heading
-      }, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
-        level: "h2",
-        theme: {
-          h2FontWeight: 700
-        },
-        margin: "0 x-large 0 0",
-        color: "primary"
-      }, (0, _formatMessage.default)('Quiz summary:'), " ", metadata === null || metadata === void 0 ? void 0 : metadata.quiz_title)), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.metricGroup
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: styles.metricsWrapper

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

@@ -78,6 +78,9 @@ var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component) {
       var itemAnalyses = _this.props.itemAnalyses || [];
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
         level: "h2",
+        theme: {
+          h2FontWeight: 700
+        },
         color: "primary"
       }, (0, _formatMessage.default)('Item Analysis')), /*#__PURE__*/_react.default.createElement("div", null, itemAnalyses.map(function (itemAnalysis) {
         return /*#__PURE__*/_react.default.createElement(_index.default, {
@@ -116,6 +119,27 @@ var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component) {
       }, (0, _errorMessages.getFailedToFetchReports)())));
     };
 
+    _this.renderHeader = function () {
+      var _quizAnalysis$metadat;
+
+      var quizAnalysis = _this.props.quizAnalysis;
+      return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
+        alignItems: "center",
+        width: "auto",
+        margin: "auto",
+        direction: "column"
+      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+        overflowY: "hidden"
+      }, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
+        level: "h2",
+        theme: {
+          h2FontWeight: 700
+        },
+        margin: "0 x-large 0 0",
+        color: "primary"
+      }, quizAnalysis === null || quizAnalysis === void 0 ? void 0 : (_quizAnalysis$metadat = quizAnalysis.metadata) === null || _quizAnalysis$metadat === void 0 ? void 0 : _quizAnalysis$metadat.quiz_title)));
+    };
+
     _this.renderTop = function () {
       var _this$props = _this.props,
           analysisError = _this$props.analysisError,
@@ -123,19 +147,28 @@ var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component) {
           quizAnalysis = _this$props.quizAnalysis;
       var shouldShowError = analysisError && !generationInProgress;
       return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
-        alignItems: "end",
-        width: "82.5rem",
+        justifyItems: "space-between",
+        alignItems: "center",
+        wrap: "wrap",
+        width: "auto",
         margin: "auto",
-        direction: "column"
+        direction: "row"
+      }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, _this.renderHeader()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
+        alignItems: "center",
+        width: "auto",
+        margin: "auto",
+        direction: "row"
       }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+        margin: "small"
+      }, /*#__PURE__*/_react.default.createElement(_index3.AnalysisUpdateDate, {
+        date: quizAnalysis === null || quizAnalysis === void 0 ? void 0 : quizAnalysis.created_timestamp
+      })), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
         overflowY: "visible"
       }, _this.renderGenerationButton()), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, shouldShowError && /*#__PURE__*/_react.default.createElement(_uiText.Text, {
         size: "x-small",
         weight: "bold",
         color: "danger"
-      }, analysisError)), /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, /*#__PURE__*/_react.default.createElement(_index3.AnalysisUpdateDate, {
-        date: quizAnalysis === null || quizAnalysis === void 0 ? void 0 : quizAnalysis.created_timestamp
-      })));
+      }, analysisError)))));
     };
 
     _this.renderTopOnFailedFetch = function () {
@@ -179,10 +212,7 @@ var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/function (_Component) {
     _this.renderGenerationButton = function () {
       var generationInProgress = _this.props.generationInProgress;
       var buttonVariant = generationInProgress ? _this.renderOngoingGenerationButton() : _this.renderStartGenerationButton();
-      return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
-        align: "end",
-        padding: "xx-small"
-      }, buttonVariant);
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, buttonVariant);
     };
 
     _this.renderBody = function () {

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.answerSummaryPropType = exports.choiceTypeAnswerSummaryPropType = exports.itemAnalysisPropType = exports.quizAnalysisPropType = void 0;
+exports.afsFlags = exports.answerSummaryPropType = exports.choiceTypeAnswerSummaryPropType = exports.itemAnalysisPropType = exports.quizAnalysisPropType = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -78,4 +78,11 @@ exports.choiceTypeAnswerSummaryPropType = choiceTypeAnswerSummaryPropType;
 
 var answerSummaryPropType = _propTypes.default.oneOfType([choiceTypeAnswerSummaryPropType]);
 
-exports.answerSummaryPropType = answerSummaryPropType;
+exports.answerSummaryPropType = answerSummaryPropType;
+
+var afsFlags = _propTypes.default.shape({
+  formulaEnabled: _propTypes.default.bool.isRequired,
+  matchingEnabled: _propTypes.default.bool.isRequired
+});
+
+exports.afsFlags = afsFlags;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "18.4.1-rc.1+5a3c477b4",
+  "version": "18.4.1-rc.11+23aa7bfcf",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -43,11 +43,11 @@
   "dependencies": {
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^2.1.9",
-    "@instructure/quiz-common": "18.4.1-rc.1+5a3c477b4",
-    "@instructure/quiz-i18n": "18.4.1-rc.1+5a3c477b4",
-    "@instructure/quiz-interactions": "18.4.1-rc.1+5a3c477b4",
-    "@instructure/quiz-number-input": "18.4.1-rc.1+5a3c477b4",
-    "@instructure/quiz-rce": "18.4.1-rc.1+5a3c477b4",
+    "@instructure/quiz-common": "18.4.1-rc.11+23aa7bfcf",
+    "@instructure/quiz-i18n": "18.4.1-rc.11+23aa7bfcf",
+    "@instructure/quiz-interactions": "18.4.1-rc.11+23aa7bfcf",
+    "@instructure/quiz-number-input": "18.4.1-rc.11+23aa7bfcf",
+    "@instructure/quiz-rce": "18.4.1-rc.11+23aa7bfcf",
     "@instructure/ui-a11y-content": "^7.22.1",
     "@instructure/ui-alerts": "^7.22.1",
     "@instructure/ui-avatar": "^7.22.1",
@@ -108,7 +108,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "18.4.1-rc.1+5a3c477b4",
+    "instructure-validations": "18.4.1-rc.11+23aa7bfcf",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -159,7 +159,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "18.4.1-rc.1+5a3c477b4",
+    "quiz-presets": "18.4.1-rc.11+23aa7bfcf",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -175,5 +175,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5a3c477b41024fbbf8b9528853cc85b019d8a6a8"
+  "gitHead": "23aa7bfcf74094cb7d122978bec96551d4b84b27"
 }

package/es/reporting/api/newItemAnalyses.js

@@ -1,38 +0,0 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-export var getItemAnalyses = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(quizId) {
-    var response;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return fetch("http://".concat(window.ENV.API_HOST, "/api/quizzes/").concat(quizId, "/stats/new_item_analyses"));
-
-          case 3:
-            response = _context.sent;
-            _context.next = 6;
-            return response.json();
-
-          case 6:
-            return _context.abrupt("return", _context.sent);
-
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](0);
-            console.error(_context.t0);
-
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[0, 9]]);
-  }));
-
-  return function getItemAnalyses(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();

package/es/reporting/api/newQuizAnalysis.js

@@ -1,38 +0,0 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-export var getQuizAnalysis = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(quizId) {
-    var response;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return fetch("http://".concat(window.ENV.API_HOST, "/api/quizzes/").concat(quizId, "/stats/new_quiz_analysis"));
-
-          case 3:
-            response = _context.sent;
-            _context.next = 6;
-            return response.json();
-
-          case 6:
-            return _context.abrupt("return", _context.sent);
-
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](0);
-            console.error(_context.t0);
-
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[0, 9]]);
-  }));
-
-  return function getQuizAnalysis(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();

package/lib/reporting/api/newItemAnalyses.js

@@ -1,51 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getItemAnalyses = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var getItemAnalyses = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(quizId) {
-    var response;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return fetch("http://".concat(window.ENV.API_HOST, "/api/quizzes/").concat(quizId, "/stats/new_item_analyses"));
-
-          case 3:
-            response = _context.sent;
-            _context.next = 6;
-            return response.json();
-
-          case 6:
-            return _context.abrupt("return", _context.sent);
-
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](0);
-            console.error(_context.t0);
-
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[0, 9]]);
-  }));
-
-  return function getItemAnalyses(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.getItemAnalyses = getItemAnalyses;

package/lib/reporting/api/newQuizAnalysis.js

@@ -1,51 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getQuizAnalysis = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var getQuizAnalysis = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(quizId) {
-    var response;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return fetch("http://".concat(window.ENV.API_HOST, "/api/quizzes/").concat(quizId, "/stats/new_quiz_analysis"));
-
-          case 3:
-            response = _context.sent;
-            _context.next = 6;
-            return response.json();
-
-          case 6:
-            return _context.abrupt("return", _context.sent);
-
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](0);
-            console.error(_context.t0);
-
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[0, 9]]);
-  }));
-
-  return function getQuizAnalysis(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.getQuizAnalysis = getQuizAnalysis;