Skip to content

Commit c7e7780

Browse files
authored
Fix/1063 bug (#655)
* fix(submissions): updated submissions navigation * fix(tests): fixed unit tests * fix(view-only-link): fixed bug * fix(submissions): fixed routing
1 parent 02a569a commit c7e7780

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ export class PreprintWithdrawalSubmissionsComponent implements OnInit {
110110
}
111111

112112
navigateToPreprint(item: PreprintWithdrawalSubmission) {
113-
this.router.navigate(['/preprints/', this.providerId(), item.preprintId], { queryParams: { mode: 'moderator' } });
113+
const url = this.router.serializeUrl(
114+
this.router.createUrlTree(['/preprints/', this.providerId(), item.id], { queryParams: { mode: 'moderator' } })
115+
);
116+
117+
window.open(url, '_blank');
114118
}
115119

116120
private getStatusFromQueryParams() {

src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<osf-registry-submission-item
3939
[submission]="item"
4040
[status]="selectedReviewOption()"
41+
(selected)="navigateToRegistration(item)"
4142
></osf-registry-submission-item>
4243
</div>
4344
}

src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ import {
1919
LoadingSpinnerComponent,
2020
SelectComponent,
2121
} from '@osf/shared/components';
22+
import { RegistrationReviewStates, RevisionReviewStates } from '@osf/shared/enums';
2223
import { Primitive } from '@osf/shared/helpers';
2324

2425
import { PENDING_SUBMISSION_REVIEW_OPTIONS, REGISTRY_SORT_OPTIONS } from '../../constants';
2526
import { RegistrySort, SubmissionReviewStatus } from '../../enums';
27+
import { RegistryModeration } from '../../models';
2628
import { GetRegistrySubmissions, RegistryModerationSelectors } from '../../store/registry-moderation';
2729
import { RegistrySubmissionItemComponent } from '../registry-submission-item/registry-submission-item.component';
2830

@@ -93,6 +95,24 @@ export class RegistryPendingSubmissionsComponent implements OnInit {
9395
this.fetchSubmissions();
9496
}
9597

98+
navigateToRegistration(item: RegistryModeration) {
99+
const isPendingModeration = item.revisionStatus === RevisionReviewStates.RevisionPendingModeration;
100+
const isPending =
101+
item.reviewsState === RegistrationReviewStates.Pending ||
102+
item.reviewsState === RegistrationReviewStates.PendingWithdraw;
103+
104+
const url = this.router.serializeUrl(
105+
this.router.createUrlTree(['/', item.id, 'overview'], {
106+
queryParams: {
107+
mode: 'moderator',
108+
revisionId: isPendingModeration && !isPending ? item.revisionId : null,
109+
},
110+
})
111+
);
112+
113+
window.open(url, '_blank');
114+
}
115+
96116
private getStatusFromQueryParams() {
97117
const queryParams = this.route.snapshot.queryParams;
98118
const statusValues = Object.values(SubmissionReviewStatus);

0 commit comments

Comments
 (0)