@instructure/outcomes-ui 2.1.5 → 2.1.7

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

@@ -298,7 +298,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,
@@ -320,7 +320,8 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
           fetchCSVData: fetchCSVData,
           formatCSVData: formatCSVData,
           fetchingStatus: csvFetchingStatus,
-          artifactId: artifactId
+          artifactId: artifactId,
+          focusedElement: focusedElement
         });
       }
     };
@@ -437,6 +438,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) {
@@ -452,7 +454,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());
     }
   }]);
 

package/es/translated/vi/hooks/useCSVExport.js

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

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

@@ -298,7 +298,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,
@@ -320,7 +320,8 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
           fetchCSVData: fetchCSVData,
           formatCSVData: formatCSVData,
           fetchingStatus: csvFetchingStatus,
-          artifactId: artifactId
+          artifactId: artifactId,
+          focusedElement: focusedElement
         });
       }
     };
@@ -437,6 +438,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) {
@@ -452,7 +454,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());
     }
   }]);
 

package/es/translated/zh-Hans/hooks/useCSVExport.js

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

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

@@ -298,7 +298,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,
@@ -320,7 +320,8 @@ var OutcomesPerStudentReport = (_dec = themeable(theme, styles), _dec(_class = (
           fetchCSVData: fetchCSVData,
           formatCSVData: formatCSVData,
           fetchingStatus: csvFetchingStatus,
-          artifactId: artifactId
+          artifactId: artifactId,
+          focusedElement: focusedElement
         });
       }
     };
@@ -437,6 +438,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) {
@@ -452,7 +454,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());
     }
   }]);
 

package/es/translated/zh-Hant/hooks/useCSVExport.js

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

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

@@ -74,7 +74,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() {
@@ -89,6 +90,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,
@@ -106,6 +112,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, {
@@ -150,7 +161,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 ? (0, _formatMessage.default)('Export CSV') : (0, _formatMessage.default)('Cancel Export')), /*#__PURE__*/_react.default.createElement("span", {
     "aria-hidden": true
   }, /*#__PURE__*/_react.default.createElement(_reactCsv.CSVLink, {
@@ -167,7 +181,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/components/OutcomesPerStudent/index.js

@@ -327,7 +327,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,
@@ -349,7 +349,8 @@ var OutcomesPerStudentReport = (_dec = (0, _uiThemeable.themeable)(_theme.defaul
           fetchCSVData: fetchCSVData,
           formatCSVData: formatCSVData,
           fetchingStatus: csvFetchingStatus,
-          artifactId: artifactId
+          artifactId: artifactId,
+          focusedElement: focusedElement
         });
       }
     };
@@ -466,6 +467,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) {
@@ -481,7 +483,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";

package/lib/hooks/useCSVExport.js

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

package/lib/translated/ar/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/ar/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/ar/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/ar/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
         });
       }
     };
@@ -468,6 +469,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 +485,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";

package/lib/translated/ar/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/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));