From 9e781dff73e5fd0eb525deea24a11bc7a476e165 Mon Sep 17 00:00:00 2001
From: Oleksandr Hladchenko
 <85172747+OleksandrHladchenko1@users.noreply.github.com>
Date: Mon, 6 Nov 2023 21:01:44 +0200
Subject: [PATCH 1/2] UIIN-2647: Show only local authorities when share local
 instance (#2327)

* UIIN-2647: Show only local authorities when share local instance

* UIIN-2647: Update CHANGELOG.md

* UIIN-2647: Add brackets to query

* UIIN-2647: Fix test
---
 CHANGELOG.md             |  1 +
 src/ViewInstance.js      | 56 ++++++++++++++++++++--------------------
 src/ViewInstance.test.js | 19 +++++++++++---
 src/utils.js             | 14 ++++++++++
 4 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b28dad54..5ed328dcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 * Optimistic locking message not working for instances in non-consortial tenant. Fixes UIIN-2628.
 * Add immediate warning message when a local instance is shared. Refs UIIN-2617.
 * ECS: Show info message when user in member tenant tries to view shared instance details without permission. Refs UIIN-2590.
+* Show only local MARC Authorities when share local instance. Fixes UIIN-2647.
 
 ## [10.0.1](https://github.com/folio-org/ui-inventory/tree/v10.0.1) (2023-11-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v10.0.0...v10.0.1)
diff --git a/src/ViewInstance.js b/src/ViewInstance.js
index 2ae2cd82a..053d8a80f 100644
--- a/src/ViewInstance.js
+++ b/src/ViewInstance.js
@@ -9,7 +9,6 @@ import {
 import {
   flowRight,
   isEmpty,
-  pick,
 } from 'lodash';
 
 import {
@@ -38,9 +37,10 @@ import {
   handleKeyCommand,
   isInstanceShadowCopy,
   isMARCSource,
+  getLinkedAuthorityIds,
 } from './utils';
 import {
-  AUTHORITY_LINKED_FIELDS,
+  CONSORTIUM_PREFIX,
   HTTP_RESPONSE_STATUS_CODES,
   indentifierTypeNames,
   INSTANCE_SHARING_STATUSES,
@@ -170,6 +170,12 @@ class ViewInstance extends React.Component {
       accumulate: true,
       throwErrors: false,
     },
+    authorities: {
+      type: 'okapi',
+      path: 'authority-storage/authorities',
+      accumulate: true,
+      throwErrors: false,
+    }
   });
 
   constructor(props) {
@@ -522,34 +528,25 @@ class ViewInstance extends React.Component {
   }
 
   checkIfHasLinkedAuthorities = (instance = {}) => {
-    const linkedAuthorities = pick(this.props.selectedInstance, AUTHORITY_LINKED_FIELDS);
-
-    const findLinkedAuthorities = authorities => {
-      const linkedAuthoritiesLength = AUTHORITY_LINKED_FIELDS.reduce((total, field) => {
-        const authoritiesAmount = authorities[field].filter(item => item.authorityId).length;
-        return total + authoritiesAmount;
-      }, 0);
+    const authorityIds = getLinkedAuthorityIds(instance).join(' or ');
 
-      return {
-        hasLinkedAuthorities: !!linkedAuthoritiesLength,
-        linkedAuthoritiesLength,
-      };
-    };
-
-    const {
-      hasLinkedAuthorities,
-      linkedAuthoritiesLength,
-    } = findLinkedAuthorities(linkedAuthorities);
+    this.props.mutator.authorities.GET({
+      params: {
+        query: `id==(${authorityIds})`,
+      }
+    }).then(({ authorities }) => {
+      const localAuthorities = authorities.filter(authority => !authority.source.startsWith(CONSORTIUM_PREFIX));
 
-    if (hasLinkedAuthorities) {
-      this.setState({
-        linkedAuthoritiesLength,
-        isShareLocalInstanceModalOpen: false,
-        isUnlinkAuthoritiesModalOpen: true,
-      });
-    } else {
-      this.handleShareLocalInstance(instance);
-    }
+      if (localAuthorities.length) {
+        this.setState({
+          linkedAuthoritiesLength: localAuthorities.length,
+          isShareLocalInstanceModalOpen: false,
+          isUnlinkAuthoritiesModalOpen: true,
+        });
+      } else {
+        this.handleShareLocalInstance(instance);
+      }
+    });
   }
 
   toggleCopyrightModal = () => {
@@ -1096,6 +1093,9 @@ ViewInstance.propTypes = {
       POST: PropTypes.func.isRequired,
       GET: PropTypes.func.isRequired,
     }).isRequired,
+    authorities: PropTypes.shape({
+      GET: PropTypes.func.isRequired,
+    }).isRequired,
   }),
   onClose: PropTypes.func,
   onCopy: PropTypes.func,
diff --git a/src/ViewInstance.test.js b/src/ViewInstance.test.js
index 0a6aa4779..c8c51c36d 100644
--- a/src/ViewInstance.test.js
+++ b/src/ViewInstance.test.js
@@ -112,9 +112,10 @@ ConfirmationModal.mockImplementation(({
   open,
   onCancel,
   onConfirm,
+  heading,
 }) => (open ? (
   <div>
-    <span>Confirmation modal</span>
+    <span>{heading}</span>
     <button
       type="button"
       onClick={onCancel}
@@ -195,6 +196,9 @@ const defaultProp = {
       POST: jest.fn(),
       GET: jest.fn(() => Promise.resolve({ sharingInstances: [{ status: 'COMPLETE' }] })),
     },
+    authorities: {
+      GET: jest.fn(),
+    }
   },
   onClose: mockonClose,
   onCopy: jest.fn(),
@@ -294,6 +298,7 @@ describe('ViewInstance', () => {
 
   it('should show a correct Warning message banner when instance sharing is in progress', async () => {
     defaultProp.mutator.shareInstance.POST.mockResolvedValue({});
+    defaultProp.mutator.authorities.GET.mockResolvedValueOnce({ authorities: [] });
     checkIfUserInMemberTenant.mockClear().mockReturnValue(true);
 
     renderViewInstance({ isShared: false });
@@ -627,7 +632,7 @@ describe('ViewInstance', () => {
             fireEvent.click(screen.getByRole('button', { name: 'Actions' }));
             fireEvent.click(screen.getByRole('button', { name: 'Share local instance' }));
 
-            expect(screen.getByText('Confirmation modal')).toBeInTheDocument();
+            expect(screen.getByText('Are you sure you want to share this instance?')).toBeInTheDocument();
           });
         });
 
@@ -654,14 +659,20 @@ describe('ViewInstance', () => {
               fireEvent.click(screen.getByRole('button', { name: 'Share local instance' }));
               fireEvent.click(screen.getByRole('button', { name: 'Confirm' }));
 
-              expect(screen.getByText('Confirmation modal')).toBeInTheDocument();
+              expect(screen.getByText('Are you sure you want to share this instance?')).toBeInTheDocument();
             });
 
             describe('when proceed sharing', () => {
-              it('should make POST request to share local instance', () => {
+              it('should make POST request to share local instance', async () => {
+                defaultProp.mutator.authorities.GET.mockResolvedValueOnce({ authorities: [{ source: 'MARC' }] });
+
                 fireEvent.click(screen.getByRole('button', { name: 'Actions' }));
                 fireEvent.click(screen.getByRole('button', { name: 'Share local instance' }));
                 fireEvent.click(screen.getByRole('button', { name: 'Confirm' }));
+
+                const localAuthoritiesModal = await screen.findByText('Linked to local authorities');
+                expect(localAuthoritiesModal).toBeInTheDocument();
+
                 fireEvent.click(screen.getByRole('button', { name: 'Confirm' }));
 
                 expect(defaultProp.mutator.shareInstance.POST).toHaveBeenCalled();
diff --git a/src/utils.js b/src/utils.js
index 88c1a9eb4..30eba4b9b 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -18,6 +18,7 @@ import {
   omit,
   chunk,
   flatten,
+  pick,
 } from 'lodash';
 import moment from 'moment';
 
@@ -41,6 +42,7 @@ import {
   OKAPI_TENANT_HEADER,
   CONTENT_TYPE_HEADER,
   OKAPI_TOKEN_HEADER,
+  AUTHORITY_LINKED_FIELDS,
 } from './constants';
 
 export const areAllFieldsEmpty = fields => fields.every(item => (isArray(item)
@@ -850,3 +852,15 @@ export const switchAffiliation = async (stripes, tenantId, move) => {
     move();
   }
 };
+
+export const getLinkedAuthorityIds = instance => {
+  // Pick fields with authorityId
+  const linkedAuthorities = pick(instance, AUTHORITY_LINKED_FIELDS);
+
+  // Retrieve only authorityId
+  const authorityIdList = AUTHORITY_LINKED_FIELDS.map(field => {
+    return linkedAuthorities[field].filter(auth => !!auth.authorityId).map(auth => auth.authorityId);
+  });
+
+  return flatten(authorityIdList);
+};

From 50f2b95df9fc41f49b4c033c0566893bf78d3925 Mon Sep 17 00:00:00 2001
From: Mariia_Aloshyna <Mariia_Aloshyna@epam.com>
Date: Tue, 7 Nov 2023 12:17:39 +0200
Subject: [PATCH 2/2] Release v10.0.2

---
 CHANGELOG.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ed328dcc..c491c44f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,16 +7,20 @@
 * Added support for `containsAny` match option in Advanced search. Refs UIIN-2486.
 * Inventory search/browse: Do not retain checkbox selections when toggling search segment. Refs UIIN-2477.
 
-## [10.0.2] IN PROGRESS
+## [10.0.3] IN PROGRESS
+
+* ECS: Show info message when user in member tenant tries to view shared instance details without permission. Refs UIIN-2590.
+* Show only local MARC Authorities when share local instance. Fixes UIIN-2647.
+
+## [10.0.2](https://github.com/folio-org/ui-inventory/tree/v10.0.2) (2023-11-07)
+[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v10.0.1...v10.0.2)
 
-* Instance. Series heading has vanished in detailed view. Fixes UIIN-2601.
 * Enable/disable consortial holdings/item actions based on User permissions. Refs UIIN-2452.
+* Instance. Series heading has vanished in detailed view. Fixes UIIN-2601.
+* Add immediate warning message when a local instance is shared. Refs UIIN-2617.
+* Optimistic locking message not working for instances in non-consortial tenant. Fixes UIIN-2628.
 * User receives an error when searching for an item in the Inventory app. Fixes UIIN-2634.
 * Create new instance success toast no longer shows the instance HRID. Fixes UIIN-2635.
-* Optimistic locking message not working for instances in non-consortial tenant. Fixes UIIN-2628.
-* Add immediate warning message when a local instance is shared. Refs UIIN-2617.
-* ECS: Show info message when user in member tenant tries to view shared instance details without permission. Refs UIIN-2590.
-* Show only local MARC Authorities when share local instance. Fixes UIIN-2647.
 
 ## [10.0.1](https://github.com/folio-org/ui-inventory/tree/v10.0.1) (2023-11-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v10.0.0...v10.0.1)