From 3203f81cfb92be69388989b520b2fa491c6f53f7 Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Wed, 10 Sep 2025 16:32:18 +0300
Subject: [PATCH 01/10] fix(registration): fixed 594

---
 .../registries-landing/registries-landing.component.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/features/registries/pages/registries-landing/registries-landing.component.ts b/src/app/features/registries/pages/registries-landing/registries-landing.component.ts
index 9e79c0402..dd70711cb 100644
--- a/src/app/features/registries/pages/registries-landing/registries-landing.component.ts
+++ b/src/app/features/registries/pages/registries-landing/registries-landing.component.ts
@@ -8,6 +8,8 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor
 import { FormControl } from '@angular/forms';
 import { Router } from '@angular/router';
 
+import { AuthService } from '@core/services';
+import { UserSelectors } from '@core/store/user';
 import { RegistryServicesComponent } from '@osf/features/registries/components';
 import { GetRegistries, RegistriesSelectors } from '@osf/features/registries/store';
 import {
@@ -37,6 +39,8 @@ import { environment } from 'src/environments/environment';
 })
 export class RegistriesLandingComponent implements OnInit {
   private router = inject(Router);
+  private readonly isAuthenticated = select(UserSelectors.isAuthenticated);
+  private readonly authService = inject(AuthService);
 
   searchControl = new FormControl<string>('');
 
@@ -66,6 +70,10 @@ export class RegistriesLandingComponent implements OnInit {
   }
 
   goToCreateRegistration(): void {
-    this.router.navigate([`/registries/${environment.defaultProvider}/new`]);
+    if (this.isAuthenticated()) {
+      this.router.navigate([`/registries/${environment.defaultProvider}/new`]);
+    } else {
+      this.authService.navigateToSignIn();
+    }
   }
 }

From de8debf0ed84558d9c0cce736782418117b98e23 Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Wed, 10 Sep 2025 22:04:15 +0300
Subject: [PATCH 02/10] fix(registration-bugs): fixed some registrations bugs

---
 .../file-detail/file-detail.component.ts      |  4 +--
 src/app/features/files/store/files.actions.ts |  5 +---
 src/app/features/files/store/files.state.ts   |  2 +-
 .../add-metadata/add-metadata.component.ts    |  6 +++-
 ...confirm-registration-dialog.component.html |  1 +
 .../custom-step/custom-step.component.html    |  9 ++++--
 .../metadata/metadata.component.html          |  3 +-
 .../registries-license.component.html         |  1 +
 .../new-registration.component.html           |  9 +++++-
 .../new-registration.component.scss           |  1 +
 .../new-registration.component.ts             | 23 +++++++++++++--
 .../components/review/review.component.html   | 11 ++++----
 .../registries/services/projects.service.ts   | 28 -------------------
 .../store/handlers/projects.handlers.ts       | 16 +++++++----
 .../registries/store/registries.actions.ts    |  5 +++-
 .../registries/store/registries.state.ts      |  4 +--
 .../generic-filter.component.html             |  2 +-
 .../components/license/license.component.html |  3 +-
 .../sub-header/sub-header.component.html      |  2 +-
 .../sub-header/sub-header.component.scss      |  1 +
 .../truncated-text.component.ts               | 10 ++++++-
 src/app/shared/services/files.service.ts      |  4 +--
 src/styles/_fonts.scss                        |  4 +++
 23 files changed, 91 insertions(+), 63 deletions(-)
 delete mode 100644 src/app/features/registries/services/projects.service.ts

diff --git a/src/app/features/files/pages/file-detail/file-detail.component.ts b/src/app/features/files/pages/file-detail/file-detail.component.ts
index 40ff066d9..d4c60db1a 100644
--- a/src/app/features/files/pages/file-detail/file-detail.component.ts
+++ b/src/app/features/files/pages/file-detail/file-detail.component.ts
@@ -183,8 +183,8 @@ export class FileDetailComponent {
           this.actions.getFileResourceMetadata(this.resourceId, this.resourceType);
           this.actions.getFileResourceContributors(this.resourceId, this.resourceType);
           if (fileId) {
-            const storageLink = this.file()?.links.download || '';
-            this.actions.getFileRevisions(storageLink, fileId);
+            const storageLink = this.file()?.links.upload || '';
+            this.actions.getFileRevisions(storageLink);
             this.actions.getCedarTemplates();
             this.actions.getCedarRecords(fileId, ResourceType.File);
           }
diff --git a/src/app/features/files/store/files.actions.ts b/src/app/features/files/store/files.actions.ts
index 96ef709fa..a6fc56f71 100644
--- a/src/app/features/files/store/files.actions.ts
+++ b/src/app/features/files/store/files.actions.ts
@@ -114,10 +114,7 @@ export class SetFileMetadata {
 export class GetFileRevisions {
   static readonly type = '[Files] Get Revisions';
 
-  constructor(
-    public link: string,
-    public fileId: string
-  ) {}
+  constructor(public link: string) {}
 }
 
 export class UpdateTags {
diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts
index d0e977eb2..d9e572374 100644
--- a/src/app/features/files/store/files.state.ts
+++ b/src/app/features/files/store/files.state.ts
@@ -257,7 +257,7 @@ export class FilesState {
     const state = ctx.getState();
     ctx.patchState({ fileRevisions: { ...state.fileRevisions, isLoading: true, error: null } });
 
-    return this.filesService.getFileRevisions(action.link, action.fileId).pipe(
+    return this.filesService.getFileRevisions(action.link).pipe(
       tap({
         next: (revisions) => {
           ctx.patchState({ fileRevisions: { data: revisions, isLoading: false, error: null } });
diff --git a/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts b/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts
index 0c9b31a1f..c27330578 100644
--- a/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts
+++ b/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts
@@ -123,7 +123,11 @@ export class AddMetadataComponent implements OnInit {
     if (templates?.links?.first && templates?.links?.last && templates.links.first !== templates.links.last) {
       this.actions.getCedarTemplates();
     } else {
-      this.router.navigate(['..'], { relativeTo: this.activatedRoute });
+      if (this.resourceType() === ResourceType.File) {
+        this.router.navigate([this.resourceId]);
+      } else {
+        this.router.navigate(['..'], { relativeTo: this.activatedRoute });
+      }
     }
   }
 
diff --git a/src/app/features/registries/components/confirm-registration-dialog/confirm-registration-dialog.component.html b/src/app/features/registries/components/confirm-registration-dialog/confirm-registration-dialog.component.html
index 9379b23c6..f4df946e2 100644
--- a/src/app/features/registries/components/confirm-registration-dialog/confirm-registration-dialog.component.html
+++ b/src/app/features/registries/components/confirm-registration-dialog/confirm-registration-dialog.component.html
@@ -58,6 +58,7 @@
       [disabled]="isRegistrationSubmitting()"
     />
     <p-button
+      data-test-submit-registration-button
       class="w-12rem btn-full-width"
       [label]="'common.buttons.submit' | translate"
       [disabled]="form.invalid || isRegistrationSubmitting()"
diff --git a/src/app/features/registries/components/custom-step/custom-step.component.html b/src/app/features/registries/components/custom-step/custom-step.component.html
index 02ae4fc0f..a5b4008b4 100644
--- a/src/app/features/registries/components/custom-step/custom-step.component.html
+++ b/src/app/features/registries/components/custom-step/custom-step.component.html
@@ -67,7 +67,7 @@ <h3 class="mb-2">
                     (keyup.enter)="inplaceRef.deactivate()"
                     (keyup.space)="inplaceRef.deactivate()"
                   >
-                    <button class="text-primary border-none cursor-pointer bg-transparent text-sm">
+                    <button class="text-primary font-primary border-none cursor-pointer bg-transparent text-sm">
                       {{ 'common.links.hideExample' | translate }}
                     </button>
                   </div>
@@ -207,6 +207,11 @@ <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
       class="mr-2"
       (click)="goBack()"
     ></p-button>
-    <p-button type="button" [label]="'common.buttons.next' | translate" (click)="goNext()"></p-button>
+    <p-button
+      data-test-goto-next-page
+      type="button"
+      [label]="'common.buttons.next' | translate"
+      (click)="goNext()"
+    ></p-button>
   </div>
 </section>
diff --git a/src/app/features/registries/components/metadata/metadata.component.html b/src/app/features/registries/components/metadata/metadata.component.html
index c877f627a..a3bb08450 100644
--- a/src/app/features/registries/components/metadata/metadata.component.html
+++ b/src/app/features/registries/components/metadata/metadata.component.html
@@ -13,6 +13,7 @@ <h2 class="mb-2">{{ 'registries.metadata.title' | translate }}</h2>
         <div class="mt-2">
           <label for="project-description-id">{{ 'common.labels.description' | translate }}</label>
           <textarea
+            data-test-metadata-description
             id="project-description-id"
             formControlName="description"
             class="w-full"
@@ -40,7 +41,7 @@ <h2 class="mb-2">{{ 'registries.metadata.title' | translate }}</h2>
     <div class="flex justify-content-end">
       <p-button [label]="'registries.deleteDraft' | translate" severity="danger" (click)="deleteDraft()" class="mr-2">
       </p-button>
-      <p-button [label]="'common.buttons.next' | translate" type="submit"></p-button>
+      <p-button data-test-goto-next-page [label]="'common.buttons.next' | translate" type="submit"></p-button>
     </div>
   </form>
 </section>
diff --git a/src/app/features/registries/components/metadata/registries-license/registries-license.component.html b/src/app/features/registries/components/metadata/registries-license/registries-license.component.html
index 7673e6661..2a0123131 100644
--- a/src/app/features/registries/components/metadata/registries-license/registries-license.component.html
+++ b/src/app/features/registries/components/metadata/registries-license/registries-license.component.html
@@ -9,6 +9,7 @@ <h2 class="mb-2">{{ 'shared.license.title' | translate }}</h2>
   </p>
   <osf-license
     [licenses]="licenses()"
+    [fullWidthSelect]="true"
     [selectedLicenseId]="selectedLicense()?.id"
     [selectedLicenseOptions]="selectedLicense()?.options"
     (createLicense)="createLicense($event)"
diff --git a/src/app/features/registries/components/new-registration/new-registration.component.html b/src/app/features/registries/components/new-registration/new-registration.component.html
index 07d10ead5..b60af0269 100644
--- a/src/app/features/registries/components/new-registration/new-registration.component.html
+++ b/src/app/features/registries/components/new-registration/new-registration.component.html
@@ -1,4 +1,4 @@
-<section class="h-full">
+<section class="h-full" data-test-new-registration-form>
   <osf-sub-header [title]="'registries.new.addNewRegistry' | translate" />
   <section class="flex flex-column lg:flex-row flex-1 p-5 gap-4 bg-white w-full">
     <p>
@@ -14,6 +14,7 @@ <h2 class="mb-4">{{ ('registries.new.steps.title' | translate) + '1' }}</h2>
       <div class="flex gap-2">
         <p-button
           class="btn-full-width w-2 font-bold"
+          [class]="{ 'pointer-events-none': fromProject }"
           severity="info"
           [label]="'common.buttons.yes' | translate"
           [raised]="fromProject"
@@ -21,6 +22,7 @@ <h2 class="mb-4">{{ ('registries.new.steps.title' | translate) + '1' }}</h2>
         />
         <p-button
           class="btn-full-width w-2"
+          [class]="{ 'pointer-events-none': !fromProject }"
           severity="info"
           [label]="'common.buttons.no' | translate"
           [raised]="!fromProject"
@@ -36,13 +38,16 @@ <h2 class="mb-4">{{ ('registries.new.steps.title' | translate) + '2' }}</h2>
           <p class="mb-4">{{ 'registries.new.steps.step2InfoText' | translate }}</p>
           <div class="flex">
             <p-select
+              data-test-project-select
               formControlName="project"
               [options]="projects()"
               [placeholder]="'registries.new.selectProject' | translate"
               optionLabel="title"
               optionValue="id"
+              filter="true"
               [loading]="isProjectsLoading()"
               (onChange)="onSelectProject($event.value)"
+              (onFilter)="onProjectFilter($event.filter)"
               class="w-6"
             />
           </div>
@@ -53,6 +58,7 @@ <h2 class="mb-4">{{ ('registries.new.steps.title' | translate) + (fromProject ?
         <p class="mb-4 text-lg font-bold">{{ 'registries.new.steps.step3' | translate }}</p>
         <div class="flex">
           <p-select
+            data-test-schema-select
             formControlName="providerSchema"
             [options]="providerSchemas()"
             optionLabel="name"
@@ -65,6 +71,7 @@ <h2 class="mb-4">{{ ('registries.new.steps.title' | translate) + (fromProject ?
       </p-card>
       <div class="flex justify-content-end">
         <p-button
+          data-test-start-registration-button
           [label]="'registries.new.createDraft' | translate"
           [disabled]="draftForm.invalid"
           type="submit"
diff --git a/src/app/features/registries/components/new-registration/new-registration.component.scss b/src/app/features/registries/components/new-registration/new-registration.component.scss
index da0c027b5..f22ca8981 100644
--- a/src/app/features/registries/components/new-registration/new-registration.component.scss
+++ b/src/app/features/registries/components/new-registration/new-registration.component.scss
@@ -2,4 +2,5 @@
   display: flex;
   flex-direction: column;
   flex: 1;
+  background-color: var(--white);
 }
diff --git a/src/app/features/registries/components/new-registration/new-registration.component.ts b/src/app/features/registries/components/new-registration/new-registration.component.ts
index 3dc94fdda..4f3243ddb 100644
--- a/src/app/features/registries/components/new-registration/new-registration.component.ts
+++ b/src/app/features/registries/components/new-registration/new-registration.component.ts
@@ -6,7 +6,10 @@ import { Button } from 'primeng/button';
 import { Card } from 'primeng/card';
 import { Select } from 'primeng/select';
 
-import { ChangeDetectionStrategy, Component, effect, inject } from '@angular/core';
+import { debounceTime, distinctUntilChanged, Subject } from 'rxjs';
+
+import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
@@ -28,6 +31,8 @@ export class NewRegistrationComponent {
   private readonly toastService = inject(ToastService);
   private readonly router = inject(Router);
   private readonly route = inject(ActivatedRoute);
+  private destroyRef = inject(DestroyRef);
+
   readonly projects = select(RegistriesSelectors.getProjects);
   readonly providerSchemas = select(RegistriesSelectors.getProviderSchemas);
   readonly isDraftSubmitting = select(RegistriesSelectors.isDraftSubmitting);
@@ -51,10 +56,12 @@ export class NewRegistrationComponent {
     project: [this.projectId || ''],
   });
 
+  private filter$ = new Subject<string>();
+
   constructor() {
     const userId = this.user()?.id;
     if (userId) {
-      this.actions.getProjects(userId);
+      this.actions.getProjects(userId, '');
     }
     this.actions.getProviderSchemas(this.providerId);
     effect(() => {
@@ -63,6 +70,14 @@ export class NewRegistrationComponent {
         this.draftForm.get('providerSchema')?.setValue(this.providerSchemas()[0]?.id);
       }
     });
+
+    this.filter$
+      .pipe(debounceTime(300), distinctUntilChanged(), takeUntilDestroyed(this.destroyRef))
+      .subscribe((value: string) => {
+        if (userId) {
+          this.actions.getProjects(userId, value);
+        }
+      });
   }
 
   onSelectProject(projectId: string) {
@@ -71,6 +86,10 @@ export class NewRegistrationComponent {
     });
   }
 
+  onProjectFilter(value: string) {
+    this.filter$.next(value);
+  }
+
   onSelectProviderSchema(providerSchemaId: string) {
     this.draftForm.patchValue({
       providerSchema: providerSchemaId,
diff --git a/src/app/features/registries/components/review/review.component.html b/src/app/features/registries/components/review/review.component.html
index 31c3bd704..6e7a84b81 100644
--- a/src/app/features/registries/components/review/review.component.html
+++ b/src/app/features/registries/components/review/review.component.html
@@ -4,7 +4,7 @@ <h2 class="mb-4">{{ 'navigation.metadata' | translate }}</h2>
 
     <div class="mb-4">
       <h4 class="mb-2">{{ 'common.labels.title' | translate }}</h4>
-      <p>{{ draftRegistration()?.title }}</p>
+      <p data-test-review-response="title">{{ draftRegistration()?.title }}</p>
       @if (!draftRegistration()?.title) {
         <p>{{ 'common.labels.title' | translate }}</p>
         <p class="font-italic">{{ 'common.labels.noData' | translate }}</p>
@@ -15,7 +15,7 @@ <h4 class="mb-2">{{ 'common.labels.title' | translate }}</h4>
     </div>
     <div class="mb-4">
       <h4 class="mb-2">{{ 'common.labels.description' | translate }}</h4>
-      <p>{{ draftRegistration()?.description }}</p>
+      <p data-test-review-response="description">{{ draftRegistration()?.description }}</p>
       @if (!draftRegistration()?.description) {
         <p class="font-italic">{{ 'common.labels.noData' | translate }}</p>
         <p-message class="mt-1" severity="error" variant="simple" size="small">
@@ -44,7 +44,7 @@ <h4 class="mb-2">{{ 'shared.license.title' | translate }}</h4>
         <p-accordion>
           <p-accordion-panel value="0">
             <p-accordion-header class="p-0 justify-content-start gap-2">
-              <div>{{ license()?.name }}</div>
+              <div data-test-review-response="license">{{ license()?.name }}</div>
             </p-accordion-header>
             <p-accordion-content>
               <div>{{ license()!.text | interpolate: licenseOptionsRecord() }}</div>
@@ -62,7 +62,7 @@ <h4 class="mb-2">{{ 'shared.license.title' | translate }}</h4>
       <h4 class="mb-2">{{ 'shared.subjects.title' | translate }}</h4>
       <div class="flex flex-wrap gap-2">
         @for (subject of subjects(); track subject.id) {
-          <p-tag [value]="subject.name" severity="info" />
+          <p-tag data-test-selected-subject [value]="subject.name" severity="info" />
         }
       </div>
       @if (!subjects().length) {
@@ -75,7 +75,7 @@ <h4 class="mb-2">{{ 'shared.subjects.title' | translate }}</h4>
 
     <div class="mb-4">
       <h4 class="mb-2">{{ 'shared.tags.title' | translate }}</h4>
-      <div class="flex flex-wrap gap-2">
+      <div class="flex flex-wrap gap-2" data-test-tags-widget-tag-input>
         @for (tag of draftRegistration()?.tags; track tag) {
           <p-tag [value]="tag" severity="info" />
         }
@@ -131,6 +131,7 @@ <h3 class="mb-2">{{ section.title }}</h3>
     </p-button>
     <p-button
       type="button"
+      data-test-goto-register
       [label]="'registries.review.register' | translate"
       [disabled]="isDraftLoading() || isDraftInvalid()"
       (click)="confirmRegistration()"
diff --git a/src/app/features/registries/services/projects.service.ts b/src/app/features/registries/services/projects.service.ts
deleted file mode 100644
index f33232e1f..000000000
--- a/src/app/features/registries/services/projects.service.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { map, Observable } from 'rxjs';
-
-import { inject, Injectable } from '@angular/core';
-
-import { ProjectsMapper } from '@osf/shared/mappers/projects';
-import { ProjectsResponseJsonApi } from '@osf/shared/models/projects';
-import { JsonApiService } from '@osf/shared/services';
-
-import { Project } from '../models';
-
-import { environment } from 'src/environments/environment';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProjectsService {
-  private readonly jsonApiService = inject(JsonApiService);
-  private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
-
-  getProjects(): Observable<Project[]> {
-    const params: Record<string, unknown> = {
-      'filter[current_user_permissions]': 'admin',
-    };
-    return this.jsonApiService
-      .get<ProjectsResponseJsonApi>(`${this.apiUrl}/users/me/nodes/`, params)
-      .pipe(map((response) => ProjectsMapper.fromGetAllProjectsResponse(response)));
-  }
-}
diff --git a/src/app/features/registries/store/handlers/projects.handlers.ts b/src/app/features/registries/store/handlers/projects.handlers.ts
index ba013df93..2ca5a1bac 100644
--- a/src/app/features/registries/store/handlers/projects.handlers.ts
+++ b/src/app/features/registries/store/handlers/projects.handlers.ts
@@ -12,21 +12,25 @@ import { RegistriesStateModel } from '../registries.model';
 export class ProjectsHandlers {
   projectsService = inject(ProjectsService);
 
-  getProjects({ patchState }: StateContext<RegistriesStateModel>, userId: string) {
-    // [NM] TODO: move this parameter to projects.service
+  getProjects(ctx: StateContext<RegistriesStateModel>, userId: string, search: string) {
     const params: Record<string, unknown> = {
       'filter[current_user_permissions]': 'admin',
     };
 
-    patchState({
+    if (search) {
+      params['filter[title]'] = search;
+    }
+    const state = ctx.getState();
+    ctx.patchState({
       projects: {
-        ...DefaultState.projects,
+        data: state.projects.data,
+        error: null,
         isLoading: true,
       },
     });
     return this.projectsService.fetchProjects(userId, params).subscribe({
       next: (projects: Project[]) => {
-        patchState({
+        ctx.patchState({
           projects: {
             data: projects,
             isLoading: false,
@@ -35,7 +39,7 @@ export class ProjectsHandlers {
         });
       },
       error: (error) => {
-        patchState({
+        ctx.patchState({
           projects: { ...DefaultState.projects, isLoading: false, error },
         });
       },
diff --git a/src/app/features/registries/store/registries.actions.ts b/src/app/features/registries/store/registries.actions.ts
index bf5bf1e7a..79ef8dc4a 100644
--- a/src/app/features/registries/store/registries.actions.ts
+++ b/src/app/features/registries/store/registries.actions.ts
@@ -18,7 +18,10 @@ export class GetProviderSchemas {
 
 export class GetProjects {
   static readonly type = '[Registries] Get Projects';
-  constructor(public userId: string) {}
+  constructor(
+    public userId: string,
+    public search: string
+  ) {}
 }
 
 export class CreateDraft {
diff --git a/src/app/features/registries/store/registries.state.ts b/src/app/features/registries/store/registries.state.ts
index eeb5f0982..0e167f254 100644
--- a/src/app/features/registries/store/registries.state.ts
+++ b/src/app/features/registries/store/registries.state.ts
@@ -94,8 +94,8 @@ export class RegistriesState {
   }
 
   @Action(GetProjects)
-  getProjects(ctx: StateContext<RegistriesStateModel>, { userId }: GetProjects) {
-    return this.projectsHandler.getProjects(ctx, userId);
+  getProjects(ctx: StateContext<RegistriesStateModel>, { userId, search }: GetProjects) {
+    return this.projectsHandler.getProjects(ctx, userId, search);
   }
 
   @Action(FetchProjectChildren)
diff --git a/src/app/shared/components/generic-filter/generic-filter.component.html b/src/app/shared/components/generic-filter/generic-filter.component.html
index 9ab2cfbf5..ac27514e4 100644
--- a/src/app/shared/components/generic-filter/generic-filter.component.html
+++ b/src/app/shared/components/generic-filter/generic-filter.component.html
@@ -18,7 +18,7 @@
         filter
         resetFilterOnHide="false"
         [virtualScroll]="true"
-        [virtualScrollItemSize]="35"
+        [virtualScrollItemSize]="25"
         [lazy]="true"
         scrollHeight="200px"
         [autoOptionFocus]="false"
diff --git a/src/app/shared/components/license/license.component.html b/src/app/shared/components/license/license.component.html
index c7ecc44a4..ecd763e4d 100644
--- a/src/app/shared/components/license/license.component.html
+++ b/src/app/shared/components/license/license.component.html
@@ -1,9 +1,8 @@
 <p-select
+  data-test-select-license
   [options]="licenses()"
   [(ngModel)]="selectedLicense"
   optionLabel="name"
-  styleClass=""
-  appendTo="body"
   [class.md:w-full]="fullWidthSelect()"
   [placeholder]="'shared.license.selectLicense' | translate"
   (onChange)="onSelectLicense($event.value)"
diff --git a/src/app/shared/components/sub-header/sub-header.component.html b/src/app/shared/components/sub-header/sub-header.component.html
index 1042335c0..c11b83ec6 100644
--- a/src/app/shared/components/sub-header/sub-header.component.html
+++ b/src/app/shared/components/sub-header/sub-header.component.html
@@ -8,7 +8,7 @@
       @if (isLoading()) {
         <p-skeleton width="12rem" height="37px"></p-skeleton>
       } @else {
-        <h1 class="flex align-items-center">
+        <h1 data-test-page-heading class="flex align-items-center">
           {{ title() }}
           @if (tooltip()) {
             <i
diff --git a/src/app/shared/components/sub-header/sub-header.component.scss b/src/app/shared/components/sub-header/sub-header.component.scss
index 835defefd..f3eaa520c 100644
--- a/src/app/shared/components/sub-header/sub-header.component.scss
+++ b/src/app/shared/components/sub-header/sub-header.component.scss
@@ -6,6 +6,7 @@
 
 .sub-header {
   color: var(--dark-blue-1);
+  background-color: var(--bg-blue-3);
 }
 
 .title-icon {
diff --git a/src/app/shared/components/truncated-text/truncated-text.component.ts b/src/app/shared/components/truncated-text/truncated-text.component.ts
index 9efd3a6ba..f084f7479 100644
--- a/src/app/shared/components/truncated-text/truncated-text.component.ts
+++ b/src/app/shared/components/truncated-text/truncated-text.component.ts
@@ -1,7 +1,7 @@
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { CommonModule } from '@angular/common';
-import { AfterViewInit, Component, ElementRef, input, signal, viewChild } from '@angular/core';
+import { AfterViewInit, Component, effect, ElementRef, input, signal, viewChild } from '@angular/core';
 
 @Component({
   selector: 'osf-truncated-text',
@@ -17,6 +17,14 @@ export class TruncatedTextComponent implements AfterViewInit {
   isTextExpanded = signal(false);
   hasOverflowingText = signal(false);
 
+  constructor() {
+    effect(() => {
+      if (this.text()) {
+        this.isTextExpanded.set(false);
+      }
+    });
+  }
+
   ngAfterViewInit() {
     this.checkTextOverflow();
   }
diff --git a/src/app/shared/services/files.service.ts b/src/app/shared/services/files.service.ts
index 8b54eee73..c53acf394 100644
--- a/src/app/shared/services/files.service.ts
+++ b/src/app/shared/services/files.service.ts
@@ -248,9 +248,9 @@ export class FilesService {
       .pipe(map((response) => MapFileCustomMetadata(response)));
   }
 
-  getFileRevisions(link: string, fileId: string): Observable<OsfFileRevision[]> {
+  getFileRevisions(link: string): Observable<OsfFileRevision[]> {
     return this.jsonApiService
-      .get<GetFileRevisionsResponse>(`${link}/${fileId}?revisions=`)
+      .get<GetFileRevisionsResponse>(`${link}?revisions=`)
       .pipe(map((response) => MapFileRevision(response.data)));
   }
 
diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss
index 5dab88fa3..05094edbc 100644
--- a/src/styles/_fonts.scss
+++ b/src/styles/_fonts.scss
@@ -39,3 +39,7 @@
   font-weight: 800;
   font-style: normal;
 }
+
+.font-primary {
+  font-family: "Open Sans", sans-serif;
+}

From 22b448110a8f0d6975aa1b0dd2727f3beb6600a3 Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Thu, 11 Sep 2025 12:13:42 +0300
Subject: [PATCH 03/10] fix(registration): fixed registrations fr project

---
 .husky/pre-push                               | 34 ++++++------
 src/app/features/project/project.routes.ts    | 12 ++++
 .../registrations.component.html              |  7 +++
 .../registrations/registrations.component.ts  | 28 +++++++++-
 .../services/registrations.service.ts         | 10 +++-
 .../store/registrations.actions.ts            |  6 +-
 .../store/registrations.selectors.ts          |  5 ++
 .../store/registrations.state.ts              |  2 +-
 .../custom-step/custom-step.component.html    | 14 +----
 .../custom-step/custom-step.component.ts      |  1 -
 .../my-registrations.component.html           |  6 +-
 .../my-registrations.component.ts             | 46 +---------------
 .../registries-landing.component.ts           | 10 +---
 .../registration-card.component.html          |  6 +-
 .../registration-card.component.ts            | 55 ++++++++++++++++---
 15 files changed, 134 insertions(+), 108 deletions(-)

diff --git a/.husky/pre-push b/.husky/pre-push
index 0ca23b22c..5a281490a 100644
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -1,19 +1,19 @@
-# # npm run build
+# npm run build
 
-# npm run test:coverage || {
-#   printf "\n\nERROR: Testing errors or coverage issues are found."
-#   printf "\n\nIn the future this will block your ability to push to github until it is resolved."
-#   printf "\n\nThe same pipeline runs via GitHub actions."
-#   printf "\n\nYou are seeing this error because code was added without test coverage."
-#   # printf "\n\n Please address them before proceeding.\n\n\n\n"
-#   # exit 1
-# }
+npm run test:coverage || {
+  printf "\n\nERROR: Testing errors or coverage issues are found."
+  printf "\n\nIn the future this will block your ability to push to github until it is resolved."
+  printf "\n\nThe same pipeline runs via GitHub actions."
+  printf "\n\nYou are seeing this error because code was added without test coverage."
+  # printf "\n\n Please address them before proceeding.\n\n\n\n"
+  # exit 1
+}
 
-# npm run test:check-coverage-thresholds || {
-#   printf "\n\nERROR: Coverage thresholds are not met."
-#   printf "\n\nIn the future this will block your ability to push to github until it is resolved."
-#   printf "\n\nThe same pipeline runs via GitHub actions."
-#   printf "\n\nYou are seeing this error because test coverage increased without updating the jest.config.js thresholds."
-#   #printf "\n\nPlease address them before proceeding.\n\n\n\n"
-#   # exit 1
-# }
+npm run test:check-coverage-thresholds || {
+  printf "\n\nERROR: Coverage thresholds are not met."
+  printf "\n\nIn the future this will block your ability to push to github until it is resolved."
+  printf "\n\nThe same pipeline runs via GitHub actions."
+  printf "\n\nYou are seeing this error because test coverage increased without updating the jest.config.js thresholds."
+  #printf "\n\nPlease address them before proceeding.\n\n\n\n"
+  # exit 1
+}
diff --git a/src/app/features/project/project.routes.ts b/src/app/features/project/project.routes.ts
index 94c3d3947..bf93b0e7d 100644
--- a/src/app/features/project/project.routes.ts
+++ b/src/app/features/project/project.routes.ts
@@ -4,6 +4,7 @@ import { Routes } from '@angular/router';
 
 import { viewOnlyGuard } from '@osf/core/guards';
 import { ResourceType } from '@osf/shared/enums';
+import { LicensesService } from '@osf/shared/services';
 import {
   CitationsState,
   CollectionsState,
@@ -17,6 +18,9 @@ import { ActivityLogsState } from '@osf/shared/stores/activity-logs';
 
 import { AnalyticsState } from '../analytics/store';
 import { CollectionsModerationState } from '../moderation/store/collections-moderation';
+import { RegistriesState } from '../registries/store';
+import { LicensesHandlers, ProjectsHandlers, ProvidersHandlers } from '../registries/store/handlers';
+import { FilesHandlers } from '../registries/store/handlers/files.handlers';
 
 import { SettingsState } from './settings/store';
 
@@ -59,6 +63,14 @@ export const projectRoutes: Routes = [
       {
         path: 'registrations',
         canActivate: [viewOnlyGuard],
+        providers: [
+          provideStates([RegistriesState]),
+          ProvidersHandlers,
+          ProjectsHandlers,
+          LicensesService,
+          LicensesHandlers,
+          FilesHandlers,
+        ],
         loadComponent: () =>
           import('../project/registrations/registrations.component').then((mod) => mod.RegistrationsComponent),
       },
diff --git a/src/app/features/project/registrations/registrations.component.html b/src/app/features/project/registrations/registrations.component.html
index 80bf0335a..a9bd9b0ad 100644
--- a/src/app/features/project/registrations/registrations.component.html
+++ b/src/app/features/project/registrations/registrations.component.html
@@ -15,6 +15,13 @@
         @for (registration of registrations(); track registration.id) {
           <osf-registration-card [registrationData]="registration" />
         }
+        @if (registrationsTotalCount() > itemsPerPage) {
+          <osf-custom-paginator
+            [first]="first"
+            [totalCount]="registrationsTotalCount()"
+            (pageChanged)="onPageChange($event)"
+          />
+        }
       </div>
     }
   </section>
diff --git a/src/app/features/project/registrations/registrations.component.ts b/src/app/features/project/registrations/registrations.component.ts
index 69cf1e5c5..ff5b5c206 100644
--- a/src/app/features/project/registrations/registrations.component.ts
+++ b/src/app/features/project/registrations/registrations.component.ts
@@ -3,6 +3,7 @@ import { createDispatchMap, select } from '@ngxs/store';
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { DialogService } from 'primeng/dynamicdialog';
+import { PaginatorState } from 'primeng/paginator';
 
 import { map, of } from 'rxjs';
 
@@ -11,7 +12,12 @@ import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { LoadingSpinnerComponent, RegistrationCardComponent, SubHeaderComponent } from '@osf/shared/components';
+import {
+  CustomPaginatorComponent,
+  LoadingSpinnerComponent,
+  RegistrationCardComponent,
+  SubHeaderComponent,
+} from '@osf/shared/components';
 
 import { GetRegistrations, RegistrationsSelectors } from './store';
 
@@ -19,7 +25,14 @@ import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'osf-registrations',
-  imports: [RegistrationCardComponent, SubHeaderComponent, FormsModule, TranslatePipe, LoadingSpinnerComponent],
+  imports: [
+    RegistrationCardComponent,
+    SubHeaderComponent,
+    FormsModule,
+    TranslatePipe,
+    LoadingSpinnerComponent,
+    CustomPaginatorComponent,
+  ],
   templateUrl: './registrations.component.html',
   styleUrl: './registrations.component.scss',
   providers: [DialogService],
@@ -32,11 +45,15 @@ export class RegistrationsComponent implements OnInit {
   readonly projectId = toSignal(this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined));
 
   registrations = select(RegistrationsSelectors.getRegistrations);
+  registrationsTotalCount = select(RegistrationsSelectors.getRegistrationsTotalCount);
   isRegistrationsLoading = select(RegistrationsSelectors.isRegistrationsLoading);
   actions = createDispatchMap({ getRegistrations: GetRegistrations });
 
+  itemsPerPage = 10;
+  first = 0;
+
   ngOnInit(): void {
-    this.actions.getRegistrations(this.projectId());
+    this.actions.getRegistrations(this.projectId(), 1, this.itemsPerPage);
   }
 
   addRegistration(): void {
@@ -44,4 +61,9 @@ export class RegistrationsComponent implements OnInit {
       queryParams: { projectId: this.projectId() },
     });
   }
+
+  onPageChange(event: PaginatorState): void {
+    this.actions.getRegistrations(this.projectId(), event.page! + 1, this.itemsPerPage);
+    this.first = event.first!;
+  }
 }
diff --git a/src/app/features/project/registrations/services/registrations.service.ts b/src/app/features/project/registrations/services/registrations.service.ts
index c222b575d..07ecf3b84 100644
--- a/src/app/features/project/registrations/services/registrations.service.ts
+++ b/src/app/features/project/registrations/services/registrations.service.ts
@@ -15,10 +15,14 @@ export class RegistrationsService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
 
-  getRegistrations(projectId: string): Observable<PaginatedData<RegistrationCard[]>> {
-    const params: Record<string, unknown> = { embed: 'contributors' };
+  getRegistrations(projectId: string, page: number, pageSize: number): Observable<PaginatedData<RegistrationCard[]>> {
+    const params = {
+      page,
+      'page[size]': pageSize,
+      embed: ['bibliographic_contributors', 'registration_schema', 'provider'],
+    };
 
-    const url = `${this.apiUrl}/nodes/${projectId}/linked_by_registrations/`;
+    const url = `${this.apiUrl}/nodes/${projectId}/registrations/`;
 
     return this.jsonApiService.get<ResponseJsonApi<RegistrationDataJsonApi[]>>(url, params).pipe(
       map((response) => {
diff --git a/src/app/features/project/registrations/store/registrations.actions.ts b/src/app/features/project/registrations/store/registrations.actions.ts
index cec5e1dfd..81a2981ef 100644
--- a/src/app/features/project/registrations/store/registrations.actions.ts
+++ b/src/app/features/project/registrations/store/registrations.actions.ts
@@ -1,5 +1,9 @@
 export class GetRegistrations {
   static readonly type = '[Registrations] Get Registrations';
 
-  constructor(public projectId: string) {}
+  constructor(
+    public projectId: string,
+    public page = 1,
+    public pageSize = 10
+  ) {}
 }
diff --git a/src/app/features/project/registrations/store/registrations.selectors.ts b/src/app/features/project/registrations/store/registrations.selectors.ts
index f958bf568..c72a45b9e 100644
--- a/src/app/features/project/registrations/store/registrations.selectors.ts
+++ b/src/app/features/project/registrations/store/registrations.selectors.ts
@@ -9,6 +9,11 @@ export class RegistrationsSelectors {
     return state.registrations.data;
   }
 
+  @Selector([RegistrationsState])
+  static getRegistrationsTotalCount(state: RegistrationsStateModel): number {
+    return state.registrations.totalCount;
+  }
+
   @Selector([RegistrationsState])
   static isRegistrationsLoading(state: RegistrationsStateModel) {
     return state.registrations.isLoading;
diff --git a/src/app/features/project/registrations/store/registrations.state.ts b/src/app/features/project/registrations/store/registrations.state.ts
index 0fd503eee..a6cc768f9 100644
--- a/src/app/features/project/registrations/store/registrations.state.ts
+++ b/src/app/features/project/registrations/store/registrations.state.ts
@@ -27,7 +27,7 @@ export class RegistrationsState {
       registrations: { ...state.registrations, isLoading: true, error: null },
     });
 
-    return this.registrationsService.getRegistrations(action.projectId).pipe(
+    return this.registrationsService.getRegistrations(action.projectId, action.page, action.pageSize).pipe(
       tap((registrations) => {
         ctx.setState({
           registrations: {
diff --git a/src/app/features/registries/components/custom-step/custom-step.component.html b/src/app/features/registries/components/custom-step/custom-step.component.html
index a5b4008b4..e9ef298df 100644
--- a/src/app/features/registries/components/custom-step/custom-step.component.html
+++ b/src/app/features/registries/components/custom-step/custom-step.component.html
@@ -60,17 +60,9 @@ <h3 class="mb-2">
                   <span class="text-primary font-medium">{{ 'common.links.showExample' | translate }} </span>
                 </ng-template>
                 <ng-template #content>
-                  <div
-                    class="p-inplace-display"
-                    tabindex="0"
-                    (click)="inplaceRef.deactivate()"
-                    (keyup.enter)="inplaceRef.deactivate()"
-                    (keyup.space)="inplaceRef.deactivate()"
-                  >
-                    <button class="text-primary font-primary border-none cursor-pointer bg-transparent text-sm">
-                      {{ 'common.links.hideExample' | translate }}
-                    </button>
-                  </div>
+                  <p-button size="small" (onClick)="inplaceRef.deactivate()" variant="text" styleClass="font-medium">
+                    {{ 'common.links.hideExample' | translate }}
+                  </p-button>
                   <p class="m-0">{{ q.exampleText }}</p>
                 </ng-template>
               </p-inplace>
diff --git a/src/app/features/registries/components/custom-step/custom-step.component.ts b/src/app/features/registries/components/custom-step/custom-step.component.ts
index fb1467a82..59721646c 100644
--- a/src/app/features/registries/components/custom-step/custom-step.component.ts
+++ b/src/app/features/registries/components/custom-step/custom-step.component.ts
@@ -152,7 +152,6 @@ export class CustomStepComponent implements OnDestroy {
           break;
 
         default:
-          console.warn(`Unsupported field type: ${q.fieldType}`);
           return;
       }
 
diff --git a/src/app/features/registries/pages/my-registrations/my-registrations.component.html b/src/app/features/registries/pages/my-registrations/my-registrations.component.html
index fc1b1733f..2795b3018 100644
--- a/src/app/features/registries/pages/my-registrations/my-registrations.component.html
+++ b/src/app/features/registries/pages/my-registrations/my-registrations.component.html
@@ -65,11 +65,7 @@
               <ng-container *ngTemplateOutlet="noRegistration"></ng-container>
             }
             @for (registration of submittedRegistrations(); track $index) {
-              <osf-registration-card
-                (updateRegistration)="onUpdateRegistration($event)"
-                (continueUpdate)="onContinueUpdateRegistration($event)"
-                [registrationData]="registration"
-              />
+              <osf-registration-card [registrationData]="registration" />
             }
             @if (submittedRegistrationsTotalCount() > itemsPerPage) {
               <osf-custom-paginator
diff --git a/src/app/features/registries/pages/my-registrations/my-registrations.component.ts b/src/app/features/registries/pages/my-registrations/my-registrations.component.ts
index 8b0dda23d..acebf0117 100644
--- a/src/app/features/registries/pages/my-registrations/my-registrations.component.ts
+++ b/src/app/features/registries/pages/my-registrations/my-registrations.component.ts
@@ -7,8 +7,6 @@ import { PaginatorState } from 'primeng/paginator';
 import { Skeleton } from 'primeng/skeleton';
 import { TabsModule } from 'primeng/tabs';
 
-import { tap } from 'rxjs';
-
 import { NgTemplateOutlet } from '@angular/common';
 import { ChangeDetectionStrategy, Component, effect, inject, signal } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
@@ -27,14 +25,7 @@ import { CustomConfirmationService, ToastService } from '@osf/shared/services';
 
 import { REGISTRATIONS_TABS } from '../../constants';
 import { RegistrationTab } from '../../enums';
-import {
-  CreateSchemaResponse,
-  DeleteDraft,
-  FetchAllSchemaResponses,
-  FetchDraftRegistrations,
-  FetchSubmittedRegistrations,
-  RegistriesSelectors,
-} from '../../store';
+import { DeleteDraft, FetchDraftRegistrations, FetchSubmittedRegistrations, RegistriesSelectors } from '../../store';
 
 import { environment } from 'src/environments/environment';
 
@@ -74,14 +65,11 @@ export class MyRegistrationsComponent {
   submittedRegistrations = select(RegistriesSelectors.getSubmittedRegistrations);
   submittedRegistrationsTotalCount = select(RegistriesSelectors.getSubmittedRegistrationsTotalCount);
   isSubmittedRegistrationsLoading = select(RegistriesSelectors.isSubmittedRegistrationsLoading);
-  schemaResponse = select(RegistriesSelectors.getSchemaResponse);
 
   actions = createDispatchMap({
     getDraftRegistrations: FetchDraftRegistrations,
     getSubmittedRegistrations: FetchSubmittedRegistrations,
     deleteDraft: DeleteDraft,
-    getSchemaResponse: FetchAllSchemaResponses,
-    createSchemaResponse: CreateSchemaResponse,
   });
 
   readonly RegistrationTab = RegistrationTab;
@@ -149,36 +137,4 @@ export class MyRegistrationsComponent {
     this.actions.getSubmittedRegistrations(this.currentUser()?.id, event.page! + 1);
     this.submittedFirst = event.first!;
   }
-
-  onUpdateRegistration(id: string): void {
-    this.actions
-      .createSchemaResponse(id)
-      .pipe(tap(() => this.navigateToJustificationPage()))
-      .subscribe();
-  }
-
-  onContinueUpdateRegistration({ id, unapproved }: { id: string; unapproved: boolean }): void {
-    this.actions
-      .getSchemaResponse(id)
-      .pipe(
-        tap(() => {
-          if (unapproved) {
-            this.navigateToJustificationReview();
-          } else {
-            this.navigateToJustificationPage();
-          }
-        })
-      )
-      .subscribe();
-  }
-
-  private navigateToJustificationPage(): void {
-    const revisionId = this.schemaResponse()?.id;
-    this.router.navigate([`/registries/revisions/${revisionId}/justification`]);
-  }
-
-  private navigateToJustificationReview(): void {
-    const revisionId = this.schemaResponse()?.id;
-    this.router.navigate([`/registries/revisions/${revisionId}/review`]);
-  }
 }
diff --git a/src/app/features/registries/pages/registries-landing/registries-landing.component.ts b/src/app/features/registries/pages/registries-landing/registries-landing.component.ts
index c99d4f673..f446f4c94 100644
--- a/src/app/features/registries/pages/registries-landing/registries-landing.component.ts
+++ b/src/app/features/registries/pages/registries-landing/registries-landing.component.ts
@@ -8,8 +8,6 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor
 import { FormControl } from '@angular/forms';
 import { Router } from '@angular/router';
 
-import { AuthService } from '@core/services';
-import { UserSelectors } from '@core/store/user';
 import {
   LoadingSpinnerComponent,
   ResourceCardComponent,
@@ -40,8 +38,6 @@ import { environment } from 'src/environments/environment';
 })
 export class RegistriesLandingComponent implements OnInit {
   private router = inject(Router);
-  private readonly isAuthenticated = select(UserSelectors.isAuthenticated);
-  private readonly authService = inject(AuthService);
 
   searchControl = new FormControl<string>('');
 
@@ -65,10 +61,6 @@ export class RegistriesLandingComponent implements OnInit {
   }
 
   goToCreateRegistration(): void {
-    if (this.isAuthenticated()) {
-      this.router.navigate([`/registries/${environment.defaultProvider}/new`]);
-    } else {
-      this.authService.navigateToSignIn();
-    }
+    this.router.navigate([`/registries/${environment.defaultProvider}/new`]);
   }
 }
diff --git a/src/app/shared/components/registration-card/registration-card.component.html b/src/app/shared/components/registration-card/registration-card.component.html
index 947702a28..bcfe88d5f 100644
--- a/src/app/shared/components/registration-card/registration-card.component.html
+++ b/src/app/shared/components/registration-card/registration-card.component.html
@@ -68,7 +68,7 @@ <h2 class="align-self-center">
                   severity="danger"
                   [label]="'common.buttons.delete' | translate"
                   class="md:ml-auto"
-                  (click)="deleteDraft.emit(registrationData().id)"
+                  (onClick)="deleteDraft.emit(registrationData().id)"
                 ></p-button>
               } @else {
                 <p-button
@@ -81,14 +81,14 @@ <h2 class="align-self-center">
                   @if (isApproved) {
                     <p-button
                       severity="secondary"
-                      (click)="updateRegistration.emit(registrationData().id)"
+                      (onClick)="updateRegistration(registrationData().id)"
                       [label]="'common.buttons.update' | translate"
                     ></p-button>
                   }
                   @if (isInProgress || isUnapproved) {
                     <p-button
                       severity="secondary"
-                      (click)="continueUpdateHandler()"
+                      (onClick)="continueUpdateRegistration(registrationData().id)"
                       [label]="'common.buttons.continueUpdate' | translate"
                     ></p-button>
                   }
diff --git a/src/app/shared/components/registration-card/registration-card.component.ts b/src/app/shared/components/registration-card/registration-card.component.ts
index 733cb2197..498bab2e9 100644
--- a/src/app/shared/components/registration-card/registration-card.component.ts
+++ b/src/app/shared/components/registration-card/registration-card.component.ts
@@ -1,12 +1,17 @@
+import { createDispatchMap, select } from '@ngxs/store';
+
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
 import { Card } from 'primeng/card';
 
+import { tap } from 'rxjs';
+
 import { DatePipe } from '@angular/common';
-import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
-import { RouterLink } from '@angular/router';
+import { ChangeDetectionStrategy, Component, inject, input, output } from '@angular/core';
+import { Router, RouterLink } from '@angular/router';
 
+import { CreateSchemaResponse, FetchAllSchemaResponses, RegistriesSelectors } from '@osf/features/registries/store';
 import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@osf/shared/enums';
 import { RegistrationCard } from '@osf/shared/models';
 
@@ -37,8 +42,14 @@ export class RegistrationCardComponent {
   readonly isDraft = input<boolean>(false);
   readonly registrationData = input.required<RegistrationCard>();
   readonly deleteDraft = output<string>();
-  readonly updateRegistration = output<string>();
-  readonly continueUpdate = output<{ id: string; unapproved: boolean }>();
+
+  private router = inject(Router);
+  schemaResponse = select(RegistriesSelectors.getSchemaResponse);
+
+  actions = createDispatchMap({
+    getSchemaResponse: FetchAllSchemaResponses,
+    createSchemaResponse: CreateSchemaResponse,
+  });
 
   get isAccepted(): boolean {
     return this.registrationData().reviewsState === RegistrationReviewStates.Accepted;
@@ -60,10 +71,36 @@ export class RegistrationCardComponent {
     return this.registrationData().revisionState === RevisionReviewStates.RevisionInProgress;
   }
 
-  continueUpdateHandler(): void {
-    this.continueUpdate.emit({
-      id: this.registrationData().id,
-      unapproved: this.registrationData().revisionState === RevisionReviewStates.Unapproved,
-    });
+  updateRegistration(id: string): void {
+    this.actions
+      .createSchemaResponse(id)
+      .pipe(tap(() => this.navigateToJustificationPage()))
+      .subscribe();
+  }
+
+  continueUpdateRegistration(id: string): void {
+    const unapproved = this.registrationData().revisionState === RevisionReviewStates.Unapproved;
+    this.actions
+      .getSchemaResponse(id)
+      .pipe(
+        tap(() => {
+          if (unapproved) {
+            this.navigateToJustificationReview();
+          } else {
+            this.navigateToJustificationPage();
+          }
+        })
+      )
+      .subscribe();
+  }
+
+  private navigateToJustificationPage(): void {
+    const revisionId = this.schemaResponse()?.id;
+    this.router.navigate([`/registries/revisions/${revisionId}/justification`]);
+  }
+
+  private navigateToJustificationReview(): void {
+    const revisionId = this.schemaResponse()?.id;
+    this.router.navigate([`/registries/revisions/${revisionId}/review`]);
   }
 }

From f7b3e5e991cbcc75d3d192a46c7402eb487750a3 Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Thu, 11 Sep 2025 12:22:22 +0300
Subject: [PATCH 04/10] fix(registration): remove useless font class

---
 src/styles/_fonts.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss
index 05094edbc..5dab88fa3 100644
--- a/src/styles/_fonts.scss
+++ b/src/styles/_fonts.scss
@@ -39,7 +39,3 @@
   font-weight: 800;
   font-style: normal;
 }
-
-.font-primary {
-  font-family: "Open Sans", sans-serif;
-}

From 33796a91884b74e3d3a26d7dd39b2f74bc720f32 Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Thu, 11 Sep 2025 16:05:51 +0300
Subject: [PATCH 05/10] fix(subjects): refactor subjects for project and
 registration

---
 .../mappers/project-overview.mapper.ts        |  1 -
 .../models/project-overview.models.ts         |  7 -----
 .../overview/project-overview.component.ts    | 15 ++++++++--
 src/app/features/project/project.routes.ts    |  1 +
 .../get-resource-subjects-json-api.model.ts   |  3 --
 src/app/features/registry/models/index.ts     |  2 --
 .../models/registry-overview.models.ts        |  5 ++--
 .../registry/models/registry-subject.model.ts |  4 ---
 .../registry-overview.component.html          |  2 +-
 .../registry-overview.component.ts            | 21 +++++++++-----
 .../services/registry-overview.service.ts     | 13 ---------
 .../registry-overview.actions.ts              |  6 ----
 .../registry-overview.model.ts                |  8 +----
 .../registry-overview.selectors.ts            | 12 +-------
 .../registry-overview.state.ts                | 29 ++-----------------
 .../resource-metadata.component.html          |  2 +-
 .../mappers/resource-overview.mappers.ts      | 14 +++++----
 .../shared/mappers/subjects/subject-mapper.ts |  2 +-
 .../shared/models/resource-overview.model.ts  |  4 +--
 19 files changed, 49 insertions(+), 102 deletions(-)
 delete mode 100644 src/app/features/registry/models/get-resource-subjects-json-api.model.ts
 delete mode 100644 src/app/features/registry/models/registry-subject.model.ts

diff --git a/src/app/features/project/overview/mappers/project-overview.mapper.ts b/src/app/features/project/overview/mappers/project-overview.mapper.ts
index 2fe859310..7473ac0af 100644
--- a/src/app/features/project/overview/mappers/project-overview.mapper.ts
+++ b/src/app/features/project/overview/mappers/project-overview.mapper.ts
@@ -36,7 +36,6 @@ export class ProjectOverviewMapper {
       currentUserIsContributorOrGroupMember: response.attributes.current_user_is_contributor_or_group_member,
       wikiEnabled: response.attributes.wiki_enabled,
       customCitation: response.attributes.custom_citation,
-      subjects: response.attributes.subjects?.map((subjectArray) => subjectArray[0]),
       contributors:
         response.embeds.bibliographic_contributors?.data?.map((contributor) => ({
           id: contributor.embeds.users.data.id,
diff --git a/src/app/features/project/overview/models/project-overview.models.ts b/src/app/features/project/overview/models/project-overview.models.ts
index 3a4bda79b..64b632ba1 100644
--- a/src/app/features/project/overview/models/project-overview.models.ts
+++ b/src/app/features/project/overview/models/project-overview.models.ts
@@ -52,7 +52,6 @@ export interface ProjectOverview {
   currentUserIsContributor: boolean;
   currentUserIsContributorOrGroupMember: boolean;
   wikiEnabled: boolean;
-  subjects: ProjectOverviewSubject[];
   contributors: ProjectOverviewContributor[];
   customCitation: string | null;
   region?: IdTypeModel;
@@ -66,11 +65,6 @@ export interface ProjectOverview {
   rootParentId?: string;
 }
 
-export interface ProjectOverviewSubject {
-  id: string;
-  text: string;
-}
-
 export interface ProjectOverviewWithMeta {
   project: ProjectOverview;
   meta?: MetaAnonymousJsonApi;
@@ -104,7 +98,6 @@ export interface ProjectOverviewGetResponseJsonApi {
     current_user_is_contributor: boolean;
     current_user_is_contributor_or_group_member: boolean;
     wiki_enabled: boolean;
-    subjects: ProjectOverviewSubject[][];
     custom_citation: string | null;
   };
   embeds: {
diff --git a/src/app/features/project/overview/project-overview.component.ts b/src/app/features/project/overview/project-overview.component.ts
index 5513a813f..59827e4c2 100644
--- a/src/app/features/project/overview/project-overview.component.ts
+++ b/src/app/features/project/overview/project-overview.component.ts
@@ -40,12 +40,14 @@ import {
   ClearWiki,
   CollectionsSelectors,
   CurrentResourceSelectors,
+  FetchSelectedSubjects,
   GetBookmarksCollectionId,
   GetCollectionProvider,
   GetConfiguredStorageAddons,
   GetHomeWiki,
   GetLinkedResources,
   GetResourceWithChildren,
+  SubjectsSelectors,
 } from '@osf/shared/stores';
 import { GetActivityLogs } from '@osf/shared/stores/activity-logs';
 import {
@@ -119,6 +121,8 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
   isReviewActionsLoading = select(CollectionsModerationSelectors.getCurrentReviewActionLoading);
   components = select(CurrentResourceSelectors.getResourceWithChildren);
   areComponentsLoading = select(CurrentResourceSelectors.isResourceWithChildrenLoading);
+  subjects = select(SubjectsSelectors.getSelectedSubjects);
+  areSubjectsLoading = select(SubjectsSelectors.areSelectedSubjectsLoading);
 
   readonly activityPageSize = 5;
   readonly activityDefaultPage = 1;
@@ -141,6 +145,7 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
     getComponentsTree: GetResourceWithChildren,
     getRootFolders: GetRootFolders,
     getConfiguredStorageAddons: GetConfiguredStorageAddons,
+    getSubjects: FetchSelectedSubjects,
   });
 
   currentProject = select(ProjectOverviewSelectors.getProject);
@@ -178,14 +183,19 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
 
   resourceOverview = computed(() => {
     const project = this.currentProject();
+    const subjects = this.subjects();
     if (project) {
-      return MapProjectOverview(project, this.isAnonymous());
+      return MapProjectOverview(project, subjects, this.isAnonymous());
     }
     return null;
   });
 
   isLoading = computed(
-    () => this.isProjectLoading() || this.isCollectionProviderLoading() || this.isReviewActionsLoading()
+    () =>
+      this.isProjectLoading() ||
+      this.isCollectionProviderLoading() ||
+      this.isReviewActionsLoading() ||
+      this.areSubjectsLoading()
   );
 
   currentResource = computed(() => {
@@ -221,6 +231,7 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
       if (currentProject) {
         const rootParentId = currentProject.rootParentId ?? currentProject.id;
         this.actions.getComponentsTree(rootParentId, currentProject.id, ResourceType.Project);
+        this.actions.getSubjects(currentProject.id, ResourceType.Project);
       }
     });
   }
diff --git a/src/app/features/project/project.routes.ts b/src/app/features/project/project.routes.ts
index bf93b0e7d..7326c49a5 100644
--- a/src/app/features/project/project.routes.ts
+++ b/src/app/features/project/project.routes.ts
@@ -45,6 +45,7 @@ export const projectRoutes: Routes = [
             CollectionsState,
             CollectionsModerationState,
             ActivityLogsState,
+            SubjectsState,
           ]),
         ],
       },
diff --git a/src/app/features/registry/models/get-resource-subjects-json-api.model.ts b/src/app/features/registry/models/get-resource-subjects-json-api.model.ts
deleted file mode 100644
index 9cee066aa..000000000
--- a/src/app/features/registry/models/get-resource-subjects-json-api.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { ApiData, JsonApiResponse } from '@shared/models';
-
-export type GetResourceSubjectsJsonApi = JsonApiResponse<ApiData<{ text: string }, null, null, null>[], null>;
diff --git a/src/app/features/registry/models/index.ts b/src/app/features/registry/models/index.ts
index fcf6c2b48..7d096d036 100644
--- a/src/app/features/registry/models/index.ts
+++ b/src/app/features/registry/models/index.ts
@@ -1,6 +1,5 @@
 export * from './bibliographic-contributors.models';
 export * from './get-registry-overview-json-api.model';
-export * from './get-resource-subjects-json-api.model';
 export * from './linked-nodes.models';
 export * from './linked-nodes-json-api.model';
 export * from './linked-registrations-json-api.model';
@@ -10,5 +9,4 @@ export * from './registry-components-json-api.model';
 export * from './registry-contributor-json-api.model';
 export * from './registry-metadata.models';
 export * from './registry-overview.models';
-export * from './registry-subject.model';
 export * from './resources';
diff --git a/src/app/features/registry/models/registry-overview.models.ts b/src/app/features/registry/models/registry-overview.models.ts
index 778b13fad..59aeb0e17 100644
--- a/src/app/features/registry/models/registry-overview.models.ts
+++ b/src/app/features/registry/models/registry-overview.models.ts
@@ -1,5 +1,5 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
-import { RegistrationQuestions, RegistrySubject } from '@osf/features/registry/models';
+import { RegistrationQuestions } from '@osf/features/registry/models';
 import {
   IdTypeModel,
   LicenseModel,
@@ -7,6 +7,7 @@ import {
   MetaAnonymousJsonApi,
   ProviderModel,
   SchemaResponse,
+  SubjectModel,
 } from '@osf/shared/models';
 import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@shared/enums';
 
@@ -45,7 +46,7 @@ export interface RegistryOverview {
   currentUserIsContributorOrGroupMember: boolean;
   wikiEnabled: boolean;
   region?: IdTypeModel;
-  subjects?: RegistrySubject[];
+  subjects?: SubjectModel[];
   customCitation: string;
   hasData: boolean;
   hasAnalyticCode: boolean;
diff --git a/src/app/features/registry/models/registry-subject.model.ts b/src/app/features/registry/models/registry-subject.model.ts
deleted file mode 100644
index 19f1c6c07..000000000
--- a/src/app/features/registry/models/registry-subject.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface RegistrySubject {
-  id: string;
-  text: string;
-}
diff --git a/src/app/features/registry/pages/registry-overview/registry-overview.component.html b/src/app/features/registry/pages/registry-overview/registry-overview.component.html
index 00d7ee9d4..52f18d280 100644
--- a/src/app/features/registry/pages/registry-overview/registry-overview.component.html
+++ b/src/app/features/registry/pages/registry-overview/registry-overview.component.html
@@ -1,4 +1,4 @@
-@if (!isRegistryLoading() && !isSubjectsLoading() && !isInstitutionsLoading() && !isSchemaBlocksLoading()) {
+@if (!isLoading()) {
   <div
     class="flex flex-column justify-content-center flex-wrap md:flex-row md:justify-content-between md:align-items-center"
   >
diff --git a/src/app/features/registry/pages/registry-overview/registry-overview.component.ts b/src/app/features/registry/pages/registry-overview/registry-overview.component.ts
index ef6f6d95a..9c67b8a16 100644
--- a/src/app/features/registry/pages/registry-overview/registry-overview.component.ts
+++ b/src/app/features/registry/pages/registry-overview/registry-overview.component.ts
@@ -26,7 +26,7 @@ import { hasViewOnlyParam, toCamelCase } from '@osf/shared/helpers';
 import { MapRegistryOverview } from '@osf/shared/mappers';
 import { SchemaResponse, ToolbarResource } from '@osf/shared/models';
 import { ToastService } from '@osf/shared/services';
-import { GetBookmarksCollectionId } from '@osf/shared/stores';
+import { FetchSelectedSubjects, GetBookmarksCollectionId, SubjectsSelectors } from '@osf/shared/stores';
 import { ViewOnlyLinkMessageComponent } from '@shared/components/view-only-link-message/view-only-link-message.component';
 
 import { ArchivingMessageComponent, RegistryRevisionsComponent, RegistryStatusesComponent } from '../../components';
@@ -36,7 +36,6 @@ import {
   GetRegistryById,
   GetRegistryInstitutions,
   GetRegistryReviewActions,
-  GetRegistrySubjects,
   RegistryOverviewSelectors,
   SetRegistryCustomCitation,
 } from '../../store/registry-overview';
@@ -76,8 +75,8 @@ export class RegistryOverviewComponent {
   readonly registry = select(RegistryOverviewSelectors.getRegistry);
   readonly isRegistryLoading = select(RegistryOverviewSelectors.isRegistryLoading);
   readonly isAnonymous = select(RegistryOverviewSelectors.isRegistryAnonymous);
-  readonly subjects = select(RegistryOverviewSelectors.getSubjects);
-  readonly isSubjectsLoading = select(RegistryOverviewSelectors.isSubjectsLoading);
+  readonly subjects = select(SubjectsSelectors.getSelectedSubjects);
+  readonly areSubjectsLoading = select(SubjectsSelectors.areSelectedSubjectsLoading);
   readonly institutions = select(RegistryOverviewSelectors.getInstitutions);
   readonly isInstitutionsLoading = select(RegistryOverviewSelectors.isInstitutionsLoading);
   readonly schemaBlocks = select(RegistryOverviewSelectors.getSchemaBlocks);
@@ -87,6 +86,15 @@ export class RegistryOverviewComponent {
   readonly isSchemaResponseLoading = select(RegistriesSelectors.getSchemaResponseLoading);
   revisionInProgress: SchemaResponse | undefined;
 
+  isLoading = computed(
+    () =>
+      this.isRegistryLoading() ||
+      this.isInstitutionsLoading() ||
+      this.isSchemaBlocksLoading() ||
+      this.isSchemaResponseLoading() ||
+      this.areSubjectsLoading()
+  );
+
   readonly schemaResponse = computed(() => {
     const registry = this.registry();
     const index = this.selectedRevisionIndex();
@@ -141,7 +149,7 @@ export class RegistryOverviewComponent {
   private readonly actions = createDispatchMap({
     getRegistryById: GetRegistryById,
     getBookmarksId: GetBookmarksCollectionId,
-    getSubjects: GetRegistrySubjects,
+    getSubjects: FetchSelectedSubjects,
     getInstitutions: GetRegistryInstitutions,
     setCustomCitation: SetRegistryCustomCitation,
     getRegistryReviewActions: GetRegistryReviewActions,
@@ -179,7 +187,7 @@ export class RegistryOverviewComponent {
               return !this.registry()?.withdrawn;
             }),
             tap(() => {
-              this.actions.getSubjects(id);
+              this.actions.getSubjects(id, ResourceType.Registration);
               this.actions.getInstitutions(id);
             })
           )
@@ -201,7 +209,6 @@ export class RegistryOverviewComponent {
   }
 
   navigateToFile(fileId: string): void {
-    // [NM] TODO: add logic to handle fileId
     this.router.navigate(['/files', fileId]);
   }
 
diff --git a/src/app/features/registry/services/registry-overview.service.ts b/src/app/features/registry/services/registry-overview.service.ts
index 3d7b12a01..f06a96364 100644
--- a/src/app/features/registry/services/registry-overview.service.ts
+++ b/src/app/features/registry/services/registry-overview.service.ts
@@ -7,11 +7,9 @@ import { ReviewAction, ReviewActionsResponseJsonApi } from '@osf/features/modera
 import { MapRegistryOverview } from '@osf/features/registry/mappers';
 import {
   GetRegistryOverviewJsonApi,
-  GetResourceSubjectsJsonApi,
   RegistryOverview,
   RegistryOverviewJsonApiData,
   RegistryOverviewWithMeta,
-  RegistrySubject,
 } from '@osf/features/registry/models';
 import { InstitutionsMapper, ReviewActionsMapper } from '@osf/shared/mappers';
 import { PageSchemaMapper } from '@osf/shared/mappers/registration';
@@ -48,17 +46,6 @@ export class RegistryOverviewService {
       .pipe(map((response) => ({ registry: MapRegistryOverview(response.data), meta: response.meta })));
   }
 
-  getSubjects(registryId: string): Observable<RegistrySubject[]> {
-    const params = {
-      'page[size]': 100,
-      page: 1,
-    };
-
-    return this.jsonApiService
-      .get<GetResourceSubjectsJsonApi>(`${this.apiUrl}/registrations/${registryId}/subjects/`, params)
-      .pipe(map((response) => response.data.map((subject) => ({ id: subject.id, text: subject.attributes.text }))));
-  }
-
   getInstitutions(registryId: string): Observable<Institution[]> {
     const params = {
       'page[size]': 100,
diff --git a/src/app/features/registry/store/registry-overview/registry-overview.actions.ts b/src/app/features/registry/store/registry-overview/registry-overview.actions.ts
index 99d42c047..e412a254c 100644
--- a/src/app/features/registry/store/registry-overview/registry-overview.actions.ts
+++ b/src/app/features/registry/store/registry-overview/registry-overview.actions.ts
@@ -10,12 +10,6 @@ export class GetRegistryById {
   ) {}
 }
 
-export class GetRegistrySubjects {
-  static readonly type = '[Registry Overview] Get Registry Subjects';
-
-  constructor(public registryId: string) {}
-}
-
 export class GetRegistryInstitutions {
   static readonly type = '[Registry Overview] Get Registry Institutions';
 
diff --git a/src/app/features/registry/store/registry-overview/registry-overview.model.ts b/src/app/features/registry/store/registry-overview/registry-overview.model.ts
index f242d3f17..ebf0c081e 100644
--- a/src/app/features/registry/store/registry-overview/registry-overview.model.ts
+++ b/src/app/features/registry/store/registry-overview/registry-overview.model.ts
@@ -1,11 +1,10 @@
 import { ReviewAction } from '@osf/features/moderation/models';
-import { RegistryOverview, RegistrySubject } from '@osf/features/registry/models';
+import { RegistryOverview } from '@osf/features/registry/models';
 import { Institution, PageSchema } from '@osf/shared/models';
 import { AsyncStateModel } from '@shared/models';
 
 export interface RegistryOverviewStateModel {
   registry: AsyncStateModel<RegistryOverview | null>;
-  subjects: AsyncStateModel<RegistrySubject[] | null>;
   institutions: AsyncStateModel<Institution[] | null>;
   schemaBlocks: AsyncStateModel<PageSchema[] | null>;
   moderationActions: AsyncStateModel<ReviewAction[]>;
@@ -18,11 +17,6 @@ export const REGISTRY_OVERVIEW_DEFAULTS: RegistryOverviewStateModel = {
     isLoading: false,
     error: null,
   },
-  subjects: {
-    data: [],
-    isLoading: false,
-    error: null,
-  },
   institutions: {
     data: [],
     isLoading: false,
diff --git a/src/app/features/registry/store/registry-overview/registry-overview.selectors.ts b/src/app/features/registry/store/registry-overview/registry-overview.selectors.ts
index be11689a5..60ce06083 100644
--- a/src/app/features/registry/store/registry-overview/registry-overview.selectors.ts
+++ b/src/app/features/registry/store/registry-overview/registry-overview.selectors.ts
@@ -1,7 +1,7 @@
 import { Selector } from '@ngxs/store';
 
 import { ReviewAction } from '@osf/features/moderation/models';
-import { RegistryOverview, RegistrySubject } from '@osf/features/registry/models';
+import { RegistryOverview } from '@osf/features/registry/models';
 import { Institution, PageSchema } from '@osf/shared/models';
 
 import { RegistryOverviewStateModel } from './registry-overview.model';
@@ -23,16 +23,6 @@ export class RegistryOverviewSelectors {
     return state.isAnonymous;
   }
 
-  @Selector([RegistryOverviewState])
-  static getSubjects(state: RegistryOverviewStateModel): RegistrySubject[] | null {
-    return state.subjects.data;
-  }
-
-  @Selector([RegistryOverviewState])
-  static isSubjectsLoading(state: RegistryOverviewStateModel): boolean {
-    return state.subjects.isLoading;
-  }
-
   @Selector([RegistryOverviewState])
   static getInstitutions(state: RegistryOverviewStateModel): Institution[] | null {
     return state.institutions.data;
diff --git a/src/app/features/registry/store/registry-overview/registry-overview.state.ts b/src/app/features/registry/store/registry-overview/registry-overview.state.ts
index de1507a47..b940a59e0 100644
--- a/src/app/features/registry/store/registry-overview/registry-overview.state.ts
+++ b/src/app/features/registry/store/registry-overview/registry-overview.state.ts
@@ -8,6 +8,7 @@ import { inject, Injectable } from '@angular/core';
 import { SetCurrentProvider } from '@osf/core/store/provider/provider.actions';
 import { SetUserAsModerator } from '@osf/core/store/user';
 import { handleSectionError } from '@osf/shared/helpers';
+import { SubjectsService } from '@osf/shared/services';
 
 import { RegistryOverviewService } from '../../services';
 
@@ -16,7 +17,6 @@ import {
   GetRegistryById,
   GetRegistryInstitutions,
   GetRegistryReviewActions,
-  GetRegistrySubjects,
   GetSchemaBlocks,
   MakePublic,
   SetRegistryCustomCitation,
@@ -32,6 +32,7 @@ import { REGISTRY_OVERVIEW_DEFAULTS, RegistryOverviewStateModel } from './regist
 })
 export class RegistryOverviewState {
   private readonly registryOverviewService = inject(RegistryOverviewService);
+  private readonly subjectsService = inject(SubjectsService);
 
   @Action(GetRegistryById)
   getRegistryById(ctx: StateContext<RegistryOverviewStateModel>, action: GetRegistryById) {
@@ -70,32 +71,6 @@ export class RegistryOverviewState {
     );
   }
 
-  @Action(GetRegistrySubjects)
-  getRegistrySubjects(ctx: StateContext<RegistryOverviewStateModel>, action: GetRegistrySubjects) {
-    const state = ctx.getState();
-    ctx.patchState({
-      subjects: {
-        ...state.subjects,
-        isLoading: true,
-      },
-    });
-
-    return this.registryOverviewService.getSubjects(action.registryId).pipe(
-      tap({
-        next: (subjects) => {
-          ctx.patchState({
-            subjects: {
-              data: subjects,
-              isLoading: false,
-              error: null,
-            },
-          });
-        },
-      }),
-      catchError((error) => handleSectionError(ctx, 'subjects', error))
-    );
-  }
-
   @Action(GetRegistryInstitutions)
   getRegistryInstitutions(ctx: StateContext<RegistryOverviewStateModel>, action: GetRegistryInstitutions) {
     const state = ctx.getState();
diff --git a/src/app/shared/components/resource-metadata/resource-metadata.component.html b/src/app/shared/components/resource-metadata/resource-metadata.component.html
index 7a13b18f4..7d6c4bb15 100644
--- a/src/app/shared/components/resource-metadata/resource-metadata.component.html
+++ b/src/app/shared/components/resource-metadata/resource-metadata.component.html
@@ -136,7 +136,7 @@ <h3>{{ 'project.overview.metadata.subjects' | translate }}</h3>
       <div class="flex flex-wrap gap-2">
         @if (resource.subjects.length) {
           @for (subject of resource.subjects; track subject.id) {
-            <p-tag [value]="subject.text" severity="info" />
+            <p-tag [value]="subject.name" severity="info" />
           }
         } @else {
           <p>{{ 'project.overview.metadata.noSubjects' | translate }}</p>
diff --git a/src/app/shared/mappers/resource-overview.mappers.ts b/src/app/shared/mappers/resource-overview.mappers.ts
index dbe839be6..dd446e27b 100644
--- a/src/app/shared/mappers/resource-overview.mappers.ts
+++ b/src/app/shared/mappers/resource-overview.mappers.ts
@@ -1,9 +1,13 @@
 import { ProjectOverview } from '@osf/features/project/overview/models';
-import { RegistryOverview, RegistrySubject } from '@osf/features/registry/models';
+import { RegistryOverview } from '@osf/features/registry/models';
 
-import { Institution, ResourceOverview } from '../models';
+import { Institution, ResourceOverview, SubjectModel } from '../models';
 
-export function MapProjectOverview(project: ProjectOverview, isAnonymous = false): ResourceOverview {
+export function MapProjectOverview(
+  project: ProjectOverview,
+  subjects: SubjectModel[],
+  isAnonymous = false
+): ResourceOverview {
   return {
     id: project.id,
     type: project.type,
@@ -30,7 +34,7 @@ export function MapProjectOverview(project: ProjectOverview, isAnonymous = false
     currentUserIsContributor: project.currentUserIsContributor,
     currentUserIsContributorOrGroupMember: project.currentUserIsContributorOrGroupMember,
     wikiEnabled: project.wikiEnabled,
-    subjects: project.subjects?.filter(Boolean) || [],
+    subjects: subjects,
     contributors: project.contributors?.filter(Boolean) || [],
     customCitation: project.customCitation || null,
     region: project.region || undefined,
@@ -43,7 +47,7 @@ export function MapProjectOverview(project: ProjectOverview, isAnonymous = false
 
 export function MapRegistryOverview(
   registry: RegistryOverview,
-  subjects: RegistrySubject[],
+  subjects: SubjectModel[],
   institutions: Institution[],
   isAnonymous = false
 ): ResourceOverview {
diff --git a/src/app/shared/mappers/subjects/subject-mapper.ts b/src/app/shared/mappers/subjects/subject-mapper.ts
index 92ca1cfed..2f36bff8e 100644
--- a/src/app/shared/mappers/subjects/subject-mapper.ts
+++ b/src/app/shared/mappers/subjects/subject-mapper.ts
@@ -2,7 +2,7 @@ import { SubjectDataJsonApi, SubjectModel, SubjectsResponseJsonApi } from '@shar
 
 export class SubjectMapper {
   static fromSubjectsResponseJsonApi(response: SubjectsResponseJsonApi): SubjectModel[] {
-    return response.data.map((data) => {
+    return response?.data.map((data) => {
       const subject: SubjectModel = {
         id: data.id,
         name: data.attributes.text,
diff --git a/src/app/shared/models/resource-overview.model.ts b/src/app/shared/models/resource-overview.model.ts
index 65435d747..9e5b1c722 100644
--- a/src/app/shared/models/resource-overview.model.ts
+++ b/src/app/shared/models/resource-overview.model.ts
@@ -1,9 +1,9 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
-import { RegistrySubject } from '@osf/features/registry/models';
 
 import { IdTypeModel } from './common';
 import { Institution } from './institutions';
 import { LicensesOption } from './license.model';
+import { SubjectModel } from './subject';
 
 export interface ResourceOverview {
   id: string;
@@ -53,7 +53,7 @@ export interface ResourceOverview {
   currentUserIsContributor: boolean;
   currentUserIsContributorOrGroupMember: boolean;
   wikiEnabled: boolean;
-  subjects: RegistrySubject[];
+  subjects: SubjectModel[];
   contributors: ProjectOverviewContributor[];
   customCitation: string | null;
   region?: IdTypeModel;

From 0041ffc68ddfda18a16545c5e1c3c0ab7e21ef76 Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Thu, 11 Sep 2025 23:42:40 +0300
Subject: [PATCH 06/10] fix(subjects): fixed subjects search

---
 .../metadata-step.component.html              |  2 +-
 .../registries-license.component.html         |  2 +-
 src/app/features/registry/registry.routes.ts  |  2 +-
 .../subjects/subjects.component.html          |  2 +
 .../components/subjects/subjects.component.ts | 49 +++++++++++++++++--
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html
index 552394153..1e2736c74 100644
--- a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html
+++ b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html
@@ -10,7 +10,7 @@ <h2 class="mb-2">{{ 'shared.license.title' | translate }}</h2>
   <p class="mb-1">{{ 'shared.license.description' | translate }}</p>
   <p>
     {{ 'shared.license.helpText' | translate }}
-    <a href="https://help.osf.io/article/148-licensing">{{ 'common.links.helpGuide' | translate }}</a
+    <a href="https://help.osf.io/article/148-licensing" target="_blank">{{ 'common.links.helpGuide' | translate }}</a
     >.
   </p>
   <osf-license
diff --git a/src/app/features/registries/components/metadata/registries-license/registries-license.component.html b/src/app/features/registries/components/metadata/registries-license/registries-license.component.html
index 2a0123131..3f94d45df 100644
--- a/src/app/features/registries/components/metadata/registries-license/registries-license.component.html
+++ b/src/app/features/registries/components/metadata/registries-license/registries-license.component.html
@@ -4,7 +4,7 @@ <h2 class="mb-2">{{ 'shared.license.title' | translate }}</h2>
   <p class="mb-1">{{ 'shared.license.description' | translate }}</p>
   <p>
     {{ 'shared.license.helpText' | translate }}
-    <a href="https://help.osf.io/article/148-licensing">{{ 'common.links.helpGuide' | translate }}</a
+    <a href="https://help.osf.io/article/148-licensing" target="_blank">{{ 'common.links.helpGuide' | translate }}</a
     >.
   </p>
   <osf-license
diff --git a/src/app/features/registry/registry.routes.ts b/src/app/features/registry/registry.routes.ts
index 22da6cde0..23a05095d 100644
--- a/src/app/features/registry/registry.routes.ts
+++ b/src/app/features/registry/registry.routes.ts
@@ -40,7 +40,7 @@ export const registryRoutes: Routes = [
         loadComponent: () =>
           import('./pages/registry-overview/registry-overview.component').then((c) => c.RegistryOverviewComponent),
         providers: [
-          provideStates([RegistriesState, CitationsState]),
+          provideStates([RegistriesState, SubjectsState, CitationsState]),
           ProvidersHandlers,
           ProjectsHandlers,
           LicensesHandlers,
diff --git a/src/app/shared/components/subjects/subjects.component.html b/src/app/shared/components/subjects/subjects.component.html
index 39fc1c960..e91393d6e 100644
--- a/src/app/shared/components/subjects/subjects.component.html
+++ b/src/app/shared/components/subjects/subjects.component.html
@@ -39,7 +39,9 @@ <h2 class="mb-2">{{ 'shared.subjects.title' | translate }}</h2>
             <p-checkbox
               [inputId]="'subjects-' + $index"
               [value]="subjects"
+              [ngModel]="isChecked(subjects)"
               (onChange)="selectSearched($event, subjects)"
+              [binary]="true"
             />
             <label for="subjects-{{ $index }}" class="flex flex-wrap ml-2">
               @for (item of subjects; track item.id) {
diff --git a/src/app/shared/components/subjects/subjects.component.ts b/src/app/shared/components/subjects/subjects.component.ts
index d87b132d5..2a4daee4e 100644
--- a/src/app/shared/components/subjects/subjects.component.ts
+++ b/src/app/shared/components/subjects/subjects.component.ts
@@ -12,7 +12,7 @@ import { Tree, TreeModule } from 'primeng/tree';
 import { debounceTime, distinctUntilChanged } from 'rxjs';
 
 import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
-import { FormControl } from '@angular/forms';
+import { FormControl, FormsModule } from '@angular/forms';
 
 import { SubjectModel } from '@osf/shared/models';
 import { SubjectsSelectors } from '@shared/stores';
@@ -21,7 +21,7 @@ import { SearchInputComponent } from '../search-input/search-input.component';
 
 @Component({
   selector: 'osf-subjects',
-  imports: [Card, TranslatePipe, Chip, SearchInputComponent, Tree, TreeModule, Checkbox, Skeleton],
+  imports: [Card, TranslatePipe, Chip, SearchInputComponent, Tree, TreeModule, Checkbox, Skeleton, FormsModule],
   templateUrl: './subjects.component.html',
   styleUrl: './subjects.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -43,6 +43,9 @@ export class SubjectsComponent {
   searchedList = computed(() =>
     this.searchedSubjects().map((subject: SubjectModel) => this.mapParentsSubject(subject))
   );
+
+  childrenIdsMap = computed(() => this.buildChildrenIdsMap(this.searchedSubjects()));
+
   expanded: Record<string, boolean> = {};
 
   searchControl = new FormControl<string>('');
@@ -91,13 +94,24 @@ export class SubjectsComponent {
     if (this.readonly()) return;
 
     if (event.checked) {
-      this.updateSelection.emit([...this.selected(), ...subjects]);
+      const map = new Map<string, SubjectModel>();
+      [...this.selected(), ...subjects].forEach((subject) => map.set(subject.id, subject));
+      this.updateSelection.emit([...map.values()]);
     } else {
-      const updatedSelection = this.selected().filter((s) => !subjects.some((sub) => sub.id === s.id));
+      const currentSubject = subjects[subjects.length - 1];
+      const childrenIds = this.childrenIdsMap()[currentSubject.id] ?? [];
+      const updatedSelection = this.selected().filter((s) => s.id !== currentSubject.id && !childrenIds.includes(s.id));
       this.updateSelection.emit(updatedSelection);
     }
   }
 
+  isChecked(subjects: SubjectModel[]): boolean {
+    if (!subjects?.length) return false;
+
+    const selectedIds = new Set(this.selected().map((s) => s.id));
+    return subjects.every((s) => selectedIds.has(s.id));
+  }
+
   private getChildrenIds(subjects: SubjectModel[]): string[] {
     return subjects.reduce((acc: string[], subject: SubjectModel) => {
       acc.push(subject.id);
@@ -127,4 +141,31 @@ export class SubjectsComponent {
     acc.push(subject);
     return this.mapParentsSubject(subject.parent, acc);
   }
+
+  private buildChildrenIdsMap(subjects: SubjectModel[]): Record<string, string[]> {
+    const groupedByParent = new Map<string, SubjectModel[]>();
+    subjects.forEach((s) => {
+      if (s.parent?.id) {
+        const arr = groupedByParent.get(s.parent.id) ?? [];
+        arr.push(s);
+        groupedByParent.set(s.parent.id, arr);
+      }
+    });
+
+    const collectChildrenIds = (id: string): string[] => {
+      const children = groupedByParent.get(id) ?? [];
+      const ids = children.map((c) => c.id);
+      for (const child of children) {
+        ids.push(...collectChildrenIds(child.id));
+      }
+      return ids;
+    };
+
+    const result: Record<string, string[]> = {};
+    subjects.forEach((s) => {
+      result[s.id] = collectChildrenIds(s.id);
+    });
+
+    return result;
+  }
 }

From 0a0ca6d2c8979bed8a8cf4550019c14f6b32da4d Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Fri, 12 Sep 2025 13:55:57 +0300
Subject: [PATCH 07/10] fix(bugs): fixed 426

---
 .../collections-main-content.component.html   |  4 ++--
 .../edit-file-metadata-dialog.component.html  |  1 +
 .../edit-file-metadata-dialog.component.ts    | 16 +++++++++++--
 .../file-metadata.component.html              |  6 +++--
 .../file-metadata/file-metadata.component.ts  | 11 +++++++++
 .../file-detail/file-detail.component.html    | 23 +++++++++++++++----
 .../metadata-description.component.html       |  4 +++-
 .../metadata-funding.component.html           |  7 +++---
 .../metadata-funding.component.ts             |  3 ++-
 .../description-dialog.component.html         | 14 +++++++++--
 .../funding-dialog.component.html             |  9 ++++++--
 .../funding-dialog.component.ts               | 15 ++++++++----
 ...resource-information-dialog.component.html |  4 +++-
 src/styles/overrides/button.scss              |  2 +-
 14 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/src/app/features/collections/components/collections-main-content/collections-main-content.component.html b/src/app/features/collections/components/collections-main-content/collections-main-content.component.html
index 90b8855ed..5d814e0bb 100644
--- a/src/app/features/collections/components/collections-main-content/collections-main-content.component.html
+++ b/src/app/features/collections/components/collections-main-content/collections-main-content.component.html
@@ -31,9 +31,9 @@ <h3 class="highlight">{{ 'collections.searchResults.noResults' | translate }}</h
         </ng-template>
       </p-select>
     } @else {
-      <p-button severity="secondary" icon="fas fa-sliders" size="large" (click)="openFilters()"></p-button>
+      <p-button severity="secondary" icon="fas fa-sliders" class="btn-icon-only" (click)="openFilters()"></p-button>
 
-      <p-button severity="secondary" icon="fas fa-filter" size="large" (click)="openSorting()"></p-button>
+      <p-button severity="secondary" icon="fas fa-filter" class="btn-icon-only" (click)="openSorting()"></p-button>
     }
   </div>
 </div>
diff --git a/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.html b/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.html
index 3916e08d1..52c028fc7 100644
--- a/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.html
+++ b/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.html
@@ -32,6 +32,7 @@
       [formControl]="resourceLanguageControl"
       [filter]="true"
       filterBy="name"
+      appendTo="body"
       [showClear]="true"
       [virtualScroll]="true"
       [virtualScrollItemSize]="35"
diff --git a/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts b/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts
index 68b7f6c11..9df90edab 100644
--- a/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts
+++ b/src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts
@@ -1,7 +1,7 @@
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
-import { DynamicDialogRef } from 'primeng/dynamicdialog';
+import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 import { InputText } from 'primeng/inputtext';
 import { Select } from 'primeng/select';
 
@@ -10,7 +10,7 @@ import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
 
 import { languageCodes, resourceTypes } from '@osf/shared/constants';
 
-import { PatchFileMetadata } from '../../models';
+import { OsfFileCustomMetadata, PatchFileMetadata } from '../../models';
 
 @Component({
   selector: 'osf-edit-file-metadata-dialog',
@@ -24,6 +24,7 @@ export class EditFileMetadataDialogComponent {
   readonly languages = languageCodes;
 
   private readonly dialogRef = inject(DynamicDialogRef);
+  readonly config = inject(DynamicDialogConfig);
 
   fileMetadataForm = new FormGroup({
     title: new FormControl<string | null>(null),
@@ -32,6 +33,17 @@ export class EditFileMetadataDialogComponent {
     resourceLanguage: new FormControl<string | null>(null),
   });
 
+  constructor() {
+    const fileMetadata = this.config.data as OsfFileCustomMetadata;
+
+    this.fileMetadataForm.patchValue({
+      title: fileMetadata.title,
+      description: fileMetadata.description,
+      resourceType: fileMetadata.resourceTypeGeneral,
+      resourceLanguage: fileMetadata.language,
+    });
+  }
+
   get titleControl(): FormControl<string | null> {
     return this.fileMetadataForm.get('title') as FormControl<string | null>;
   }
diff --git a/src/app/features/files/components/file-metadata/file-metadata.component.html b/src/app/features/files/components/file-metadata/file-metadata.component.html
index 581576b68..868f4fbd1 100644
--- a/src/app/features/files/components/file-metadata/file-metadata.component.html
+++ b/src/app/features/files/components/file-metadata/file-metadata.component.html
@@ -3,7 +3,7 @@
     <h2>{{ 'files.detail.fileMetadata.title' | translate }}</h2>
 
     <div class="flex gap-2">
-      <p-button severity="secondary" icon="fas fa-download" (click)="downloadFileMetadata()" />
+      <p-button severity="secondary" class="btn-icon-only" icon="fas fa-download" (click)="downloadFileMetadata()" />
 
       <p-button
         severity="secondary"
@@ -23,7 +23,9 @@ <h2>{{ 'files.detail.fileMetadata.title' | translate }}</h2>
       @if (fileMetadata()?.[field.key]) {
         <div class="flex flex-column gap-2">
           <h4>{{ field.label | translate }}</h4>
-          <p>{{ fileMetadata()?.[field.key] }}</p>
+          <p>
+            {{ field.key === 'language' ? getLanguageName(fileMetadata()?.[field.key]!) : fileMetadata()?.[field.key] }}
+          </p>
         </div>
       }
     }
diff --git a/src/app/features/files/components/file-metadata/file-metadata.component.ts b/src/app/features/files/components/file-metadata/file-metadata.component.ts
index 0e87413ed..cd7ec7d92 100644
--- a/src/app/features/files/components/file-metadata/file-metadata.component.ts
+++ b/src/app/features/files/components/file-metadata/file-metadata.component.ts
@@ -12,6 +12,9 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
 
+import { languageCodes } from '@osf/shared/constants';
+import { LanguageCodeModel } from '@osf/shared/models';
+
 import { FileMetadataFields } from '../../constants';
 import { PatchFileMetadata } from '../../models';
 import { FilesSelectors, SetFileMetadata } from '../../store';
@@ -36,6 +39,8 @@ export class FileMetadataComponent {
   fileMetadata = select(FilesSelectors.getFileCustomMetadata);
   isLoading = select(FilesSelectors.isFileMetadataLoading);
 
+  readonly languageCodes = languageCodes;
+
   readonly fileGuid = toSignal(this.route.params.pipe(map((params) => params['fileGuid'])) ?? of(undefined));
 
   metadataFields = FileMetadataFields;
@@ -54,6 +59,11 @@ export class FileMetadataComponent {
     }
   }
 
+  getLanguageName(languageCode: string): string {
+    const language = this.languageCodes.find((lang: LanguageCodeModel) => lang.code === languageCode);
+    return language ? language.name : languageCode;
+  }
+
   openEditFileMetadataDialog() {
     this.dialogService
       .open(EditFileMetadataDialogComponent, {
@@ -63,6 +73,7 @@ export class FileMetadataComponent {
         closeOnEscape: true,
         modal: true,
         closable: true,
+        data: this.fileMetadata(),
       })
       .onClose.pipe(filter((res: PatchFileMetadata) => !!res))
       .subscribe((res) => this.setFileMetadata(res));
diff --git a/src/app/features/files/pages/file-detail/file-detail.component.html b/src/app/features/files/pages/file-detail/file-detail.component.html
index f20b65a42..ffc24acfc 100644
--- a/src/app/features/files/pages/file-detail/file-detail.component.html
+++ b/src/app/features/files/pages/file-detail/file-detail.component.html
@@ -27,11 +27,21 @@
       }
 
       @if (file()?.links?.download) {
-        <p-button severity="secondary" icon="fas fa-download" (click)="downloadFile(file()?.links?.download!)" />
+        <p-button
+          severity="secondary"
+          class="btn-icon-only"
+          icon="fas fa-download"
+          (click)="downloadFile(file()?.links?.download!)"
+        />
       }
       @if (file()?.links?.render) {
         <div class="relative">
-          <p-button severity="secondary" icon="fas fa-file-import" (click)="embedMenu.toggle($event)" />
+          <p-button
+            severity="secondary"
+            class="btn-icon-only"
+            icon="fas fa-file-import"
+            (click)="embedMenu.toggle($event)"
+          />
 
           <p-menu appendTo="body" [model]="embedItems" popup #embedMenu>
             <ng-template #item let-item>
@@ -42,7 +52,12 @@
       }
       @if (file()?.links?.html) {
         <div class="relative">
-          <p-button severity="secondary" icon="fas fa-share-nodes" (click)="shareMenu.toggle($event)" />
+          <p-button
+            severity="secondary"
+            class="btn-icon-only"
+            icon="fas fa-share-nodes"
+            (click)="shareMenu.toggle($event)"
+          />
 
           <p-menu appendTo="body" [model]="shareItems" popup #shareMenu>
             <ng-template #item let-item>
@@ -52,7 +67,7 @@
         </div>
       }
       @if (file() && !isAnonymous()) {
-        <p-button severity="danger" icon="fas fa-trash" (click)="confirmDelete(file()!)" />
+        <p-button severity="danger" class="btn-icon-only" icon="fas fa-trash" (click)="confirmDelete(file()!)" />
       }
     </div>
   </div>
diff --git a/src/app/features/metadata/components/metadata-description/metadata-description.component.html b/src/app/features/metadata/components/metadata-description/metadata-description.component.html
index 69fdc299b..4a943d8e0 100644
--- a/src/app/features/metadata/components/metadata-description/metadata-description.component.html
+++ b/src/app/features/metadata/components/metadata-description/metadata-description.component.html
@@ -11,5 +11,7 @@ <h2>{{ 'project.overview.metadata.description' | translate }}</h2>
     }
   </div>
 
-  <p class="mt-4">{{ description() || ('project.overview.metadata.noDescription' | translate) }}</p>
+  <p data-test-display-node-description class="mt-4">
+    {{ description() || ('project.overview.metadata.noDescription' | translate) }}
+  </p>
 </p-card>
diff --git a/src/app/features/metadata/components/metadata-funding/metadata-funding.component.html b/src/app/features/metadata/components/metadata-funding/metadata-funding.component.html
index 5fa7fa5e7..cf6f14c49 100644
--- a/src/app/features/metadata/components/metadata-funding/metadata-funding.component.html
+++ b/src/app/features/metadata/components/metadata-funding/metadata-funding.component.html
@@ -14,10 +14,11 @@ <h2>{{ 'project.overview.metadata.fundingSupport' | translate }}</h2>
   @if (funders()?.length) {
     <div class="mt-4">
       @for (funder of funders(); track funder.funderIdentifier) {
-        <div class="mb-2 pb-3 border-bottom-1 surface-border flex flex-column gap-2">
+        <div class="surface-border flex flex-column gap-2" [ngClass]="{ 'mb-3 pb-3 border-bottom-1': !$last }">
           <p>{{ 'files.detail.resourceMetadata.fields.funder' | translate }}: {{ funder.funderName }}</p>
-
-          <p>{{ 'files.detail.resourceMetadata.fields.awardTitle' | translate }}: {{ funder.awardTitle }}</p>
+          @if (funder.awardTitle) {
+            <p>{{ 'files.detail.resourceMetadata.fields.awardTitle' | translate }}: {{ funder.awardTitle }}</p>
+          }
 
           @if (funder.awardUri) {
             <p>
diff --git a/src/app/features/metadata/components/metadata-funding/metadata-funding.component.ts b/src/app/features/metadata/components/metadata-funding/metadata-funding.component.ts
index 38764938f..c0d6e7081 100644
--- a/src/app/features/metadata/components/metadata-funding/metadata-funding.component.ts
+++ b/src/app/features/metadata/components/metadata-funding/metadata-funding.component.ts
@@ -3,13 +3,14 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { Button } from 'primeng/button';
 import { Card } from 'primeng/card';
 
+import { NgClass } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
 import { Funder } from '../../models';
 
 @Component({
   selector: 'osf-metadata-funding',
-  imports: [Button, Card, TranslatePipe],
+  imports: [NgClass, Button, Card, TranslatePipe],
   templateUrl: './metadata-funding.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
diff --git a/src/app/features/metadata/dialogs/description-dialog/description-dialog.component.html b/src/app/features/metadata/dialogs/description-dialog/description-dialog.component.html
index 591756ac2..90cf60628 100644
--- a/src/app/features/metadata/dialogs/description-dialog/description-dialog.component.html
+++ b/src/app/features/metadata/dialogs/description-dialog/description-dialog.component.html
@@ -9,7 +9,17 @@
   ></textarea>
 
   <div class="flex justify-content-end gap-2">
-    <p-button severity="info" [label]="'common.buttons.cancel' | translate" (onClick)="cancel()" />
-    <p-button [label]="'common.buttons.save' | translate" [disabled]="descriptionControl.invalid" (onClick)="save()" />
+    <p-button
+      data-test-cancel-editing-node-description-button
+      severity="info"
+      [label]="'common.buttons.cancel' | translate"
+      (onClick)="cancel()"
+    />
+    <p-button
+      data-test-save-node-description-button
+      [label]="'common.buttons.save' | translate"
+      [disabled]="descriptionControl.invalid"
+      (onClick)="save()"
+    />
   </div>
 </form>
diff --git a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html
index 33a353b0b..734741348 100644
--- a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html
+++ b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.html
@@ -47,7 +47,7 @@
           <input pInputText [id]="'awardNumber-' + $index" formControlName="awardNumber" class="w-full" />
         </div>
 
-        @if (fundingEntries.length > 1) {
+        @if (configFunders.length || fundingEntries.length > 1) {
           <div class="flex justify-content-end">
             <p-button
               severity="danger"
@@ -72,6 +72,11 @@
 
   <div class="flex justify-content-end gap-2">
     <p-button severity="info" [label]="'common.buttons.cancel' | translate" (onClick)="cancel()" />
-    <p-button type="submit" [label]="'common.buttons.save' | translate" [disabled]="fundingForm.invalid" />
+    <p-button
+      data-test-save-funding-metadata-button
+      type="submit"
+      [label]="'common.buttons.save' | translate"
+      [disabled]="fundingForm.invalid"
+    />
   </div>
 </form>
diff --git a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts
index da758e84a..b0d97c15d 100644
--- a/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts
+++ b/src/app/features/metadata/dialogs/funding-dialog/funding-dialog.component.ts
@@ -39,6 +39,8 @@ export class FundingDialogComponent implements OnInit {
 
   private searchSubject = new Subject<string>();
 
+  configFunders = this.config.data?.funders;
+
   constructor() {
     effect(() => {
       const funders = this.fundersList() || [];
@@ -66,9 +68,8 @@ export class FundingDialogComponent implements OnInit {
   ngOnInit(): void {
     this.actions.getFundersList();
 
-    const configFunders = this.config.data?.funders;
-    if (configFunders?.length > 0) {
-      configFunders.forEach((funder: Funder) => {
+    if (this.configFunders?.length > 0) {
+      this.configFunders.forEach((funder: Funder) => {
         this.addFundingEntry({
           funderName: funder.funderName || '',
           funderIdentifier: funder.funderIdentifier || '',
@@ -104,11 +105,10 @@ export class FundingDialogComponent implements OnInit {
       }),
       awardTitle: new FormControl(supplement?.title || supplement?.awardTitle || '', {
         nonNullable: true,
-        validators: [Validators.required],
       }),
       awardUri: new FormControl(supplement?.url || supplement?.awardUri || '', {
         nonNullable: true,
-        validators: [CustomValidators.linkValidator(), CustomValidators.requiredTrimmed()],
+        validators: [CustomValidators.linkValidator()],
       }),
       awardNumber: new FormControl(supplement?.awardNumber || '', {
         nonNullable: true,
@@ -124,6 +124,11 @@ export class FundingDialogComponent implements OnInit {
   removeFundingEntry(index: number): void {
     if (this.fundingEntries.length > 1) {
       this.fundingEntries.removeAt(index);
+    } else {
+      const result: FundingDialogResult = {
+        fundingEntries: [],
+      };
+      this.dialogRef.close(result);
     }
   }
 
diff --git a/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html b/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html
index d5a9d26f5..9882a7e53 100644
--- a/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html
+++ b/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html
@@ -31,10 +31,12 @@
       optionValue="value"
       [placeholder]="'common.buttons.select' | translate"
       appendTo="body"
+      [virtualScroll]="true"
+      [virtualScrollItemSize]="35"
       class="w-full"
     >
       <ng-template #item let-option>
-        <span class="w-25rem">{{ option.label }}</span>
+        <span>{{ option.label }}</span>
       </ng-template>
     </p-select>
   </div>
diff --git a/src/styles/overrides/button.scss b/src/styles/overrides/button.scss
index 09fd79b4c..d2cf4ebb3 100644
--- a/src/styles/overrides/button.scss
+++ b/src/styles/overrides/button.scss
@@ -31,7 +31,7 @@
 }
 
 .btn-icon-only .p-button {
-  padding: mix.rem(13px) mix.rem(20px);
+  padding: mix.rem(13px) mix.rem(21px);
 }
 
 .btn-full-width {

From 3ef0b52387750501578bea989cdd9a40cc4f21bf Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Fri, 12 Sep 2025 14:32:38 +0300
Subject: [PATCH 08/10] fix(bugs): add some area labels

---
 .../pages/file-detail/file-detail.component.html      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/features/files/pages/file-detail/file-detail.component.html b/src/app/features/files/pages/file-detail/file-detail.component.html
index ffc24acfc..05c85e754 100644
--- a/src/app/features/files/pages/file-detail/file-detail.component.html
+++ b/src/app/features/files/pages/file-detail/file-detail.component.html
@@ -31,6 +31,7 @@
           severity="secondary"
           class="btn-icon-only"
           icon="fas fa-download"
+          [ariaLabel]="'common.buttons.download' | translate"
           (click)="downloadFile(file()?.links?.download!)"
         />
       }
@@ -40,6 +41,7 @@
             severity="secondary"
             class="btn-icon-only"
             icon="fas fa-file-import"
+            [ariaLabel]="'common.buttons.embed' | translate"
             (click)="embedMenu.toggle($event)"
           />
 
@@ -56,6 +58,7 @@
             severity="secondary"
             class="btn-icon-only"
             icon="fas fa-share-nodes"
+            [ariaLabel]="'common.buttons.share' | translate"
             (click)="shareMenu.toggle($event)"
           />
 
@@ -67,7 +70,13 @@
         </div>
       }
       @if (file() && !isAnonymous()) {
-        <p-button severity="danger" class="btn-icon-only" icon="fas fa-trash" (click)="confirmDelete(file()!)" />
+        <p-button
+          severity="danger"
+          [ariaLabel]="'common.buttons.delete' | translate"
+          class="btn-icon-only"
+          icon="fas fa-trash"
+          (click)="confirmDelete(file()!)"
+        />
       }
     </div>
   </div>

From 26ad3c68c6f350fed31987ecc949b7debeb7bcb4 Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Fri, 12 Sep 2025 16:00:45 +0300
Subject: [PATCH 09/10] fix(bugs): files upload limits

---
 .../components/custom-step/custom-step.component.ts      | 9 ++++++++-
 .../files-control/files-control.component.html           | 2 +-
 .../components/files-control/files-control.component.ts  | 8 +++++++-
 .../components/metadata/metadata.component.html          | 3 ++-
 src/app/shared/components/stepper/stepper.component.html | 1 +
 .../shared/components/subjects/subjects.component.html   | 1 +
 .../components/text-input/text-input.component.html      | 4 ++--
 .../shared/components/text-input/text-input.component.ts | 2 +-
 src/app/shared/constants/files-limits.const.ts           | 2 ++
 src/app/shared/constants/index.ts                        | 1 +
 src/app/shared/services/toast.service.ts                 | 2 +-
 src/assets/i18n/en.json                                  | 3 ++-
 12 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 src/app/shared/constants/files-limits.const.ts

diff --git a/src/app/features/registries/components/custom-step/custom-step.component.ts b/src/app/features/registries/components/custom-step/custom-step.component.ts
index 59721646c..e32768270 100644
--- a/src/app/features/registries/components/custom-step/custom-step.component.ts
+++ b/src/app/features/registries/components/custom-step/custom-step.component.ts
@@ -29,10 +29,11 @@ import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule,
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { InfoIconComponent } from '@osf/shared/components';
-import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants';
+import { FILE_COUNT_ATTACHMENTS_LIMIT, INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants';
 import { FieldType } from '@osf/shared/enums';
 import { CustomValidators, findChangedFields } from '@osf/shared/helpers';
 import { FilePayloadJsonApi, OsfFile, PageSchema } from '@osf/shared/models';
+import { ToastService } from '@osf/shared/services';
 
 import { FilesMapper } from '../../mappers/files.mapper';
 import { RegistriesSelectors, SetUpdatedFields, UpdateStepValidation } from '../../store';
@@ -77,6 +78,7 @@ export class CustomStepComponent implements OnDestroy {
   private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
   private readonly fb = inject(FormBuilder);
+  private toastService = inject(ToastService);
 
   readonly pages = select(RegistriesSelectors.getPagesSchema);
   readonly FieldType = FieldType;
@@ -180,7 +182,12 @@ export class CustomStepComponent implements OnDestroy {
 
   onAttachFile(file: OsfFile, questionKey: string): void {
     this.attachedFiles[questionKey] = this.attachedFiles[questionKey] || [];
+
     if (!this.attachedFiles[questionKey].some((f) => f.file_id === file.id)) {
+      if (this.attachedFiles[questionKey].length >= FILE_COUNT_ATTACHMENTS_LIMIT) {
+        this.toastService.showWarn('shared.files.limitText');
+        return;
+      }
       this.attachedFiles[questionKey].push(file);
       this.stepForm.patchValue({
         [questionKey]: [...(this.attachedFiles[questionKey] || []), file],
diff --git a/src/app/features/registries/components/files-control/files-control.component.html b/src/app/features/registries/components/files-control/files-control.component.html
index ea73def20..884f72428 100644
--- a/src/app/features/registries/components/files-control/files-control.component.html
+++ b/src/app/features/registries/components/files-control/files-control.component.html
@@ -58,7 +58,7 @@
       [isLoading]="isFilesLoading()"
       [actions]="filesTreeActions"
       [viewOnly]="filesViewOnly()"
-      [viewOnlyDownloadable]="false"
+      [viewOnlyDownloadable]="true"
       [resourceId]="projectId()"
       [provider]="provider()"
       (folderIsOpening)="folderIsOpening($event)"
diff --git a/src/app/features/registries/components/files-control/files-control.component.ts b/src/app/features/registries/components/files-control/files-control.component.ts
index 980a2763e..6bff47341 100644
--- a/src/app/features/registries/components/files-control/files-control.component.ts
+++ b/src/app/features/registries/components/files-control/files-control.component.ts
@@ -16,8 +16,9 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { CreateFolderDialogComponent } from '@osf/features/files/components';
 import { FilesTreeComponent, LoadingSpinnerComponent } from '@osf/shared/components';
+import { FILE_SIZE_LIMIT } from '@osf/shared/constants';
 import { FilesTreeActions, OsfFile } from '@osf/shared/models';
-import { FilesService } from '@osf/shared/services';
+import { FilesService, ToastService } from '@osf/shared/services';
 
 import {
   CreateFolder,
@@ -57,6 +58,7 @@ export class FilesControlComponent {
   private readonly dialogService = inject(DialogService);
   private readonly translateService = inject(TranslateService);
   private readonly destroyRef = inject(DestroyRef);
+  private toastService = inject(ToastService);
 
   readonly files = select(RegistriesSelectors.getFiles);
   readonly filesTotalCount = select(RegistriesSelectors.getFilesTotalCount);
@@ -103,6 +105,10 @@ export class FilesControlComponent {
   onFileSelected(event: Event): void {
     const input = event.target as HTMLInputElement;
     const file = input.files?.[0];
+    if (file && file.size > FILE_SIZE_LIMIT) {
+      this.toastService.showWarn('shared.files.limitText');
+      return;
+    }
     if (!file) return;
 
     this.uploadFile(file);
diff --git a/src/app/features/registries/components/metadata/metadata.component.html b/src/app/features/registries/components/metadata/metadata.component.html
index 620c66986..75d6a4897 100644
--- a/src/app/features/registries/components/metadata/metadata.component.html
+++ b/src/app/features/registries/components/metadata/metadata.component.html
@@ -11,7 +11,7 @@ <h2 class="mb-2">{{ 'common.labels.title' | translate }}</h2>
         </label>
         <p class="mb-1">{{ 'shared.title.description' | translate }}</p>
         <osf-text-input
-          id="registration-title-id"
+          [inputId]="'registration-title-id'"
           [control]="metadataForm.controls['title']"
           [maxLength]="inputLimits.fullName.maxLength"
         >
@@ -33,6 +33,7 @@ <h2>{{ 'common.labels.description' | translate }}</h2>
             rows="5"
             cols="30"
             pTextarea
+            [ariaLabel]="'common.labels.description' | translate"
           ></textarea>
           @if (
             metadataForm.controls['description'].errors?.['required'] &&
diff --git a/src/app/shared/components/stepper/stepper.component.html b/src/app/shared/components/stepper/stepper.component.html
index 7089f1300..6e5549af5 100644
--- a/src/app/shared/components/stepper/stepper.component.html
+++ b/src/app/shared/components/stepper/stepper.component.html
@@ -9,6 +9,7 @@
           [class.invalid]="step.invalid"
           [class.current]="i === currentStep().index"
           (click)="onStepClick(step)"
+          [attr.aria-label]="step.label | translate"
         >
           @if (step.invalid && i !== currentStep().index) {
             <osf-icon iconClass="fas fa-exclamation" />
diff --git a/src/app/shared/components/subjects/subjects.component.html b/src/app/shared/components/subjects/subjects.component.html
index e02642187..ccd35c589 100644
--- a/src/app/shared/components/subjects/subjects.component.html
+++ b/src/app/shared/components/subjects/subjects.component.html
@@ -67,6 +67,7 @@ <h2 class="mb-2">{{ 'shared.subjects.title' | translate }}</h2>
       (onNodeSelect)="selectSubject($event.node.data)"
       (onNodeUnselect)="removeSubject($event.node.data)"
       [ariaLabel]="'shared.subjects.subjectTree' | translate"
+      [togglerAriaLabel]="'common.accessibility.toggleTreeNode' | translate"
     >
     </p-tree>
   }
diff --git a/src/app/shared/components/text-input/text-input.component.html b/src/app/shared/components/text-input/text-input.component.html
index 59f592760..23fdb6139 100644
--- a/src/app/shared/components/text-input/text-input.component.html
+++ b/src/app/shared/components/text-input/text-input.component.html
@@ -1,8 +1,8 @@
 @if (label()) {
-  <label [for]="inputId">{{ label() | translate }}</label>
+  <label [for]="inputId()">{{ label() | translate }}</label>
 }
 <input
-  [id]="inputId"
+  [id]="inputId()"
   pInputText
   [type]="type()"
   [formControl]="control()"
diff --git a/src/app/shared/components/text-input/text-input.component.ts b/src/app/shared/components/text-input/text-input.component.ts
index 4a7a027d0..b1c708bb8 100644
--- a/src/app/shared/components/text-input/text-input.component.ts
+++ b/src/app/shared/components/text-input/text-input.component.ts
@@ -25,7 +25,7 @@ export class TextInputComponent {
   minLength = input<number>();
   maxLength = input<number>();
 
-  inputId = `input-${Math.random().toString(36).substring(2, 15)}`;
+  inputId = input<string>(`input-${Math.random().toString(36).substring(2, 15)}`);
   helpId = `help-${Math.random().toString(36).substring(2, 15)}`;
 
   getErrorMessage(): ValidationParams {
diff --git a/src/app/shared/constants/files-limits.const.ts b/src/app/shared/constants/files-limits.const.ts
new file mode 100644
index 000000000..0f8156270
--- /dev/null
+++ b/src/app/shared/constants/files-limits.const.ts
@@ -0,0 +1,2 @@
+export const FILE_SIZE_LIMIT = 5 * 1024 * 1024 * 1024;
+export const FILE_COUNT_ATTACHMENTS_LIMIT = 1;
diff --git a/src/app/shared/constants/index.ts b/src/app/shared/constants/index.ts
index 6d9b00431..e8aadc9a5 100644
--- a/src/app/shared/constants/index.ts
+++ b/src/app/shared/constants/index.ts
@@ -4,6 +4,7 @@ export * from './addons-tab-options.const';
 export * from './contributors.constants';
 export * from './default-citation-titles.const';
 export * from './default-table-params.constants';
+export * from './files-limits.const';
 export * from './filter-placeholders';
 export * from './input-limits.const';
 export * from './input-validation-messages.const';
diff --git a/src/app/shared/services/toast.service.ts b/src/app/shared/services/toast.service.ts
index da6ac62e1..dae505bee 100644
--- a/src/app/shared/services/toast.service.ts
+++ b/src/app/shared/services/toast.service.ts
@@ -13,7 +13,7 @@ export class ToastService {
   }
 
   showWarn(summary: string, params?: unknown) {
-    this.messageService.add({ severity: 'warn', summary, data: { translationParams: params }, key: 'osf' });
+    this.messageService.add({ severity: 'warn', summary, life: 5000, data: { translationParams: params }, key: 'osf' });
   }
 
   showError(summary: string, params?: unknown) {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index d64c6ed28..8e549b5d0 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -64,7 +64,8 @@
       "tooltipBtn": "Tooltip button",
       "customizeOptions": "Customize options",
       "toggleProjectVisibility": "Toggle project visibility",
-      "tagInput": "Tag input"
+      "tagInput": "Tag input",
+      "toggleTreeNode": "Toggle tree node"
     },
     "dialogs": {
       "confirmation": "Confirmation"

From 5391f086002bead22f53113bcc5a1034d2c4925b Mon Sep 17 00:00:00 2001
From: NazarMykhalkevych <nmykhalkevych@exoft.net>
Date: Wed, 17 Sep 2025 23:03:22 +0300
Subject: [PATCH 10/10] fix(registration): show data for admin

---
 .../components/custom-step/custom-step.component.html     | 8 +-------
 .../registry-overview/registry-overview.component.ts      | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/app/features/registries/components/custom-step/custom-step.component.html b/src/app/features/registries/components/custom-step/custom-step.component.html
index e9ef298df..4e54d6ead 100644
--- a/src/app/features/registries/components/custom-step/custom-step.component.html
+++ b/src/app/features/registries/components/custom-step/custom-step.component.html
@@ -139,13 +139,7 @@ <h3 class="mb-2">
               }
 
               @case (FieldType.Text) {
-                <input
-                  [formControlName]="q.responseKey!"
-                  type="text"
-                  class="w-full"
-                  [placeholder]="q.exampleText"
-                  pInputText
-                />
+                <input [formControlName]="q.responseKey!" type="text" class="w-full" pInputText />
                 @if (
                   stepForm.controls[q.responseKey!].errors?.['required'] &&
                   (stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
diff --git a/src/app/features/registry/pages/registry-overview/registry-overview.component.ts b/src/app/features/registry/pages/registry-overview/registry-overview.component.ts
index a6598507a..87011a718 100644
--- a/src/app/features/registry/pages/registry-overview/registry-overview.component.ts
+++ b/src/app/features/registry/pages/registry-overview/registry-overview.component.ts
@@ -113,7 +113,8 @@ export class RegistryOverviewComponent {
     const schemaResponses =
       (this.isModeration
         ? registry?.schemaResponses
-        : registry?.schemaResponses.filter((r) => r.reviewsState === RevisionReviewStates.Approved)) || [];
+        : registry?.schemaResponses.filter((r) => r.reviewsState === RevisionReviewStates.Approved || this.isAdmin)) ||
+      [];
     if (index !== null) {
       return schemaResponses[index];
     }