fix(preprint-stepper): added delete logic

nsemets · nsemets · commit 014e8f7da064 · 2026-04-02T12:26:23.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.html b/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.html
@@ -238,4 +238,11 @@ <h2>{{ 'preprints.preprintStepper.authorAssertions.publicPreregistration.title'
     [loading]="isUpdatingPreprint()"
     (onClick)="nextButtonClicked()"
   />
+  <p-button
+    class="w-6 md:w-6rem"
+    styleClass="w-full"
+    [label]="'common.buttons.delete' | translate"
+    severity="danger"
+    (onClick)="deletePreprint()"
+  />
 </section>
diff --git a/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.spec.ts b/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.spec.ts
@@ -284,6 +284,15 @@ describe('AuthorAssertionsStepComponent', () => {
     expect(emitSpy).toHaveBeenCalled();
   });
 
+  it('should emit deleteClicked when deletePreprint is called', () => {
+    setup({ detectChanges: false });
+    const emitSpy = jest.spyOn(component.deleteClicked, 'emit');
+
+    component.deletePreprint();
+
+    expect(emitSpy).toHaveBeenCalled();
+  });
+
   it('should handle discard confirmation callbacks when there are unsaved changes', () => {
     setup();
     const emitSpy = jest.spyOn(component.backClicked, 'emit');
diff --git a/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.ts b/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.ts
@@ -126,6 +126,7 @@ export class AuthorAssertionsStepComponent {
 
   nextClicked = output<void>();
   backClicked = output<void>();
+  deleteClicked = output<void>();
 
   constructor() {
     effect(() => {
@@ -259,6 +260,10 @@ export class AuthorAssertionsStepComponent {
     });
   }
 
+  deletePreprint() {
+    this.deleteClicked.emit();
+  }
+
   private disableAndClearValidators(control: AbstractControl): void {
     if (control instanceof FormArray) {
       while (control.length !== 0) {
diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.html b/src/app/features/preprints/components/stepper/file-step/file-step.component.html
@@ -163,4 +163,11 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
     tooltipPosition="top"
     (onClick)="nextButtonClicked()"
   />
+  <p-button
+    class="w-6 md:w-6rem"
+    styleClass="w-full"
+    [label]="'common.buttons.delete' | translate"
+    severity="danger"
+    (onClick)="deletePreprint()"
+  />
 </section>
diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.spec.ts b/src/app/features/preprints/components/stepper/file-step/file-step.component.spec.ts
@@ -199,6 +199,15 @@ describe('FileStepComponent', () => {
     expect(emitSpy).toHaveBeenCalled();
   });
 
+  it('should emit deleteClicked when deletePreprint is called', () => {
+    setup({ detectChanges: false });
+    const emitSpy = jest.spyOn(component.deleteClicked, 'emit');
+
+    component.deletePreprint();
+
+    expect(emitSpy).toHaveBeenCalled();
+  });
+
   it('should handle nextButtonClicked for allowed and blocked states', () => {
     setup({ detectChanges: false });
     const emitSpy = jest.spyOn(component.nextClicked, 'emit');
diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.ts b/src/app/features/preprints/components/stepper/file-step/file-step.component.ts
@@ -120,6 +120,7 @@ export class FileStepComponent implements OnInit {
 
   nextClicked = output<void>();
   backClicked = output<void>();
+  deleteClicked = output<void>();
 
   isFileSourceSelected = computed(() => this.selectedFileSource() !== PreprintFileSource.None);
   canProceedToNext = computed(() => !!this.preprintFile() && !this.versionFileMode());
@@ -163,6 +164,10 @@ export class FileStepComponent implements OnInit {
     this.nextClicked.emit();
   }
 
+  deletePreprint() {
+    this.deleteClicked.emit();
+  }
+
   onFileSelected(event: Event): void {
     const input = event.target as HTMLInputElement;
     const file = input.files?.[0];
diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-metadata-step.component.html b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-metadata-step.component.html
@@ -118,4 +118,11 @@ <h2 class="mb-4">{{ 'preprints.preprintStepper.metadata.publicationCitationTitle
     [loading]="isUpdatingPreprint()"
     (onClick)="nextButtonClicked()"
   />
+  <p-button
+    class="w-6 md:w-6rem"
+    styleClass="w-full"
+    [label]="'common.buttons.delete' | translate"
+    severity="danger"
+    (onClick)="deletePreprint()"
+  />
 </section>
diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-metadata-step.component.spec.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-metadata-step.component.spec.ts
@@ -236,6 +236,15 @@ describe('PreprintsMetadataStepComponent', () => {
     expect(customConfirmationServiceMock.confirmContinue).not.toHaveBeenCalled();
   });
 
+  it('should emit deleteClicked when deletePreprint is called', () => {
+    setup({ detectChanges: false });
+    const emitSpy = jest.spyOn(component.deleteClicked, 'emit');
+
+    component.deletePreprint();
+
+    expect(emitSpy).toHaveBeenCalled();
+  });
+
   it('should request confirmation and emit on confirm when there are changes in backButtonClicked', () => {
     setup();
     const backClickedSpy = jest.spyOn(component.backClicked, 'emit');
diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-metadata-step.component.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-metadata-step.component.ts
@@ -65,6 +65,7 @@ export class PreprintsMetadataStepComponent implements OnInit {
   provider = input.required<PreprintProviderDetails>();
   nextClicked = output<void>();
   backClicked = output<void>();
+  deleteClicked = output<void>();
 
   private actions = createDispatchMap({
     updatePreprint: UpdatePreprint,
@@ -154,6 +155,10 @@ export class PreprintsMetadataStepComponent implements OnInit {
     });
   }
 
+  deletePreprint() {
+    this.deleteClicked.emit();
+  }
+
   createLicense(licenseDetails: { id: string; licenseOptions: LicenseOptions }) {
     this.actions.saveLicense(licenseDetails.id, licenseDetails.licenseOptions);
   }
diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.html b/src/app/features/preprints/components/stepper/review-step/review-step.component.html
@@ -248,4 +248,12 @@ <h2>{{ 'preprints.preprintStepper.review.sections.supplements.title' | translate
     [loading]="isPreprintSubmitting()"
     (onClick)="submitPreprint()"
   />
+  <p-button
+    class="w-6 md:w-6rem"
+    styleClass="w-full"
+    [label]="'common.buttons.delete' | translate"
+    severity="danger"
+    [disabled]="isPreprintSubmitting()"
+    (onClick)="deletePreprint()"
+  />
 </section>
diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.spec.ts b/src/app/features/preprints/components/stepper/review-step/review-step.component.spec.ts
@@ -244,4 +244,13 @@ describe('ReviewStepComponent', () => {
       new LoadMoreBibliographicContributors(undefined, ResourceType.Preprint)
     );
   });
+
+  it('should emit deleteClicked when deletePreprint is called', () => {
+    setup({ detectChanges: false });
+    const emitSpy = jest.spyOn(component.deleteClicked, 'emit');
+
+    component.deletePreprint();
+
+    expect(emitSpy).toHaveBeenCalled();
+  });
 });
diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.ts b/src/app/features/preprints/components/stepper/review-step/review-step.component.ts
@@ -9,7 +9,7 @@ import { Tag } from 'primeng/tag';
 import { of, switchMap, tap } from 'rxjs';
 
 import { DatePipe, TitleCasePipe } from '@angular/common';
-import { ChangeDetectionStrategy, Component, computed, inject, input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, inject, input, OnInit, output } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { ApplicabilityStatus, PreregLinkInfo, ReviewsState } from '@osf/features/preprints/enums';
@@ -59,6 +59,7 @@ export class ReviewStepComponent implements OnInit {
   private readonly toastService = inject(ToastService);
 
   readonly provider = input.required<PreprintProviderDetails>();
+  readonly deleteClicked = output<void>();
 
   private readonly actions = createDispatchMap({
     getBibliographicContributors: GetBibliographicContributors,
@@ -144,4 +145,8 @@ export class ReviewStepComponent implements OnInit {
   loadMoreContributors(): void {
     this.actions.loadMoreBibliographicContributors(this.preprint()?.id, ResourceType.Preprint);
   }
+
+  deletePreprint(): void {
+    this.deleteClicked.emit();
+  }
 }
diff --git a/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.html b/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.html
@@ -98,4 +98,11 @@ <h2>{{ 'preprints.preprintStepper.supplements.title' | translate }}</h2>
     [loading]="isPreprintSubmitting()"
     (onClick)="nextButtonClicked()"
   />
+  <p-button
+    class="w-6 md:w-6rem"
+    styleClass="w-full"
+    [label]="'common.buttons.delete' | translate"
+    severity="danger"
+    (onClick)="deletePreprint()"
+  />
 </section>
diff --git a/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.spec.ts b/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.spec.ts
@@ -328,6 +328,15 @@ describe('SupplementsStepComponent', () => {
     expect(confirmationMock.confirmContinue).not.toHaveBeenCalled();
   });
 
+  it('should emit deleteClicked when deletePreprint is called', () => {
+    setup({ detectChanges: false });
+    const emitSpy = jest.spyOn(component.deleteClicked, 'emit');
+
+    component.deletePreprint();
+
+    expect(emitSpy).toHaveBeenCalled();
+  });
+
   it('should compute next button disabled state for create and connect options', () => {
     setup({ detectChanges: false });
     component.selectedSupplementOption.set(SupplementOptions.CreateNewProject);
diff --git a/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.ts b/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.ts
@@ -85,6 +85,7 @@ export class SupplementsStepComponent implements OnInit {
 
   nextClicked = output<void>();
   backClicked = output<void>();
+  deleteClicked = output<void>();
 
   readonly SupplementOptions = SupplementOptions;
 
@@ -244,4 +245,8 @@ export class SupplementsStepComponent implements OnInit {
 
     this.backClicked.emit();
   }
+
+  deletePreprint() {
+    this.deleteClicked.emit();
+  }
 }
diff --git a/src/app/features/preprints/pages/create-new-version/create-new-version.component.html b/src/app/features/preprints/pages/create-new-version/create-new-version.component.html
@@ -36,10 +36,15 @@ <h1 class="preprint-provider-name">
   <section class="flex-1 bg-white px-3 py-4 md:py-4 md:px-4">
     @switch (currentStep().value) {
       @case (PreprintSteps.File) {
-        <osf-file-step [provider]="provider" (nextClicked)="moveToNextStep()" (backClicked)="navigateBack()" />
+        <osf-file-step
+          [provider]="provider"
+          (nextClicked)="moveToNextStep()"
+          (backClicked)="navigateBack()"
+          (deleteClicked)="requestDeletePreprint()"
+        />
       }
       @case (PreprintSteps.Review) {
-        <osf-review-step [provider]="provider" />
+        <osf-review-step [provider]="provider" (deleteClicked)="requestDeletePreprint()" />
       }
     }
   </section>
diff --git a/src/app/features/preprints/pages/create-new-version/create-new-version.component.spec.ts b/src/app/features/preprints/pages/create-new-version/create-new-version.component.spec.ts
@@ -11,25 +11,37 @@ import { StepperComponent } from '@osf/shared/components/stepper/stepper.compone
 import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
 import { BrandService } from '@osf/shared/services/brand.service';
 import { BrowserTabService } from '@osf/shared/services/browser-tab.service';
+import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
 import { HeaderStyleService } from '@osf/shared/services/header-style.service';
+import { ToastService } from '@osf/shared/services/toast.service';
 
 import { FileStepComponent, ReviewStepComponent } from '../../components';
 import { createNewVersionStepsConst } from '../../constants';
 import { PreprintSteps } from '../../enums';
 import { PreprintProviderDetails } from '../../models';
 import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers';
-import { FetchPreprintById, PreprintStepperSelectors, ResetPreprintStepperState } from '../../store/preprint-stepper';
+import {
+  DeletePreprint,
+  FetchPreprintById,
+  PreprintStepperSelectors,
+  ResetPreprintStepperState,
+} from '../../store/preprint-stepper';
 
 import { CreateNewVersionComponent } from './create-new-version.component';
 
 import { PREPRINT_PROVIDER_DETAILS_MOCK } from '@testing/mocks/preprint-provider-details';
 import { provideOSFCore } from '@testing/osf.testing.provider';
 import { BrandServiceMock, BrandServiceMockType } from '@testing/providers/brand-service.mock';
 import { BrowserTabServiceMock, BrowserTabServiceMockType } from '@testing/providers/browser-tab-service.mock';
+import {
+  CustomConfirmationServiceMock,
+  CustomConfirmationServiceMockType,
+} from '@testing/providers/custom-confirmation-provider.mock';
 import { HeaderStyleServiceMock, HeaderStyleServiceMockType } from '@testing/providers/header-style-service.mock';
 import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
 import { RouterMockBuilder, RouterMockType } from '@testing/providers/router-provider.mock';
 import { mergeSignalOverrides, provideMockStore, SignalOverride } from '@testing/providers/store-provider.mock';
+import { ToastServiceMock, ToastServiceMockType } from '@testing/providers/toast-provider.mock';
 
 describe('CreateNewVersionComponent', () => {
   let component: CreateNewVersionComponent;
@@ -39,6 +51,8 @@ describe('CreateNewVersionComponent', () => {
   let brandServiceMock: BrandServiceMockType;
   let headerStyleMock: HeaderStyleServiceMockType;
   let browserTabMock: BrowserTabServiceMockType;
+  let customConfirmationServiceMock: CustomConfirmationServiceMockType;
+  let toastServiceMock: ToastServiceMockType;
 
   const mockProvider: PreprintProviderDetails = PREPRINT_PROVIDER_DETAILS_MOCK;
   const mockProviderId = 'osf';
@@ -62,6 +76,8 @@ describe('CreateNewVersionComponent', () => {
     brandServiceMock = BrandServiceMock.simple();
     headerStyleMock = HeaderStyleServiceMock.simple();
     browserTabMock = BrowserTabServiceMock.simple();
+    customConfirmationServiceMock = CustomConfirmationServiceMock.simple();
+    toastServiceMock = ToastServiceMock.simple();
 
     TestBed.configureTestingModule({
       imports: [CreateNewVersionComponent, ...MockComponents(StepperComponent, FileStepComponent, ReviewStepComponent)],
@@ -72,6 +88,8 @@ describe('CreateNewVersionComponent', () => {
         MockProvider(BrandService, brandServiceMock),
         MockProvider(HeaderStyleService, headerStyleMock),
         MockProvider(BrowserTabService, browserTabMock),
+        MockProvider(CustomConfirmationService, customConfirmationServiceMock),
+        MockProvider(ToastService, toastServiceMock),
         MockProvider(IS_WEB, of(true)),
         provideMockStore({ signals }),
       ],
@@ -119,6 +137,7 @@ describe('CreateNewVersionComponent', () => {
     expect(headerStyleMock.resetToDefaults).toHaveBeenCalled();
     expect(brandServiceMock.resetBranding).toHaveBeenCalled();
     expect(browserTabMock.resetToDefaults).toHaveBeenCalled();
+    expect(store.dispatch).toHaveBeenCalledWith(new DeletePreprint());
     expect(store.dispatch).toHaveBeenCalledWith(new ResetPreprintStepperState());
   });
 
@@ -193,4 +212,53 @@ describe('CreateNewVersionComponent', () => {
 
     expect(routerMock.navigate).toHaveBeenCalledWith([mockPreprintId.split('_')[0]]);
   });
+
+  it('should confirm preprint deletion request', () => {
+    setup();
+
+    component.requestDeletePreprint();
+
+    expect(customConfirmationServiceMock.confirmDelete).toHaveBeenCalledWith({
+      headerKey: 'preprints.preprintStepper.deleteDraft.header',
+      messageKey: 'preprints.preprintStepper.deleteDraft.message',
+      onConfirm: expect.any(Function),
+    });
+  });
+
+  it('should delete preprint, reset state, show toast and navigate on delete confirm', () => {
+    setup();
+
+    component.requestDeletePreprint();
+    const confirmDeleteCall = customConfirmationServiceMock.confirmDelete.mock.calls[0][0];
+    confirmDeleteCall.onConfirm();
+
+    expect(store.dispatch).toHaveBeenCalledWith(new DeletePreprint());
+    expect(store.dispatch).toHaveBeenCalledWith(new ResetPreprintStepperState());
+    expect(toastServiceMock.showSuccess).toHaveBeenCalledWith('preprints.preprintStepper.deleteDraft.success');
+    expect(routerMock.navigateByUrl).toHaveBeenCalledWith('/my-preprints');
+  });
+
+  it('should allow deactivation after preprint is deleted', () => {
+    setup();
+
+    component.requestDeletePreprint();
+    const confirmDeleteCall = customConfirmationServiceMock.confirmDelete.mock.calls[0][0];
+    confirmDeleteCall.onConfirm();
+
+    expect(component.canDeactivate()).toBe(true);
+  });
+
+  it('should not delete preprint again on destroy after successful deletion', () => {
+    setup();
+
+    component.requestDeletePreprint();
+    const confirmDeleteCall = customConfirmationServiceMock.confirmDelete.mock.calls[0][0];
+    confirmDeleteCall.onConfirm();
+    (store.dispatch as jest.Mock).mockClear();
+
+    component.ngOnDestroy();
+
+    expect(store.dispatch).toHaveBeenCalledWith(new ResetPreprintStepperState());
+    expect(store.dispatch).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts b/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts
diff --git a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.html b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.html
diff --git a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.spec.ts b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.spec.ts
diff --git a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
