From 31f95e9842aa534968751dbd872ddac9103ebd5d Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Wed, 15 Nov 2023 17:01:53 +0500
Subject: [PATCH 1/8] UISACQCOMP-168: extend `<Donors />` component props

---
 CHANGELOG.md                  |  1 +
 lib/Donors/Donors.js          | 23 +++++++++++++++++++----
 lib/Donors/DonorsContainer.js | 15 ++++++++++-----
 lib/Donors/index.js           |  1 +
 lib/Donors/utils.js           |  8 +++++++-
 lib/Donors/utils.test.js      |  1 +
 6 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a01447d..4d3862fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Add `inputType` prop to `<SingleSearchForm>`. Refs UISACQCOMP-165.
 * View the list of donors. Refs UISACQCOMP-166.
 * Added `indexRef` and `inputRef` props to `<SingleSearchForm>`. Refs UISACQCOMP-167.
+* Extend Donors component functionality. Refs UISACQCOMP-168.
 
 ## [5.0.0](https://github.com/folio-org/stripes-acq-components/tree/v5.0.0) (2023-10-12)
 [Full Changelog](https://github.com/folio-org/stripes-acq-components/compare/v4.0.2...v5.0.0)
diff --git a/lib/Donors/Donors.js b/lib/Donors/Donors.js
index 6c314c6b..ba15fa1b 100644
--- a/lib/Donors/Donors.js
+++ b/lib/Donors/Donors.js
@@ -1,6 +1,7 @@
+import { noop } from 'lodash';
 import PropTypes from 'prop-types';
 import { FieldArray } from 'react-final-form-arrays';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import {
   Col,
@@ -12,10 +13,19 @@ import { defaultColumnMapping } from './constants';
 import { DonorsContainer } from './DonorsContainer';
 import { useFetchDonors } from './hooks';
 
-export function Donors({ name, donorOrganizationIds, ...rest }) {
+export function Donors({ name, donorOrganizationIds, onChange, ...rest }) {
   const [donorIds, setDonorIds] = useState(donorOrganizationIds);
   const { donors, isLoading } = useFetchDonors(donorIds);
 
+  useEffect(() => {
+    setDonorIds(donorOrganizationIds);
+  }, [donorOrganizationIds]);
+
+  const onSetDonorIds = (values = []) => {
+    setDonorIds(values);
+    onChange(values);
+  };
+
   if (isLoading) {
     return <Loading />;
   }
@@ -27,8 +37,9 @@ export function Donors({ name, donorOrganizationIds, ...rest }) {
           name={name}
           id={name}
           component={DonorsContainer}
-          setDonorIds={setDonorIds}
+          setDonorIds={onSetDonorIds}
           donors={donors}
+          donorIds={donorIds}
           {...rest}
         />
       </Col>
@@ -41,13 +52,17 @@ Donors.propTypes = {
   columnWidths: PropTypes.object,
   donorOrganizationIds: PropTypes.arrayOf(PropTypes.string),
   name: PropTypes.string,
+  onChange: PropTypes.func,
+  onRemove: PropTypes.func,
   searchLabel: PropTypes.node,
   showTriggerButton: PropTypes.bool,
   visibleColumns: PropTypes.arrayOf(PropTypes.string),
 };
 
 Donors.defaultProps = {
+  columnMapping: defaultColumnMapping,
   donorOrganizationIds: [],
   name: 'donorOrganizationIds',
-  columnMapping: defaultColumnMapping,
+  onChange: noop,
+  onRemove: noop,
 };
diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
index 60add8db..65e2ae08 100644
--- a/lib/Donors/DonorsContainer.js
+++ b/lib/Donors/DonorsContainer.js
@@ -1,4 +1,4 @@
-import { map, sortBy } from 'lodash';
+import { map, noop, sortBy } from 'lodash';
 import PropTypes from 'prop-types';
 import { useMemo } from 'react';
 import { useIntl } from 'react-intl';
@@ -14,9 +14,11 @@ export function DonorsContainer({
   columnMapping,
   columnWidths,
   donors,
+  donorIds,
   fields,
   formatter,
   id,
+  onRemove,
   setDonorIds,
   searchLabel,
   showTriggerButton,
@@ -35,7 +37,7 @@ export function DonorsContainer({
     }, {});
   }, [donors]);
 
-  const listOfDonors = useMemo(() => (fields.value || [])
+  const listOfDonors = useMemo(() => (donorIds || [])
     .map((contactId, _index) => {
       const contact = donorsMap?.[contactId];
 
@@ -43,13 +45,13 @@ export function DonorsContainer({
         ...(contact || { isDeleted: true }),
         _index,
       };
-    }), [donorsMap, fields.value]);
+    }), [donorIds, donorsMap]);
 
   const contentData = useMemo(() => sortBy(listOfDonors, [({ lastName }) => lastName?.toLowerCase()]), [listOfDonors]);
 
   const resultsFormatter = useMemo(() => {
-    return formatter || getDonorsFormatter({ intl, fields, canViewOrganizations });
-  }, [canViewOrganizations, fields, formatter, intl]);
+    return formatter || getDonorsFormatter({ intl, fields, canViewOrganizations, onRemove });
+  }, [canViewOrganizations, fields, formatter, intl, onRemove]);
 
   const onAddDonors = (values = []) => {
     const addedDonorIds = new Set(fields.value);
@@ -91,9 +93,11 @@ DonorsContainer.propTypes = {
   columnWidths: PropTypes.object,
   columnMapping: PropTypes.object,
   donors: PropTypes.arrayOf(PropTypes.object),
+  donorIds: PropTypes.arrayOf(PropTypes.string),
   fields: PropTypes.object,
   formatter: PropTypes.object,
   id: PropTypes.string,
+  onRemove: PropTypes.func,
   searchLabel: PropTypes.node,
   setDonorIds: PropTypes.func.isRequired,
   showTriggerButton: PropTypes.bool,
@@ -101,6 +105,7 @@ DonorsContainer.propTypes = {
 };
 
 DonorsContainer.defaultProps = {
+  onRemove: noop,
   showTriggerButton: true,
   visibleColumns: defaultContainerVisibleColumns,
 };
diff --git a/lib/Donors/index.js b/lib/Donors/index.js
index f625423c..0a0e73f6 100644
--- a/lib/Donors/index.js
+++ b/lib/Donors/index.js
@@ -1,4 +1,5 @@
 export { Donors } from './Donors';
 export { DonorsList } from './DonorsList';
 export { DonorsListContainer } from './DonorsListContainer';
+export { DonorsLookup } from './DonorsLookup';
 export { useFetchDonors } from './hooks/useFetchDonors';
diff --git a/lib/Donors/utils.js b/lib/Donors/utils.js
index 8381f8f2..946fa2ce 100644
--- a/lib/Donors/utils.js
+++ b/lib/Donors/utils.js
@@ -17,7 +17,12 @@ export const getDonorsListFormatter = ({ canViewOrganizations }) => ({
   code: donor => donor.code,
 });
 
-export const getDonorsFormatter = ({ canViewOrganizations, fields, intl }) => ({
+export const getDonorsFormatter = ({
+  canViewOrganizations,
+  fields,
+  intl,
+  onRemove,
+}) => ({
   ...getDonorsListFormatter({ canViewOrganizations }),
   unassignDonor: donor => (
     <Button
@@ -27,6 +32,7 @@ export const getDonorsFormatter = ({ canViewOrganizations, fields, intl }) => ({
       onClick={(e) => {
         e.preventDefault();
         fields.remove(donor._index);
+        onRemove(fields.value[donor._index]);
       }}
     >
       <Icon icon="times-circle" />
diff --git a/lib/Donors/utils.test.js b/lib/Donors/utils.test.js
index 0634d4c8..6e717855 100644
--- a/lib/Donors/utils.test.js
+++ b/lib/Donors/utils.test.js
@@ -11,6 +11,7 @@ const defaultProps = {
   intl: {
     formatMessage: jest.fn((id) => id),
   },
+  onRemove: jest.fn(),
 };
 
 describe('getDonorsListFormatter', () => {

From eecb03d5f9a3cefa7d6f2738228986340dd732ed Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Wed, 15 Nov 2023 17:52:13 +0500
Subject: [PATCH 2/8] fix: failing test case

---
 lib/Donors/DonorsContainer.test.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/Donors/DonorsContainer.test.js b/lib/Donors/DonorsContainer.test.js
index 70c141bc..d53b4cf8 100644
--- a/lib/Donors/DonorsContainer.test.js
+++ b/lib/Donors/DonorsContainer.test.js
@@ -48,14 +48,12 @@ jest.mock('./hooks', () => ({
 const defaultProps = {
   columnMapping: {},
   columnWidths: {},
-  donors: [],
-  fields: {
-    value: [
-      '1',
-      '2',
-    ],
-  },
+  donorIds: [
+    '1',
+    '2',
+  ],
   formatter: {},
+  donors: [],
   id: 'donors',
   setDonorIds,
   searchLabel: 'Search',

From 26b9fdb217fa8953514bcccb0101fcea4866911b Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Wed, 15 Nov 2023 18:25:11 +0500
Subject: [PATCH 3/8] tests: add test coverages

---
 lib/Donors/Donors.test.js | 1 +
 lib/Donors/utils.test.js  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Donors/Donors.test.js b/lib/Donors/Donors.test.js
index 8980c0a1..eb0a3fb5 100644
--- a/lib/Donors/Donors.test.js
+++ b/lib/Donors/Donors.test.js
@@ -21,6 +21,7 @@ jest.mock('./hooks', () => ({
 const defaultProps = {
   name: 'donors',
   donorOrganizationIds: [],
+  onChange: jest.fn(),
 };
 
 const renderForm = (props = {}) => (
diff --git a/lib/Donors/utils.test.js b/lib/Donors/utils.test.js
index 6e717855..a56f1acb 100644
--- a/lib/Donors/utils.test.js
+++ b/lib/Donors/utils.test.js
@@ -3,15 +3,17 @@ import {
   getDonorsFormatter,
 } from './utils';
 
+const mockOnRemove = jest.fn();
 const defaultProps = {
   canViewOrganizations: true,
   fields: {
     remove: jest.fn(),
+    value: ['1'],
   },
   intl: {
     formatMessage: jest.fn((id) => id),
   },
-  onRemove: jest.fn(),
+  onRemove: mockOnRemove,
 };
 
 describe('getDonorsListFormatter', () => {
@@ -32,5 +34,10 @@ describe('getDonorsFormatter', () => {
     expect(result).toEqual(expect.objectContaining({
       unassignDonor: expect.any(Function),
     }));
+
+    result.unassignDonor({ _index: 0 }).props.onClick({ preventDefault: jest.fn() });
+
+    expect(defaultProps.fields.remove).toHaveBeenCalled();
+    expect(mockOnRemove).toHaveBeenCalled();
   });
 });

From 5da4edaac00dda8a121d4c2c69ca6262bc239ba1 Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Wed, 15 Nov 2023 19:35:38 +0500
Subject: [PATCH 4/8] fix: add donors lookup specific column props

---
 lib/Donors/DonorsContainer.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
index 65e2ae08..13122016 100644
--- a/lib/Donors/DonorsContainer.js
+++ b/lib/Donors/DonorsContainer.js
@@ -5,7 +5,10 @@ import { useIntl } from 'react-intl';
 
 import { useStripes } from '@folio/stripes/core';
 
-import { defaultContainerVisibleColumns } from './constants';
+import {
+  defaultContainerVisibleColumns,
+  pluginVisibleColumns,
+} from './constants';
 import { DonorsList } from './DonorsList';
 import { DonorsLookup } from './DonorsLookup';
 import { getDonorsFormatter } from './utils';
@@ -19,6 +22,7 @@ export function DonorsContainer({
   formatter,
   id,
   onRemove,
+  pluginVisibleColumns: pluginVisibleColumnsProp,
   setDonorIds,
   searchLabel,
   showTriggerButton,
@@ -81,7 +85,7 @@ export function DonorsContainer({
             onAddDonors={onAddDonors}
             name={id}
             searchLabel={searchLabel}
-            visibleColumns={visibleColumns}
+            visibleColumns={pluginVisibleColumnsProp}
           />
         )
       }
@@ -102,10 +106,12 @@ DonorsContainer.propTypes = {
   setDonorIds: PropTypes.func.isRequired,
   showTriggerButton: PropTypes.bool,
   visibleColumns: PropTypes.arrayOf(PropTypes.string),
+  pluginVisibleColumns: PropTypes.arrayOf(PropTypes.string),
 };
 
 DonorsContainer.defaultProps = {
   onRemove: noop,
   showTriggerButton: true,
   visibleColumns: defaultContainerVisibleColumns,
+  pluginVisibleColumns,
 };

From 83a6b08a93c2c6152722bfc0e94e31c00b46c4b2 Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Thu, 16 Nov 2023 11:01:02 +0500
Subject: [PATCH 5/8] tests: add test coverage

---
 lib/Donors/Donors.test.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/Donors/Donors.test.js b/lib/Donors/Donors.test.js
index eb0a3fb5..1133a03f 100644
--- a/lib/Donors/Donors.test.js
+++ b/lib/Donors/Donors.test.js
@@ -1,5 +1,6 @@
 import { MemoryRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
+import user from '@testing-library/user-event';
 
 import stripesFinalForm from '@folio/stripes/final-form';
 
@@ -11,6 +12,17 @@ jest.mock('@folio/stripes/components', () => ({
   Loading: jest.fn(() => 'Loading'),
 }));
 
+jest.mock('./DonorsLookup', () => ({
+  DonorsLookup: jest.fn(({ onAddDonors }) => (
+    <button
+      type="button"
+      onClick={() => onAddDonors([{ id: 'donorId' }])}
+    >
+      Add donor
+    </button>
+  )),
+}));
+
 jest.mock('./hooks', () => ({
   useFetchDonors: jest.fn().mockReturnValue({
     donors: [],
@@ -66,4 +78,16 @@ describe('Donors', () => {
 
     expect(screen.getByText('Loading')).toBeDefined();
   });
+
+  it('should call onChange when donorOrganizationIds changed', () => {
+    const onChange = jest.fn();
+
+    renderComponent({ onChange });
+
+    const addDonorButton = screen.getByText('Add donor');
+
+    user.click(addDonorButton);
+
+    expect(onChange).toHaveBeenCalled();
+  });
 });

From f733e86552ad4041e66ac771b80941eb6c9a468d Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Thu, 16 Nov 2023 11:54:04 +0500
Subject: [PATCH 6/8] fix: select all and sorting issue

---
 lib/Donors/DonorsContainer.js | 1 +
 lib/Donors/DonorsLookup.js    | 4 ++++
 lib/Donors/constants.js       | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
index 13122016..a5b61748 100644
--- a/lib/Donors/DonorsContainer.js
+++ b/lib/Donors/DonorsContainer.js
@@ -86,6 +86,7 @@ export function DonorsContainer({
             name={id}
             searchLabel={searchLabel}
             visibleColumns={pluginVisibleColumnsProp}
+            {...rest}
           />
         )
       }
diff --git a/lib/Donors/DonorsLookup.js b/lib/Donors/DonorsLookup.js
index 0fed2002..3a853834 100644
--- a/lib/Donors/DonorsLookup.js
+++ b/lib/Donors/DonorsLookup.js
@@ -12,6 +12,7 @@ import {
   pluginVisibleColumns,
   resultsPaneTitle,
   searchableIndexes,
+  sortableColumns,
   visibleFilters,
 } from './constants';
 
@@ -20,6 +21,7 @@ export const DonorsLookup = ({
   onAddDonors,
   searchLabel,
   visibleColumns,
+  ...rest
 }) => {
   const stripes = useStripes();
 
@@ -41,6 +43,8 @@ export const DonorsLookup = ({
       searchableIndexes={searchableIndexes}
       visibleFilters={visibleFilters}
       isMultiSelect
+      sortableColumns={sortableColumns}
+      {...rest}
     >
       <span data-test-add-donor>
         <FormattedMessage id="stripes-acq-components.donors.noFindOrganizationPlugin" />
diff --git a/lib/Donors/constants.js b/lib/Donors/constants.js
index f0b0d217..68ba2fdf 100644
--- a/lib/Donors/constants.js
+++ b/lib/Donors/constants.js
@@ -11,6 +11,8 @@ export const defaultVisibleColumns = [
   'code',
 ];
 
+export const sortableColumns = ['name', 'code'];
+
 export const defaultContainerVisibleColumns = [
   ...defaultVisibleColumns,
   'unassignDonor',

From 00d15f70d231290792153fdb95b162ba0274104c Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Thu, 16 Nov 2023 14:53:11 +0500
Subject: [PATCH 7/8] update loading for donors list

---
 lib/Donors/Donors.js               |  7 +------
 lib/Donors/Donors.test.js          | 16 ----------------
 lib/Donors/DonorsContainer.js      |  8 +++-----
 lib/Donors/DonorsContainer.test.js | 16 +++++++++-------
 4 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/lib/Donors/Donors.js b/lib/Donors/Donors.js
index ba15fa1b..32d34c5b 100644
--- a/lib/Donors/Donors.js
+++ b/lib/Donors/Donors.js
@@ -5,7 +5,6 @@ import { useEffect, useState } from 'react';
 
 import {
   Col,
-  Loading,
   Row,
 } from '@folio/stripes/components';
 
@@ -26,10 +25,6 @@ export function Donors({ name, donorOrganizationIds, onChange, ...rest }) {
     onChange(values);
   };
 
-  if (isLoading) {
-    return <Loading />;
-  }
-
   return (
     <Row>
       <Col xs={12}>
@@ -39,7 +34,7 @@ export function Donors({ name, donorOrganizationIds, onChange, ...rest }) {
           component={DonorsContainer}
           setDonorIds={onSetDonorIds}
           donors={donors}
-          donorIds={donorIds}
+          loading={isLoading}
           {...rest}
         />
       </Col>
diff --git a/lib/Donors/Donors.test.js b/lib/Donors/Donors.test.js
index 1133a03f..504e7d88 100644
--- a/lib/Donors/Donors.test.js
+++ b/lib/Donors/Donors.test.js
@@ -7,11 +7,6 @@ import stripesFinalForm from '@folio/stripes/final-form';
 import { Donors } from './Donors';
 import { useFetchDonors } from './hooks';
 
-jest.mock('@folio/stripes/components', () => ({
-  ...jest.requireActual('@folio/stripes/components'),
-  Loading: jest.fn(() => 'Loading'),
-}));
-
 jest.mock('./DonorsLookup', () => ({
   DonorsLookup: jest.fn(({ onAddDonors }) => (
     <button
@@ -68,17 +63,6 @@ describe('Donors', () => {
     expect(screen.getByText('stripes-components.tableEmpty')).toBeDefined();
   });
 
-  it('should render Loading component', () => {
-    useFetchDonors.mockClear().mockReturnValue({
-      donors: [],
-      isLoading: true,
-    });
-
-    renderComponent();
-
-    expect(screen.getByText('Loading')).toBeDefined();
-  });
-
   it('should call onChange when donorOrganizationIds changed', () => {
     const onChange = jest.fn();
 
diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
index a5b61748..319868f3 100644
--- a/lib/Donors/DonorsContainer.js
+++ b/lib/Donors/DonorsContainer.js
@@ -17,7 +17,6 @@ export function DonorsContainer({
   columnMapping,
   columnWidths,
   donors,
-  donorIds,
   fields,
   formatter,
   id,
@@ -41,7 +40,7 @@ export function DonorsContainer({
     }, {});
   }, [donors]);
 
-  const listOfDonors = useMemo(() => (donorIds || [])
+  const listOfDonors = useMemo(() => (fields.value || [])
     .map((contactId, _index) => {
       const contact = donorsMap?.[contactId];
 
@@ -49,9 +48,9 @@ export function DonorsContainer({
         ...(contact || { isDeleted: true }),
         _index,
       };
-    }), [donorIds, donorsMap]);
+    }), [donorsMap, fields.value]);
 
-  const contentData = useMemo(() => sortBy(listOfDonors, [({ lastName }) => lastName?.toLowerCase()]), [listOfDonors]);
+  const contentData = useMemo(() => sortBy(listOfDonors, [({ name }) => name?.toLowerCase()]), [listOfDonors]);
 
   const resultsFormatter = useMemo(() => {
     return formatter || getDonorsFormatter({ intl, fields, canViewOrganizations, onRemove });
@@ -98,7 +97,6 @@ DonorsContainer.propTypes = {
   columnWidths: PropTypes.object,
   columnMapping: PropTypes.object,
   donors: PropTypes.arrayOf(PropTypes.object),
-  donorIds: PropTypes.arrayOf(PropTypes.string),
   fields: PropTypes.object,
   formatter: PropTypes.object,
   id: PropTypes.string,
diff --git a/lib/Donors/DonorsContainer.test.js b/lib/Donors/DonorsContainer.test.js
index d53b4cf8..4d199d3a 100644
--- a/lib/Donors/DonorsContainer.test.js
+++ b/lib/Donors/DonorsContainer.test.js
@@ -48,12 +48,14 @@ jest.mock('./hooks', () => ({
 const defaultProps = {
   columnMapping: {},
   columnWidths: {},
-  donorIds: [
-    '1',
-    '2',
-  ],
-  formatter: {},
   donors: [],
+  fields: {
+    value: [
+      '1',
+      '2',
+    ],
+  },
+  formatter: {},
   id: 'donors',
   setDonorIds,
   searchLabel: 'Search',
@@ -100,7 +102,7 @@ describe('DonorsContainer', () => {
     expect(screen.getByText(mockData[0].name)).toBeDefined();
   });
 
-  it('should call `setDonorIds` when `onAddDonors` is called', async () => {
+  it('should call `setDonorIds` when `onAddDonors` is called', () => {
     renderComponent({
       donors: [mockVendor],
       fields: {
@@ -112,7 +114,7 @@ describe('DonorsContainer', () => {
     const addDonorsButton = screen.getByText('Add donor');
 
     expect(addDonorsButton).toBeDefined();
-    await user.click(addDonorsButton);
+    user.click(addDonorsButton);
     expect(setDonorIds).toHaveBeenCalled();
   });
 

From 6344233a3a22f90cb5aaa8379097fa553d3cc2d6 Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Thu, 16 Nov 2023 15:11:05 +0500
Subject: [PATCH 8/8] improve useFetchDonors hook

---
 lib/Donors/Donors.js                              |  2 +-
 lib/Donors/DonorsContainer.js                     | 10 +---------
 lib/Donors/DonorsLookup.js                        |  2 --
 lib/Donors/hooks/useFetchDonors/useFetchDonors.js |  7 +++++--
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/lib/Donors/Donors.js b/lib/Donors/Donors.js
index 32d34c5b..69365a09 100644
--- a/lib/Donors/Donors.js
+++ b/lib/Donors/Donors.js
@@ -14,7 +14,7 @@ import { useFetchDonors } from './hooks';
 
 export function Donors({ name, donorOrganizationIds, onChange, ...rest }) {
   const [donorIds, setDonorIds] = useState(donorOrganizationIds);
-  const { donors, isLoading } = useFetchDonors(donorIds);
+  const { donors, isLoading } = useFetchDonors(donorIds, { keepPreviousData: true });
 
   useEffect(() => {
     setDonorIds(donorOrganizationIds);
diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
index 319868f3..25286c6a 100644
--- a/lib/Donors/DonorsContainer.js
+++ b/lib/Donors/DonorsContainer.js
@@ -5,10 +5,7 @@ import { useIntl } from 'react-intl';
 
 import { useStripes } from '@folio/stripes/core';
 
-import {
-  defaultContainerVisibleColumns,
-  pluginVisibleColumns,
-} from './constants';
+import { defaultContainerVisibleColumns } from './constants';
 import { DonorsList } from './DonorsList';
 import { DonorsLookup } from './DonorsLookup';
 import { getDonorsFormatter } from './utils';
@@ -21,7 +18,6 @@ export function DonorsContainer({
   formatter,
   id,
   onRemove,
-  pluginVisibleColumns: pluginVisibleColumnsProp,
   setDonorIds,
   searchLabel,
   showTriggerButton,
@@ -84,8 +80,6 @@ export function DonorsContainer({
             onAddDonors={onAddDonors}
             name={id}
             searchLabel={searchLabel}
-            visibleColumns={pluginVisibleColumnsProp}
-            {...rest}
           />
         )
       }
@@ -105,12 +99,10 @@ DonorsContainer.propTypes = {
   setDonorIds: PropTypes.func.isRequired,
   showTriggerButton: PropTypes.bool,
   visibleColumns: PropTypes.arrayOf(PropTypes.string),
-  pluginVisibleColumns: PropTypes.arrayOf(PropTypes.string),
 };
 
 DonorsContainer.defaultProps = {
   onRemove: noop,
   showTriggerButton: true,
   visibleColumns: defaultContainerVisibleColumns,
-  pluginVisibleColumns,
 };
diff --git a/lib/Donors/DonorsLookup.js b/lib/Donors/DonorsLookup.js
index 3a853834..51783418 100644
--- a/lib/Donors/DonorsLookup.js
+++ b/lib/Donors/DonorsLookup.js
@@ -21,7 +21,6 @@ export const DonorsLookup = ({
   onAddDonors,
   searchLabel,
   visibleColumns,
-  ...rest
 }) => {
   const stripes = useStripes();
 
@@ -44,7 +43,6 @@ export const DonorsLookup = ({
       visibleFilters={visibleFilters}
       isMultiSelect
       sortableColumns={sortableColumns}
-      {...rest}
     >
       <span data-test-add-donor>
         <FormattedMessage id="stripes-acq-components.donors.noFindOrganizationPlugin" />
diff --git a/lib/Donors/hooks/useFetchDonors/useFetchDonors.js b/lib/Donors/hooks/useFetchDonors/useFetchDonors.js
index ae7c10e1..6f9e5dd1 100644
--- a/lib/Donors/hooks/useFetchDonors/useFetchDonors.js
+++ b/lib/Donors/hooks/useFetchDonors/useFetchDonors.js
@@ -9,7 +9,7 @@ import { VENDORS_API } from '../../../constants';
 import { batchRequest } from '../../../utils';
 import { DEFAULT_DATA } from './constants';
 
-export const useFetchDonors = (donorOrganizationIds = DEFAULT_DATA) => {
+export const useFetchDonors = (donorOrganizationIds = DEFAULT_DATA, options = {}) => {
   const ky = useOkapiKy();
   const namespace = useNamespace({ key: 'fetch-donors-list' });
 
@@ -24,7 +24,10 @@ export const useFetchDonors = (donorOrganizationIds = DEFAULT_DATA) => {
         donorOrganizationIds,
       );
     },
-    { enabled: Boolean(donorOrganizationIds.length) },
+    {
+      enabled: Boolean(donorOrganizationIds.length),
+      ...options,
+    },
   );
 
   return ({