@instructure/outcomes-ui 4.1.1 → 4.1.2

package/lib/translated/en-GB/components/Gradebook/toolbar/SettingsTray/index.js

@@ -16,9 +16,8 @@ var _uiFlex = require("@instructure/ui-flex");
 var _uiText = require("@instructure/ui-text");
 var _uiTray = require("@instructure/ui-tray");
 var _canvasTheme = require("@instructure/canvas-theme");
-var _index = require("../../context/GradebookConfigContext/index.js");
-var _index2 = require("../../context/GradebookAppContext/index.js");
-var _index3 = require("../../../FlashAlert/index.js");
+var _index = require("../../context/GradebookAppContext/index.js");
+var _index2 = require("../../../FlashAlert/index.js");
 /**
  * SettingsTray component that provides the tray chrome and renders the SettingsTrayContent.
  * This component handles:
@@ -30,15 +29,13 @@ var _index3 = require("../../../FlashAlert/index.js");
  */
 var SettingsTray = exports.SettingsTray = function SettingsTray(_ref) {
   var open = _ref.open,
-    onDismiss = _ref.onDismiss;
-  var _useGradebookConfig = (0, _index.useGradebookConfig)(),
-    components = _useGradebookConfig.components;
-  var _useGradebookApp = (0, _index2.useGradebookApp)(),
+    onDismiss = _ref.onDismiss,
+    SettingsTrayContent = _ref.SettingsTrayContent;
+  var _useGradebookApp = (0, _index.useGradebookApp)(),
     _useGradebookApp$sett = _useGradebookApp.settings,
     contextSettings = _useGradebookApp$sett.settings,
     setSettings = _useGradebookApp$sett.setSettings,
     onSave = _useGradebookApp$sett.onSave;
-  var SettingsTrayContent = components.SettingsTrayContent;
   var _useState = (0, _react.useState)(contextSettings),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     localSettings = _useState2[0],
@@ -71,13 +68,13 @@ var SettingsTray = exports.SettingsTray = function SettingsTray(_ref) {
             result = _context.v;
             if (result.success) {
               setSettings(localSettings);
-              (0, _index3.showFlashAlert)({
+              (0, _index2.showFlashAlert)({
                 message: "Your settings have been saved.",
                 type: 'success'
               });
               onDismiss();
             } else {
-              (0, _index3.showFlashAlert)({
+              (0, _index2.showFlashAlert)({
                 message: result.error || "There was an error saving your settings. Please try again.",
                 type: 'error'
               });
@@ -87,7 +84,7 @@ var SettingsTray = exports.SettingsTray = function SettingsTray(_ref) {
           case 3:
             _context.p = 3;
             _t = _context.v;
-            (0, _index3.showFlashAlert)({
+            (0, _index2.showFlashAlert)({
               message: "An unexpected error occurred while saving settings",
               type: 'error',
               err: _t

package/lib/translated/en-GB/components/Gradebook/toolbar/SettingsTray/index.stories.js

@@ -34,7 +34,8 @@ var Default = exports.Default = {
       open: open,
       onDismiss: function onDismiss() {
         return setOpen(false);
-      }
+      },
+      SettingsTrayContent: _decorators.ExampleSettingsTrayContent
     }));
   }
 };
@@ -42,7 +43,8 @@ var Open = exports.Open = {
   render: function render() {
     return /*#__PURE__*/_react.default.createElement(_index.SettingsTray, {
       open: true,
-      onDismiss: function onDismiss() {}
+      onDismiss: function onDismiss() {},
+      SettingsTrayContent: _decorators.ExampleSettingsTrayContent
     });
   }
 };

package/lib/translated/en-GB-x-ukhe/components/Gradebook/GradebookApp.js

@@ -10,10 +10,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _i18n = require("../../i18n/i18n.js");
 var _index = require("./context/GradebookConfigContext/index.js");
-var _index2 = require("./context/GradebookAppContext/index.js");
 var GradebookApp = exports.GradebookApp = function GradebookApp(_ref) {
   var config = _ref.config,
-    settings = _ref.settings,
     _ref$translations = _ref.translations,
     translations = _ref$translations === void 0 ? {
       language: 'en',
@@ -38,7 +36,5 @@ var GradebookApp = exports.GradebookApp = function GradebookApp(_ref) {
   }
   return /*#__PURE__*/_react.default.createElement(_index.GradebookConfigProvider, {
     config: config
-  }, /*#__PURE__*/_react.default.createElement(_index2.GradebookAppProvider, {
-    settings: settings
-  }, children || /*#__PURE__*/_react.default.createElement("div", null, "GradebookAppRoot")));
+  }, children || /*#__PURE__*/_react.default.createElement("div", null, "GradebookAppRoot"));
 };

package/lib/translated/en-GB-x-ukhe/components/Gradebook/GradebookApp.stories.js

@@ -1,59 +1,16 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Default = void 0;
-var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _react = _interopRequireDefault(require("react"));
 var _GradebookApp = require("./GradebookApp.js");
-var _addonActions = require("@storybook/addon-actions");
-// Example minimal settings type
-
 var meta = {
   title: 'Gradebook/GradebookApp',
   component: _GradebookApp.GradebookApp
 };
 var _default = exports.default = meta;
-var defaultConfig = {
-  components: {
-    StudentPopover: function StudentPopover() {
-      return /*#__PURE__*/_react.default.createElement("div", null, "Student Popover");
-    },
-    SettingsTrayContent: function SettingsTrayContent() {
-      return /*#__PURE__*/_react.default.createElement("div", null, "Settings Content");
-    }
-  }
-};
-var defaultSettings = {
-  settings: {
-    option1: true
-  },
-  onSave: function () {
-    var _onSave = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regenerator2.default)().m(function _callee(settings) {
-      return (0, _regenerator2.default)().w(function (_context) {
-        while (1) switch (_context.n) {
-          case 0:
-            (0, _addonActions.action)('onSave')(settings);
-            _context.n = 1;
-            return new Promise(function (resolve) {
-              return setTimeout(resolve, 1000);
-            });
-          case 1:
-            return _context.a(2, {
-              success: true
-            });
-        }
-      }, _callee);
-    }));
-    function onSave(_x) {
-      return _onSave.apply(this, arguments);
-    }
-    return onSave;
-  }()
-};
+var defaultConfig = {};
 var resourceOverrides = {
   en: {
     'align_new_outcomes_2a2d3d48': 'Align new outcomes',
@@ -103,7 +60,6 @@ var resourceOverrides = {
 var Default = exports.Default = {
   args: {
     config: defaultConfig,
-    settings: defaultSettings,
     translations: {
       language: 'en',
       resourceOverrides: resourceOverrides,

package/lib/translated/en-GB-x-ukhe/components/Gradebook/__tests__/index.test.js

@@ -49,24 +49,7 @@ _globals.jest.mock("../context/GradebookAppContext", function () {
 });
 var mockSetupI18n = i18nModule.setupI18n;
 describe('GradebookApp', function () {
-  var mockConfig = {
-    components: {
-      StudentPopover: function StudentPopover() {
-        return /*#__PURE__*/_react.default.createElement("div", null, "Student Popover");
-      },
-      SettingsTrayContent: function SettingsTrayContent() {
-        return /*#__PURE__*/_react.default.createElement("div", null, "Settings");
-      }
-    }
-  };
-  var mockSettingsData = {};
-  var mockOnSave = _globals.jest.fn().mockResolvedValue({
-    success: true
-  });
-  var mockSettings = {
-    settings: mockSettingsData,
-    onSave: mockOnSave
-  };
+  var mockConfig = {};
   beforeEach(function () {
     _globals.jest.clearAllMocks();
   });
@@ -76,8 +59,7 @@ describe('GradebookApp', function () {
         while (1) switch (_context.n) {
           case 0:
             (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
-              config: mockConfig,
-              settings: mockSettings
+              config: mockConfig
             }));
 
             // Should call setupI18n with default language
@@ -96,7 +78,6 @@ describe('GradebookApp', function () {
     it('renders with i18n disabled', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
         config: mockConfig,
-        settings: mockSettings,
         translations: {
           i18nEnabled: false
         }
@@ -114,7 +95,6 @@ describe('GradebookApp', function () {
           case 0:
             (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 language: 'es',
                 i18nEnabled: true
@@ -142,7 +122,6 @@ describe('GradebookApp', function () {
             };
             (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 language: 'fr',
                 i18nEnabled: true,
@@ -167,7 +146,6 @@ describe('GradebookApp', function () {
           case 0:
             (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 i18nEnabled: false
               }
@@ -184,7 +162,6 @@ describe('GradebookApp', function () {
     it('renders fallback content when no children provided', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
         config: mockConfig,
-        settings: mockSettings,
         translations: {
           i18nEnabled: false
         }
@@ -196,7 +173,6 @@ describe('GradebookApp', function () {
     it('passes gradebookConfig to GradebookConfigProvider', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
         config: mockConfig,
-        settings: mockSettings,
         translations: {
           i18nEnabled: false
         }
@@ -205,15 +181,10 @@ describe('GradebookApp', function () {
       (0, _globals.expect)(provider).toBeInTheDocument();
       var configData = provider.getAttribute('data-config');
       (0, _globals.expect)(configData).toBeTruthy();
-      var parsedConfig = JSON.parse(configData);
-      (0, _globals.expect)(parsedConfig).toMatchObject({
-        components: _globals.expect.any(Object)
-      });
     });
     it('wraps children with GradebookConfigProvider', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
         config: mockConfig,
-        settings: mockSettings,
         translations: {
           i18nEnabled: false
         }
@@ -232,7 +203,6 @@ describe('GradebookApp', function () {
           case 0:
             (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 language: 'en',
                 i18nEnabled: true
@@ -260,7 +230,6 @@ describe('GradebookApp', function () {
           case 0:
             _render = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 language: 'en',
                 i18nEnabled: true
@@ -270,7 +239,6 @@ describe('GradebookApp', function () {
             (0, _globals.expect)(mockSetupI18n).toHaveBeenCalledTimes(1);
             rerender(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 language: 'es',
                 i18nEnabled: true
@@ -303,7 +271,6 @@ describe('GradebookApp', function () {
             };
             _render2 = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 language: 'en',
                 i18nEnabled: true,
@@ -313,7 +280,6 @@ describe('GradebookApp', function () {
             (0, _globals.expect)(mockSetupI18n).toHaveBeenCalledWith('en', overrides1);
             rerender(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
               config: mockConfig,
-              settings: mockSettings,
               translations: {
                 language: 'en',
                 i18nEnabled: true,
@@ -333,7 +299,6 @@ describe('GradebookApp', function () {
     it('does not re-run setupI18n when i18nEnabled changes to false', function () {
       var _render3 = (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
           config: mockConfig,
-          settings: mockSettings,
           translations: {
             language: 'en',
             i18nEnabled: true
@@ -343,7 +308,6 @@ describe('GradebookApp', function () {
       (0, _globals.expect)(mockSetupI18n).toHaveBeenCalledTimes(1);
       rerender(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
         config: mockConfig,
-        settings: mockSettings,
         translations: {
           i18nEnabled: false
         }
@@ -354,29 +318,10 @@ describe('GradebookApp', function () {
     });
   });
   describe('Type Safety', function () {
-    it('accepts gradebookConfig with custom settings type', function () {
-      var customConfig = {
-        components: {
-          StudentPopover: function StudentPopover() {
-            return /*#__PURE__*/_react.default.createElement("div", null, "Popover");
-          },
-          SettingsTrayContent: function SettingsTrayContent() {
-            return /*#__PURE__*/_react.default.createElement("div", null, "Settings");
-          }
-        }
-      };
-      var customSettingsData = {
-        customOption: true
-      };
-      var customOnSave = _globals.jest.fn().mockResolvedValue({
-        success: true
-      });
+    it('accepts gradebookConfig', function () {
+      var customConfig = {};
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
         config: customConfig,
-        settings: {
-          settings: customSettingsData,
-          onSave: customOnSave
-        },
         translations: {
           i18nEnabled: false
         }

package/lib/translated/en-GB-x-ukhe/components/Gradebook/context/GradebookConfigContext/GradebookConfigContext.js

@@ -5,5 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GradebookConfigContext = void 0;
 var _react = require("react");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 var GradebookConfigContext = exports.GradebookConfigContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/translated/en-GB-x-ukhe/components/Gradebook/context/GradebookConfigContext/__tests__/GradebookConfigContext.test.js

@@ -11,48 +11,44 @@ var TestConfigConsumer = function TestConfigConsumer() {
   var config = (0, _index.useGradebookConfig)();
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": "config-consumer"
-  }, config.components.StudentPopover ? 'has-student-popover' : 'no-student-popover');
+  }, config.masteryLevelConfig ? 'has-mastery-config' : 'no-mastery-config');
 };
 
-// Test component that uses the components
-var TestComponentsConsumer = function TestComponentsConsumer() {
+// Test component that uses the mastery level config
+var TestMasteryLevelConsumer = function TestMasteryLevelConsumer() {
+  var _config$masteryLevelC, _config$masteryLevelC2;
   var config = (0, _index.useGradebookConfig)();
-  var components = config.components;
-  var componentCount = Object.keys(components).length;
+  var availableLevels = ((_config$masteryLevelC = config.masteryLevelConfig) === null || _config$masteryLevelC === void 0 ? void 0 : (_config$masteryLevelC2 = _config$masteryLevelC.availableLevels) === null || _config$masteryLevelC2 === void 0 ? void 0 : _config$masteryLevelC2.length) || 0;
   return /*#__PURE__*/_react.default.createElement("div", {
-    "data-testid": "component-count"
-  }, componentCount);
+    "data-testid": "mastery-level-count"
+  }, availableLevels);
 };
-var DEFAULT_CONFIG = {
-  components: {
-    StudentPopover: function StudentPopover() {
-      return /*#__PURE__*/_react.default.createElement("div", null, "Mock StudentPopover");
-    },
-    SettingsTrayContent: function SettingsTrayContent() {
-      return /*#__PURE__*/_react.default.createElement("div", null, "Settings Content");
-    }
+var DEFAULT_CONFIG = {};
+var CONFIG_WITH_MASTERY = {
+  masteryLevelConfig: {
+    availableLevels: ['exceeds_mastery', 'mastery', 'near_mastery']
   }
 };
 describe('GradebookConfigContext', function () {
   describe('GradebookConfigProvider', function () {
     it('provides config to children', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.GradebookConfigProvider, {
-        config: DEFAULT_CONFIG
+        config: CONFIG_WITH_MASTERY
       }, /*#__PURE__*/_react.default.createElement(TestConfigConsumer, null)));
-      (0, _globals.expect)(_react2.screen.getByTestId('config-consumer')).toHaveTextContent('has-student-popover');
+      (0, _globals.expect)(_react2.screen.getByTestId('config-consumer')).toHaveTextContent('has-mastery-config');
     });
-    it('requires components field', function () {
+    it('allows empty config', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.GradebookConfigProvider, {
         config: DEFAULT_CONFIG
       }, /*#__PURE__*/_react.default.createElement(TestConfigConsumer, null)));
       (0, _globals.expect)(_react2.screen.getByTestId('config-consumer')).toBeInTheDocument();
-      (0, _globals.expect)(_react2.screen.getByTestId('config-consumer')).toHaveTextContent('has-student-popover');
+      (0, _globals.expect)(_react2.screen.getByTestId('config-consumer')).toHaveTextContent('no-mastery-config');
     });
-    it('requires StudentPopover in components', function () {
+    it('provides mastery level config when specified', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.GradebookConfigProvider, {
-        config: DEFAULT_CONFIG
-      }, /*#__PURE__*/_react.default.createElement(TestComponentsConsumer, null)));
-      (0, _globals.expect)(_react2.screen.getByTestId('component-count')).toHaveTextContent('2');
+        config: CONFIG_WITH_MASTERY
+      }, /*#__PURE__*/_react.default.createElement(TestMasteryLevelConsumer, null)));
+      (0, _globals.expect)(_react2.screen.getByTestId('mastery-level-count')).toHaveTextContent('3');
     });
   });
   describe('useGradebookConfig', function () {
@@ -66,24 +62,24 @@ describe('GradebookConfigContext', function () {
     });
     it('returns config when used inside provider', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.GradebookConfigProvider, {
-        config: DEFAULT_CONFIG
+        config: CONFIG_WITH_MASTERY
       }, /*#__PURE__*/_react.default.createElement(TestConfigConsumer, null)));
-      (0, _globals.expect)(_react2.screen.getByTestId('config-consumer')).toHaveTextContent('has-student-popover');
+      (0, _globals.expect)(_react2.screen.getByTestId('config-consumer')).toHaveTextContent('has-mastery-config');
     });
   });
-  describe('components', function () {
+  describe('masteryLevelConfig', function () {
     it('throws error when used outside provider', function () {
       var consoleSpy = jest.spyOn(console, 'error').mockImplementation(function () {});
       (0, _globals.expect)(function () {
-        (0, _react2.render)(/*#__PURE__*/_react.default.createElement(TestComponentsConsumer, null));
+        (0, _react2.render)(/*#__PURE__*/_react.default.createElement(TestMasteryLevelConsumer, null));
       }).toThrow('useGradebookConfig must be used within GradebookConfigProvider');
       consoleSpy.mockRestore();
     });
-    it('returns components when provided', function () {
+    it('returns mastery level config when provided', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.GradebookConfigProvider, {
-        config: DEFAULT_CONFIG
-      }, /*#__PURE__*/_react.default.createElement(TestComponentsConsumer, null)));
-      (0, _globals.expect)(_react2.screen.getByTestId('component-count')).toHaveTextContent('2');
+        config: CONFIG_WITH_MASTERY
+      }, /*#__PURE__*/_react.default.createElement(TestMasteryLevelConsumer, null)));
+      (0, _globals.expect)(_react2.screen.getByTestId('mastery-level-count')).toHaveTextContent('3');
     });
   });
 });

package/lib/translated/en-GB-x-ukhe/components/Gradebook/gradebook-table/ScoreCellContent/__tests__/index.test.js

@@ -82,12 +82,12 @@ describe('ScoreCellContent', function () {
       _react2.fireEvent.click(button);
       expect(onAction).toHaveBeenCalledTimes(1);
     });
-    it('disables action button when onAction is undefined', function () {
+    it('does not show action button when onAction is undefined', function () {
       (0, _react2.render)(/*#__PURE__*/_react.default.createElement(_index.ScoreCellContent, Object.assign({}, defaultProps, {
         onAction: void 0,
         focus: true
       })));
-      expect(_react2.screen.queryByTestId('score-cell-action-button')).toHaveAttribute('disabled');
+      expect(_react2.screen.queryByTestId('score-cell-action-button')).not.toBeInTheDocument();
     });
   });
   describe('scoreDisplayFormat', function () {

package/lib/translated/en-GB-x-ukhe/components/Gradebook/gradebook-table/ScoreCellContent/index.js

@@ -28,7 +28,7 @@ var ScoreCellContent = exports.ScoreCellContent = function ScoreCellContent(_ref
     hoverInternal = _useState2[0],
     setHoverInternal = _useState2[1];
   var hover = hoverControlled !== null && hoverControlled !== void 0 ? hoverControlled : hoverInternal;
-  var showAction = focus || hover;
+  var showAction = onAction && (focus || hover);
   var handleMouseEnter = function handleMouseEnter() {
     if (hoverControlled === void 0) {
       setHoverInternal(true);
@@ -74,7 +74,6 @@ var ScoreCellContent = exports.ScoreCellContent = function ScoreCellContent(_ref
     renderIcon: /*#__PURE__*/_react.default.createElement(_uiIcons.IconExpandStartLine, null),
     screenReaderLabel: "View Contributing Score Details",
     onClick: onAction,
-    disabled: !onAction,
     "data-testid": "score-cell-action-button"
   })));
 };

package/lib/translated/en-GB-x-ukhe/components/Gradebook/gradebook-table/ScoreCellContent/index.stories.js

@@ -13,6 +13,11 @@ var _index = require("./index.js");
 var meta = {
   title: 'Gradebook/ScoreCellContent',
   component: _index.ScoreCellContent,
+  parameters: {
+    actions: {
+      argTypesRegex: ''
+    } // Disable auto-actions
+  },
   decorators: [function (Story) {
     return /*#__PURE__*/_react.default.createElement(_uiView.View, {
       width: "200px",