Feat - Preprints Affiliated institutions (#280)

* refactor(institutions): Refactored store, service and models for handling institutions * feat(affiliated-institutions): Implemented shared component for selection, used for preprints * feat(affiliated-institutions-view): Implemented shared component. Unified usage of Institution model * fix(affiliated-institutions-view): Fixed link * fix(affiliated-institutions-view): Fixed warning * fix(affiliated-institutions): Fixed PR comments

Author: rrromchIk

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.scss

@@ -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();
+ });
+});