fix(preprint-create-new-version): Fixed error with primary file (#545)

* fix(preprint-create-new-version): Fixed error with primary file * fix(preprint-create-new-version): Fixed PR comment

Author: rrromchIk

src/app/features/moderation/mappers/registry-moderation.mapper.ts

@@ -37,10 +37,12 @@ export class RegistryModerationMapper {
  toState: response.attributes.to_state,
  dateModified: response.attributes.date_modified,
  comment: response.attributes.comment,
- creator: {
- id: response.embeds.creator.data.id,
- name: response.embeds.creator.data.attributes.full_name,
- },
+ creator: response.embeds?.creator
+ ? {
+ id: response.embeds.creator.data.id,
+ name: response.embeds.creator.data.attributes.full_name,
+ }
+ : null,
  trigger: response.attributes.trigger,
  };
  }

src/app/features/moderation/models/review-action.model.ts

@@ -6,6 +6,6 @@ export interface ReviewAction {
  fromState: string;
  toState: string;
  dateModified: string;
- creator: IdName;
+ creator: IdName | null;
  comment: string;
 }

src/app/features/preprints/components/preprint-details/moderation-status-banner/moderation-status-banner.component.ts

@@ -106,9 +106,9 @@ export class ModerationStatusBannerComponent {
  return recentActivityMessageByState[ReviewsState.PendingWithdrawal];
  });
 
- actionCreatorName = computed(() => this.latestAction()?.creator.name);
+ actionCreatorName = computed(() => this.latestAction()?.creator?.name);
  actionCreatorLink = computed(() => `${this.webUrl}/${this.actionCreatorId()}`);
- actionCreatorId = computed(() => this.latestAction()?.creator.id);
+ actionCreatorId = computed(() => this.latestAction()?.creator?.id);
  withdrawalRequesterName = computed(() => this.latestWithdrawalRequest()?.creator.name);
  withdrawalRequesterId = computed(() => this.latestWithdrawalRequest()?.creator.id);
 }

src/app/features/preprints/components/preprint-details/status-banner/status-banner.component.ts

@@ -87,7 +87,7 @@ export class StatusBannerComponent {
  if (this.isWithdrawalRejected()) {
  return this.latestRequestAction()?.creator.name;
  } else {
- return this.latestAction()?.creator.name;
+ return this.latestAction()?.creator?.name;
  }
  });
 

src/app/features/preprints/components/stepper/review-step/review-step.component.html

@@ -69,20 +69,22 @@ <h3>{{ 'common.labels.contributors' | translate }}</h3>
  <osf-affiliated-institutions-view data-test-preprint-institution-list [institutions]="affiliatedInstitutions()" />
  }
 
- <section class="license flex flex-column gap-2">
- <h3>{{ 'preprints.preprintStepper.review.sections.metadata.license' | translate }}</h3>
-
- <p-accordion>
- <p-accordion-panel value="0">
- <p-accordion-header class="p-0 justify-content-start gap-2">
- <p class="font-normal">{{ license()?.name }}</p>
- </p-accordion-header>
- <p-accordion-content>
- <p>{{ license()!.text | interpolate: licenseOptionsRecord() }}</p>
- </p-accordion-content>
- </p-accordion-panel>
- </p-accordion>
- </section>
+ @if (license()) {
+ <section class="license flex flex-column gap-2">
+ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.license' | translate }}</h3>
+
+ <p-accordion>
+ <p-accordion-panel value="0">
+ <p-accordion-header class="p-0 justify-content-start gap-2">
+ <p class="font-normal">{{ license()?.name }}</p>
+ </p-accordion-header>
+ <p-accordion-content>
+ <p>{{ license()!.text | interpolate: licenseOptionsRecord() }}</p>
+ </p-accordion-content>
+ </p-accordion-panel>
+ </p-accordion>
+ </section>
+ }
 
  @if (preprint()?.articleDoiLink) {
  <section class="flex flex-column gap-2">

src/app/features/preprints/components/stepper/review-step/review-step.component.ts

@@ -7,6 +7,8 @@ import { Button } from 'primeng/button';
 import { Card } from 'primeng/card';
 import { Tag } from 'primeng/tag';
 
+import { Observable, of, switchMap, tap } from 'rxjs';
+
 import { DatePipe, TitleCasePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, inject, input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
@@ -18,6 +20,7 @@ import {
  FetchPreprintProject,
  PreprintStepperSelectors,
  SubmitPreprint,
+ UpdatePrimaryFileRelationship,
 } from '@osf/features/preprints/store/preprint-stepper';
 import {
  AffiliatedInstitutionsViewComponent,
@@ -62,9 +65,11 @@ export class ReviewStepComponent implements OnInit {
  fetchPreprintProject: FetchPreprintProject,
  submitPreprint: SubmitPreprint,
  fetchResourceInstitutions: FetchResourceInstitutions,
+ updatePrimaryFileRelationship: UpdatePrimaryFileRelationship,
  });
 
  provider = input.required<PreprintProviderDetails | undefined>();
+ isCreateNewVersionContext = input<boolean>(false);
 
  preprint = select(PreprintStepperSelectors.getPreprint);
  isPreprintSubmitting = select(PreprintStepperSelectors.isPreprintSubmitting);
@@ -89,17 +94,27 @@ export class ReviewStepComponent implements OnInit {
  }
 
  submitPreprint() {
- if (this.preprint()?.reviewsState !== ReviewsState.Accepted) {
- this.actions.submitPreprint().subscribe({
- complete: () => {
- this.toastService.showSuccess('preprints.preprintStepper.common.successMessages.preprintSubmitted');
- this.router.navigate(['/preprints', this.provider()!.id, this.preprint()!.id]);
- },
- });
- } else {
- this.toastService.showSuccess('preprints.preprintStepper.common.successMessages.preprintSubmitted');
- this.router.navigate(['/preprints', this.provider()!.id, this.preprint()!.id]);
+ const preprint = this.preprint()!;
+ let update$: Observable<void | null> = of(null);
+
+ if (this.isCreateNewVersionContext()) {
+ update$ = this.actions.updatePrimaryFileRelationship(preprint.primaryFileId!);
  }
+
+ update$
+ .pipe(
+ switchMap(() => {
+ if (preprint.reviewsState !== ReviewsState.Accepted) {
+ return this.actions.submitPreprint();
+ }
+ return of(null);
+ }),
+ tap(() => {
+ this.toastService.showSuccess('preprints.preprintStepper.common.successMessages.preprintSubmitted');
+ this.router.navigate(['/preprints', this.provider()!.id, preprint.id]);
+ })
+ )
+ .subscribe();
  }
 
  cancelSubmission() {

src/app/features/preprints/pages/create-new-version/create-new-version.component.html

@@ -40,7 +40,7 @@ <h1 class="preprint-provider-name">
  />
  }
  @case (PreprintSteps.Review) {
- <osf-review-step [provider]="preprintProvider()" />
+ <osf-review-step [provider]="preprintProvider()" [isCreateNewVersionContext]="true" />
  }
  }
 </section>

src/app/features/preprints/services/preprints.service.ts

@@ -166,7 +166,7 @@ export class PreprintsService {
  }
 
  getPreprintReviewActions(preprintId: string) {
- const baseUrl = `${this.apiUrl}/preprints/${preprintId}/review_actions/`;
+ const baseUrl = `${this.apiUrl}/preprints/${preprintId}/review_actions/?embed=creator`;
 
  return this.jsonApiService
  .get<ReviewActionsResponseJsonApi>(baseUrl)

src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts

@@ -50,6 +50,12 @@ export class UploadFile {
  constructor(public file: File) {}
 }
 
+export class UpdatePrimaryFileRelationship {
+ static readonly type = '[Preprint Stepper] Update Primary File Relationship';
+
+ constructor(public fileId: string) {}
+}
+
 export class ReuploadFile {
  static readonly type = '[Preprint Stepper] Reupload File';
 

src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts

@@ -44,6 +44,7 @@ import {
  SetSelectedPreprintProviderId,
  SubmitPreprint,
  UpdatePreprint,
+ UpdatePrimaryFileRelationship,
  UploadFile,
 } from './';
 
@@ -175,24 +176,34 @@ export class PreprintStepperState {
  const file = event.body!.data;
  const createdFileId = file.id.split('/')[1];
 
- return this.preprintFilesService.updateFileRelationship(state.preprint.data!.id, createdFileId).pipe(
- tap((preprint: Preprint) => {
- ctx.patchState({
- preprint: {
- ...ctx.getState().preprint,
- data: {
- ...ctx.getState().preprint.data!,
- primaryFileId: preprint.primaryFileId,
- },
- },
- });
- }),
- catchError((error) => handleSectionError(ctx, 'preprint', error))
- );
+ return ctx.dispatch(new UpdatePrimaryFileRelationship(createdFileId));
  })
  );
  }
 
+ @Action(UpdatePrimaryFileRelationship)
+ updatePrimaryFileRelationship(ctx: StateContext<PreprintStepperStateModel>, action: UpdatePrimaryFileRelationship) {
+ const state = ctx.getState();
+
+ ctx.setState(patch({ preprint: patch({ isSubmitting: true }) }));
+
+ return this.preprintFilesService.updateFileRelationship(state.preprint.data!.id, action.fileId).pipe(
+ tap((preprint: Preprint) => {
+ ctx.patchState({
+ preprint: {
+ ...ctx.getState().preprint,
+ data: {
+ ...ctx.getState().preprint.data!,
+ primaryFileId: preprint.primaryFileId,
+ },
+ isSubmitting: false,
+ },
+ });
+ }),
+ catchError((error) => handleSectionError(ctx, 'preprint', error))
+ );
+ }
+
  @Action(ReuploadFile)
  reuploadFile(ctx: StateContext<PreprintStepperStateModel>, action: ReuploadFile) {
  const state = ctx.getState();