UIREQ-1032, UIREQ-1034, UIREQ-1035 - Request detail view update for L…

…ending, Borrowing and Pickup DCB roles
folio-org · Nov 9, 2023 · 852d154 · 852d154
1 parent 43515f6
commit 852d154
Show file tree

Hide file tree

Showing 10 changed files with 501 additions and 133 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change history for ui-requests
 
+## [9.1.0] in progress
+
+* Hide all actions except "Cancel Request" in Action menu (Lending library). Refs UIREQ-1032.
+* Hide all actions except "Cancel Request" in Action menu and DCB item links (Borrowing library). Refs UIREQ-1034.
+* Hide all actions except "Cancel Request" in Action menu and DCB item links (Pickup library). Refs UIREQ-1035.
+
 ## [9.0.0](https://github.com/folio-org/ui-requests/tree/v9.0.0) (2023-10-12)
 [Full Changelog](https://github.com/folio-org/ui-requests/compare/v8.0.2...v9.0.0)
 

diff --git a/src/ItemDetail.js b/src/ItemDetail.js
@@ -17,6 +17,7 @@ import {
 
 import {
   isValidRequest,
+  isVirtualItem,
   openRequestStatusFilters,
 } from './utils';
 import { itemStatusesTranslations } from './constants';
@@ -58,7 +59,7 @@ const ItemDetail = ({
   const isRequestValid = isValidRequest({ instanceId, holdingsRecordId });
   const recordLink = () => {
     if (itemId) {
-      return isRequestValid
+      return isRequestValid && !isVirtualItem(instanceId, holdingsRecordId)
         ? <Link to={`/inventory/view/${instanceId}/${holdingsRecordId}/${itemId}`}>{item.barcode || itemId}</Link>
         : (item.barcode || itemId);
     }

diff --git a/src/ItemDetail.test.js b/src/ItemDetail.test.js
@@ -79,4 +79,29 @@ describe('ItemDetail', () => {
       expect(within(keyValueWithLink).getByText(item.barcode)).toBeInTheDocument();
     });
   });
+
+  describe('when DCB transaction request on virtual item', () => {
+    const request = {
+      ...defaultRequest,
+      instanceId: INVALID_REQUEST_HARDCODED_ID,
+      holdingsRecordId: INVALID_REQUEST_HARDCODED_ID,
+    };
+
+    beforeEach(() => {
+      render(
+        <ItemDetail
+          {...defaultProps}
+          request={request}
+        />
+      );
+    });
+
+    it('should render "item barcode" without link', () => {
+      const keyValueWithLink = screen.getByTestId(testIds.itemBarcodeLink);
+      const link = within(keyValueWithLink).queryByRole('link');
+
+      expect(link).not.toBeInTheDocument();
+      expect(within(keyValueWithLink).getByText(item.barcode)).toBeInTheDocument();
+    });
+  });
 });
diff --git a/src/ViewRequest.js b/src/ViewRequest.js
@@ -63,6 +63,8 @@ import {
   getTlrSettings,
   generateUserName,
   isValidRequest,
+  isVirtualItem,
+  isVirtualPatron,
 } from './utils';
 import urls from './routes/urls';
 
@@ -473,6 +475,7 @@ class ViewRequest extends React.Component {
     const {
       requestLevel,
       item,
+      requester,
     } = request;
 
     const getPickupServicePointName = this.getPickupServicePointName(request);
@@ -482,6 +485,7 @@ class ViewRequest extends React.Component {
     const isRequestOpen = requestStatus.startsWith('Open');
     const cancellationReasonMap = keyBy(cancellationReasons, 'id');
     const isRequestValid = isValidRequest(request);
+    const isDCBTransaction = isVirtualPatron(requester?.personal?.lastName) || isVirtualItem(request?.instanceId, request?.holdingsRecordId);
 
     let deliveryAddressDetail;
     let selectedDelivery = false;
@@ -519,18 +523,22 @@ class ViewRequest extends React.Component {
 
         return (
           <IfPermission perm="ui-requests.create">
-            <Button
-              id="duplicate-request"
-              onClick={() => {
-                onToggle();
-                this.props.onDuplicate(request);
-              }}
-              buttonStyle="dropdownItem"
-            >
-              <Icon icon="duplicate">
-                <FormattedMessage id="ui-requests.actions.duplicateRequest" />
-              </Icon>
-            </Button>
+            {
+              !isDCBTransaction && (
+                <Button
+                  id="duplicate-request"
+                  onClick={() => {
+                    onToggle();
+                    this.props.onDuplicate(request);
+                  }}
+                  buttonStyle="dropdownItem"
+                >
+                  <Icon icon="duplicate">
+                    <FormattedMessage id="ui-requests.actions.duplicateRequest" />
+                  </Icon>
+                </Button>
+              )
+            }
           </IfPermission>
         );
       }
@@ -539,7 +547,7 @@ class ViewRequest extends React.Component {
         <>
           <IfPermission perm="ui-requests.edit">
             {
-              isRequestValid &&
+              isRequestValid && !isDCBTransaction &&
               <Button
                 buttonStyle="dropdownItem"
                 id="clickable-edit-request"
@@ -568,7 +576,7 @@ class ViewRequest extends React.Component {
             </Button>
           </IfPermission>
           {
-            isRequestValid &&
+            isRequestValid && !isDCBTransaction &&
             <IfPermission perm="ui-requests.create">
               <Button
                 id="duplicate-request"
@@ -584,7 +592,7 @@ class ViewRequest extends React.Component {
               </Button>
             </IfPermission>
           }
-          {item && isRequestNotFilled && isRequestValid &&
+          {item && isRequestNotFilled && isRequestValid && !isDCBTransaction &&
             <IfPermission perm="ui-requests.moveRequest">
               <Button
                 id="move-request"
@@ -599,7 +607,7 @@ class ViewRequest extends React.Component {
                 </Icon>
               </Button>
             </IfPermission> }
-          {isRequestOpen && isRequestValid &&
+          {isRequestOpen && isRequestValid && !isDCBTransaction &&
             <IfPermission perm="ui-requests.reorderQueue">
               <Button
                 id="reorder-queue"
@@ -670,6 +678,7 @@ class ViewRequest extends React.Component {
               >
                 <TitleInformation
                   instanceId={request.instanceId}
+                  holdingsRecordId={request.holdingsRecordId}
                   titleLevelRequestsCount={request.titleRequestCount}
                   title={request.instance.title}
                   contributors={request.instance.contributorNames}