@instructure/outcomes-ui 2.1.7 → 2.1.9

package/lib/translated/vi/components/OutcomeTray/OutcomeList/index.js

@@ -47,7 +47,8 @@ var OutcomeList = /*#__PURE__*/function (_React$Component) {
           outcomes = _this$props.outcomes,
           isOutcomeSelected = _this$props.isOutcomeSelected,
           selectOutcomeIds = _this$props.selectOutcomeIds,
-          deselectOutcomeIds = _this$props.deselectOutcomeIds;
+          deselectOutcomeIds = _this$props.deselectOutcomeIds,
+          features = _this$props.features;
       return outcomes.map(function (outcome) {
         return /*#__PURE__*/_react.default.createElement("div", {
           key: outcome.id
@@ -56,7 +57,8 @@ var OutcomeList = /*#__PURE__*/function (_React$Component) {
           isOutcomeSelected: isOutcomeSelected,
           selectOutcomeIds: selectOutcomeIds,
           deselectOutcomeIds: deselectOutcomeIds,
-          isTray: true
+          isTray: true,
+          features: features
         }));
       });
     }
@@ -116,8 +118,10 @@ OutcomeList.propTypes = {
   getOutcomesList: _propTypes.default.func.isRequired,
   isLoading: _propTypes.default.bool.isRequired,
   listPage: _propTypes.default.number.isRequired,
-  listTotal: _propTypes.default.number
+  listTotal: _propTypes.default.number,
+  features: _propTypes.default.array
 };
 OutcomeList.defaultProps = {
-  listTotal: null
+  listTotal: null,
+  features: []
 };

package/lib/translated/vi/components/OutcomeTray/index.js

@@ -95,7 +95,8 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
           isFetching = _this$props2.isFetching,
           listPage = _this$props2.listPage,
           listTotal = _this$props2.listTotal,
-          getOutcomesList = _this$props2.getOutcomesList;
+          getOutcomesList = _this$props2.getOutcomesList,
+          features = _this$props2.features;
       return /*#__PURE__*/_react.default.createElement(_uiView.View, {
         display: "block",
         padding: "small none none none"
@@ -107,7 +108,8 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
         isLoading: isFetching,
         listPage: listPage,
         listTotal: listTotal,
-        getOutcomesList: getOutcomesList
+        getOutcomesList: getOutcomesList,
+        features: features
       }));
     }
   }, {
@@ -283,7 +285,8 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   displayMasteryPercentText: _propTypes.default.bool,
   shouldModifyArtifact: _propTypes.default.bool,
   scope: _propTypes.default.string.isRequired,
-  showAlert: _propTypes.default.func
+  showAlert: _propTypes.default.func,
+  features: _propTypes.default.array
 }, _class2.defaultProps = {
   screenreaderNotification: null,
   liveRegion: null,
@@ -298,6 +301,7 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   shouldModifyArtifact: false,
   searchTotal: null,
   listTotal: null,
-  showAlert: function showAlert() {}
+  showAlert: function showAlert() {},
+  features: []
 }, _temp)) || _class);
 exports.default = OutcomeTray;

package/lib/translated/vi/components/OutcomeView/MasteryDescription/index.js

@@ -27,6 +27,8 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _shapes = require("../../../store/shapes.js");
 
+var _constants = require("../../../constants.js");
+
 var _theme = _interopRequireDefault(require("../../theme.js"));
 
 var _percent_vi_number = Intl.NumberFormat("vi", { style: "percent" }).format,
@@ -45,10 +47,29 @@ var styles = {
   'scoreMasteryText': 'outcomes-ui__MasteryDescription--scoreMasteryText'
 };
 
-var scoringText = function scoringText(scoringMethod) {
+var renderUserFacingMethod = function renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled) {
+  var legacyDecayingAverage = "M\u1EE9c Th\xE0nh Th\u1EA1o \u0111\u01B0\u1EE3c t\xEDnh to\xE1n theo c\xE1ch t\xEDnh Trung B\xECnh \u01AFu Ti\xEAn \u0110i\u1EC3m S\u1ED1 G\u1EA7n Nh\u1EA5t. C\xE1c l\u1EA7n t\xEDnh g\u1EA7n nh\u1EA5t \u0111\u01B0\u1EE3c t\xEDnh theo tr\u1ECDng s\u1ED1 th\xE0nh th\u1EA1o l\xE0 " + _percent_vi_number(scoringMethod.algorithm_data.decaying_average_percent) + ", trung b\xECnh t\u1EA5t c\u1EA3 l\u1EA7n t\xEDnh k\u1EBFt qu\u1EA3 kh\xE1c \u0111\u01B0\u1EE3c t\xEDnh theo tr\u1ECDng s\u1ED1 l\xE0 " + _percent_vi_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + ". N\u1EBFu ch\u1EC9 c\xF3 m\u1ED9t k\u1EBFt qu\u1EA3 th\xEC \u0111i\u1EC3m duy nh\u1EA5t s\u1EBD \u0111\u01B0\u1EE3c tr\u1EA3 v\u1EC1.";
+
+  if (newDecayingAvgFFEnabled) {
+    switch (scoringMethod.algorithm) {
+      case 'decaying_average':
+        return "Mastery calculated by Weighted Average. Most recent counts as " + _percent_vi_number(scoringMethod.algorithm_data.decaying_average_percent) + " of mastery weight, average of all other results count as " + _percent_vi_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + " of weight. If there is only one result, the single score will be returned.";
+
+      case 'standard_decaying_average':
+        return "Mastery calculated by Decaying Average. Between two assessments, the most recent assessment gets " + _percent_vi_number(scoringMethod.algorithm_data.standard_decaying_average_percent) + " weight, and the first gets " + _percent_vi_number(1.0 - scoringMethod.algorithm_data.standard_decaying_average_percent) + ". For each additional assessment, the sum of the previous score calculations decay by an additional " + _percent_vi_number(1.0 - scoringMethod.algorithm_data.standard_decaying_average_percent) + ". If there is only one result, the single score will be returned.";
+    }
+  } else {
+    return legacyDecayingAverage;
+  }
+};
+
+var scoringText = function scoringText(scoringMethod, newDecayingAvgFFEnabled) {
   switch (scoringMethod.algorithm) {
     case 'decaying_average':
-      return "M\u1EE9c Th\xE0nh Th\u1EA1o \u0111\u01B0\u1EE3c t\xEDnh to\xE1n theo c\xE1ch t\xEDnh Trung B\xECnh \u01AFu Ti\xEAn \u0110i\u1EC3m S\u1ED1 G\u1EA7n Nh\u1EA5t. C\xE1c l\u1EA7n t\xEDnh g\u1EA7n nh\u1EA5t \u0111\u01B0\u1EE3c t\xEDnh theo tr\u1ECDng s\u1ED1 th\xE0nh th\u1EA1o l\xE0 " + _percent_vi_number(scoringMethod.algorithm_data.decaying_average_percent) + ", trung b\xECnh t\u1EA5t c\u1EA3 l\u1EA7n t\xEDnh k\u1EBFt qu\u1EA3 kh\xE1c \u0111\u01B0\u1EE3c t\xEDnh theo tr\u1ECDng s\u1ED1 l\xE0 " + _percent_vi_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + ". N\u1EBFu ch\u1EC9 c\xF3 m\u1ED9t k\u1EBFt qu\u1EA3 th\xEC \u0111i\u1EC3m duy nh\u1EA5t s\u1EBD \u0111\u01B0\u1EE3c tr\u1EA3 v\u1EC1.";
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
+
+    case 'standard_decaying_average':
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
 
     case 'n_mastery':
       return "M\u1EE9c th\xE0nh th\u1EA1o \u0111\u01B0\u1EE3c t\xEDnh theo n S\u1ED1 L\u1EA7n. Ph\u1EA3i \u0111\u1EA1t m\u1EE9c th\xE0nh th\u1EA1o \xEDt nh\u1EA5t " + _default_vi_number(scoringMethod.algorithm_data.n_mastery_count) + " l\u1EA7n.  \u0110i\u1EC3m tr\xEAn m\u1EE9c th\xE0nh th\u1EA1o s\u1EBD \u0111\u01B0\u1EE3c t\xEDnh trung b\xECnh \u0111\u1EC3 t\xEDnh to\xE1n \u0111i\u1EC3m cu\u1ED1i c\xF9ng.";
@@ -59,6 +80,9 @@ var scoringText = function scoringText(scoringMethod) {
     case 'latest':
       return "M\u1EE9c th\xE0nh th\u1EA1o \u0111\u01B0\u1EE3c t\xEDnh theo \u0110i\u1EC3m G\u1EA7n Nh\u1EA5t. \u0110i\u1EC3m th\xE0nh th\u1EA1o th\u1EC3 hi\u1EC7n b\xE0i \u0111\xE1nh gi\xE1 \u0111\xE3 \u0111\u01B0\u1EE3c ch\u1EA5m \u0111i\u1EC3m g\u1EA7n nh\u1EA5t.";
 
+    case 'average':
+      return "Mastery reflects Average Score. Calculated by dividing the sum of all item scores by the number of scores.";
+
     default:
       return '';
   }
@@ -85,7 +109,9 @@ var MasteryDescription = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
       var _this$props = this.props,
           artifactTypeName = _this$props.artifactTypeName,
           displayMasteryPercentText = _this$props.displayMasteryPercentText,
-          scoringMethod = _this$props.scoringMethod;
+          scoringMethod = _this$props.scoringMethod,
+          features = _this$props.features;
+      var newDecayingAvgFFEnabled = features.includes(_constants.NEW_DECAYING_AVERAGE_FF);
 
       if (!scoringMethod) {
         return /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
@@ -98,7 +124,7 @@ var MasteryDescription = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
         "data-automation": "outcomeView__scoreMethodDescription"
       }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
         size: "small"
-      }, scoringText(scoringMethod))), displayMasteryPercentText && artifactTypeName && /*#__PURE__*/_react.default.createElement("div", {
+      }, scoringText(scoringMethod, newDecayingAvgFFEnabled))), displayMasteryPercentText && artifactTypeName && /*#__PURE__*/_react.default.createElement("div", {
         className: styles.scoreMasteryText
       }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
         size: "small"
@@ -110,9 +136,11 @@ var MasteryDescription = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
 }(_react.default.Component), _class2.propTypes = {
   artifactTypeName: _propTypes.default.string,
   displayMasteryPercentText: _propTypes.default.bool.isRequired,
-  scoringMethod: _shapes.scoringMethodShape
+  scoringMethod: _shapes.scoringMethodShape,
+  features: _propTypes.default.array
 }, _class2.defaultProps = {
   artifactTypeName: null,
-  scoringMethod: null
+  scoringMethod: null,
+  features: []
 }, _temp)) || _class);
 exports.default = MasteryDescription;

package/lib/translated/vi/components/OutcomeView/index.js

@@ -100,7 +100,8 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
           artifactTypeName = _this$props4.artifactTypeName,
           displayMasteryDescription = _this$props4.displayMasteryDescription,
           displayMasteryPercentText = _this$props4.displayMasteryPercentText,
-          friendlyDescription = _this$props4.friendlyDescription;
+          friendlyDescription = _this$props4.friendlyDescription,
+          features = _this$props4.features;
       var scoringMethod = this.getScoringMethod();
       var scoringTiers = this.getScoringTiers();
       var displayMasteryInformation = this.getDisplayMasteryInformation();
@@ -146,7 +147,8 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
       }), displayMasteryDescription && displayMasteryInformation && /*#__PURE__*/_react.default.createElement(_index3.default, {
         artifactTypeName: artifactTypeName,
         displayMasteryPercentText: displayMasteryPercentText,
-        scoringMethod: scoringMethod
+        scoringMethod: scoringMethod,
+        features: features
       }));
     }
   }]);
@@ -162,7 +164,8 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   scoringTiers: _propTypes.default.arrayOf(_shapes.scoringTierShape),
   artifactTypeName: _propTypes.default.string,
   displayMasteryDescription: _propTypes.default.bool,
-  displayMasteryPercentText: _propTypes.default.bool
+  displayMasteryPercentText: _propTypes.default.bool,
+  features: _propTypes.default.array
 }, _class2.defaultProps = {
   context: null,
   outcomeResult: null,
@@ -171,6 +174,7 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   artifactTypeName: null,
   displayMasteryDescription: false,
   displayMasteryPercentText: false,
-  friendlyDescription: null
+  friendlyDescription: null,
+  features: []
 }, _temp)) || _class);
 exports.default = OutcomeView;

package/lib/translated/vi/components/OutcomesPerStudent/__tests__/index.test.js

@@ -44,6 +44,7 @@ describe('OutcomesPerStudent/index', function () {
     var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     return Object.assign({
       loadPage: _sinon.default.stub().returns(Promise.resolve()),
+      clearReportStore: _sinon.default.spy(),
       getReportOutcome: _sinon.default.stub().returns({
         id: 1,
         label: 'Foo.PRQ.2',
@@ -182,6 +183,13 @@ describe('OutcomesPerStudent/index', function () {
       });
     });
   });
+  it('calls clearReportStore when about to unmount', function () {
+    var props = makeProps();
+    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react.default.createElement(_index.default, props));
+    (0, _chai.expect)(props.clearReportStore).to.not.have.been.called;
+    wrapper.unmount();
+    (0, _chai.expect)(props.clearReportStore).to.have.been.calledOnce;
+  });
   it('meets a11y standards', function () {
     return (0, _checkA11y.default)( /*#__PURE__*/_react.default.createElement(_index.default, makeProps()));
   });

package/lib/translated/vi/components/OutcomesPerStudent/index.js

@@ -373,6 +373,11 @@ var OutcomesPerStudentReport = (_dec = (0, _uiThemeable.themeable)(_theme.defaul
         return setError(e);
       });
     }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.props.clearReportStore();
+    }
   }, {
     key: "renderReportTable",
     value: function renderReportTable() {
@@ -510,6 +515,7 @@ var OutcomesPerStudentReport = (_dec = (0, _uiThemeable.themeable)(_theme.defaul
   isOpen: _propTypes.default.func.isRequired,
   closeReportAlignment: _propTypes.default.func.isRequired,
   features: _propTypes.default.array.isRequired,
+  clearReportStore: _propTypes.default.func.isRequired,
   scope: _propTypes.default.string.isRequired
 }, _class2.defaultProps = {
   loadUsersOverride: void 0,

package/lib/translated/vi/constants.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CALCULATION_METHODS = exports.AVERAGE = exports.DECAYING_AVERAGE = exports.N_MASTERY = exports.LATEST = exports.HIGHEST = exports.getFeatureFlags = exports.REPORT_DOWNLOAD_FF = exports.SET_INDIVIDUAL_RESULTS_STATE = exports.SET_INDIVIDUAL_RESULTS = exports.SET_LIST_TOTAL = exports.SET_LIST_PAGE = exports.SET_OUTCOME_LIST = exports.SET_SEARCH_TOTAL = exports.SET_SEARCH_ENTRIES = exports.SET_SEARCH_LOADING = exports.SET_SEARCH_PAGE = exports.SET_SEARCH_TEXT = exports.LO_MASTERED = exports.LO_MASTERY_PERCENT = exports.LO_ID = exports.LO_NAME = exports.LOR_POINTS_POSSIBLE = exports.LOR_POINTS = exports.ALIGNED_QUESTIONS_COUNT = exports.ATTEMPT_COUNT = exports.STUDENT_UUID = exports.STUDENT_NAME = exports.COMPLETED = exports.ERROR = exports.IN_PROGRESS = exports.NOT_FETCHING = exports.ALL_USERS = exports.CLOSE_REPORT_ALIGNMENT = exports.VIEW_REPORT_ALIGNMENT = exports.SET_REMAINING_PAGES_LOADING = exports.SET_REPORT_LOADING = exports.SET_REPORT_USERS = exports.SET_REPORT_RESULTS = exports.SET_REPORT_ROLLUPS = exports.SET_REPORT_OUTCOMES = exports.SET_REPORT_PAGE_DATA = exports.SET_REPORT_PAGE = exports.RESET_OUTCOME_PICKER = exports.SET_SCOPE = exports.TOGGLE_EXPANDED_IDS = exports.SET_ACTIVE_COLLECTION_ID = exports.SET_FOCUSED_OUTCOME = exports.UPDATE_ALIGNMENT = exports.CLOSE_ALIGNMENT = exports.VIEW_ALIGNMENT = exports.SET_ALIGNMENTS = exports.SET_CONTEXT = exports.SET_FEATURES = exports.SET_SCORING_METHOD = exports.UNSELECT_OUTCOME_IDS = exports.SET_SELECTED_OUTCOME_IDS = exports.SET_ROOT_OUTCOME_IDS = exports.SET_OUTCOME_PICKER_STATE = exports.SET_OUTCOMES = exports.SET_ERROR = exports.SELECT_OUTCOME_IDS = void 0;
+exports.CALCULATION_METHODS = exports.AVERAGE = exports.WEIGHTED_AVERAGE = exports.STANDARD_DECAYING_AVERAGE = exports.DECAYING_AVERAGE = exports.N_MASTERY = exports.LATEST = exports.HIGHEST = exports.getFeatureFlags = exports.NEW_DECAYING_AVERAGE_FF = exports.REPORT_DOWNLOAD_FF = exports.SET_INDIVIDUAL_RESULTS_STATE = exports.SET_INDIVIDUAL_RESULTS = exports.SET_LIST_TOTAL = exports.SET_LIST_PAGE = exports.SET_OUTCOME_LIST = exports.SET_SEARCH_TOTAL = exports.SET_SEARCH_ENTRIES = exports.SET_SEARCH_LOADING = exports.SET_SEARCH_PAGE = exports.SET_SEARCH_TEXT = exports.LO_MASTERED = exports.LO_MASTERY_PERCENT = exports.LO_ID = exports.LO_NAME = exports.LOR_POINTS_POSSIBLE = exports.LOR_POINTS = exports.ALIGNED_QUESTIONS_COUNT = exports.ATTEMPT_COUNT = exports.STUDENT_UUID = exports.STUDENT_NAME = exports.COMPLETED = exports.ERROR = exports.IN_PROGRESS = exports.NOT_FETCHING = exports.ALL_USERS = exports.CLOSE_REPORT_ALIGNMENT = exports.VIEW_REPORT_ALIGNMENT = exports.CLEAR_REPORT_DATA = exports.SET_REMAINING_PAGES_LOADING = exports.SET_REPORT_LOADING = exports.SET_REPORT_USERS = exports.SET_REPORT_RESULTS = exports.SET_REPORT_ROLLUPS = exports.SET_REPORT_OUTCOMES = exports.SET_REPORT_PAGE_DATA = exports.SET_REPORT_PAGE = exports.RESET_OUTCOME_PICKER = exports.SET_SCOPE = exports.TOGGLE_EXPANDED_IDS = exports.SET_ACTIVE_COLLECTION_ID = exports.SET_FOCUSED_OUTCOME = exports.UPDATE_ALIGNMENT = exports.CLOSE_ALIGNMENT = exports.VIEW_ALIGNMENT = exports.SET_ALIGNMENTS = exports.SET_CONTEXT = exports.SET_FEATURES = exports.SET_SCORING_METHOD = exports.UNSELECT_OUTCOME_IDS = exports.SET_SELECTED_OUTCOME_IDS = exports.SET_ROOT_OUTCOME_IDS = exports.SET_OUTCOME_PICKER_STATE = exports.SET_OUTCOMES = exports.SET_ERROR = exports.SELECT_OUTCOME_IDS = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -80,6 +80,8 @@ var SET_REPORT_LOADING = 'SET_REPORT_LOADING';
 exports.SET_REPORT_LOADING = SET_REPORT_LOADING;
 var SET_REMAINING_PAGES_LOADING = 'SET_REMAINING_PAGES_LOADING';
 exports.SET_REMAINING_PAGES_LOADING = SET_REMAINING_PAGES_LOADING;
+var CLEAR_REPORT_DATA = 'CLEAR_REPORT_DATA';
+exports.CLEAR_REPORT_DATA = CLEAR_REPORT_DATA;
 var VIEW_REPORT_ALIGNMENT = 'VIEW_REPORT_ALIGNMENT';
 exports.VIEW_REPORT_ALIGNMENT = VIEW_REPORT_ALIGNMENT;
 var CLOSE_REPORT_ALIGNMENT = 'CLOSE_REPORT_ALIGNMENT';
@@ -154,9 +156,11 @@ var SET_INDIVIDUAL_RESULTS_STATE = 'SET_INDIVIDUAL_RESULTS_STATE';
 exports.SET_INDIVIDUAL_RESULTS_STATE = SET_INDIVIDUAL_RESULTS_STATE;
 var REPORT_DOWNLOAD_FF = 'report_download';
 exports.REPORT_DOWNLOAD_FF = REPORT_DOWNLOAD_FF;
+var NEW_DECAYING_AVERAGE_FF = 'outcomes_new_decaying_average_calculation';
+exports.NEW_DECAYING_AVERAGE_FF = NEW_DECAYING_AVERAGE_FF;
 
 var getFeatureFlags = function getFeatureFlags() {
-  return [REPORT_DOWNLOAD_FF];
+  return [REPORT_DOWNLOAD_FF, NEW_DECAYING_AVERAGE_FF];
 };
 /*
  * calculation method
@@ -172,7 +176,11 @@ var N_MASTERY = 'n_mastery';
 exports.N_MASTERY = N_MASTERY;
 var DECAYING_AVERAGE = 'decaying_average';
 exports.DECAYING_AVERAGE = DECAYING_AVERAGE;
+var STANDARD_DECAYING_AVERAGE = 'standard_decaying_average';
+exports.STANDARD_DECAYING_AVERAGE = STANDARD_DECAYING_AVERAGE;
+var WEIGHTED_AVERAGE = 'weighted_average';
+exports.WEIGHTED_AVERAGE = WEIGHTED_AVERAGE;
 var AVERAGE = 'average';
 exports.AVERAGE = AVERAGE;
-var CALCULATION_METHODS = (_CALCULATION_METHODS = {}, (0, _defineProperty2.default)(_CALCULATION_METHODS, HIGHEST, 'Highest Score'), (0, _defineProperty2.default)(_CALCULATION_METHODS, LATEST, 'Most Recent Score'), (0, _defineProperty2.default)(_CALCULATION_METHODS, N_MASTERY, 'Achieve Mastery {n} times'), (0, _defineProperty2.default)(_CALCULATION_METHODS, DECAYING_AVERAGE, 'Decaying Average - {percent}%/{complement}%'), (0, _defineProperty2.default)(_CALCULATION_METHODS, AVERAGE, 'Average'), _CALCULATION_METHODS);
+var CALCULATION_METHODS = (_CALCULATION_METHODS = {}, (0, _defineProperty2.default)(_CALCULATION_METHODS, HIGHEST, 'Highest Score'), (0, _defineProperty2.default)(_CALCULATION_METHODS, LATEST, 'Most Recent Score'), (0, _defineProperty2.default)(_CALCULATION_METHODS, N_MASTERY, 'Achieve Mastery {n} times'), (0, _defineProperty2.default)(_CALCULATION_METHODS, DECAYING_AVERAGE, 'Decaying Average - {percent}%/{complement}%'), (0, _defineProperty2.default)(_CALCULATION_METHODS, WEIGHTED_AVERAGE, 'Weighted Average - {percent}%/{complement}%'), (0, _defineProperty2.default)(_CALCULATION_METHODS, STANDARD_DECAYING_AVERAGE, 'Decaying Average - {percent}%/{complement}%'), (0, _defineProperty2.default)(_CALCULATION_METHODS, AVERAGE, 'Average'), _CALCULATION_METHODS);
 exports.CALCULATION_METHODS = CALCULATION_METHODS;

package/lib/translated/vi/containers/ConnectedAlignmentWidget.js

@@ -29,11 +29,14 @@ var _WithArtifact = _interopRequireDefault(require("../components/WithArtifact.j
 
 var _ConnectedOutcomeTray = _interopRequireDefault(require("./ConnectedOutcomeTray.js"));
 
+var _selectors2 = require("../store/features/selectors.js");
+
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   var scope = ownProps.scope;
   return {
     tray: _ConnectedOutcomeTray.default,
-    alignedOutcomes: (0, _selectors.getAlignedOutcomes)(state, scope)
+    alignedOutcomes: (0, _selectors.getAlignedOutcomes)(state, scope),
+    features: (0, _selectors2.getFeatures)(state)
   };
 };
 

package/lib/translated/vi/containers/ConnectedOutcomeTray.js

@@ -35,6 +35,8 @@ var _index = _interopRequireDefault(require("../components/OutcomeTray/index.js"
 
 var _selectors4 = require("../store/activePicker/selectors.js");
 
+var _selectors5 = require("../store/features/selectors.js");
+
 function mapStateToProps(state, ownProps) {
   var scope = ownProps.scope;
   return {
@@ -50,7 +52,8 @@ function mapStateToProps(state, ownProps) {
     outcomes: (0, _selectors3.getOutcomeList)(state, scope),
     listPage: (0, _selectors3.getListPage)(state, scope),
     listTotal: (0, _selectors3.getListTotal)(state, scope),
-    focusedOutcome: (0, _selectors2.getFocusedOutcome)(state, scope)
+    focusedOutcome: (0, _selectors2.getFocusedOutcome)(state, scope),
+    features: (0, _selectors5.getFeatures)(state)
   };
 }
 

package/lib/translated/vi/containers/ConnectedOutcomeView.js

@@ -13,12 +13,15 @@ var _index = _interopRequireDefault(require("../components/OutcomeView/index.js"
 
 var _selectors = require("../store/context/selectors.js");
 
+var _selectors2 = require("../store/features/selectors.js");
+
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   var _getContextByScope;
 
   var scope = ownProps.scope;
   return {
-    context: (_getContextByScope = (0, _selectors.getContextByScope)(state, scope)) === null || _getContextByScope === void 0 ? void 0 : _getContextByScope.data
+    context: (_getContextByScope = (0, _selectors.getContextByScope)(state, scope)) === null || _getContextByScope === void 0 ? void 0 : _getContextByScope.data,
+    features: (0, _selectors2.getFeatures)(state)
   };
 };
 

package/lib/translated/vi/containers/ConnectedOutcomesPerStudent.js

@@ -48,7 +48,8 @@ function mapDispatchToProps(dispatch, ownProps) {
     loadRemainingPages: _actions.loadRemainingPages,
     viewReportAlignment: _actions.viewReportAlignment,
     closeReportAlignment: _actions.closeReportAlignment,
-    setError: _actions2.setError
+    setError: _actions2.setError,
+    clearReportStore: _actions.clearReportStore
   }, dispatch, scope);
 }
 /* eslint-enable react-redux/mapDispatchToProps-returns-object */

package/lib/translated/vi/store/report/__tests__/actions.test.js

@@ -618,6 +618,27 @@ describe('report/actions', function () {
       });
     });
   });
+  describe('clearReportStore', function () {
+    it('clears the report store', function () {
+      var state = {
+        scopeForTest: {
+          report: {
+            page: {
+              number: 0
+            },
+            users: {
+              1: users,
+              2: getUsersResponse.users
+            },
+            rollups: rollups
+          }
+        }
+      };
+      var store = (0, _createMockStore.default)((0, _immutable.Map)((0, _immutable.fromJS)(state)), service);
+      store.dispatch(actions.clearReportStore(state, 'scopeForTest'));
+      (0, _chai.expect)(store.getActions().slice(-1)[0].type).to.eq(_constants.CLEAR_REPORT_DATA);
+    });
+  });
   describe('getUserList', function () {
     it('returns a list of user uuids from page 1', function () {
       var state = {

package/lib/translated/vi/store/report/__tests__/reducers.test.js

@@ -8,6 +8,8 @@ var _chai = require("chai");
 
 var _immutable = require("immutable");
 
+var _constants = require("../../../constants.js");
+
 var _actions = require("../actions.js");
 
 var _reducers = _interopRequireDefault(require("../reducers.js"));
@@ -16,13 +18,20 @@ describe('reports/reducers', function () {
   // eslint-disable-next-line camelcase
   var user_uuid = '560fddd9-9b16-4e3a-969c-2f095e7afc78';
   var state = (0, _immutable.fromJS)({
-    rollups: {
+    outcomes: {
       100: {
         id: 100,
         label: 'blue',
         title: 'green'
       }
     },
+    rollups: [{
+      outcomeId: '100',
+      averageScore: 0.8,
+      count: 1,
+      masteryCount: 1,
+      childArtifactCount: 0
+    }],
     results: {
       1955: (0, _defineProperty2.default)({}, user_uuid, {
         user_uuid: user_uuid,
@@ -47,6 +56,12 @@ describe('reports/reducers', function () {
       var newState = (0, _reducers.default)(state, (0, _actions.setPage)(newPage));
       (0, _chai.expect)(newState.get('page').toJS()).to.deep.equal(newPage);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('page').toJS()).to.deep.equal({
+        number: void 0
+      });
+    });
   });
   describe('pageData', function () {
     it('is updated by setPageData', function () {
@@ -57,17 +72,64 @@ describe('reports/reducers', function () {
       var newState = (0, _reducers.default)(state, (0, _actions.setPageData)(newPageData));
       (0, _chai.expect)(newState.get('pageData').toJS()).to.deep.equal(newPageData);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('pageData').toJS()).to.deep.equal(new Map());
+    });
+  });
+  describe('loading', function () {
+    it('is updated by setLoading', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.setLoading)(true));
+      (0, _chai.expect)(newState.get('loading')).to.be.true;
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('loading')).to.be.false;
+    });
+  });
+  describe('loadingRemainingPages', function () {
+    it('is updated by setLoadingRemainingPages', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.setLoadingRemainingPages)(_constants.IN_PROGRESS));
+      (0, _chai.expect)(newState.get('loadingRemainingPages')).to.eq(_constants.IN_PROGRESS);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('loadingRemainingPages')).to.eq(_constants.NOT_FETCHING);
+    });
+  });
+  describe('outcomes', function () {
+    it('is updated by setReportOutcomes', function () {
+      var newOutcome = {
+        200: {
+          id: 200,
+          label: 'yellow',
+          title: 'red'
+        }
+      };
+      var newState = (0, _reducers.default)(state, (0, _actions.setReportOutcomes)(newOutcome));
+      (0, _chai.expect)(newState.get('outcomes').toJS()).to.deep.equal(newOutcome);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('outcomes').toJS()).to.deep.equal(new Map());
+    });
   });
   describe('rollups', function () {
     it('is updated by setRollups', function () {
       var newRollup = {
-        id: 200,
-        label: 'yellow',
-        title: 'red'
+        outcomeId: 200,
+        averageScore: 0.9,
+        count: 1,
+        masteryCount: 1,
+        childArtifactCount: 0
       };
       var newState = (0, _reducers.default)(state, (0, _actions.setRollups)([newRollup]));
       (0, _chai.expect)(newState.get('rollups').toJS()).to.deep.equal([newRollup]);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('rollups').toJS()).to.deep.equal([]);
+    });
   });
   describe('results', function () {
     it('is updated by setResults', function () {
@@ -114,6 +176,10 @@ describe('reports/reducers', function () {
         pointsPossible: seenResult.pointsPossible
       });
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('results').toJS()).to.deep.equal(new Map());
+    });
   });
   describe('openReportAlignmentId', function () {
     it('is set by VIEW_REPORT_ALIGNMENT', function () {
@@ -137,5 +203,9 @@ describe('reports/reducers', function () {
       var newState = (0, _reducers.default)(state, (0, _actions.setUsers)(newUsers));
       (0, _chai.expect)(newState.get('users').toJS()).to.deep.equal(newUsers);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('users').toJS()).to.deep.equal(new Map());
+    });
   });
 });

package/lib/translated/vi/store/report/actions.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPaginatedUserList = exports.getUserList = exports.loadRemainingResults = exports.loadRemainingUsers = exports.loadRemainingPages = exports.loadRollups = exports.loadPage = exports.loadUsers = exports.setLoadingRemainingPages = exports.setLoading = exports.setPage = exports.setPageData = exports.setUsers = exports.closeReportAlignment = exports.viewReportAlignment = exports.setResults = exports.setRollups = exports.setReportOutcomes = void 0;
+exports.getPaginatedUserList = exports.getUserList = exports.clearReportStore = exports.loadRemainingResults = exports.loadRemainingUsers = exports.loadRemainingPages = exports.loadRollups = exports.loadPage = exports.loadUsers = exports.closeReportAlignment = exports.viewReportAlignment = exports.clearReportData = exports.setLoadingRemainingPages = exports.setLoading = exports.setPage = exports.setPageData = exports.setUsers = exports.setResults = exports.setRollups = exports.setReportOutcomes = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -32,10 +32,6 @@ var setRollups = (0, _reduxActions.createAction)(_constants.SET_REPORT_ROLLUPS);
 exports.setRollups = setRollups;
 var setResults = (0, _reduxActions.createAction)(_constants.SET_REPORT_RESULTS);
 exports.setResults = setResults;
-var viewReportAlignment = (0, _reduxActions.createAction)(_constants.VIEW_REPORT_ALIGNMENT);
-exports.viewReportAlignment = viewReportAlignment;
-var closeReportAlignment = (0, _reduxActions.createAction)(_constants.CLOSE_REPORT_ALIGNMENT);
-exports.closeReportAlignment = closeReportAlignment;
 var setUsers = (0, _reduxActions.createAction)(_constants.SET_REPORT_USERS);
 exports.setUsers = setUsers;
 var setPageData = (0, _reduxActions.createAction)(_constants.SET_REPORT_PAGE_DATA);
@@ -44,9 +40,15 @@ var setPage = (0, _reduxActions.createAction)(_constants.SET_REPORT_PAGE);
 exports.setPage = setPage;
 var setLoading = (0, _reduxActions.createAction)(_constants.SET_REPORT_LOADING);
 exports.setLoading = setLoading;
-var setLoadingRemainingPages = (0, _reduxActions.createAction)(_constants.SET_REMAINING_PAGES_LOADING); // Function calls to Outcome Service
-
+var setLoadingRemainingPages = (0, _reduxActions.createAction)(_constants.SET_REMAINING_PAGES_LOADING);
 exports.setLoadingRemainingPages = setLoadingRemainingPages;
+var clearReportData = (0, _reduxActions.createAction)(_constants.CLEAR_REPORT_DATA);
+exports.clearReportData = clearReportData;
+var viewReportAlignment = (0, _reduxActions.createAction)(_constants.VIEW_REPORT_ALIGNMENT);
+exports.viewReportAlignment = viewReportAlignment;
+var closeReportAlignment = (0, _reduxActions.createAction)(_constants.CLOSE_REPORT_ALIGNMENT); // Function calls to Outcome Service
+
+exports.closeReportAlignment = closeReportAlignment;
 
 var loadUsers = function loadUsers(artifactType, artifactId, pageNumber) {
   return function (dispatch, getState, _arg, scope) {
@@ -109,10 +111,10 @@ var loadPage = function loadPage(artifactType, artifactId, pageNumber, loadUsers
 
     if (!loading) {
       if (hasSeenPage) {
-        dispatch(setPage({
+        return Promise.resolve(dispatch(setPage({
           number: pageNumber,
           loading: false
-        }));
+        })));
       } else {
         dispatch(setLoading(true));
         dispatch(setPage({
@@ -283,10 +285,18 @@ var loadRemainingResults = function loadRemainingResults(artifactType, artifactI
       dispatch(setLoadingRemainingPages(_constants.ERROR));
     });
   };
+};
+
+exports.loadRemainingResults = loadRemainingResults;
+
+var clearReportStore = function clearReportStore() {
+  return function (dispatch, _getState, _arg, _scope) {
+    dispatch(clearReportData());
+  };
 }; // Helpers
 
 
-exports.loadRemainingResults = loadRemainingResults;
+exports.clearReportStore = clearReportStore;
 
 var getUsersPromise = function getUsersPromise(dispatch, artifactType, artifactId, pageNumber, loadUsersOverride) {
   // if the override function is provided, we assume the upstream application has handled dispatching and is