refactor: change some variable naming and remove unused code

openedx · Jan 17, 2024 · 7b0326e · 7b0326e
1 parent 75423f4
commit 7b0326e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 111 deletions.
diff --git a/src/plugins/directPlugins/DirectPluginSlot.jsx b/src/plugins/directPlugins/DirectPluginSlot.jsx
@@ -7,23 +7,23 @@ import organizePlugins from './utils';
 const DirectPluginSlot = ({ defaultContents, slotId, renderWidget }) => {
   const allPluginChanges = React.useContext(DirectPluginContext);
 
-  const contents = React.useMemo(() => {
+  const preparedWidgets = React.useMemo(() => {
     const slotChanges = allPluginChanges.getDirectSlotChanges()[slotId] ?? [];
     return organizePlugins(defaultContents, slotChanges);
   }, [allPluginChanges, defaultContents, slotId]);
 
   return (
     <>
-      {contents.map((c) => {
-        if (c.hidden) {
+      {preparedWidgets.map((preppedWidget) => {
+        if (preppedWidget.hidden) {
           return null;
         }
-        if (c.wrappers) {
+        if (preppedWidget.wrappers) {
           // TODO: define how the reduce logic is able to wrap widgets and make it testable
           // eslint-disable-next-line max-len
-          return c.wrappers.reduce((widget, wrapper) => React.createElement(wrapper, { widget, key: c.id }), renderWidget(c));
+          return preppedWidget.wrappers.reduce((widget, wrapper) => React.createElement(wrapper, { widget, key: preppedWidget.id }), renderWidget(preppedWidget));
         }
-        return renderWidget(c);
+        return renderWidget(preppedWidget);
       })}
     </>
   );

diff --git a/src/plugins/directPlugins/mocks/DefaultComponentMock.jsx b/src/plugins/directPlugins/mocks/DefaultComponentMock.jsx
diff --git a/src/plugins/directPlugins/mocks/PluginComponentsMock.jsx b/src/plugins/directPlugins/mocks/PluginComponentsMock.jsx
diff --git a/src/plugins/directPlugins/utils.test.jsx b/src/plugins/directPlugins/utils.test.jsx
@@ -3,9 +3,7 @@ import '@testing-library/jest-dom';
 import organizePlugins from './utils';
 import { DirectPluginOperations } from './DirectPlugin';
 
-jest.unmock('./utils');
-
-const mockModifyComponent = (widget) => {
+const mockModifyWidget = (widget) => {
   const newContent = {
     url: '/search',
     label: 'Search',
@@ -15,7 +13,7 @@ const mockModifyComponent = (widget) => {
   return modifiedWidget;
 };
 
-function mockWrapComponent({ widget }) {
+function mockWrapWidget({ widget }) {
   const isAdmin = true;
   return isAdmin ? widget : null;
 }
@@ -24,7 +22,7 @@ const mockSlotChanges = [
   {
     op: DirectPluginOperations.Wrap,
     widgetId: 'drafts',
-    wrapper: mockWrapComponent,
+    wrapper: mockWrapWidget,
   },
   {
     op: DirectPluginOperations.Hide,
@@ -33,7 +31,7 @@ const mockSlotChanges = [
   {
     op: DirectPluginOperations.Modify,
     widgetId: 'lookUp',
-    fn: mockModifyComponent,
+    fn: mockModifyWidget,
   },
   {
     op: DirectPluginOperations.Insert,
@@ -132,7 +130,7 @@ describe('organizePlugins', () => {
       const widget = plugins.find((w) => w.id === 'drafts');
       expect(plugins.length).toEqual(4);
       expect(widget.wrappers.length).toEqual(2);
-      expect(widget.wrappers[0]).toEqual(mockWrapComponent);
+      expect(widget.wrappers[0]).toEqual(mockWrapWidget);
       expect(widget.wrappers[1]).toEqual(newMockWrapComponent);
     });