feat(ENG-9827): fix conflicts

Author: Vlad0n20

src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.spec.ts

@@ -9,7 +9,9 @@ import { of, throwError } from 'rxjs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions';
+import { CreateCedarMetadataRecord } from '@osf/features/metadata/store';
 import { UpdateProjectPublicStatus } from '@osf/features/project/overview/store';
+import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { ToastService } from '@osf/shared/services/toast.service';
 
 import { provideOSFCore } from '@testing/osf.testing.provider';
@@ -19,20 +21,33 @@ import { ToastServiceMock, ToastServiceMockType } from '@testing/providers/toast
 
 import { AddToCollectionConfirmationDialogComponent } from './add-to-collection-confirmation-dialog.component';
 
+const MOCK_CEDAR_DATA = {
+  data: { '@context': {} },
+  id: 'template-1',
+  isPublished: true,
+} as any;
+
 describe('AddToCollectionConfirmationDialogComponent', () => {
   let component: AddToCollectionConfirmationDialogComponent;
   let fixture: ComponentFixture<AddToCollectionConfirmationDialogComponent>;
   let store: Store;
   let dialogRef: DynamicDialogRef;
   let toastService: ToastServiceMockType;
-  let dialogConfig: { data: { payload?: unknown; project?: { id: string; isPublic: boolean } } };
+  let dialogConfig: {
+    data: {
+      payload?: unknown;
+      project?: { id: string; isPublic: boolean };
+      cedarData?: unknown;
+    };
+  };
 
   beforeEach(() => {
     toastService = ToastServiceMock.simple();
     dialogConfig = {
       data: {
         payload: { title: 'Submission' },
         project: { id: 'project-1', isPublic: false },
+        cedarData: null,
       },
     };
 
@@ -69,13 +84,14 @@ describe('AddToCollectionConfirmationDialogComponent', () => {
     expect(toastService.showSuccess).not.toHaveBeenCalled();
   });
 
-  it('should update project public status and create submission when project is private', () => {
+  it('should update project public status then create submission when project is private and no Cedar data', () => {
     vi.spyOn(store, 'dispatch').mockReturnValue(of(void 0));
 
     component.handleAddToCollectionConfirm();
 
     expect(store.dispatch).toHaveBeenCalledWith(new UpdateProjectPublicStatus([{ id: 'project-1', public: true }]));
     expect(store.dispatch).toHaveBeenCalledWith(new CreateCollectionSubmission({ title: 'Submission' } as any));
+    expect(store.dispatch).not.toHaveBeenCalledWith(expect.any(CreateCedarMetadataRecord));
     expect(dialogRef.close).toHaveBeenCalledWith(true);
     expect(toastService.showSuccess).toHaveBeenCalledWith('collections.addToCollection.confirmationDialogToastMessage');
     expect(component.isSubmitting()).toBe(false);
@@ -92,6 +108,29 @@ describe('AddToCollectionConfirmationDialogComponent', () => {
     expect(dialogRef.close).toHaveBeenCalledWith(true);
   });
 
+  it('should create Cedar record before submission when cedarData is present', () => {
+    dialogConfig.data.cedarData = MOCK_CEDAR_DATA;
+    vi.spyOn(store, 'dispatch').mockReturnValue(of(void 0));
+
+    component.handleAddToCollectionConfirm();
+
+    expect(store.dispatch).toHaveBeenCalledWith(
+      new CreateCedarMetadataRecord(MOCK_CEDAR_DATA, 'project-1', ResourceType.Project)
+    );
+    expect(store.dispatch).toHaveBeenCalledWith(new CreateCollectionSubmission({ title: 'Submission' } as any));
+    expect(dialogRef.close).toHaveBeenCalledWith(true);
+  });
+
+  it('should not create Cedar record when cedarData is null', () => {
+    dialogConfig.data.cedarData = null;
+    vi.spyOn(store, 'dispatch').mockReturnValue(of(void 0));
+
+    component.handleAddToCollectionConfirm();
+
+    expect(store.dispatch).not.toHaveBeenCalledWith(expect.any(CreateCedarMetadataRecord));
+    expect(store.dispatch).toHaveBeenCalledWith(new CreateCollectionSubmission({ title: 'Submission' } as any));
+  });
+
   it('should reset submitting state on error', () => {
     vi.spyOn(store, 'dispatch').mockImplementation((action) => {
       if (action instanceof CreateCollectionSubmission) {
@@ -106,4 +145,20 @@ describe('AddToCollectionConfirmationDialogComponent', () => {
     expect(dialogRef.close).not.toHaveBeenCalled();
     expect(toastService.showSuccess).not.toHaveBeenCalled();
   });
+
+  it('should reset submitting state on Cedar record creation error', () => {
+    dialogConfig.data.cedarData = MOCK_CEDAR_DATA;
+    vi.spyOn(store, 'dispatch').mockImplementation((action) => {
+      if (action instanceof CreateCedarMetadataRecord) {
+        return throwError(() => new Error('cedar fail'));
+      }
+      return of(void 0);
+    });
+
+    component.handleAddToCollectionConfirm();
+
+    expect(component.isSubmitting()).toBe(false);
+    expect(dialogRef.close).not.toHaveBeenCalled();
+    expect(toastService.showSuccess).not.toHaveBeenCalled();
+  });
 });

src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts

@@ -5,13 +5,16 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { Button } from 'primeng/button';
 import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 
-import { forkJoin, of } from 'rxjs';
+import { Observable, of, switchMap } from 'rxjs';
 
 import { ChangeDetectionStrategy, Component, DestroyRef, inject, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions';
+import { CedarRecordDataBinding } from '@osf/features/metadata/models';
+import { CreateCedarMetadataRecord } from '@osf/features/metadata/store';
 import { UpdateProjectPublicStatus } from '@osf/features/project/overview/store';
+import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { ToastService } from '@osf/shared/services/toast.service';
 
 @Component({
@@ -30,26 +33,33 @@ export class AddToCollectionConfirmationDialogComponent {
   actions = createDispatchMap({
     createCollectionSubmission: CreateCollectionSubmission,
     updateProjectPublicStatus: UpdateProjectPublicStatus,
+    createCedarRecord: CreateCedarMetadataRecord,
   });
 
   handleAddToCollectionConfirm(): void {
     const payload = this.config.data.payload;
     const project = this.config.data.project;
+    const cedarData = this.config.data.cedarData as CedarRecordDataBinding | null | undefined;
 
     if (!payload || !project) return;
 
     this.isSubmitting.set(true);
     const projectPayload = [{ id: project.id as string, public: true }];
 
-    const updatePublicStatus$ = project.isPublic ? of(null) : this.actions.updateProjectPublicStatus(projectPayload);
+    const updatePublicStatus$: Observable<unknown> = project.isPublic
+      ? of(null)
+      : this.actions.updateProjectPublicStatus(projectPayload);
 
-    const createSubmission$ = this.actions.createCollectionSubmission(payload);
+    const createCedar$: Observable<unknown> = cedarData
+      ? this.actions.createCedarRecord(cedarData, project.id as string, ResourceType.Project)
+      : of(null);
 
-    forkJoin({
-      publicStatusUpdate: updatePublicStatus$,
-      collectionSubmission: createSubmission$,
-    })
-      .pipe(takeUntilDestroyed(this.destroyRef))
+    updatePublicStatus$
+      .pipe(
+        switchMap(() => createCedar$),
+        switchMap(() => this.actions.createCollectionSubmission(payload)),
+        takeUntilDestroyed(this.destroyRef)
+      )
       .subscribe({
         next: () => {
           this.isSubmitting.set(false);

src/app/features/collections/components/add-to-collection/add-to-collection.component.ts

@@ -211,19 +211,18 @@ export class AddToCollectionComponent implements CanDeactivateComponent {
     const payload = {
       collectionId: this.primaryCollectionId() || '',
       projectId: this.selectedProject()?.id || '',
-      collectionMetadata: this.isCedarMode() ? {} : this.collectionMetadataForm.value || {},
       userId: this.currentUser()?.id || '',
+      collectionMetadata: this.isCedarMode() ? {} : this.collectionMetadataForm.value || {},
     };
 
     const isEditMode = this.isEditMode();
 
     if (isEditMode) {
       this.loaderService.show();
 
-      this.actions
-        .updateCollectionSubmission(payload)
+      this.saveCedarRecordIfNeeded()
         .pipe(
-          switchMap(() => this.saveCedarRecordIfNeeded()),
+          switchMap(() => this.actions.updateCollectionSubmission(payload)),
           finalize(() => this.loaderService.hide()),
           takeUntilDestroyed(this.destroyRef)
         )
@@ -242,7 +241,11 @@ export class AddToCollectionComponent implements CanDeactivateComponent {
         .open(AddToCollectionConfirmationDialogComponent, {
           header: 'collections.addToCollection.confirmationDialogHeader',
           width: '500px',
-          data: { payload, project: this.selectedProject() },
+          data: {
+            payload,
+            project: this.selectedProject(),
+            cedarData: this.pendingCedarData(),
+          },
         })
         .onClose.pipe(
           filter((res) => !!res),
@@ -277,13 +280,13 @@ export class AddToCollectionComponent implements CanDeactivateComponent {
       .onClose.pipe(
         filter((res: RemoveFromCollectionDialogResult) => res?.confirmed),
         switchMap((res) => {
-          const payload: RemoveCollectionSubmissionPayload = {
+          const removePayload: RemoveCollectionSubmissionPayload = {
             projectId,
             collectionId,
             comment: res?.comment || '',
           };
-
-          return this.actions.deleteCollectionSubmission(payload);
+          this.loaderService.show();
+          return this.actions.deleteCollectionSubmission(removePayload);
         }),
         takeUntilDestroyed(this.destroyRef)
       )

src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts

@@ -20,7 +20,13 @@ describe('CollectionMetadataStepComponent', () => {
   let component: CollectionMetadataStepComponent;
   let fixture: ComponentFixture<CollectionMetadataStepComponent>;
 
-  function setup(isCedarMode = false, cedarTemplate: CedarMetadataDataTemplateJsonApi | null = null) {
+  function setup(
+    options: {
+      isCedarMode?: boolean;
+      cedarTemplate?: CedarMetadataDataTemplateJsonApi | null;
+      existingCedarRecord?: CedarMetadataRecordData | null;
+    } = {}
+  ) {
     TestBed.configureTestingModule({
       imports: [CollectionMetadataStepComponent, MockComponents(StepPanel, Step, StepItem)],
       providers: [
@@ -43,9 +49,15 @@ describe('CollectionMetadataStepComponent', () => {
     fixture.componentRef.setInput('targetStepValue', 1);
     fixture.componentRef.setInput('isDisabled', false);
     fixture.componentRef.setInput('primaryCollectionId', 'test-collection-id');
-    fixture.componentRef.setInput('isCedarMode', isCedarMode);
-    if (cedarTemplate) {
-      fixture.componentRef.setInput('cedarTemplate', cedarTemplate);
+
+    if (options.isCedarMode !== undefined) {
+      fixture.componentRef.setInput('isCedarMode', options.isCedarMode);
+    }
+    if (options.cedarTemplate !== undefined) {
+      fixture.componentRef.setInput('cedarTemplate', options.cedarTemplate);
+    }
+    if (options.existingCedarRecord !== undefined) {
+      fixture.componentRef.setInput('existingCedarRecord', options.existingCedarRecord);
     }
 
     fixture.detectChanges();
@@ -66,6 +78,10 @@ describe('CollectionMetadataStepComponent', () => {
     expect(component.isCedarMode()).toBe(false);
   });
 
+  it('should default isCedarMode to false', () => {
+    expect(component.isCedarMode()).toBe(false);
+  });
+
   it('should handle save metadata in filter mode', () => {
     const mockForm = new FormGroup({});
     component.collectionMetadataForm.set(mockForm);
@@ -128,7 +144,7 @@ describe('CollectionMetadataStepComponent', () => {
 
   describe('CEDAR mode', () => {
     beforeEach(() => {
-      setup(true, MOCK_CEDAR_TEMPLATE);
+      setup({ isCedarMode: true, cedarTemplate: MOCK_CEDAR_TEMPLATE });
     });
 
     it('should initialize in CEDAR mode', () => {

src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts

@@ -149,6 +149,7 @@ export class CollectionMetadataStepComponent {
     };
 
     this.collectionMetadataSaved.set(true);
+    this.metadataSaved.emit(this.collectionMetadataForm());
     this.cedarDataSaved.emit(cedarData);
     this.stepChange.emit(AddToCollectionSteps.Complete);
   }

src/app/shared/mappers/collections/collections.mapper.ts

@@ -243,7 +243,7 @@ export class CollectionsMapper {
 
   static toCollectionSubmissionRequest(payload: CollectionSubmissionPayload): CollectionSubmissionPayloadJsonApi {
     const collectionId = payload.collectionId;
-    const collectionsMetadata = convertToSnakeCase(payload.collectionMetadata);
+    const collectionsMetadata = payload.collectionMetadata ? convertToSnakeCase(payload.collectionMetadata) : {};
 
     return {
       data: {
@@ -271,7 +271,7 @@ export class CollectionsMapper {
   }
 
   static collectionSubmissionUpdateRequest(payload: CollectionSubmissionPayload) {
-    const collectionsMetadata = convertToSnakeCase(payload.collectionMetadata);
+    const collectionsMetadata = payload.collectionMetadata ? convertToSnakeCase(payload.collectionMetadata) : {};
 
     return {
       data: {

src/app/shared/models/collections/collection-submission-payload.model.ts

@@ -2,5 +2,5 @@ export interface CollectionSubmissionPayload {
   collectionId: string;
   projectId: string;
   userId: string;
-  collectionMetadata: Record<string, string>;
+  collectionMetadata?: Record<string, string>;
 }