refactor: default props

folio-org · Nov 8, 2023 · 861fd1f · 861fd1f
1 parent 8f882d9
commit 861fd1f
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 28 deletions.
diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
@@ -8,7 +8,7 @@ import { useStripes } from '@folio/stripes/core';
 import { defaultVisibleColumns } from './constants';
 import DonorsList from './DonorsList';
 import DonorsLookup from './DonorsLookup';
-import { getResultsFormatter } from './utils';
+import { getDonorsListFormatter } from './utils';
 
 function DonorsContainer({
   columnMapping,
@@ -26,11 +26,13 @@ function DonorsContainer({
   const intl = useIntl();
   const canViewOrganizations = stripes.hasPerm('ui-organizations.view');
 
-  const donorsMap = donors.reduce((acc, contact) => {
-    acc[contact.id] = contact;
+  const donorsMap = useMemo(() => {
+    return donors.reduce((acc, contact) => {
+      acc[contact.id] = contact;
 
-    return acc;
-  }, {});
+      return acc;
+    }, {});
+  }, [donors]);
 
   const listOfDonors = useMemo(() => (fields.value || [])
     .map((contactId, _index) => {
@@ -45,7 +47,7 @@ function DonorsContainer({
   const contentData = useMemo(() => sortBy(listOfDonors, [({ lastName }) => lastName?.toLowerCase()]), [listOfDonors]);
 
   const resultsFormatter = useMemo(() => {
-    return formatter || getResultsFormatter({ intl, fields, canViewOrganizations });
+    return formatter || getDonorsListFormatter({ intl, fields, canViewOrganizations });
   }, [canViewOrganizations, fields, formatter, intl]);
 
   const onAddDonors = (values = []) => {
@@ -75,7 +77,6 @@ function DonorsContainer({
             onAddDonors={onAddDonors}
             name={id}
             searchLabel={searchLabel}
-            showTriggerButton={showTriggerButton}
             visibleColumns={visibleColumns}
           />
         )

diff --git a/lib/Donors/DonorsContainer.test.js b/lib/Donors/DonorsContainer.test.js
@@ -107,9 +107,13 @@ describe('DonorsContainer', () => {
     const addDonorsButton = screen.getByText('Add donor');
 
     expect(addDonorsButton).toBeDefined();
-
     await user.click(addDonorsButton);
-
     expect(setDonorIds).toHaveBeenCalled();
   });
+
+  it('should not render `DonorsLookup` when `showTriggerButton` is false', () => {
+    renderComponent({ showTriggerButton: false });
+
+    expect(screen.queryByText('Add donor')).toBeNull();
+  });
 });
diff --git a/lib/Donors/DonorsList.js b/lib/Donors/DonorsList.js
@@ -5,6 +5,7 @@ import { MultiColumnList } from '@folio/stripes/components';
 import {
   alignRowProps,
   defaultColumnMapping,
+  defaultFormatter,
   defaultVisibleColumns,
 } from './constants';
 
@@ -40,6 +41,7 @@ DonorsList.propTypes = {
 
 DonorsList.defaultProps = {
   columnMapping: defaultColumnMapping,
+  formatter: defaultFormatter,
   visibleColumns: defaultVisibleColumns,
 };
 

diff --git a/lib/Donors/DonorsLookup.js b/lib/Donors/DonorsLookup.js
@@ -19,15 +19,10 @@ const DonorsLookup = ({
   name,
   onAddDonors,
   searchLabel,
-  showTriggerButton,
   visibleColumns,
 }) => {
   const stripes = useStripes();
 
-  if (!showTriggerButton) {
-    return null;
-  }
-
   return (
     <Pluggable
       id={`${name}-plugin`}
@@ -57,13 +52,11 @@ const DonorsLookup = ({
 DonorsLookup.propTypes = {
   onAddDonors: PropTypes.func.isRequired,
   name: PropTypes.string,
-  showTriggerButton: PropTypes.bool,
   searchLabel: PropTypes.node,
   visibleColumns: PropTypes.arrayOf(PropTypes.string),
 };
 
 DonorsLookup.defaultProps = {
-  showTriggerButton: true,
   searchLabel: <FormattedMessage id="stripes-acq-components.donors.button.addDonor" />,
   visibleColumns: pluginVisibleColumns,
 };

diff --git a/lib/Donors/DonorsLookup.test.js b/lib/Donors/DonorsLookup.test.js
@@ -41,15 +41,7 @@ describe('DonorsLookup', () => {
     const addDonorsButton = screen.getByText('Add donor');
 
     expect(addDonorsButton).toBeDefined();
-
     await user.click(addDonorsButton);
-
     expect(mockOnAddDonors).toHaveBeenCalledWith([mockVendorData]);
   });
-
-  it('should not render component', () => {
-    renderComponent({ showTriggerButton: false });
-
-    expect(screen.queryByText('Add donor')).toBeNull();
-  });
 });
diff --git a/lib/Donors/constants.js b/lib/Donors/constants.js
@@ -1,3 +1,4 @@
+import { TextLink } from '@folio/stripes/components';
 import { FormattedMessage } from 'react-intl';
 
 export const defaultColumnMapping = {
@@ -11,6 +12,11 @@ export const defaultVisibleColumns = [
   'code',
 ];
 
+export const defaultFormatter = {
+  name: donor => <TextLink to={donor.id}>{donor.name}</TextLink>,
+  code: donor => donor.code,
+};
+
 export const alignRowProps = { alignLastColToEnd: true };
 
 export const modalLabel = <FormattedMessage id="stripes-acq-components.donors.modal.title" />;

diff --git a/lib/Donors/utils.js b/lib/Donors/utils.js
@@ -12,7 +12,7 @@ const getDonorUrl = (orgId) => {
   return undefined;
 };
 
-export const getResultsFormatter = ({
+export const getDonorsListFormatter = ({
   canViewOrganizations,
   fields,
   intl,

diff --git a/lib/Donors/utils.test.js b/lib/Donors/utils.test.js
@@ -1,4 +1,4 @@
-import { getResultsFormatter } from './utils';
+import { getDonorsListFormatter } from './utils';
 
 const defaultProps = {
   canViewOrganizations: true,
@@ -10,9 +10,9 @@ const defaultProps = {
   },
 };
 
-describe('getResultsFormatter', () => {
+describe('getDonorsListFormatter', () => {
   it('should return object with name, code and unassignDonor functions', () => {
-    const result = getResultsFormatter(defaultProps);
+    const result = getDonorsListFormatter(defaultProps);
 
     expect(result).toEqual(expect.objectContaining({
       name: expect.any(Function),