npm - @instructure/outcomes-ui - Versions diffs - 2.1.5 → 2.1.7 - Mend

@instructure/outcomes-ui 2.1.5 → 2.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (401) hide show

package/lib/translated/en/components/OutcomeView/__tests__/index.test.js CHANGED Viewed

@@ -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/components/OutcomesPerStudent/ExportCSVButton/index.js CHANGED Viewed

@@ -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/components/OutcomesPerStudent/index.js CHANGED Viewed

@@ -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/en/hooks/useCSVExport.js CHANGED Viewed

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

package/lib/translated/en-AU/components/OutcomeCheckbox/__tests__/index.test.js CHANGED Viewed

@@ -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-AU/components/OutcomeView/__tests__/index.test.js CHANGED Viewed

@@ -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-AU/components/OutcomesPerStudent/ExportCSVButton/index.js CHANGED Viewed

@@ -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-AU/components/OutcomesPerStudent/index.js CHANGED Viewed

@@ -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/en-AU/hooks/useCSVExport.js CHANGED Viewed

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

package/lib/translated/en-AU-x-unimelb/components/OutcomeCheckbox/__tests__/index.test.js CHANGED Viewed

@@ -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-AU-x-unimelb/components/OutcomeView/__tests__/index.test.js CHANGED Viewed

@@ -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-AU-x-unimelb/components/OutcomesPerStudent/ExportCSVButton/index.js CHANGED Viewed

@@ -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-AU-x-unimelb/components/OutcomesPerStudent/index.js CHANGED Viewed

@@ -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/en-AU-x-unimelb/hooks/useCSVExport.js CHANGED Viewed

@@ -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/components/OutcomeCheckbox/__tests__/index.test.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/index.js CHANGED Viewed

@@ -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/en-CA/hooks/useCSVExport.js CHANGED Viewed

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

package/lib/translated/en-CY/components/OutcomeCheckbox/__tests__/index.test.js CHANGED Viewed

@@ -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-CY/components/OutcomeView/__tests__/index.test.js CHANGED Viewed

@@ -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-CY/components/OutcomesPerStudent/ExportCSVButton/index.js CHANGED Viewed

@@ -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-CY/components/OutcomesPerStudent/index.js CHANGED Viewed

@@ -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/en-CY/hooks/useCSVExport.js CHANGED Viewed

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

package/lib/translated/en-GB/components/OutcomeCheckbox/__tests__/index.test.js CHANGED Viewed

@@ -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));