refactor: add default formatter

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

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
@@ -8,7 +8,10 @@ import { useStripes } from '@folio/stripes/core';
 import { defaultVisibleColumns } from './constants';
 import DonorsList from './DonorsList';
 import DonorsLookup from './DonorsLookup';
-import { getDonorsListFormatter } from './utils';
+import {
+  getDonorsListFormatter,
+  getUnAssignDonorFormatter,
+} from './utils';
 
 function DonorsContainer({
   columnMapping,
@@ -47,8 +50,17 @@ function DonorsContainer({
   const contentData = useMemo(() => sortBy(listOfDonors, [({ lastName }) => lastName?.toLowerCase()]), [listOfDonors]);
 
   const resultsFormatter = useMemo(() => {
-    return formatter || getDonorsListFormatter({ intl, fields, canViewOrganizations });
-  }, [canViewOrganizations, fields, formatter, intl]);
+    const defaultFormatter = formatter || getDonorsListFormatter({ intl, fields, canViewOrganizations });
+
+    if (visibleColumns.includes('unassignDonor')) {
+      return {
+        ...getUnAssignDonorFormatter({ intl, fields }),
+        ...defaultFormatter,
+      };
+    }
+
+    return defaultFormatter;
+  }, [canViewOrganizations, fields, formatter, intl, visibleColumns]);
 
   const onAddDonors = (values = []) => {
     const addedDonorIds = new Set(fields.value);

diff --git a/lib/Donors/utils.js b/lib/Donors/utils.js
@@ -12,13 +12,12 @@ const getDonorUrl = (orgId) => {
   return undefined;
 };
 
-export const getDonorsListFormatter = ({
-  canViewOrganizations,
-  fields,
-  intl,
-}) => ({
+export const getDonorsListFormatter = ({ canViewOrganizations }) => ({
   name: donor => <TextLink to={getDonorUrl(canViewOrganizations && donor.id)}>{donor.name}</TextLink>,
   code: donor => donor.code,
+});
+
+export const getUnAssignDonorFormatter = ({ fields, intl }) => ({
   unassignDonor: donor => (
     <Button
       align="end"