[ENG-12550] 3. Registration metadata edit shows unavailable licenses

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

@@ -29,7 +29,6 @@ <h1 class="collections-heading flex align-items-center">{{ collectionProvider()?
           [stepperActiveValue]="stepperActiveValue()"
           [targetStepValue]="AddToCollectionSteps.ProjectMetadata"
           [isDisabled]="isProjectMetadataDisabled()"
-          [providerId]="providerId()"
           (metadataSaved)="handleProjectMetadataSaved()"
           (stepChange)="handleChangeStep($event)"
         />

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

@@ -5,12 +5,7 @@ import { of, Subject, throwError } from 'rxjs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { UserSelectors } from '@core/store/user';
-import { CollectionMetadataStepComponent } from '@osf/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component';
-import { ProjectContributorsStepComponent } from '@osf/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component';
-import { ProjectMetadataStepComponent } from '@osf/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component';
-import { SelectProjectStepComponent } from '@osf/features/collections/components/add-to-collection/select-project-step/select-project-step.component';
-import { AddToCollectionSteps } from '@osf/features/collections/enums';
+import { UserSelectors } from '@osf/core/store/user';
 import { CedarRecordDataBinding } from '@osf/features/metadata/models';
 import { MetadataSelectors } from '@osf/features/metadata/store';
 import { LoadingSpinnerComponent } from '@osf/shared/components/loading-spinner/loading-spinner.component';
@@ -19,8 +14,8 @@ import { CustomDialogService } from '@osf/shared/services/custom-dialog.service'
 import { HeaderStyleService } from '@osf/shared/services/header-style.service';
 import { LoaderService } from '@osf/shared/services/loader.service';
 import { ToastService } from '@osf/shared/services/toast.service';
-import { CollectionsSelectors } from '@shared/stores/collections';
-import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
+import { CollectionsSelectors } from '@osf/shared/stores/collections';
+import { ProjectsSelectors } from '@osf/shared/stores/projects';
 
 import { MOCK_USER } from '@testing/mocks/data.mock';
 import { MOCK_PROJECT } from '@testing/mocks/project.mock';
@@ -38,8 +33,13 @@ import { RouterMockBuilder } from '@testing/providers/router-provider.mock';
 import { mergeSignalOverrides, provideMockStore, SignalOverride } from '@testing/providers/store-provider.mock';
 import { ToastServiceMock } from '@testing/providers/toast-provider.mock';
 
+import { AddToCollectionSteps } from '../../enums';
 import { AddToCollectionSelectors } from '../../store/add-to-collection';
 
+import { CollectionMetadataStepComponent } from './collection-metadata-step/collection-metadata-step.component';
+import { ProjectContributorsStepComponent } from './project-contributors-step/project-contributors-step.component';
+import { ProjectMetadataStepComponent } from './project-metadata-step/project-metadata-step.component';
+import { SelectProjectStepComponent } from './select-project-step/select-project-step.component';
 import { AddToCollectionComponent } from './add-to-collection.component';
 
 const mockCollectionProvider = MOCK_PROVIDER;
@@ -138,11 +138,6 @@ describe('AddToCollectionComponent', () => {
     expect(mockRouter.navigate).toHaveBeenCalledWith(['/not-found']);
   });
 
-  it('should set providerId and dispatch getCollectionProvider when providerId is present', () => {
-    const { component } = setup({ routeParams: { providerId: 'provider-1' } });
-    expect(component.providerId()).toBe('provider-1');
-  });
-
   it('should handle project selection', () => {
     const { component } = setup();
     component.handleProjectSelected();

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

@@ -105,7 +105,6 @@ export class AddToCollectionComponent implements CanDeactivateComponent {
   isProjectReadOnly = select(UserSelectors.isProjectReadOnly);
   cedarRecords = select(MetadataSelectors.getCedarRecords);
 
-  providerId = signal<string>('');
   allowNavigation = signal<boolean>(false);
   projectMetadataSaved = signal<boolean>(false);
   projectContributorsSaved = signal<boolean>(false);
@@ -298,7 +297,6 @@ export class AddToCollectionComponent implements CanDeactivateComponent {
       return;
     }
 
-    this.providerId.set(id);
     this.actions.getCollectionProvider(id);
   }
 

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

@@ -38,10 +38,10 @@ <h3>{{ 'collections.addToCollection.resourceMetadata' | translate }}</h3>
             </div>
           </div>
           <p-button
-            (click)="handleEditStep()"
             severity="secondary"
             class="align-self-end"
             [label]="'common.buttons.clickToEdit' | translate"
+            (onClick)="handleEditStep()"
           ></p-button>
         }
       </div>
@@ -141,16 +141,16 @@ <h3>{{ 'collections.addToCollection.resourceMetadata' | translate }}</h3>
 
         <div class="flex justify-content-end gap-3">
           <p-button
-            (click)="handleDiscardChanges()"
             [disabled]="isSelectedProjectUpdateSubmitting()"
             severity="info"
             [label]="'common.buttons.discardChanges' | translate"
+            (onClick)="handleDiscardChanges()"
           />
           <p-button
             [label]="'common.buttons.saveAndContinue' | translate"
             [loading]="isSelectedProjectUpdateSubmitting()"
             [disabled]="!projectMetadataForm.valid"
-            (click)="handleUpdateMetadata()"
+            (onClick)="handleUpdateMetadata()"
           />
         </div>
       </form>

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

@@ -1,118 +1,205 @@
+import { Store } from '@ngxs/store';
+
 import { MockComponents, MockPipe, MockProvider } from 'ng-mocks';
 
+import { Step, StepItem, StepPanel } from 'primeng/stepper';
+
+import { Mock } from 'vitest';
+
+import { signal, WritableSignal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { AddToCollectionSelectors } from '@osf/features/collections/store/add-to-collection';
+import { AddToCollectionSteps } from '@osf/features/collections/enums';
+import { AddToCollectionSelectors, GetCollectionLicenses } from '@osf/features/collections/store/add-to-collection';
 import { TagsInputComponent } from '@osf/shared/components/tags-input/tags-input.component';
 import { TextInputComponent } from '@osf/shared/components/text-input/text-input.component';
 import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/truncated-text.component';
+import { ResourceType } from '@osf/shared/enums/resource-type.enum';
+import { LicenseModel } from '@osf/shared/models/license/license.model';
+import { InterpolatePipe } from '@osf/shared/pipes/interpolate.pipe';
 import { ToastService } from '@osf/shared/services/toast.service';
-import { InterpolatePipe } from '@shared/pipes/interpolate.pipe';
-import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
+import { CollectionsSelectors } from '@osf/shared/stores/collections';
+import { GetAllContributors } from '@osf/shared/stores/contributors';
+import { ClearProjects, ProjectsSelectors } from '@osf/shared/stores/projects';
 
 import { MOCK_PROJECT } from '@testing/mocks/project.mock';
+import { MOCK_PROVIDER } from '@testing/mocks/provider.mock';
 import { provideOSFCore } from '@testing/osf.testing.provider';
-import { provideMockStore } from '@testing/providers/store-provider.mock';
+import {
+  BaseSetupOverrides,
+  mergeSignalOverrides,
+  provideMockStore,
+  SignalOverride,
+} from '@testing/providers/store-provider.mock';
 import { ToastServiceMockBuilder } from '@testing/providers/toast-provider.mock';
 
 import { ProjectMetadataStepComponent } from './project-metadata-step.component';
 
-describe.skip('ProjectMetadataStepComponent', () => {
+const MOCK_LICENSE: LicenseModel = {
+  id: 'MIT',
+  name: 'MIT License',
+  requiredFields: [],
+  url: '',
+  text: '',
+};
+
+const MOCK_COLLECTION_PROVIDER = {
+  ...MOCK_PROVIDER,
+  licensesLink: 'https://api.osf.io/v2/providers/collections/1/licenses/',
+  defaultLicenseId: null,
+};
+
+interface SetupOverrides extends BaseSetupOverrides {
+  project?: typeof MOCK_PROJECT | null;
+  licenses?: LicenseModel[];
+  provider?: typeof MOCK_COLLECTION_PROVIDER | null;
+}
+
+describe('ProjectMetadataStepComponent', () => {
   let component: ProjectMetadataStepComponent;
   let fixture: ComponentFixture<ProjectMetadataStepComponent>;
-  let toastServiceMock: ReturnType<ToastServiceMockBuilder['build']>;
+  let store: Store;
+  let licensesSignal: WritableSignal<LicenseModel[]>;
+
+  function setup(overrides: SetupOverrides = {}) {
+    const project = 'project' in overrides ? overrides.project! : MOCK_PROJECT;
+    const licenses = overrides.licenses ?? [];
+    const provider = 'provider' in overrides ? overrides.provider! : MOCK_COLLECTION_PROVIDER;
+    const toastServiceMock = ToastServiceMockBuilder.create().build();
+
+    licensesSignal = signal(licenses);
 
-  beforeEach(() => {
-    toastServiceMock = ToastServiceMockBuilder.create().build();
+    const defaultSignals: SignalOverride[] = [
+      { selector: ProjectsSelectors.getSelectedProject, value: project },
+      { selector: CollectionsSelectors.getCollectionProvider, value: provider },
+      { selector: AddToCollectionSelectors.getCollectionLicenses, value: licensesSignal },
+      { selector: ProjectsSelectors.getSelectedProjectUpdateSubmitting, value: false },
+    ];
 
     TestBed.configureTestingModule({
       imports: [
         ProjectMetadataStepComponent,
-        ...MockComponents(TagsInputComponent, TextInputComponent, TruncatedTextComponent),
+        ...MockComponents(TagsInputComponent, TextInputComponent, TruncatedTextComponent, StepPanel, Step, StepItem),
         MockPipe(InterpolatePipe),
       ],
       providers: [
         provideOSFCore(),
         MockProvider(ToastService, toastServiceMock),
         provideMockStore({
-          signals: [
-            { selector: ProjectsSelectors.getSelectedProject, value: MOCK_PROJECT },
-            { selector: AddToCollectionSelectors.getCollectionLicenses, value: [] },
-            { selector: ProjectsSelectors.getSelectedProjectUpdateSubmitting, value: false },
-          ],
+          signals: mergeSignalOverrides(defaultSignals, overrides.selectorOverrides),
         }),
       ],
     });
 
+    store = TestBed.inject(Store);
     fixture = TestBed.createComponent(ProjectMetadataStepComponent);
     component = fixture.componentInstance;
 
     fixture.componentRef.setInput('stepperActiveValue', 0);
-    fixture.componentRef.setInput('targetStepValue', 2);
+    fixture.componentRef.setInput('targetStepValue', AddToCollectionSteps.ProjectMetadata);
     fixture.componentRef.setInput('isDisabled', false);
-    fixture.componentRef.setInput('providerId', 'id1');
-
     fixture.detectChanges();
-  });
+  }
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+  it('should create with required inputs', () => {
+    setup();
 
-  it('should initialize with input values', () => {
+    expect(component).toBeTruthy();
     expect(component.stepperActiveValue()).toBe(0);
-    expect(component.targetStepValue()).toBe(2);
+    expect(component.targetStepValue()).toBe(AddToCollectionSteps.ProjectMetadata);
     expect(component.isDisabled()).toBe(false);
-    expect(component.providerId()).toBe('id1');
   });
 
-  it('should handle tags change', () => {
-    const mockTags = ['tag1', 'tag2', 'tag3'];
+  it('should dispatch GetCollectionLicenses with provider licensesLink when licenses are empty', () => {
+    setup({ licenses: [] });
+
+    expect(store.dispatch).toHaveBeenCalledWith(new GetCollectionLicenses(MOCK_COLLECTION_PROVIDER.licensesLink));
+  });
+
+  it('should not dispatch GetCollectionLicenses when licenses are already loaded', () => {
+    setup({ licenses: [MOCK_LICENSE] });
 
-    component.handleTagsChange(mockTags);
+    expect(store.dispatch).not.toHaveBeenCalledWith(expect.any(GetCollectionLicenses));
+  });
+
+  it('should resolve projectLicense from collection licenses by project licenseId', () => {
+    setup({ licenses: [MOCK_LICENSE] });
 
-    expect(component.projectTags()).toEqual(mockTags);
+    expect(component.projectLicense()).toEqual(MOCK_LICENSE);
+    expect(component.selectedLicense()).toEqual(MOCK_LICENSE);
   });
 
-  it('should handle discard changes', () => {
+  it('should return null projectLicense when project is missing', () => {
+    setup({ project: null, licenses: [MOCK_LICENSE] });
+
+    expect(component.projectLicense()).toBeNull();
+  });
+
+  it('should update tags on handleTagsChange', () => {
+    setup({ licenses: [MOCK_LICENSE] });
+
     component.handleTagsChange(['tag1', 'tag2']);
+
     expect(component.projectTags()).toEqual(['tag1', 'tag2']);
+  });
 
+  it('should restore project tags on discard changes', () => {
+    setup({ licenses: [MOCK_LICENSE] });
+
+    component.handleTagsChange(['changed']);
     component.handleDiscardChanges();
 
-    expect(component).toBeTruthy();
+    expect(component.projectTags()).toEqual(MOCK_PROJECT.tags);
   });
 
-  it('should handle edit step', () => {
+  it('should emit stepChange on handleEditStep', () => {
+    setup();
     const stepChangeSpy = vi.spyOn(component.stepChange, 'emit');
 
     component.handleEditStep();
 
-    expect(stepChangeSpy).toHaveBeenCalledWith(component.targetStepValue());
+    expect(stepChangeSpy).toHaveBeenCalledWith(AddToCollectionSteps.ProjectMetadata);
   });
 
-  it('should handle different input values', () => {
-    fixture.componentRef.setInput('stepperActiveValue', 1);
-    fixture.componentRef.setInput('targetStepValue', 3);
-    fixture.componentRef.setInput('isDisabled', true);
-    fixture.componentRef.setInput('providerId', 'id2');
-    fixture.detectChanges();
+  it('should select license from select change event', () => {
+    setup({ licenses: [MOCK_LICENSE] });
+    const otherLicense: LicenseModel = { ...MOCK_LICENSE, id: 'CC0', name: 'CC0' };
+
+    component.handleSelectCollectionLicense({ value: otherLicense } as never);
 
-    expect(component.stepperActiveValue()).toBe(1);
-    expect(component.targetStepValue()).toBe(3);
-    expect(component.isDisabled()).toBe(true);
-    expect(component.providerId()).toBe('id2');
+    expect(component.selectedLicense()).toEqual(otherLicense);
   });
 
-  it('should initialize selected license as null', () => {
-    expect(component.selectedLicense()).toBe(null);
+  it('should proceed to contributors step when metadata is unchanged', () => {
+    setup({ licenses: [MOCK_LICENSE] });
+    (store.dispatch as Mock).mockClear();
+    const stepChangeSpy = vi.spyOn(component.stepChange, 'emit');
+    const metadataSavedSpy = vi.spyOn(component.metadataSaved, 'emit');
+
+    component.handleUpdateMetadata();
+
+    expect(stepChangeSpy).toHaveBeenCalledWith(AddToCollectionSteps.ProjectContributors);
+    expect(store.dispatch).toHaveBeenCalledWith(new GetAllContributors(MOCK_PROJECT.id, ResourceType.Project));
+    expect(metadataSavedSpy).toHaveBeenCalled();
   });
 
-  it('should have project metadata form', () => {
-    expect(component.projectMetadataForm).toBeDefined();
+  it('should not update metadata when project is missing', () => {
+    setup({ project: null });
+    (store.dispatch as Mock).mockClear();
+    const stepChangeSpy = vi.spyOn(component.stepChange, 'emit');
+
+    component.handleUpdateMetadata();
+
+    expect(stepChangeSpy).not.toHaveBeenCalled();
+    expect(store.dispatch).not.toHaveBeenCalledWith(expect.any(GetAllContributors));
   });
 
-  it('should have computed project license', () => {
-    expect(component.projectLicense()).toBeDefined();
+  it('should dispatch ClearProjects on destroy', () => {
+    setup();
+    (store.dispatch as Mock).mockClear();
+
+    fixture.destroy();
+
+    expect(store.dispatch).toHaveBeenCalledWith(new ClearProjects());
   });
 });

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

@@ -28,7 +28,7 @@ import {
   untracked,
 } from '@angular/core';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
-import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 
 import { AddToCollectionSteps, ProjectMetadataFormControls } from '@osf/features/collections/enums';
 import { ProjectMetadataForm } from '@osf/features/collections/models/project-metadata-form.model';
@@ -54,7 +54,6 @@ import { CollectionsSelectors } from '@shared/stores/collections';
     TranslatePipe,
     ReactiveFormsModule,
     Textarea,
-    FormsModule,
     TagsInputComponent,
     Chip,
     Card,
@@ -94,7 +93,6 @@ export class ProjectMetadataStepComponent {
   stepperActiveValue = input.required<number>();
   targetStepValue = input.required<number>();
   isDisabled = input.required<boolean>();
-  providerId = input.required<string>();
 
   stepChange = output<number>();
   metadataSaved = output<void>();
@@ -219,10 +217,9 @@ export class ProjectMetadataStepComponent {
   private setupEffects(): void {
     effect(() => {
       const licenses = this.collectionLicenses();
-      const providerId = this.providerId();
 
-      if (!licenses.length && providerId) {
-        this.actions.getCollectionLicenses(providerId);
+      if (!licenses.length) {
+        this.actions.getCollectionLicenses(this.collectionProvider()?.licensesLink);
       }
     });