Reimplement bug fix, but this time better (maybe)

CenterForOpenScience · Jan 21, 2025 · 4389693 · 4389693
1 parent 57fcd09
commit 4389693
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/app/preprints/detail/route.ts b/app/preprints/detail/route.ts
@@ -96,20 +96,22 @@ export default class PreprintsDetail extends Route {
             let hasPendingWithdrawal = false;
             let latestWithdrawalRequest = null;
             let latestAction = null;
-            if (preprintWithdrawableState && preprint.currentUserIsAdmin) {
+            if (preprint.currentUserPermissions.length > 0) {
                 const reviewActions = await preprint?.queryHasMany('reviewActions');
                 latestAction = reviewActions.firstObject;
-                const withdrawalRequests = await preprint?.queryHasMany('requests');
-                latestWithdrawalRequest = withdrawalRequests.firstObject;
-                if (latestWithdrawalRequest) {
-                    hasPendingWithdrawal = latestWithdrawalRequest.machineState === 'pending';
-                    const requestActions = await withdrawalRequests.firstObject?.queryHasMany('actions', {
-                        sort: '-modified',
-                    });
-                    latestAction = requestActions.firstObject;
-                    // @ts-ignore: ActionTrigger is never
-                    if (latestAction && latestAction.actionTrigger === 'reject') {
-                        isWithdrawalRejected = true;
+                if (preprintWithdrawableState && preprint.currentUserIsAdmin) {
+                    const withdrawalRequests = await preprint?.queryHasMany('requests');
+                    latestWithdrawalRequest = withdrawalRequests.firstObject;
+                    if (latestWithdrawalRequest) {
+                        hasPendingWithdrawal = latestWithdrawalRequest.machineState === 'pending';
+                        const requestActions = await withdrawalRequests.firstObject?.queryHasMany('actions', {
+                            sort: '-modified',
+                        });
+                        latestAction = requestActions.firstObject;
+                        // @ts-ignore: ActionTrigger is never
+                        if (latestAction && latestAction.actionTrigger === 'reject') {
+                            isWithdrawalRejected = true;
+                        }
                     }
                 }
             }