@instructure/outcomes-ui 2.1.6 → 2.1.8

package/es/components/OutcomeCheckbox/__tests__/index.test.js

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

package/es/components/OutcomeView/__tests__/index.test.js

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

package/es/components/OutcomesPerStudent/ExportCSVButton/index.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { Button } from '@instructure/ui-buttons';
 import { CSVLink } from 'react-csv';
@@ -48,7 +48,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 = useRef(null);
 
   var exportCSV = function exportCSV() {
@@ -63,6 +64,11 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
       showProgressBar = _useBoolean2[1],
       hideProgressBar = _useBoolean2[2];
 
+  var _useState = useState(useRef(null)),
+      _useState2 = _slicedToArray(_useState, 2),
+      csvButtonRef = _useState2[0],
+      setCsvButtonRef = _useState2[1];
+
   var _useCSVExport = useCSVExport({
     fetchCSVData: fetchCSVData,
     fetchingStatus: fetchingStatus,
@@ -80,6 +86,11 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
   useEffect(function () {
     if (exportState === CSV_COMPLETE) {
       exportCSV();
+      setTimeout(function () {
+        if (focusedElement === csvButtonRef) {
+          csvButtonRef.focus();
+        }
+      }, 3000);
     }
   }, [exportState]);
   return /*#__PURE__*/React.createElement(Flex, {
@@ -124,7 +135,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 ? t('Export CSV') : t('Cancel Export')), /*#__PURE__*/React.createElement("span", {
     "aria-hidden": true
   }, /*#__PURE__*/React.createElement(CSVLink, {
@@ -141,6 +155,10 @@ ExportCSVButton.propTypes = {
   fetchCSVData: PropTypes.func.isRequired,
   formatCSVData: PropTypes.func.isRequired,
   fetchingStatus: PropTypes.string.isRequired,
-  artifactId: PropTypes.string.isRequired
+  artifactId: PropTypes.string.isRequired,
+  focusedElement: PropTypes.element
+};
+ExportCSVButton.defaultProps = {
+  focusedElement: null
 };
 export default ExportCSVButton;

package/es/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/components/OutcomesPerStudent/index.js

@@ -295,7 +295,7 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
 
     _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,
@@ -317,7 +317,8 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
           fetchCSVData: fetchCSVData,
           formatCSVData: formatCSVData,
           fetchingStatus: csvFetchingStatus,
-          artifactId: artifactId
+          artifactId: artifactId,
+          focusedElement: focusedElement
         });
       }
     };
@@ -338,6 +339,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() {
@@ -434,6 +440,7 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
           hasAnyOutcomes = _this$props4.hasAnyOutcomes,
           loading = _this$props4.loading;
       var hasAnyStudents = users && users.length > 0;
+      var focusedElement = document.activeElement;
 
       var renderReportContent = function renderReportContent() {
         if (loading) {
@@ -449,7 +456,7 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
 
       return /*#__PURE__*/React.createElement("div", {
         className: styles.background
-      }, this.renderExportButton(hasAnyStudents), renderReportContent());
+      }, this.renderExportButton(hasAnyStudents, focusedElement), renderReportContent());
     }
   }]);
 
@@ -475,6 +482,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/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';

package/es/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/hooks/useCSVExport.js

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

package/es/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/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/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/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;

package/es/translated/ar/components/OutcomeCheckbox/__tests__/index.test.js

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

package/es/translated/ar/components/OutcomeView/__tests__/index.test.js

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

package/es/translated/ar/components/OutcomesPerStudent/ExportCSVButton/index.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { Button } from '@instructure/ui-buttons';
 import { CSVLink } from 'react-csv';
@@ -47,7 +47,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 = useRef(null);
 
   var exportCSV = function exportCSV() {
@@ -62,6 +63,11 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
       showProgressBar = _useBoolean2[1],
       hideProgressBar = _useBoolean2[2];
 
+  var _useState = useState(useRef(null)),
+      _useState2 = _slicedToArray(_useState, 2),
+      csvButtonRef = _useState2[0],
+      setCsvButtonRef = _useState2[1];
+
   var _useCSVExport = useCSVExport({
     fetchCSVData: fetchCSVData,
     fetchingStatus: fetchingStatus,
@@ -79,6 +85,11 @@ var ExportCSVButton = function ExportCSVButton(_ref) {
   useEffect(function () {
     if (exportState === CSV_COMPLETE) {
       exportCSV();
+      setTimeout(function () {
+        if (focusedElement === csvButtonRef) {
+          csvButtonRef.focus();
+        }
+      }, 3000);
     }
   }, [exportState]);
   return /*#__PURE__*/React.createElement(Flex, {
@@ -119,7 +130,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.createElement("span", {
     "aria-hidden": true
   }, /*#__PURE__*/React.createElement(CSVLink, {
@@ -136,6 +150,10 @@ ExportCSVButton.propTypes = {
   fetchCSVData: PropTypes.func.isRequired,
   formatCSVData: PropTypes.func.isRequired,
   fetchingStatus: PropTypes.string.isRequired,
-  artifactId: PropTypes.string.isRequired
+  artifactId: PropTypes.string.isRequired,
+  focusedElement: PropTypes.element
+};
+ExportCSVButton.defaultProps = {
+  focusedElement: null
 };
 export default ExportCSVButton;

package/es/translated/ar/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()));
   });