Feat - Preprints Moderation

src/app/core/components/nav-menu/nav-menu.component.ts

@@ -44,6 +44,7 @@ export class NavMenuComponent {
       isProject: this.isProjectRoute() && !this.isRegistryRoute() && !this.isPreprintRoute(),
       isRegistry: this.isRegistryRoute(),
       isPreprint: this.isPreprintRoute(),
+      preprintReviewsPageVisible: this.canUserViewReviews(),
       isCollections: this.isCollectionsRoute() || false,
       currentUrl: this.router.url,
     };
@@ -69,6 +70,7 @@ export class NavMenuComponent {
   protected readonly isCollectionsRoute = computed(() => this.currentRoute().isCollectionsWithId);
   protected readonly isRegistryRoute = computed(() => this.currentRoute().isRegistryRoute);
   protected readonly isPreprintRoute = computed(() => this.currentRoute().isPreprintRoute);
+  protected readonly canUserViewReviews = select(UserSelectors.getCanViewReviews);
 
   private getRouteInfo() {
     const urlSegments = this.router.url.split('/').filter((segment) => segment);

src/app/core/helpers/nav-menu.helper.ts

@@ -140,6 +140,9 @@ function updatePreprintMenuItem(item: MenuItem, ctx: RouteContext): MenuItem {
       }
       return { ...subItem, visible: false, expanded: false };
     }
+    if (subItem.id === 'preprints-moderation') {
+      return { ...subItem, visible: ctx.preprintReviewsPageVisible };
+    }
     return subItem;
   });
 

src/app/core/models/route-context.model.ts

@@ -4,6 +4,7 @@ export interface RouteContext {
   isProject: boolean;
   isRegistry: boolean;
   isPreprint: boolean;
+  preprintReviewsPageVisible?: boolean;
   isCollections: boolean;
   currentUrl?: string;
 }

src/app/core/store/user/user.selectors.ts

@@ -63,6 +63,11 @@ export class UserSelectors {
     return !!state.currentUser.data?.isModerator;
   }
 
+  @Selector([UserState])
+  static getCanViewReviews(state: UserStateModel): boolean {
+    return state.currentUser.data?.canViewReviews || false;
+  }
+
   @Selector([UserState])
   static isAuthenticated(state: UserStateModel): boolean {
     return !!state.currentUser.data || !!localStorage.getItem('currentUser');

src/app/features/moderation/components/moderators-list/moderators-list.component.html

@@ -1,24 +1,26 @@
 <div class="flex flex-column gap-4 md:flex-row md:gap-6">
-  <div class="md:w-8">
-    <osf-search-input [control]="searchControl" [placeholder]="'common.search.title' | translate" />
-  </div>
+  <osf-search-input class="w-full" [control]="searchControl" [placeholder]="'common.search.title' | translate" />
 
-  <div class="ml-auto w-full md:w-4">
-    <p-button
-      class="w-full"
-      styleClass="w-full"
-      [label]="'moderation.addModerator' | translate"
-      (click)="openAddModeratorDialog()"
-      [disabled]="isModeratorsLoading()"
-    ></p-button>
-  </div>
+  @if (isCurrentUserAdminModerator()) {
+    <div class="ml-auto w-full md:w-4">
+      <p-button
+        class="w-full"
+        styleClass="w-full"
+        [label]="'moderation.addModerator' | translate"
+        (click)="openAddModeratorDialog()"
+        [disabled]="isModeratorsLoading()"
+      />
+    </div>
+  }
 </div>
 
 <div class="block w-full my-5">
   <osf-moderators-table
     [items]="moderators()"
     [isLoading]="isModeratorsLoading()"
+    [currentUserId]="currentUser()?.id"
+    [isCurrentUserAdminModerator]="isCurrentUserAdminModerator()"
     (update)="updateModerator($event)"
     (remove)="removeModerator($event)"
-  ></osf-moderators-table>
+  />
 </div>

src/app/features/moderation/components/moderators-list/moderators-list.component.ts

@@ -7,12 +7,23 @@ import { DialogService } from 'primeng/dynamicdialog';
 
 import { debounceTime, distinctUntilChanged, filter, forkJoin, map, of, skip } from 'rxjs';
 
-import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit, Signal, signal } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  DestroyRef,
+  effect,
+  inject,
+  OnInit,
+  Signal,
+  signal,
+} from '@angular/core';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 
-import { AddModeratorType } from '@osf/features/moderation/enums';
+import { UserSelectors } from '@core/store/user';
+import { AddModeratorType, ModeratorPermission } from '@osf/features/moderation/enums';
 import { ModeratorDialogAddModel, ModeratorModel } from '@osf/features/moderation/models';
 import {
   AddModerator,
@@ -58,6 +69,17 @@ export class ModeratorsListComponent implements OnInit {
   moderators = signal([]);
   initialModerators = select(ModeratorsSelectors.getModerators);
   isModeratorsLoading = select(ModeratorsSelectors.isModeratorsLoading);
+  currentUser = select(UserSelectors.getCurrentUser);
+
+  isCurrentUserAdminModerator = computed(() => {
+    const currentUserId = this.currentUser()?.id;
+    const initialModerators = this.initialModerators();
+    if (!currentUserId) return false;
+
+    return initialModerators.some((moderator: ModeratorModel) => {
+      return moderator.userId === currentUserId && moderator.permission === ModeratorPermission.Admin;
+    });
+  });
 
   protected actions = createDispatchMap({
     loadModerators: LoadModerators,

src/app/features/moderation/components/moderators-table/moderators-table.component.html

@@ -38,14 +38,25 @@
         </td>
         <td>
           <div>
-            <osf-select
-              [options]="permissionsOptions"
-              [placeholder]="'project.contributors.permissionFilter'"
-              [appendTo]="'body'"
-              [noBorder]="true"
-              [(selectedValue)]="item.permission"
-              (changeValue)="updatePermission(item)"
-            ></osf-select>
+            @if (isCurrentUserAdminModerator()) {
+              <osf-select
+                [options]="permissionsOptions"
+                [placeholder]="'project.contributors.permissionFilter'"
+                [appendTo]="'body'"
+                [noBorder]="true"
+                [(selectedValue)]="item.permission"
+                (changeValue)="updatePermission(item)"
+              />
+            } @else {
+              @switch (item.permission) {
+                @case (ModeratorPermission.Admin) {
+                  <span>{{ 'moderation.moderatorPermissions.administrator' | translate }}</span>
+                }
+                @case (ModeratorPermission.Moderator) {
+                  <span>{{ 'moderation.moderatorPermissions.moderator' | translate }}</span>
+                }
+              }
+            }
           </div>
         </td>
         <td>
@@ -79,8 +90,16 @@
           </div>
         </td>
         <td>
-          <p-button class="danger-icon-btn" icon="fas fa-trash" severity="danger" text (click)="removeModerator(item)">
-          </p-button>
+          @if (isCurrentUserAdminModerator() || currentUserId() === item.id) {
+            <p-button
+              class="danger-icon-btn"
+              icon="fas fa-trash"
+              severity="danger"
+              text
+              (click)="removeModerator(item)"
+              [disabled]="!isCurrentUserAdminModerator() && currentUserId() !== item.id"
+            />
+          }
         </td>
       </tr>
     } @else {

src/app/features/moderation/components/moderators-table/moderators-table.component.ts

@@ -9,6 +9,7 @@ import { ChangeDetectionStrategy, Component, inject, input, output, signal } fro
 import { FormsModule } from '@angular/forms';
 
 import { MODERATION_PERMISSIONS } from '@osf/features/moderation/constants';
+import { ModeratorPermission } from '@osf/features/moderation/enums';
 import { ModeratorModel } from '@osf/features/moderation/models';
 import {
   EducationHistoryDialogComponent,
@@ -29,6 +30,8 @@ import { TableParameters } from '@osf/shared/models';
 export class ModeratorsTableComponent {
   items = input<ModeratorModel[]>([]);
   isLoading = input(false);
+  currentUserId = input.required<string | undefined>();
+  isCurrentUserAdminModerator = input.required<boolean>();
 
   update = output<ModeratorModel>();
   remove = output<ModeratorModel>();
@@ -38,6 +41,7 @@ export class ModeratorsTableComponent {
 
   protected readonly tableParams = signal<TableParameters>({ ...MY_PROJECTS_TABLE_PARAMS });
   protected readonly permissionsOptions = MODERATION_PERMISSIONS;
+  protected readonly ModeratorPermission = ModeratorPermission;
 
   skeletonData: ModeratorModel[] = Array.from({ length: 3 }, () => ({}) as ModeratorModel);
 

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

@@ -113,7 +113,7 @@ export class PreprintSubmissionsComponent implements OnInit {
   }
 
   navigateToPreprint(item: PreprintSubmission) {
-    this.router.navigate(['/preprints/', item.id, 'overview'], { queryParams: { mode: 'moderator' } });
+    this.router.navigate(['/preprints/', this.providerId(), item.id], { queryParams: { mode: 'moderator' } });
   }
 
   private getStatusFromQueryParams() {

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

@@ -110,7 +110,7 @@ export class PreprintWithdrawalSubmissionsComponent implements OnInit {
   }
 
   navigateToPreprint(item: PreprintWithdrawalSubmission) {
-    this.router.navigate(['/preprints/', item.preprintId, 'overview'], { queryParams: { mode: 'moderator' } });
+    this.router.navigate(['/preprints/', this.providerId(), item.preprintId], { queryParams: { mode: 'moderator' } });
   }
 
   private getStatusFromQueryParams() {

src/app/features/moderation/constants/submission.const.ts

@@ -65,13 +65,13 @@ export const WITHDRAWAL_SUBMISSION_REVIEW_OPTIONS: SubmissionReviewOption[] = [
   {
     value: SubmissionReviewStatus.Accepted,
     icon: 'fas fa-circle-check',
-    label: 'moderation.submissionReviewStatus.accepted',
+    label: 'moderation.submissionReviewStatus.approved',
     count: 0,
   },
   {
     value: SubmissionReviewStatus.Rejected,
     icon: 'fas fa-circle-minus',
-    label: 'moderation.submissionReviewStatus.rejected',
+    label: 'moderation.submissionReviewStatus.declined',
     count: 0,
   },
 ];

src/app/features/moderation/models/index.ts

@@ -17,5 +17,4 @@ export * from './registry-json-api.model';
 export * from './registry-moderation.model';
 export * from './review-action.model';
 export * from './review-action-json-api.model';
-export * from './submission.model';
 export * from './submission-review-option.model';

src/app/features/moderation/services/moderators.service.ts

@@ -21,7 +21,7 @@ export class ModeratorsService {
   private readonly urlMap = new Map<ResourceType, string>([
     [ResourceType.Collection, 'providers/collections'],
     [ResourceType.Registration, 'providers/registrations'],
-    [ResourceType.Preprint, 'preprint_providers'],
+    [ResourceType.Preprint, 'providers/preprints'],
   ]);
 
   getModerators(resourceId: string, resourceType: ResourceType): Observable<ModeratorModel[]> {

src/app/features/moderation/services/preprint-moderation.service.ts

@@ -29,7 +29,7 @@ export class PreprintModerationService {
   private readonly jsonApiService = inject(JsonApiService);
 
   getPreprintProviders(): Observable<PreprintProviderModerationInfo[]> {
-    const baseUrl = `${environment.apiUrl}/preprint_providers/?filter[permissions]=view_actions,set_up_moderation`;
+    const baseUrl = `${environment.apiUrl}/providers/preprints/?filter[permissions]=view_actions,set_up_moderation`;
 
     return this.jsonApiService
       .get<JsonApiResponse<PreprintRelatedCountJsonApi[], null>>(baseUrl)

src/app/features/preprints/components/index.ts

@@ -6,6 +6,7 @@ export { PreprintsInstitutionFilterComponent } from './filters/preprints-institu
 export { PreprintsLicenseFilterComponent } from './filters/preprints-license-filter/preprints-license-filter.component';
 export { AdditionalInfoComponent } from './preprint-details/additional-info/additional-info.component';
 export { GeneralInformationComponent } from './preprint-details/general-information/general-information.component';
+export { ModerationStatusBannerComponent } from './preprint-details/moderation-status-banner/moderation-status-banner.component';
 export { PreprintFileSectionComponent } from './preprint-details/preprint-file-section/preprint-file-section.component';
 export { ShareAndDownloadComponent } from './preprint-details/share-and-downlaod/share-and-download.component';
 export { StatusBannerComponent } from './preprint-details/status-banner/status-banner.component';
@@ -19,6 +20,8 @@ export { PreprintsFilterChipsComponent } from '@osf/features/preprints/component
 export { PreprintsResourcesComponent } from '@osf/features/preprints/components/filters/preprints-resources/preprints-resources.component';
 export { PreprintsResourcesFiltersComponent } from '@osf/features/preprints/components/filters/preprints-resources-filters/preprints-resources-filters.component';
 export { PreprintsSubjectFilterComponent } from '@osf/features/preprints/components/filters/preprints-subject-filter/preprints-subject-filter.component';
+export { MakeDecisionComponent } from '@osf/features/preprints/components/preprint-details/make-decision/make-decision.component';
+export { PreprintTombstoneComponent } from '@osf/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component';
 export { WithdrawDialogComponent } from '@osf/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component';
 export { FileStepComponent } from '@osf/features/preprints/components/stepper/file-step/file-step.component';
 export { MetadataStepComponent } from '@osf/features/preprints/components/stepper/metadata-step/metadata-step.component';

src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.html

@@ -13,12 +13,22 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.publicationCitation'
 
       @if (preprintValue.originalPublicationDate) {
         <section class="flex flex-column gap-2">
-          <h3>{{ 'preprints.preprintStepper.review.sections.metadata.publicationDate' | translate }}</h3>
+          <h3>{{ 'preprints.details.originalPublicationDate' | translate }}</h3>
 
           {{ preprintValue.originalPublicationDate | date: 'MMM d, y, h:mm a' }}
         </section>
       }
 
+      @if (preprintValue.doi) {
+        <section class="flex flex-column gap-2">
+          <h3>{{ 'preprints.details.publicationDoi' | translate }}</h3>
+
+          <a [href]="preprint()?.articleDoiLink">
+            {{ preprint()?.articleDoiLink }}
+          </a>
+        </section>
+      }
+
       <section class="license flex flex-column gap-2">
         <h3>{{ 'preprints.preprintStepper.review.sections.metadata.license' | translate }}</h3>
 

src/app/features/preprints/components/preprint-details/general-information/general-information.component.html

@@ -19,6 +19,16 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.affiliatedInstitution
         </section>
       }
 
+      @if (preprintValue.nodeId) {
+        <section class="flex flex-column gap-2">
+          <h3>{{ 'preprints.details.supplementalMaterials' | translate }}</h3>
+          <a [routerLink]="nodeLink()" class="flex gap-1">
+            {{ nodeLink() }}
+            <osf-icon iconClass="fa fa-external-link-alt" />
+          </a>
+        </section>
+      }
+
       <section class="flex flex-column gap-2">
         <h3>{{ 'preprints.preprintStepper.review.sections.metadata.authors' | translate }}</h3>
 
@@ -108,7 +118,10 @@ <h3>
         </section>
       }
 
-      <osf-preprint-doi-section [preprintProvider]="preprintProvider()" />
+      <osf-preprint-doi-section
+        [preprintProvider]="preprintProvider()"
+        (preprintVersionSelected)="preprintVersionSelected.emit($event)"
+      />
     </div>
   }