@instructure/outcomes-ui 2.1.6 → 2.1.8

package/lib/translated/en-AU-x-unimelb/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

package/lib/translated/en-AU-x-unimelb/store/report/reducers.js

@@ -21,30 +21,48 @@ var _constants = require("../../constants.js");
 
 var _actions = require("./actions.js");
 
-var users = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setUsers, function (state, action) {
+var _handleActions, _handleActions2, _handleActions3, _handleActions4, _handleActions5, _handleActions6, _handleActions7, _handleActions8;
+
+var users = (0, _reduxActions.handleActions)((_handleActions = {}, (0, _defineProperty2.default)(_handleActions, _actions.setUsers, function (_state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.Map)());
-var page = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setPage, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions), (0, _immutable.Map)());
+var page = (0, _reduxActions.handleActions)((_handleActions2 = {}, (0, _defineProperty2.default)(_handleActions2, _actions.setPage, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.fromJS)({
+}), (0, _defineProperty2.default)(_handleActions2, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.fromJS)({
+    number: void 0
+  });
+}), _handleActions2), (0, _immutable.fromJS)({
   number: void 0
 }));
-var pageData = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setPageData, function (state, action) {
+var pageData = (0, _reduxActions.handleActions)((_handleActions3 = {}, (0, _defineProperty2.default)(_handleActions3, _actions.setPageData, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.Map)());
-var outcomes = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setReportOutcomes, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions3, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions3), (0, _immutable.Map)());
+var outcomes = (0, _reduxActions.handleActions)((_handleActions4 = {}, (0, _defineProperty2.default)(_handleActions4, _actions.setReportOutcomes, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.Map)());
-var rollups = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setRollups, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions4, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions4), (0, _immutable.Map)());
+var rollups = (0, _reduxActions.handleActions)((_handleActions5 = {}, (0, _defineProperty2.default)(_handleActions5, _actions.setRollups, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.List)());
-var loading = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setLoading, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions5, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.List)();
+}), _handleActions5), (0, _immutable.List)());
+var loading = (0, _reduxActions.handleActions)((_handleActions6 = {}, (0, _defineProperty2.default)(_handleActions6, _actions.setLoading, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), false);
-var loadingRemainingPages = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setLoadingRemainingPages, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions6, _actions.clearReportData, function (_state, _action) {
+  return false;
+}), _handleActions6), false);
+var loadingRemainingPages = (0, _reduxActions.handleActions)((_handleActions7 = {}, (0, _defineProperty2.default)(_handleActions7, _actions.setLoadingRemainingPages, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), _constants.NOT_FETCHING);
-var results = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setResults, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions7, _actions.clearReportData, function (_state, _action) {
+  return _constants.NOT_FETCHING;
+}), _handleActions7), _constants.NOT_FETCHING);
+var results = (0, _reduxActions.handleActions)((_handleActions8 = {}, (0, _defineProperty2.default)(_handleActions8, _actions.setResults, function (state, action) {
   var _action$payload = action.payload,
       outcomeId = _action$payload.outcomeId,
       results = _action$payload.results,
@@ -67,7 +85,9 @@ var results = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({},
   var fetchedResults = (0, _immutable.Map)(resultMap);
   var allResults = (0, _immutable.Map)([].concat((0, _toConsumableArray2.default)(fetchedResults), (0, _toConsumableArray2.default)(seenResults)));
   return state.set(outcomeId, allResults);
-}), (0, _immutable.Map)());
+}), (0, _defineProperty2.default)(_handleActions8, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions8), (0, _immutable.Map)());
 var openReportAlignmentId = (0, _reduxActions.handleActions)({
   VIEW_REPORT_ALIGNMENT: function VIEW_REPORT_ALIGNMENT(state, action) {
     return action.payload;

package/lib/translated/en-CA/components/OutcomeCheckbox/__tests__/index.test.js

@@ -56,6 +56,11 @@ describe('OutcomeCheckbox', function () {
     var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react.default.createElement(_index.default, props));
     (0, _chai.expect)(wrapper.text()).to.match(/This is the Friendly Description/);
   });
+  it('does not render friendly description', function () {
+    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react.default.createElement(_index.default, makeProps()));
+    (0, _chai.expect)(wrapper.find('[data-automation="outcomeCheckbox__friendly_description_header"]').length).to.equal(0);
+    (0, _chai.expect)(wrapper.find('[data-automation="outcomeCheckbox__friendly_description_expanded"]').length).to.equal(0);
+  });
   it('renders an OutcomeDescription component', function () {
     var props = makeProps();
     var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react.default.createElement(_index.default, props));

package/lib/translated/en-CA/components/OutcomeView/__tests__/index.test.js

@@ -64,6 +64,11 @@ var sharedSpecs = function sharedSpecs(makeProps) {
     (0, _chai.expect)(text).to.match(/Friendly Description/);
     (0, _chai.expect)(text).to.match(/This is another description/);
   });
+  it('ensures Friendly Description does not show', function () {
+    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react.default.createElement(_index.default, makeProps()));
+    (0, _chai.expect)(wrapper.find('[data-automation="outcomeView__friendly_description_header"]').length).to.equal(0);
+    (0, _chai.expect)(wrapper.find('[data-automation="outcomeView__friendly_description_expanded"]').length).to.equal(0);
+  });
   it('meets a11y standards', function () {
     return (0, _checkA11y.default)( /*#__PURE__*/_react.default.createElement(_index.default, makeProps()));
   });

package/lib/translated/en-CA/components/OutcomesPerStudent/ExportCSVButton/index.js

@@ -72,7 +72,8 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
   var fetchCSVData = _ref.fetchCSVData,
       formatCSVData = _ref.formatCSVData,
       fetchingStatus = _ref.fetchingStatus,
-      artifactId = _ref.artifactId;
+      artifactId = _ref.artifactId,
+      focusedElement = _ref.focusedElement;
   var csvElementRef = (0, _react.useRef)(null);
 
   var exportCSV = function exportCSV() {
@@ -87,6 +88,11 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
       showProgressBar = _useBoolean2[1],
       hideProgressBar = _useBoolean2[2];
 
+  var _useState = (0, _react.useState)((0, _react.useRef)(null)),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      csvButtonRef = _useState2[0],
+      setCsvButtonRef = _useState2[1];
+
   var _useCSVExport = (0, _useCSVExport2.default)({
     fetchCSVData: fetchCSVData,
     fetchingStatus: fetchingStatus,
@@ -104,6 +110,11 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
   (0, _react.useEffect)(function () {
     if (exportState === _useCSVExport2.CSV_COMPLETE) {
       exportCSV();
+      setTimeout(function () {
+        if (focusedElement === csvButtonRef) {
+          csvButtonRef.focus();
+        }
+      }, 3000);
     }
   }, [exportState]);
   return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
@@ -144,7 +155,10 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
     color: canStartExport ? 'primary' : 'secondary',
     onClick: canStartExport ? beginExport : cancelExport,
     interaction: canStartExport ? 'enabled' : progressValue < 100 ? 'enabled' : 'disabled',
-    "data-automation": "outcomesPerStudent_exportCSVButton"
+    "data-automation": "outcomesPerStudent_exportCSVButton",
+    buttonRef: function buttonRef(ref) {
+      return setCsvButtonRef(ref);
+    }
   }, canStartExport ? "Export CSV" : "Cancel Export"), /*#__PURE__*/_react.default.createElement("span", {
     "aria-hidden": true
   }, /*#__PURE__*/_react.default.createElement(_reactCsv.CSVLink, {
@@ -161,7 +175,11 @@ ExportCSVButton.propTypes = {
   fetchCSVData: _propTypes.default.func.isRequired,
   formatCSVData: _propTypes.default.func.isRequired,
   fetchingStatus: _propTypes.default.string.isRequired,
-  artifactId: _propTypes.default.string.isRequired
+  artifactId: _propTypes.default.string.isRequired,
+  focusedElement: _propTypes.default.element
+};
+ExportCSVButton.defaultProps = {
+  focusedElement: null
 };
 var _default = ExportCSVButton;
 exports.default = _default;

package/lib/translated/en-CA/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/en-CA/components/OutcomesPerStudent/index.js

@@ -329,7 +329,7 @@ var OutcomesPerStudentReport = (_dec = (0, _uiThemeable.themeable)(_theme.defaul
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _this.renderExportButton = function (hasAnyStudents) {
+    _this.renderExportButton = function (hasAnyStudents, focusedElement) {
       var _this$props = _this.props,
           hasAnyOutcomes = _this$props.hasAnyOutcomes,
           loading = _this$props.loading,
@@ -351,7 +351,8 @@ var OutcomesPerStudentReport = (_dec = (0, _uiThemeable.themeable)(_theme.defaul
           fetchCSVData: fetchCSVData,
           formatCSVData: formatCSVData,
           fetchingStatus: csvFetchingStatus,
-          artifactId: artifactId
+          artifactId: artifactId,
+          focusedElement: focusedElement
         });
       }
     };
@@ -372,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() {
@@ -468,6 +474,7 @@ var OutcomesPerStudentReport = (_dec = (0, _uiThemeable.themeable)(_theme.defaul
           hasAnyOutcomes = _this$props4.hasAnyOutcomes,
           loading = _this$props4.loading;
       var hasAnyStudents = users && users.length > 0;
+      var focusedElement = document.activeElement;
 
       var renderReportContent = function renderReportContent() {
         if (loading) {
@@ -483,7 +490,7 @@ var OutcomesPerStudentReport = (_dec = (0, _uiThemeable.themeable)(_theme.defaul
 
       return /*#__PURE__*/_react.default.createElement("div", {
         className: styles.background
-      }, this.renderExportButton(hasAnyStudents), renderReportContent());
+      }, this.renderExportButton(hasAnyStudents, focusedElement), renderReportContent());
     }
   }]);
   OutcomesPerStudentReport.displayName = "OutcomesPerStudentReport";
@@ -508,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/en-CA/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.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.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';

package/lib/translated/en-CA/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/en-CA/hooks/useCSVExport.js

@@ -98,7 +98,7 @@ var useCSVExport = function useCSVExport(_ref) {
       setTimeout(function () {
         hideProgressBar();
         setExportState(NOT_EXPORTING);
-      }, 2000);
+      }, 3000);
     }
   }, [exportState, formattedData, progressValue]);
 

package/lib/translated/en-CA/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/en-CA/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/en-CA/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