Feat - Preprints Affiliated institutions

src/app/core/constants/ngxs-states.constant.ts

@@ -8,7 +8,8 @@ import { RegistrationsState } from '@osf/features/project/registrations/store';
 import { AccountSettingsState } from '@osf/features/settings/account-settings/store/account-settings.state';
 import { DeveloperAppsState } from '@osf/features/settings/developer-apps/store';
 import { NotificationSubscriptionState } from '@osf/features/settings/notifications/store';
-import { AddonsState, InstitutionsState, WikiState } from '@osf/shared/stores';
+import { AddonsState, WikiState } from '@osf/shared/stores';
+import { InstitutionsState } from '@shared/stores/institutions';
 import { LicensesState } from '@shared/stores/licenses';
 import { MyResourcesState } from '@shared/stores/my-resources';
 import { RegionsState } from '@shared/stores/regions';

src/app/features/home/pages/dashboard/dashboard.component.ts

@@ -21,7 +21,7 @@ import { MY_PROJECTS_TABLE_PARAMS } from '@osf/shared/constants';
 import { SortOrder } from '@osf/shared/enums';
 import { IS_MEDIUM } from '@osf/shared/helpers';
 import { MyResourcesItem, MyResourcesSearchFilters, TableParameters } from '@osf/shared/models';
-import { ClearMyResources, FetchUserInstitutions, GetMyProjects, MyResourcesSelectors } from '@shared/stores';
+import { ClearMyResources, GetMyProjects, MyResourcesSelectors } from '@shared/stores';
 
 import { ConfirmEmailComponent } from '../../components';
 
@@ -73,7 +73,6 @@ export class DashboardComponent implements OnInit {
 
   ngOnInit() {
     this.setupQueryParamsSubscription();
-    this.store.dispatch(new FetchUserInstitutions());
 
     this.route.params.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
       const userId = params['userId'];

src/app/features/institutions/pages/institutions-list/institutions-list.component.ts

@@ -30,7 +30,7 @@ import {
 import { TABLE_PARAMS } from '@shared/constants';
 import { parseQueryFilterParams } from '@shared/helpers';
 import { QueryParams } from '@shared/models';
-import { FetchInstitutions, InstitutionsSelectors } from '@shared/stores';
+import { FetchInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
 
 @Component({
   selector: 'osf-institutions-list',

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

@@ -8,15 +8,7 @@ <h3>{{ 'preprints.preprintStepper.common.labels.abstract' | translate }}</h3>
       </section>
 
       @if (affiliatedInstitutions().length) {
-        <section class="flex flex-column gap-2">
-          <h3>{{ 'preprints.preprintStepper.review.sections.metadata.affiliatedInstitutions' | translate }}</h3>
-
-          <div class="flex gap-2">
-            @for (institution of affiliatedInstitutions(); track institution.id) {
-              <img alt="Institution logo" [src]="institution.assets.logo" height="45" />
-            }
-          </div>
-        </section>
+        <osf-affiliated-institutions-view [institutions]="affiliatedInstitutions()" />
       }
 
       @if (preprintValue.nodeId) {

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

@@ -5,18 +5,18 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { Card } from 'primeng/card';
 import { Skeleton } from 'primeng/skeleton';
 
-import { ChangeDetectionStrategy, Component, computed, effect, input, OnDestroy, output, signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, effect, input, OnDestroy, output } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterLink } from '@angular/router';
 
 import { PreprintDoiSectionComponent } from '@osf/features/preprints/components/preprint-details/preprint-doi-section/preprint-doi-section.component';
 import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums';
 import { PreprintProviderDetails } from '@osf/features/preprints/models';
 import { FetchPreprintById, PreprintSelectors } from '@osf/features/preprints/store/preprint';
-import { IconComponent, TruncatedTextComponent } from '@shared/components';
+import { AffiliatedInstitutionsViewComponent, IconComponent, TruncatedTextComponent } from '@shared/components';
 import { ResourceType } from '@shared/enums';
-import { Institution } from '@shared/models';
 import { ContributorsSelectors, GetAllContributors, ResetContributorsState } from '@shared/stores';
+import { FetchResourceInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
 
 import { environment } from 'src/environments/environment';
 
@@ -31,6 +31,7 @@ import { environment } from 'src/environments/environment';
     PreprintDoiSectionComponent,
     RouterLink,
     IconComponent,
+    AffiliatedInstitutionsViewComponent,
   ],
   templateUrl: './general-information.component.html',
   styleUrl: './general-information.component.scss',
@@ -44,6 +45,7 @@ export class GeneralInformationComponent implements OnDestroy {
     getContributors: GetAllContributors,
     resetContributorsState: ResetContributorsState,
     fetchPreprintById: FetchPreprintById,
+    fetchResourceInstitutions: FetchResourceInstitutions,
   });
   protected readonly environment = environment;
 
@@ -53,8 +55,7 @@ export class GeneralInformationComponent implements OnDestroy {
   preprint = select(PreprintSelectors.getPreprint);
   isPreprintLoading = select(PreprintSelectors.isPreprintLoading);
 
-  //[RNi] TODO: Implement when institutions available
-  affiliatedInstitutions = signal<Institution[]>([]);
+  affiliatedInstitutions = select(InstitutionsSelectors.getResourceInstitutions);
 
   contributors = select(ContributorsSelectors.getContributors);
   areContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
@@ -74,6 +75,7 @@ export class GeneralInformationComponent implements OnDestroy {
       if (!preprint) return;
 
       this.actions.getContributors(this.preprint()!.id, ResourceType.Preprint);
+      this.actions.fetchResourceInstitutions(this.preprint()!.id, ResourceType.Preprint);
     });
   }
 

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

@@ -41,6 +41,10 @@ <h2>{{ 'preprints.preprintStepper.metadata.publicationDoi.title' | translate }}<
   </div>
 </p-card>
 
+<div class="m-t-24">
+  <osf-preprints-affiliated-institutions [preprintId]="createdPreprint()?.id" [provider]="provider()" />
+</div>
+
 <div class="m-t-24">
   <osf-preprints-subjects [control]="metadataForm.controls['subjects']" [preprintId]="createdPreprint()?.id" />
 </div>

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

@@ -9,12 +9,11 @@ import { InputText } from 'primeng/inputtext';
 import { Message } from 'primeng/message';
 import { Tooltip } from 'primeng/tooltip';
 
-import { ChangeDetectionStrategy, Component, inject, OnInit, output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject, input, OnInit, output } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 
-import { PreprintsSubjectsComponent } from '@osf/features/preprints/components/stepper/metadata-step/preprints-subjects/preprints-subjects.component';
 import { formInputLimits } from '@osf/features/preprints/constants';
-import { MetadataForm, Preprint } from '@osf/features/preprints/models';
+import { MetadataForm, Preprint, PreprintProviderDetails } from '@osf/features/preprints/models';
 import {
   CreatePreprint,
   FetchLicenses,
@@ -29,6 +28,8 @@ import { License, LicenseOptions } from '@shared/models';
 import { CustomConfirmationService, ToastService } from '@shared/services';
 
 import { ContributorsComponent } from './contributors/contributors.component';
+import { PreprintsAffiliatedInstitutionsComponent } from './preprints-affiliated-institutions/preprints-affiliated-institutions.component';
+import { PreprintsSubjectsComponent } from './preprints-subjects/preprints-subjects.component';
 
 @Component({
   selector: 'osf-preprint-metadata',
@@ -47,6 +48,7 @@ import { ContributorsComponent } from './contributors/contributors.component';
     LicenseComponent,
     TagsInputComponent,
     PreprintsSubjectsComponent,
+    PreprintsAffiliatedInstitutionsComponent,
   ],
   templateUrl: './metadata-step.component.html',
   styleUrl: './metadata-step.component.scss',
@@ -71,6 +73,7 @@ export class MetadataStepComponent implements OnInit {
   createdPreprint = select(PreprintStepperSelectors.getPreprint);
   isUpdatingPreprint = select(PreprintStepperSelectors.isPreprintSubmitting);
 
+  provider = input.required<PreprintProviderDetails | undefined>();
   nextClicked = output<void>();
   backClicked = output<void>();
 

src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.html

@@ -0,0 +1,18 @@
+<p-card>
+  <div>
+    <h2>{{ 'preprints.preprintStepper.metadata.affiliatedInstitutionsTitle' | translate }}</h2>
+    <p class="m-t-12">
+      {{
+        'preprints.preprintStepper.metadata.affiliatedInstitutionsDescription'
+          | translate: { preprintWord: provider()?.preprintWord }
+      }}
+    </p>
+
+    <div class="m-t-24">
+      <osf-affiliated-institution-select
+        [calculateSelectedItemsMode]="true"
+        (selectInstitutions)="institutionsSelected($event)"
+      />
+    </div>
+  </div>
+</p-card>

src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.spec.ts

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

src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts

@@ -0,0 +1,38 @@
+import { createDispatchMap } from '@ngxs/store';
+
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { Card } from 'primeng/card';
+
+import { ChangeDetectionStrategy, Component, input, OnInit } from '@angular/core';
+
+import { PreprintProviderDetails } from '@osf/features/preprints/models';
+import { AffiliatedInstitutionSelectComponent } from '@shared/components';
+import { ResourceType } from '@shared/enums';
+import { Institution } from '@shared/models';
+import { FetchResourceInstitutions, UpdateResourceInstitutions } from '@shared/stores/institutions';
+
+@Component({
+  selector: 'osf-preprints-affiliated-institutions',
+  imports: [AffiliatedInstitutionSelectComponent, Card, TranslatePipe],
+  templateUrl: './preprints-affiliated-institutions.component.html',
+  styleUrl: './preprints-affiliated-institutions.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class PreprintsAffiliatedInstitutionsComponent implements OnInit {
+  preprintId = input<string>();
+  provider = input.required<PreprintProviderDetails | undefined>();
+
+  private actions = createDispatchMap({
+    fetchResourceInstitutions: FetchResourceInstitutions,
+    updateResourceInstitutions: UpdateResourceInstitutions,
+  });
+
+  ngOnInit() {
+    this.actions.fetchResourceInstitutions(this.preprintId()!, ResourceType.Preprint);
+  }
+
+  institutionsSelected(institutions: Institution[]) {
+    this.actions.updateResourceInstitutions(this.preprintId()!, ResourceType.Preprint, institutions);
+  }
+}

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

@@ -63,15 +63,7 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.contributors' | trans
     </section>
 
     @if (affiliatedInstitutions().length) {
-      <section class="flex flex-column gap-2">
-        <h3>{{ 'preprints.preprintStepper.review.sections.metadata.affiliatedInstitutions' | translate }}</h3>
-
-        <div class="flex gap-2">
-          @for (institution of affiliatedInstitutions(); track institution.id) {
-            <img alt="Institution logo" [src]="institution.assets.logo" height="45" />
-          }
-        </div>
-      </section>
+      <osf-affiliated-institutions-view [institutions]="affiliatedInstitutions()" />
     }
 
     <section class="license flex flex-column gap-2">

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

@@ -8,7 +8,7 @@ import { Card } from 'primeng/card';
 import { Tag } from 'primeng/tag';
 
 import { DatePipe, TitleCasePipe } from '@angular/common';
-import { ChangeDetectionStrategy, Component, computed, inject, input, OnInit, signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, inject, input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { ApplicabilityStatus, PreregLinkInfo, ReviewsState } from '@osf/features/preprints/enums';
@@ -19,12 +19,12 @@ import {
   PreprintStepperSelectors,
   SubmitPreprint,
 } from '@osf/features/preprints/store/preprint-stepper';
-import { TruncatedTextComponent } from '@shared/components';
+import { AffiliatedInstitutionsViewComponent, TruncatedTextComponent } from '@shared/components';
 import { ResourceType } from '@shared/enums';
-import { Institution } from '@shared/models';
 import { InterpolatePipe } from '@shared/pipes';
 import { ToastService } from '@shared/services';
 import { ContributorsSelectors, FetchSelectedSubjects, GetAllContributors, SubjectsSelectors } from '@shared/stores';
+import { FetchResourceInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
 
 @Component({
   selector: 'osf-review-step',
@@ -41,6 +41,7 @@ import { ContributorsSelectors, FetchSelectedSubjects, GetAllContributors, Subje
     AccordionHeader,
     AccordionPanel,
     InterpolatePipe,
+    AffiliatedInstitutionsViewComponent,
   ],
   templateUrl: './review-step.component.html',
   styleUrl: './review-step.component.scss',
@@ -55,6 +56,7 @@ export class ReviewStepComponent implements OnInit {
     fetchLicenses: FetchLicenses,
     fetchPreprintProject: FetchPreprintProject,
     submitPreprint: SubmitPreprint,
+    fetchResourceInstitutions: FetchResourceInstitutions,
   });
   provider = input.required<PreprintProviderDetails | undefined>();
   preprint = select(PreprintStepperSelectors.getPreprint);
@@ -65,7 +67,7 @@ export class ReviewStepComponent implements OnInit {
     return this.contributors().filter((contributor) => contributor.isBibliographic);
   });
   subjects = select(SubjectsSelectors.getSelectedSubjects);
-  affiliatedInstitutions = signal<Institution[]>([]);
+  affiliatedInstitutions = select(InstitutionsSelectors.getResourceInstitutions);
   license = select(PreprintStepperSelectors.getPreprintLicense);
   preprintProject = select(PreprintStepperSelectors.getPreprintProject);
   licenseOptionsRecord = computed(() => {
@@ -80,6 +82,7 @@ export class ReviewStepComponent implements OnInit {
     this.actions.fetchSubjects(this.preprint()!.id, ResourceType.Preprint);
     this.actions.fetchLicenses();
     this.actions.fetchPreprintProject();
+    this.actions.fetchResourceInstitutions(this.preprint()!.id, ResourceType.Preprint);
   }
 
   submitPreprint() {

src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.html

@@ -43,7 +43,11 @@ <h1 class="preprint-provider-name">
       />
     }
     @case (SubmitStepsEnum.Metadata) {
-      <osf-preprint-metadata (nextClicked)="moveToNextStep()" (backClicked)="moveToPreviousStep()" />
+      <osf-preprint-metadata
+        (nextClicked)="moveToNextStep()"
+        (backClicked)="moveToPreviousStep()"
+        [provider]="preprintProvider()"
+      />
     }
     @case (SubmitStepsEnum.AuthorAssertions) {
       <osf-author-assertions-step (nextClicked)="moveToNextStep()" (backClicked)="moveToPreviousStep()" />

src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.html

@@ -36,7 +36,11 @@ <h1 class="preprint-provider-name">
       <osf-title-and-abstract-step (nextClicked)="moveToNextStep()" />
     }
     @case (PreprintSteps.Metadata) {
-      <osf-preprint-metadata (nextClicked)="moveToNextStep()" (backClicked)="moveToPreviousStep()" />
+      <osf-preprint-metadata
+        (nextClicked)="moveToNextStep()"
+        (backClicked)="moveToPreviousStep()"
+        [provider]="preprintProvider()"
+      />
     }
     @case (PreprintSteps.AuthorAssertions) {
       <osf-author-assertions-step (nextClicked)="moveToNextStep()" (backClicked)="moveToPreviousStep()" />

src/app/features/project/metadata/mappers/project-metadata.mapper.ts

@@ -1,4 +1,6 @@
 import { ProjectOverview, ProjectOverviewContributor } from '@osf/features/project/overview/models';
+import { InstitutionsMapper } from '@shared/mappers';
+import { InstitutionsJsonApiResponse } from '@shared/models';
 
 export class ProjectMetadataMapper {
   static fromMetadataApiResponse(response: Record<string, unknown>): ProjectOverview {
@@ -40,6 +42,9 @@ export class ProjectMetadataMapper {
       isCollection: attributes['collection'] as boolean,
       accessRequestsEnabled: attributes['access_requests_enabled'] as boolean,
       wikiEnabled: attributes['wiki_enabled'] as boolean,
+      affiliatedInstitutions: InstitutionsMapper.fromInstitutionsResponse(
+        embeds['affiliated_institutions'] as InstitutionsJsonApiResponse
+      ),
       currentUserCanComment: attributes['current_user_can_comment'] as boolean,
       currentUserPermissions: (attributes['current_user_permissions'] as string[]) || [],
       currentUserIsContributor: attributes['current_user_is_contributor'] as boolean,

src/app/features/project/metadata/services/metadata.service.ts

@@ -81,7 +81,6 @@ export class MetadataService {
   getProjectForMetadata(projectId: string): Observable<ProjectOverview> {
     const params: Record<string, unknown> = {
       'embed[]': ['contributors', 'affiliated_institutions', 'identifiers', 'license', 'subjects_acceptable'],
-      'fields[institutions]': 'assets,description,name',
       'fields[users]': 'family_name,full_name,given_name,middle_name',
       'fields[subjects]': 'text,taxonomy',
     };

src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.html

@@ -42,7 +42,7 @@ <h3 class="font-normal affiliation-label mb-2">
               [inputId]="affiliation.id"
               [name]="'affiliations'"
             />
-            <img ngSrc="{{ affiliation.logo }}" alt="OSF Logo" height="44" width="44" />
+            <img ngSrc="{{ affiliation.assets.logo }}" alt="OSF Logo" height="44" width="44" />
           </div>
         }
       </div>

src/app/features/project/overview/mappers/project-overview.mapper.ts

@@ -1,3 +1,4 @@
+import { InstitutionsMapper } from '@shared/mappers';
 import { License } from '@shared/models';
 
 import { ProjectOverview, ProjectOverviewGetResponseJsoApi } from '../models';
@@ -44,13 +45,7 @@ export class ProjectOverviewMapper {
         middleName: contributor.embeds.users.data.attributes.middle_name,
         type: contributor.embeds.users.data.type,
       })),
-      affiliatedInstitutions: response.embeds.affiliated_institutions?.data.map((institution) => ({
-        id: institution.id,
-        type: institution.type,
-        logo: institution.attributes.assets.logo,
-        description: institution.attributes.description,
-        name: institution.attributes.name,
-      })),
+      affiliatedInstitutions: InstitutionsMapper.fromInstitutionsResponse(response.embeds.affiliated_institutions),
       identifiers: response.embeds.identifiers?.data.map((identifier) => ({
         id: identifier.id,
         type: identifier.type,