UIREQMED-42: Add Decline Action for Mediated request with status of New - Awaiting confirmation

Author: Dmitriy-Litvinenko

src/components/MediatedRequestsActivities/components/MediatedRequestsDetail/MediatedRequestsDetail.js

@@ -18,7 +18,6 @@ import {
   IfPermission,
   TitleManager,
   useOkapiKy,
-  useStripes,
 } from '@folio/stripes/core';
 import {
   Button,
@@ -70,7 +69,7 @@ const MediatedRequestsDetail = ({
   stripes,
   patronGroups,
   setRequest,
-  update,
+  updateMediatedRequestList,
 }) => {
   const history = useHistory();
   const location = useLocation();
@@ -81,8 +80,8 @@ const MediatedRequestsDetail = ({
   const {
     mediatedRequest,
     isFetching,
-    shouldUpdate,
-    setShouldUpdate,
+    shouldUpdateMediatedRequestById,
+    setShouldUpdateMediatedRequestById,
   } = useMediatedRequestById(mediatedRequestIdFromPathname);
   const { userData } = useUserById(mediatedRequest?.requesterId, isFetching);
   const { servicePoints } = useServicePoints();
@@ -95,8 +94,8 @@ const MediatedRequestsDetail = ({
   const onConfirmDeclineModal = () => {
     ky.post(`requests-mediated/mediated-requests/${mediatedRequestIdFromPathname}/decline`)
       .then(() => {
-        update();
-        setShouldUpdate(shouldUpdate + 1);
+        updateMediatedRequestList();
+        setShouldUpdateMediatedRequestById(shouldUpdateMediatedRequestById + 1);
         setDeclineModalOpen(false);
       })
       .catch(() => {
@@ -120,6 +119,10 @@ const MediatedRequestsDetail = ({
       onToggle();
       history.push(`${mediatedRequestsActivitiesUrl}/edit/${mediatedRequestIdFromPathname}`);
     };
+    const handleDecline = () => {
+      onOpenDeclineModal();
+      onToggle();
+    };
 
     return (
       <>
@@ -138,10 +141,7 @@ const MediatedRequestsDetail = ({
           <Button
             buttonStyle="dropdownItem"
             marginBottom0
-            onClick={() => {
-              onOpenDeclineModal();
-              onToggle();
-            }}
+            onClick={handleDecline}
           >
             <Icon icon={ICONS.TIMES_CIRCLE}>
               <FormattedMessage id="ui-requests-mediated.mediatedRequestDetails.actionMenu.decline" />
@@ -260,7 +260,7 @@ const MediatedRequestsDetail = ({
 MediatedRequestsDetail.propTypes = {
   stripes: PropTypes.object.isRequired,
   setRequest: PropTypes.func.isRequired,
-  update: PropTypes.func.isRequired,
+  updateMediatedRequestList: PropTypes.func.isRequired,
   patronGroups: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string,
     group: PropTypes.string,

src/hooks/useMediatedRequestById/useMediatedRequestById.js

@@ -10,24 +10,24 @@ import {
 } from '@folio/stripes/core';
 
 const useMediatedRequestById = (mediatedRequestId) => {
-  const [shouldUpdate, setShouldUpdate] = useState(0);
+  const [shouldUpdateMediatedRequestById, setShouldUpdateMediatedRequestById] = useState(0);
 
   const ky = useOkapiKy();
   const [namespace] = useNamespace({ key: 'mediatedRequest' });
   const {
     data,
     isFetching,
   } = useQuery(
-    [namespace, mediatedRequestId, shouldUpdate],
+    [namespace, mediatedRequestId, shouldUpdateMediatedRequestById],
     () => ky.get(`requests-mediated/mediated-requests/${mediatedRequestId}`).json(),
     { enabled: Boolean(mediatedRequestId) },
   );
 
   return {
     isFetching,
     mediatedRequest: data,
-    shouldUpdate,
-    setShouldUpdate,
+    shouldUpdateMediatedRequestById,
+    setShouldUpdateMediatedRequestById,
   };
 };
 

src/routes/MediatedRequestsActivitiesContainer.js

@@ -62,7 +62,6 @@ class MediatedRequestsActivitiesContainer extends React.Component {
           query: buildQuery,
         },
       },
-      // shouldRefresh: () => true,
       resourceShouldRefresh: true,
       throwErrors: false,
     },
@@ -163,7 +162,7 @@ class MediatedRequestsActivitiesContainer extends React.Component {
     }
   };
 
-  update = () => {
+  updateMediatedRequestList = () => {
     const {
       location,
       history,
@@ -196,7 +195,7 @@ class MediatedRequestsActivitiesContainer extends React.Component {
         {
           React.Children.map(
             this.props.children, child => React.cloneElement(child, {
-              update: this.update,
+              updateMediatedRequestList: this.updateMediatedRequestList,
             })
           )
         }