@instructure/outcomes-ui 2.1.7 → 2.1.9

package/es/translated/zh-Hans/components/OutcomeTray/OutcomeList/index.js

@@ -28,7 +28,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.createElement("div", {
           key: outcome.id
@@ -37,7 +38,8 @@ var OutcomeList = /*#__PURE__*/function (_React$Component) {
           isOutcomeSelected: isOutcomeSelected,
           selectOutcomeIds: selectOutcomeIds,
           deselectOutcomeIds: deselectOutcomeIds,
-          isTray: true
+          isTray: true,
+          features: features
         }));
       });
     }
@@ -97,9 +99,11 @@ OutcomeList.propTypes = {
   getOutcomesList: PropTypes.func.isRequired,
   isLoading: PropTypes.bool.isRequired,
   listPage: PropTypes.number.isRequired,
-  listTotal: PropTypes.number
+  listTotal: PropTypes.number,
+  features: PropTypes.array
 };
 OutcomeList.defaultProps = {
-  listTotal: null
+  listTotal: null,
+  features: []
 };
 export { OutcomeList as default };

package/es/translated/zh-Hans/components/OutcomeTray/index.js

@@ -69,7 +69,8 @@ var OutcomeTray = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
           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.createElement(View, {
         display: "block",
         padding: "small none none none"
@@ -81,7 +82,8 @@ var OutcomeTray = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
         isLoading: isFetching,
         listPage: listPage,
         listTotal: listTotal,
-        getOutcomesList: getOutcomesList
+        getOutcomesList: getOutcomesList,
+        features: features
       }));
     }
   }, {
@@ -258,7 +260,8 @@ var OutcomeTray = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
   displayMasteryPercentText: PropTypes.bool,
   shouldModifyArtifact: PropTypes.bool,
   scope: PropTypes.string.isRequired,
-  showAlert: PropTypes.func
+  showAlert: PropTypes.func,
+  features: PropTypes.array
 }, _class2.defaultProps = {
   screenreaderNotification: null,
   liveRegion: null,
@@ -273,6 +276,7 @@ var OutcomeTray = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
   shouldModifyArtifact: false,
   searchTotal: null,
   listTotal: null,
-  showAlert: function showAlert() {}
+  showAlert: function showAlert() {},
+  features: []
 }, _temp)) || _class);
 export { OutcomeTray as default };

package/es/translated/zh-Hans/components/OutcomeView/MasteryDescription/index.js

@@ -16,6 +16,7 @@ import { Text } from '@instructure/ui-text';
 import { Spinner } from '@instructure/ui-spinner';
 import { themeable } from '@instructure/ui-themeable';
 import { scoringMethodShape } from "../../../store/shapes.js";
+import { NEW_DECAYING_AVERAGE_FF } from "../../../constants.js";
 import theme from "../../theme.js";
 var styles = {
   componentId: 'IalyE',
@@ -26,10 +27,29 @@ var styles = {
   'scoreMasteryText': 'outcomes-ui__MasteryDescription--scoreMasteryText'
 };
 
-var scoringText = function scoringText(scoringMethod) {
+var renderUserFacingMethod = function renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled) {
+  var legacyDecayingAverage = "\u6309\u8870\u51CF\u5E73\u5747\u503C\u8BA1\u7B97\u7684\u638C\u63E1\u7A0B\u5EA6\u3002\u6700\u65B0\u8BA1\u6570\u4E3A\u638C\u63E1\u7A0B\u5EA6\u6743\u91CD\u7684 " + _percent_zhHans_number(scoringMethod.algorithm_data.decaying_average_percent) + "\uFF0C\u6240\u6709\u5176\u4ED6\u7ED3\u679C\u7684\u5E73\u5747\u503C\u8BA1\u6570\u4E3A\u6743\u91CD\u7684 " + _percent_zhHans_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + "\u3002\u5982\u679C\u53EA\u6709\u4E00\u4E2A\u7ED3\u679C\uFF0C\u5C06\u8FD4\u56DE\u5355\u4E2A\u5206\u6570\u3002";
+
+  if (newDecayingAvgFFEnabled) {
+    switch (scoringMethod.algorithm) {
+      case 'decaying_average':
+        return "Mastery calculated by Weighted Average. Most recent counts as " + _percent_zhHans_number(scoringMethod.algorithm_data.decaying_average_percent) + " of mastery weight, average of all other results count as " + _percent_zhHans_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_zhHans_number(scoringMethod.algorithm_data.standard_decaying_average_percent) + " weight, and the first gets " + _percent_zhHans_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_zhHans_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 "\u6309\u8870\u51CF\u5E73\u5747\u503C\u8BA1\u7B97\u7684\u638C\u63E1\u7A0B\u5EA6\u3002\u6700\u65B0\u8BA1\u6570\u4E3A\u638C\u63E1\u7A0B\u5EA6\u6743\u91CD\u7684 " + _percent_zhHans_number(scoringMethod.algorithm_data.decaying_average_percent) + "\uFF0C\u6240\u6709\u5176\u4ED6\u7ED3\u679C\u7684\u5E73\u5747\u503C\u8BA1\u6570\u4E3A\u6743\u91CD\u7684 " + _percent_zhHans_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + "\u3002\u5982\u679C\u53EA\u6709\u4E00\u4E2A\u7ED3\u679C\uFF0C\u5C06\u8FD4\u56DE\u5355\u4E2A\u5206\u6570\u3002";
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
+
+    case 'standard_decaying_average':
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
 
     case 'n_mastery':
       return "\u6309\u6B21\u6570\u8BA1\u7B97\u7684\u638C\u63E1\u7A0B\u5EA6\u3002\u5FC5\u987B\u81F3\u5C11\u6709 " + _default_zhHans_number(scoringMethod.algorithm_data.n_mastery_count) + " \u6B21\u8FBE\u5230\u638C\u63E1\u7A0B\u5EA6\u3002\u9AD8\u4E8E\u638C\u63E1\u7A0B\u5EA6\u7684\u5206\u6570\u5C06\u53D6\u5E73\u5747\u503C\u4EE5\u8BA1\u7B97\u6700\u7EC8\u5206\u6570\u3002";
@@ -40,6 +60,9 @@ var scoringText = function scoringText(scoringMethod) {
     case 'latest':
       return "\u6309\u6700\u65B0\u5206\u6570\u8BA1\u7B97\u7684\u638C\u63E1\u7A0B\u5EA6\u3002\u638C\u63E1\u7A0B\u5EA6\u5206\u6570\u53CD\u6620\u4E86\u6700\u8FD1\u8BC4\u5206\u7684\u8BC4\u4F30\u3002";
 
+    case 'average':
+      return "Mastery reflects Average Score. Calculated by dividing the sum of all item scores by the number of scores.";
+
     default:
       return '';
   }
@@ -67,7 +90,9 @@ var MasteryDescription = (_dec = themeable(theme, styles), _dec(_class = (_temp
       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(NEW_DECAYING_AVERAGE_FF);
 
       if (!scoringMethod) {
         return /*#__PURE__*/React.createElement(Spinner, {
@@ -80,7 +105,7 @@ var MasteryDescription = (_dec = themeable(theme, styles), _dec(_class = (_temp
         "data-automation": "outcomeView__scoreMethodDescription"
       }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, {
         size: "small"
-      }, scoringText(scoringMethod))), displayMasteryPercentText && artifactTypeName && /*#__PURE__*/React.createElement("div", {
+      }, scoringText(scoringMethod, newDecayingAvgFFEnabled))), displayMasteryPercentText && artifactTypeName && /*#__PURE__*/React.createElement("div", {
         className: styles.scoreMasteryText
       }, /*#__PURE__*/React.createElement(Text, {
         size: "small"
@@ -93,9 +118,11 @@ var MasteryDescription = (_dec = themeable(theme, styles), _dec(_class = (_temp
 }(React.Component), _class2.propTypes = {
   artifactTypeName: PropTypes.string,
   displayMasteryPercentText: PropTypes.bool.isRequired,
-  scoringMethod: scoringMethodShape
+  scoringMethod: scoringMethodShape,
+  features: PropTypes.array
 }, _class2.defaultProps = {
   artifactTypeName: null,
-  scoringMethod: null
+  scoringMethod: null,
+  features: []
 }, _temp)) || _class);
 export { MasteryDescription as default };

package/es/translated/zh-Hans/components/OutcomeView/index.js

@@ -77,7 +77,8 @@ var OutcomeView = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
           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();
@@ -123,7 +124,8 @@ var OutcomeView = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
       }), displayMasteryDescription && displayMasteryInformation && /*#__PURE__*/React.createElement(MasteryDescription, {
         artifactTypeName: artifactTypeName,
         displayMasteryPercentText: displayMasteryPercentText,
-        scoringMethod: scoringMethod
+        scoringMethod: scoringMethod,
+        features: features
       }));
     }
   }]);
@@ -140,7 +142,8 @@ var OutcomeView = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
   scoringTiers: PropTypes.arrayOf(scoringTierShape),
   artifactTypeName: PropTypes.string,
   displayMasteryDescription: PropTypes.bool,
-  displayMasteryPercentText: PropTypes.bool
+  displayMasteryPercentText: PropTypes.bool,
+  features: PropTypes.array
 }, _class2.defaultProps = {
   context: null,
   outcomeResult: null,
@@ -149,6 +152,7 @@ var OutcomeView = (_dec = themeable(theme, styles), _dec(_class = (_temp = _clas
   artifactTypeName: null,
   displayMasteryDescription: false,
   displayMasteryPercentText: false,
-  friendlyDescription: null
+  friendlyDescription: null,
+  features: []
 }, _temp)) || _class);
 export { OutcomeView as default };

package/es/translated/zh-Hans/components/OutcomesPerStudent/__tests__/index.test.js

@@ -1,7 +1,7 @@
 import chai, { expect } from 'chai';
 import React from 'react';
 import sinon from 'sinon';
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 import OutcomesPerStudent from "../index.js";
 import checkA11y from "../../../test/checkA11y.js";
 var styles = {
@@ -29,6 +29,7 @@ describe('OutcomesPerStudent/index', function () {
     var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     return Object.assign({
       loadPage: sinon.stub().returns(Promise.resolve()),
+      clearReportStore: sinon.spy(),
       getReportOutcome: sinon.stub().returns({
         id: 1,
         label: 'Foo.PRQ.2',
@@ -167,6 +168,13 @@ describe('OutcomesPerStudent/index', function () {
       });
     });
   });
+  it('calls clearReportStore when about to unmount', function () {
+    var props = makeProps();
+    var wrapper = mount( /*#__PURE__*/React.createElement(OutcomesPerStudent, props));
+    expect(props.clearReportStore).to.not.have.been.called;
+    wrapper.unmount();
+    expect(props.clearReportStore).to.have.been.calledOnce;
+  });
   it('meets a11y standards', function () {
     return checkA11y( /*#__PURE__*/React.createElement(OutcomesPerStudent, makeProps()));
   });

package/es/translated/zh-Hans/components/OutcomesPerStudent/index.js

@@ -342,6 +342,11 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
         return setError(e);
       });
     }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.props.clearReportStore();
+    }
   }, {
     key: "renderReportTable",
     value: function renderReportTable() {
@@ -480,6 +485,7 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
   isOpen: PropTypes.func.isRequired,
   closeReportAlignment: PropTypes.func.isRequired,
   features: PropTypes.array.isRequired,
+  clearReportStore: PropTypes.func.isRequired,
   scope: PropTypes.string.isRequired
 }, _class2.defaultProps = {
   loadUsersOverride: void 0,

package/es/translated/zh-Hans/constants.js

@@ -44,6 +44,7 @@ export var SET_REPORT_RESULTS = 'SET_REPORT_RESULTS';
 export var SET_REPORT_USERS = 'SET_REPORT_USERS';
 export var SET_REPORT_LOADING = 'SET_REPORT_LOADING';
 export var SET_REMAINING_PAGES_LOADING = 'SET_REMAINING_PAGES_LOADING';
+export var CLEAR_REPORT_DATA = 'CLEAR_REPORT_DATA';
 export var VIEW_REPORT_ALIGNMENT = 'VIEW_REPORT_ALIGNMENT';
 export var CLOSE_REPORT_ALIGNMENT = 'CLOSE_REPORT_ALIGNMENT';
 export var ALL_USERS = 'ALL_USERS';
@@ -90,8 +91,9 @@ export var SET_INDIVIDUAL_RESULTS_STATE = 'SET_INDIVIDUAL_RESULTS_STATE';
 */
 
 export var REPORT_DOWNLOAD_FF = 'report_download';
+export var NEW_DECAYING_AVERAGE_FF = 'outcomes_new_decaying_average_calculation';
 export var getFeatureFlags = function getFeatureFlags() {
-  return [REPORT_DOWNLOAD_FF];
+  return [REPORT_DOWNLOAD_FF, NEW_DECAYING_AVERAGE_FF];
 };
 /*
  * calculation method
@@ -101,5 +103,7 @@ export var HIGHEST = 'highest';
 export var LATEST = 'latest';
 export var N_MASTERY = 'n_mastery';
 export var DECAYING_AVERAGE = 'decaying_average';
+export var STANDARD_DECAYING_AVERAGE = 'standard_decaying_average';
+export var WEIGHTED_AVERAGE = 'weighted_average';
 export var AVERAGE = 'average';
-export var CALCULATION_METHODS = (_CALCULATION_METHODS = {}, _defineProperty(_CALCULATION_METHODS, HIGHEST, 'Highest Score'), _defineProperty(_CALCULATION_METHODS, LATEST, 'Most Recent Score'), _defineProperty(_CALCULATION_METHODS, N_MASTERY, 'Achieve Mastery {n} times'), _defineProperty(_CALCULATION_METHODS, DECAYING_AVERAGE, 'Decaying Average - {percent}%/{complement}%'), _defineProperty(_CALCULATION_METHODS, AVERAGE, 'Average'), _CALCULATION_METHODS);
+export var CALCULATION_METHODS = (_CALCULATION_METHODS = {}, _defineProperty(_CALCULATION_METHODS, HIGHEST, 'Highest Score'), _defineProperty(_CALCULATION_METHODS, LATEST, 'Most Recent Score'), _defineProperty(_CALCULATION_METHODS, N_MASTERY, 'Achieve Mastery {n} times'), _defineProperty(_CALCULATION_METHODS, DECAYING_AVERAGE, 'Decaying Average - {percent}%/{complement}%'), _defineProperty(_CALCULATION_METHODS, WEIGHTED_AVERAGE, 'Weighted Average - {percent}%/{complement}%'), _defineProperty(_CALCULATION_METHODS, STANDARD_DECAYING_AVERAGE, 'Decaying Average - {percent}%/{complement}%'), _defineProperty(_CALCULATION_METHODS, AVERAGE, 'Average'), _CALCULATION_METHODS);

package/es/translated/zh-Hans/containers/ConnectedAlignmentWidget.js

@@ -8,12 +8,14 @@ import * as outcomePickerActions from "../store/OutcomePicker/actions.js";
 import AlignmentWidget from "../components/AlignmentWidget/index.js";
 import WithArtifact from "../components/WithArtifact.js";
 import ConnectedOutcomeTray from "./ConnectedOutcomeTray.js";
+import { getFeatures } from "../store/features/selectors.js";
 
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   var scope = ownProps.scope;
   return {
     tray: ConnectedOutcomeTray,
-    alignedOutcomes: getAlignedOutcomes(state, scope)
+    alignedOutcomes: getAlignedOutcomes(state, scope),
+    features: getFeatures(state)
   };
 };
 

package/es/translated/zh-Hans/containers/ConnectedOutcomeTray.js

@@ -11,6 +11,7 @@ import { getFocusedOutcome, getSelectedOutcomeIds, getOutcomePickerState, makeIs
 import { getOutcomeList, getListPage, getListTotal } from "../store/OutcomeTray/selectors.js";
 import OutcomeTray from "../components/OutcomeTray/index.js";
 import { isOpen } from "../store/activePicker/selectors.js";
+import { getFeatures } from "../store/features/selectors.js";
 
 function mapStateToProps(state, ownProps) {
   var scope = ownProps.scope;
@@ -27,7 +28,8 @@ function mapStateToProps(state, ownProps) {
     outcomes: getOutcomeList(state, scope),
     listPage: getListPage(state, scope),
     listTotal: getListTotal(state, scope),
-    focusedOutcome: getFocusedOutcome(state, scope)
+    focusedOutcome: getFocusedOutcome(state, scope),
+    features: getFeatures(state)
   };
 }
 

package/es/translated/zh-Hans/containers/ConnectedOutcomeView.js

@@ -1,13 +1,15 @@
 import { connect } from 'react-redux';
 import OutcomeView from "../components/OutcomeView/index.js";
 import { getContextByScope } from "../store/context/selectors.js";
+import { getFeatures } from "../store/features/selectors.js";
 
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   var _getContextByScope;
 
   var scope = ownProps.scope;
   return {
-    context: (_getContextByScope = getContextByScope(state, scope)) === null || _getContextByScope === void 0 ? void 0 : _getContextByScope.data
+    context: (_getContextByScope = getContextByScope(state, scope)) === null || _getContextByScope === void 0 ? void 0 : _getContextByScope.data,
+    features: getFeatures(state)
   };
 };
 

package/es/translated/zh-Hans/containers/ConnectedOutcomesPerStudent.js

@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { bindActionCreators as bindScopedActionCreators } from 'multireducer';
 import OutcomesPerStudent from "../components/OutcomesPerStudent/index.js";
-import { loadPage, loadRemainingPages, viewReportAlignment, closeReportAlignment } from "../store/report/actions.js";
+import { loadPage, loadRemainingPages, viewReportAlignment, closeReportAlignment, clearReportStore } from "../store/report/actions.js";
 import { setError } from "../store/context/actions.js";
 import { formatCSVData, getLoading, getPageCount, getPageNumber, getUsers, getReportOutcome, getRollups, getScore, getLoadingRemainingPages, isOpen, hasAnyOutcomes } from "../store/report/selectors.js";
 import { getFeatures } from "../store/features/selectors.js";
@@ -33,7 +33,8 @@ function mapDispatchToProps(dispatch, ownProps) {
     loadRemainingPages: loadRemainingPages,
     viewReportAlignment: viewReportAlignment,
     closeReportAlignment: closeReportAlignment,
-    setError: setError
+    setError: setError,
+    clearReportStore: clearReportStore
   }, dispatch, scope);
 }
 /* eslint-enable react-redux/mapDispatchToProps-returns-object */

package/es/translated/zh-Hans/store/report/__tests__/actions.test.js

@@ -5,7 +5,7 @@ import { fromJS, Map } from 'immutable';
 import { wrapAction } from 'multireducer';
 import sinon from 'sinon';
 import * as actions from "../actions.js";
-import { SET_ERROR, VIEW_REPORT_ALIGNMENT, CLOSE_REPORT_ALIGNMENT, NOT_FETCHING, IN_PROGRESS, COMPLETED, ERROR } from "../../../constants.js";
+import { SET_ERROR, VIEW_REPORT_ALIGNMENT, CLOSE_REPORT_ALIGNMENT, CLEAR_REPORT_DATA, NOT_FETCHING, IN_PROGRESS, COMPLETED, ERROR } from "../../../constants.js";
 import { setError } from "../../context/actions.js";
 import createMockStore, { scopeActions } from "../../../test/createMockStore.js";
 var scopedActions = scopeActions(_objectSpread(_objectSpread({}, actions), {}, {
@@ -600,6 +600,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 = createMockStore(Map(fromJS(state)), service);
+      store.dispatch(actions.clearReportStore(state, 'scopeForTest'));
+      expect(store.getActions().slice(-1)[0].type).to.eq(CLEAR_REPORT_DATA);
+    });
+  });
   describe('getUserList', function () {
     it('returns a list of user uuids from page 1', function () {
       var state = {

package/es/translated/zh-Hans/store/report/__tests__/reducers.test.js

@@ -1,19 +1,27 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { expect } from 'chai';
 import { fromJS } from 'immutable';
-import { setPage, setPageData, setRollups, setResults, setUsers, viewReportAlignment, closeReportAlignment } from "../actions.js";
+import { IN_PROGRESS, NOT_FETCHING } from "../../../constants.js";
+import { setPage, setPageData, setRollups, setResults, setUsers, setReportOutcomes, setLoading, setLoadingRemainingPages, clearReportData, viewReportAlignment, closeReportAlignment } from "../actions.js";
 import reducer from "../reducers.js";
 describe('reports/reducers', function () {
   // eslint-disable-next-line camelcase
   var user_uuid = '560fddd9-9b16-4e3a-969c-2f095e7afc78';
   var state = fromJS({
-    rollups: {
+    outcomes: {
       100: {
         id: 100,
         label: 'blue',
         title: 'green'
       }
     },
+    rollups: [{
+      outcomeId: '100',
+      averageScore: 0.8,
+      count: 1,
+      masteryCount: 1,
+      childArtifactCount: 0
+    }],
     results: {
       1955: _defineProperty({}, user_uuid, {
         user_uuid: user_uuid,
@@ -38,6 +46,12 @@ describe('reports/reducers', function () {
       var newState = reducer(state, setPage(newPage));
       expect(newState.get('page').toJS()).to.deep.equal(newPage);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('page').toJS()).to.deep.equal({
+        number: void 0
+      });
+    });
   });
   describe('pageData', function () {
     it('is updated by setPageData', function () {
@@ -48,17 +62,64 @@ describe('reports/reducers', function () {
       var newState = reducer(state, setPageData(newPageData));
       expect(newState.get('pageData').toJS()).to.deep.equal(newPageData);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('pageData').toJS()).to.deep.equal(new Map());
+    });
+  });
+  describe('loading', function () {
+    it('is updated by setLoading', function () {
+      var newState = reducer(state, setLoading(true));
+      expect(newState.get('loading')).to.be.true;
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('loading')).to.be.false;
+    });
+  });
+  describe('loadingRemainingPages', function () {
+    it('is updated by setLoadingRemainingPages', function () {
+      var newState = reducer(state, setLoadingRemainingPages(IN_PROGRESS));
+      expect(newState.get('loadingRemainingPages')).to.eq(IN_PROGRESS);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('loadingRemainingPages')).to.eq(NOT_FETCHING);
+    });
+  });
+  describe('outcomes', function () {
+    it('is updated by setReportOutcomes', function () {
+      var newOutcome = {
+        200: {
+          id: 200,
+          label: 'yellow',
+          title: 'red'
+        }
+      };
+      var newState = reducer(state, setReportOutcomes(newOutcome));
+      expect(newState.get('outcomes').toJS()).to.deep.equal(newOutcome);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      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 = reducer(state, setRollups([newRollup]));
       expect(newState.get('rollups').toJS()).to.deep.equal([newRollup]);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('rollups').toJS()).to.deep.equal([]);
+    });
   });
   describe('results', function () {
     it('is updated by setResults', function () {
@@ -105,6 +166,10 @@ describe('reports/reducers', function () {
         pointsPossible: seenResult.pointsPossible
       });
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('results').toJS()).to.deep.equal(new Map());
+    });
   });
   describe('openReportAlignmentId', function () {
     it('is set by VIEW_REPORT_ALIGNMENT', function () {
@@ -128,5 +193,9 @@ describe('reports/reducers', function () {
       var newState = reducer(state, setUsers(newUsers));
       expect(newState.get('users').toJS()).to.deep.equal(newUsers);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('users').toJS()).to.deep.equal(new Map());
+    });
   });
 });

package/es/translated/zh-Hans/store/report/actions.js

@@ -3,7 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { createAction } from 'redux-actions';
 import { CALL_SERVICE } from '@instructure/redux-service-middleware';
 import { getUsers, getPageLoading, getPageNumber, getResults, getHighestPageSeen, getPageCount, getRollups, getLoadingRemainingPages } from "./selectors.js";
-import { SET_REPORT_PAGE, SET_REPORT_PAGE_DATA, SET_REPORT_OUTCOMES, SET_REPORT_ROLLUPS, SET_REPORT_RESULTS, SET_REPORT_USERS, VIEW_REPORT_ALIGNMENT, CLOSE_REPORT_ALIGNMENT, SET_REPORT_LOADING, SET_REMAINING_PAGES_LOADING, ALL_USERS, ERROR, IN_PROGRESS, COMPLETED } from "../../constants.js";
+import { SET_REPORT_PAGE, SET_REPORT_PAGE_DATA, SET_REPORT_OUTCOMES, SET_REPORT_ROLLUPS, SET_REPORT_RESULTS, SET_REPORT_USERS, SET_REPORT_LOADING, SET_REMAINING_PAGES_LOADING, CLEAR_REPORT_DATA, VIEW_REPORT_ALIGNMENT, CLOSE_REPORT_ALIGNMENT, ALL_USERS, ERROR, IN_PROGRESS, COMPLETED } from "../../constants.js";
 import { getConfig } from "../config/selectors.js";
 import { setError } from "../context/actions.js";
 /*
@@ -13,13 +13,14 @@ import { setError } from "../context/actions.js";
 export var setReportOutcomes = createAction(SET_REPORT_OUTCOMES);
 export var setRollups = createAction(SET_REPORT_ROLLUPS);
 export var setResults = createAction(SET_REPORT_RESULTS);
-export var viewReportAlignment = createAction(VIEW_REPORT_ALIGNMENT);
-export var closeReportAlignment = createAction(CLOSE_REPORT_ALIGNMENT);
 export var setUsers = createAction(SET_REPORT_USERS);
 export var setPageData = createAction(SET_REPORT_PAGE_DATA);
 export var setPage = createAction(SET_REPORT_PAGE);
 export var setLoading = createAction(SET_REPORT_LOADING);
-export var setLoadingRemainingPages = createAction(SET_REMAINING_PAGES_LOADING); // Function calls to Outcome Service
+export var setLoadingRemainingPages = createAction(SET_REMAINING_PAGES_LOADING);
+export var clearReportData = createAction(CLEAR_REPORT_DATA);
+export var viewReportAlignment = createAction(VIEW_REPORT_ALIGNMENT);
+export var closeReportAlignment = createAction(CLOSE_REPORT_ALIGNMENT); // Function calls to Outcome Service
 
 export var loadUsers = function loadUsers(artifactType, artifactId, pageNumber) {
   return function (dispatch, getState, _arg, scope) {
@@ -80,10 +81,10 @@ export var loadPage = function loadPage(artifactType, artifactId, pageNumber, lo
 
     if (!loading) {
       if (hasSeenPage) {
-        dispatch(setPage({
+        return Promise.resolve(dispatch(setPage({
           number: pageNumber,
           loading: false
-        }));
+        })));
       } else {
         dispatch(setLoading(true));
         dispatch(setPage({
@@ -246,6 +247,11 @@ export var loadRemainingResults = function loadRemainingResults(artifactType, ar
       dispatch(setLoadingRemainingPages(ERROR));
     });
   };
+};
+export var clearReportStore = function clearReportStore() {
+  return function (dispatch, _getState, _arg, _scope) {
+    dispatch(clearReportData());
+  };
 }; // Helpers
 
 var getUsersPromise = function getUsersPromise(dispatch, artifactType, artifactId, pageNumber, loadUsersOverride) {

package/es/translated/zh-Hans/store/report/reducers.js

@@ -1,34 +1,53 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+var _handleActions, _handleActions2, _handleActions3, _handleActions4, _handleActions5, _handleActions6, _handleActions7, _handleActions8;
+
 import { List, Map, fromJS } from 'immutable';
 import { handleActions } from 'redux-actions';
 import { combineReducers } from 'redux-immutable';
 import { NOT_FETCHING } from "../../constants.js";
-import { setPage, setPageData, setUsers, setReportOutcomes, setRollups, setResults, setLoading, setLoadingRemainingPages } from "./actions.js";
-var users = handleActions(_defineProperty({}, setUsers, function (state, action) {
+import { setPage, setPageData, setUsers, setReportOutcomes, setRollups, setResults, setLoading, setLoadingRemainingPages, clearReportData } from "./actions.js";
+var users = handleActions((_handleActions = {}, _defineProperty(_handleActions, setUsers, function (_state, action) {
   return fromJS(action.payload);
-}), Map());
-var page = handleActions(_defineProperty({}, setPage, function (state, action) {
+}), _defineProperty(_handleActions, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions), Map());
+var page = handleActions((_handleActions2 = {}, _defineProperty(_handleActions2, setPage, function (state, action) {
   return fromJS(action.payload);
-}), fromJS({
+}), _defineProperty(_handleActions2, clearReportData, function (_state, _action) {
+  return fromJS({
+    number: void 0
+  });
+}), _handleActions2), fromJS({
   number: void 0
 }));
-var pageData = handleActions(_defineProperty({}, setPageData, function (state, action) {
+var pageData = handleActions((_handleActions3 = {}, _defineProperty(_handleActions3, setPageData, function (state, action) {
   return fromJS(action.payload);
-}), Map());
-var outcomes = handleActions(_defineProperty({}, setReportOutcomes, function (state, action) {
+}), _defineProperty(_handleActions3, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions3), Map());
+var outcomes = handleActions((_handleActions4 = {}, _defineProperty(_handleActions4, setReportOutcomes, function (state, action) {
   return fromJS(action.payload);
-}), Map());
-var rollups = handleActions(_defineProperty({}, setRollups, function (state, action) {
+}), _defineProperty(_handleActions4, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions4), Map());
+var rollups = handleActions((_handleActions5 = {}, _defineProperty(_handleActions5, setRollups, function (state, action) {
   return fromJS(action.payload);
-}), List());
-var loading = handleActions(_defineProperty({}, setLoading, function (state, action) {
+}), _defineProperty(_handleActions5, clearReportData, function (_state, _action) {
+  return List();
+}), _handleActions5), List());
+var loading = handleActions((_handleActions6 = {}, _defineProperty(_handleActions6, setLoading, function (state, action) {
   return fromJS(action.payload);
-}), false);
-var loadingRemainingPages = handleActions(_defineProperty({}, setLoadingRemainingPages, function (state, action) {
+}), _defineProperty(_handleActions6, clearReportData, function (_state, _action) {
+  return false;
+}), _handleActions6), false);
+var loadingRemainingPages = handleActions((_handleActions7 = {}, _defineProperty(_handleActions7, setLoadingRemainingPages, function (state, action) {
   return fromJS(action.payload);
-}), NOT_FETCHING);
-var results = handleActions(_defineProperty({}, setResults, function (state, action) {
+}), _defineProperty(_handleActions7, clearReportData, function (_state, _action) {
+  return NOT_FETCHING;
+}), _handleActions7), NOT_FETCHING);
+var results = handleActions((_handleActions8 = {}, _defineProperty(_handleActions8, setResults, function (state, action) {
   var _action$payload = action.payload,
       outcomeId = _action$payload.outcomeId,
       results = _action$payload.results,
@@ -51,7 +70,9 @@ var results = handleActions(_defineProperty({}, setResults, function (state, act
   var fetchedResults = Map(resultMap);
   var allResults = Map([].concat(_toConsumableArray(fetchedResults), _toConsumableArray(seenResults)));
   return state.set(outcomeId, allResults);
-}), Map());
+}), _defineProperty(_handleActions8, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions8), Map());
 var openReportAlignmentId = handleActions({
   VIEW_REPORT_ALIGNMENT: function VIEW_REPORT_ALIGNMENT(state, action) {
     return action.payload;