Fix - Preprints bugs (#337)

* fix(metadata-step): Made Publication DOI field optional

* fix(preprints-landing): Contact Us button titlecased, Show example button link fixed

* fix(create-new-version): Handled back button

* fix(preprint-moderation): Fixed sorting for submissions

* fix(license-component): Clearing all fields on cancel button click

* fix(preprint-stepper): Fixed add-project-form

Author: rrromchIk

src/app/features/moderation/enums/preprint-submissions-sort.enum.ts

@@ -1,6 +1,6 @@
 export enum PreprintSubmissionsSort {
   TitleAZ = 'title',
   TitleZA = '-title',
-  Oldest = 'date_last_transitioned',
-  Newest = '-date_last_transitioned',
+  Oldest = '-date_last_transitioned',
+  Newest = 'date_last_transitioned',
 }

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

@@ -14,7 +14,7 @@ <h3>{{ 'preprints.preprintStepper.common.labels.abstract' | translate }}</h3>
       @if (preprintValue.nodeId) {
         <section class="flex flex-column gap-2">
           <h3>{{ 'preprints.details.supplementalMaterials' | translate }}</h3>
-          <a [routerLink]="nodeLink()" class="flex gap-1">
+          <a [href]="nodeLink()" class="flex gap-1">
             {{ nodeLink() }}
             <osf-icon iconClass="fa fa-external-link-alt" />
           </a>

src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.html

@@ -55,7 +55,7 @@ <h1 class="preprint-provider-name">{{ preprintProvider()!.name }}</h1>
     <p-skeleton width="10%" height="1rem" />
   } @else if (preprintProvider()?.examplePreprintId) {
     <p>
-      <a class="font-bold" [routerLink]="['preprints', preprintProvider()!.id, preprintProvider()!.examplePreprintId]"
+      <a class="font-bold" [routerLink]="['/preprints', preprintProvider()!.id, preprintProvider()!.examplePreprintId]"
         >{{ 'preprints.showExample' | translate }}
       </a>
     </p>

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

@@ -22,25 +22,6 @@ <h2 class="mb-2">{{ 'shared.license.title' | translate }}</h2>
   />
 </p-card>
 
-<p-card styleClass="m-t-24" class="card">
-  <div>
-    <h2>{{ 'preprints.preprintStepper.metadata.publicationDoi.title' | translate }}</h2>
-
-    <input id="doi" class="m-t-24" pInputText type="text" [formControl]="metadataForm.controls['doi']" />
-    @let doiControl = metadataForm.controls['doi'];
-    @if (doiControl.errors?.['required'] && (doiControl.touched || doiControl.dirty)) {
-      <p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
-        {{ INPUT_VALIDATION_MESSAGES.required | translate }}
-      </p-message>
-    }
-    @if (doiControl.errors?.['pattern'] && (doiControl.touched || doiControl.dirty)) {
-      <p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small"
-        >{{ 'preprints.preprintStepper.metadata.publicationDoi.patternError' | translate }}
-      </p-message>
-    }
-  </div>
-</p-card>
-
 <div class="m-t-24">
   <osf-preprints-affiliated-institutions [preprintId]="createdPreprint()?.id" [provider]="provider()" />
 </div>
@@ -59,6 +40,20 @@ <h2>{{ 'preprints.preprintStepper.metadata.tagsTitle' | translate }}</h2>
   </div>
 </p-card>
 
+<p-card styleClass="m-t-24" class="card">
+  <div>
+    <h2>{{ 'preprints.preprintStepper.metadata.publicationDoi.title' | translate }}</h2>
+
+    <input id="doi" class="m-t-24" pInputText type="text" [formControl]="metadataForm.controls['doi']" />
+    @let doiControl = metadataForm.controls['doi'];
+    @if (doiControl.errors?.['pattern'] && (doiControl.touched || doiControl.dirty)) {
+      <p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small"
+        >{{ 'preprints.preprintStepper.metadata.publicationDoi.patternError' | translate }}
+      </p-message>
+    }
+  </div>
+</p-card>
+
 <p-card styleClass="m-t-24" class="card">
   <h2>{{ 'preprints.preprintStepper.metadata.publicationDateTitle' | translate }}</h2>
 

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

@@ -21,7 +21,7 @@ import {
   SaveLicense,
   UpdatePreprint,
 } from '@osf/features/preprints/store/preprint-stepper';
-import { CustomValidators, findChangedFields } from '@osf/shared/helpers';
+import { findChangedFields } from '@osf/shared/helpers';
 import { IconComponent, LicenseComponent, TagsInputComponent, TextInputComponent } from '@shared/components';
 import { INPUT_VALIDATION_MESSAGES } from '@shared/constants';
 import { LicenseModel, LicenseOptions } from '@shared/models';
@@ -87,7 +87,7 @@ export class MetadataStepComponent implements OnInit {
     this.metadataForm = new FormGroup<MetadataForm>({
       doi: new FormControl(this.createdPreprint()?.doi || null, {
         nonNullable: true,
-        validators: [CustomValidators.requiredTrimmed(), Validators.pattern(this.inputLimits.doi.pattern)],
+        validators: [Validators.pattern(this.inputLimits.doi.pattern)],
       }),
       originalPublicationDate: new FormControl(publicationDate ? new Date(publicationDate) : null, {
         nonNullable: false,

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

@@ -87,13 +87,15 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.license' | translate
       </p-accordion>
     </section>
 
-    <section class="flex flex-column gap-2">
-      <h3>{{ 'preprints.preprintStepper.review.sections.metadata.publicationDoi' | translate }}</h3>
+    @if (preprint()?.articleDoiLink) {
+      <section class="flex flex-column gap-2">
+        <h3>{{ 'preprints.preprintStepper.review.sections.metadata.publicationDoi' | translate }}</h3>
 
-      <a [href]="preprint()?.articleDoiLink">
-        {{ preprint()?.articleDoiLink }}
-      </a>
-    </section>
+        <a [href]="preprint()?.articleDoiLink">
+          {{ preprint()?.articleDoiLink }}
+        </a>
+      </section>
+    }
 
     <section class="flex flex-column gap-2">
       <h3>{{ 'preprints.preprintStepper.review.sections.metadata.subjects' | translate }}</h3>

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

@@ -18,7 +18,7 @@ import {
   signal,
 } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 
 import { FileStepComponent, ReviewStepComponent } from '@osf/features/preprints/components';
 import { createNewVersionStepsConst } from '@osf/features/preprints/constants';
@@ -45,7 +45,8 @@ import { BrandService } from '@shared/services';
 export class CreateNewVersionComponent implements OnInit, OnDestroy, CanDeactivateComponent {
   @HostBinding('class') classes = 'flex-1 flex flex-column w-full';
 
-  private readonly route = inject(ActivatedRoute);
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
 
   private providerId = toSignal(this.route.params.pipe(map((params) => params['providerId'])) ?? of(undefined));
   private preprintId = toSignal(this.route.params.pipe(map((params) => params['preprintId'])) ?? of(undefined));
@@ -114,7 +115,8 @@ export class CreateNewVersionComponent implements OnInit, OnDestroy, CanDeactiva
   }
 
   moveToPreviousStep() {
-    this.currentStep.set(this.newVersionSteps[this.currentStep()?.index - 1]);
+    const id = this.preprintId().split('_')[0];
+    this.router.navigate([id]);
   }
 
   @HostListener('window:beforeunload', ['$event'])

src/app/features/preprints/pages/landing/preprints-landing.component.html

@@ -40,7 +40,7 @@ <h1>{{ 'preprints.title' | translate }}</h1>
   } @else if (osfPreprintProvider()!.examplePreprintId) {
     <a
       class="font-bold"
-      [routerLink]="['preprints', osfPreprintProvider()!.id, osfPreprintProvider()!.examplePreprintId]"
+      [routerLink]="['/preprints', osfPreprintProvider()!.id, osfPreprintProvider()!.examplePreprintId]"
       >{{ 'preprints.showExample' | translate }}
     </a>
   }
@@ -79,6 +79,6 @@ <h2 class="text-2xl">{{ 'preprints.createServer.title' | translate }}</h2>
   </div>
 
   <p-button severity="success" class="link-button">
-    <a [href]="'mailto:' + supportEmail">{{ 'preprints.createServer.contactUs' | translate }}</a>
+    <a [href]="'mailto:' + supportEmail">{{ 'preprints.createServer.contactUs' | translate | titlecase }}</a>
   </p-button>
 </section>

src/app/features/preprints/preprints.routes.ts

@@ -8,7 +8,7 @@ import { PreprintState } from '@osf/features/preprints/store/preprint';
 import { PreprintProvidersState } from '@osf/features/preprints/store/preprint-providers';
 import { PreprintStepperState } from '@osf/features/preprints/store/preprint-stepper';
 import { ConfirmLeavingGuard } from '@shared/guards';
-import { CitationsState, ContributorsState, SubjectsState } from '@shared/stores';
+import { CitationsState, ContributorsState, ProjectsState, SubjectsState } from '@shared/stores';
 
 import { PreprintModerationState } from '../moderation/store/preprint-moderation';
 
@@ -62,6 +62,7 @@ export const preprintsRoutes: Routes = [
             (c) => c.SubmitPreprintStepperComponent
           ),
         canDeactivate: [ConfirmLeavingGuard],
+        providers: [provideStates([ProjectsState])],
       },
       {
         path: ':providerId/edit/:preprintId',
@@ -71,6 +72,7 @@ export const preprintsRoutes: Routes = [
             (c) => c.UpdatePreprintStepperComponent
           ),
         canDeactivate: [ConfirmLeavingGuard],
+        providers: [provideStates([ProjectsState])],
       },
       {
         path: ':providerId/moderation',

src/app/shared/components/license/license.component.ts

@@ -112,7 +112,7 @@ export class LicenseComponent {
 
   cancel() {
     this.licenseForm.reset({
-      year: this.currentYear.getFullYear().toString(),
+      year: '',
       copyrightHolders: '',
     });
   }