Fix - Preprints bugs

src/app/features/admin-institutions/components/filters-section/filters-section.component.html

@@ -17,7 +17,6 @@ <h2>{{ 'adminInstitutions.common.filterBy' | translate }}</h2>
           class="px-4"
           [filterValues]="filterValues()"
           [filters]="filters()"
-          [filterOptionsCache]="filterOptionsCache()"
           (filterRemoved)="onFilterChipRemoved($event)"
         />
 

src/app/features/admin-institutions/components/filters-section/filters-section.component.ts

@@ -45,7 +45,6 @@ export class FiltersSectionComponent {
   filters = select(GlobalSearchSelectors.getFilters);
   filterValues = select(GlobalSearchSelectors.getFilterValues);
   filterSearchCache = select(GlobalSearchSelectors.getFilterSearchCache);
-  filterOptionsCache = select(GlobalSearchSelectors.getFilterOptionsCache);
   areResourcesLoading = select(GlobalSearchSelectors.getResourcesLoading);
 
   onFilterChanged(event: { filterType: string; value: StringOrNull }): void {

src/app/features/moderation/constants/preprint-sort-options.const.ts

@@ -13,10 +13,10 @@ export const PREPRINT_SORT_OPTIONS: CustomOption<string>[] = [
   },
   {
     value: PreprintSubmissionsSort.Newest,
-    label: 'moderation.sortOption.oldest',
+    label: 'moderation.sortOption.newest',
   },
   {
     value: PreprintSubmissionsSort.Oldest,
-    label: 'moderation.sortOption.newest',
+    label: 'moderation.sortOption.oldest',
   },
 ];

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

@@ -27,7 +27,18 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.authors' | translate
         <div class="flex flex-column gap-1 line-height-2 md:flex-row">
           @for (contributor of bibliographicContributors(); track contributor.id) {
             <div>
-              <a class="font-bold"> {{ contributor.fullName }}</a>
+              @if (contributor.isUnregisteredContributor) {
+                <span>{{ contributor.fullName }}</span>
+              } @else {
+                <a
+                  class="font-bold"
+                  [href]="`${webUrl}/${contributor.userId}`"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {{ contributor.fullName }}
+                </a>
+              }
               <span>{{ $last ? '' : ',' }}</span>
             </div>
           }
@@ -38,7 +49,6 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.authors' | translate
         </div>
       </section>
 
-      <!-- [RNi] TODO: Extract to separate component -->
       @if (preprintProvider()?.assertionsEnabled) {
         <section class="flex flex-column gap-2">
           <h3>{{ 'preprints.preprintStepper.review.sections.authorAssertions.conflictOfInterest' | translate }}</h3>

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

@@ -45,7 +45,7 @@ export class GeneralInformationComponent implements OnDestroy {
     fetchPreprintById: FetchPreprintById,
     fetchResourceInstitutions: FetchResourceInstitutions,
   });
-  readonly environment = environment;
+  readonly webUrl = environment.webUrl;
 
   preprintProvider = input.required<PreprintProviderDetails | undefined>();
   preprintVersionSelected = output<string>();

src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.html

@@ -41,15 +41,15 @@
     }
 
     @if (file()) {
-      @let fileValue = file()!;
+      @let preprintValue = preprint()!;
 
       <div class="flex flex-column gap-1 justify-content-start md:flex-row">
-        <span>{{ dateLabel() | translate }}: {{ fileValue.dateCreated | date: 'longDate' }}</span>
+        <span>{{ dateLabel() | translate }}: {{ preprintValue.dateCreated | date: 'longDate' }}</span>
         @if (isMedium() || isLarge()) {
           <span>|</span>
         }
         <span>
-          {{ 'preprints.details.file.lastEdited' | translate }} : {{ fileValue.dateModified | date: 'longDate' }}
+          {{ 'preprints.details.file.lastEdited' | translate }} : {{ preprintValue.dateModified | date: 'longDate' }}
         </span>
       </div>
     }

src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts

@@ -36,6 +36,7 @@ export class PreprintFileSectionComponent {
   isMedium = toSignal(inject(IS_MEDIUM));
   isLarge = toSignal(inject(IS_LARGE));
 
+  preprint = select(PreprintSelectors.getPreprint);
   file = select(PreprintSelectors.getPreprintFile);
   preprint$ = toObservable(select(PreprintSelectors.getPreprint));
   isFileLoading = select(PreprintSelectors.isPreprintFileLoading);
@@ -58,10 +59,10 @@ export class PreprintFileSectionComponent {
     const fileVersions = this.fileVersions();
     if (!fileVersions.length) return [];
 
-    return fileVersions.map((version, index) => ({
+    return fileVersions.map((version) => ({
       label: this.translateService.instant('preprints.details.file.downloadVersion', {
-        version: ++index,
-        date: this.datePipe.transform(version.dateCreated, 'mm/dd/yyyy hh:mm:ss'),
+        version: version.id,
+        date: this.datePipe.transform(version.dateCreated, 'MM/dd/yyyy hh:mm:ss'),
       }),
       url: version.downloadLink,
       command: () => this.logDownload(),

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

@@ -39,7 +39,6 @@ <h3>{{ 'preprints.preprintStepper.common.labels.abstract' | translate }}</h3>
       <section class="license flex flex-column gap-2">
         <h3>{{ 'preprints.preprintStepper.review.sections.metadata.license' | translate }}</h3>
 
-        <!-- [RNi] TODO: Extract to separate component -->
         <p-accordion>
           <p-accordion-panel value="0">
             <p-accordion-header class="p-0 justify-content-start gap-2">

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

@@ -10,40 +10,43 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
   <p class="line-height-3">{{ 'preprints.preprintStepper.file.note' | translate }}</p>
 </section>
 
-<section class="mt-4 w-full flex flex-column gap-2 md:flex-row">
-  <p-button
-    [ngClass]="{
-      active: selectedFileSource() === PreprintFileSource.Computer,
-    }"
-    class="file-source-button w-full"
-    [styleClass]="selectedFileSource() ? 'w-full cursor-not-allowed' : 'w-full'"
-    [label]="'preprints.preprintStepper.file.uploadFromComputer' | translate | titlecase"
-    severity="secondary"
-    [disabled]="isFileSourceSelected()"
-    [pTooltip]="'preprints.preprintStepper.file.tooltips.computerDisabled' | translate"
-    tooltipPosition="top"
-    (onClick)="selectFileSource(PreprintFileSource.Computer)"
-  />
-  <p-button
-    [ngClass]="{
-      active: selectedFileSource() === PreprintFileSource.Project,
-    }"
-    class="file-source-button w-full"
-    [styleClass]="isFileSourceSelected() ? 'w-full cursor-not-allowed' : 'w-full'"
-    [label]="'preprints.preprintStepper.file.selectFromProject' | translate | titlecase"
-    severity="secondary"
-    [disabled]="isFileSourceSelected() || versionFileMode()"
-    [pTooltip]="'preprints.preprintStepper.file.tooltips.projectDisabled' | translate"
-    tooltipPosition="top"
-    (onClick)="selectFileSource(PreprintFileSource.Project)"
-  />
-</section>
+@if (!preprintHasPrimaryFile() || versionFileMode()) {
+  <section class="mt-4 w-full flex flex-column gap-2 md:flex-row">
+    <p-button
+      [ngClass]="{
+        active: selectedFileSource() === PreprintFileSource.Computer,
+      }"
+      class="file-source-button w-full"
+      [styleClass]="selectedFileSource() ? 'w-full cursor-not-allowed' : 'w-full'"
+      [label]="'preprints.preprintStepper.file.uploadFromComputer' | translate | titlecase"
+      severity="secondary"
+      [disabled]="isFileSourceSelected()"
+      [pTooltip]="'preprints.preprintStepper.file.tooltips.computerDisabled' | translate"
+      tooltipPosition="top"
+      (onClick)="selectFileSource(PreprintFileSource.Computer)"
+    />
+    <p-button
+      data-test-select-button
+      [ngClass]="{
+        active: selectedFileSource() === PreprintFileSource.Project,
+      }"
+      class="file-source-button w-full"
+      [styleClass]="isFileSourceSelected() ? 'w-full cursor-not-allowed' : 'w-full'"
+      [label]="'preprints.preprintStepper.file.selectFromProject' | translate"
+      severity="secondary"
+      [disabled]="isFileSourceSelected() || versionFileMode()"
+      [pTooltip]="'preprints.preprintStepper.file.tooltips.projectDisabled' | translate"
+      tooltipPosition="top"
+      (onClick)="selectFileSource(PreprintFileSource.Project)"
+    />
+  </section>
+}
 
 @if (selectedFileSource() === PreprintFileSource.Computer) {
   <section class="mt-6">
     @if (!fileUploadLink()) {
       <p-skeleton width="5rem" height="2rem" />
-    } @else if ((!preprintFiles().length && !arePreprintFilesLoading()) || versionFileMode()) {
+    } @else if ((!preprintFile() && !isPreprintFileLoading()) || versionFileMode()) {
       <p-button
         outlined
         raised
@@ -58,7 +61,7 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
   </section>
 }
 
-@if (selectedFileSource() === PreprintFileSource.Project && !preprintFiles().length && !arePreprintFilesLoading()) {
+@if (selectedFileSource() === PreprintFileSource.Project && !preprintFile() && !isPreprintFileLoading()) {
   <p-card styleClass="mt-6" class="card">
     <div>
       <p class="line-height-3">{{ 'preprints.preprintStepper.file.projectSelection.description' | translate }}</p>
@@ -99,28 +102,39 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
     }
   </section>
 }
+
+@if (cancelSourceOptionButtonVisible()) {
+  <div class="mt-3 flex flex-row justify-content-end">
+    <p-button
+      class="md:w-6rem"
+      styleClass="w-full"
+      [label]="'common.buttons.cancel' | translate"
+      severity="info"
+      (onClick)="cancelButtonClicked()"
+    />
+  </div>
+}
+
 @if (!versionFileMode()) {
   <section class="mt-6">
-    @if (arePreprintFilesLoading()) {
+    @if (isPreprintFileLoading()) {
       <p-skeleton height="2rem" class="w-full" />
-    } @else {
-      @for (file of preprintFiles(); track file.id) {
-        <section class="file-row">
-          <div class="flex flex-row gap-2">
-            <osf-icon [iconClass]="'fas fa-file'" />
-            <p>{{ file.name }}</p>
-          </div>
+    } @else if (preprintFile()) {
+      <section class="file-row">
+        <div class="flex flex-row gap-2">
+          <osf-icon [iconClass]="'fas fa-file'" />
+          <p data-test-file-name>{{ preprintFile()!.name }}</p>
+        </div>
 
-          <p-button
-            class="danger-icon-btn"
-            icon="fas fa-trash"
-            severity="danger"
-            text
-            [ariaLabel]="'common.buttons.delete' | translate"
-            (onClick)="versionFile()"
-          />
-        </section>
-      }
+        <p-button
+          class="danger-icon-btn"
+          icon="fas fa-trash"
+          severity="danger"
+          text
+          [ariaLabel]="'common.buttons.delete' | translate"
+          (onClick)="versionFile()"
+        />
+      </section>
     }
   </section>
 }
@@ -137,9 +151,9 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
     class="w-6 md:w-9rem"
     styleClass="w-full"
     [label]="'common.buttons.next' | translate"
-    [disabled]="!preprint()?.primaryFileId || versionFileMode()"
+    [disabled]="!preprintFile() || versionFileMode()"
     [pTooltip]="
-      !preprint()?.primaryFileId || versionFileMode()
+      !preprintFile() || versionFileMode()
         ? ('preprints.preprintStepper.common.validation.fillRequiredFields' | translate)
         : ''
     "

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

@@ -32,6 +32,7 @@ import {
   CopyFileFromProject,
   FetchAvailableProjects,
   FetchPreprintFilesLinks,
+  FetchPreprintPrimaryFile,
   FetchProjectFiles,
   FetchProjectFilesByLink,
   PreprintStepperSelectors,
@@ -73,6 +74,7 @@ export class FileStepComponent implements OnInit {
     getPreprintFilesLinks: FetchPreprintFilesLinks,
     uploadFile: UploadFile,
     reuploadFile: ReuploadFile,
+    fetchPreprintFile: FetchPreprintPrimaryFile,
     getAvailableProjects: FetchAvailableProjects,
     getFilesForSelectedProject: FetchProjectFiles,
     getProjectFilesByLink: FetchProjectFilesByLink,
@@ -88,17 +90,31 @@ export class FileStepComponent implements OnInit {
   providerId = select(PreprintStepperSelectors.getSelectedProviderId);
   selectedFileSource = select(PreprintStepperSelectors.getSelectedFileSource);
   fileUploadLink = select(PreprintStepperSelectors.getUploadLink);
-  preprintFiles = select(PreprintStepperSelectors.getPreprintFiles);
-  arePreprintFilesLoading = select(PreprintStepperSelectors.arePreprintFilesLoading);
+
+  preprintFile = select(PreprintStepperSelectors.getPreprintFile);
+  isPreprintFileLoading = select(PreprintStepperSelectors.isPreprintFilesLoading);
+
   availableProjects = select(PreprintStepperSelectors.getAvailableProjects);
   areAvailableProjectsLoading = select(PreprintStepperSelectors.areAvailableProjectsLoading);
+
   projectFiles = select(PreprintStepperSelectors.getProjectFiles);
   areProjectFilesLoading = select(PreprintStepperSelectors.areProjectFilesLoading);
+
   currentFolder = select(PreprintStepperSelectors.getCurrentFolder);
   selectedProjectId = signal<StringOrNull>(null);
 
   versionFileMode = signal<boolean>(false);
 
+  preprintHasPrimaryFile = computed(() => {
+    return !!this.preprint()?.primaryFileId;
+  });
+
+  cancelSourceOptionButtonVisible = computed(() => {
+    return (
+      !this.preprintFile() && this.selectedFileSource() !== PreprintFileSource.None && !this.isPreprintFileLoading()
+    );
+  });
+
   projectNameControl = new FormControl<StringOrNull>(null);
 
   filesTreeActions: FilesTreeActions = {
@@ -119,7 +135,9 @@ export class FileStepComponent implements OnInit {
 
   ngOnInit() {
     this.actions.getPreprintFilesLinks();
-
+    if (this.preprintHasPrimaryFile() && !this.preprintFile()) {
+      this.actions.fetchPreprintFile();
+    }
     this.projectNameControl.valueChanges
       .pipe(debounceTime(500), distinctUntilChanged(), takeUntilDestroyed(this.destroyRef))
       .subscribe((projectNameOrId) => {
@@ -159,9 +177,17 @@ export class FileStepComponent implements OnInit {
 
     if (this.versionFileMode()) {
       this.versionFileMode.set(false);
-      this.actions.reuploadFile(file);
+      this.actions.reuploadFile(file).subscribe({
+        next: () => {
+          this.actions.fetchPreprintFile();
+        },
+      });
     } else {
-      this.actions.uploadFile(file);
+      this.actions.uploadFile(file).subscribe({
+        next: () => {
+          this.actions.fetchPreprintFile();
+        },
+      });
     }
   }
 
@@ -175,7 +201,11 @@ export class FileStepComponent implements OnInit {
   }
 
   selectProjectFile(file: OsfFile) {
-    this.actions.copyFileFromProject(file);
+    this.actions.copyFileFromProject(file).subscribe({
+      next: () => {
+        this.actions.fetchPreprintFile();
+      },
+    });
   }
 
   versionFile() {
@@ -189,4 +219,12 @@ export class FileStepComponent implements OnInit {
       onReject: () => null,
     });
   }
+
+  cancelButtonClicked() {
+    if (this.preprintFile()) {
+      return;
+    }
+
+    this.actions.setSelectedFileSource(PreprintFileSource.None);
+  }
 }