@instructure/outcomes-ui 4.1.1 → 4.1.2

package/es/components/Gradebook/gradebook-table/StudentCell/index.js

@@ -3,7 +3,6 @@ import { Avatar } from '@instructure/ui-avatar';
 import { Flex } from '@instructure/ui-flex';
 import { Text } from '@instructure/ui-text';
 import { SecondaryInfoDisplay, NameDisplayFormat } from "../../../../util/gradebook/constants.js";
-import { useGradebookConfig } from "../../context/GradebookConfigContext/index.js";
 var getSecondaryInfo = function getSecondaryInfo(student, secondaryInfoDisplay) {
   if (!secondaryInfoDisplay) return null;
   switch (secondaryInfoDisplay) {
@@ -18,16 +17,12 @@ var getSecondaryInfo = function getSecondaryInfo(student, secondaryInfoDisplay)
   }
 };
 export var StudentCell = function StudentCell(_ref) {
-  var courseId = _ref.courseId,
-    student = _ref.student,
-    masteryScores = _ref.masteryScores,
+  var student = _ref.student,
     secondaryInfoDisplay = _ref.secondaryInfoDisplay,
     _ref$showStudentAvata = _ref.showStudentAvatar,
     showStudentAvatar = _ref$showStudentAvata === void 0 ? true : _ref$showStudentAvata,
-    nameDisplayFormat = _ref.nameDisplayFormat;
-  var _useGradebookConfig = useGradebookConfig(),
-    components = _useGradebookConfig.components;
-  var StudentPopover = components.StudentPopover;
+    nameDisplayFormat = _ref.nameDisplayFormat,
+    studentPopover = _ref.studentPopover;
   var shouldShowStudentStatus = student.status === 'inactive' || student.status === 'concluded';
   var secondaryInfo = getSecondaryInfo(student, secondaryInfoDisplay);
   var studentName = nameDisplayFormat === NameDisplayFormat.LAST_FIRST ? student.sortable_name : student.display_name;
@@ -49,13 +44,7 @@ export var StudentCell = function StudentCell(_ref) {
   }, /*#__PURE__*/React.createElement(Flex, {
     direction: "column",
     textAlign: "start"
-  }, /*#__PURE__*/React.createElement(StudentPopover, {
-    key: student.id,
-    student: student,
-    studentName: studentName,
-    courseId: courseId,
-    masteryScores: masteryScores
-  }), secondaryInfo !== null && /*#__PURE__*/React.createElement(Text, {
+  }, studentPopover, secondaryInfo !== null && /*#__PURE__*/React.createElement(Text, {
     size: "legend",
     color: "secondary",
     "data-testid": "student-secondary-info"

package/es/components/Gradebook/gradebook-table/StudentCell/index.stories.js

@@ -2,23 +2,25 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React from 'react';
 import { View } from '@instructure/ui-view';
 import { SecondaryInfoDisplay, NameDisplayFormat } from "../../../../util/gradebook/constants.js";
-import { StoryWrapper } from "../../storybook/decorators.js";
-import { mockMasteryScores, mockStudent, mockStudentLongName } from "../../__mocks__/mockData.js";
+import { mockStudent, mockStudentLongName } from "../../__mocks__/mockData.js";
+import { createStudentPopover, StoryWrapper } from "../../storybook/decorators.js";
 import { StudentCell } from "../../../../index.js";
 var meta = {
   title: 'Gradebook/StudentCell',
   component: StudentCell,
   decorators: [function (Story) {
-    return /*#__PURE__*/React.createElement(View, {
+    return /*#__PURE__*/React.createElement(StoryWrapper, null, /*#__PURE__*/React.createElement(View, {
       as: "div",
       width: "300px",
       height: "48px",
       display: "block"
-    }, /*#__PURE__*/React.createElement(StoryWrapper, null, /*#__PURE__*/React.createElement(Story, null)));
+    }, /*#__PURE__*/React.createElement(Story, null)));
   }],
   args: {
-    courseId: '123',
-    masteryScores: mockMasteryScores
+    studentPopover: createStudentPopover({
+      studentName: mockStudent.display_name,
+      student: mockStudent
+    })
   }
 };
 export default meta;
@@ -49,7 +51,11 @@ export var LastFirstFormat = {
   args: {
     student: mockStudent,
     nameDisplayFormat: NameDisplayFormat.LAST_FIRST,
-    secondaryInfoDisplay: SecondaryInfoDisplay.SIS_ID
+    secondaryInfoDisplay: SecondaryInfoDisplay.SIS_ID,
+    studentPopover: createStudentPopover({
+      studentName: mockStudent.sortable_name,
+      student: mockStudent
+    })
   }
 };
 export var FirstLastFormat = {
@@ -62,14 +68,22 @@ export var FirstLastFormat = {
 export var LongName = {
   args: {
     student: mockStudentLongName,
-    secondaryInfoDisplay: SecondaryInfoDisplay.SIS_ID
+    secondaryInfoDisplay: SecondaryInfoDisplay.SIS_ID,
+    studentPopover: createStudentPopover({
+      studentName: mockStudentLongName.display_name,
+      student: mockStudentLongName
+    })
   }
 };
 export var LongNameLastFirst = {
   args: {
     student: mockStudentLongName,
     nameDisplayFormat: NameDisplayFormat.LAST_FIRST,
-    secondaryInfoDisplay: SecondaryInfoDisplay.SIS_ID
+    secondaryInfoDisplay: SecondaryInfoDisplay.SIS_ID,
+    studentPopover: createStudentPopover({
+      studentName: mockStudentLongName.sortable_name,
+      student: mockStudentLongName
+    })
   }
 };
 export var ShowStatus = {

package/es/components/Gradebook/popovers/StudentPopover/__tests__/index.test.js

@@ -23,16 +23,7 @@ describe('StudentPopover', function () {
   var renderComponent = function renderComponent() {
     var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     return render(/*#__PURE__*/React.createElement(GradebookConfigProvider, {
-      config: {
-        components: {
-          StudentPopover: function StudentPopover() {
-            return null;
-          },
-          SettingsTrayContent: function SettingsTrayContent() {
-            return null;
-          }
-        }
-      }
+      config: {}
     }, /*#__PURE__*/React.createElement(StudentPopover, _objectSpread(_objectSpread({}, defaultProps), props))));
   };
   describe('Rendering', function () {

package/es/components/Gradebook/storybook/decorators.js

@@ -9,18 +9,23 @@ import { NameDisplayFormatSelector } from "../toolbar/SettingsTray/NameDisplaySe
 import { StudentPopover } from "../popovers/StudentPopover/index.js";
 import { NameDisplayFormat } from "../../../util/gradebook/constants.js";
 import { GradebookApp } from "../GradebookApp.js";
+import { GradebookAppProvider } from "../context/GradebookAppContext/index.js";
 import { createStudent, mockUserDetailsDefault } from "../__mocks__/mockData.js";
-var StudentPopoverWrapper = function StudentPopoverWrapper(props) {
-  return /*#__PURE__*/React.createElement(StudentPopover, Object.assign({}, props, {
-    student: props.student || createStudent('1', 'John', 'Doe'),
-    studentName: props.studentName || 'John Doe',
+export var createStudentPopover = function createStudentPopover(_ref) {
+  var studentName = _ref.studentName,
+    student = _ref.student,
+    masteryScores = _ref.masteryScores;
+  return /*#__PURE__*/React.createElement(StudentPopover, {
+    student: student || createStudent('1', 'John', 'Doe'),
+    studentName: studentName,
+    masteryScores: masteryScores,
     studentGradesUrl: "/test-url",
     userDetails: mockUserDetailsDefault
-  }));
+  });
 };
-var ExampleSettingsTrayContent = function ExampleSettingsTrayContent(_ref) {
-  var settings = _ref.settings,
-    _onChange = _ref.onChange;
+export var ExampleSettingsTrayContent = function ExampleSettingsTrayContent(_ref2) {
+  var settings = _ref2.settings,
+    _onChange = _ref2.onChange;
   return /*#__PURE__*/React.createElement(Flex, {
     direction: "column",
     gap: "large"
@@ -43,19 +48,14 @@ var ExampleSettingsTrayContent = function ExampleSettingsTrayContent(_ref) {
     }
   }));
 };
-export var StoryWrapper = function StoryWrapper(_ref2) {
-  var children = _ref2.children,
-    masteryLevelConfig = _ref2.masteryLevelConfig,
-    components = _ref2.components;
-  var defaultComponents = {
-    StudentPopover: StudentPopoverWrapper,
-    SettingsTrayContent: ExampleSettingsTrayContent
-  };
+export var StoryWrapper = function StoryWrapper(_ref3) {
+  var children = _ref3.children,
+    masteryLevelConfig = _ref3.masteryLevelConfig;
   return /*#__PURE__*/React.createElement(GradebookApp, {
     config: {
-      components: _objectSpread(_objectSpread({}, defaultComponents), components),
       masteryLevelConfig: masteryLevelConfig
-    },
+    }
+  }, /*#__PURE__*/React.createElement(GradebookAppProvider, {
     settings: {
       settings: {
         showStudentNames: true,
@@ -85,5 +85,5 @@ export var StoryWrapper = function StoryWrapper(_ref2) {
         return onSave;
       }()
     }
-  }, children);
+  }, children));
 };

package/es/components/Gradebook/toolbar/SettingsTray/__tests__/index.test.js

@@ -6,7 +6,6 @@ import { expect, jest } from '@jest/globals';
 import '@testing-library/jest-dom';
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { SettingsTray } from "../index.js";
-import { GradebookConfigProvider } from "../../../context/GradebookConfigContext/index.js";
 import { GradebookAppProvider } from "../../../context/GradebookAppContext/index.js";
 import * as FlashAlert from "../../../../FlashAlert/index.js";
 jest.mock("../../../../FlashAlert");
@@ -46,34 +45,20 @@ describe('SettingsTray', function () {
       }
     })));
   };
-  var createConfig = function createConfig() {
-    var overrides = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    return {
-      components: _objectSpread({
-        StudentPopover: function StudentPopover() {
-          return null;
-        },
-        SettingsTrayContent: MockSettingsTrayContent
-      }, overrides)
-    };
-  };
   var renderWithProviders = function renderWithProviders() {
     var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    var configOverrides = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var settingsOverrides = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-    var config = createConfig(configOverrides);
+    var settingsOverrides = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
     var settingsConfig = _objectSpread({
       settings: defaultSettings,
       onSave: defaultMockOnSave
     }, settingsOverrides);
-    return render(/*#__PURE__*/React.createElement(GradebookConfigProvider, {
-      config: config
-    }, /*#__PURE__*/React.createElement(GradebookAppProvider, {
+    return render(/*#__PURE__*/React.createElement(GradebookAppProvider, {
       settings: settingsConfig
     }, /*#__PURE__*/React.createElement(SettingsTray, Object.assign({
       open: false,
-      onDismiss: jest.fn()
-    }, props)))));
+      onDismiss: jest.fn(),
+      SettingsTrayContent: MockSettingsTrayContent
+    }, props))));
   };
   beforeEach(function () {
     jest.clearAllMocks();
@@ -105,15 +90,14 @@ describe('SettingsTray', function () {
       expect(screen.getByText('Cancel')).toBeInTheDocument();
       expect(screen.getByText('Save')).toBeInTheDocument();
     });
-    it('renders SettingsTrayContent from config', function () {
+    it('renders SettingsTrayContent from prop', function () {
       var CustomSettingsTrayContent = function CustomSettingsTrayContent() {
         return /*#__PURE__*/React.createElement("div", {
           "data-testid": "custom-content"
         }, "Custom");
       };
       renderWithProviders({
-        open: true
-      }, {
+        open: true,
         SettingsTrayContent: CustomSettingsTrayContent
       });
       expect(screen.getByTestId('custom-content')).toBeInTheDocument();
@@ -125,19 +109,17 @@ describe('SettingsTray', function () {
           open: false
         }),
         rerender = _renderWithProviders.rerender;
-      var config = createConfig();
       var settingsConfig = {
         settings: defaultSettings,
         onSave: defaultMockOnSave
       };
-      rerender(/*#__PURE__*/React.createElement(GradebookConfigProvider, {
-        config: config
-      }, /*#__PURE__*/React.createElement(GradebookAppProvider, {
+      rerender(/*#__PURE__*/React.createElement(GradebookAppProvider, {
         settings: settingsConfig
       }, /*#__PURE__*/React.createElement(SettingsTray, {
         open: true,
-        onDismiss: jest.fn()
-      }))));
+        onDismiss: jest.fn(),
+        SettingsTrayContent: MockSettingsTrayContent
+      })));
       expect(screen.getByLabelText('Option 1')).toBeChecked();
       expect(screen.getByLabelText('Option 2')).toHaveValue('test');
     });
@@ -177,27 +159,24 @@ describe('SettingsTray', function () {
       expect(input).toHaveValue('changed');
 
       // Close and reopen
-      var config = createConfig();
       var settingsConfig = {
         settings: defaultSettings,
         onSave: defaultMockOnSave
       };
-      rerender(/*#__PURE__*/React.createElement(GradebookConfigProvider, {
-        config: config
-      }, /*#__PURE__*/React.createElement(GradebookAppProvider, {
+      rerender(/*#__PURE__*/React.createElement(GradebookAppProvider, {
         settings: settingsConfig
       }, /*#__PURE__*/React.createElement(SettingsTray, {
         open: false,
-        onDismiss: jest.fn()
-      }))));
-      rerender(/*#__PURE__*/React.createElement(GradebookConfigProvider, {
-        config: config
-      }, /*#__PURE__*/React.createElement(GradebookAppProvider, {
+        onDismiss: jest.fn(),
+        SettingsTrayContent: MockSettingsTrayContent
+      })));
+      rerender(/*#__PURE__*/React.createElement(GradebookAppProvider, {
         settings: settingsConfig
       }, /*#__PURE__*/React.createElement(SettingsTray, {
         open: true,
-        onDismiss: jest.fn()
-      }))));
+        onDismiss: jest.fn(),
+        SettingsTrayContent: MockSettingsTrayContent
+      })));
 
       // Should be reset to original value
       expect(screen.getByLabelText('Option 2')).toHaveValue('test');
@@ -247,7 +226,7 @@ describe('SettingsTray', function () {
             renderWithProviders({
               open: true,
               onDismiss: onDismiss
-            }, {}, {
+            }, {
               onSave: onSave
             });
 
@@ -291,7 +270,7 @@ describe('SettingsTray', function () {
             renderWithProviders({
               open: true,
               onDismiss: onDismiss
-            }, {}, {
+            }, {
               onSave: onSave
             });
 
@@ -336,7 +315,7 @@ describe('SettingsTray', function () {
             renderWithProviders({
               open: true,
               onDismiss: onDismiss
-            }, {}, {
+            }, {
               onSave: onSave
             });
 
@@ -366,7 +345,7 @@ describe('SettingsTray', function () {
             renderWithProviders({
               open: true,
               onDismiss: onDismiss
-            }, {}, {
+            }, {
               onSave: onSave
             });
 
@@ -403,7 +382,7 @@ describe('SettingsTray', function () {
             });
             renderWithProviders({
               open: true
-            }, {}, {
+            }, {
               onSave: onSave
             });
             saveButton = screen.getByTestId('lmgb-save-settings-button');
@@ -440,7 +419,7 @@ describe('SettingsTray', function () {
             renderWithProviders({
               open: true,
               onDismiss: onDismiss
-            }, {}, {
+            }, {
               onSave: onSave
             });
 
@@ -462,8 +441,7 @@ describe('SettingsTray', function () {
         return /*#__PURE__*/React.createElement("div", null, "Content");
       });
       renderWithProviders({
-        open: true
-      }, {
+        open: true,
         SettingsTrayContent: SettingsTrayContent
       });
       expect(SettingsTrayContent).toHaveBeenCalledWith(expect.objectContaining({

package/es/components/Gradebook/toolbar/SettingsTray/index.js

@@ -9,7 +9,6 @@ import { Text } from '@instructure/ui-text';
 import { Tray } from '@instructure/ui-tray';
 import t from 'format-message';
 import { colors } from '@instructure/canvas-theme';
-import { useGradebookConfig } from "../../context/GradebookConfigContext/index.js";
 import { useGradebookApp } from "../../context/GradebookAppContext/index.js";
 import { showFlashAlert } from "../../../FlashAlert/index.js";
 /**
@@ -23,15 +22,13 @@ import { showFlashAlert } from "../../../FlashAlert/index.js";
  */
 export var SettingsTray = function SettingsTray(_ref) {
   var open = _ref.open,
-    onDismiss = _ref.onDismiss;
-  var _useGradebookConfig = useGradebookConfig(),
-    components = _useGradebookConfig.components;
+    onDismiss = _ref.onDismiss,
+    SettingsTrayContent = _ref.SettingsTrayContent;
   var _useGradebookApp = useGradebookApp(),
     _useGradebookApp$sett = _useGradebookApp.settings,
     contextSettings = _useGradebookApp$sett.settings,
     setSettings = _useGradebookApp$sett.setSettings,
     onSave = _useGradebookApp$sett.onSave;
-  var SettingsTrayContent = components.SettingsTrayContent;
   var _useState = useState(contextSettings),
     _useState2 = _slicedToArray(_useState, 2),
     localSettings = _useState2[0],

package/es/components/Gradebook/toolbar/SettingsTray/index.stories.js

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import { SettingsTray } from "./index.js";
 import { Button } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
-import { StoryWrapper } from "../../storybook/decorators.js";
+import { StoryWrapper, ExampleSettingsTrayContent } from "../../storybook/decorators.js";
 var meta = {
   title: 'Gradebook/SettingsTray',
   component: SettingsTray,
@@ -26,7 +26,8 @@ export var Default = {
       open: open,
       onDismiss: function onDismiss() {
         return setOpen(false);
-      }
+      },
+      SettingsTrayContent: ExampleSettingsTrayContent
     }));
   }
 };
@@ -34,7 +35,8 @@ export var Open = {
   render: function render() {
     return /*#__PURE__*/React.createElement(SettingsTray, {
       open: true,
-      onDismiss: function onDismiss() {}
+      onDismiss: function onDismiss() {},
+      SettingsTrayContent: ExampleSettingsTrayContent
     });
   }
 };

package/es/translated/ar/components/Gradebook/GradebookApp.js

@@ -2,10 +2,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect, useState } from 'react';
 import { setupI18n } from "../../i18n/i18n.js";
 import { GradebookConfigProvider } from "./context/GradebookConfigContext/index.js";
-import { GradebookAppProvider } from "./context/GradebookAppContext/index.js";
 export var GradebookApp = function GradebookApp(_ref) {
   var config = _ref.config,
-    settings = _ref.settings,
     _ref$translations = _ref.translations,
     translations = _ref$translations === void 0 ? {
       language: 'en',
@@ -30,7 +28,5 @@ export var GradebookApp = function GradebookApp(_ref) {
   }
   return /*#__PURE__*/React.createElement(GradebookConfigProvider, {
     config: config
-  }, /*#__PURE__*/React.createElement(GradebookAppProvider, {
-    settings: settings
-  }, children || /*#__PURE__*/React.createElement("div", null, "GradebookAppRoot")));
+  }, children || /*#__PURE__*/React.createElement("div", null, "GradebookAppRoot"));
 };

package/es/translated/ar/components/Gradebook/GradebookApp.stories.js

@@ -1,53 +1,10 @@
-import _regenerator from "@babel/runtime/helpers/esm/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import React from 'react';
 import { GradebookApp } from "./GradebookApp.js";
-import { action } from '@storybook/addon-actions';
-
-// Example minimal settings type
-
 var meta = {
   title: 'Gradebook/GradebookApp',
   component: GradebookApp
 };
 export default meta;
-var defaultConfig = {
-  components: {
-    StudentPopover: function StudentPopover() {
-      return /*#__PURE__*/React.createElement("div", null, "Student Popover");
-    },
-    SettingsTrayContent: function SettingsTrayContent() {
-      return /*#__PURE__*/React.createElement("div", null, "Settings Content");
-    }
-  }
-};
-var defaultSettings = {
-  settings: {
-    option1: true
-  },
-  onSave: function () {
-    var _onSave = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(settings) {
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
-          case 0:
-            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',
@@ -97,7 +54,6 @@ var resourceOverrides = {
 export var Default = {
   args: {
     config: defaultConfig,
-    settings: defaultSettings,
     translations: {
       language: 'en',
       resourceOverrides: resourceOverrides,