From 677d6e68d49082b89aadde524ea6e2dd7f123c5d Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Wed, 6 Oct 2021 10:35:42 -0700 Subject: [PATCH] Fix receiver's data entry page not to show 'Reorder' button --- .../src/client/RequestEntry/RequestEntry.tsx | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/WNPRC_Purchasing/src/client/RequestEntry/RequestEntry.tsx b/WNPRC_Purchasing/src/client/RequestEntry/RequestEntry.tsx index 3a3503c34..1f2e05e0a 100644 --- a/WNPRC_Purchasing/src/client/RequestEntry/RequestEntry.tsx +++ b/WNPRC_Purchasing/src/client/RequestEntry/RequestEntry.tsx @@ -52,6 +52,9 @@ export const App: FC = memo(() => { const [rejectQCStateId, setRejectQCStateId] = useState(); const [isReorder, setIsReorder] = useState(ActionURL.getParameter('isReorder') || false); const { isAdmin: hasPurchasingAdminPermission, canUpdate: hasPurchasingUpdatePermission, canInsert: hasPurchasingInsertPermission } = getServerContext().user; + const [isRequester, setIsRequester] = useState(); + const [isReceiver, setIsReceiver] = useState(); + const [isPurchaseAdmin, setIsPurchaseAdmin] = useState(); // equivalent to componentDidMount and componentDidUpdate (if with dependencies, then equivalent to componentDidUpdate) useEffect(() => { @@ -59,6 +62,10 @@ export const App: FC = memo(() => { const reqRowId = ActionURL.getParameter('requestRowId'); setRequestId(reqRowId); + setIsRequester(hasPurchasingInsertPermission && !hasPurchasingAdminPermission && !hasPurchasingUpdatePermission); + setIsReceiver(hasPurchasingUpdatePermission && !hasPurchasingAdminPermission); + setIsPurchaseAdmin(hasPurchasingAdminPermission); + (async () => { //get QCStates const qcStateVals = await getData('core', 'qcState', 'RowId, Label'); @@ -454,9 +461,9 @@ export const App: FC = memo(() => { onInputChange={requestOrderModelChange} model={requestOrderModel} hasRequestId={!!requestId} - isRequester={hasPurchasingInsertPermission && !hasPurchasingAdminPermission && !hasPurchasingUpdatePermission} - isAdmin={hasPurchasingAdminPermission} - isReceiver={hasPurchasingUpdatePermission && !hasPurchasingAdminPermission} + isRequester={isRequester} + isAdmin={isPurchaseAdmin} + isReceiver={isReceiver} isReorder={isReorder} /> { @@ -478,9 +485,9 @@ export const App: FC = memo(() => { lineItems={lineItems} errorMsg={lineItemErrorMsg} hasRequestId={!!requestId} - isRequester={hasPurchasingInsertPermission && !hasPurchasingAdminPermission && !hasPurchasingUpdatePermission} - isAdmin={hasPurchasingAdminPermission} - isReceiver={hasPurchasingUpdatePermission && !hasPurchasingAdminPermission} + isRequester={isRequester} + isAdmin={isPurchaseAdmin} + isReceiver={isReceiver} isReorder={isReorder} /> { - (requestId && !isReorder) && ( + (requestId && !isReorder && !isReceiver) && (