Skip to content
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

Reimplement bug fix and account for permissions when accessing preprint requests #2485

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Reimplement bug fix and account for permissions when accessing preprint requests #2485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4389693
Reimplement bug fix, but this time better (maybe)
futa-ikeda Jan 21, 2025
31ac662
Fix status banner modal bug
futa-ikeda Jan 21, 2025
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
2 changes: 1 addition & 1 deletion app/preprints/-components/preprint-status-banner/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default class PreprintStatusBanner extends Component<InputArgs>{
}

get reviewerName(): string | undefined {
return this.args.latestAction?.creator.fullName;
return this.args.latestAction?.creator.get('fullName');
}

get isWithdrawn() {
Expand Down
26 changes: 14 additions & 12 deletions app/preprints/detail/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
}
Expand Down
Loading