Skip to content

Do not display 'Reorder' button on data entry page for the receivers #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-bpatel merged 1 commit into from
Oct 6, 2021
Merged

Do not display 'Reorder' button on data entry page for the receivers #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions WNPRC_Purchasing/src/client/RequestEntry/RequestEntry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,20 @@ export const App: FC = memo(() => {
const [rejectQCStateId, setRejectQCStateId] = useState<number>();
const [isReorder, setIsReorder] = useState<boolean>(ActionURL.getParameter('isReorder') || false);
const { isAdmin: hasPurchasingAdminPermission, canUpdate: hasPurchasingUpdatePermission, canInsert: hasPurchasingInsertPermission } = getServerContext().user;
const [isRequester, setIsRequester] = useState<boolean>();
const [isReceiver, setIsReceiver] = useState<boolean>();
const [isPurchaseAdmin, setIsPurchaseAdmin] = useState<boolean>();

// equivalent to componentDidMount and componentDidUpdate (if with dependencies, then equivalent to componentDidUpdate)
useEffect(() => {
// is fired on component mount
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');
Expand Down Expand Up @@ -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}
/>
{
Expand All @@ -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}
/>
<button
Expand All @@ -505,7 +512,7 @@ export const App: FC = memo(() => {
{requestId && !isReorder ? 'Submit' : 'Submit for Review'}
</button>
{
(requestId && !isReorder) && (
(requestId && !isReorder && !isReceiver) && (
<button
className="btn btn-primary pull-right"
style={{marginRight:'10px'}}
Expand Down