Feat - Submit preprint

src/app/core/services/index.ts

@@ -1,4 +1,3 @@
 export { JsonApiService } from './json-api.service';
-export { LicensesService } from './licenses.service';
 export { RequestAccessService } from './request-access.service';
 export { UserService } from './user.service';

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

@@ -1,6 +1,5 @@
 export { BrowseBySubjectsComponent } from './browse-by-subjects/browse-by-subjects.component';
 export { PreprintServicesComponent } from './preprint-services/preprint-services.component';
-export { TitleAndAbstractStepComponent } from './submit-steps/title-and-abstract-step/title-and-abstract-step.component';
 export { AdvisoryBoardComponent } from '@osf/features/preprints/components/advisory-board/advisory-board.component';
 export { PreprintsCreatorsFilterComponent } from '@osf/features/preprints/components/filters/preprints-creators-filter/preprints-creators-filter.component';
 export { PreprintsDateCreatedFilterComponent } from '@osf/features/preprints/components/filters/preprints-date-created-filter/preprints-date-created-filter.component';
@@ -11,3 +10,6 @@ export { PreprintsFilterChipsComponent } from '@osf/features/preprints/component
 export { PreprintsHelpDialogComponent } from '@osf/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component';
 export { PreprintsResourcesComponent } from '@osf/features/preprints/components/preprints-resources/preprints-resources.component';
 export { PreprintsResourcesFiltersComponent } from '@osf/features/preprints/components/preprints-resources-filters/preprints-resources-filters.component';
+export { FileStepComponent } from '@osf/features/preprints/components/submit-steps/file-step/file-step.component';
+export { MetadataComponent } from '@osf/features/preprints/components/submit-steps/metadata/metadata.component';
+export { TitleAndAbstractStepComponent } from '@osf/features/preprints/components/submit-steps/title-and-abstract-step/title-and-abstract-step.component';

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

@@ -27,18 +27,18 @@ <h2>File</h2>
     [styleClass]="isFileSourceSelected() ? 'w-full cursor-not-allowed' : 'w-full'"
     [label]="'Select From existing OSF project' | titlecase"
     severity="secondary"
-    [disabled]="isFileSourceSelected()"
+    [disabled]="isFileSourceSelected() || versionFileMode()"
     [pTooltip]="isFileSourceSelected() ? 'Start a new preprint to attach a file from your project.' : ''"
     tooltipPosition="top"
     (click)="selectFileSource(PreprintFileSource.Project)"
   />
 </section>
 
-@if (isFileSourceSelected() && selectedFileSource() === PreprintFileSource.Computer) {
+@if (selectedFileSource() === PreprintFileSource.Computer) {
   <section class="m-t-48">
     @if (!fileUploadLink()) {
       <p-skeleton width="5rem" height="2rem" />
-    } @else if (!preprintFiles().length) {
+    } @else if ((!preprintFiles().length && !arePreprintFilesLoading()) || versionFileMode()) {
       <p-button
         outlined
         raised
@@ -51,27 +51,10 @@ <h2>File</h2>
       <input #fileInput type="file" class="hidden" (change)="onFileSelected($event)" />
     }
   </section>
-
-  <section>
-    @if (arePreprintFilesLoading()) {
-      <p-skeleton width="20rem" height="2rem" class="m-t-48" />
-    } @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>
-
-          <p-button class="danger-icon-btn" icon="fas fa-trash" severity="danger" text />
-        </section>
-      }
-    }
-  </section>
 }
 
-@if (isFileSourceSelected() && selectedFileSource() === PreprintFileSource.Project) {
-  <p-card styleClass="m-t-48">
+@if (selectedFileSource() === PreprintFileSource.Project && !preprintFiles().length && !arePreprintFilesLoading()) {
+  <p-card styleClass="m-t-48" class="card">
     <div>
       <p class="line-height-3">This will make your project public, if it is not already</p>
       <p class="line-height-3">The projects and components for which you have admin access are listed below.</p>
@@ -83,7 +66,7 @@ <h2>File</h2>
         optionValue="id"
         [formControl]="projectNameControl"
         [placeholder]="'Project Title'"
-        class="w-6"
+        class="w-12 md:w-6"
         [editable]="true"
         styleClass="m-t-24"
         appendTo="body"
@@ -107,8 +90,32 @@ <h2>File</h2>
     }
   </section>
 }
+@if (!versionFileMode()) {
+  <section class="m-t-48">
+    @if (arePreprintFilesLoading()) {
+      <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>
+
+          <p-button class="danger-icon-btn" icon="fas fa-trash" severity="danger" text (click)="versionFile()" />
+        </section>
+      }
+    }
+  </section>
+}
 
 <section class="m-t-48 flex flex-row justify-content-end align-items-center gap-2">
-  <p-button class="w-6rem" styleClass="w-full" label="Back" severity="info" (click)="backButtonClicked()" />
-  <p-button class="w-9rem" styleClass="w-full" label="Next" (click)="nextButtonClicked()" />
+  <p-button class="w-6 md:w-6rem" styleClass="w-full" label="Back" severity="info" (click)="backButtonClicked()" />
+  <p-button
+    class="w-6 md:w-9rem"
+    styleClass="w-full"
+    label="Next"
+    (click)="nextButtonClicked()"
+    [disabled]="!createdPreprint()?.primaryFileId || versionFileMode()"
+  />
 </section>

src/app/features/preprints/components/submit-steps/file-step/file-step.component.scss

@@ -1,4 +1,5 @@
 @use "assets/styles/mixins" as mix;
+@use "assets/styles/variables" as var;
 
 .file-source-button {
   --p-button-secondary-border-color: var(--grey-2);
@@ -15,8 +16,13 @@
 
 .file-row {
   @include mix.flex-center-between;
-  margin-top: mix.rem(48px);
   padding: mix.rem(6px) mix.rem(12px);
   border-bottom: 1px solid var(--grey-2);
   border-top: 1px solid var(--grey-2);
 }
+
+.card {
+  @media (max-width: var.$breakpoint-sm) {
+    --p-card-body-padding: 0.75rem;
+  }
+}

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

@@ -27,17 +27,20 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms';
 import { StringOrNull } from '@core/helpers';
 import { PreprintFileSource } from '@osf/features/preprints/enums';
 import {
+  CopyFileFromProject,
   GetAvailableProjects,
   GetPreprintFilesLinks,
   GetProjectFiles,
   GetProjectFilesByLink,
+  ReuploadFile,
   SetSelectedPreprintFileSource,
   SubmitPreprintSelectors,
   UploadFile,
 } from '@osf/features/preprints/store/submit-preprint';
 import { FilesTreeActions } from '@osf/features/project/files/models';
 import { FilesTreeComponent, IconComponent } from '@shared/components';
 import { OsfFile } from '@shared/models';
+import { CustomConfirmationService } from '@shared/services';
 
 @Component({
   selector: 'osf-file-step',
@@ -59,18 +62,22 @@ import { OsfFile } from '@shared/models';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FileStepComponent implements OnInit {
+  private customConfirmationService = inject(CustomConfirmationService);
   private actions = createDispatchMap({
     setSelectedFileSource: SetSelectedPreprintFileSource,
     getPreprintFilesLinks: GetPreprintFilesLinks,
     uploadFile: UploadFile,
+    reuploadFile: ReuploadFile,
     getAvailableProjects: GetAvailableProjects,
     getFilesForSelectedProject: GetProjectFiles,
     getProjectFilesByLink: GetProjectFilesByLink,
+    copyFileFromProject: CopyFileFromProject,
   });
   private destroyRef = inject(DestroyRef);
 
   readonly PreprintFileSource = PreprintFileSource;
 
+  createdPreprint = select(SubmitPreprintSelectors.getCreatedPreprint);
   providerId = select(SubmitPreprintSelectors.getSelectedProviderId);
   selectedFileSource = select(SubmitPreprintSelectors.getSelectedFileSource);
   fileUploadLink = select(SubmitPreprintSelectors.getUploadLink);
@@ -83,6 +90,8 @@ export class FileStepComponent implements OnInit {
   selectedProjectId = signal<StringOrNull>(null);
   currentFolder = signal<OsfFile | null>(null);
 
+  versionFileMode = signal<boolean>(false);
+
   projectNameControl = new FormControl<StringOrNull>(null);
 
   filesTreeActions: FilesTreeActions = {
@@ -99,6 +108,7 @@ export class FileStepComponent implements OnInit {
   };
 
   nextClicked = output<void>();
+  backClicked = output<void>();
 
   isFileSourceSelected = computed(() => {
     return this.selectedFileSource() !== PreprintFileSource.None;
@@ -109,9 +119,12 @@ export class FileStepComponent implements OnInit {
 
     this.projectNameControl.valueChanges
       .pipe(debounceTime(500), distinctUntilChanged(), takeUntilDestroyed(this.destroyRef))
-      .subscribe((value) => {
-        this.selectedProjectId.set(value);
-        this.actions.getAvailableProjects(value);
+      .subscribe((projectNameOrId) => {
+        if (this.selectedProjectId() === projectNameOrId) {
+          return;
+        }
+
+        this.actions.getAvailableProjects(projectNameOrId);
       });
   }
 
@@ -124,10 +137,14 @@ export class FileStepComponent implements OnInit {
   }
 
   backButtonClicked() {
-    //[RNi] TODO: implement logic of going back to the previous step
+    this.backClicked.emit();
   }
 
   nextButtonClicked() {
+    if (!this.createdPreprint()?.primaryFileId) {
+      return;
+    }
+
     this.nextClicked.emit();
   }
 
@@ -136,7 +153,12 @@ export class FileStepComponent implements OnInit {
     const file = input.files?.[0];
     if (!file) return;
 
-    this.actions.uploadFile(file);
+    if (this.versionFileMode()) {
+      this.versionFileMode.set(false);
+      this.actions.reuploadFile(file);
+    } else {
+      this.actions.uploadFile(file);
+    }
   }
 
   @HostListener('window:beforeunload', ['$event'])
@@ -150,10 +172,24 @@ export class FileStepComponent implements OnInit {
       return;
     }
 
+    this.selectedProjectId.set(event.value);
     this.actions.getFilesForSelectedProject(event.value);
   }
 
   selectProjectFile(file: OsfFile) {
-    //[RNi] TODO: implement logic of linking preprint to that file
+    this.actions.copyFileFromProject(file);
+  }
+
+  versionFile() {
+    this.customConfirmationService.confirmContinue({
+      headerKey: 'Add a new preprint file',
+      messageKey:
+        'This will allow a new version of the preprint file to be uploaded to the preprint. The existing file will be retained as a version of the preprint.',
+      onConfirm: () => {
+        this.versionFileMode.set(true);
+        this.actions.setSelectedFileSource(PreprintFileSource.None);
+      },
+      onReject: () => null,
+    });
   }
 }

src/app/features/preprints/components/submit-steps/metadata/contributors/contributors.component.html

@@ -0,0 +1,32 @@
+<p-card class="w-full">
+  <h2>{{ 'project.overview.metadata.contributors' | translate }}</h2>
+  <div class="warning-message m-t-24 m-b-12">
+    <p-message severity="error">
+      <i class="osf-icon-warning-sign mr-2"></i>
+      Warning: Changing your permissions will prevent you from editing your draft.
+    </p-message>
+  </div>
+  <osf-contributors-list
+    class="w-full"
+    [contributors]="contributors()"
+    [isLoading]="isContributorsLoading()"
+    (remove)="removeContributor($event)"
+    (showEducationHistory)="openEducationHistory($event)"
+    (showEmploymentHistory)="openEmploymentHistory($event)"
+  />
+  <div class="flex justify-content-end mt-3">
+    @if (hasChanges) {
+      <div class="flex gap-2 mr-4">
+        <p-button (click)="cancel()" text severity="info" [label]="'common.buttons.cancel' | translate" />
+        <p-button (click)="save()" [label]="'common.buttons.save' | translate" />
+      </div>
+    }
+    <p-button
+      class="w-full md:w-auto"
+      styleClass="w-full"
+      label="Add Contributor By Search"
+      type="submit"
+      (click)="openAddContributorDialog()"
+    ></p-button>
+  </div>
+</p-card>

src/app/features/preprints/components/submit-steps/metadata/contributors/contributors.component.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContributorsComponent } from './contributors.component';
+
+describe('ContributorsComponent', () => {
+  let component: ContributorsComponent;
+  let fixture: ComponentFixture<ContributorsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ContributorsComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ContributorsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});