Fix/affiliated institutions

src/app/core/constants/nav-items.constant.ts

@@ -31,14 +31,14 @@ export const PROJECT_MENU_ITEMS: MenuItem[] = [
     label: 'navigation.overview',
     routerLink: 'overview',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-metadata',
     label: 'navigation.metadata',
     routerLink: 'metadata',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-files',
@@ -107,14 +107,14 @@ export const REGISTRATION_MENU_ITEMS: MenuItem[] = [
     label: 'navigation.overview',
     routerLink: 'overview',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'registration-metadata',
     label: 'navigation.metadata',
     routerLink: 'metadata',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'registration-files',

src/app/features/admin-institutions/pages/institutions-preprints/institutions-preprints.component.ts

@@ -7,10 +7,8 @@ import { Button } from 'primeng/button';
 import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, OnDestroy, OnInit, signal } from '@angular/core';
 
-import { FiltersSectionComponent } from '@osf/features/admin-institutions/components/filters-section/filters-section.component';
-import { mapPreprintResourceToTableData } from '@osf/features/admin-institutions/mappers/institution-preprint-to-table-data.mapper';
 import { ResourceType, SortOrder } from '@osf/shared/enums';
-import { SearchFilters } from '@osf/shared/models';
+import { PaginationLinksModel, SearchFilters } from '@osf/shared/models';
 import {
   FetchResources,
   FetchResourcesByLink,
@@ -22,9 +20,11 @@ import {
 } from '@shared/stores/global-search';
 
 import { AdminTableComponent } from '../../components';
+import { FiltersSectionComponent } from '../../components/filters-section/filters-section.component';
 import { preprintsTableColumns } from '../../constants';
 import { DownloadType } from '../../enums';
 import { downloadResults } from '../../helpers';
+import { mapPreprintResourceToTableData } from '../../mappers/institution-preprint-to-table-data.mapper';
 import { TableCellData } from '../../models';
 import { InstitutionsAdminSelectors } from '../../store';
 
@@ -75,7 +75,7 @@ export class InstitutionsPreprintsComponent implements OnInit, OnDestroy {
       next: { href: this.nextLink() },
       prev: { href: this.previousLink() },
       first: { href: this.firstLink() },
-    };
+    } as PaginationLinksModel;
   });
 
   ngOnInit(): void {

src/app/features/admin-institutions/pages/institutions-projects/institutions-projects.component.ts

@@ -19,11 +19,9 @@ import {
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
-import { UserSelectors } from '@osf/core/store/user';
-import { FiltersSectionComponent } from '@osf/features/admin-institutions/components/filters-section/filters-section.component';
-import { mapProjectResourceToTableCellData } from '@osf/features/admin-institutions/mappers/institution-project-to-table-data.mapper';
+import { UserSelectors } from '@core/store/user';
 import { ResourceType, SortOrder } from '@osf/shared/enums';
-import { ResourceModel, SearchFilters } from '@osf/shared/models';
+import { PaginationLinksModel, ResourceModel, SearchFilters } from '@osf/shared/models';
 import { ToastService } from '@osf/shared/services';
 import {
   FetchResources,
@@ -36,10 +34,12 @@ import {
 } from '@shared/stores/global-search';
 
 import { AdminTableComponent } from '../../components';
+import { FiltersSectionComponent } from '../../components/filters-section/filters-section.component';
 import { projectTableColumns } from '../../constants';
 import { ContactDialogComponent } from '../../dialogs';
 import { ContactOption, DownloadType } from '../../enums';
 import { downloadResults } from '../../helpers';
+import { mapProjectResourceToTableCellData } from '../../mappers/institution-project-to-table-data.mapper';
 import { ContactDialogData, TableCellData, TableCellLink, TableIconClickEvent } from '../../models';
 import { InstitutionsAdminSelectors, RequestProjectAccess, SendUserMessage } from '../../store';
 
@@ -101,7 +101,7 @@ export class InstitutionsProjectsComponent implements OnInit, OnDestroy {
       next: { href: this.nextLink() },
       prev: { href: this.previousLink() },
       first: { href: this.firstLink() },
-    };
+    } as PaginationLinksModel;
   });
 
   ngOnInit(): void {

src/app/features/admin-institutions/pages/institutions-registrations/institutions-registrations.component.ts

@@ -7,10 +7,8 @@ import { Button } from 'primeng/button';
 import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, OnDestroy, OnInit, signal } from '@angular/core';
 
-import { FiltersSectionComponent } from '@osf/features/admin-institutions/components/filters-section/filters-section.component';
-import { mapRegistrationResourceToTableData } from '@osf/features/admin-institutions/mappers/institution-registration-to-table-data.mapper';
 import { ResourceType, SortOrder } from '@osf/shared/enums';
-import { SearchFilters } from '@osf/shared/models';
+import { PaginationLinksModel, SearchFilters } from '@osf/shared/models';
 import {
   ClearFilterSearchResults,
   FetchResources,
@@ -23,9 +21,11 @@ import {
 } from '@shared/stores/global-search';
 
 import { AdminTableComponent } from '../../components';
+import { FiltersSectionComponent } from '../../components/filters-section/filters-section.component';
 import { registrationTableColumns } from '../../constants';
 import { DownloadType } from '../../enums';
 import { downloadResults } from '../../helpers';
+import { mapRegistrationResourceToTableData } from '../../mappers/institution-registration-to-table-data.mapper';
 import { TableCellData } from '../../models';
 import { InstitutionsAdminSelectors } from '../../store';
 
@@ -77,7 +77,7 @@ export class InstitutionsRegistrationsComponent implements OnInit, OnDestroy {
       next: { href: this.nextLink() },
       prev: { href: this.previousLink() },
       first: { href: this.firstLink() },
-    };
+    } as PaginationLinksModel;
   });
 
   ngOnInit(): void {

src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.html

@@ -10,7 +10,7 @@ <h3 class="text-lg text-red-500">{{ 'project.metadata.addMetadata.notPublishedTe
         <p-button
           class="w-10rem flex-shrink-0 btn-full-width"
           severity="secondary"
-          [label]="'Edit record'"
+          [label]="'project.metadata.addMetadata.editRecord' | translate"
           (onClick)="editModeEmit()"
         >
         </p-button>

src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.html

@@ -1,7 +1,8 @@
 <div class="mb-4">
   <osf-affiliated-institution-select
-    [calculateSelectedItemsMode]="true"
-    (selectInstitutions)="onSelectInstitutions($event)"
+    [institutions]="userInstitutions()"
+    [isLoading]="areUserInstitutionsLoading()"
+    [(selectedInstitutions)]="selectedInstitutions"
   />
 </div>
 

src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts

@@ -1,8 +1,8 @@
 import { Store } from '@ngxs/store';
 
-import { MockProvider } from 'ng-mocks';
+import { MockProvider, MockProviders } from 'ng-mocks';
 
-import { DynamicDialogRef } from 'primeng/dynamicdialog';
+import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
@@ -23,7 +23,11 @@ describe('AffiliatedInstitutionsDialogComponent', () => {
     });
     await TestBed.configureTestingModule({
       imports: [AffiliatedInstitutionsDialogComponent],
-      providers: [TranslateServiceMock, MockProvider(DynamicDialogRef), MockProvider(Store, MOCK_STORE)],
+      providers: [
+        TranslateServiceMock,
+        MockProviders(DynamicDialogRef, DynamicDialogConfig),
+        MockProvider(Store, MOCK_STORE),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(AffiliatedInstitutionsDialogComponent);

src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts

@@ -1,37 +1,39 @@
-import { select } from '@ngxs/store';
+import { createDispatchMap, select } from '@ngxs/store';
 
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
-import { DynamicDialogRef } from 'primeng/dynamicdialog';
+import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject, OnInit, signal } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components';
 import { Institution } from '@osf/shared/models';
-import { InstitutionsSelectors } from '@osf/shared/stores';
+import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores';
 
 @Component({
   selector: 'osf-affiliated-institutions-dialog',
   imports: [Button, TranslatePipe, ReactiveFormsModule, AffiliatedInstitutionSelectComponent],
   templateUrl: './affiliated-institutions-dialog.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AffiliatedInstitutionsDialogComponent {
+export class AffiliatedInstitutionsDialogComponent implements OnInit {
   dialogRef = inject(DynamicDialogRef);
+  config = inject(DynamicDialogConfig);
 
+  actions = createDispatchMap({ fetchUserInstitutions: FetchUserInstitutions });
   userInstitutions = select(InstitutionsSelectors.getUserInstitutions);
   areUserInstitutionsLoading = select(InstitutionsSelectors.areUserInstitutionsLoading);
 
-  selectedInstitutions: Institution[] = [];
+  selectedInstitutions = signal<Institution[]>(this.config.data || []);
 
-  onSelectInstitutions(selectedInstitutions: Institution[]): void {
-    this.selectedInstitutions = selectedInstitutions;
+  ngOnInit() {
+    this.actions.fetchUserInstitutions();
   }
 
   save(): void {
-    this.dialogRef.close(this.selectedInstitutions);
+    this.dialogRef.close(this.selectedInstitutions());
   }
 
   cancel(): void {

src/app/features/metadata/metadata.component.ts

@@ -428,24 +428,23 @@ export class MetadataComponent implements OnInit {
   }
 
   openEditAffiliatedInstitutionsDialog(): void {
-    const dialogRef = this.dialogService.open(AffiliatedInstitutionsDialogComponent, {
-      header: this.translateService.instant('project.metadata.affiliatedInstitutions.dialog.header'),
-      width: '500px',
-      focusOnShow: false,
-      closeOnEscape: true,
-      modal: true,
-      closable: true,
-    });
-    dialogRef.onClose
-      .pipe(
+    this.dialogService
+      .open(AffiliatedInstitutionsDialogComponent, {
+        header: this.translateService.instant('project.metadata.affiliatedInstitutions.dialog.header'),
+        width: '500px',
+        focusOnShow: false,
+        closeOnEscape: true,
+        modal: true,
+        closable: true,
+        data: this.affiliatedInstitutions(),
+      })
+      .onClose.pipe(
         filter((result) => !!result),
-        switchMap((institutions) => {
-          return this.actions.updateResourceInstitutions(this.resourceId, this.resourceType(), institutions);
-        })
+        switchMap((institutions) =>
+          this.actions.updateResourceInstitutions(this.resourceId, this.resourceType(), institutions)
+        )
       )
-      .subscribe({
-        next: () => this.toastService.showSuccess('project.metadata.affiliatedInstitutions.updated'),
-      });
+      .subscribe(() => this.toastService.showSuccess('project.metadata.affiliatedInstitutions.updated'));
   }
 
   getSubjectChildren(parentId: string) {

src/app/features/my-projects/my-projects.component.html

@@ -70,21 +70,17 @@
         </p-tabpanel>
 
         <p-tabpanel [value]="tabOption.Bookmarks" class="flex flex-column gap-4 flex-1">
-          @if (!bookmarks().length && !isLoading()) {
-            <p>{{ 'myProjects.bookmarks.emptyState' | translate }}</p>
-          } @else {
-            <osf-my-projects-table
-              [items]="bookmarks()"
-              [tableParams]="tableParams()"
-              [searchControl]="searchControl"
-              [sortColumn]="sortColumn()"
-              [sortOrder]="sortOrder()"
-              [isLoading]="isLoading()"
-              (pageChange)="onPageChange($event)"
-              (sort)="onSort($event)"
-              (itemClick)="navigateToProject($event)"
-            />
-          }
+          <osf-my-projects-table
+            [items]="bookmarks()"
+            [tableParams]="tableParams()"
+            [searchControl]="searchControl"
+            [sortColumn]="sortColumn()"
+            [sortOrder]="sortOrder()"
+            [isLoading]="isLoading()"
+            (pageChange)="onPageChange($event)"
+            (sort)="onSort($event)"
+            (itemClick)="navigateToProject($event)"
+          />
         </p-tabpanel>
       </p-tabpanels>
     </p-tabs>

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

@@ -7,7 +7,6 @@ import { Skeleton } from 'primeng/skeleton';
 
 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';
@@ -29,7 +28,6 @@ import { environment } from 'src/environments/environment';
     Skeleton,
     FormsModule,
     PreprintDoiSectionComponent,
-    RouterLink,
     IconComponent,
     AffiliatedInstitutionsViewComponent,
   ],

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

@@ -1,17 +1,21 @@
 <p-card>
   <div>
     <h2>{{ 'preprints.preprintStepper.metadata.affiliatedInstitutionsTitle' | translate }}</h2>
-    <p class="m-t-12">
+    <p class="mt-3">
       {{
         'preprints.preprintStepper.metadata.affiliatedInstitutionsDescription'
           | translate: { preprintWord: provider()?.preprintWord }
       }}
     </p>
 
-    <div class="m-t-24">
+    <div class="mt-4">
       <osf-affiliated-institution-select
-        [calculateSelectedItemsMode]="true"
-        (selectInstitutions)="institutionsSelected($event)"
+        [institutions]="userInstitutions()"
+        [isLoading]="
+          areUserInstitutionsLoading() || areResourceInstitutionsLoading() || areResourceInstitutionsSubmitting()
+        "
+        [selectedInstitutions]="selectedInstitutions()"
+        (selectedInstitutionsChange)="onInstitutionsChange($event)"
       />
     </div>
   </div>