From 369af3bf16050f0965accc9d7f83cd19213aa45f Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Mon, 21 Jul 2025 22:40:01 +0300
Subject: [PATCH 1/9] feat(metadata): moved metadata project to reusable
 component

---
 ...ata-affiliated-institutions.component.html |   4 +-
 ...adata-affiliated-institutions.component.ts |   4 +-
 ...oject-metadata-contributors.component.html |   4 +-
 ...project-metadata-contributors.component.ts |   4 +-
 ...roject-metadata-description.component.html |   4 +-
 .../project-metadata-description.component.ts |   4 +-
 .../project-metadata-funding.component.html   |   4 +-
 .../project-metadata-funding.component.ts     |   4 +-
 .../project-metadata-license.component.html   |   4 +-
 .../project-metadata-license.component.ts     |   4 +-
 ...ct-metadata-publication-doi.component.html |   4 +-
 ...ject-metadata-publication-doi.component.ts |   5 +-
 .../project-metadata-subjects.component.html  |   6 +-
 .../project-metadata-subjects.component.scss  |   0
 .../project-metadata-subjects.component.ts    |  47 +----
 .../metadata/helpers/cedar-metadata.helper.ts |   1 +
 .../metadata/project-metadata.component.html  |  94 ++-------
 .../metadata/project-metadata.component.ts    | 181 +++++++++++-------
 .../mappers/project-overview.mapper.ts        |   4 +-
 .../models/project-overview.models.ts         |  53 ++---
 .../shared-metadata.component.html            |  80 ++++++++
 .../shared-metadata.component.spec.ts         |  22 +++
 .../shared-metadata.component.ts              |  61 ++++++
 23 files changed, 358 insertions(+), 240 deletions(-)
 delete mode 100644 src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.scss
 create mode 100644 src/app/shared/components/shared-metadata/shared-metadata.component.html
 create mode 100644 src/app/shared/components/shared-metadata/shared-metadata.component.spec.ts
 create mode 100644 src/app/shared/components/shared-metadata/shared-metadata.component.ts

diff --git a/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html b/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
index 9abbe7fb7..c9bc91e43 100644
--- a/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
+++ b/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
@@ -9,9 +9,9 @@ <h2>{{ 'project.overview.metadata.affiliatedInstitutions' | translate }}</h2>
     ></p-button>
   </div>
 
-  @if (currentProject()?.affiliatedInstitutions?.length) {
+  @if (affiliatedInstitutions()) {
     <div class="pt-4">
-      @for (institution of currentProject()!.affiliatedInstitutions!; track institution.id) {
+      @for (institution of affiliatedInstitutions(); track institution.id) {
         <div class="flex align-items-center gap-3 mb-3">
           @if (institution.logo) {
             <img [src]="institution.logo" [alt]="institution.name" class="w-3rem h-3rem border-round" />
diff --git a/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts b/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
index d06dce556..e7b1428b6 100644
--- a/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
+++ b/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
@@ -5,7 +5,7 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ProjectOverview } from '@osf/features/project/overview/models';
+import { ProjectAffiliatedInstitutions } from '@osf/features/project/overview/models';
 
 @Component({
   selector: 'osf-project-metadata-affiliated-institutions',
@@ -16,5 +16,5 @@ import { ProjectOverview } from '@osf/features/project/overview/models';
 export class ProjectMetadataAffiliatedInstitutionsComponent {
   openEditAffiliatedInstitutionsDialog = output<void>();
 
-  currentProject = input.required<ProjectOverview | null>();
+  affiliatedInstitutions = input<ProjectAffiliatedInstitutions[]>([]);
 }
diff --git a/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.html b/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
index 77dbe94ba..b16a0d5dc 100644
--- a/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
+++ b/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
@@ -9,9 +9,9 @@ <h2>{{ 'project.overview.metadata.contributors' | translate }}</h2>
     ></p-button>
   </div>
 
-  @if (currentProject()?.contributors) {
+  @if (contributors()) {
     <div class="inline-flex gap-1 line-height-2 pt-4">
-      @for (contributor of currentProject()?.contributors; track contributor.id) {
+      @for (contributor of contributors(); track contributor.id) {
         <div>
           <a class="font-bold"> {{ contributor.fullName }}</a>
           <span>{{ $last ? '' : ',' }}</span>
diff --git a/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts b/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
index 4c7768c3e..d170c2bcd 100644
--- a/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
+++ b/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
@@ -5,7 +5,7 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ProjectOverview } from '@osf/features/project/overview/models';
+import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
 
 @Component({
   selector: 'osf-project-metadata-contributors',
@@ -16,5 +16,5 @@ import { ProjectOverview } from '@osf/features/project/overview/models';
 export class ProjectMetadataContributorsComponent {
   openEditContributorDialog = output<void>();
 
-  currentProject = input.required<ProjectOverview | null>();
+  contributors = input.required<ProjectOverviewContributor[] | null>();
 }
diff --git a/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.html b/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.html
index 81a97cfc0..680349ad8 100644
--- a/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.html
+++ b/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.html
@@ -9,8 +9,8 @@ <h2>{{ 'project.overview.metadata.description' | translate }}</h2>
     ></p-button>
   </div>
 
-  @if (currentProject()?.description) {
-    <p>{{ currentProject()?.description }}</p>
+  @if (description()) {
+    <p>{{ description() }}</p>
   } @else {
     <p class="text-color-secondary">{{ 'project.overview.metadata.noDescription' | translate }}</p>
   }
diff --git a/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.ts b/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.ts
index 8f5f35a17..14461e41d 100644
--- a/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.ts
+++ b/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.ts
@@ -5,8 +5,6 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ProjectOverview } from '@osf/features/project/overview/models';
-
 @Component({
   selector: 'osf-project-metadata-description',
   imports: [Card, Button, TranslatePipe],
@@ -16,5 +14,5 @@ import { ProjectOverview } from '@osf/features/project/overview/models';
 export class ProjectMetadataDescriptionComponent {
   openEditDescriptionDialog = output<void>();
 
-  currentProject = input.required<ProjectOverview | null>();
+  description = input.required<string | null>();
 }
diff --git a/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.html b/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.html
index cc66c8927..e9e0d0186 100644
--- a/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.html
+++ b/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.html
@@ -9,9 +9,9 @@ <h2>{{ 'project.overview.metadata.fundingSupport' | translate }}</h2>
     ></p-button>
   </div>
 
-  @if (currentProject()?.supplements?.length) {
+  @if (supplements()) {
     <div class="pt-4">
-      @for (supplement of currentProject()!.supplements!; track supplement.id) {
+      @for (supplement of supplements(); track supplement.id) {
         <div class="mb-2 p-3 border-1 border-round surface-border">
           <p class="font-semibold m-0 mb-2">{{ supplement.title }}</p>
           <p class="text-sm text-color-secondary m-0 mb-1">{{ supplement.dateCreated | date: 'MMM d, y' }}</p>
diff --git a/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.ts b/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.ts
index 95d90c996..e170c3b8f 100644
--- a/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.ts
+++ b/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.ts
@@ -6,7 +6,7 @@ import { Card } from 'primeng/card';
 import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ProjectOverview } from '@osf/features/project/overview/models';
+import { ProjectSupplements } from '@osf/features/project/overview/models';
 
 @Component({
   selector: 'osf-project-metadata-funding',
@@ -17,5 +17,5 @@ import { ProjectOverview } from '@osf/features/project/overview/models';
 export class ProjectMetadataFundingComponent {
   openEditFundingDialog = output<void>();
 
-  currentProject = input.required<ProjectOverview | null>();
+  supplements = input<ProjectSupplements[]>([]);
 }
diff --git a/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.html b/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.html
index 16df1fe0a..113231940 100644
--- a/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.html
+++ b/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.html
@@ -9,9 +9,9 @@ <h2>{{ 'project.overview.metadata.license' | translate }}</h2>
     ></p-button>
   </div>
 
-  @if (currentProject()?.license) {
+  @if (license()) {
     <div class="pt-4">
-      <p class="m-0">{{ currentProject()?.license }}</p>
+      <p class="m-0">{{ license().name }}</p>
     </div>
   } @else {
     <div class="pt-4">
diff --git a/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.ts b/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.ts
index dcfb48bbc..8211b1e11 100644
--- a/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.ts
+++ b/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.ts
@@ -5,7 +5,7 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ProjectOverview } from '@osf/features/project/overview/models';
+import { License } from '@shared/models';
 
 @Component({
   selector: 'osf-project-metadata-license',
@@ -16,5 +16,5 @@ import { ProjectOverview } from '@osf/features/project/overview/models';
 export class ProjectMetadataLicenseComponent {
   openEditLicenseDialog = output<void>();
 
-  currentProject = input.required<ProjectOverview | null>();
+  license = input<License>({} as License);
 }
diff --git a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html b/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
index 1ddbe9779..89bd85459 100644
--- a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
+++ b/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
@@ -9,9 +9,9 @@ <h2>{{ 'project.overview.metadata.publication' | translate }}</h2>
     ></p-button>
   </div>
 
-  @if (currentProject()?.identifiers?.length) {
+  @if (identifiers() && identifiers().length) {
     <div class="pt-4">
-      @for (identifier of currentProject()!.identifiers!; track identifier.id) {
+      @for (identifier of identifiers()!; track identifier.id) {
         @if (identifier.category === 'doi') {
           <p>{{ identifier.value }}</p>
         }
diff --git a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts b/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
index f3e4f87dd..a93956ea2 100644
--- a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
+++ b/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
@@ -5,16 +5,17 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ProjectOverview } from '@osf/features/project/overview/models';
+import { ProjectIdentifiers } from '@osf/features/project/overview/models';
 
 @Component({
   selector: 'osf-project-metadata-publication-doi',
   imports: [Button, Card, TranslatePipe],
   templateUrl: './project-metadata-publication-doi.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class ProjectMetadataPublicationDoiComponent {
   openEditPublicationDoiDialog = output<void>();
 
-  currentProject = input.required<ProjectOverview | null>();
+  identifiers = input<ProjectIdentifiers[]>([]);
 }
diff --git a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.html b/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
index 991d700d1..5c6529cfc 100644
--- a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
+++ b/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
@@ -2,8 +2,8 @@
   <osf-subjects
     [areSubjectsUpdating]="isSubjectsUpdating()"
     [selected]="selectedSubjects()"
-    (loadChildren)="getSubjectChildren($event)"
-    (searchChanged)="searchSubjects($event)"
-    (updateSelection)="updateSelectedSubjects($event)"
+    (loadChildren)="getSubjectChildren.emit($event)"
+    (searchChanged)="searchSubjects.emit($event)"
+    (updateSelection)="updateSelectedSubjects.emit($event)"
   />
 </p-card>
diff --git a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.scss b/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts b/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
index 10a3a81e6..d4fb3b804 100644
--- a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
+++ b/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
@@ -1,18 +1,8 @@
-import { createDispatchMap, select } from '@ngxs/store';
-
 import { Card } from 'primeng/card';
 
-import { ChangeDetectionStrategy, Component, input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ResourceType } from '@osf/shared/enums';
 import { SubjectModel } from '@osf/shared/models';
-import {
-  FetchChildrenSubjects,
-  FetchSelectedSubjects,
-  FetchSubjects,
-  SubjectsSelectors,
-  UpdateResourceSubjects,
-} from '@osf/shared/stores';
 import { SubjectsComponent } from '@shared/components';
 
 @Component({
@@ -20,34 +10,13 @@ import { SubjectsComponent } from '@shared/components';
   imports: [SubjectsComponent, Card],
   templateUrl: './project-metadata-subjects.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
-export class ProjectMetadataSubjectsComponent implements OnInit {
-  projectId = input<string>();
-
-  protected selectedSubjects = select(SubjectsSelectors.getSelectedSubjects);
-  protected isSubjectsUpdating = select(SubjectsSelectors.areSelectedSubjectsLoading);
-
-  protected actions = createDispatchMap({
-    fetchSubjects: FetchSubjects,
-    fetchSelectedSubjects: FetchSelectedSubjects,
-    fetchChildrenSubjects: FetchChildrenSubjects,
-    updateResourceSubjects: UpdateResourceSubjects,
-  });
-
-  ngOnInit(): void {
-    this.actions.fetchSubjects(ResourceType.Project);
-    this.actions.fetchSelectedSubjects(this.projectId()!, ResourceType.Project);
-  }
-
-  getSubjectChildren(parentId: string) {
-    this.actions.fetchChildrenSubjects(parentId);
-  }
-
-  searchSubjects(search: string) {
-    this.actions.fetchSubjects(ResourceType.Project, this.projectId()!, search);
-  }
+export class ProjectMetadataSubjectsComponent {
+  selectedSubjects = input.required<SubjectModel[]>();
+  isSubjectsUpdating = input.required<boolean>();
 
-  updateSelectedSubjects(subjects: SubjectModel[]) {
-    this.actions.updateResourceSubjects(this.projectId()!, ResourceType.Project, subjects);
-  }
+  getSubjectChildren = output<string>();
+  searchSubjects = output<string>();
+  updateSelectedSubjects = output<SubjectModel[]>();
 }
diff --git a/src/app/features/project/metadata/helpers/cedar-metadata.helper.ts b/src/app/features/project/metadata/helpers/cedar-metadata.helper.ts
index f49a4e5c4..9ee0ecc35 100644
--- a/src/app/features/project/metadata/helpers/cedar-metadata.helper.ts
+++ b/src/app/features/project/metadata/helpers/cedar-metadata.helper.ts
@@ -4,6 +4,7 @@ export class CedarMetadataHelper {
 
     return items.map((item) => {
       const safeItem = typeof item === 'object' && item !== null ? (item as Record<string, unknown>) : {};
+
       return {
         '@id': safeItem['@id'] ?? '',
         '@type': safeItem['@type'] ?? '',
diff --git a/src/app/features/project/metadata/project-metadata.component.html b/src/app/features/project/metadata/project-metadata.component.html
index b477e407a..080ba1e4c 100644
--- a/src/app/features/project/metadata/project-metadata.component.html
+++ b/src/app/features/project/metadata/project-metadata.component.html
@@ -24,83 +24,23 @@
         @for (tab of tabs(); track $index) {
           <p-tabpanel [value]="tab.id">
             @if (tab.type === 'project') {
-              <div class="flex-column flex flex-1 w-full bg-white lg:flex-row">
-                <div class="col-12 lg:col-6 flex flex-column gap-4">
-                  <p-card>
-                    <div class="flex justify-content-between flex-wrap gap-4">
-                      <div class="flex flex-column gap-2 flex-1">
-                        <h2>
-                          {{ 'project.overview.metadata.dateCreated' | translate }}
-                        </h2>
-
-                        <p class="m-0 text-color-secondary">
-                          {{ currentProject()?.dateCreated | date: 'MMM d, y, h:mm a' }}
-                        </p>
-                      </div>
-
-                      <div class="flex flex-column gap-2 flex-1">
-                        <h2>
-                          {{ 'project.overview.metadata.dateUpdated' | translate }}
-                        </h2>
-
-                        <p class="m-0 text-color-secondary">
-                          {{ currentProject()?.dateModified | date: 'MMM d, y, h:mm a' }}
-                        </p>
-                      </div>
-                    </div>
-                  </p-card>
-
-                  <osf-project-metadata-contributors
-                    (openEditContributorDialog)="openEditContributorDialog()"
-                    [currentProject]="currentProject()"
-                  />
-
-                  <osf-project-metadata-description
-                    (openEditDescriptionDialog)="openEditDescriptionDialog()"
-                    [currentProject]="currentProject()"
-                  />
-
-                  <osf-project-metadata-resource-information
-                    (openEditResourceInformationDialog)="openEditResourceInformationDialog()"
-                    [customItemMetadata]="customItemMetadata()"
-                  />
-
-                  <osf-project-metadata-funding
-                    (openEditFundingDialog)="openEditFundingDialog()"
-                    [currentProject]="currentProject()"
-                  />
-
-                  <osf-project-metadata-affiliated-institutions
-                    (openEditAffiliatedInstitutionsDialog)="openEditAffiliatedInstitutionsDialog()"
-                    [currentProject]="currentProject()"
-                  />
-                </div>
-
-                <div class="col-12 lg:col-6 flex flex-column gap-4">
-                  <osf-project-metadata-license
-                    (openEditLicenseDialog)="openEditLicenseDialog()"
-                    [currentProject]="currentProject()"
-                  />
-
-                  <osf-project-metadata-publication-doi
-                    (openEditPublicationDoiDialog)="handleEditDoi()"
-                    [currentProject]="currentProject()"
-                  />
-
-                  <p-card>
-                    <div class="flex flex-column gap-3">
-                      <h2>{{ 'project.overview.metadata.tags' | translate }}</h2>
-
-                      <osf-tags-input
-                        (tagsChanged)="onTagsChanged($event)"
-                        [tags]="currentProject()?.tags || []"
-                      ></osf-tags-input>
-                    </div>
-                  </p-card>
-
-                  <osf-project-metadata-subjects [projectId]="currentProject()?.id" />
-                </div>
-              </div>
+              <osf-shared-metadata
+                [selectedSubjects]="selectedSubjects()"
+                [isSubjectsUpdating]="isSubjectsUpdating()"
+                [currentInstance]="currentProject()!"
+                [customItemMetadata]="customItemMetadata()!"
+                (openEditContributorDialog)="openEditContributorDialog()"
+                (openEditDescriptionDialog)="openEditDescriptionDialog()"
+                (openEditResourceInformationDialog)="openEditResourceInformationDialog()"
+                (openEditFundingDialog)="openEditFundingDialog()"
+                (openEditAffiliatedInstitutionsDialog)="openEditAffiliatedInstitutionsDialog()"
+                (openEditLicenseDialog)="openEditLicenseDialog()"
+                (handleEditDoi)="handleEditDoi()"
+                (tagsChanged)="onTagsChanged($event)"
+                (getSubjectChildren)="getSubjectChildren($event)"
+                (searchSubjects)="searchSubjects($event)"
+                (updateSelectedSubjects)="updateSelectedSubjects($event)"
+              />
             } @else {
               <div class="p-6">
                 @if (selectedCedarTemplate() && selectedCedarRecord()) {
diff --git a/src/app/features/project/metadata/project-metadata.component.ts b/src/app/features/project/metadata/project-metadata.component.ts
index e603d6e5e..32b64e672 100644
--- a/src/app/features/project/metadata/project-metadata.component.ts
+++ b/src/app/features/project/metadata/project-metadata.component.ts
@@ -53,8 +53,18 @@ import {
   UpdateProjectDetails,
 } from '@osf/features/project/metadata/store';
 import { ResourceType } from '@osf/shared/enums';
-import { ContributorsSelectors, GetAllContributors } from '@osf/shared/stores';
+import {
+  ContributorsSelectors,
+  FetchChildrenSubjects,
+  FetchSelectedSubjects,
+  FetchSubjects,
+  GetAllContributors,
+  SubjectsSelectors,
+  UpdateResourceSubjects,
+} from '@osf/shared/stores';
 import { LoadingSpinnerComponent, SubHeaderComponent, TagsInputComponent } from '@shared/components';
+import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
+import { SubjectModel } from '@shared/models';
 import { CustomConfirmationService, LoaderService, ToastService } from '@shared/services';
 
 @Component({
@@ -80,11 +90,13 @@ import { CustomConfirmationService, LoaderService, ToastService } from '@shared/
     Tabs,
     LoadingSpinnerComponent,
     TagsInputComponent,
+    SharedMetadataComponent,
   ],
   templateUrl: './project-metadata.component.html',
   styleUrl: './project-metadata.component.scss',
   providers: [DialogService],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class ProjectMetadataComponent implements OnInit {
   private readonly route = inject(ActivatedRoute);
@@ -96,6 +108,8 @@ export class ProjectMetadataComponent implements OnInit {
   private readonly loaderService = inject(LoaderService);
   private readonly customConfirmationService = inject(CustomConfirmationService);
 
+  private projectId = '';
+
   tabs = signal<{ id: string; label: string; type: 'project' | 'cedar' }[]>([]);
   protected readonly selectedTab = signal('project');
 
@@ -115,6 +129,11 @@ export class ProjectMetadataComponent implements OnInit {
     getCedarTemplates: GetCedarMetadataTemplates,
     createCedarRecord: CreateCedarMetadataRecord,
     updateCedarRecord: UpdateCedarMetadataRecord,
+
+    fetchSubjects: FetchSubjects,
+    fetchSelectedSubjects: FetchSelectedSubjects,
+    fetchChildrenSubjects: FetchChildrenSubjects,
+    updateResourceSubjects: UpdateResourceSubjects,
   });
 
   protected currentProject = select(ProjectMetadataSelectors.getProject);
@@ -126,6 +145,8 @@ export class ProjectMetadataComponent implements OnInit {
   protected currentUser = select(UserSelectors.getCurrentUser);
   protected cedarRecords = select(ProjectMetadataSelectors.getCedarRecords);
   protected cedarTemplates = select(ProjectMetadataSelectors.getCedarTemplates);
+  protected selectedSubjects = select(SubjectsSelectors.getSelectedSubjects);
+  protected isSubjectsUpdating = select(SubjectsSelectors.areSelectedSubjectsLoading);
 
   constructor() {
     effect(() => {
@@ -135,11 +156,12 @@ export class ProjectMetadataComponent implements OnInit {
 
       const baseTabs = [{ id: 'project', label: project.title, type: 'project' as const }];
 
-      const cedarTabs = records.map((record) => ({
-        id: record.id || '',
-        label: record.embeds?.template?.data?.attributes?.schema_name || `Record ${record.id}`,
-        type: 'cedar' as const,
-      }));
+      const cedarTabs =
+        records?.map((record) => ({
+          id: record.id || '',
+          label: record.embeds?.template?.data?.attributes?.schema_name || `Record ${record.id}`,
+          type: 'cedar' as const,
+        })) || [];
 
       this.tabs.set([...baseTabs, ...cedarTabs]);
 
@@ -163,14 +185,16 @@ export class ProjectMetadataComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const projectId = this.route.parent?.parent?.snapshot.params['id'];
+    this.projectId = this.route.parent?.parent?.snapshot.params['id'];
 
-    if (projectId) {
-      this.actions.getProject(projectId);
-      this.actions.getCustomItemMetadata(projectId);
-      this.actions.getContributors(projectId, ResourceType.Project);
-      this.actions.getCedarRecords(projectId);
+    if (this.projectId) {
+      this.actions.getProject(this.projectId);
+      this.actions.getCustomItemMetadata(this.projectId);
+      this.actions.getContributors(this.projectId, ResourceType.Project);
+      this.actions.getCedarRecords(this.projectId);
       this.actions.getCedarTemplates();
+      this.actions.fetchSubjects(ResourceType.Project);
+      this.actions.fetchSelectedSubjects(this.projectId!, ResourceType.Project);
 
       const user = this.currentUser();
       if (user?.id) {
@@ -179,27 +203,6 @@ export class ProjectMetadataComponent implements OnInit {
     }
   }
 
-  private handleRouteBasedTabSelection(): void {
-    const recordId = this.route.snapshot.paramMap.get('recordId');
-
-    if (!recordId) {
-      this.selectedTab.set('project');
-      this.selectedCedarRecord.set(null);
-      this.selectedCedarTemplate.set(null);
-      return;
-    }
-
-    const tab = this.tabs().find((tab) => tab.id === recordId);
-
-    if (tab) {
-      this.selectedTab.set('project');
-
-      if (tab.type === 'cedar') {
-        this.loadCedarRecord(tab.id);
-      }
-    }
-  }
-
   onTagsChanged(tags: string[]): void {
     const projectId = this.currentProject()?.id;
     if (projectId) {
@@ -234,13 +237,6 @@ export class ProjectMetadataComponent implements OnInit {
     });
   }
 
-  private refreshContributorsData(): void {
-    const projectId = this.route.parent?.parent?.snapshot.params['id'];
-    if (projectId) {
-      this.actions.getContributors(projectId, ResourceType.Project);
-    }
-  }
-
   openEditDescriptionDialog(): void {
     const dialogRef = this.dialogService.open(DescriptionDialogComponent, {
       header: this.translateService.instant('project.metadata.description.dialog.header'),
@@ -459,18 +455,20 @@ export class ProjectMetadataComponent implements OnInit {
   }
 
   onTabChange(tabId: string | number): void {
-    const tab = this.tabs().find((x) => x.id === tabId);
+    const tab = this.tabs().find((x) => x.id === tabId.toString());
 
     if (!tab) {
       return;
     }
 
+    this.selectedTab.set(tab.id);
+
     if (tab.type === 'cedar') {
       this.loadCedarRecord(tab.id);
 
       const currentRecordId = this.route.snapshot.paramMap.get('recordId');
       if (currentRecordId !== tab.id) {
-        this.router.navigate(['..', tab.id], { relativeTo: this.route });
+        this.router.navigate(['metadata', tab.id], { relativeTo: this.route.parent?.parent });
       }
     } else {
       this.selectedCedarRecord.set(null);
@@ -478,38 +476,11 @@ export class ProjectMetadataComponent implements OnInit {
 
       const currentRecordId = this.route.snapshot.paramMap.get('recordId');
       if (currentRecordId) {
-        this.router.navigate(['.'], { relativeTo: this.route });
+        this.router.navigate(['metadata'], { relativeTo: this.route.parent?.parent });
       }
     }
   }
 
-  private loadCedarRecord(recordId: string): void {
-    const records = this.cedarRecords();
-    const templates = this.cedarTemplates();
-
-    const record = records.find((r) => r.id === recordId);
-    if (!record) {
-      return;
-    }
-
-    this.selectedCedarRecord.set(record);
-    this.cedarFormReadonly.set(true);
-
-    const templateId = record.relationships?.template?.data?.id;
-    if (templateId && templates?.data) {
-      const template = templates.data.find((t) => t.id === templateId);
-      if (template) {
-        this.selectedCedarTemplate.set(template);
-      } else {
-        this.selectedCedarTemplate.set(null);
-        this.actions.getCedarTemplates();
-      }
-    } else {
-      this.selectedCedarTemplate.set(null);
-      this.actions.getCedarTemplates();
-    }
-  }
-
   onCedarFormEdit(): void {
     this.cedarFormReadonly.set(false);
   }
@@ -561,4 +532,74 @@ export class ProjectMetadataComponent implements OnInit {
   onCedarFormChangeTemplate(): void {
     this.router.navigate(['add'], { relativeTo: this.route });
   }
+
+  getSubjectChildren(parentId: string) {
+    this.actions.fetchChildrenSubjects(parentId);
+  }
+
+  searchSubjects(search: string) {
+    this.actions.fetchSubjects(ResourceType.Project, this.projectId, search);
+  }
+
+  updateSelectedSubjects(subjects: SubjectModel[]) {
+    this.actions.updateResourceSubjects(this.projectId, ResourceType.Project, subjects);
+  }
+
+  private refreshContributorsData(): void {
+    if (this.projectId) {
+      this.actions.getContributors(this.projectId, ResourceType.Project);
+    }
+  }
+
+  private loadCedarRecord(recordId: string): void {
+    const records = this.cedarRecords();
+    const templates = this.cedarTemplates();
+
+    if (!records) {
+      return;
+    }
+
+    const record = records.find((r) => r.id === recordId);
+    if (!record) {
+      return;
+    }
+
+    this.selectedCedarRecord.set(record);
+    this.cedarFormReadonly.set(true);
+
+    const templateId = record.relationships?.template?.data?.id;
+    if (templateId && templates?.data) {
+      const template = templates.data.find((t) => t.id === templateId);
+      if (template) {
+        this.selectedCedarTemplate.set(template);
+      } else {
+        this.selectedCedarTemplate.set(null);
+        this.actions.getCedarTemplates();
+      }
+    } else {
+      this.selectedCedarTemplate.set(null);
+      this.actions.getCedarTemplates();
+    }
+  }
+
+  private handleRouteBasedTabSelection(): void {
+    const recordId = this.route.snapshot.paramMap.get('recordId');
+
+    if (!recordId) {
+      this.selectedTab.set('project');
+      this.selectedCedarRecord.set(null);
+      this.selectedCedarTemplate.set(null);
+      return;
+    }
+
+    const tab = this.tabs().find((tab) => tab.id === recordId);
+
+    if (tab) {
+      this.selectedTab.set(tab.id);
+
+      if (tab.type === 'cedar') {
+        this.loadCedarRecord(tab.id);
+      }
+    }
+  }
 }
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 b840f42b1..0ee87f0cc 100644
--- a/src/app/features/project/overview/mappers/project-overview.mapper.ts
+++ b/src/app/features/project/overview/mappers/project-overview.mapper.ts
@@ -1,3 +1,5 @@
+import { License } from '@shared/models';
+
 import {
   ComponentGetResponseJsoApi,
   ComponentOverview,
@@ -28,7 +30,7 @@ export class ProjectOverviewMapper {
             year: response.attributes.node_license.year,
           }
         : undefined,
-      license: response.embeds.license?.data?.attributes,
+      license: response.embeds.license?.data?.attributes as unknown as License,
       doi: response.attributes.doi,
       publicationDoi: response.attributes.publication_doi,
       analyticsKey: response.attributes.analytics_key,
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 ce507c7ac..19f8c6f25 100644
--- a/src/app/features/project/overview/models/project-overview.models.ts
+++ b/src/app/features/project/overview/models/project-overview.models.ts
@@ -1,4 +1,5 @@
 import { JsonApiResponse } from '@osf/core/models';
+import { License } from '@shared/models';
 
 export interface ProjectOverviewContributor {
   familyName: string;
@@ -67,11 +68,7 @@ export interface ProjectOverview {
     copyrightHolders: string[];
     year: string;
   };
-  license?: {
-    name: string;
-    text: string;
-    url: string;
-  };
+  license?: License;
   doi?: string;
   publicationDoi?: string;
   storage?: {
@@ -80,19 +77,8 @@ export interface ProjectOverview {
     storageLimitStatus: string;
     storageUsage: string;
   };
-  identifiers?: {
-    id: string;
-    type: string;
-    category: string;
-    value: string;
-  }[];
-  supplements?: {
-    id: string;
-    type: string;
-    title: string;
-    dateCreated: string;
-    url: string;
-  }[];
+  identifiers?: ProjectIdentifiers[];
+  supplements?: ProjectSupplements[];
   analyticsKey: string;
   currentUserCanComment: boolean;
   currentUserPermissions: string[];
@@ -105,13 +91,7 @@ export interface ProjectOverview {
     id: string;
     type: string;
   };
-  affiliatedInstitutions?: {
-    id: string;
-    type: string;
-    name: string;
-    description: string;
-    logo: string;
-  }[];
+  affiliatedInstitutions?: ProjectAffiliatedInstitutions[];
   forksCount: number;
   viewOnlyLinksCount: number;
   links: {
@@ -276,3 +256,26 @@ export interface ProjectOverviewGetResponseJsoApi {
 export interface ProjectOverviewResponseJsonApi extends JsonApiResponse<ProjectOverviewGetResponseJsoApi, null> {
   data: ProjectOverviewGetResponseJsoApi;
 }
+
+export interface ProjectIdentifiers {
+  id: string;
+  type: string;
+  category: string;
+  value: string;
+}
+
+export interface ProjectAffiliatedInstitutions {
+  id: string;
+  type: string;
+  name: string;
+  description: string;
+  logo: string;
+}
+
+export interface ProjectSupplements {
+  id: string;
+  type: string;
+  title: string;
+  dateCreated: string;
+  url: string;
+}
diff --git a/src/app/shared/components/shared-metadata/shared-metadata.component.html b/src/app/shared/components/shared-metadata/shared-metadata.component.html
new file mode 100644
index 000000000..809714297
--- /dev/null
+++ b/src/app/shared/components/shared-metadata/shared-metadata.component.html
@@ -0,0 +1,80 @@
+<div class="flex-column flex flex-1 w-full bg-white lg:flex-row">
+  <div class="col-12 lg:col-6 flex flex-column gap-4">
+    <p-card>
+      <div class="flex justify-content-between flex-wrap gap-4">
+        <div class="flex flex-column gap-2 flex-1">
+          <h2>
+            {{ 'project.overview.metadata.dateCreated' | translate }}
+          </h2>
+
+          <p class="m-0 text-color-secondary">
+            {{ currentInstance().dateCreated | date: 'MMM d, y, h:mm a' }}
+          </p>
+        </div>
+
+        <div class="flex flex-column gap-2 flex-1">
+          <h2>
+            {{ 'project.overview.metadata.dateUpdated' | translate }}
+          </h2>
+
+          <p class="m-0 text-color-secondary">
+            {{ currentInstance().dateModified | date: 'MMM d, y, h:mm a' }}
+          </p>
+        </div>
+      </div>
+    </p-card>
+
+    <osf-project-metadata-contributors
+      (openEditContributorDialog)="openEditContributorDialog.emit()"
+      [contributors]="currentInstance().contributors!"
+    />
+
+    <osf-project-metadata-description
+      (openEditDescriptionDialog)="openEditDescriptionDialog.emit()"
+      [description]="currentInstance().description!"
+    />
+
+    <osf-project-metadata-resource-information
+      (openEditResourceInformationDialog)="openEditResourceInformationDialog.emit()"
+      [customItemMetadata]="customItemMetadata()"
+    />
+
+    <osf-project-metadata-funding
+      (openEditFundingDialog)="openEditFundingDialog.emit()"
+      [supplements]="currentInstance().supplements!"
+    />
+
+    <osf-project-metadata-affiliated-institutions
+      (openEditAffiliatedInstitutionsDialog)="openEditAffiliatedInstitutionsDialog.emit()"
+      [affiliatedInstitutions]="currentInstance().affiliatedInstitutions!"
+    />
+  </div>
+
+  <div class="col-12 lg:col-6 flex flex-column gap-4">
+    <osf-project-metadata-license
+      (openEditLicenseDialog)="openEditLicenseDialog.emit()"
+      [license]="currentInstance().license!"
+    />
+
+    <osf-project-metadata-publication-doi
+      (openEditPublicationDoiDialog)="handleEditDoi.emit()"
+      [identifiers]="currentInstance().identifiers!"
+    />
+
+    <p-card>
+      <div class="flex flex-column gap-3">
+        <h2>{{ 'project.overview.metadata.tags' | translate }}</h2>
+
+        <osf-tags-input (tagsChanged)="tagsChanged.emit($event)" [tags]="currentInstance().tags || []"></osf-tags-input>
+      </div>
+    </p-card>
+
+    <osf-project-metadata-subjects
+      (getSubjectChildren)="getSubjectChildren.emit($event)"
+      (searchSubjects)="searchSubjects.emit($event)"
+      (updateSelectedSubjects)="updateSelectedSubjects.emit($event)"
+      [isSubjectsUpdating]="isSubjectsUpdating()!"
+      [selectedSubjects]="selectedSubjects()"
+    />
+  </div>
+</div>
diff --git a/src/app/shared/components/shared-metadata/shared-metadata.component.spec.ts b/src/app/shared/components/shared-metadata/shared-metadata.component.spec.ts
new file mode 100644
index 000000000..c86786f42
--- /dev/null
+++ b/src/app/shared/components/shared-metadata/shared-metadata.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SharedMetadataComponent } from './shared-metadata.component';
+
+describe('SharedMetadataComponent', () => {
+  let component: SharedMetadataComponent;
+  let fixture: ComponentFixture<SharedMetadataComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SharedMetadataComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SharedMetadataComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/components/shared-metadata/shared-metadata.component.ts b/src/app/shared/components/shared-metadata/shared-metadata.component.ts
new file mode 100644
index 000000000..9ea29c0a6
--- /dev/null
+++ b/src/app/shared/components/shared-metadata/shared-metadata.component.ts
@@ -0,0 +1,61 @@
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { Card } from 'primeng/card';
+
+import { DatePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
+
+import {
+  ProjectMetadataAffiliatedInstitutionsComponent,
+  ProjectMetadataContributorsComponent,
+  ProjectMetadataDescriptionComponent,
+  ProjectMetadataFundingComponent,
+  ProjectMetadataLicenseComponent,
+  ProjectMetadataPublicationDoiComponent,
+  ProjectMetadataResourceInformationComponent,
+  ProjectMetadataSubjectsComponent,
+} from '@osf/features/project/metadata/components';
+import { CustomItemMetadataRecord } from '@osf/features/project/metadata/models';
+import { ProjectOverview } from '@osf/features/project/overview/models';
+import { TagsInputComponent } from '@shared/components';
+import { SubjectModel } from '@shared/models';
+
+@Component({
+  selector: 'osf-shared-metadata',
+  imports: [
+    ProjectMetadataSubjectsComponent,
+    TranslatePipe,
+    TagsInputComponent,
+    ProjectMetadataPublicationDoiComponent,
+    ProjectMetadataLicenseComponent,
+    ProjectMetadataAffiliatedInstitutionsComponent,
+    ProjectMetadataFundingComponent,
+    ProjectMetadataResourceInformationComponent,
+    ProjectMetadataDescriptionComponent,
+    ProjectMetadataContributorsComponent,
+    DatePipe,
+    Card,
+  ],
+  templateUrl: './shared-metadata.component.html',
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class SharedMetadataComponent {
+  currentInstance = input.required<ProjectOverview>();
+  customItemMetadata = input.required<CustomItemMetadataRecord>();
+  selectedSubjects = input.required<SubjectModel[]>();
+  isSubjectsUpdating = input.required<boolean>();
+
+  openEditContributorDialog = output<void>();
+  openEditDescriptionDialog = output<void>();
+  openEditResourceInformationDialog = output<void>();
+  openEditFundingDialog = output<void>();
+  openEditAffiliatedInstitutionsDialog = output<void>();
+  openEditLicenseDialog = output<void>();
+  handleEditDoi = output<void>();
+  tagsChanged = output<string[]>();
+
+  getSubjectChildren = output<string>();
+  searchSubjects = output<string>();
+  updateSelectedSubjects = output<SubjectModel[]>();
+}

From ab3637992e32f7e85199c13b10cfa9bf16562855 Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Mon, 21 Jul 2025 22:47:06 +0300
Subject: [PATCH 2/9] feat(registry-metadata): added page

---
 src/app/features/registry/pages/index.ts      |  1 +
 .../registry-metadata.component.html          |  1 +
 .../registry-metadata.component.scss          |  0
 .../registry-metadata.component.spec.ts       | 22 +++++++++++++++++++
 .../registry-metadata.component.ts            | 10 +++++++++
 src/app/features/registry/registry.routes.ts  |  5 +++++
 6 files changed, 39 insertions(+)
 create mode 100644 src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
 create mode 100644 src/app/features/registry/pages/registry-metadata/registry-metadata.component.scss
 create mode 100644 src/app/features/registry/pages/registry-metadata/registry-metadata.component.spec.ts
 create mode 100644 src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts

diff --git a/src/app/features/registry/pages/index.ts b/src/app/features/registry/pages/index.ts
index de079877f..b6f51cf0b 100644
--- a/src/app/features/registry/pages/index.ts
+++ b/src/app/features/registry/pages/index.ts
@@ -1,2 +1,3 @@
+export * from './registry-metadata/registry-metadata.component';
 export * from '@osf/features/registry/pages/registry-files/registry-files.component';
 export * from '@osf/features/registry/pages/registry-overview/registry-overview.component';
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
new file mode 100644
index 000000000..a94f7cb29
--- /dev/null
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
@@ -0,0 +1 @@
+<p>registry-metadata works!</p>
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.scss b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.spec.ts b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.spec.ts
new file mode 100644
index 000000000..6d4445e0c
--- /dev/null
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RegistryMetadataComponent } from './registry-metadata.component';
+
+describe('RegistryMetadataComponent', () => {
+  let component: RegistryMetadataComponent;
+  let fixture: ComponentFixture<RegistryMetadataComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RegistryMetadataComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(RegistryMetadataComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
new file mode 100644
index 000000000..f3200b694
--- /dev/null
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
@@ -0,0 +1,10 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+
+@Component({
+  selector: 'osf-registry-metadata',
+  imports: [],
+  templateUrl: './registry-metadata.component.html',
+  styleUrl: './registry-metadata.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class RegistryMetadataComponent {}
diff --git a/src/app/features/registry/registry.routes.ts b/src/app/features/registry/registry.routes.ts
index fef5eec8f..e88ab2723 100644
--- a/src/app/features/registry/registry.routes.ts
+++ b/src/app/features/registry/registry.routes.ts
@@ -27,6 +27,11 @@ export const registryRoutes: Routes = [
         loadComponent: () =>
           import('./pages/registry-overview/registry-overview.component').then((c) => c.RegistryOverviewComponent),
       },
+      {
+        path: 'metadata',
+        loadComponent: () =>
+          import('./pages/registry-metadata/registry-metadata.component').then((c) => c.RegistryMetadataComponent),
+      },
       {
         path: 'contributors',
         loadComponent: () =>

From ba89f4080a5e8aa257008631b885931b8aba1af5 Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Tue, 22 Jul 2025 00:50:32 +0300
Subject: [PATCH 3/9] feat(registry-metadata): added structure

---
 .../metadata/project-metadata.component.ts    |  27 +-
 src/app/features/registry/mappers/index.ts    |   1 +
 .../mappers/registry-metadata.mapper.ts       |  92 +++++
 src/app/features/registry/models/index.ts     |   1 +
 .../models/registry-metadata.models.ts        | 195 ++++++++++
 .../registry-metadata.component.html          |  50 ++-
 .../registry-metadata.component.ts            | 209 ++++++++++-
 src/app/features/registry/registry.routes.ts  |   2 +
 src/app/features/registry/services/index.ts   |   1 +
 .../services/registry-metadata.service.ts     | 118 ++++++
 .../registry/store/registry-metadata/index.ts |   4 +
 .../registry-metadata.actions.ts              |  59 +++
 .../registry-metadata.model.ts                |  19 +
 .../registry-metadata.selectors.ts            |  71 ++++
 .../registry-metadata.state.ts                | 346 ++++++++++++++++++
 src/app/shared/services/subjects.service.ts   |  13 +-
 .../stores/subjects/subjects.actions.ts       |   3 +-
 .../shared/stores/subjects/subjects.state.ts  |   7 +-
 18 files changed, 1184 insertions(+), 34 deletions(-)
 create mode 100644 src/app/features/registry/mappers/registry-metadata.mapper.ts
 create mode 100644 src/app/features/registry/models/registry-metadata.models.ts
 create mode 100644 src/app/features/registry/services/registry-metadata.service.ts
 create mode 100644 src/app/features/registry/store/registry-metadata/index.ts
 create mode 100644 src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
 create mode 100644 src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
 create mode 100644 src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
 create mode 100644 src/app/features/registry/store/registry-metadata/registry-metadata.state.ts

diff --git a/src/app/features/project/metadata/project-metadata.component.ts b/src/app/features/project/metadata/project-metadata.component.ts
index 32b64e672..130d5dd1d 100644
--- a/src/app/features/project/metadata/project-metadata.component.ts
+++ b/src/app/features/project/metadata/project-metadata.component.ts
@@ -2,29 +2,17 @@ import { createDispatchMap, select } from '@ngxs/store';
 
 import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 
-import { Card } from 'primeng/card';
 import { DialogService } from 'primeng/dynamicdialog';
 import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs';
 
 import { EMPTY, filter, switchMap } from 'rxjs';
 
-import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { UserSelectors } from '@osf/core/store/user';
-import {
-  CedarTemplateFormComponent,
-  ProjectMetadataAffiliatedInstitutionsComponent,
-  ProjectMetadataContributorsComponent,
-  ProjectMetadataDescriptionComponent,
-  ProjectMetadataFundingComponent,
-  ProjectMetadataLicenseComponent,
-  ProjectMetadataPublicationDoiComponent,
-  ProjectMetadataResourceInformationComponent,
-  ProjectMetadataSubjectsComponent,
-} from '@osf/features/project/metadata/components';
+import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
 import {
   AffiliatedInstitutionsDialogComponent,
   ContributorsDialogComponent,
@@ -62,7 +50,7 @@ import {
   SubjectsSelectors,
   UpdateResourceSubjects,
 } from '@osf/shared/stores';
-import { LoadingSpinnerComponent, SubHeaderComponent, TagsInputComponent } from '@shared/components';
+import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
 import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
 import { SubjectModel } from '@shared/models';
 import { CustomConfirmationService, LoaderService, ToastService } from '@shared/services';
@@ -71,16 +59,6 @@ import { CustomConfirmationService, LoaderService, ToastService } from '@shared/
   selector: 'osf-project-metadata',
   imports: [
     SubHeaderComponent,
-    Card,
-    DatePipe,
-    ProjectMetadataContributorsComponent,
-    ProjectMetadataDescriptionComponent,
-    ProjectMetadataResourceInformationComponent,
-    ProjectMetadataLicenseComponent,
-    ProjectMetadataPublicationDoiComponent,
-    ProjectMetadataSubjectsComponent,
-    ProjectMetadataFundingComponent,
-    ProjectMetadataAffiliatedInstitutionsComponent,
     CedarTemplateFormComponent,
     TranslatePipe,
     Tab,
@@ -89,7 +67,6 @@ import { CustomConfirmationService, LoaderService, ToastService } from '@shared/
     TabPanels,
     Tabs,
     LoadingSpinnerComponent,
-    TagsInputComponent,
     SharedMetadataComponent,
   ],
   templateUrl: './project-metadata.component.html',
diff --git a/src/app/features/registry/mappers/index.ts b/src/app/features/registry/mappers/index.ts
index 2d7d7308c..629991406 100644
--- a/src/app/features/registry/mappers/index.ts
+++ b/src/app/features/registry/mappers/index.ts
@@ -1,2 +1,3 @@
+export * from './registry-metadata.mapper';
 export * from './registry-overview.mapper';
 export * from './registry-schema-block.mapper';
diff --git a/src/app/features/registry/mappers/registry-metadata.mapper.ts b/src/app/features/registry/mappers/registry-metadata.mapper.ts
new file mode 100644
index 000000000..5638443c9
--- /dev/null
+++ b/src/app/features/registry/mappers/registry-metadata.mapper.ts
@@ -0,0 +1,92 @@
+import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
+import { RegistryStatus, RevisionReviewStates } from '@shared/enums';
+
+import {
+  BibliographicContributor,
+  BibliographicContributorData,
+  BibliographicContributorsJsonApi,
+} from '../models/registry-metadata.models';
+import { RegistryOverview } from '../models/registry-overview.models';
+
+export class RegistryMetadataMapper {
+  static fromMetadataApiResponse(response: Record<string, unknown>): RegistryOverview {
+    const attributes = response['attributes'] as Record<string, unknown>;
+    const embeds = response['embeds'] as Record<string, unknown>;
+
+    const contributors: ProjectOverviewContributor[] = [];
+    if (embeds && embeds['contributors']) {
+      const contributorsData = (embeds['contributors'] as Record<string, unknown>)['data'] as Record<string, unknown>[];
+      contributorsData?.forEach((contributor) => {
+        const contributorEmbeds = contributor['embeds'] as Record<string, unknown>;
+        if (contributorEmbeds && contributorEmbeds['users']) {
+          const userData = (contributorEmbeds['users'] as Record<string, unknown>)['data'] as Record<string, unknown>;
+          const userAttributes = userData['attributes'] as Record<string, unknown>;
+
+          contributors.push({
+            id: userData['id'] as string,
+            type: userData['type'] as string,
+            fullName: userAttributes['full_name'] as string,
+            givenName: userAttributes['given_name'] as string,
+            familyName: userAttributes['family_name'] as string,
+            middleName: (userAttributes['middle_name'] as string) || '',
+          });
+        }
+      });
+    }
+
+    return {
+      id: response['id'] as string,
+      type: (response['type'] as string) || 'registrations',
+      title: attributes['title'] as string,
+      description: attributes['description'] as string,
+      category: attributes['category'] as string,
+      tags: (attributes['tags'] as string[]) || [],
+      dateCreated: attributes['date_created'] as string,
+      dateModified: attributes['date_modified'] as string,
+      dateRegistered: attributes['date_registered'] as string,
+      registrationType: (attributes['registration_type'] as string) || '',
+      doi: (attributes['doi'] as string) || '',
+      isPublic: attributes['public'] as boolean,
+      isFork: attributes['fork'] as boolean,
+      accessRequestsEnabled: attributes['access_requests_enabled'] as boolean,
+      wikiEnabled: attributes['wiki_enabled'] as boolean,
+      currentUserCanComment: attributes['current_user_can_comment'] as boolean,
+      currentUserPermissions: (attributes['current_user_permissions'] as string[]) || [],
+      currentUserIsContributor: attributes['current_user_is_contributor'] as boolean,
+      currentUserIsContributorOrGroupMember: attributes['current_user_is_contributor_or_group_member'] as boolean,
+      analyticsKey: (attributes['analytics_key'] as string) || '',
+      contributors: contributors,
+      subjects: Array.isArray(attributes['subjects']) ? attributes['subjects'].flat() : attributes['subjects'],
+      forksCount: 0,
+      citation: '',
+      hasData: false,
+      hasAnalyticCode: false,
+      hasMaterials: false,
+      hasPapers: false,
+      hasSupplements: false,
+      questions: {},
+      registrationSchemaLink: '',
+      associatedProjectId: '',
+      schemaResponses: [],
+      status: attributes['status'] as RegistryStatus,
+      revisionStatus: attributes['revision_status'] as RevisionReviewStates,
+      links: {
+        files: '',
+      },
+    } as RegistryOverview;
+  }
+
+  static mapBibliographicContributors(response: BibliographicContributorsJsonApi): BibliographicContributor[] {
+    return response.data.map((contributor: BibliographicContributorData) => ({
+      id: contributor.id,
+      index: contributor.attributes.index,
+      user: {
+        id: contributor.embeds.users.data.id,
+        fullName: contributor.embeds.users.data.attributes.full_name,
+        profileImage: contributor.embeds.users.data.links.profile_image,
+        htmlUrl: contributor.embeds.users.data.links.html,
+        iri: contributor.embeds.users.data.links.iri,
+      },
+    }));
+  }
+}
diff --git a/src/app/features/registry/models/index.ts b/src/app/features/registry/models/index.ts
index 05202a94a..1bb999279 100644
--- a/src/app/features/registry/models/index.ts
+++ b/src/app/features/registry/models/index.ts
@@ -3,6 +3,7 @@ export * from './get-registry-overview-json-api.model';
 export * from './get-registry-schema-block-json-api.model';
 export * from './get-resource-subjects-json-api.model';
 export * from './registry-institution.model';
+export * from './registry-metadata.models';
 export * from './registry-overview.models';
 export * from './registry-schema-block.model';
 export * from './registry-subject.model';
diff --git a/src/app/features/registry/models/registry-metadata.models.ts b/src/app/features/registry/models/registry-metadata.models.ts
new file mode 100644
index 000000000..0a5e7d1bc
--- /dev/null
+++ b/src/app/features/registry/models/registry-metadata.models.ts
@@ -0,0 +1,195 @@
+export interface BibliographicContributorsJsonApi {
+  data: BibliographicContributorData[];
+  meta: {
+    total: number;
+    per_page: number;
+    total_bibliographic: number;
+    version: string;
+  };
+  links: {
+    self: string;
+    first: string | null;
+    last: string | null;
+    prev: string | null;
+    next: string | null;
+  };
+}
+
+export interface BibliographicContributorData {
+  id: string;
+  type: string;
+  attributes: {
+    index: number;
+  };
+  relationships: {
+    users: {
+      links: {
+        related: {
+          href: string;
+          meta: Record<string, unknown>;
+        };
+      };
+      data: {
+        id: string;
+        type: string;
+      };
+    };
+  };
+  embeds: {
+    users: {
+      data: {
+        id: string;
+        type: string;
+        attributes: {
+          full_name: string;
+        };
+        links: {
+          html: string;
+          profile_image: string;
+          self: string;
+          iri: string;
+        };
+      };
+    };
+  };
+  links: {
+    self: string;
+  };
+}
+
+export interface BibliographicContributor {
+  id: string;
+  index: number;
+  user: {
+    id: string;
+    fullName: string;
+    profileImage: string;
+    htmlUrl: string;
+    iri: string;
+  };
+}
+
+export interface CustomItemMetadataRecord {
+  language?: string;
+  resource_type_general?: string;
+  funders?: {
+    funder_name: string;
+    funder_identifier?: string;
+    funder_identifier_type?: string;
+    award_number?: string;
+    award_uri?: string;
+    award_title?: string;
+  }[];
+}
+
+export interface CustomItemMetadataResponse {
+  data: {
+    id: string;
+    type: string;
+    attributes: CustomItemMetadataRecord;
+  };
+}
+
+export interface CrossRefFunder {
+  id: number;
+  location: string;
+  name: string;
+  alt_names: string[];
+  uri: string;
+  replaces: number[];
+  replaced_by: number | null;
+  tokens: string[];
+}
+
+export interface CrossRefFundersResponse {
+  status: string;
+  message_type: string;
+  message_version: string;
+  message: {
+    facets: Record<string, unknown>;
+    total_results: number;
+    items: CrossRefFunder[];
+    items_per_page: number;
+  };
+}
+
+export interface UserInstitution {
+  id: string;
+  type: string;
+  attributes: {
+    name: string;
+    description: string;
+    logo_path: string | null;
+  };
+}
+
+export interface UserInstitutionsResponse {
+  data: UserInstitution[];
+  meta: {
+    total: number;
+    per_page: number;
+    version: string;
+  };
+  links: {
+    self: string;
+    first: string | null;
+    last: string | null;
+    prev: string | null;
+    next: string | null;
+  };
+}
+
+export interface RegistryMetadata {
+  tags?: string[];
+  description?: string;
+  category?: string;
+  doi?: boolean;
+  node_license?: {
+    id: string;
+    type: string;
+  };
+  institutions?: {
+    id: string;
+    type: string;
+  }[];
+}
+
+export interface RegistrySubjectsJsonApi {
+  data: RegistrySubjectData[];
+  links: {
+    first: string | null;
+    last: string | null;
+    prev: string | null;
+    next: string | null;
+    meta: {
+      total: number;
+      per_page: number;
+    };
+  };
+  meta: {
+    version: string;
+  };
+}
+
+export interface RegistrySubjectData {
+  id: string;
+  type: string;
+  attributes: {
+    text: string;
+    taxonomy_name: string;
+  };
+  relationships: {
+    children: {
+      links: {
+        related: {
+          href: string;
+          meta: Record<string, unknown>;
+        };
+      };
+    };
+  };
+  links: {
+    self: string;
+    iri: string;
+  };
+}
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
index a94f7cb29..2c9fb9c88 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
@@ -1 +1,49 @@
-<p>registry-metadata works!</p>
+<section class="flex flex-column flex-1">
+  <osf-sub-header
+    [showButton]="true"
+    [buttonLabel]="'project.metadata.addCommunityMetadataRecord.title' | translate"
+    (buttonClick)="openAddRecord()"
+    [title]="'project.overview.metadata.title' | translate"
+  />
+  @if (!tabs().length) {
+    <div class="flex-1">
+      <osf-loading-spinner />
+    </div>
+  }
+
+  @if (tabs().length) {
+    <p-tabs class="flex-1" [value]="selectedTab()" [lazy]="true" scrollable>
+      <p-tablist class="pr-5 pl-5">
+        @for (item of tabs(); track $index) {
+          <p-tab [value]="item.id">{{ item.label | translate }}</p-tab>
+        }
+      </p-tablist>
+
+      <p-tabpanels class="p-3 flex-1 md:p-5 xl:p-4">
+        @for (tab of tabs(); track $index) {
+          <p-tabpanel [value]="tab.id">
+            @if (tab.type === 'registry') {
+              <osf-shared-metadata
+                [selectedSubjects]="selectedSubjects()"
+                [isSubjectsUpdating]="isSubjectsUpdating()"
+                [currentInstance]="getCurrentInstanceForTemplate()"
+                [customItemMetadata]="getCustomMetadataForTemplate()"
+                (openEditContributorDialog)="openEditContributorDialog()"
+                (openEditDescriptionDialog)="openEditDescriptionDialog()"
+                (openEditResourceInformationDialog)="openEditResourceInformationDialog()"
+                (openEditFundingDialog)="openEditFundingDialog()"
+                (openEditAffiliatedInstitutionsDialog)="openEditAffiliatedInstitutionsDialog()"
+                (openEditLicenseDialog)="openEditLicenseDialog()"
+                (handleEditDoi)="handleEditDoi()"
+                (tagsChanged)="onTagsChanged($event)"
+                (getSubjectChildren)="getSubjectChildren($event)"
+                (searchSubjects)="searchSubjects($event)"
+                (updateSelectedSubjects)="updateSelectedSubjects($event)"
+              />
+            }
+          </p-tabpanel>
+        }
+      </p-tabpanels>
+    </p-tabs>
+  }
+</section>
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
index f3200b694..0ca218bf8 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
@@ -1,10 +1,213 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { createDispatchMap, select } from '@ngxs/store';
+
+import { TranslatePipe, TranslateService } from '@ngx-translate/core';
+
+import { DialogService } from 'primeng/dynamicdialog';
+import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs';
+
+import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit, signal } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { UserSelectors } from '@osf/core/store/user';
+import { CustomItemMetadataRecord } from '@osf/features/project/metadata/models';
+import { ProjectOverview } from '@osf/features/project/overview/models';
+import {
+  ContributorsSelectors,
+  FetchChildrenSubjects,
+  FetchSelectedSubjects,
+  FetchSubjects,
+  GetAllContributors,
+  SubjectsSelectors,
+  UpdateResourceSubjects,
+} from '@osf/shared/stores';
+import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
+import { ResourceType } from '@shared/enums';
+import { SubjectModel } from '@shared/models';
+import { CustomConfirmationService, LoaderService, ToastService } from '@shared/services';
+
+import {
+  GetBibliographicContributors,
+  GetCustomItemMetadata,
+  GetFundersList,
+  GetRegistryForMetadata,
+  GetRegistrySubjects,
+  GetUserInstitutions,
+  RegistryMetadataSelectors,
+  UpdateCustomItemMetadata,
+  UpdateRegistryDetails,
+} from '../../store/registry-metadata';
 
 @Component({
   selector: 'osf-registry-metadata',
-  imports: [],
+  imports: [
+    SubHeaderComponent,
+    TranslatePipe,
+    Tab,
+    TabList,
+    TabPanel,
+    TabPanels,
+    Tabs,
+    LoadingSpinnerComponent,
+    SharedMetadataComponent,
+  ],
   templateUrl: './registry-metadata.component.html',
   styleUrl: './registry-metadata.component.scss',
+  providers: [DialogService],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
-export class RegistryMetadataComponent {}
+export class RegistryMetadataComponent implements OnInit {
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+  private readonly destroyRef = inject(DestroyRef);
+  private readonly dialogService = inject(DialogService);
+  private readonly translateService = inject(TranslateService);
+  private readonly toastService = inject(ToastService);
+  private readonly loaderService = inject(LoaderService);
+  private readonly customConfirmationService = inject(CustomConfirmationService);
+
+  private registryId = '';
+
+  tabs = signal<{ id: string; label: string; type: 'registry' }[]>([]);
+  protected readonly selectedTab = signal('registry');
+
+  protected actions = createDispatchMap({
+    getRegistry: GetRegistryForMetadata,
+    getBibliographicContributors: GetBibliographicContributors,
+    updateRegistryDetails: UpdateRegistryDetails,
+    getCustomItemMetadata: GetCustomItemMetadata,
+    updateCustomItemMetadata: UpdateCustomItemMetadata,
+    getFundersList: GetFundersList,
+    getContributors: GetAllContributors,
+    getUserInstitutions: GetUserInstitutions,
+    getRegistrySubjects: GetRegistrySubjects,
+
+    fetchSubjects: FetchSubjects,
+    fetchSelectedSubjects: FetchSelectedSubjects,
+    fetchChildrenSubjects: FetchChildrenSubjects,
+    updateResourceSubjects: UpdateResourceSubjects,
+  });
+
+  protected currentRegistry = select(RegistryMetadataSelectors.getRegistry);
+  protected currentRegistryLoading = select(RegistryMetadataSelectors.getRegistryLoading);
+  protected bibliographicContributors = select(RegistryMetadataSelectors.getBibliographicContributors);
+  protected bibliographicContributorsLoading = select(RegistryMetadataSelectors.getBibliographicContributorsLoading);
+  protected customItemMetadata = select(RegistryMetadataSelectors.getCustomItemMetadata);
+  protected fundersList = select(RegistryMetadataSelectors.getFundersList);
+  protected contributors = select(ContributorsSelectors.getContributors);
+  protected isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
+  protected currentUser = select(UserSelectors.getCurrentUser);
+  protected selectedSubjects = select(SubjectsSelectors.getSelectedSubjects);
+  protected isSubjectsUpdating = select(SubjectsSelectors.areSelectedSubjectsLoading);
+
+  constructor() {
+    effect(() => {
+      const registry = this.currentRegistry();
+      if (!registry) return;
+
+      const baseTabs = [{ id: 'registry', label: registry.title, type: 'registry' as const }];
+
+      this.tabs.set(baseTabs);
+    });
+  }
+
+  ngOnInit(): void {
+    this.registryId = this.route.parent?.parent?.snapshot.params['id'];
+
+    if (this.registryId) {
+      this.actions.getRegistry(this.registryId);
+      this.actions.getBibliographicContributors(this.registryId);
+      this.actions.getCustomItemMetadata(this.registryId);
+      this.actions.getContributors(this.registryId, ResourceType.Registration);
+      this.actions.getRegistrySubjects(this.registryId);
+      this.actions.fetchSubjects(ResourceType.Registration, this.registryId, '', true);
+      this.actions.fetchSelectedSubjects(this.registryId, ResourceType.Registration);
+
+      const user = this.currentUser();
+      if (user?.id) {
+        this.actions.getUserInstitutions(user.id);
+      }
+    }
+  }
+
+  openAddRecord(): void {
+    this.router.navigate(['add'], { relativeTo: this.route });
+  }
+
+  onTagsChanged(tags: string[]): void {
+    const registryId = this.currentRegistry()?.id;
+    if (registryId) {
+      this.actions.updateRegistryDetails(registryId, { tags });
+    }
+  }
+
+  openEditContributorDialog(): void {
+    // Similar implementation to project metadata
+    // For now, just show the bibliographic contributors from the API
+    console.log('Bibliographic contributors:', this.bibliographicContributors());
+  }
+
+  openEditDescriptionDialog(): void {
+    // Similar implementation to project metadata
+    console.log('Edit description for registry:', this.currentRegistry());
+  }
+
+  openEditResourceInformationDialog(): void {
+    // Similar implementation to project metadata
+    console.log('Edit resource information for registry:', this.currentRegistry());
+  }
+
+  openEditLicenseDialog(): void {
+    // Similar implementation to project metadata
+    console.log('Edit license for registry:', this.currentRegistry());
+  }
+
+  openEditFundingDialog(): void {
+    this.actions.getFundersList();
+    // Similar implementation to project metadata
+    console.log('Edit funding for registry:', this.currentRegistry());
+  }
+
+  openEditAffiliatedInstitutionsDialog(): void {
+    // Similar implementation to project metadata
+    console.log('Edit affiliated institutions for registry:', this.currentRegistry());
+  }
+
+  handleEditDoi(): void {
+    this.customConfirmationService.confirmDelete({
+      headerKey: this.translateService.instant('project.metadata.doi.dialog.createConfirm.header'),
+      messageKey: this.translateService.instant('project.metadata.doi.dialog.createConfirm.message'),
+      acceptLabelKey: this.translateService.instant('common.buttons.create'),
+      acceptLabelType: 'primary',
+      onConfirm: () => {
+        const registryId = this.currentRegistry()?.id;
+        if (registryId) {
+          this.actions.updateRegistryDetails(registryId, { doi: true }).subscribe({
+            next: () => this.toastService.showSuccess('registry.metadata.doi.created'),
+          });
+        }
+      },
+    });
+  }
+
+  getSubjectChildren(parentId: string) {
+    this.actions.fetchChildrenSubjects(parentId);
+  }
+
+  searchSubjects(search: string) {
+    this.actions.fetchSubjects(ResourceType.Registration, this.registryId, search, true);
+  }
+
+  updateSelectedSubjects(subjects: SubjectModel[]) {
+    this.actions.updateResourceSubjects(this.registryId, ResourceType.Registration, subjects);
+  }
+
+  getCurrentInstanceForTemplate(): ProjectOverview {
+    return this.currentRegistry() as unknown as ProjectOverview;
+  }
+
+  getCustomMetadataForTemplate(): CustomItemMetadataRecord {
+    return this.customItemMetadata() as unknown as CustomItemMetadataRecord;
+  }
+}
diff --git a/src/app/features/registry/registry.routes.ts b/src/app/features/registry/registry.routes.ts
index e88ab2723..b629556f9 100644
--- a/src/app/features/registry/registry.routes.ts
+++ b/src/app/features/registry/registry.routes.ts
@@ -3,6 +3,7 @@ import { provideStates } from '@ngxs/store';
 import { Routes } from '@angular/router';
 
 import { RegistryFilesState } from '@osf/features/registry/store/registry-files';
+import { RegistryMetadataState } from '@osf/features/registry/store/registry-metadata';
 import { RegistryOverviewState } from '@osf/features/registry/store/registry-overview';
 import { ResourceType } from '@osf/shared/enums';
 import { ContributorsState, ViewOnlyLinkState } from '@osf/shared/stores';
@@ -31,6 +32,7 @@ export const registryRoutes: Routes = [
         path: 'metadata',
         loadComponent: () =>
           import('./pages/registry-metadata/registry-metadata.component').then((c) => c.RegistryMetadataComponent),
+        providers: [provideStates([RegistryMetadataState])],
       },
       {
         path: 'contributors',
diff --git a/src/app/features/registry/services/index.ts b/src/app/features/registry/services/index.ts
index 08edb6ef5..e65075448 100644
--- a/src/app/features/registry/services/index.ts
+++ b/src/app/features/registry/services/index.ts
@@ -1 +1,2 @@
+export * from './registry-metadata.service';
 export * from './registry-overview.service';
diff --git a/src/app/features/registry/services/registry-metadata.service.ts b/src/app/features/registry/services/registry-metadata.service.ts
new file mode 100644
index 000000000..92483afe4
--- /dev/null
+++ b/src/app/features/registry/services/registry-metadata.service.ts
@@ -0,0 +1,118 @@
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { inject, Injectable } from '@angular/core';
+
+import { JsonApiService } from '@osf/core/services';
+
+import { RegistryMetadataMapper } from '../mappers';
+import {
+  BibliographicContributorsJsonApi,
+  CrossRefFundersResponse,
+  CustomItemMetadataRecord,
+  CustomItemMetadataResponse,
+  RegistryOverview,
+  RegistrySubjectsJsonApi,
+  UserInstitutionsResponse,
+} from '../models';
+
+import { environment } from 'src/environments/environment';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class RegistryMetadataService {
+  private readonly jsonApiService = inject(JsonApiService);
+  private readonly apiUrl = environment.apiUrl;
+
+  getBibliographicContributors(
+    registryId: string,
+    page = 1,
+    pageSize = 100
+  ): Observable<BibliographicContributorsJsonApi> {
+    const params: Record<string, unknown> = {
+      'fields[contributors]': 'index,users',
+      'fields[users]': 'full_name',
+      page: page,
+      'page[size]': pageSize,
+    };
+
+    return this.jsonApiService.get<BibliographicContributorsJsonApi>(
+      `${this.apiUrl}/registrations/${registryId}/bibliographic_contributors/`,
+      params
+    );
+  }
+
+  getCustomItemMetadata(guid: string): Observable<CustomItemMetadataResponse> {
+    return this.jsonApiService.get<CustomItemMetadataResponse>(`${this.apiUrl}/custom_item_metadata_records/${guid}/`);
+  }
+
+  updateCustomItemMetadata(guid: string, metadata: CustomItemMetadataRecord): Observable<CustomItemMetadataResponse> {
+    return this.jsonApiService.put<CustomItemMetadataResponse>(`${this.apiUrl}/custom_item_metadata_records/${guid}/`, {
+      data: {
+        type: 'custom-item-metadata-records',
+        attributes: metadata,
+      },
+    });
+  }
+
+  getFundersList(searchQuery?: string): Observable<CrossRefFundersResponse> {
+    let url = environment.funderApiUrl;
+
+    if (searchQuery && searchQuery.trim()) {
+      url += `&query=${encodeURIComponent(searchQuery.trim())}`;
+    }
+
+    return this.jsonApiService.get<CrossRefFundersResponse>(url);
+  }
+
+  getRegistryForMetadata(registryId: string): Observable<RegistryOverview> {
+    const params: Record<string, unknown> = {
+      'embed[]': ['contributors', 'affiliated_institutions', 'identifiers', 'license', 'subjects_acceptable'],
+      'fields[institutions]': 'assets,description,name',
+      'fields[users]': 'family_name,full_name,given_name,middle_name',
+      'fields[subjects]': 'text,taxonomy',
+    };
+
+    return this.jsonApiService
+      .get<{ data: Record<string, unknown> }>(`${environment.apiUrl}/registrations/${registryId}/`, params)
+      .pipe(map((response) => RegistryMetadataMapper.fromMetadataApiResponse(response.data)));
+  }
+
+  updateRegistryDetails(registryId: string, updates: Partial<Record<string, unknown>>): Observable<RegistryOverview> {
+    const payload = {
+      data: {
+        id: registryId,
+        type: 'registrations',
+        attributes: updates,
+      },
+    };
+
+    return this.jsonApiService
+      .patch<Record<string, unknown>>(`${this.apiUrl}/registrations/${registryId}`, payload)
+      .pipe(map((response) => RegistryMetadataMapper.fromMetadataApiResponse(response)));
+  }
+
+  getUserInstitutions(userId: string, page = 1, pageSize = 10): Observable<UserInstitutionsResponse> {
+    const params = {
+      page: page.toString(),
+      'page[size]': pageSize.toString(),
+    };
+
+    return this.jsonApiService.get<UserInstitutionsResponse>(`${this.apiUrl}/users/${userId}/institutions/`, {
+      params,
+    });
+  }
+
+  getRegistrySubjects(registryId: string, page = 1, pageSize = 100): Observable<RegistrySubjectsJsonApi> {
+    const params: Record<string, unknown> = {
+      'page[size]': pageSize,
+      page: page,
+    };
+
+    return this.jsonApiService.get<RegistrySubjectsJsonApi>(
+      `${this.apiUrl}/registrations/${registryId}/subjects/`,
+      params
+    );
+  }
+}
diff --git a/src/app/features/registry/store/registry-metadata/index.ts b/src/app/features/registry/store/registry-metadata/index.ts
new file mode 100644
index 000000000..d73dba1f8
--- /dev/null
+++ b/src/app/features/registry/store/registry-metadata/index.ts
@@ -0,0 +1,4 @@
+export * from './registry-metadata.actions';
+export * from './registry-metadata.model';
+export * from './registry-metadata.selectors';
+export * from './registry-metadata.state';
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
new file mode 100644
index 000000000..fb98bb5c0
--- /dev/null
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
@@ -0,0 +1,59 @@
+import { CustomItemMetadataRecord, RegistryMetadata } from '../../models/registry-metadata.models';
+
+export class GetRegistryForMetadata {
+  static readonly type = '[RegistryMetadata] Get Registry For Metadata';
+  constructor(public registryId: string) {}
+}
+
+export class GetBibliographicContributors {
+  static readonly type = '[RegistryMetadata] Get Bibliographic Contributors';
+  constructor(
+    public registryId: string,
+    public page?: number,
+    public pageSize?: number
+  ) {}
+}
+
+export class GetCustomItemMetadata {
+  static readonly type = '[RegistryMetadata] Get Custom Item Metadata';
+  constructor(public guid: string) {}
+}
+
+export class UpdateCustomItemMetadata {
+  static readonly type = '[RegistryMetadata] Update Custom Item Metadata';
+  constructor(
+    public guid: string,
+    public metadata: CustomItemMetadataRecord
+  ) {}
+}
+
+export class UpdateRegistryDetails {
+  static readonly type = '[RegistryMetadata] Update Registry Details';
+  constructor(
+    public registryId: string,
+    public updates: Partial<RegistryMetadata>
+  ) {}
+}
+
+export class GetFundersList {
+  static readonly type = '[RegistryMetadata] Get Funders List';
+  constructor(public search?: string) {}
+}
+
+export class GetUserInstitutions {
+  static readonly type = '[RegistryMetadata] Get User Institutions';
+  constructor(
+    public userId: string,
+    public page?: number,
+    public pageSize?: number
+  ) {}
+}
+
+export class GetRegistrySubjects {
+  static readonly type = '[RegistryMetadata] Get Registry Subjects';
+  constructor(
+    public registryId: string,
+    public page?: number,
+    public pageSize?: number
+  ) {}
+}
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
new file mode 100644
index 000000000..7956d36e1
--- /dev/null
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
@@ -0,0 +1,19 @@
+import { AsyncStateModel } from '@shared/models';
+
+import { RegistryOverview } from '../../models';
+import {
+  BibliographicContributor,
+  CrossRefFunder,
+  CustomItemMetadataRecord,
+  RegistrySubjectData,
+  UserInstitution,
+} from '../../models/registry-metadata.models';
+
+export interface RegistryMetadataStateModel {
+  registry: AsyncStateModel<RegistryOverview | null>;
+  bibliographicContributors: AsyncStateModel<BibliographicContributor[]>;
+  customItemMetadata: AsyncStateModel<CustomItemMetadataRecord | null>;
+  fundersList: AsyncStateModel<CrossRefFunder[]>;
+  userInstitutions: AsyncStateModel<UserInstitution[]>;
+  subjects: AsyncStateModel<RegistrySubjectData[]>;
+}
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
new file mode 100644
index 000000000..75465dab7
--- /dev/null
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
@@ -0,0 +1,71 @@
+import { Selector } from '@ngxs/store';
+
+import { RegistryMetadataStateModel } from './registry-metadata.model';
+import { RegistryMetadataState } from './registry-metadata.state';
+
+export class RegistryMetadataSelectors {
+  @Selector([RegistryMetadataState])
+  static getRegistry(state: RegistryMetadataStateModel) {
+    return state.registry.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getRegistryLoading(state: RegistryMetadataStateModel) {
+    return state.registry.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getBibliographicContributors(state: RegistryMetadataStateModel) {
+    return state.bibliographicContributors.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getBibliographicContributorsLoading(state: RegistryMetadataStateModel) {
+    return state.bibliographicContributors.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getCustomItemMetadata(state: RegistryMetadataStateModel) {
+    return state.customItemMetadata.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getCustomItemMetadataLoading(state: RegistryMetadataStateModel) {
+    return state.customItemMetadata.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getFundersList(state: RegistryMetadataStateModel) {
+    return state.fundersList.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getFundersLoading(state: RegistryMetadataStateModel) {
+    return state.fundersList.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getUserInstitutions(state: RegistryMetadataStateModel) {
+    return state.userInstitutions.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getUserInstitutionsLoading(state: RegistryMetadataStateModel): boolean {
+    return state.userInstitutions.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getSubjects(state: RegistryMetadataStateModel) {
+    return state.subjects.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getSubjectsLoading(state: RegistryMetadataStateModel) {
+    return state.subjects.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getError(state: RegistryMetadataStateModel) {
+    return state.registry.error;
+  }
+}
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
new file mode 100644
index 000000000..c0df0f460
--- /dev/null
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
@@ -0,0 +1,346 @@
+import { Action, State, StateContext } from '@ngxs/store';
+
+import { finalize, tap } from 'rxjs';
+
+import { inject, Injectable } from '@angular/core';
+
+import { RegistryMetadataMapper } from '../../mappers';
+import { RegistryMetadataService } from '../../services/registry-metadata.service';
+
+import {
+  GetBibliographicContributors,
+  GetCustomItemMetadata,
+  GetFundersList,
+  GetRegistryForMetadata,
+  GetRegistrySubjects,
+  GetUserInstitutions,
+  UpdateCustomItemMetadata,
+  UpdateRegistryDetails,
+} from './registry-metadata.actions';
+import { RegistryMetadataStateModel } from './registry-metadata.model';
+
+const initialState: RegistryMetadataStateModel = {
+  registry: { data: null, isLoading: false, error: null },
+  bibliographicContributors: { data: [], isLoading: false, error: null },
+  customItemMetadata: { data: null, isLoading: false, error: null },
+  fundersList: { data: [], isLoading: false, error: null },
+  userInstitutions: { data: [], isLoading: false, error: null },
+  subjects: { data: [], isLoading: false, error: null },
+};
+
+@State<RegistryMetadataStateModel>({
+  name: 'registryMetadata',
+  defaults: initialState,
+})
+@Injectable()
+export class RegistryMetadataState {
+  private readonly registryMetadataService = inject(RegistryMetadataService);
+
+  @Action(GetRegistryForMetadata)
+  getRegistryForMetadata(ctx: StateContext<RegistryMetadataStateModel>, action: GetRegistryForMetadata) {
+    ctx.patchState({
+      registry: {
+        data: null,
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService.getRegistryForMetadata(action.registryId).pipe(
+      tap({
+        next: (registry) => {
+          ctx.patchState({
+            registry: {
+              data: registry,
+              isLoading: false,
+              error: null,
+            },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            registry: {
+              data: ctx.getState().registry.data,
+              error: error.message,
+              isLoading: false,
+            },
+          });
+        },
+      }),
+      finalize(() =>
+        ctx.patchState({
+          registry: {
+            data: ctx.getState().registry.data,
+            error: null,
+            isLoading: false,
+          },
+        })
+      )
+    );
+  }
+
+  @Action(GetBibliographicContributors)
+  getBibliographicContributors(ctx: StateContext<RegistryMetadataStateModel>, action: GetBibliographicContributors) {
+    ctx.patchState({
+      bibliographicContributors: {
+        data: [],
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService
+      .getBibliographicContributors(action.registryId, action.page, action.pageSize)
+      .pipe(
+        tap({
+          next: (response) => {
+            const contributors = RegistryMetadataMapper.mapBibliographicContributors(response);
+            ctx.patchState({
+              bibliographicContributors: {
+                data: contributors,
+                isLoading: false,
+                error: null,
+              },
+            });
+          },
+          error: (error) => {
+            ctx.patchState({
+              bibliographicContributors: {
+                data: [],
+                isLoading: false,
+                error: error.message,
+              },
+            });
+          },
+        }),
+        finalize(() =>
+          ctx.patchState({
+            bibliographicContributors: {
+              ...ctx.getState().bibliographicContributors,
+              isLoading: false,
+            },
+          })
+        )
+      );
+  }
+
+  @Action(GetRegistrySubjects)
+  getRegistrySubjects(ctx: StateContext<RegistryMetadataStateModel>, action: GetRegistrySubjects) {
+    ctx.patchState({
+      subjects: {
+        data: [],
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService.getRegistrySubjects(action.registryId, action.page, action.pageSize).pipe(
+      tap({
+        next: (response) => {
+          ctx.patchState({
+            subjects: {
+              data: response.data,
+              isLoading: false,
+              error: null,
+            },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            subjects: {
+              data: [],
+              isLoading: false,
+              error: error.message,
+            },
+          });
+        },
+      }),
+      finalize(() =>
+        ctx.patchState({
+          subjects: {
+            ...ctx.getState().subjects,
+            isLoading: false,
+          },
+        })
+      )
+    );
+  }
+
+  @Action(GetCustomItemMetadata)
+  getCustomItemMetadata(ctx: StateContext<RegistryMetadataStateModel>, action: GetCustomItemMetadata) {
+    ctx.patchState({
+      customItemMetadata: { data: null, isLoading: true, error: null },
+    });
+
+    return this.registryMetadataService.getCustomItemMetadata(action.guid).pipe(
+      tap({
+        next: (response) => {
+          ctx.patchState({
+            customItemMetadata: { data: response.data.attributes, isLoading: false, error: null },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            customItemMetadata: { data: null, isLoading: false, error: error.message },
+          });
+        },
+      }),
+      finalize(() =>
+        ctx.patchState({
+          customItemMetadata: {
+            ...ctx.getState().customItemMetadata,
+            isLoading: false,
+          },
+        })
+      )
+    );
+  }
+
+  @Action(UpdateCustomItemMetadata)
+  updateCustomItemMetadata(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateCustomItemMetadata) {
+    ctx.patchState({
+      customItemMetadata: { data: null, isLoading: true, error: null },
+    });
+
+    return this.registryMetadataService.updateCustomItemMetadata(action.guid, action.metadata).pipe(
+      tap({
+        next: (response) => {
+          ctx.patchState({
+            customItemMetadata: { data: response.data.attributes, isLoading: false, error: null },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            customItemMetadata: { ...ctx.getState().customItemMetadata, isLoading: false, error: error.message },
+          });
+        },
+      }),
+      finalize(() => ctx.patchState({ customItemMetadata: { ...ctx.getState().customItemMetadata, isLoading: false } }))
+    );
+  }
+
+  @Action(UpdateRegistryDetails)
+  updateRegistryDetails(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateRegistryDetails) {
+    ctx.patchState({
+      registry: {
+        ...ctx.getState().registry,
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService.updateRegistryDetails(action.registryId, action.updates).pipe(
+      tap({
+        next: (updatedRegistry) => {
+          const currentRegistry = ctx.getState().registry.data;
+
+          ctx.patchState({
+            registry: {
+              data: {
+                ...currentRegistry,
+                ...updatedRegistry,
+              },
+              error: null,
+              isLoading: false,
+            },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            registry: {
+              ...ctx.getState().registry,
+              error: error.message,
+              isLoading: false,
+            },
+          });
+        },
+      }),
+      finalize(() =>
+        ctx.patchState({
+          registry: {
+            ...ctx.getState().registry,
+            error: null,
+            isLoading: false,
+          },
+        })
+      )
+    );
+  }
+
+  @Action(GetFundersList)
+  getFundersList(ctx: StateContext<RegistryMetadataStateModel>, action: GetFundersList) {
+    ctx.patchState({
+      fundersList: { data: [], isLoading: true, error: null },
+    });
+
+    return this.registryMetadataService.getFundersList(action.search).pipe(
+      tap({
+        next: (response) => {
+          ctx.patchState({
+            fundersList: { data: response.message.items, isLoading: false, error: null },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            fundersList: {
+              ...ctx.getState().fundersList,
+              isLoading: false,
+              error: error.message,
+            },
+          });
+        },
+      }),
+      finalize(() =>
+        ctx.patchState({
+          fundersList: {
+            ...ctx.getState().fundersList,
+            isLoading: false,
+          },
+        })
+      )
+    );
+  }
+
+  @Action(GetUserInstitutions)
+  getUserInstitutions(ctx: StateContext<RegistryMetadataStateModel>, action: GetUserInstitutions) {
+    ctx.patchState({
+      userInstitutions: {
+        data: [],
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService.getUserInstitutions(action.userId, action.page, action.pageSize).pipe(
+      tap({
+        next: (response) => {
+          ctx.patchState({
+            userInstitutions: {
+              data: response.data,
+              isLoading: false,
+              error: null,
+            },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            userInstitutions: {
+              ...ctx.getState().userInstitutions,
+              error: error.message,
+              isLoading: false,
+            },
+          });
+        },
+      }),
+      finalize(() =>
+        ctx.patchState({
+          userInstitutions: {
+            ...ctx.getState().userInstitutions,
+            error: null,
+            isLoading: false,
+          },
+        })
+      )
+    );
+  }
+}
diff --git a/src/app/shared/services/subjects.service.ts b/src/app/shared/services/subjects.service.ts
index 643493104..98429e28b 100644
--- a/src/app/shared/services/subjects.service.ts
+++ b/src/app/shared/services/subjects.service.ts
@@ -25,12 +25,21 @@ export class SubjectsService {
     [ResourceType.DraftRegistration, 'draft_registrations'],
   ]);
 
-  getSubjects(resourceType: ResourceType, resourceId?: string, search?: string): Observable<SubjectModel[]> {
-    const baseUrl =
+  getSubjects(
+    resourceType: ResourceType,
+    resourceId?: string,
+    search?: string,
+    isMetadataRegistry = false
+  ): Observable<SubjectModel[]> {
+    let baseUrl =
       resourceType === ResourceType.Project
         ? `${this.apiUrl}/subjects/`
         : `${this.apiUrl}/providers/${this.urlMap.get(resourceType)}/${resourceId}/subjects/`;
 
+    if (isMetadataRegistry) {
+      baseUrl = baseUrl.replace('/providers', '');
+    }
+
     const params: Record<string, string> = {
       'page[size]': '100',
       sort: 'text',
diff --git a/src/app/shared/stores/subjects/subjects.actions.ts b/src/app/shared/stores/subjects/subjects.actions.ts
index 34891fe20..af46c07a5 100644
--- a/src/app/shared/stores/subjects/subjects.actions.ts
+++ b/src/app/shared/stores/subjects/subjects.actions.ts
@@ -7,7 +7,8 @@ export class FetchSubjects {
   constructor(
     public resourceType: ResourceType | undefined,
     public resourceId?: string,
-    public search?: string
+    public search?: string,
+    public isMetadataRegistry?: boolean
   ) {}
 }
 
diff --git a/src/app/shared/stores/subjects/subjects.state.ts b/src/app/shared/stores/subjects/subjects.state.ts
index 04a6ff62c..2e26c0fe6 100644
--- a/src/app/shared/stores/subjects/subjects.state.ts
+++ b/src/app/shared/stores/subjects/subjects.state.ts
@@ -42,7 +42,10 @@ export class SubjectsState {
   private readonly subjectsService = inject(SubjectsService);
 
   @Action(FetchSubjects)
-  fetchSubjects(ctx: StateContext<SubjectsModel>, { resourceId, resourceType, search }: FetchSubjects) {
+  fetchSubjects(
+    ctx: StateContext<SubjectsModel>,
+    { resourceId, resourceType, search, isMetadataRegistry }: FetchSubjects
+  ) {
     if (!resourceType) {
       return;
     }
@@ -60,7 +63,7 @@ export class SubjectsState {
       },
     });
 
-    return this.subjectsService.getSubjects(resourceType, resourceId, search).pipe(
+    return this.subjectsService.getSubjects(resourceType, resourceId, search, isMetadataRegistry).pipe(
       tap((subjects) => {
         if (search) {
           ctx.patchState({

From c183d7142c20b9497029bcf3e11ce3193acad0bc Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Tue, 22 Jul 2025 20:22:51 +0300
Subject: [PATCH 4/9] feat(metadata): added issues for cedar metadata

---
 .../add-metadata/add-metadata.component.ts    |   4 -
 src/app/features/registry/pages/index.ts      |   1 +
 .../registry-metadata-add.component.html      |  82 ++++++++
 .../registry-metadata-add.component.scss      |   7 +
 .../registry-metadata-add.component.ts        | 195 ++++++++++++++++++
 .../registry-metadata.component.html          |  22 +-
 .../registry-metadata.component.ts            | 187 ++++++++++++++++-
 src/app/features/registry/registry.routes.ts  |  14 ++
 .../services/registry-metadata.service.ts     |  34 +++
 .../registry-metadata.actions.ts              |  30 +++
 .../registry-metadata.model.ts                |   8 +
 .../registry-metadata.selectors.ts            |  30 +++
 .../registry-metadata.state.ts                | 120 +++++++++++
 13 files changed, 726 insertions(+), 8 deletions(-)
 create mode 100644 src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
 create mode 100644 src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss
 create mode 100644 src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts

diff --git a/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts b/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts
index 167cb67d4..7295f549b 100644
--- a/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts
+++ b/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts
@@ -57,10 +57,6 @@ export class AddMetadataComponent implements OnInit {
     updateCedarMetadataRecord: UpdateCedarMetadataRecord,
   });
 
-  get isEditingExistingRecord(): boolean {
-    return !!this.activatedRoute.snapshot.params['record-id'];
-  }
-
   constructor() {
     effect(() => {
       const records = this.cedarRecords();
diff --git a/src/app/features/registry/pages/index.ts b/src/app/features/registry/pages/index.ts
index b6f51cf0b..369382d7f 100644
--- a/src/app/features/registry/pages/index.ts
+++ b/src/app/features/registry/pages/index.ts
@@ -1,3 +1,4 @@
 export * from './registry-metadata/registry-metadata.component';
+export * from './registry-metadata-add/registry-metadata-add.component';
 export * from '@osf/features/registry/pages/registry-files/registry-files.component';
 export * from '@osf/features/registry/pages/registry-overview/registry-overview.component';
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
new file mode 100644
index 000000000..8b85e40a1
--- /dev/null
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
@@ -0,0 +1,82 @@
+<osf-sub-header [title]="'project.metadata.addMetadata.title' | translate" />
+
+@if (!selectedTemplate()) {
+  @if (cedarTemplatesLoading()) {
+    <div class="flex-1">
+      <osf-loading-spinner />
+    </div>
+  } @else {
+    <section class="flex flex-column bg-white flex-1 h-full p-3 gap-4 sm:p-5">
+      <section class="flex flex-column gap-2">
+        <section class="flex flex-column gap-2">
+          <h2>{{ 'project.metadata.addMetadata.selectTemplate' | translate }}</h2>
+          <div [innerHTML]="'project.metadata.addMetadata.cedarInfo' | translate"></div>
+        </section>
+
+        <div class="flex gap-2 flex-wrap sm:gap-4">
+          @for (meta of cedarTemplates()?.data; track meta.id) {
+            <p-button
+              severity="info"
+              class="metadata border-1 grey-border-color border-round-xl p-4 align-items-center"
+              styleClass="flex justify-content-between flex-column gap-4 hover:border-0"
+              [class.cursor-pointer]="!hasExistingRecord(meta.id)"
+              [class.cursor-not-allowed]="hasExistingRecord(meta.id)"
+              (click)="onTemplateSelected(meta)"
+            >
+              <div class="flex flex-row gap-4">
+                <h2>{{ meta.attributes.template.title }}</h2>
+              </div>
+
+              <div class="flex flex-column">
+                <p>{{ meta.attributes.template.description }}</p>
+              </div>
+
+              @if (hasExistingRecord(meta.id)) {
+                <p-button
+                  severity="secondary"
+                  [pTooltip]="'project.metadata.addMetadata.youAlreadyAddedText' | translate"
+                  [label]="'project.metadata.addMetadata.youAlreadyAdded' | translate"
+                  [disabled]="true"
+                ></p-button>
+              } @else {
+                <p-button
+                  severity="secondary"
+                  [label]="'project.metadata.addMetadata.select' | translate"
+                  (click)="onTemplateSelected(meta)"
+                ></p-button>
+              }
+            </p-button>
+          }
+        </div>
+
+        <div class="flex justify-content-end flex-0 gap-2 mt-6">
+          <p-button
+            styleClass="w-10rem"
+            class="w-10rem"
+            [label]="'common.buttons.cancel' | translate"
+            severity="info"
+            (click)="onCancel()"
+          ></p-button>
+          @if (hasMultiplePages()) {
+            <p-button
+              styleClass="w-10rem"
+              class="w-10rem"
+              [label]="'common.buttons.next' | translate"
+              [disabled]="!hasNextPage()"
+              (click)="onNext()"
+            ></p-button>
+          }
+        </div>
+      </section>
+    </section>
+  }
+} @else {
+  <osf-cedar-template-form
+    [template]="selectedTemplate()!"
+    [readonly]="!isEditMode"
+    (editMode)="toggleEditMode()"
+    (emitData)="onSubmit($event)"
+    (changeTemplate)="onChangeTemplate()"
+    (cancel)="onCancel()"
+  />
+}
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss
new file mode 100644
index 000000000..75061e4f9
--- /dev/null
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss
@@ -0,0 +1,7 @@
+.metadata {
+  flex-basis: calc(50% - 1.5rem);
+
+  @media (max-width: 576px) {
+    flex-basis: 100%;
+  }
+}
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
new file mode 100644
index 000000000..74986cedc
--- /dev/null
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
@@ -0,0 +1,195 @@
+import { createDispatchMap, select } from '@ngxs/store';
+
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { Button } from 'primeng/button';
+import { Tooltip } from 'primeng/tooltip';
+
+import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit, signal } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
+import {
+  CedarMetadataDataTemplateJsonApi,
+  CedarMetadataRecord,
+  CedarMetadataRecordData,
+  CedarRecordDataBinding,
+} from '@osf/features/project/metadata/models';
+import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { ToastService } from '@shared/services';
+
+import {
+  CreateCedarMetadataRecord,
+  GetCedarMetadataTemplates,
+  GetRegistryCedarMetadataRecords,
+  RegistryMetadataSelectors,
+} from '../../store/registry-metadata';
+
+@Component({
+  selector: 'osf-registry-metadata-add',
+  imports: [SubHeaderComponent, CedarTemplateFormComponent, LoadingSpinnerComponent, TranslatePipe, Button, Tooltip],
+  templateUrl: './registry-metadata-add.component.html',
+  styleUrl: './registry-metadata-add.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+})
+export class RegistryMetadataAddComponent implements OnInit {
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+  private readonly destroyRef = inject(DestroyRef);
+  private readonly toastService = inject(ToastService);
+
+  isEditMode = true;
+
+  private registryId = '';
+
+  existingRecord = signal<CedarMetadataRecordData | null>(null);
+  selectedTemplate = signal<CedarMetadataDataTemplateJsonApi | null>(null);
+  isSubmitting = signal<boolean>(false);
+
+  protected actions = createDispatchMap({
+    getCedarTemplates: GetCedarMetadataTemplates,
+    getCedarRecords: GetRegistryCedarMetadataRecords,
+    createCedarRecord: CreateCedarMetadataRecord,
+  });
+
+  protected cedarRecords = select(RegistryMetadataSelectors.getCedarRecords);
+  protected cedarTemplates = select(RegistryMetadataSelectors.getCedarTemplates);
+  protected cedarTemplatesLoading = select(RegistryMetadataSelectors.getCedarTemplatesLoading);
+  protected cedarRecord = select(RegistryMetadataSelectors.getCedarRecord);
+
+  constructor() {
+    effect(() => {
+      const records = this.cedarRecords();
+      const cedarTemplatesData = this.cedarTemplates()?.data;
+      const recordId = this.route.snapshot.params['record-id'];
+
+      if (!records || !cedarTemplatesData) {
+        return;
+      }
+
+      if (recordId) {
+        const existingRecord = records.find((record) => {
+          return record.id === recordId;
+        });
+
+        if (existingRecord) {
+          const templateId = existingRecord.relationships.template.data.id;
+          const matchingTemplate = cedarTemplatesData.find((template) => template.id === templateId);
+
+          if (matchingTemplate) {
+            this.selectedTemplate.set(matchingTemplate);
+            this.existingRecord.set(existingRecord);
+            this.isEditMode = false;
+          }
+        }
+      } else {
+        this.selectedTemplate.set(null);
+        this.existingRecord.set(null);
+        this.isEditMode = true;
+      }
+    });
+  }
+
+  ngOnInit(): void {
+    this.registryId = this.route.parent?.parent?.snapshot.params['id'];
+
+    if (this.registryId) {
+      this.actions.getCedarTemplates();
+      this.actions.getCedarRecords(this.registryId);
+    }
+  }
+
+  hasMultiplePages(): boolean {
+    const templates = this.cedarTemplates();
+    return !!(templates?.links?.first && templates?.links?.last && templates.links.first !== templates.links.last);
+  }
+
+  hasNextPage(): boolean {
+    const templates = this.cedarTemplates();
+    return !!templates?.links?.next;
+  }
+
+  hasExistingRecord(templateId: string): boolean {
+    const records = this.cedarRecords();
+    if (!records) return false;
+
+    return records.some((record) => record.relationships.template.data.id === templateId);
+  }
+
+  onTemplateSelected(template: CedarMetadataDataTemplateJsonApi): void {
+    this.selectedTemplate.set(template);
+  }
+
+  onSubmit(data: CedarRecordDataBinding): void {
+    const registryId = this.registryId;
+    if (!registryId) return;
+
+    this.isSubmitting.set(true);
+
+    const model = {
+      data: {
+        type: 'cedar_metadata_records' as const,
+        attributes: {
+          metadata: data.data,
+          is_published: false,
+        },
+        relationships: {
+          template: {
+            data: {
+              type: 'cedar-metadata-templates' as const,
+              id: data.id,
+            },
+          },
+          target: {
+            data: {
+              type: 'registrations' as const,
+              id: registryId,
+            },
+          },
+        },
+      },
+    } as unknown as CedarMetadataRecord;
+
+    this.actions
+      .createCedarRecord(model)
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe({
+        next: () => {
+          this.isSubmitting.set(false);
+          this.toastService.showSuccess('CEDAR record created successfully');
+          this.router.navigate(['../metadata', this.cedarRecord()?.data.id], { relativeTo: this.route.parent });
+        },
+        error: () => {
+          this.isSubmitting.set(false);
+          this.toastService.showError('Failed to create CEDAR record');
+        },
+      });
+  }
+
+  onChangeTemplate(): void {
+    this.selectedTemplate.set(null);
+  }
+
+  toggleEditMode(): void {
+    this.isEditMode = !this.isEditMode;
+  }
+
+  onNext(): void {
+    const templates = this.cedarTemplates();
+    if (!templates?.links?.next) {
+      return;
+    }
+    this.actions.getCedarTemplates(templates.links.next);
+  }
+
+  onCancel(): void {
+    const templates = this.cedarTemplates();
+    if (templates?.links?.first && templates?.links?.last && templates.links.first !== templates.links.last) {
+      this.actions.getCedarTemplates();
+    } else {
+      this.router.navigate(['..'], { relativeTo: this.route });
+    }
+  }
+}
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
index 2c9fb9c88..fd90b2ad2 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
@@ -5,6 +5,7 @@
     (buttonClick)="openAddRecord()"
     [title]="'project.overview.metadata.title' | translate"
   />
+
   @if (!tabs().length) {
     <div class="flex-1">
       <osf-loading-spinner />
@@ -12,7 +13,7 @@
   }
 
   @if (tabs().length) {
-    <p-tabs class="flex-1" [value]="selectedTab()" [lazy]="true" scrollable>
+    <p-tabs class="flex-1" [value]="selectedTab()" [lazy]="true" scrollable (valueChange)="onTabChange($event)">
       <p-tablist class="pr-5 pl-5">
         @for (item of tabs(); track $index) {
           <p-tab [value]="item.id">{{ item.label | translate }}</p-tab>
@@ -40,6 +41,25 @@
                 (searchSubjects)="searchSubjects($event)"
                 (updateSelectedSubjects)="updateSelectedSubjects($event)"
               />
+            } @else {
+              <div class="p-6">
+                @if (selectedCedarTemplate() && selectedCedarRecord()) {
+                  <osf-cedar-template-form
+                    [template]="selectedCedarTemplate()!"
+                    [existingRecord]="selectedCedarRecord()!"
+                    [readonly]="cedarFormReadonly()"
+                    [showEditButton]="true"
+                    (emitData)="onCedarFormSubmit($event)"
+                    (changeTemplate)="onCedarFormChangeTemplate()"
+                    (editMode)="onCedarFormEdit()"
+                  />
+                } @else {
+                  <div class="text-center py-8">
+                    <p class="text-lg mb-4">{{ 'project.metadata.addMetadata.loadingCedar' | translate }}</p>
+                    <p class="text-sm text-gray-600">{{ tab.label }}</p>
+                  </div>
+                }
+              </div>
             }
           </p-tabpanel>
         }
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
index 0ca218bf8..61579738b 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
@@ -6,10 +6,18 @@ import { DialogService } from 'primeng/dynamicdialog';
 import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs';
 
 import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit, signal } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { UserSelectors } from '@osf/core/store/user';
-import { CustomItemMetadataRecord } from '@osf/features/project/metadata/models';
+import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
+import {
+  CedarMetadataDataTemplateJsonApi,
+  CedarMetadataRecord,
+  CedarMetadataRecordData,
+  CedarRecordDataBinding,
+  CustomItemMetadataRecord,
+} from '@osf/features/project/metadata/models';
 import { ProjectOverview } from '@osf/features/project/overview/models';
 import {
   ContributorsSelectors,
@@ -27,13 +35,17 @@ import { SubjectModel } from '@shared/models';
 import { CustomConfirmationService, LoaderService, ToastService } from '@shared/services';
 
 import {
+  CreateCedarMetadataRecord,
   GetBibliographicContributors,
+  GetCedarMetadataTemplates,
   GetCustomItemMetadata,
   GetFundersList,
+  GetRegistryCedarMetadataRecords,
   GetRegistryForMetadata,
   GetRegistrySubjects,
   GetUserInstitutions,
   RegistryMetadataSelectors,
+  UpdateCedarMetadataRecord,
   UpdateCustomItemMetadata,
   UpdateRegistryDetails,
 } from '../../store/registry-metadata';
@@ -50,6 +62,7 @@ import {
     Tabs,
     LoadingSpinnerComponent,
     SharedMetadataComponent,
+    CedarTemplateFormComponent,
   ],
   templateUrl: './registry-metadata.component.html',
   styleUrl: './registry-metadata.component.scss',
@@ -69,9 +82,13 @@ export class RegistryMetadataComponent implements OnInit {
 
   private registryId = '';
 
-  tabs = signal<{ id: string; label: string; type: 'registry' }[]>([]);
+  tabs = signal<{ id: string; label: string; type: 'registry' | 'cedar' }[]>([]);
   protected readonly selectedTab = signal('registry');
 
+  selectedCedarRecord = signal<CedarMetadataRecordData | null>(null);
+  selectedCedarTemplate = signal<CedarMetadataDataTemplateJsonApi | null>(null);
+  cedarFormReadonly = signal<boolean>(true);
+
   protected actions = createDispatchMap({
     getRegistry: GetRegistryForMetadata,
     getBibliographicContributors: GetBibliographicContributors,
@@ -82,6 +99,10 @@ export class RegistryMetadataComponent implements OnInit {
     getContributors: GetAllContributors,
     getUserInstitutions: GetUserInstitutions,
     getRegistrySubjects: GetRegistrySubjects,
+    getCedarRecords: GetRegistryCedarMetadataRecords,
+    getCedarTemplates: GetCedarMetadataTemplates,
+    createCedarRecord: CreateCedarMetadataRecord,
+    updateCedarRecord: UpdateCedarMetadataRecord,
 
     fetchSubjects: FetchSubjects,
     fetchSelectedSubjects: FetchSelectedSubjects,
@@ -100,15 +121,42 @@ export class RegistryMetadataComponent implements OnInit {
   protected currentUser = select(UserSelectors.getCurrentUser);
   protected selectedSubjects = select(SubjectsSelectors.getSelectedSubjects);
   protected isSubjectsUpdating = select(SubjectsSelectors.areSelectedSubjectsLoading);
+  protected cedarRecords = select(RegistryMetadataSelectors.getCedarRecords);
+  protected cedarTemplates = select(RegistryMetadataSelectors.getCedarTemplates);
 
   constructor() {
     effect(() => {
+      const records = this.cedarRecords();
       const registry = this.currentRegistry();
       if (!registry) return;
 
       const baseTabs = [{ id: 'registry', label: registry.title, type: 'registry' as const }];
 
-      this.tabs.set(baseTabs);
+      const cedarTabs =
+        records?.map((record) => ({
+          id: record.id || '',
+          label: record.embeds?.template?.data?.attributes?.schema_name || `Record ${record.id}`,
+          type: 'cedar' as const,
+        })) || [];
+
+      this.tabs.set([...baseTabs, ...cedarTabs]);
+
+      this.handleRouteBasedTabSelection();
+    });
+
+    effect(() => {
+      const templates = this.cedarTemplates();
+      const selectedRecord = this.selectedCedarRecord();
+
+      if (selectedRecord && templates?.data && !this.selectedCedarTemplate()) {
+        const templateId = selectedRecord.relationships?.template?.data?.id;
+        if (templateId) {
+          const template = templates.data.find((t) => t.id === templateId);
+          if (template) {
+            this.selectedCedarTemplate.set(template);
+          }
+        }
+      }
     });
   }
 
@@ -121,6 +169,8 @@ export class RegistryMetadataComponent implements OnInit {
       this.actions.getCustomItemMetadata(this.registryId);
       this.actions.getContributors(this.registryId, ResourceType.Registration);
       this.actions.getRegistrySubjects(this.registryId);
+      this.actions.getCedarRecords(this.registryId);
+      this.actions.getCedarTemplates();
       this.actions.fetchSubjects(ResourceType.Registration, this.registryId, '', true);
       this.actions.fetchSelectedSubjects(this.registryId, ResourceType.Registration);
 
@@ -210,4 +260,135 @@ export class RegistryMetadataComponent implements OnInit {
   getCustomMetadataForTemplate(): CustomItemMetadataRecord {
     return this.customItemMetadata() as unknown as CustomItemMetadataRecord;
   }
+
+  onTabChange(tabId: string | number): void {
+    const tab = this.tabs().find((x) => x.id === tabId.toString());
+
+    if (!tab) {
+      return;
+    }
+
+    this.selectedTab.set(tab.id);
+
+    if (tab.type === 'cedar') {
+      this.loadCedarRecord(tab.id);
+
+      const currentRecordId = this.route.snapshot.paramMap.get('recordId');
+      if (currentRecordId !== tab.id) {
+        this.router.navigate(['metadata', tab.id], { relativeTo: this.route.parent?.parent });
+      }
+    } else {
+      this.selectedCedarRecord.set(null);
+      this.selectedCedarTemplate.set(null);
+
+      const currentRecordId = this.route.snapshot.paramMap.get('recordId');
+      if (currentRecordId) {
+        this.router.navigate(['metadata'], { relativeTo: this.route.parent?.parent });
+      }
+    }
+  }
+
+  onCedarFormEdit(): void {
+    this.cedarFormReadonly.set(false);
+  }
+
+  onCedarFormSubmit(data: CedarRecordDataBinding): void {
+    const registryId = this.currentRegistry()?.id;
+    const selectedRecord = this.selectedCedarRecord();
+
+    if (!registryId || !selectedRecord) return;
+
+    const model = {
+      data: {
+        type: 'cedar_metadata_records' as const,
+        attributes: {
+          metadata: data.data,
+          is_published: false,
+        },
+        relationships: {
+          template: {
+            data: {
+              type: 'cedar-metadata-templates' as const,
+              id: data.id,
+            },
+          },
+          target: {
+            data: {
+              type: 'registrations' as const,
+              id: registryId,
+            },
+          },
+        },
+      },
+    } as unknown as CedarMetadataRecord;
+
+    if (selectedRecord.id) {
+      this.actions
+        .updateCedarRecord(model, selectedRecord.id)
+        .pipe(takeUntilDestroyed(this.destroyRef))
+        .subscribe({
+          next: () => {
+            this.cedarFormReadonly.set(true);
+            this.toastService.showSuccess('CEDAR record updated successfully');
+            this.actions.getCedarRecords(registryId);
+          },
+        });
+    }
+  }
+
+  onCedarFormChangeTemplate(): void {
+    this.router.navigate(['add'], { relativeTo: this.route });
+  }
+
+  private loadCedarRecord(recordId: string): void {
+    const records = this.cedarRecords();
+    const templates = this.cedarTemplates();
+
+    if (!records) {
+      return;
+    }
+
+    const record = records.find((r) => r.id === recordId);
+    if (!record) {
+      return;
+    }
+
+    this.selectedCedarRecord.set(record);
+    this.cedarFormReadonly.set(true);
+
+    const templateId = record.relationships?.template?.data?.id;
+    if (templateId && templates?.data) {
+      const template = templates.data.find((t) => t.id === templateId);
+      if (template) {
+        this.selectedCedarTemplate.set(template);
+      } else {
+        this.selectedCedarTemplate.set(null);
+        this.actions.getCedarTemplates();
+      }
+    } else {
+      this.selectedCedarTemplate.set(null);
+      this.actions.getCedarTemplates();
+    }
+  }
+
+  private handleRouteBasedTabSelection(): void {
+    const recordId = this.route.snapshot.paramMap.get('recordId');
+
+    if (!recordId) {
+      this.selectedTab.set('registry');
+      this.selectedCedarRecord.set(null);
+      this.selectedCedarTemplate.set(null);
+      return;
+    }
+
+    const tab = this.tabs().find((tab) => tab.id === recordId);
+
+    if (tab) {
+      this.selectedTab.set(tab.id);
+
+      if (tab.type === 'cedar') {
+        this.loadCedarRecord(tab.id);
+      }
+    }
+  }
 }
diff --git a/src/app/features/registry/registry.routes.ts b/src/app/features/registry/registry.routes.ts
index b629556f9..e2db7e720 100644
--- a/src/app/features/registry/registry.routes.ts
+++ b/src/app/features/registry/registry.routes.ts
@@ -34,6 +34,20 @@ export const registryRoutes: Routes = [
           import('./pages/registry-metadata/registry-metadata.component').then((c) => c.RegistryMetadataComponent),
         providers: [provideStates([RegistryMetadataState])],
       },
+      {
+        path: 'metadata/add',
+        loadComponent: () =>
+          import('./pages/registry-metadata-add/registry-metadata-add.component').then(
+            (c) => c.RegistryMetadataAddComponent
+          ),
+        providers: [provideStates([RegistryMetadataState])],
+      },
+      {
+        path: 'metadata/:recordId',
+        loadComponent: () =>
+          import('./pages/registry-metadata/registry-metadata.component').then((c) => c.RegistryMetadataComponent),
+        providers: [provideStates([RegistryMetadataState])],
+      },
       {
         path: 'contributors',
         loadComponent: () =>
diff --git a/src/app/features/registry/services/registry-metadata.service.ts b/src/app/features/registry/services/registry-metadata.service.ts
index 92483afe4..01e4700fa 100644
--- a/src/app/features/registry/services/registry-metadata.service.ts
+++ b/src/app/features/registry/services/registry-metadata.service.ts
@@ -4,6 +4,11 @@ import { map } from 'rxjs/operators';
 import { inject, Injectable } from '@angular/core';
 
 import { JsonApiService } from '@osf/core/services';
+import {
+  CedarMetadataRecord,
+  CedarMetadataRecordJsonApi,
+  CedarMetadataTemplateJsonApi,
+} from '@osf/features/project/metadata/models';
 
 import { RegistryMetadataMapper } from '../mappers';
 import {
@@ -115,4 +120,33 @@ export class RegistryMetadataService {
       params
     );
   }
+
+  getRegistryCedarMetadataRecords(registryId: string): Observable<CedarMetadataRecordJsonApi> {
+    const params: Record<string, unknown> = {
+      embed: 'template',
+      'page[size]': 20,
+    };
+
+    return this.jsonApiService.get<CedarMetadataRecordJsonApi>(
+      `${this.apiUrl}/registrations/${registryId}/cedar_metadata_records/`,
+      params
+    );
+  }
+
+  getCedarMetadataTemplates(url?: string): Observable<CedarMetadataTemplateJsonApi> {
+    return this.jsonApiService.get<CedarMetadataTemplateJsonApi>(
+      url || `${environment.apiDomainUrl}/_/cedar_metadata_templates/?adapterOptions[sort]=schema_name`
+    );
+  }
+
+  createCedarMetadataRecord(data: CedarMetadataRecord): Observable<CedarMetadataRecord> {
+    return this.jsonApiService.post<CedarMetadataRecord>(`${environment.apiDomainUrl}/_/cedar_metadata_records/`, data);
+  }
+
+  updateCedarMetadataRecord(data: CedarMetadataRecord, recordId: string): Observable<CedarMetadataRecord> {
+    return this.jsonApiService.patch<CedarMetadataRecord>(
+      `${environment.apiDomainUrl}/_/cedar_metadata_records/${recordId}/`,
+      data
+    );
+  }
 }
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
index fb98bb5c0..ca8b1c9e0 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
@@ -1,3 +1,5 @@
+import { CedarMetadataRecord, CedarMetadataRecordData } from '@osf/features/project/metadata/models';
+
 import { CustomItemMetadataRecord, RegistryMetadata } from '../../models/registry-metadata.models';
 
 export class GetRegistryForMetadata {
@@ -57,3 +59,31 @@ export class GetRegistrySubjects {
     public pageSize?: number
   ) {}
 }
+
+export class GetCedarMetadataTemplates {
+  static readonly type = '[RegistryMetadata] Get Cedar Metadata Templates';
+  constructor(public url?: string) {}
+}
+
+export class GetRegistryCedarMetadataRecords {
+  static readonly type = '[RegistryMetadata] Get Registry Cedar Metadata Records';
+  constructor(public registryId: string) {}
+}
+
+export class CreateCedarMetadataRecord {
+  static readonly type = '[RegistryMetadata] Create Cedar Metadata Record';
+  constructor(public record: CedarMetadataRecord) {}
+}
+
+export class UpdateCedarMetadataRecord {
+  static readonly type = '[RegistryMetadata] Update Cedar Metadata Record';
+  constructor(
+    public record: CedarMetadataRecord,
+    public recordId: string
+  ) {}
+}
+
+export class AddCedarMetadataRecordToState {
+  static readonly type = '[RegistryMetadata] Add Cedar Metadata Record To State';
+  constructor(public record: CedarMetadataRecordData) {}
+}
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
index 7956d36e1..a03f71a61 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
@@ -1,3 +1,8 @@
+import {
+  CedarMetadataRecord,
+  CedarMetadataRecordData,
+  CedarMetadataTemplateJsonApi,
+} from '@osf/features/project/metadata/models';
 import { AsyncStateModel } from '@shared/models';
 
 import { RegistryOverview } from '../../models';
@@ -16,4 +21,7 @@ export interface RegistryMetadataStateModel {
   fundersList: AsyncStateModel<CrossRefFunder[]>;
   userInstitutions: AsyncStateModel<UserInstitution[]>;
   subjects: AsyncStateModel<RegistrySubjectData[]>;
+  cedarTemplates: AsyncStateModel<CedarMetadataTemplateJsonApi | null>;
+  cedarRecord: AsyncStateModel<CedarMetadataRecord | null>;
+  cedarRecords: AsyncStateModel<CedarMetadataRecordData[]>;
 }
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
index 75465dab7..d974ba725 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
@@ -64,6 +64,36 @@ export class RegistryMetadataSelectors {
     return state.subjects.isLoading;
   }
 
+  @Selector([RegistryMetadataState])
+  static getCedarTemplates(state: RegistryMetadataStateModel) {
+    return state.cedarTemplates.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getCedarTemplatesLoading(state: RegistryMetadataStateModel) {
+    return state.cedarTemplates.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getCedarRecord(state: RegistryMetadataStateModel) {
+    return state.cedarRecord.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getCedarRecordLoading(state: RegistryMetadataStateModel) {
+    return state.cedarRecord.isLoading;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getCedarRecords(state: RegistryMetadataStateModel) {
+    return state.cedarRecords.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getCedarRecordsLoading(state: RegistryMetadataStateModel) {
+    return state.cedarRecords.isLoading;
+  }
+
   @Selector([RegistryMetadataState])
   static getError(state: RegistryMetadataStateModel) {
     return state.registry.error;
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
index c0df0f460..75c90b42b 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
@@ -4,16 +4,23 @@ import { finalize, tap } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { CedarMetadataRecord, CedarMetadataRecordJsonApi } from '@osf/features/project/metadata/models';
+
 import { RegistryMetadataMapper } from '../../mappers';
 import { RegistryMetadataService } from '../../services/registry-metadata.service';
 
 import {
+  AddCedarMetadataRecordToState,
+  CreateCedarMetadataRecord,
   GetBibliographicContributors,
+  GetCedarMetadataTemplates,
   GetCustomItemMetadata,
   GetFundersList,
+  GetRegistryCedarMetadataRecords,
   GetRegistryForMetadata,
   GetRegistrySubjects,
   GetUserInstitutions,
+  UpdateCedarMetadataRecord,
   UpdateCustomItemMetadata,
   UpdateRegistryDetails,
 } from './registry-metadata.actions';
@@ -26,6 +33,9 @@ const initialState: RegistryMetadataStateModel = {
   fundersList: { data: [], isLoading: false, error: null },
   userInstitutions: { data: [], isLoading: false, error: null },
   subjects: { data: [], isLoading: false, error: null },
+  cedarTemplates: { data: null, isLoading: false, error: null },
+  cedarRecord: { data: null, isLoading: false, error: null },
+  cedarRecords: { data: [], isLoading: false, error: null },
 };
 
 @State<RegistryMetadataStateModel>({
@@ -343,4 +353,114 @@ export class RegistryMetadataState {
       )
     );
   }
+
+  @Action(GetCedarMetadataTemplates)
+  getCedarMetadataTemplates(ctx: StateContext<RegistryMetadataStateModel>, action: GetCedarMetadataTemplates) {
+    ctx.patchState({
+      cedarTemplates: {
+        data: null,
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService.getCedarMetadataTemplates(action.url).pipe(
+      tap({
+        next: (response) => {
+          ctx.patchState({
+            cedarTemplates: {
+              data: response,
+              error: null,
+              isLoading: false,
+            },
+          });
+        },
+        error: (error) => {
+          ctx.patchState({
+            cedarTemplates: {
+              ...ctx.getState().cedarTemplates,
+              error: error.message,
+              isLoading: false,
+            },
+          });
+        },
+      }),
+      finalize(() =>
+        ctx.patchState({
+          cedarTemplates: {
+            ...ctx.getState().cedarTemplates,
+            isLoading: false,
+          },
+        })
+      )
+    );
+  }
+
+  @Action(GetRegistryCedarMetadataRecords)
+  getRegistryCedarMetadataRecords(
+    ctx: StateContext<RegistryMetadataStateModel>,
+    action: GetRegistryCedarMetadataRecords
+  ) {
+    ctx.patchState({
+      cedarRecords: {
+        data: [],
+        isLoading: true,
+        error: null,
+      },
+    });
+    return this.registryMetadataService.getRegistryCedarMetadataRecords(action.registryId).pipe(
+      tap((response: CedarMetadataRecordJsonApi) => {
+        ctx.patchState({
+          cedarRecords: {
+            data: response.data,
+            error: null,
+            isLoading: false,
+          },
+        });
+      })
+    );
+  }
+
+  @Action(CreateCedarMetadataRecord)
+  createCedarMetadataRecord(ctx: StateContext<RegistryMetadataStateModel>, action: CreateCedarMetadataRecord) {
+    return this.registryMetadataService.createCedarMetadataRecord(action.record).pipe(
+      tap((response: CedarMetadataRecord) => {
+        ctx.dispatch(new AddCedarMetadataRecordToState(response.data));
+      })
+    );
+  }
+
+  @Action(UpdateCedarMetadataRecord)
+  updateCedarMetadataRecord(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateCedarMetadataRecord) {
+    return this.registryMetadataService.updateCedarMetadataRecord(action.record, action.recordId).pipe(
+      tap((response: CedarMetadataRecord) => {
+        const state = ctx.getState();
+        const updatedRecords = state.cedarRecords.data.map((record) =>
+          record.id === action.recordId ? response.data : record
+        );
+        ctx.patchState({
+          cedarRecords: {
+            data: updatedRecords,
+            isLoading: false,
+            error: null,
+          },
+        });
+      })
+    );
+  }
+
+  @Action(AddCedarMetadataRecordToState)
+  addCedarMetadataRecordToState(ctx: StateContext<RegistryMetadataStateModel>, action: AddCedarMetadataRecordToState) {
+    const state = ctx.getState();
+    const updatedCedarRecords = [...state.cedarRecords.data, action.record];
+
+    ctx.setState({
+      ...state,
+      cedarRecords: {
+        data: updatedCedarRecords,
+        error: null,
+        isLoading: false,
+      },
+    });
+  }
 }

From 2dd4b472a681c9668016e5a83a9efc10dbb064b7 Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Tue, 22 Jul 2025 23:10:41 +0300
Subject: [PATCH 5/9] feat(metadata): moved files to shared changed tags input

---
 .../add-metadata/add-metadata.component.ts    |  2 +-
 .../metadata/project-metadata.component.ts    | 18 ++--
 .../registry-metadata-add.component.ts        |  2 +-
 .../registry-metadata.component.html          |  1 +
 .../registry-metadata.component.ts            |  2 +-
 .../cedar-template-form.component.html        |  0
 .../cedar-template-form.component.scss        |  0
 .../cedar-template-form.component.ts          |  1 +
 .../shared-metadata}/components/index.ts      |  0
 ...ata-affiliated-institutions.component.html |  0
 ...-affiliated-institutions.component.spec.ts |  0
 ...adata-affiliated-institutions.component.ts |  0
 ...oject-metadata-contributors.component.html |  0
 ...ct-metadata-contributors.component.spec.ts |  0
 ...project-metadata-contributors.component.ts |  0
 ...roject-metadata-description.component.html |  0
 ...ect-metadata-description.component.spec.ts |  0
 .../project-metadata-description.component.ts |  0
 .../project-metadata-doi.component.html       |  0
 .../project-metadata-doi.component.spec.ts    |  0
 .../project-metadata-doi.component.ts         |  0
 .../project-metadata-funding.component.html   |  0
 ...project-metadata-funding.component.spec.ts |  0
 .../project-metadata-funding.component.ts     |  0
 .../project-metadata-license.component.html   |  0
 ...project-metadata-license.component.spec.ts |  0
 .../project-metadata-license.component.ts     |  0
 ...ct-metadata-publication-doi.component.html | 12 ++-
 ...metadata-publication-doi.component.spec.ts |  0
 ...ject-metadata-publication-doi.component.ts |  1 +
 ...tadata-resource-information.component.html |  0
 ...ata-resource-information.component.spec.ts |  0
 ...metadata-resource-information.component.ts |  0
 .../project-metadata-subjects.component.html  |  0
 ...roject-metadata-subjects.component.spec.ts |  0
 .../project-metadata-subjects.component.ts    |  0
 ...iliated-institutions-dialog.component.html |  0
 ...ated-institutions-dialog.component.spec.ts |  0
 ...ffiliated-institutions-dialog.component.ts |  0
 .../contributors-dialog.component.html        |  0
 .../contributors-dialog.component.spec.ts     |  0
 .../contributors-dialog.component.ts          |  0
 .../description-dialog.component.html         |  0
 .../description-dialog.component.scss         |  0
 .../description-dialog.component.spec.ts      |  0
 .../description-dialog.component.ts           |  0
 .../funding-dialog.component.html             |  0
 .../funding-dialog.component.spec.ts          |  0
 .../funding-dialog.component.ts               |  8 +-
 .../shared-metadata}/dialogs/index.ts         |  0
 .../license-dialog.component.html             |  0
 .../license-dialog.component.scss             |  0
 .../license-dialog.component.spec.ts          |  0
 .../license-dialog.component.ts               |  0
 ...resource-information-dialog.component.html |  0
 ...ource-information-dialog.component.spec.ts |  0
 .../resource-information-dialog.component.ts  |  0
 .../shared-metadata.component.html            |  1 +
 .../shared-metadata.component.ts              | 12 ++-
 .../tags-input/tags-input.component.html      | 38 ++++++--
 .../tags-input/tags-input.component.scss      | 45 +++++++++
 .../tags-input/tags-input.component.ts        | 94 ++++++++++++++++++-
 src/assets/styles/overrides/chip.scss         |  6 +-
 63 files changed, 198 insertions(+), 45 deletions(-)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/cedar-template-form/cedar-template-form.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/cedar-template-form/cedar-template-form.component.scss (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/cedar-template-form/cedar-template-form.component.ts (99%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/index.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-contributors/project-metadata-contributors.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-contributors/project-metadata-contributors.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-contributors/project-metadata-contributors.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-description/project-metadata-description.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-description/project-metadata-description.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-description/project-metadata-description.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-doi/project-metadata-doi.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-doi/project-metadata-doi.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-doi/project-metadata-doi.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-funding/project-metadata-funding.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-funding/project-metadata-funding.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-funding/project-metadata-funding.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-license/project-metadata-license.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-license/project-metadata-license.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-license/project-metadata-license.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html (73%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-publication-doi/project-metadata-publication-doi.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts (94%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-resource-information/project-metadata-resource-information.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-resource-information/project-metadata-resource-information.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-resource-information/project-metadata-resource-information.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-subjects/project-metadata-subjects.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-subjects/project-metadata-subjects.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/components/project-metadata-subjects/project-metadata-subjects.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/contributors-dialog/contributors-dialog.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/contributors-dialog/contributors-dialog.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/contributors-dialog/contributors-dialog.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/description-dialog/description-dialog.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/description-dialog/description-dialog.component.scss (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/description-dialog/description-dialog.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/description-dialog/description-dialog.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/funding-dialog/funding-dialog.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/funding-dialog/funding-dialog.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/funding-dialog/funding-dialog.component.ts (96%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/index.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/license-dialog/license-dialog.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/license-dialog/license-dialog.component.scss (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/license-dialog/license-dialog.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/license-dialog/license-dialog.component.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/resource-information-dialog/resource-information-dialog.component.html (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/resource-information-dialog/resource-information-dialog.component.spec.ts (100%)
 rename src/app/{features/project/metadata => shared/components/shared-metadata}/dialogs/resource-information-dialog/resource-information-dialog.component.ts (100%)

diff --git a/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts b/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts
index 7295f549b..4686a4572 100644
--- a/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts
+++ b/src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts
@@ -9,7 +9,6 @@ import { ChangeDetectionStrategy, Component, DestroyRef, effect, HostBinding, in
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
 import {
   CedarMetadataDataTemplateJsonApi,
   CedarMetadataRecord,
@@ -17,6 +16,7 @@ import {
   CedarRecordDataBinding,
 } from '@osf/features/project/metadata/models';
 import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
 import { ToastService } from '@shared/services';
 
 import {
diff --git a/src/app/features/project/metadata/project-metadata.component.ts b/src/app/features/project/metadata/project-metadata.component.ts
index 130d5dd1d..6fc759327 100644
--- a/src/app/features/project/metadata/project-metadata.component.ts
+++ b/src/app/features/project/metadata/project-metadata.component.ts
@@ -12,15 +12,6 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { UserSelectors } from '@osf/core/store/user';
-import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
-import {
-  AffiliatedInstitutionsDialogComponent,
-  ContributorsDialogComponent,
-  DescriptionDialogComponent,
-  FundingDialogComponent,
-  LicenseDialogComponent,
-  ResourceInformationDialogComponent,
-} from '@osf/features/project/metadata/dialogs';
 import {
   CedarMetadataDataTemplateJsonApi,
   CedarMetadataRecord,
@@ -51,6 +42,15 @@ import {
   UpdateResourceSubjects,
 } from '@osf/shared/stores';
 import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
+import {
+  AffiliatedInstitutionsDialogComponent,
+  ContributorsDialogComponent,
+  DescriptionDialogComponent,
+  FundingDialogComponent,
+  LicenseDialogComponent,
+  ResourceInformationDialogComponent,
+} from '@shared/components/shared-metadata/dialogs';
 import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
 import { SubjectModel } from '@shared/models';
 import { CustomConfirmationService, LoaderService, ToastService } from '@shared/services';
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
index 74986cedc..f563ff161 100644
--- a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
@@ -9,7 +9,6 @@ import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit,
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
 import {
   CedarMetadataDataTemplateJsonApi,
   CedarMetadataRecord,
@@ -17,6 +16,7 @@ import {
   CedarRecordDataBinding,
 } from '@osf/features/project/metadata/models';
 import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
 import { ToastService } from '@shared/services';
 
 import {
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
index fd90b2ad2..c21f66aeb 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
@@ -25,6 +25,7 @@
           <p-tabpanel [value]="tab.id">
             @if (tab.type === 'registry') {
               <osf-shared-metadata
+                [hideEditDoi]="true"
                 [selectedSubjects]="selectedSubjects()"
                 [isSubjectsUpdating]="isSubjectsUpdating()"
                 [currentInstance]="getCurrentInstanceForTemplate()"
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
index 61579738b..78a7f6c48 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
@@ -10,7 +10,6 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { UserSelectors } from '@osf/core/store/user';
-import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
 import {
   CedarMetadataDataTemplateJsonApi,
   CedarMetadataRecord,
@@ -29,6 +28,7 @@ import {
   UpdateResourceSubjects,
 } from '@osf/shared/stores';
 import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
 import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
 import { ResourceType } from '@shared/enums';
 import { SubjectModel } from '@shared/models';
diff --git a/src/app/features/project/metadata/components/cedar-template-form/cedar-template-form.component.html b/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/cedar-template-form/cedar-template-form.component.html
rename to src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.html
diff --git a/src/app/features/project/metadata/components/cedar-template-form/cedar-template-form.component.scss b/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.scss
similarity index 100%
rename from src/app/features/project/metadata/components/cedar-template-form/cedar-template-form.component.scss
rename to src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.scss
diff --git a/src/app/features/project/metadata/components/cedar-template-form/cedar-template-form.component.ts b/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.ts
similarity index 99%
rename from src/app/features/project/metadata/components/cedar-template-form/cedar-template-form.component.ts
rename to src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.ts
index 90954aa47..a117ea733 100644
--- a/src/app/features/project/metadata/components/cedar-template-form/cedar-template-form.component.ts
+++ b/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.ts
@@ -35,6 +35,7 @@ interface CedarEditorElement extends HTMLElement {
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class CedarTemplateFormComponent implements OnInit {
   emitData = output<CedarRecordDataBinding>();
diff --git a/src/app/features/project/metadata/components/index.ts b/src/app/shared/components/shared-metadata/components/index.ts
similarity index 100%
rename from src/app/features/project/metadata/components/index.ts
rename to src/app/shared/components/shared-metadata/components/index.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-description/project-metadata-description.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-doi/project-metadata-doi.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-doi/project-metadata-doi.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-doi/project-metadata-doi.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-doi/project-metadata-doi.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-doi/project-metadata-doi.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-doi/project-metadata-doi.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-doi/project-metadata-doi.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-doi/project-metadata-doi.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-doi/project-metadata-doi.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-doi/project-metadata-doi.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-doi/project-metadata-doi.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-doi/project-metadata-doi.component.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-license/project-metadata-license.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
similarity index 73%
rename from src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
index 89bd85459..928046214 100644
--- a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.html
@@ -2,11 +2,13 @@
   <div class="flex justify-content-between align-items-center">
     <h2>{{ 'project.overview.metadata.publication' | translate }}</h2>
 
-    <p-button
-      severity="secondary"
-      [label]="'common.buttons.edit' | translate"
-      (click)="openEditPublicationDoiDialog.emit()"
-    ></p-button>
+    @if (!hideEditDoi()) {
+      <p-button
+        severity="secondary"
+        [label]="'common.buttons.edit' | translate"
+        (click)="openEditPublicationDoiDialog.emit()"
+      ></p-button>
+    }
   </div>
 
   @if (identifiers() && identifiers().length) {
diff --git a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
similarity index 94%
rename from src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
index a93956ea2..e43a19bb4 100644
--- a/src/app/features/project/metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
@@ -18,4 +18,5 @@ export class ProjectMetadataPublicationDoiComponent {
   openEditPublicationDoiDialog = output<void>();
 
   identifiers = input<ProjectIdentifiers[]>([]);
+  hideEditDoi = input<boolean>(false);
 }
diff --git a/src/app/features/project/metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
rename to src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
diff --git a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.spec.ts b/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.spec.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.spec.ts
diff --git a/src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
similarity index 100%
rename from src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
rename to src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
diff --git a/src/app/features/project/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.html
similarity index 100%
rename from src/app/features/project/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.html
rename to src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.html
diff --git a/src/app/features/project/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts b/src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts
rename to src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts
diff --git a/src/app/features/project/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts
rename to src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts
diff --git a/src/app/features/project/metadata/dialogs/contributors-dialog/contributors-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.html
similarity index 100%
rename from src/app/features/project/metadata/dialogs/contributors-dialog/contributors-dialog.component.html
rename to src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.html
diff --git a/src/app/features/project/metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts b/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts
rename to src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts
diff --git a/src/app/features/project/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts
rename to src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.ts
diff --git a/src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.html
similarity index 100%
rename from src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.html
rename to src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.html
diff --git a/src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.scss b/src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.scss
similarity index 100%
rename from src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.scss
rename to src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.scss
diff --git a/src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.spec.ts b/src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.spec.ts
rename to src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.spec.ts
diff --git a/src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/description-dialog/description-dialog.component.ts
rename to src/app/shared/components/shared-metadata/dialogs/description-dialog/description-dialog.component.ts
diff --git a/src/app/features/project/metadata/dialogs/funding-dialog/funding-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.html
similarity index 100%
rename from src/app/features/project/metadata/dialogs/funding-dialog/funding-dialog.component.html
rename to src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.html
diff --git a/src/app/features/project/metadata/dialogs/funding-dialog/funding-dialog.component.spec.ts b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/funding-dialog/funding-dialog.component.spec.ts
rename to src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.spec.ts
diff --git a/src/app/features/project/metadata/dialogs/funding-dialog/funding-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
similarity index 96%
rename from src/app/features/project/metadata/dialogs/funding-dialog/funding-dialog.component.ts
rename to src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
index a6b8a5b96..a1185bcc6 100644
--- a/src/app/features/project/metadata/dialogs/funding-dialog/funding-dialog.component.ts
+++ b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
@@ -13,9 +13,6 @@ import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit,
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormArray, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 
-import { ProjectMetadataSelectors } from '@osf/features/project/metadata/store';
-import { ProjectOverview } from '@osf/features/project/overview/models';
-
 import {
   FunderOption,
   FundingDialogResult,
@@ -23,8 +20,9 @@ import {
   FundingEntryForm,
   FundingForm,
   SupplementData,
-} from '../../models';
-import { GetFundersList } from '../../store/project-metadata.actions';
+} from '@osf/features/project/metadata/models';
+import { GetFundersList, ProjectMetadataSelectors } from '@osf/features/project/metadata/store';
+import { ProjectOverview } from '@osf/features/project/overview/models';
 
 @Component({
   selector: 'osf-funding-dialog',
diff --git a/src/app/features/project/metadata/dialogs/index.ts b/src/app/shared/components/shared-metadata/dialogs/index.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/index.ts
rename to src/app/shared/components/shared-metadata/dialogs/index.ts
diff --git a/src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.html
similarity index 100%
rename from src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.html
rename to src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.html
diff --git a/src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.scss b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.scss
similarity index 100%
rename from src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.scss
rename to src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.scss
diff --git a/src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.spec.ts b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.spec.ts
rename to src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.spec.ts
diff --git a/src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.ts
rename to src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.ts
diff --git a/src/app/features/project/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html
similarity index 100%
rename from src/app/features/project/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html
rename to src/app/shared/components/shared-metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html
diff --git a/src/app/features/project/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.spec.ts b/src/app/shared/components/shared-metadata/dialogs/resource-information-dialog/resource-information-dialog.component.spec.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.spec.ts
rename to src/app/shared/components/shared-metadata/dialogs/resource-information-dialog/resource-information-dialog.component.spec.ts
diff --git a/src/app/features/project/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts
similarity index 100%
rename from src/app/features/project/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts
rename to src/app/shared/components/shared-metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts
diff --git a/src/app/shared/components/shared-metadata/shared-metadata.component.html b/src/app/shared/components/shared-metadata/shared-metadata.component.html
index 809714297..ca960cdfe 100644
--- a/src/app/shared/components/shared-metadata/shared-metadata.component.html
+++ b/src/app/shared/components/shared-metadata/shared-metadata.component.html
@@ -58,6 +58,7 @@ <h2>
 
     <osf-project-metadata-publication-doi
       (openEditPublicationDoiDialog)="handleEditDoi.emit()"
+      [hideEditDoi]="hideEditDoi()"
       [identifiers]="currentInstance().identifiers!"
     />
 
diff --git a/src/app/shared/components/shared-metadata/shared-metadata.component.ts b/src/app/shared/components/shared-metadata/shared-metadata.component.ts
index 9ea29c0a6..565caa9c6 100644
--- a/src/app/shared/components/shared-metadata/shared-metadata.component.ts
+++ b/src/app/shared/components/shared-metadata/shared-metadata.component.ts
@@ -5,6 +5,11 @@ import { Card } from 'primeng/card';
 import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
+import { CustomItemMetadataRecord } from '@osf/features/project/metadata/models';
+import { ProjectOverview } from '@osf/features/project/overview/models';
+import { TagsInputComponent } from '@shared/components';
+import { SubjectModel } from '@shared/models';
+
 import {
   ProjectMetadataAffiliatedInstitutionsComponent,
   ProjectMetadataContributorsComponent,
@@ -14,11 +19,7 @@ import {
   ProjectMetadataPublicationDoiComponent,
   ProjectMetadataResourceInformationComponent,
   ProjectMetadataSubjectsComponent,
-} from '@osf/features/project/metadata/components';
-import { CustomItemMetadataRecord } from '@osf/features/project/metadata/models';
-import { ProjectOverview } from '@osf/features/project/overview/models';
-import { TagsInputComponent } from '@shared/components';
-import { SubjectModel } from '@shared/models';
+} from './components';
 
 @Component({
   selector: 'osf-shared-metadata',
@@ -45,6 +46,7 @@ export class SharedMetadataComponent {
   customItemMetadata = input.required<CustomItemMetadataRecord>();
   selectedSubjects = input.required<SubjectModel[]>();
   isSubjectsUpdating = input.required<boolean>();
+  hideEditDoi = input<boolean>(false);
 
   openEditContributorDialog = output<void>();
   openEditDescriptionDialog = output<void>();
diff --git a/src/app/shared/components/tags-input/tags-input.component.html b/src/app/shared/components/tags-input/tags-input.component.html
index 4b62ccf56..4815011cf 100644
--- a/src/app/shared/components/tags-input/tags-input.component.html
+++ b/src/app/shared/components/tags-input/tags-input.component.html
@@ -1,11 +1,29 @@
-<div>
-  <p-chips
-    styleClass="w-full"
-    [ngModel]="tags()"
-    (ngModelChange)="onTagsChange($event)"
-    [placeholder]="'common.placeholder.addTag' | translate"
-    separator=","
-    [required]="required()"
-  ></p-chips>
-  <small>{{ 'common.hint.tagSeparators' | translate }}</small>
+<div class="flex flex-column gap-2">
+  <div
+    class="tags-input-container flex flex-wrap align-items-center gap-1 p-inputtext"
+    tabindex="0"
+    role="textbox"
+    [attr.aria-label]="'common.placeholder.addTag' | translate"
+    (click)="onContainerClick()"
+    (keydown)="onContainerKeydown($event)"
+  >
+    @for (tag of localTags(); track $index) {
+      <p-chip [label]="tag" [removable]="true" (onRemove)="removeTag($index)" class="p-chip-inline" />
+    }
+
+    <input
+      #tagInput
+      pInputText
+      type="text"
+      [placeholder]="localTags().length === 0 ? ('common.placeholder.addTag' | translate) : ''"
+      [required]="required() && localTags().length === 0"
+      (keydown)="onInputKeydown($event)"
+      (blur)="onInputBlur($event)"
+      class="tag-input-field"
+    />
+  </div>
+
+  <small class="text-color-secondary">
+    {{ 'common.hint.tagSeparators' | translate }}
+  </small>
 </div>
diff --git a/src/app/shared/components/tags-input/tags-input.component.scss b/src/app/shared/components/tags-input/tags-input.component.scss
index e69de29bb..9ed984add 100644
--- a/src/app/shared/components/tags-input/tags-input.component.scss
+++ b/src/app/shared/components/tags-input/tags-input.component.scss
@@ -0,0 +1,45 @@
+.tags-input-container {
+  min-height: 2.5rem;
+  border: 1px solid var(--p-inputtext-border-color);
+  background: var(--p-inputtext-background);
+  transition:
+    border-color 0.2s,
+    box-shadow 0.2s;
+  cursor: text;
+
+  &:focus-within {
+    border-color: var(--p-inputtext-focus-border-color);
+    box-shadow: var(--p-inputtext-focus-ring-shadow);
+  }
+
+  &:hover {
+    border-color: var(--p-inputtext-hover-border-color);
+  }
+
+  .tag-input-field {
+    border: none;
+    outline: none;
+    background: transparent;
+    flex: 1;
+    min-width: 120px;
+    font-size: 1rem;
+    padding: 0;
+    margin: 0;
+
+    &::placeholder {
+      color: var(--p-inputtext-placeholder-color);
+    }
+  }
+
+  .p-chip-inline {
+    font-size: 0.875rem;
+
+    .p-chip {
+      font-size: inherit;
+    }
+  }
+}
+
+.tags-input-container:focus-within .tag-input-field {
+  outline: none;
+}
diff --git a/src/app/shared/components/tags-input/tags-input.component.ts b/src/app/shared/components/tags-input/tags-input.component.ts
index 67c4957df..e8de22185 100644
--- a/src/app/shared/components/tags-input/tags-input.component.ts
+++ b/src/app/shared/components/tags-input/tags-input.component.ts
@@ -1,13 +1,23 @@
 import { TranslatePipe } from '@ngx-translate/core';
 
-import { Chips } from 'primeng/chips';
+import { Chip } from 'primeng/chip';
+import { InputText } from 'primeng/inputtext';
 
-import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  effect,
+  ElementRef,
+  input,
+  output,
+  signal,
+  viewChild,
+} from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
 @Component({
   selector: 'osf-tags-input',
-  imports: [TranslatePipe, FormsModule, Chips],
+  imports: [TranslatePipe, FormsModule, Chip, InputText],
   templateUrl: './tags-input.component.html',
   styleUrl: './tags-input.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -17,7 +27,81 @@ export class TagsInputComponent {
   required = input<boolean>(false);
   tagsChanged = output<string[]>();
 
-  onTagsChange(tags: string[]): void {
-    this.tagsChanged.emit(tags);
+  inputValue = signal<string>('');
+  inputElement = viewChild<ElementRef<HTMLInputElement>>('tagInput');
+
+  localTags = signal<string[]>([]);
+  private isLocalUpdate = false;
+
+  constructor() {
+    effect(() => {
+      const incoming = this.tags();
+
+      if (!this.isLocalUpdate) {
+        this.localTags.set([...incoming]);
+      }
+
+      this.isLocalUpdate = false;
+    });
+  }
+
+  onContainerClick(): void {
+    this.inputElement()?.nativeElement.focus();
+  }
+
+  onContainerKeydown(event: KeyboardEvent): void {
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault();
+      this.inputElement()?.nativeElement.focus();
+    }
+  }
+
+  onInputKeydown(event: KeyboardEvent): void {
+    const target = event.target as HTMLInputElement;
+    const value = target.value.trim();
+
+    if ((event.key === 'Enter' || event.key === ',' || event.key === ' ') && value) {
+      event.preventDefault();
+      this.addTag(value);
+      target.value = '';
+      this.inputValue.set('');
+    } else if (event.key === 'Backspace' && !value && this.localTags().length > 0) {
+      this.removeTag(this.localTags().length - 1);
+    }
+  }
+
+  onInputBlur(event: FocusEvent): void {
+    const target = event.target as HTMLInputElement;
+    const value = target.value.trim();
+
+    if (value) {
+      this.addTag(value);
+      target.value = '';
+      this.inputValue.set('');
+    }
+  }
+
+  private addTag(tagValue: string): void {
+    const currentTags = this.localTags();
+    const normalizedValue = tagValue.replace(/[,\s]+/g, ' ').trim();
+
+    if (normalizedValue && !currentTags.includes(normalizedValue)) {
+      const updatedTags = [...currentTags, normalizedValue];
+
+      this.localTags.set(updatedTags);
+      this.isLocalUpdate = true;
+
+      this.tagsChanged.emit(updatedTags);
+    }
+  }
+
+  removeTag(index: number): void {
+    const currentTags = this.localTags();
+    const updatedTags = currentTags.filter((_, i) => i !== index);
+
+    this.localTags.set(updatedTags);
+    this.isLocalUpdate = true;
+
+    this.tagsChanged.emit(updatedTags);
   }
 }
diff --git a/src/assets/styles/overrides/chip.scss b/src/assets/styles/overrides/chip.scss
index 661d1a9f7..fd31e98a5 100644
--- a/src/assets/styles/overrides/chip.scss
+++ b/src/assets/styles/overrides/chip.scss
@@ -32,8 +32,8 @@
   }
 }
 
-p-chips.ng-invalid.ng-touched {
-  .p-inputchips-input {
-    border-color: var(--p-inputchips-invalid-border-color);
+.osf-tags-input {
+  input.ng-invalid.ng-touched {
+    border-color: var(--p-inputtext-invalid-border-color);
   }
 }

From bbe9307eabcab25b94f03065a2b38d9514d1d64c Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Thu, 24 Jul 2025 00:35:30 +0300
Subject: [PATCH 6/9] feat(registries-metadata): add page

---
 src/app/core/interceptors/auth.interceptor.ts |  20 +-
 .../metadata/project-metadata.component.ts    |   2 -
 .../metadata/services/metadata.service.ts     |   2 +-
 .../mappers/registry-metadata.mapper.ts       |  40 ++
 src/app/features/registry/models/index.ts     |   2 +
 .../registry-contributor-json-api.model.ts    | 114 +++++
 .../registry-institutions-json-api.model.ts   |  29 ++
 .../models/registry-overview.models.ts        |   8 +-
 .../registry-metadata-add.component.ts        |   1 -
 .../registry-metadata.component.html          |   7 +-
 .../registry-metadata.component.ts            | 282 ++++++++++--
 .../services/registry-metadata.service.ts     | 109 ++++-
 .../registry-metadata.actions.ts              |  61 ++-
 .../registry-metadata.model.ts                |  13 +-
 .../registry-metadata.selectors.ts            |  22 +-
 .../registry-metadata.state.ts                | 413 ++++++++----------
 .../components/license/license.component.html |   4 +-
 .../components/license/license.component.ts   |   2 +
 .../cedar-template-form.component.ts          |   1 -
 ...ata-affiliated-institutions.component.html |  12 +-
 ...adata-affiliated-institutions.component.ts |   1 +
 ...oject-metadata-contributors.component.html |  12 +-
 ...project-metadata-contributors.component.ts |   4 +-
 ...roject-metadata-description.component.html |  12 +-
 .../project-metadata-description.component.ts |   4 +-
 .../project-metadata-funding.component.html   |  41 +-
 .../project-metadata-funding.component.ts     |   8 +-
 .../project-metadata-license.component.html   |  12 +-
 .../project-metadata-license.component.ts     |   2 +-
 ...ject-metadata-publication-doi.component.ts |   1 -
 ...tadata-resource-information.component.html |  18 +-
 ...metadata-resource-information.component.ts |   3 +-
 .../project-metadata-subjects.component.html  |   1 +
 .../project-metadata-subjects.component.ts    |   2 +-
 .../contributors-dialog.component.ts          |   7 +-
 .../funding-dialog.component.ts               |  27 +-
 .../license-dialog.component.html             |  38 +-
 .../license-dialog.component.ts               |  98 +++--
 .../shared-metadata.component.html            |  19 +-
 .../shared-metadata.component.ts              |   4 +-
 .../subjects/subjects.component.html          |  96 ++--
 .../components/subjects/subjects.component.ts |   7 +
 .../tags-input/tags-input.component.html      |  16 +-
 .../tags-input/tags-input.component.ts        |   5 +
 44 files changed, 1064 insertions(+), 518 deletions(-)
 create mode 100644 src/app/features/registry/models/registry-contributor-json-api.model.ts
 create mode 100644 src/app/features/registry/models/registry-institutions-json-api.model.ts

diff --git a/src/app/core/interceptors/auth.interceptor.ts b/src/app/core/interceptors/auth.interceptor.ts
index 174408c69..7b6a9deaf 100644
--- a/src/app/core/interceptors/auth.interceptor.ts
+++ b/src/app/core/interceptors/auth.interceptor.ts
@@ -11,15 +11,19 @@ export const authInterceptor: HttpInterceptorFn = (
   // 2rjFZwmdDG4rtKj7hGkEMO6XyHBM2lN7XBbsA1e8OqcFhOWu6Z7fQZiheu9RXtzSeVrgOt roman nastyuk
 
   if (authToken) {
-    const authReq = req.clone({
-      setHeaders: {
-        Authorization: `Bearer ${authToken}`,
-        Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json',
-        'Content-Type': 'application/vnd.api+json',
-      },
-    });
+    if (!req.url.includes('/api.crossref.org/funders')) {
+      const authReq = req.clone({
+        setHeaders: {
+          Authorization: `Bearer ${authToken}`,
+          Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json',
+          'Content-Type': 'application/vnd.api+json',
+        },
+      });
 
-    return next(authReq);
+      return next(authReq);
+    } else {
+      return next(req);
+    }
   }
 
   return next(req);
diff --git a/src/app/features/project/metadata/project-metadata.component.ts b/src/app/features/project/metadata/project-metadata.component.ts
index 6fc759327..cd7c4a4bf 100644
--- a/src/app/features/project/metadata/project-metadata.component.ts
+++ b/src/app/features/project/metadata/project-metadata.component.ts
@@ -73,7 +73,6 @@ import { CustomConfirmationService, LoaderService, ToastService } from '@shared/
   styleUrl: './project-metadata.component.scss',
   providers: [DialogService],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
 })
 export class ProjectMetadataComponent implements OnInit {
   private readonly route = inject(ActivatedRoute);
@@ -285,7 +284,6 @@ export class ProjectMetadataComponent implements OnInit {
       )
       .subscribe({
         next: () => this.toastService.showSuccess('project.metadata.resourceInformation.updated'),
-        error: () => this.toastService.showError('project.metadata.resourceInformation.updateFailed'),
       });
   }
 
diff --git a/src/app/features/project/metadata/services/metadata.service.ts b/src/app/features/project/metadata/services/metadata.service.ts
index 0515535d8..a6c56b206 100644
--- a/src/app/features/project/metadata/services/metadata.service.ts
+++ b/src/app/features/project/metadata/services/metadata.service.ts
@@ -40,7 +40,7 @@ export class MetadataService {
   }
 
   getFundersList(searchQuery?: string): Observable<CrossRefFundersResponse> {
-    let url = environment.funderApiUrl;
+    let url = `${environment.funderApiUrl}funders?mailto=support%40osf.io`;
 
     if (searchQuery && searchQuery.trim()) {
       url += `&query=${encodeURIComponent(searchQuery.trim())}`;
diff --git a/src/app/features/registry/mappers/registry-metadata.mapper.ts b/src/app/features/registry/mappers/registry-metadata.mapper.ts
index 5638443c9..d94a07ef1 100644
--- a/src/app/features/registry/mappers/registry-metadata.mapper.ts
+++ b/src/app/features/registry/mappers/registry-metadata.mapper.ts
@@ -1,5 +1,6 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
 import { RegistryStatus, RevisionReviewStates } from '@shared/enums';
+import { License } from '@shared/models';
 
 import {
   BibliographicContributor,
@@ -12,6 +13,7 @@ export class RegistryMetadataMapper {
   static fromMetadataApiResponse(response: Record<string, unknown>): RegistryOverview {
     const attributes = response['attributes'] as Record<string, unknown>;
     const embeds = response['embeds'] as Record<string, unknown>;
+    const relationships = response['relationships'] as Record<string, unknown>;
 
     const contributors: ProjectOverviewContributor[] = [];
     if (embeds && embeds['contributors']) {
@@ -34,6 +36,41 @@ export class RegistryMetadataMapper {
       });
     }
 
+    let license: License | undefined;
+    let licenseUrl: string | undefined;
+
+    if (embeds && embeds['license']) {
+      const licenseData = (embeds['license'] as Record<string, unknown>)['data'] as Record<string, unknown>;
+      if (licenseData) {
+        const licenseAttributes = licenseData['attributes'] as Record<string, unknown>;
+        license = {
+          id: licenseData['id'] as string,
+          name: licenseAttributes['name'] as string,
+          text: licenseAttributes['text'] as string,
+          url: licenseAttributes['url'] as string,
+          requiredFields: (licenseAttributes['required_fields'] as string[]) || [],
+        };
+      }
+    } else if (relationships && relationships['license']) {
+      const licenseRelationship = relationships['license'] as Record<string, unknown>;
+      if (licenseRelationship['links']) {
+        const licenseLinks = licenseRelationship['links'] as Record<string, unknown>;
+        if (licenseLinks['related'] && typeof licenseLinks['related'] === 'object') {
+          const relatedLinks = licenseLinks['related'] as Record<string, unknown>;
+          licenseUrl = relatedLinks['href'] as string;
+        }
+      }
+    }
+
+    let nodeLicense: { copyrightHolders: string[]; year: string } | undefined;
+    if (attributes['node_license']) {
+      const nodeLicenseData = attributes['node_license'] as Record<string, unknown>;
+      nodeLicense = {
+        copyrightHolders: (nodeLicenseData['copyright_holders'] as string[]) || [],
+        year: (nodeLicenseData['year'] as string) || new Date().getFullYear().toString(),
+      };
+    }
+
     return {
       id: response['id'] as string,
       type: (response['type'] as string) || 'registrations',
@@ -57,6 +94,9 @@ export class RegistryMetadataMapper {
       analyticsKey: (attributes['analytics_key'] as string) || '',
       contributors: contributors,
       subjects: Array.isArray(attributes['subjects']) ? attributes['subjects'].flat() : attributes['subjects'],
+      license: license,
+      nodeLicense: nodeLicense,
+      licenseUrl: licenseUrl,
       forksCount: 0,
       citation: '',
       hasData: false,
diff --git a/src/app/features/registry/models/index.ts b/src/app/features/registry/models/index.ts
index 1bb999279..e64ed4424 100644
--- a/src/app/features/registry/models/index.ts
+++ b/src/app/features/registry/models/index.ts
@@ -2,7 +2,9 @@ export * from './get-registry-institutions-json-api.model';
 export * from './get-registry-overview-json-api.model';
 export * from './get-registry-schema-block-json-api.model';
 export * from './get-resource-subjects-json-api.model';
+export * from './registry-contributor-json-api.model';
 export * from './registry-institution.model';
+export * from './registry-institutions-json-api.model';
 export * from './registry-metadata.models';
 export * from './registry-overview.models';
 export * from './registry-schema-block.model';
diff --git a/src/app/features/registry/models/registry-contributor-json-api.model.ts b/src/app/features/registry/models/registry-contributor-json-api.model.ts
new file mode 100644
index 000000000..3193d114e
--- /dev/null
+++ b/src/app/features/registry/models/registry-contributor-json-api.model.ts
@@ -0,0 +1,114 @@
+export interface RegistryContributorJsonApi {
+  id: string;
+  type: 'contributors';
+  attributes: {
+    index: number;
+    bibliographic: boolean;
+    permission: string;
+    unregistered_contributor: string | null;
+    is_curator: boolean;
+  };
+  relationships: {
+    users: {
+      links: {
+        related: {
+          href: string;
+          meta: Record<string, unknown>;
+        };
+      };
+      data: {
+        id: string;
+        type: 'users';
+      };
+    };
+    node: {
+      links: {
+        related: {
+          href: string;
+          meta: Record<string, unknown>;
+        };
+      };
+      data: {
+        id: string;
+        type: 'nodes';
+      };
+    };
+  };
+  embeds?: {
+    users: {
+      data: {
+        id: string;
+        type: 'users';
+        attributes: {
+          full_name: string;
+          given_name: string;
+          middle_names: string;
+          family_name: string;
+          suffix: string;
+          date_registered: string;
+          active: boolean;
+          timezone: string;
+          locale: string;
+          social: Record<string, unknown>;
+          employment: unknown[];
+          education: unknown[];
+        };
+        relationships: Record<string, unknown>;
+        links: {
+          html: string;
+          profile_image: string;
+          self: string;
+          iri: string;
+        };
+      };
+    };
+  };
+  links: {
+    self: string;
+  };
+}
+
+export interface RegistryContributorJsonApiResponse {
+  data: RegistryContributorJsonApi;
+  links: {
+    self: string;
+  };
+  meta: {
+    version: string;
+  };
+}
+
+export interface RegistryContributorUpdateRequest {
+  data: {
+    id: string;
+    type: 'contributors';
+    attributes: Record<string, unknown>;
+    relationships: Record<string, unknown>;
+  };
+}
+
+export interface RegistryContributorsListJsonApiResponse {
+  data: RegistryContributorJsonApi[];
+  links: {
+    first: string | null;
+    last: string | null;
+    prev: string | null;
+    next: string | null;
+    meta: {
+      total: number;
+      per_page: number;
+      total_bibliographic: number;
+    };
+  };
+  meta: {
+    version: string;
+  };
+}
+
+export interface RegistryContributorAddRequest {
+  data: {
+    type: 'contributors';
+    attributes: Record<string, unknown>;
+    relationships: Record<string, unknown>;
+  };
+}
diff --git a/src/app/features/registry/models/registry-institutions-json-api.model.ts b/src/app/features/registry/models/registry-institutions-json-api.model.ts
new file mode 100644
index 000000000..e3aab2ad1
--- /dev/null
+++ b/src/app/features/registry/models/registry-institutions-json-api.model.ts
@@ -0,0 +1,29 @@
+export interface RegistryInstitutionJsonApi {
+  id: string;
+  type: string;
+  attributes: {
+    name: string;
+  };
+  links: {
+    self: string;
+    html: string;
+    iri: string;
+  };
+}
+
+export interface RegistryInstitutionsJsonApiResponse {
+  data: RegistryInstitutionJsonApi[];
+  links: {
+    first: string | null;
+    last: string | null;
+    prev: string | null;
+    next: string | null;
+    meta: {
+      total: number;
+      per_page: number;
+    };
+  };
+  meta: {
+    version: string;
+  };
+}
diff --git a/src/app/features/registry/models/registry-overview.models.ts b/src/app/features/registry/models/registry-overview.models.ts
index 91cdc6d53..b9c34528a 100644
--- a/src/app/features/registry/models/registry-overview.models.ts
+++ b/src/app/features/registry/models/registry-overview.models.ts
@@ -1,6 +1,7 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
 import { RegistrationQuestions, RegistrySubject } from '@osf/features/registry/models';
 import { RegistryStatus, RevisionReviewStates } from '@shared/enums';
+import { License } from '@shared/models';
 
 export interface RegistryOverview {
   id: string;
@@ -24,11 +25,8 @@ export interface RegistryOverview {
     copyrightHolders: string[];
     year: string;
   };
-  license?: {
-    name: string;
-    text: string;
-    url: string;
-  };
+  license?: License;
+  licenseUrl?: string;
   identifiers?: {
     id: string;
     type: string;
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
index f563ff161..700e325e7 100644
--- a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
@@ -32,7 +32,6 @@ import {
   templateUrl: './registry-metadata-add.component.html',
   styleUrl: './registry-metadata-add.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
 })
 export class RegistryMetadataAddComponent implements OnInit {
   private readonly route = inject(ActivatedRoute);
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
index c21f66aeb..0f4c3d417 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.html
@@ -1,6 +1,6 @@
 <section class="flex flex-column flex-1">
   <osf-sub-header
-    [showButton]="true"
+    [showButton]="!isReadonly()"
     [buttonLabel]="'project.metadata.addCommunityMetadataRecord.title' | translate"
     (buttonClick)="openAddRecord()"
     [title]="'project.overview.metadata.title' | translate"
@@ -25,7 +25,8 @@
           <p-tabpanel [value]="tab.id">
             @if (tab.type === 'registry') {
               <osf-shared-metadata
-                [hideEditDoi]="true"
+                [hideEditDoiAndLicence]="true"
+                [readonly]="isReadonly()"
                 [selectedSubjects]="selectedSubjects()"
                 [isSubjectsUpdating]="isSubjectsUpdating()"
                 [currentInstance]="getCurrentInstanceForTemplate()"
@@ -35,8 +36,6 @@
                 (openEditResourceInformationDialog)="openEditResourceInformationDialog()"
                 (openEditFundingDialog)="openEditFundingDialog()"
                 (openEditAffiliatedInstitutionsDialog)="openEditAffiliatedInstitutionsDialog()"
-                (openEditLicenseDialog)="openEditLicenseDialog()"
-                (handleEditDoi)="handleEditDoi()"
                 (tagsChanged)="onTagsChanged($event)"
                 (getSubjectChildren)="getSubjectChildren($event)"
                 (searchSubjects)="searchSubjects($event)"
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
index 78a7f6c48..f3c7e8542 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
@@ -5,7 +5,18 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 import { DialogService } from 'primeng/dynamicdialog';
 import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs';
 
-import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit, signal } from '@angular/core';
+import { EMPTY, filter, switchMap } from 'rxjs';
+
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  DestroyRef,
+  effect,
+  inject,
+  OnInit,
+  signal,
+} from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
@@ -25,29 +36,39 @@ import {
   FetchSubjects,
   GetAllContributors,
   SubjectsSelectors,
-  UpdateResourceSubjects,
 } from '@osf/shared/stores';
 import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
 import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
+import {
+  AffiliatedInstitutionsDialogComponent,
+  ContributorsDialogComponent,
+  DescriptionDialogComponent,
+  FundingDialogComponent,
+  ResourceInformationDialogComponent,
+} from '@shared/components/shared-metadata/dialogs';
 import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
 import { ResourceType } from '@shared/enums';
 import { SubjectModel } from '@shared/models';
-import { CustomConfirmationService, LoaderService, ToastService } from '@shared/services';
+import { ToastService } from '@shared/services';
 
 import {
+  AddRegistryContributor,
   CreateCedarMetadataRecord,
   GetBibliographicContributors,
   GetCedarMetadataTemplates,
   GetCustomItemMetadata,
-  GetFundersList,
   GetRegistryCedarMetadataRecords,
   GetRegistryForMetadata,
+  GetRegistryInstitutions,
   GetRegistrySubjects,
   GetUserInstitutions,
   RegistryMetadataSelectors,
   UpdateCedarMetadataRecord,
   UpdateCustomItemMetadata,
+  UpdateRegistryContributor,
   UpdateRegistryDetails,
+  UpdateRegistryInstitutions,
+  UpdateRegistrySubjects,
 } from '../../store/registry-metadata';
 
 @Component({
@@ -68,7 +89,6 @@ import {
   styleUrl: './registry-metadata.component.scss',
   providers: [DialogService],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
 })
 export class RegistryMetadataComponent implements OnInit {
   private readonly route = inject(ActivatedRoute);
@@ -77,8 +97,6 @@ export class RegistryMetadataComponent implements OnInit {
   private readonly dialogService = inject(DialogService);
   private readonly translateService = inject(TranslateService);
   private readonly toastService = inject(ToastService);
-  private readonly loaderService = inject(LoaderService);
-  private readonly customConfirmationService = inject(CustomConfirmationService);
 
   private registryId = '';
 
@@ -95,35 +113,44 @@ export class RegistryMetadataComponent implements OnInit {
     updateRegistryDetails: UpdateRegistryDetails,
     getCustomItemMetadata: GetCustomItemMetadata,
     updateCustomItemMetadata: UpdateCustomItemMetadata,
-    getFundersList: GetFundersList,
     getContributors: GetAllContributors,
     getUserInstitutions: GetUserInstitutions,
+    getRegistryInstitutions: GetRegistryInstitutions,
     getRegistrySubjects: GetRegistrySubjects,
     getCedarRecords: GetRegistryCedarMetadataRecords,
     getCedarTemplates: GetCedarMetadataTemplates,
     createCedarRecord: CreateCedarMetadataRecord,
     updateCedarRecord: UpdateCedarMetadataRecord,
+    addRegistryContributor: AddRegistryContributor,
 
     fetchSubjects: FetchSubjects,
     fetchSelectedSubjects: FetchSelectedSubjects,
     fetchChildrenSubjects: FetchChildrenSubjects,
-    updateResourceSubjects: UpdateResourceSubjects,
+    updateRegistrySubjects: UpdateRegistrySubjects,
+    updateRegistryInstitutions: UpdateRegistryInstitutions,
+    updateRegistryContributor: UpdateRegistryContributor,
   });
 
   protected currentRegistry = select(RegistryMetadataSelectors.getRegistry);
   protected currentRegistryLoading = select(RegistryMetadataSelectors.getRegistryLoading);
-  protected bibliographicContributors = select(RegistryMetadataSelectors.getBibliographicContributors);
-  protected bibliographicContributorsLoading = select(RegistryMetadataSelectors.getBibliographicContributorsLoading);
   protected customItemMetadata = select(RegistryMetadataSelectors.getCustomItemMetadata);
-  protected fundersList = select(RegistryMetadataSelectors.getFundersList);
+  protected currentUser = select(UserSelectors.getCurrentUser);
   protected contributors = select(ContributorsSelectors.getContributors);
   protected isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
-  protected currentUser = select(UserSelectors.getCurrentUser);
+  protected institutions = select(RegistryMetadataSelectors.getInstitutions);
   protected selectedSubjects = select(SubjectsSelectors.getSelectedSubjects);
   protected isSubjectsUpdating = select(SubjectsSelectors.areSelectedSubjectsLoading);
   protected cedarRecords = select(RegistryMetadataSelectors.getCedarRecords);
   protected cedarTemplates = select(RegistryMetadataSelectors.getCedarTemplates);
 
+  protected readonly isReadonly = computed(() => {
+    const registry = this.currentRegistry();
+    if (!registry) return false;
+
+    const permissions = registry.currentUserPermissions || [];
+    return permissions.length === 1 && permissions[0] === 'read';
+  });
+
   constructor() {
     effect(() => {
       const records = this.cedarRecords();
@@ -168,6 +195,7 @@ export class RegistryMetadataComponent implements OnInit {
       this.actions.getBibliographicContributors(this.registryId);
       this.actions.getCustomItemMetadata(this.registryId);
       this.actions.getContributors(this.registryId, ResourceType.Registration);
+      this.actions.getRegistryInstitutions(this.registryId);
       this.actions.getRegistrySubjects(this.registryId);
       this.actions.getCedarRecords(this.registryId);
       this.actions.getCedarTemplates();
@@ -193,52 +221,194 @@ export class RegistryMetadataComponent implements OnInit {
   }
 
   openEditContributorDialog(): void {
-    // Similar implementation to project metadata
-    // For now, just show the bibliographic contributors from the API
-    console.log('Bibliographic contributors:', this.bibliographicContributors());
+    const dialogRef = this.dialogService.open(ContributorsDialogComponent, {
+      width: '800px',
+      header: this.translateService.instant('project.metadata.contributors.editContributors'),
+      focusOnShow: false,
+      closeOnEscape: true,
+      modal: true,
+      closable: true,
+      data: {
+        projectId: this.currentRegistry()?.id,
+        contributors: this.contributors(),
+        isLoading: this.isContributorsLoading(),
+        isRegistry: true,
+      },
+    });
+
+    dialogRef.onClose.pipe(filter((result) => !!result && (result.refresh || result.saved))).subscribe({
+      next: () => {
+        this.refreshContributorsData();
+        this.toastService.showSuccess('project.metadata.contributors.updateSucceed');
+      },
+    });
   }
 
   openEditDescriptionDialog(): void {
-    // Similar implementation to project metadata
-    console.log('Edit description for registry:', this.currentRegistry());
+    const dialogRef = this.dialogService.open(DescriptionDialogComponent, {
+      header: this.translateService.instant('project.metadata.description.dialog.header'),
+      width: '500px',
+      focusOnShow: false,
+      closeOnEscape: true,
+      modal: true,
+      closable: true,
+      data: {
+        currentProject: this.currentRegistry(),
+      },
+    });
+
+    dialogRef.onClose
+      .pipe(
+        filter((result) => !!result),
+        switchMap((result) => {
+          const registryId = this.currentRegistry()?.id;
+          if (registryId) {
+            return this.actions.updateRegistryDetails(registryId, { description: result });
+          }
+          return EMPTY;
+        })
+      )
+      .subscribe({
+        next: () => {
+          this.toastService.showSuccess('project.metadata.description.updated');
+          const registryId = this.currentRegistry()?.id;
+          if (registryId) {
+            this.actions.getRegistry(registryId);
+          }
+        },
+      });
   }
 
   openEditResourceInformationDialog(): void {
-    // Similar implementation to project metadata
-    console.log('Edit resource information for registry:', this.currentRegistry());
-  }
+    const dialogRef = this.dialogService.open(ResourceInformationDialogComponent, {
+      header: this.translateService.instant('project.metadata.resourceInformation.dialog.header'),
+      width: '500px',
+      focusOnShow: false,
+      closeOnEscape: true,
+      modal: true,
+      closable: true,
+      data: {
+        currentProject: this.currentRegistry(),
+        customItemMetadata: this.customItemMetadata(),
+      },
+    });
 
-  openEditLicenseDialog(): void {
-    // Similar implementation to project metadata
-    console.log('Edit license for registry:', this.currentRegistry());
+    dialogRef.onClose
+      .pipe(
+        filter((result) => !!result && (result.resourceType || result.resourceLanguage)),
+        switchMap((result) => {
+          const registryId = this.currentRegistry()?.id;
+          if (registryId) {
+            const currentMetadata = this.customItemMetadata();
+
+            const updatedMetadata = {
+              ...currentMetadata,
+              language: result.resourceLanguage || currentMetadata?.language,
+              resource_type_general: result.resourceType || currentMetadata?.resource_type_general,
+              funders: currentMetadata?.funders,
+            };
+
+            return this.actions.updateCustomItemMetadata(registryId, updatedMetadata);
+          }
+          return EMPTY;
+        })
+      )
+      .subscribe({
+        next: () => this.toastService.showSuccess('project.metadata.resourceInformation.updated'),
+      });
   }
 
   openEditFundingDialog(): void {
-    this.actions.getFundersList();
-    // Similar implementation to project metadata
-    console.log('Edit funding for registry:', this.currentRegistry());
-  }
+    const dialogRef = this.dialogService.open(FundingDialogComponent, {
+      header: this.translateService.instant('project.metadata.funding.dialog.header'),
+      width: '600px',
+      focusOnShow: false,
+      closeOnEscape: true,
+      modal: true,
+      closable: true,
+      data: {
+        funders: this.customItemMetadata().funders,
+      },
+    });
 
-  openEditAffiliatedInstitutionsDialog(): void {
-    // Similar implementation to project metadata
-    console.log('Edit affiliated institutions for registry:', this.currentRegistry());
+    dialogRef.onClose
+      .pipe(
+        filter((result) => !!result && result.fundingEntries),
+        switchMap((result) => {
+          const registryId = this.currentRegistry()?.id;
+          if (registryId) {
+            const currentMetadata = this.customItemMetadata() || {
+              language: 'en',
+              resource_type_general: 'Dataset',
+              funders: [],
+            };
+
+            const updatedMetadata = {
+              ...currentMetadata,
+              funders: result.fundingEntries.map(
+                (entry: {
+                  funderName?: string;
+                  funderIdentifier?: string;
+                  funderIdentifierType?: string;
+                  awardNumber?: string;
+                  awardUri?: string;
+                  awardTitle?: string;
+                }) => ({
+                  funder_name: entry.funderName || '',
+                  funder_identifier: entry.funderIdentifier || '',
+                  funder_identifier_type: entry.funderIdentifierType || '',
+                  award_number: entry.awardNumber || '',
+                  award_uri: entry.awardUri || '',
+                  award_title: entry.awardTitle || '',
+                })
+              ),
+            };
+
+            return this.actions.updateCustomItemMetadata(registryId, updatedMetadata);
+          }
+
+          return EMPTY;
+        })
+      )
+      .subscribe({
+        next: () => this.toastService.showSuccess('project.metadata.funding.updated'),
+      });
   }
 
-  handleEditDoi(): void {
-    this.customConfirmationService.confirmDelete({
-      headerKey: this.translateService.instant('project.metadata.doi.dialog.createConfirm.header'),
-      messageKey: this.translateService.instant('project.metadata.doi.dialog.createConfirm.message'),
-      acceptLabelKey: this.translateService.instant('common.buttons.create'),
-      acceptLabelType: 'primary',
-      onConfirm: () => {
-        const registryId = this.currentRegistry()?.id;
-        if (registryId) {
-          this.actions.updateRegistryDetails(registryId, { doi: true }).subscribe({
-            next: () => this.toastService.showSuccess('registry.metadata.doi.created'),
-          });
-        }
+  openEditAffiliatedInstitutionsDialog(): void {
+    const dialogRef = this.dialogService.open(AffiliatedInstitutionsDialogComponent, {
+      header: this.translateService.instant('project.metadata.affiliatedInstitutions.dialog.header'),
+      width: '500px',
+      focusOnShow: false,
+      closeOnEscape: true,
+      modal: true,
+      closable: true,
+      data: {
+        currentProject: this.getCurrentInstanceForTemplate(),
       },
     });
+
+    dialogRef.onClose
+      .pipe(
+        filter((result) => !!result),
+        switchMap((result) => {
+          const registryId = this.currentRegistry()?.id;
+          if (registryId) {
+            const institutionsData = result.map((institutionId: string) => ({
+              type: 'institutions',
+              id: institutionId,
+            }));
+
+            return this.actions.updateRegistryInstitutions(registryId, institutionsData);
+          }
+          return EMPTY;
+        })
+      )
+      .subscribe({
+        next: () => {
+          this.toastService.showSuccess('project.metadata.affiliatedInstitutions.updated');
+        },
+      });
   }
 
   getSubjectChildren(parentId: string) {
@@ -250,11 +420,27 @@ export class RegistryMetadataComponent implements OnInit {
   }
 
   updateSelectedSubjects(subjects: SubjectModel[]) {
-    this.actions.updateResourceSubjects(this.registryId, ResourceType.Registration, subjects);
+    const subjectData = subjects.map((subject) => ({
+      type: 'subjects',
+      id: subject.id,
+    }));
+    this.actions.updateRegistrySubjects(this.registryId, subjectData);
   }
 
   getCurrentInstanceForTemplate(): ProjectOverview {
-    return this.currentRegistry() as unknown as ProjectOverview;
+    const registry = this.currentRegistry();
+    const institutions = this.institutions();
+
+    const institutionsFormatted =
+      institutions?.map((inst) => ({
+        id: inst.id,
+        name: inst.attributes.name,
+      })) || [];
+
+    return {
+      ...registry,
+      institutions: institutionsFormatted,
+    } as unknown as ProjectOverview;
   }
 
   getCustomMetadataForTemplate(): CustomItemMetadataRecord {
@@ -391,4 +577,8 @@ export class RegistryMetadataComponent implements OnInit {
       }
     }
   }
+
+  private refreshContributorsData(): void {
+    this.actions.getContributors(this.registryId, ResourceType.Registration);
+  }
 }
diff --git a/src/app/features/registry/services/registry-metadata.service.ts b/src/app/features/registry/services/registry-metadata.service.ts
index 01e4700fa..d138ba8a8 100644
--- a/src/app/features/registry/services/registry-metadata.service.ts
+++ b/src/app/features/registry/services/registry-metadata.service.ts
@@ -9,13 +9,17 @@ import {
   CedarMetadataRecordJsonApi,
   CedarMetadataTemplateJsonApi,
 } from '@osf/features/project/metadata/models';
+import { License } from '@shared/models';
 
 import { RegistryMetadataMapper } from '../mappers';
 import {
   BibliographicContributorsJsonApi,
-  CrossRefFundersResponse,
   CustomItemMetadataRecord,
   CustomItemMetadataResponse,
+  RegistryContributorAddRequest,
+  RegistryContributorJsonApiResponse,
+  RegistryContributorUpdateRequest,
+  RegistryInstitutionsJsonApiResponse,
   RegistryOverview,
   RegistrySubjectsJsonApi,
   UserInstitutionsResponse,
@@ -53,22 +57,17 @@ export class RegistryMetadataService {
   }
 
   updateCustomItemMetadata(guid: string, metadata: CustomItemMetadataRecord): Observable<CustomItemMetadataResponse> {
-    return this.jsonApiService.put<CustomItemMetadataResponse>(`${this.apiUrl}/custom_item_metadata_records/${guid}/`, {
-      data: {
-        type: 'custom-item-metadata-records',
-        attributes: metadata,
-      },
-    });
-  }
-
-  getFundersList(searchQuery?: string): Observable<CrossRefFundersResponse> {
-    let url = environment.funderApiUrl;
-
-    if (searchQuery && searchQuery.trim()) {
-      url += `&query=${encodeURIComponent(searchQuery.trim())}`;
-    }
-
-    return this.jsonApiService.get<CrossRefFundersResponse>(url);
+    return this.jsonApiService.patch<CustomItemMetadataResponse>(
+      `${this.apiUrl}/custom_item_metadata_records/${guid}/`,
+      {
+        data: {
+          id: guid,
+          type: 'custom-item-metadata-records',
+          attributes: metadata,
+          relationships: {},
+        },
+      }
+    );
   }
 
   getRegistryForMetadata(registryId: string): Observable<RegistryOverview> {
@@ -149,4 +148,80 @@ export class RegistryMetadataService {
       data
     );
   }
+
+  updateRegistrySubjects(
+    registryId: string,
+    subjects: { type: string; id: string }[]
+  ): Observable<{ data: { type: string; id: string }[] }> {
+    return this.jsonApiService.patch<{ data: { type: string; id: string }[] }>(
+      `${this.apiUrl}/registrations/${registryId}/relationships/subjects/`,
+      {
+        data: subjects,
+      }
+    );
+  }
+
+  updateRegistryInstitutions(
+    registryId: string,
+    institutions: { type: string; id: string }[]
+  ): Observable<{ data: { type: string; id: string }[] }> {
+    return this.jsonApiService.patch<{ data: { type: string; id: string }[] }>(
+      `${this.apiUrl}/registrations/${registryId}/relationships/institutions/`,
+      {
+        data: institutions,
+      }
+    );
+  }
+
+  getLicenseFromUrl(licenseUrl: string): Observable<License> {
+    return this.jsonApiService.get<{ data: Record<string, unknown> }>(licenseUrl).pipe(
+      map((response) => {
+        const licenseData = response.data;
+        const attributes = licenseData['attributes'] as Record<string, unknown>;
+
+        return {
+          id: licenseData['id'] as string,
+          name: attributes['name'] as string,
+          text: attributes['text'] as string,
+          url: attributes['url'] as string,
+          requiredFields: (attributes['required_fields'] as string[]) || [],
+        } as License;
+      })
+    );
+  }
+
+  getRegistryInstitutions(
+    registryId: string,
+    page = 1,
+    pageSize = 100
+  ): Observable<RegistryInstitutionsJsonApiResponse> {
+    const params: Record<string, unknown> = {
+      'fields[institutions]': 'name',
+      page: page,
+      'page[size]': pageSize,
+    };
+
+    return this.jsonApiService.get(`${this.apiUrl}/registrations/${registryId}/institutions/`, params);
+  }
+
+  updateRegistryContributor(
+    registryId: string,
+    contributorId: string,
+    updateData: RegistryContributorUpdateRequest
+  ): Observable<RegistryContributorJsonApiResponse> {
+    return this.jsonApiService.patch<RegistryContributorJsonApiResponse>(
+      `${this.apiUrl}/registrations/${registryId}/contributors/${contributorId}/`,
+      updateData
+    );
+  }
+
+  addRegistryContributor(
+    registryId: string,
+    contributorData: RegistryContributorAddRequest
+  ): Observable<RegistryContributorJsonApiResponse> {
+    return this.jsonApiService.post<RegistryContributorJsonApiResponse>(
+      `${this.apiUrl}/registrations/${registryId}/contributors/`,
+      contributorData
+    );
+  }
 }
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
index ca8b1c9e0..f7cec76ca 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.actions.ts
@@ -37,11 +37,6 @@ export class UpdateRegistryDetails {
   ) {}
 }
 
-export class GetFundersList {
-  static readonly type = '[RegistryMetadata] Get Funders List';
-  constructor(public search?: string) {}
-}
-
 export class GetUserInstitutions {
   static readonly type = '[RegistryMetadata] Get User Institutions';
   constructor(
@@ -60,6 +55,57 @@ export class GetRegistrySubjects {
   ) {}
 }
 
+export class UpdateRegistrySubjects {
+  static readonly type = '[RegistryMetadata] Update Registry Subjects';
+  constructor(
+    public registryId: string,
+    public subjects: { type: string; id: string }[]
+  ) {}
+}
+
+export class UpdateRegistryInstitutions {
+  static readonly type = '[RegistryMetadata] Update Registry Institutions';
+  constructor(
+    public registryId: string,
+    public institutions: { type: string; id: string }[]
+  ) {}
+}
+
+export class GetRegistryInstitutions {
+  static readonly type = '[RegistryMetadata] Get Registry Institutions';
+  constructor(
+    public registryId: string,
+    public page?: number,
+    public pageSize?: number
+  ) {}
+}
+
+export class UpdateRegistryContributor {
+  static readonly type = '[RegistryMetadata] Update Registry Contributor';
+  constructor(
+    public registryId: string,
+    public contributorId: string,
+    public updateData: {
+      id: string;
+      type: 'contributors';
+      attributes: Record<string, unknown>;
+      relationships: Record<string, unknown>;
+    }
+  ) {}
+}
+
+export class AddRegistryContributor {
+  static readonly type = '[RegistryMetadata] Add Registry Contributor';
+  constructor(
+    public registryId: string,
+    public contributorData: {
+      type: 'contributors';
+      attributes: Record<string, unknown>;
+      relationships: Record<string, unknown>;
+    }
+  ) {}
+}
+
 export class GetCedarMetadataTemplates {
   static readonly type = '[RegistryMetadata] Get Cedar Metadata Templates';
   constructor(public url?: string) {}
@@ -87,3 +133,8 @@ export class AddCedarMetadataRecordToState {
   static readonly type = '[RegistryMetadata] Add Cedar Metadata Record To State';
   constructor(public record: CedarMetadataRecordData) {}
 }
+
+export class GetLicenseFromUrl {
+  static readonly type = '[RegistryMetadata] Get License From URL';
+  constructor(public licenseUrl: string) {}
+}
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
index a03f71a61..a55821781 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.model.ts
@@ -3,25 +3,26 @@ import {
   CedarMetadataRecordData,
   CedarMetadataTemplateJsonApi,
 } from '@osf/features/project/metadata/models';
-import { AsyncStateModel } from '@shared/models';
+import { AsyncStateModel, License } from '@shared/models';
 
-import { RegistryOverview } from '../../models';
 import {
   BibliographicContributor,
-  CrossRefFunder,
   CustomItemMetadataRecord,
+  RegistryInstitutionJsonApi,
+  RegistryOverview,
   RegistrySubjectData,
   UserInstitution,
-} from '../../models/registry-metadata.models';
+} from '../../models';
 
 export interface RegistryMetadataStateModel {
   registry: AsyncStateModel<RegistryOverview | null>;
   bibliographicContributors: AsyncStateModel<BibliographicContributor[]>;
-  customItemMetadata: AsyncStateModel<CustomItemMetadataRecord | null>;
-  fundersList: AsyncStateModel<CrossRefFunder[]>;
+  customItemMetadata: AsyncStateModel<CustomItemMetadataRecord>;
   userInstitutions: AsyncStateModel<UserInstitution[]>;
+  institutions: AsyncStateModel<RegistryInstitutionJsonApi[]>;
   subjects: AsyncStateModel<RegistrySubjectData[]>;
   cedarTemplates: AsyncStateModel<CedarMetadataTemplateJsonApi | null>;
   cedarRecord: AsyncStateModel<CedarMetadataRecord | null>;
   cedarRecords: AsyncStateModel<CedarMetadataRecordData[]>;
+  license: AsyncStateModel<License | null>;
 }
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
index d974ba725..ffb10a74c 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
@@ -9,6 +9,16 @@ export class RegistryMetadataSelectors {
     return state.registry.data;
   }
 
+  @Selector([RegistryMetadataState])
+  static getLicense(state: RegistryMetadataStateModel) {
+    return state.license.data;
+  }
+
+  @Selector([RegistryMetadataState])
+  static getLicenseLoading(state: RegistryMetadataStateModel) {
+    return state.license.isLoading;
+  }
+
   @Selector([RegistryMetadataState])
   static getRegistryLoading(state: RegistryMetadataStateModel) {
     return state.registry.isLoading;
@@ -30,18 +40,18 @@ export class RegistryMetadataSelectors {
   }
 
   @Selector([RegistryMetadataState])
-  static getCustomItemMetadataLoading(state: RegistryMetadataStateModel) {
-    return state.customItemMetadata.isLoading;
+  static getInstitutions(state: RegistryMetadataStateModel) {
+    return state.institutions.data;
   }
 
   @Selector([RegistryMetadataState])
-  static getFundersList(state: RegistryMetadataStateModel) {
-    return state.fundersList.data;
+  static getInstitutionsLoading(state: RegistryMetadataStateModel) {
+    return state.institutions.isLoading;
   }
 
   @Selector([RegistryMetadataState])
-  static getFundersLoading(state: RegistryMetadataStateModel) {
-    return state.fundersList.isLoading;
+  static getCustomItemMetadataLoading(state: RegistryMetadataStateModel) {
+    return state.customItemMetadata.isLoading;
   }
 
   @Selector([RegistryMetadataState])
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
index 75c90b42b..c07f81eaa 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
@@ -1,41 +1,51 @@
 import { Action, State, StateContext } from '@ngxs/store';
 
-import { finalize, tap } from 'rxjs';
+import { catchError, tap } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { handleSectionError } from '@core/handlers';
 import { CedarMetadataRecord, CedarMetadataRecordJsonApi } from '@osf/features/project/metadata/models';
+import { ResourceType } from '@shared/enums';
+import { GetAllContributors } from '@shared/stores';
 
 import { RegistryMetadataMapper } from '../../mappers';
+import { CustomItemMetadataRecord } from '../../models';
 import { RegistryMetadataService } from '../../services/registry-metadata.service';
 
 import {
   AddCedarMetadataRecordToState,
+  AddRegistryContributor,
   CreateCedarMetadataRecord,
   GetBibliographicContributors,
   GetCedarMetadataTemplates,
   GetCustomItemMetadata,
-  GetFundersList,
+  GetLicenseFromUrl,
   GetRegistryCedarMetadataRecords,
   GetRegistryForMetadata,
+  GetRegistryInstitutions,
   GetRegistrySubjects,
   GetUserInstitutions,
   UpdateCedarMetadataRecord,
   UpdateCustomItemMetadata,
+  UpdateRegistryContributor,
   UpdateRegistryDetails,
+  UpdateRegistryInstitutions,
+  UpdateRegistrySubjects,
 } from './registry-metadata.actions';
 import { RegistryMetadataStateModel } from './registry-metadata.model';
 
 const initialState: RegistryMetadataStateModel = {
   registry: { data: null, isLoading: false, error: null },
   bibliographicContributors: { data: [], isLoading: false, error: null },
-  customItemMetadata: { data: null, isLoading: false, error: null },
-  fundersList: { data: [], isLoading: false, error: null },
+  customItemMetadata: { data: {}, isLoading: false, error: null },
   userInstitutions: { data: [], isLoading: false, error: null },
+  institutions: { data: [], isLoading: false, error: null },
   subjects: { data: [], isLoading: false, error: null },
   cedarTemplates: { data: null, isLoading: false, error: null },
   cedarRecord: { data: null, isLoading: false, error: null },
   cedarRecords: { data: [], isLoading: false, error: null },
+  license: { data: null, isLoading: false, error: null },
 };
 
 @State<RegistryMetadataStateModel>({
@@ -57,35 +67,20 @@ export class RegistryMetadataState {
     });
 
     return this.registryMetadataService.getRegistryForMetadata(action.registryId).pipe(
-      tap({
-        next: (registry) => {
-          ctx.patchState({
-            registry: {
-              data: registry,
-              isLoading: false,
-              error: null,
-            },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            registry: {
-              data: ctx.getState().registry.data,
-              error: error.message,
-              isLoading: false,
-            },
-          });
-        },
-      }),
-      finalize(() =>
+      tap((registry) => {
         ctx.patchState({
           registry: {
-            data: ctx.getState().registry.data,
-            error: null,
+            data: registry,
             isLoading: false,
+            error: null,
           },
-        })
-      )
+        });
+
+        if (registry.licenseUrl) {
+          ctx.dispatch(new GetLicenseFromUrl(registry.licenseUrl));
+        }
+      }),
+      catchError((error) => handleSectionError(ctx, 'registry', error))
     );
   }
 
@@ -102,35 +97,17 @@ export class RegistryMetadataState {
     return this.registryMetadataService
       .getBibliographicContributors(action.registryId, action.page, action.pageSize)
       .pipe(
-        tap({
-          next: (response) => {
-            const contributors = RegistryMetadataMapper.mapBibliographicContributors(response);
-            ctx.patchState({
-              bibliographicContributors: {
-                data: contributors,
-                isLoading: false,
-                error: null,
-              },
-            });
-          },
-          error: (error) => {
-            ctx.patchState({
-              bibliographicContributors: {
-                data: [],
-                isLoading: false,
-                error: error.message,
-              },
-            });
-          },
-        }),
-        finalize(() =>
+        tap((response) => {
+          const contributors = RegistryMetadataMapper.mapBibliographicContributors(response);
           ctx.patchState({
             bibliographicContributors: {
-              ...ctx.getState().bibliographicContributors,
+              data: contributors,
               isLoading: false,
+              error: null,
             },
-          })
-        )
+          });
+        }),
+        catchError((error) => handleSectionError(ctx, 'bibliographicContributors', error))
       );
   }
 
@@ -145,87 +122,79 @@ export class RegistryMetadataState {
     });
 
     return this.registryMetadataService.getRegistrySubjects(action.registryId, action.page, action.pageSize).pipe(
-      tap({
-        next: (response) => {
-          ctx.patchState({
-            subjects: {
-              data: response.data,
-              isLoading: false,
-              error: null,
-            },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            subjects: {
-              data: [],
-              isLoading: false,
-              error: error.message,
-            },
-          });
-        },
-      }),
-      finalize(() =>
+      tap((response) => {
         ctx.patchState({
           subjects: {
-            ...ctx.getState().subjects,
+            data: response.data,
             isLoading: false,
+            error: null,
           },
-        })
-      )
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'subjects', error))
+    );
+  }
+
+  @Action(GetRegistryInstitutions)
+  getRegistryInstitutions(ctx: StateContext<RegistryMetadataStateModel>, action: GetRegistryInstitutions) {
+    ctx.patchState({
+      institutions: {
+        data: [],
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService.getRegistryInstitutions(action.registryId, action.page, action.pageSize).pipe(
+      tap((response) => {
+        ctx.patchState({
+          institutions: {
+            data: response.data,
+            isLoading: false,
+            error: null,
+          },
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'institutions', error))
     );
   }
 
   @Action(GetCustomItemMetadata)
   getCustomItemMetadata(ctx: StateContext<RegistryMetadataStateModel>, action: GetCustomItemMetadata) {
     ctx.patchState({
-      customItemMetadata: { data: null, isLoading: true, error: null },
+      customItemMetadata: { data: {}, isLoading: true, error: null },
     });
 
     return this.registryMetadataService.getCustomItemMetadata(action.guid).pipe(
-      tap({
-        next: (response) => {
-          ctx.patchState({
-            customItemMetadata: { data: response.data.attributes, isLoading: false, error: null },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            customItemMetadata: { data: null, isLoading: false, error: error.message },
-          });
-        },
-      }),
-      finalize(() =>
+      tap((response) => {
+        const metadataAttributes = response?.data?.attributes || (response as unknown as CustomItemMetadataRecord);
+
         ctx.patchState({
-          customItemMetadata: {
-            ...ctx.getState().customItemMetadata,
-            isLoading: false,
-          },
-        })
-      )
+          customItemMetadata: { data: metadataAttributes, isLoading: false, error: null },
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'customItemMetadata', error))
     );
   }
 
   @Action(UpdateCustomItemMetadata)
   updateCustomItemMetadata(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateCustomItemMetadata) {
     ctx.patchState({
-      customItemMetadata: { data: null, isLoading: true, error: null },
+      customItemMetadata: { data: {} as CustomItemMetadataRecord, isLoading: true, error: null },
     });
 
     return this.registryMetadataService.updateCustomItemMetadata(action.guid, action.metadata).pipe(
-      tap({
-        next: (response) => {
-          ctx.patchState({
-            customItemMetadata: { data: response.data.attributes, isLoading: false, error: null },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            customItemMetadata: { ...ctx.getState().customItemMetadata, isLoading: false, error: error.message },
-          });
-        },
+      tap((response) => {
+        const metadataAttributes = response?.data?.attributes || (response as unknown as CustomItemMetadataRecord);
+        ctx.patchState({
+          customItemMetadata: {
+            data: { ...ctx.getState().customItemMetadata.data, ...metadataAttributes },
+            isLoading: false,
+            error: null,
+          },
+        });
       }),
-      finalize(() => ctx.patchState({ customItemMetadata: { ...ctx.getState().customItemMetadata, isLoading: false } }))
+      catchError((error) => handleSectionError(ctx, 'customItemMetadata', error))
     );
   }
 
@@ -240,74 +209,21 @@ export class RegistryMetadataState {
     });
 
     return this.registryMetadataService.updateRegistryDetails(action.registryId, action.updates).pipe(
-      tap({
-        next: (updatedRegistry) => {
-          const currentRegistry = ctx.getState().registry.data;
+      tap((updatedRegistry) => {
+        const currentRegistry = ctx.getState().registry.data;
 
-          ctx.patchState({
-            registry: {
-              data: {
-                ...currentRegistry,
-                ...updatedRegistry,
-              },
-              error: null,
-              isLoading: false,
-            },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            registry: {
-              ...ctx.getState().registry,
-              error: error.message,
-              isLoading: false,
-            },
-          });
-        },
-      }),
-      finalize(() =>
         ctx.patchState({
           registry: {
-            ...ctx.getState().registry,
+            data: {
+              ...currentRegistry,
+              ...updatedRegistry,
+            },
             error: null,
             isLoading: false,
           },
-        })
-      )
-    );
-  }
-
-  @Action(GetFundersList)
-  getFundersList(ctx: StateContext<RegistryMetadataStateModel>, action: GetFundersList) {
-    ctx.patchState({
-      fundersList: { data: [], isLoading: true, error: null },
-    });
-
-    return this.registryMetadataService.getFundersList(action.search).pipe(
-      tap({
-        next: (response) => {
-          ctx.patchState({
-            fundersList: { data: response.message.items, isLoading: false, error: null },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            fundersList: {
-              ...ctx.getState().fundersList,
-              isLoading: false,
-              error: error.message,
-            },
-          });
-        },
+        });
       }),
-      finalize(() =>
-        ctx.patchState({
-          fundersList: {
-            ...ctx.getState().fundersList,
-            isLoading: false,
-          },
-        })
-      )
+      catchError((error) => handleSectionError(ctx, 'registry', error))
     );
   }
 
@@ -322,35 +238,16 @@ export class RegistryMetadataState {
     });
 
     return this.registryMetadataService.getUserInstitutions(action.userId, action.page, action.pageSize).pipe(
-      tap({
-        next: (response) => {
-          ctx.patchState({
-            userInstitutions: {
-              data: response.data,
-              isLoading: false,
-              error: null,
-            },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            userInstitutions: {
-              ...ctx.getState().userInstitutions,
-              error: error.message,
-              isLoading: false,
-            },
-          });
-        },
-      }),
-      finalize(() =>
+      tap((response) => {
         ctx.patchState({
           userInstitutions: {
-            ...ctx.getState().userInstitutions,
-            error: null,
+            data: response.data,
             isLoading: false,
+            error: null,
           },
-        })
-      )
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'userInstitutions', error))
     );
   }
 
@@ -365,34 +262,16 @@ export class RegistryMetadataState {
     });
 
     return this.registryMetadataService.getCedarMetadataTemplates(action.url).pipe(
-      tap({
-        next: (response) => {
-          ctx.patchState({
-            cedarTemplates: {
-              data: response,
-              error: null,
-              isLoading: false,
-            },
-          });
-        },
-        error: (error) => {
-          ctx.patchState({
-            cedarTemplates: {
-              ...ctx.getState().cedarTemplates,
-              error: error.message,
-              isLoading: false,
-            },
-          });
-        },
-      }),
-      finalize(() =>
+      tap((response) => {
         ctx.patchState({
           cedarTemplates: {
-            ...ctx.getState().cedarTemplates,
+            data: response,
+            error: null,
             isLoading: false,
           },
-        })
-      )
+        });
+      }),
+      catchError((error) => handleSectionError(ctx, 'cedarTemplates', error))
     );
   }
 
@@ -417,7 +296,8 @@ export class RegistryMetadataState {
             isLoading: false,
           },
         });
-      })
+      }),
+      catchError((error) => handleSectionError(ctx, 'cedarRecords', error))
     );
   }
 
@@ -463,4 +343,93 @@ export class RegistryMetadataState {
       },
     });
   }
+
+  @Action(UpdateRegistrySubjects)
+  updateRegistrySubjects(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateRegistrySubjects) {
+    return this.registryMetadataService.updateRegistrySubjects(action.registryId, action.subjects);
+  }
+
+  @Action(UpdateRegistryInstitutions)
+  updateRegistryInstitutions(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateRegistryInstitutions) {
+    return this.registryMetadataService.updateRegistryInstitutions(action.registryId, action.institutions).pipe(
+      tap({
+        next: () => {
+          ctx.dispatch(new GetRegistryInstitutions(action.registryId));
+        },
+      })
+    );
+  }
+
+  @Action(UpdateRegistryContributor)
+  updateRegistryContributor(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateRegistryContributor) {
+    const updateRequest = {
+      data: action.updateData,
+    };
+
+    return this.registryMetadataService
+      .updateRegistryContributor(action.registryId, action.contributorId, updateRequest)
+      .pipe(
+        tap({
+          next: () => {
+            ctx.dispatch(new GetBibliographicContributors(action.registryId));
+            ctx.dispatch(new GetAllContributors(action.registryId, ResourceType.Registration));
+            ctx.dispatch(new GetRegistryForMetadata(action.registryId));
+          },
+        })
+      );
+  }
+
+  @Action(AddRegistryContributor)
+  addRegistryContributor(ctx: StateContext<RegistryMetadataStateModel>, action: AddRegistryContributor) {
+    const addRequest = {
+      data: action.contributorData,
+    };
+
+    return this.registryMetadataService.addRegistryContributor(action.registryId, addRequest).pipe(
+      tap({
+        next: () => {
+          ctx.dispatch(new GetBibliographicContributors(action.registryId));
+          ctx.dispatch(new GetAllContributors(action.registryId, ResourceType.Registration));
+          ctx.dispatch(new GetRegistryForMetadata(action.registryId));
+        },
+      })
+    );
+  }
+
+  @Action(GetLicenseFromUrl)
+  getLicenseFromUrl(ctx: StateContext<RegistryMetadataStateModel>, action: GetLicenseFromUrl) {
+    ctx.patchState({
+      license: {
+        data: null,
+        isLoading: true,
+        error: null,
+      },
+    });
+
+    return this.registryMetadataService.getLicenseFromUrl(action.licenseUrl).pipe(
+      tap((license) => {
+        ctx.patchState({
+          license: {
+            data: license,
+            isLoading: false,
+            error: null,
+          },
+        });
+
+        const currentRegistry = ctx.getState().registry.data;
+        if (currentRegistry) {
+          ctx.patchState({
+            registry: {
+              ...ctx.getState().registry,
+              data: {
+                ...currentRegistry,
+                license: license,
+              },
+            },
+          });
+        }
+      }),
+      catchError((error) => handleSectionError(ctx, 'license', error))
+    );
+  }
 }
diff --git a/src/app/shared/components/license/license.component.html b/src/app/shared/components/license/license.component.html
index 8fd8dcadf..fb87b212e 100644
--- a/src/app/shared/components/license/license.component.html
+++ b/src/app/shared/components/license/license.component.html
@@ -3,6 +3,8 @@
   [(ngModel)]="selectedLicense"
   optionLabel="name"
   styleClass=""
+  appendTo="body"
+  [class.md:w-full]="fullWidthSelect()"
   [placeholder]="'shared.license.selectLicense' | translate"
   (onChange)="onSelectLicense($event.value)"
   class="mt-4 w-full md:w-6"
@@ -35,7 +37,7 @@
     <osf-truncated-text [text]="selectedLicense()!.text | interpolate: licenseForm.value" />
   </p>
 
-  @if (selectedLicense()!.requiredFields.length) {
+  @if (selectedLicense()!.requiredFields.length && showInternalButtons()) {
     <section class="m-t-48 flex flex-row justify-content-end align-items-center gap-2">
       <p-button
         class="w-6 md:w-6rem"
diff --git a/src/app/shared/components/license/license.component.ts b/src/app/shared/components/license/license.component.ts
index 6a0e1e26e..dcdd8fcf3 100644
--- a/src/app/shared/components/license/license.component.ts
+++ b/src/app/shared/components/license/license.component.ts
@@ -42,6 +42,8 @@ export class LicenseComponent {
   selectedLicenseOptions = input<LicenseOptions | null | undefined>(null);
   licenses = input.required<License[]>();
   isSubmitting = input<boolean>(false);
+  showInternalButtons = input<boolean>(true);
+  fullWidthSelect = input<boolean>(false);
   selectedLicense = model<License | null>(null);
   createLicense = output<{ id: string; licenseOptions: LicenseOptions }>();
   selectLicense = output<License>();
diff --git a/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.ts b/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.ts
index a117ea733..90954aa47 100644
--- a/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.ts
+++ b/src/app/shared/components/shared-metadata/components/cedar-template-form/cedar-template-form.component.ts
@@ -35,7 +35,6 @@ interface CedarEditorElement extends HTMLElement {
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
 })
 export class CedarTemplateFormComponent implements OnInit {
   emitData = output<CedarRecordDataBinding>();
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
index c9bc91e43..af6b5d311 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.html
@@ -2,11 +2,13 @@
   <div class="flex justify-content-between align-items-center">
     <h2>{{ 'project.overview.metadata.affiliatedInstitutions' | translate }}</h2>
 
-    <p-button
-      severity="secondary"
-      [label]="'common.buttons.edit' | translate"
-      (click)="openEditAffiliatedInstitutionsDialog.emit()"
-    ></p-button>
+    @if (!readonly()) {
+      <p-button
+        severity="secondary"
+        [label]="'common.buttons.edit' | translate"
+        (click)="openEditAffiliatedInstitutionsDialog.emit()"
+      ></p-button>
+    }
   </div>
 
   @if (affiliatedInstitutions()) {
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
index e7b1428b6..fe0c2fa0d 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-affiliated-institutions/project-metadata-affiliated-institutions.component.ts
@@ -17,4 +17,5 @@ export class ProjectMetadataAffiliatedInstitutionsComponent {
   openEditAffiliatedInstitutionsDialog = output<void>();
 
   affiliatedInstitutions = input<ProjectAffiliatedInstitutions[]>([]);
+  readonly = input<boolean>(false);
 }
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
index b16a0d5dc..ca74df140 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.html
@@ -2,11 +2,13 @@
   <div class="flex justify-content-between align-items-center">
     <h2>{{ 'project.overview.metadata.contributors' | translate }}</h2>
 
-    <p-button
-      (click)="openEditContributorDialog.emit()"
-      severity="secondary"
-      [label]="'common.buttons.edit' | translate"
-    ></p-button>
+    @if (!readonly()) {
+      <p-button
+        (click)="openEditContributorDialog.emit()"
+        severity="secondary"
+        [label]="'common.buttons.edit' | translate"
+      ></p-button>
+    }
   </div>
 
   @if (contributors()) {
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
index d170c2bcd..994ace939 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-contributors/project-metadata-contributors.component.ts
@@ -15,6 +15,6 @@ import { ProjectOverviewContributor } from '@osf/features/project/overview/model
 })
 export class ProjectMetadataContributorsComponent {
   openEditContributorDialog = output<void>();
-
-  contributors = input.required<ProjectOverviewContributor[] | null>();
+  contributors = input<ProjectOverviewContributor[]>([]);
+  readonly = input<boolean>(false);
 }
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.html
index 680349ad8..d682bd318 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.html
@@ -2,11 +2,13 @@
   <div class="flex justify-content-between align-items-center">
     <h2>{{ 'project.overview.metadata.description' | translate }}</h2>
 
-    <p-button
-      severity="secondary"
-      [label]="'common.buttons.edit' | translate"
-      (click)="openEditDescriptionDialog.emit()"
-    ></p-button>
+    @if (!readonly()) {
+      <p-button
+        severity="secondary"
+        [label]="'common.buttons.edit' | translate"
+        (click)="openEditDescriptionDialog.emit()"
+      ></p-button>
+    }
   </div>
 
   @if (description()) {
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.ts
index 14461e41d..d28dbd765 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-description/project-metadata-description.component.ts
@@ -13,6 +13,6 @@ import { ChangeDetectionStrategy, Component, input, output } from '@angular/core
 })
 export class ProjectMetadataDescriptionComponent {
   openEditDescriptionDialog = output<void>();
-
-  description = input.required<string | null>();
+  description = input.required<string>();
+  readonly = input<boolean>(false);
 }
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.html
index e9e0d0186..b551468ff 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.html
@@ -2,21 +2,38 @@
   <div class="flex justify-content-between align-items-center">
     <h2>{{ 'project.overview.metadata.fundingSupport' | translate }}</h2>
 
-    <p-button
-      severity="secondary"
-      [label]="'common.buttons.edit' | translate"
-      (click)="openEditFundingDialog.emit()"
-    ></p-button>
+    @if (!readonly()) {
+      <p-button
+        severity="secondary"
+        [label]="'common.buttons.edit' | translate"
+        (click)="openEditFundingDialog.emit()"
+      ></p-button>
+    }
   </div>
 
-  @if (supplements()) {
+  @if (funders()) {
     <div class="pt-4">
-      @for (supplement of supplements(); track supplement.id) {
-        <div class="mb-2 p-3 border-1 border-round surface-border">
-          <p class="font-semibold m-0 mb-2">{{ supplement.title }}</p>
-          <p class="text-sm text-color-secondary m-0 mb-1">{{ supplement.dateCreated | date: 'MMM d, y' }}</p>
-          @if (supplement.url) {
-            <a [href]="supplement.url" target="_blank" class="text-primary text-sm">{{ supplement.url }}</a>
+      @for (funder of funders(); track funder.funder_identifier) {
+        <div class="mb-2 pb-3 border-bottom-1 surface-border flex flex-column gap-2">
+          <p>{{ 'project.files.detail.projectMetadata.fields.funder' | translate }}: {{ funder.funder_name }}</p>
+
+          <p>{{ 'project.files.detail.projectMetadata.fields.awardTitle' | translate }}: {{ funder.award_title }}</p>
+
+          @if (funder.award_uri) {
+            <p>
+              {{ 'project.files.detail.projectMetadata.fields.awardUri' | translate }}:
+              <a [href]="funder.award_uri" target="_blank" class="text-primary text-sm">{{ funder.award_title }}</a>
+            </p>
+          }
+
+          @if (funder.award_number) {
+            <p>
+              {{ 'project.files.detail.projectMetadata.fields.awardNumber' | translate }} : {{ funder.award_number }}
+            </p>
+          }
+
+          @if (funder.award_uri) {
+            <a [href]="funder.award_uri" target="_blank" class="text-primary text-sm">{{ funder.award_uri }}</a>
           }
         </div>
       }
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.ts
index e170c3b8f..434a3a783 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-funding/project-metadata-funding.component.ts
@@ -3,19 +3,19 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { Button } from 'primeng/button';
 import { Card } from 'primeng/card';
 
-import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { ProjectSupplements } from '@osf/features/project/overview/models';
+import { Funder } from '@osf/features/project/metadata/models';
 
 @Component({
   selector: 'osf-project-metadata-funding',
-  imports: [Button, Card, TranslatePipe, DatePipe],
+  imports: [Button, Card, TranslatePipe],
   templateUrl: './project-metadata-funding.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ProjectMetadataFundingComponent {
   openEditFundingDialog = output<void>();
 
-  supplements = input<ProjectSupplements[]>([]);
+  funders = input<Funder[]>([]);
+  readonly = input<boolean>(false);
 }
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.html
index 113231940..53bca92a9 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.html
@@ -2,11 +2,13 @@
   <div class="flex justify-content-between align-items-center">
     <h2>{{ 'project.overview.metadata.license' | translate }}</h2>
 
-    <p-button
-      severity="secondary"
-      [label]="'common.buttons.edit' | translate"
-      (click)="openEditLicenseDialog.emit()"
-    ></p-button>
+    @if (!hideEditLicense()) {
+      <p-button
+        severity="secondary"
+        [label]="'common.buttons.edit' | translate"
+        (click)="openEditLicenseDialog.emit()"
+      />
+    }
   </div>
 
   @if (license()) {
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.ts
index 8211b1e11..23e031ff4 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-license/project-metadata-license.component.ts
@@ -15,6 +15,6 @@ import { License } from '@shared/models';
 })
 export class ProjectMetadataLicenseComponent {
   openEditLicenseDialog = output<void>();
-
+  hideEditLicense = input<boolean>(false);
   license = input<License>({} as License);
 }
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
index e43a19bb4..fc06cc2fe 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-publication-doi/project-metadata-publication-doi.component.ts
@@ -12,7 +12,6 @@ import { ProjectIdentifiers } from '@osf/features/project/overview/models';
   imports: [Button, Card, TranslatePipe],
   templateUrl: './project-metadata-publication-doi.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
 })
 export class ProjectMetadataPublicationDoiComponent {
   openEditPublicationDoiDialog = output<void>();
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html
index 18c70e4fc..77b345e2b 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.html
@@ -2,23 +2,25 @@
   <div class="flex justify-content-between align-items-center">
     <h2>{{ 'project.overview.metadata.resourceInformation' | translate }}</h2>
 
-    <p-button
-      severity="secondary"
-      [label]="'common.buttons.edit' | translate"
-      (click)="openEditResourceInformationDialog.emit()"
-    ></p-button>
+    @if (!readonly()) {
+      <p-button
+        severity="secondary"
+        [label]="'common.buttons.edit' | translate"
+        (click)="openEditResourceInformationDialog.emit()"
+      ></p-button>
+    }
   </div>
 
-  @if (customItemMetadata()?.resource_type_general) {
+  @if (customItemMetadata().resource_type_general) {
     <div class="flex-column flex gap-2">
       <p class="inline-block font-bold">
         <span> {{ 'project.overview.metadata.resourceType' | translate }}: </span>
-        <span>{{ customItemMetadata()?.resource_type_general | titlecase }}</span>
+        <span>{{ customItemMetadata().resource_type_general | titlecase }}</span>
       </p>
 
       <p class="inline-block font-bold">
         <span> {{ 'project.overview.metadata.resourceLanguage' | translate }}: </span>
-        <span>{{ getLanguageName(customItemMetadata()?.language || '') }}</span>
+        <span>{{ getLanguageName(customItemMetadata().language || '') }}</span>
       </p>
     </div>
   } @else {
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts
index 64f17e4e2..0047146bc 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-resource-information/project-metadata-resource-information.component.ts
@@ -19,7 +19,8 @@ import { LanguageCodeModel } from '@shared/models';
 export class ProjectMetadataResourceInformationComponent {
   openEditResourceInformationDialog = output<void>();
 
-  customItemMetadata = input.required<CustomItemMetadataRecord | null>();
+  customItemMetadata = input.required<CustomItemMetadataRecord>();
+  readonly = input<boolean>(false);
   protected readonly languageCodes = languageCodes;
 
   getLanguageName(languageCode: string): string {
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.html b/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
index 5c6529cfc..75aaa17af 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.html
@@ -1,5 +1,6 @@
 <p-card>
   <osf-subjects
+    [readonly]="readonly()"
     [areSubjectsUpdating]="isSubjectsUpdating()"
     [selected]="selectedSubjects()"
     (loadChildren)="getSubjectChildren.emit($event)"
diff --git a/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts b/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
index d4fb3b804..a820c6915 100644
--- a/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
+++ b/src/app/shared/components/shared-metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts
@@ -10,11 +10,11 @@ import { SubjectsComponent } from '@shared/components';
   imports: [SubjectsComponent, Card],
   templateUrl: './project-metadata-subjects.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
 })
 export class ProjectMetadataSubjectsComponent {
   selectedSubjects = input.required<SubjectModel[]>();
   isSubjectsUpdating = input.required<boolean>();
+  readonly = input<boolean>(false);
 
   getSubjectChildren = output<string>();
   searchSubjects = output<string>();
diff --git a/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.ts
index 4621dc55d..c563599cf 100644
--- a/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.ts
+++ b/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/contributors-dialog.component.ts
@@ -55,11 +55,14 @@ export class ContributorsDialogComponent implements OnInit {
     addContributor: AddContributor,
   });
 
+  private readonly resourceType: ResourceType;
   private readonly projectId: string;
 
   constructor() {
     this.projectId = this.config.data?.projectId;
 
+    this.resourceType = this.config.data?.['isRegistry'] ? ResourceType.Registration : ResourceType.Project;
+
     this.contributors.set(this.config.data?.contributors || []);
     this.isContributorsLoading.set(this.config.data?.isLoading || false);
   }
@@ -91,7 +94,7 @@ export class ContributorsDialogComponent implements OnInit {
       .subscribe((res: ContributorDialogAddModel) => {
         if (res?.type === AddContributorType.Registered) {
           const addRequests = res.data.map((payload) =>
-            this.actions.addContributor(this.projectId, ResourceType.Project, payload)
+            this.actions.addContributor(this.projectId, this.resourceType, payload)
           );
 
           forkJoin(addRequests).subscribe(() => {
@@ -104,7 +107,7 @@ export class ContributorsDialogComponent implements OnInit {
 
   removeContributor(contributor: ContributorModel): void {
     this.actions
-      .deleteContributor(this.projectId, ResourceType.Project, contributor.userId)
+      .deleteContributor(this.projectId, this.resourceType, contributor.userId)
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe({
         next: () => {
diff --git a/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
index a1185bcc6..7c7bf6d70 100644
--- a/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
+++ b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
@@ -14,6 +14,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormArray, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 
 import {
+  Funder,
   FunderOption,
   FundingDialogResult,
   FundingEntryData,
@@ -22,7 +23,6 @@ import {
   SupplementData,
 } from '@osf/features/project/metadata/models';
 import { GetFundersList, ProjectMetadataSelectors } from '@osf/features/project/metadata/store';
-import { ProjectOverview } from '@osf/features/project/overview/models';
 
 @Component({
   selector: 'osf-funding-dialog',
@@ -69,10 +69,6 @@ export class FundingDialogComponent implements OnInit {
     });
   }
 
-  get currentProject(): ProjectOverview | null {
-    return this.config.data ? this.config.data.currentProject || null : null;
-  }
-
   get fundingEntries() {
     return this.fundingForm.get('fundingEntries') as FormArray<FormGroup<FundingEntryForm>>;
   }
@@ -80,7 +76,21 @@ export class FundingDialogComponent implements OnInit {
   ngOnInit(): void {
     this.actions.getFundersList();
 
-    this.addFundingEntry();
+    const configFunders = this.config.data?.funders;
+    if (configFunders && configFunders.length > 0) {
+      configFunders.forEach((funder: Funder) => {
+        this.addFundingEntry({
+          funderName: funder.funder_name || '',
+          funderIdentifier: funder.funder_identifier || '',
+          funderIdentifierType: funder.funder_identifier_type || 'DOI',
+          awardTitle: funder.award_title || '',
+          awardUri: funder.award_uri || '',
+          awardNumber: funder.award_number || '',
+        });
+      });
+    } else {
+      this.addFundingEntry();
+    }
 
     this.searchSubject
       .pipe(debounceTime(300), distinctUntilChanged(), takeUntilDestroyed(this.destroyRef))
@@ -136,8 +146,8 @@ export class FundingDialogComponent implements OnInit {
       const entry = this.fundingEntries.at(index);
       entry.patchValue({
         funderName: selectedFunder.name,
-        funderIdentifier: selectedFunder.id,
-        funderIdentifierType: 'DOI',
+        funderIdentifier: selectedFunder.uri,
+        funderIdentifierType: 'Crossref Funder ID',
       });
     }
   }
@@ -150,7 +160,6 @@ export class FundingDialogComponent implements OnInit {
 
       const result: FundingDialogResult = {
         fundingEntries: fundingData,
-        projectId: this.currentProject ? this.currentProject.id : undefined,
       };
 
       this.dialogRef.close(result);
diff --git a/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.html
index 78a9d5e98..719354bb9 100644
--- a/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.html
+++ b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.html
@@ -2,33 +2,25 @@
   @if (licensesLoading()) {
     <osf-loading-spinner></osf-loading-spinner>
   } @else {
-    <form [formGroup]="licenseForm" class="flex flex-column gap-4">
-      <div>
-        <label for="licenseName" class="block text-sm font-medium mb-2">
-          {{ 'project.metadata.license.dialog.chooseLicense.label' | translate }}
-        </label>
-        <p-select
-          id="licenseName"
-          formControlName="licenseName"
-          [options]="licenseOptions"
-          [placeholder]="'project.metadata.license.dialog.chooseLicense.placeholder' | translate"
-          class="w-full"
-          appendTo="body"
-          optionLabel="label"
-          optionValue="value"
-        />
-      </div>
+    <div class="license-content">
+      <h3 class="mb-3">{{ 'project.metadata.license.dialog.chooseLicense.label' | translate }}</h3>
 
-      @if (selectedLicenseText()) {
-        <div class="bg-blue-100 p-2 max-h-11rem overflow-auto">
-          <p>{{ selectedLicenseText() }}</p>
-        </div>
-      }
-    </form>
+      <osf-license
+        #licenseComponent
+        [licenses]="licenses()"
+        [selectedLicenseId]="selectedLicenseId()"
+        [selectedLicenseOptions]="selectedLicenseOptions()"
+        [isSubmitting]="isSubmitting()"
+        [showInternalButtons]="false"
+        [fullWidthSelect]="true"
+        (selectLicense)="onSelectLicense($event)"
+        (createLicense)="onCreateLicense($event)"
+      />
+    </div>
   }
 
   <div class="flex justify-content-end gap-2">
     <p-button severity="info" [label]="'common.buttons.cancel' | translate" (click)="cancel()" />
-    <p-button [label]="'common.buttons.create' | translate" (click)="save()" [disabled]="!licenseForm.valid" />
+    <p-button [label]="'common.buttons.create' | translate" (click)="save()" [loading]="isSubmitting()" />
   </div>
 </div>
diff --git a/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.ts
index c939898fe..dcd03f48e 100644
--- a/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.ts
+++ b/src/app/shared/components/shared-metadata/dialogs/license-dialog/license-dialog.component.ts
@@ -4,23 +4,17 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
 import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
-import { Select } from 'primeng/select';
 
-import { ChangeDetectionStrategy, Component, effect, inject, OnInit, signal } from '@angular/core';
-import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { ChangeDetectionStrategy, Component, inject, OnInit, signal, viewChild } from '@angular/core';
 
 import { ProjectOverview } from '@osf/features/project/overview/models';
-import { LoadingSpinnerComponent } from '@osf/shared/components';
-import { License, SelectOption } from '@shared/models';
+import { LicenseComponent, LoadingSpinnerComponent } from '@osf/shared/components';
+import { License, LicenseOptions } from '@shared/models';
 import { LicensesSelectors, LoadAllLicenses } from '@shared/stores/licenses';
 
-interface LicenseForm {
-  licenseName: FormControl<string>;
-}
-
 @Component({
   selector: 'osf-license-dialog',
-  imports: [Button, Select, TranslatePipe, ReactiveFormsModule, LoadingSpinnerComponent],
+  imports: [Button, TranslatePipe, LoadingSpinnerComponent, LicenseComponent],
   templateUrl: './license-dialog.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -28,13 +22,6 @@ export class LicenseDialogComponent implements OnInit {
   protected dialogRef = inject(DynamicDialogRef);
   protected config = inject(DynamicDialogConfig);
 
-  licenseForm = new FormGroup<LicenseForm>({
-    licenseName: new FormControl('', {
-      nonNullable: true,
-      validators: [Validators.required],
-    }),
-  });
-
   protected actions = createDispatchMap({
     loadLicenses: LoadAllLicenses,
   });
@@ -42,60 +29,75 @@ export class LicenseDialogComponent implements OnInit {
   licenses = select(LicensesSelectors.getLicenses);
   licensesLoading = select(LicensesSelectors.getLoading);
 
-  selectedLicenseText = signal<string>('');
-  licenseOptions: SelectOption[] = [];
+  selectedLicenseId = signal<string | null>(null);
+  selectedLicenseOptions = signal<LicenseOptions | null>(null);
   currentProject: ProjectOverview | null = null;
+  isSubmitting = signal<boolean>(false);
 
-  constructor() {
-    effect(() => {
-      const currentLicenses = this.licenses();
-
-      if (currentLicenses) {
-        this.licenseOptions = currentLicenses.map((license: License) => ({
-          label: license.name,
-          value: license.id,
-        }));
-      }
-    });
-  }
+  licenseComponent = viewChild<LicenseComponent>('licenseComponent');
 
   ngOnInit(): void {
     this.actions.loadLicenses();
-
+    this.currentProject = this.config.data?.currentProject || null;
     if (this.currentProject?.license) {
-      this.licenseForm.patchValue({
-        licenseName: this.currentProject.license.name || '',
-      });
+      this.selectedLicenseId.set(this.currentProject.license.id || null);
+      if (this.currentProject.nodeLicense) {
+        this.selectedLicenseOptions.set({
+          copyrightHolders: this.currentProject.nodeLicense.copyrightHolders?.join(', ') || '',
+          year: this.currentProject.nodeLicense.year || new Date().getFullYear().toString(),
+        });
+      }
     }
+  }
 
-    this.licenseForm.get('licenseName')?.valueChanges.subscribe((licenseName) => {
-      this.updateSelectedLicenseText(licenseName);
-    });
+  onSelectLicense(license: License): void {
+    this.selectedLicenseId.set(license.id);
   }
 
-  private updateSelectedLicenseText(licenseId: string): void {
-    const selectedLicense = this.licenses().find((license: License) => license.id === licenseId);
+  onCreateLicense(event: { id: string; licenseOptions: LicenseOptions }): void {
+    const selectedLicense = this.licenses().find((license) => license.id === event.id);
 
     if (selectedLicense) {
-      this.selectedLicenseText.set(selectedLicense.text);
-    } else {
-      this.selectedLicenseText.set('');
+      this.dialogRef.close({
+        licenseName: selectedLicense.name,
+        licenseId: selectedLicense.id,
+        licenseOptions: event.licenseOptions,
+        projectId: this.currentProject?.id,
+      });
     }
+
+    this.isSubmitting.set(false);
   }
 
   save(): void {
-    if (this.licenseForm.valid) {
-      const formValue = this.licenseForm.getRawValue();
-      const selectedLicense = this.licenses().find((license) => license.id === formValue.licenseName);
+    if (
+      this.licenseComponent()?.selectedLicense()!.requiredFields.length &&
+      this.licenseComponent()?.licenseForm.invalid
+    ) {
+      return;
+    }
+
+    const selectedLicenseId = this.selectedLicenseId();
+    if (!selectedLicenseId) return;
+
+    const selectedLicense = this.licenses().find((license) => license.id === selectedLicenseId);
+    if (!selectedLicense) return;
+
+    this.isSubmitting.set(true);
+
+    if (selectedLicense.requiredFields?.length) {
+      this.licenseComponent()?.saveLicense();
+    } else {
       this.dialogRef.close({
-        licenseName: formValue.licenseName,
-        licenseId: selectedLicense?.id,
+        licenseName: selectedLicense.name,
+        licenseId: selectedLicense.id,
         projectId: this.currentProject?.id,
       });
     }
   }
 
   cancel(): void {
+    this.licenseComponent()?.cancel();
     this.dialogRef.close();
   }
 }
diff --git a/src/app/shared/components/shared-metadata/shared-metadata.component.html b/src/app/shared/components/shared-metadata/shared-metadata.component.html
index ca960cdfe..f6f5b42d3 100644
--- a/src/app/shared/components/shared-metadata/shared-metadata.component.html
+++ b/src/app/shared/components/shared-metadata/shared-metadata.component.html
@@ -25,26 +25,31 @@ <h2>
     </p-card>
 
     <osf-project-metadata-contributors
+      [readonly]="readonly()"
       (openEditContributorDialog)="openEditContributorDialog.emit()"
       [contributors]="currentInstance().contributors!"
     />
 
     <osf-project-metadata-description
+      [readonly]="readonly()"
       (openEditDescriptionDialog)="openEditDescriptionDialog.emit()"
       [description]="currentInstance().description!"
     />
 
     <osf-project-metadata-resource-information
+      [readonly]="readonly()"
       (openEditResourceInformationDialog)="openEditResourceInformationDialog.emit()"
-      [customItemMetadata]="customItemMetadata()"
+      [customItemMetadata]="customItemMetadata()!"
     />
 
     <osf-project-metadata-funding
+      [readonly]="readonly()"
       (openEditFundingDialog)="openEditFundingDialog.emit()"
-      [supplements]="currentInstance().supplements!"
+      [funders]="customItemMetadata().funders!"
     />
 
     <osf-project-metadata-affiliated-institutions
+      [readonly]="readonly()"
       (openEditAffiliatedInstitutionsDialog)="openEditAffiliatedInstitutionsDialog.emit()"
       [affiliatedInstitutions]="currentInstance().affiliatedInstitutions!"
     />
@@ -53,12 +58,13 @@ <h2>
   <div class="col-12 lg:col-6 flex flex-column gap-4">
     <osf-project-metadata-license
       (openEditLicenseDialog)="openEditLicenseDialog.emit()"
+      [hideEditLicense]="hideEditDoiAndLicence() || readonly()"
       [license]="currentInstance().license!"
     />
 
     <osf-project-metadata-publication-doi
       (openEditPublicationDoiDialog)="handleEditDoi.emit()"
-      [hideEditDoi]="hideEditDoi()"
+      [hideEditDoi]="hideEditDoiAndLicence() || readonly()"
       [identifiers]="currentInstance().identifiers!"
     />
 
@@ -66,11 +72,16 @@ <h2>
       <div class="flex flex-column gap-3">
         <h2>{{ 'project.overview.metadata.tags' | translate }}</h2>
 
-        <osf-tags-input (tagsChanged)="tagsChanged.emit($event)" [tags]="currentInstance().tags || []"></osf-tags-input>
+        <osf-tags-input
+          [readonly]="readonly()"
+          (tagsChanged)="tagsChanged.emit($event)"
+          [tags]="currentInstance().tags || []"
+        />
       </div>
     </p-card>
 
     <osf-project-metadata-subjects
+      [readonly]="readonly()"
       (getSubjectChildren)="getSubjectChildren.emit($event)"
       (searchSubjects)="searchSubjects.emit($event)"
       (updateSelectedSubjects)="updateSelectedSubjects.emit($event)"
diff --git a/src/app/shared/components/shared-metadata/shared-metadata.component.ts b/src/app/shared/components/shared-metadata/shared-metadata.component.ts
index 565caa9c6..fb23a4152 100644
--- a/src/app/shared/components/shared-metadata/shared-metadata.component.ts
+++ b/src/app/shared/components/shared-metadata/shared-metadata.component.ts
@@ -38,7 +38,6 @@ import {
     Card,
   ],
   templateUrl: './shared-metadata.component.html',
-  standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class SharedMetadataComponent {
@@ -46,7 +45,8 @@ export class SharedMetadataComponent {
   customItemMetadata = input.required<CustomItemMetadataRecord>();
   selectedSubjects = input.required<SubjectModel[]>();
   isSubjectsUpdating = input.required<boolean>();
-  hideEditDoi = input<boolean>(false);
+  hideEditDoiAndLicence = input<boolean>(false);
+  readonly = input<boolean>(false);
 
   openEditContributorDialog = output<void>();
   openEditDescriptionDialog = output<void>();
diff --git a/src/app/shared/components/subjects/subjects.component.html b/src/app/shared/components/subjects/subjects.component.html
index 7a7996439..39fc1c960 100644
--- a/src/app/shared/components/subjects/subjects.component.html
+++ b/src/app/shared/components/subjects/subjects.component.html
@@ -8,7 +8,7 @@ <h2 class="mb-2">{{ 'shared.subjects.title' | translate }}</h2>
       <p-chip
         class="mb-2 mr-2"
         [label]="subject.name"
-        [removable]="true"
+        [removable]="!readonly()"
         removeIcon="fas fa-close"
         (onRemove)="removeSubject(subject)"
       />
@@ -16,53 +16,55 @@ <h2 class="mb-2">{{ 'shared.subjects.title' | translate }}</h2>
   }
 </p-card>
 
-<osf-search-input
-  class="w-full"
-  [control]="searchControl"
-  [placeholder]="'shared.subjects.searchSubjects' | translate"
-/>
+@if (!readonly()) {
+  <osf-search-input
+    class="w-full"
+    [control]="searchControl"
+    [placeholder]="'shared.subjects.searchSubjects' | translate"
+  />
 
-@if (searchControl.value) {
-  <div class="mt-4 pl-3">
-    @if (isSearching()) {
-      <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
-      <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
-      <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
-      <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
-    } @else {
-      @if (!searchedList().length) {
-        <p class="text-500">{{ 'shared.subjects.noSubject' | translate }}</p>
-      }
-      @for (subjects of searchedList(); track $index) {
-        <div class="flex mb-2">
-          <p-checkbox
-            [inputId]="'subjects-' + $index"
-            [value]="subjects"
-            (onChange)="selectSearched($event, subjects)"
-          />
-          <label for="subjects-{{ $index }}" class="flex flex-wrap ml-2">
-            @for (item of subjects; track item.id) {
-              <span [class]="$last ? 'font-bold' : ''">{{ item.name }}</span>
-              @if (!$last) {
-                <span class="mx-1">/</span>
+  @if (searchControl.value) {
+    <div class="mt-4 pl-3">
+      @if (isSearching()) {
+        <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
+        <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
+        <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
+        <p-skeleton width="100%" class="flex mb-2" height="1rem" borderRadius="0" />
+      } @else {
+        @if (!searchedList().length) {
+          <p class="text-500">{{ 'shared.subjects.noSubject' | translate }}</p>
+        }
+        @for (subjects of searchedList(); track $index) {
+          <div class="flex mb-2">
+            <p-checkbox
+              [inputId]="'subjects-' + $index"
+              [value]="subjects"
+              (onChange)="selectSearched($event, subjects)"
+            />
+            <label for="subjects-{{ $index }}" class="flex flex-wrap ml-2">
+              @for (item of subjects; track item.id) {
+                <span [class]="$last ? 'font-bold' : ''">{{ item.name }}</span>
+                @if (!$last) {
+                  <span class="mx-1">/</span>
+                }
               }
-            }
-          </label>
-        </div>
+            </label>
+          </div>
+        }
       }
-    }
-  </div>
-} @else {
-  <p-tree
-    [value]="subjectsTree()"
-    selectionMode="checkbox"
-    [selection]="selectedTree()"
-    [lazy]="true"
-    [loading]="areSubjectsUpdating() || subjectsLoading()"
-    (onNodeExpand)="loadNode($event.node)"
-    (onNodeCollapse)="collapseNode($event.node)"
-    (onNodeSelect)="selectSubject($event.node.data)"
-    (onNodeUnselect)="removeSubject($event.node.data)"
-  >
-  </p-tree>
+    </div>
+  } @else {
+    <p-tree
+      [value]="subjectsTree()"
+      selectionMode="checkbox"
+      [selection]="selectedTree()"
+      [lazy]="true"
+      [loading]="areSubjectsUpdating() || subjectsLoading()"
+      (onNodeExpand)="loadNode($event.node)"
+      (onNodeCollapse)="collapseNode($event.node)"
+      (onNodeSelect)="selectSubject($event.node.data)"
+      (onNodeUnselect)="removeSubject($event.node.data)"
+    >
+    </p-tree>
+  }
 }
diff --git a/src/app/shared/components/subjects/subjects.component.ts b/src/app/shared/components/subjects/subjects.component.ts
index e7bac58d6..cb7c793f5 100644
--- a/src/app/shared/components/subjects/subjects.component.ts
+++ b/src/app/shared/components/subjects/subjects.component.ts
@@ -33,6 +33,7 @@ export class SubjectsComponent {
   areSubjectsUpdating = input<boolean>(false);
   isSearching = select(SubjectsSelectors.getSearchedSubjectsLoading);
   selected = input<SubjectModel[]>([]);
+  readonly = input<boolean>(false);
   searchChanged = output<string>();
   loadChildren = output<string>();
   updateSelection = output<SubjectModel[]>();
@@ -64,6 +65,8 @@ export class SubjectsComponent {
   }
 
   selectSubject(subject: SubjectModel) {
+    if (this.readonly()) return;
+
     const childrenIds = this.getChildrenIds([subject]);
     const updatedSelection = [...this.selected().filter((s) => !childrenIds.includes(s.id)), subject];
     const parentSubjects = this.mapParentsSubject(subject.parent).filter(
@@ -76,6 +79,8 @@ export class SubjectsComponent {
   }
 
   removeSubject(subject: SubjectModel) {
+    if (this.readonly()) return;
+
     const updatedSelection = this.selected().filter(
       (s) => s.id !== subject.id && !this.getChildrenIds([subject]).includes(s.id)
     );
@@ -83,6 +88,8 @@ export class SubjectsComponent {
   }
 
   selectSearched(event: CheckboxChangeEvent, subjects: SubjectModel[]) {
+    if (this.readonly()) return;
+
     if (event.checked) {
       this.updateSelection.emit([...this.selected(), ...subjects]);
     } else {
diff --git a/src/app/shared/components/tags-input/tags-input.component.html b/src/app/shared/components/tags-input/tags-input.component.html
index 4815011cf..02f8c1488 100644
--- a/src/app/shared/components/tags-input/tags-input.component.html
+++ b/src/app/shared/components/tags-input/tags-input.component.html
@@ -1,14 +1,15 @@
 <div class="flex flex-column gap-2">
   <div
     class="tags-input-container flex flex-wrap align-items-center gap-1 p-inputtext"
+    [class.readonly]="readonly()"
     tabindex="0"
     role="textbox"
     [attr.aria-label]="'common.placeholder.addTag' | translate"
-    (click)="onContainerClick()"
-    (keydown)="onContainerKeydown($event)"
+    (click)="!readonly() && onContainerClick()"
+    (keydown)="!readonly() && onContainerKeydown($event)"
   >
     @for (tag of localTags(); track $index) {
-      <p-chip [label]="tag" [removable]="true" (onRemove)="removeTag($index)" class="p-chip-inline" />
+      <p-chip [label]="tag" [removable]="!readonly()" (onRemove)="removeTag($index)" class="p-chip-inline" />
     }
 
     <input
@@ -17,13 +18,16 @@
       type="text"
       [placeholder]="localTags().length === 0 ? ('common.placeholder.addTag' | translate) : ''"
       [required]="required() && localTags().length === 0"
+      [readOnly]="readonly()"
       (keydown)="onInputKeydown($event)"
       (blur)="onInputBlur($event)"
       class="tag-input-field"
     />
   </div>
 
-  <small class="text-color-secondary">
-    {{ 'common.hint.tagSeparators' | translate }}
-  </small>
+  @if (!readonly()) {
+    <small class="text-color-secondary">
+      {{ 'common.hint.tagSeparators' | translate }}
+    </small>
+  }
 </div>
diff --git a/src/app/shared/components/tags-input/tags-input.component.ts b/src/app/shared/components/tags-input/tags-input.component.ts
index e8de22185..3c8ba3678 100644
--- a/src/app/shared/components/tags-input/tags-input.component.ts
+++ b/src/app/shared/components/tags-input/tags-input.component.ts
@@ -25,6 +25,7 @@ import { FormsModule } from '@angular/forms';
 export class TagsInputComponent {
   tags = input<string[]>([]);
   required = input<boolean>(false);
+  readonly = input<boolean>(false);
   tagsChanged = output<string[]>();
 
   inputValue = signal<string>('');
@@ -82,6 +83,8 @@ export class TagsInputComponent {
   }
 
   private addTag(tagValue: string): void {
+    if (this.readonly()) return;
+
     const currentTags = this.localTags();
     const normalizedValue = tagValue.replace(/[,\s]+/g, ' ').trim();
 
@@ -96,6 +99,8 @@ export class TagsInputComponent {
   }
 
   removeTag(index: number): void {
+    if (this.readonly()) return;
+
     const currentTags = this.localTags();
     const updatedTags = currentTags.filter((_, i) => i !== index);
 

From b78f3c02a5071f9fd92b3b854c5c2c8e2858e62c Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Thu, 24 Jul 2025 10:07:26 +0300
Subject: [PATCH 7/9] feat(main): merge main

---
 .../project/overview/mappers/project-overview.mapper.ts       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 11d4f24d7..797d90b5a 100644
--- a/src/app/features/project/overview/mappers/project-overview.mapper.ts
+++ b/src/app/features/project/overview/mappers/project-overview.mapper.ts
@@ -1,3 +1,5 @@
+import { License } from '@shared/models';
+
 import { ProjectOverview, ProjectOverviewGetResponseJsoApi } from '../models';
 
 export class ProjectOverviewMapper {
@@ -77,6 +79,6 @@ export class ProjectOverviewMapper {
         rootFolder: response.relationships?.files?.links?.related?.href,
         iri: response.links?.iri,
       },
-    };
+    } as ProjectOverview;
   }
 }

From f78d66b3249a2a8c94f4499accd729673238cd77 Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Thu, 24 Jul 2025 15:57:25 +0300
Subject: [PATCH 8/9] feat(registry-metadata): added fixes by suggestions

---
 .../models/cedar-metadata-template.models.ts  |   2 +-
 .../metadata/project-metadata.component.ts    |   9 +-
 .../mappers/project-overview.mapper.ts        |   2 +-
 .../registry/mappers/cedar-form.mapper.ts     |  27 +
 src/app/features/registry/mappers/index.ts    |   1 +
 .../registry-metadata-add.component.html      |  21 +-
 .../registry-metadata-add.component.scss      |   4 +-
 .../registry-metadata-add.component.spec.ts   | 568 ++++++++++++++++++
 .../registry-metadata-add.component.ts        |  30 +-
 .../registry-metadata.component.ts            |  35 +-
 .../registry-metadata.selectors.ts            |   5 -
 .../registry-metadata.state.ts                |  26 +-
 .../funding-dialog.component.html             |   1 +
 .../funding-dialog.component.ts               |   1 +
 src/app/shared/enums/index.ts                 |   1 +
 .../shared/enums/metadata-projects.enum.ts    |   5 +
 src/app/shared/models/metadata-tabs.model.ts  |   7 +
 src/assets/i18n/en.json                       |   2 +
 18 files changed, 657 insertions(+), 90 deletions(-)
 create mode 100644 src/app/features/registry/mappers/cedar-form.mapper.ts
 create mode 100644 src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.spec.ts
 create mode 100644 src/app/shared/enums/metadata-projects.enum.ts
 create mode 100644 src/app/shared/models/metadata-tabs.model.ts

diff --git a/src/app/features/project/metadata/models/cedar-metadata-template.models.ts b/src/app/features/project/metadata/models/cedar-metadata-template.models.ts
index 681d716c2..75044e300 100644
--- a/src/app/features/project/metadata/models/cedar-metadata-template.models.ts
+++ b/src/app/features/project/metadata/models/cedar-metadata-template.models.ts
@@ -225,7 +225,7 @@ export interface CedarMetadataRecordData {
     };
     target: {
       data: {
-        type: 'nodes';
+        type: 'nodes' | 'registrations';
         id: string;
       };
     };
diff --git a/src/app/features/project/metadata/project-metadata.component.ts b/src/app/features/project/metadata/project-metadata.component.ts
index cd7c4a4bf..bd3c3c942 100644
--- a/src/app/features/project/metadata/project-metadata.component.ts
+++ b/src/app/features/project/metadata/project-metadata.component.ts
@@ -31,7 +31,7 @@ import {
   UpdateCustomItemMetadata,
   UpdateProjectDetails,
 } from '@osf/features/project/metadata/store';
-import { ResourceType } from '@osf/shared/enums';
+import { MetadataProjectsEnum, ResourceType } from '@osf/shared/enums';
 import {
   ContributorsSelectors,
   FetchChildrenSubjects,
@@ -53,6 +53,7 @@ import {
 } from '@shared/components/shared-metadata/dialogs';
 import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
 import { SubjectModel } from '@shared/models';
+import { MetadataTabsModel } from '@shared/models/metadata-tabs.model';
 import { CustomConfirmationService, LoaderService, ToastService } from '@shared/services';
 
 @Component({
@@ -86,7 +87,7 @@ export class ProjectMetadataComponent implements OnInit {
 
   private projectId = '';
 
-  tabs = signal<{ id: string; label: string; type: 'project' | 'cedar' }[]>([]);
+  tabs = signal<MetadataTabsModel[]>([]);
   protected readonly selectedTab = signal('project');
 
   selectedCedarRecord = signal<CedarMetadataRecordData | null>(null);
@@ -130,13 +131,13 @@ export class ProjectMetadataComponent implements OnInit {
       const project = this.currentProject();
       if (!project) return;
 
-      const baseTabs = [{ id: 'project', label: project.title, type: 'project' as const }];
+      const baseTabs = [{ id: 'project', label: project.title, type: MetadataProjectsEnum.PROJECT }];
 
       const cedarTabs =
         records?.map((record) => ({
           id: record.id || '',
           label: record.embeds?.template?.data?.attributes?.schema_name || `Record ${record.id}`,
-          type: 'cedar' as const,
+          type: MetadataProjectsEnum.CEDAR,
         })) || [];
 
       this.tabs.set([...baseTabs, ...cedarTabs]);
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 797d90b5a..79cbe3bcd 100644
--- a/src/app/features/project/overview/mappers/project-overview.mapper.ts
+++ b/src/app/features/project/overview/mappers/project-overview.mapper.ts
@@ -25,7 +25,7 @@ export class ProjectOverviewMapper {
             year: response.attributes.node_license.year,
           }
         : undefined,
-      license: response.embeds.license?.data?.attributes as unknown as License,
+      license: response.embeds.license?.data?.attributes as License,
       doi: response.attributes.doi,
       publicationDoi: response.attributes.publication_doi,
       analyticsKey: response.attributes.analytics_key,
diff --git a/src/app/features/registry/mappers/cedar-form.mapper.ts b/src/app/features/registry/mappers/cedar-form.mapper.ts
new file mode 100644
index 000000000..54c680f34
--- /dev/null
+++ b/src/app/features/registry/mappers/cedar-form.mapper.ts
@@ -0,0 +1,27 @@
+import { CedarMetadataRecord, CedarRecordDataBinding } from '@osf/features/project/metadata/models';
+
+export function CedarFormMapper(data: CedarRecordDataBinding, registryId: string): CedarMetadataRecord {
+  return {
+    data: {
+      type: 'cedar_metadata_records' as const,
+      attributes: {
+        metadata: data.data,
+        is_published: false,
+      },
+      relationships: {
+        template: {
+          data: {
+            type: 'cedar-metadata-templates' as const,
+            id: data.id,
+          },
+        },
+        target: {
+          data: {
+            type: 'registrations' as const,
+            id: registryId,
+          },
+        },
+      },
+    },
+  };
+}
diff --git a/src/app/features/registry/mappers/index.ts b/src/app/features/registry/mappers/index.ts
index 629991406..07eddfde6 100644
--- a/src/app/features/registry/mappers/index.ts
+++ b/src/app/features/registry/mappers/index.ts
@@ -1,3 +1,4 @@
+export * from './cedar-form.mapper';
 export * from './registry-metadata.mapper';
 export * from './registry-overview.mapper';
 export * from './registry-schema-block.mapper';
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
index 8b85e40a1..ea2723196 100644
--- a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
@@ -15,13 +15,16 @@ <h2>{{ 'project.metadata.addMetadata.selectTemplate' | translate }}</h2>
 
         <div class="flex gap-2 flex-wrap sm:gap-4">
           @for (meta of cedarTemplates()?.data; track meta.id) {
-            <p-button
-              severity="info"
-              class="metadata border-1 grey-border-color border-round-xl p-4 align-items-center"
-              styleClass="flex justify-content-between flex-column gap-4 hover:border-0"
-              [class.cursor-pointer]="!hasExistingRecord(meta.id)"
-              [class.cursor-not-allowed]="hasExistingRecord(meta.id)"
-              (click)="onTemplateSelected(meta)"
+            <!--            <p-button-->
+            <!--              severity="info"-->
+            <!--              class="metadata border-1 grey-border-color border-round-xl p-4 align-items-center"-->
+            <!--              styleClass="flex justify-content-between flex-column gap-4 hover:border-0"-->
+            <!--              [class.cursor-pointer]="!hasExistingRecord(meta.id)"-->
+            <!--              [class.cursor-not-allowed]="hasExistingRecord(meta.id)"-->
+            <!--              (click)="onTemplateSelected(meta)"-->
+            <!--            >-->
+            <div
+              class="flex flex-column gap-4 metadata border-1 grey-border-color border-round-xl p-4 align-items-center"
             >
               <div class="flex flex-row gap-4">
                 <h2>{{ meta.attributes.template.title }}</h2>
@@ -45,7 +48,9 @@ <h2>{{ meta.attributes.template.title }}</h2>
                   (click)="onTemplateSelected(meta)"
                 ></p-button>
               }
-            </p-button>
+            </div>
+
+            <!--            </p-button>-->
           }
         </div>
 
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss
index 75061e4f9..924232170 100644
--- a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.scss
@@ -1,7 +1,9 @@
+@use "assets/styles/variables" as var;
+
 .metadata {
   flex-basis: calc(50% - 1.5rem);
 
-  @media (max-width: 576px) {
+  @media (max-width: var.$breakpoint-sm) {
     flex-basis: 100%;
   }
 }
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.spec.ts b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.spec.ts
new file mode 100644
index 000000000..b51634051
--- /dev/null
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.spec.ts
@@ -0,0 +1,568 @@
+import { provideStore, Store } from '@ngxs/store';
+
+import { TranslatePipe } from '@ngx-translate/core';
+import { MockComponent, MockPipe } from 'ng-mocks';
+
+import { of, throwError } from 'rxjs';
+
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute, provideRouter, Router } from '@angular/router';
+
+import {
+  CedarMetadataDataTemplateJsonApi,
+  CedarMetadataRecord,
+  CedarMetadataRecordData,
+  CedarRecordDataBinding,
+} from '@osf/features/project/metadata/models';
+import { CedarFormMapper } from '@osf/features/registry/mappers';
+import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
+import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
+import { ToastService } from '@shared/services';
+
+import { RegistryMetadataState } from '../../store/registry-metadata';
+
+import { RegistryMetadataAddComponent } from './registry-metadata-add.component';
+
+jest.mock('@osf/features/registry/mappers', () => ({
+  CedarFormMapper: jest.fn(),
+}));
+
+describe('RegistryMetadataAddComponent', () => {
+  let component: RegistryMetadataAddComponent;
+  let fixture: ComponentFixture<RegistryMetadataAddComponent>;
+  let store: Store;
+  let router: Router;
+  let activatedRoute: ActivatedRoute;
+  let toastService: ToastService;
+
+  const mockRegistryId = 'test-registry-id';
+  const mockRecordId = 'test-record-id';
+
+  const mockCedarTemplate: CedarMetadataDataTemplateJsonApi = {
+    id: 'template-1',
+    type: 'cedar-metadata-templates',
+    attributes: {
+      schema_name: 'Test Template',
+      cedar_id: 'cedar-123',
+      template: {
+        '@id': 'test-id',
+        '@type': 'test-type',
+        type: 'object',
+        title: 'Test Template',
+        description: 'Test Description',
+        $schema: 'http://json-schema.org/draft-04/schema#',
+        '@context': {
+          pav: 'http://purl.org/pav/',
+          xsd: 'http://www.w3.org/2001/XMLSchema#',
+          bibo: 'http://purl.org/ontology/bibo/',
+          oslc: 'http://open-services.net/ns/core#',
+          schema: 'http://schema.org/',
+          'schema:name': { '@type': 'xsd:string' },
+          'pav:createdBy': { '@type': '@id' },
+          'pav:createdOn': { '@type': 'xsd:dateTime' },
+          'oslc:modifiedBy': { '@type': '@id' },
+          'pav:lastUpdatedOn': { '@type': 'xsd:dateTime' },
+          'schema:description': { '@type': 'xsd:string' },
+        },
+        required: ['@context', 'schema:name'],
+        properties: {},
+        _ui: {
+          order: ['schema:name'],
+          propertyLabels: { 'schema:name': 'Name' },
+          propertyDescriptions: { 'schema:name': 'Template name' },
+        },
+      },
+    },
+  };
+
+  const mockCedarRecord: CedarMetadataRecordData = {
+    id: mockRecordId,
+    type: 'cedar_metadata_records',
+    attributes: {
+      metadata: {
+        '@context': {},
+        Constructs: [],
+        Assessments: [],
+        Organization: [],
+        'Project Name': { '@value': 'Test Project' },
+        LDbaseWebsite: {},
+        'Project Methods': [],
+        'Participant Types': [],
+        'Special Populations': [],
+        'Developmental Design': {},
+        LDbaseProjectEndDate: { '@type': 'xsd:date', '@value': '2024-12-31' },
+        'Educational Curricula': [],
+        LDbaseInvestigatorORCID: [],
+        LDbaseProjectStartDates: { '@type': 'xsd:date', '@value': '2024-01-01' },
+        'Educational Environments': {},
+        LDbaseProjectDescription: { '@value': 'Test Description' },
+        LDbaseProjectContributors: [],
+      },
+      is_published: false,
+    },
+    relationships: {
+      template: {
+        data: {
+          type: 'cedar-metadata-templates',
+          id: 'template-1',
+        },
+      },
+      target: {
+        data: {
+          type: 'registrations',
+          id: mockRegistryId,
+        },
+      },
+    },
+  };
+
+  const mockCedarTemplates = {
+    data: [mockCedarTemplate],
+    links: {
+      first: 'http://api.test.com/first',
+      last: 'http://api.test.com/last',
+      next: 'http://api.test.com/next',
+      prev: null,
+    },
+  };
+
+  const mockCedarRecords = [mockCedarRecord];
+
+  const mockActivatedRoute = {
+    snapshot: {
+      params: {},
+    },
+    parent: {
+      parent: {
+        snapshot: {
+          params: { id: mockRegistryId },
+        },
+      },
+    },
+  };
+
+  beforeEach(async () => {
+    const mockToastService = {
+      showSuccess: jest.fn(),
+      showError: jest.fn(),
+    };
+
+    await TestBed.configureTestingModule({
+      imports: [
+        RegistryMetadataAddComponent,
+        MockComponent(SubHeaderComponent),
+        MockComponent(CedarTemplateFormComponent),
+        MockComponent(LoadingSpinnerComponent),
+        MockPipe(TranslatePipe),
+      ],
+      providers: [
+        provideStore([RegistryMetadataState]),
+        provideRouter([]),
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        { provide: ActivatedRoute, useValue: mockActivatedRoute },
+        { provide: ToastService, useValue: mockToastService },
+      ],
+    }).compileComponents();
+
+    store = TestBed.inject(Store);
+    router = TestBed.inject(Router);
+    activatedRoute = TestBed.inject(ActivatedRoute);
+    toastService = TestBed.inject(ToastService);
+
+    store.reset({
+      registryMetadata: {
+        cedarRecords: { data: mockCedarRecords, isLoading: false, error: null },
+        cedarTemplates: { data: mockCedarTemplates, isLoading: false, error: null },
+        cedarRecord: { data: null, isLoading: false, error: null },
+      },
+    });
+
+    fixture = TestBed.createComponent(RegistryMetadataAddComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('ngOnInit', () => {
+    it('should initialize with registryId from route params', () => {
+      component.ngOnInit();
+      expect(component['registryId']).toBe(mockRegistryId);
+    });
+
+    it('should dispatch actions when registryId is available', () => {
+      const dispatchSpy = jest.spyOn(store, 'dispatch');
+      component.ngOnInit();
+
+      expect(dispatchSpy).toHaveBeenCalledTimes(2);
+    });
+
+    it('should not dispatch actions when registryId is not available', () => {
+      component['route'].parent!.parent!.snapshot.params['id'] = undefined;
+      const dispatchSpy = jest.spyOn(store, 'dispatch');
+
+      component.ngOnInit();
+
+      expect(dispatchSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('constructor effect', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+    });
+
+    it('should handle record-id in route params for editing existing record', () => {
+      activatedRoute.snapshot.params = { 'record-id': mockRecordId };
+
+      const newFixture = TestBed.createComponent(RegistryMetadataAddComponent);
+      newFixture.detectChanges();
+      const newComponent = newFixture.componentInstance;
+
+      expect(newComponent.existingRecord()).toEqual(mockCedarRecord);
+      expect(newComponent.selectedTemplate()).toEqual(mockCedarTemplate);
+      expect(newComponent.isEditMode).toBe(false);
+    });
+
+    it('should handle no record-id in route params for creating new record', () => {
+      activatedRoute.snapshot.params = {};
+
+      const newFixture = TestBed.createComponent(RegistryMetadataAddComponent);
+      newFixture.detectChanges();
+      const newComponent = newFixture.componentInstance;
+
+      expect(newComponent.existingRecord()).toBeNull();
+      expect(newComponent.selectedTemplate()).toBeNull();
+      expect(newComponent.isEditMode).toBe(true);
+    });
+  });
+
+  describe('hasMultiplePages', () => {
+    it('should return true when first and last links are different', () => {
+      expect(component.hasMultiplePages()).toBe(true);
+    });
+
+    it('should return false when first and last links are the same', () => {
+      store.reset({
+        registryMetadata: {
+          cedarTemplates: {
+            data: {
+              ...mockCedarTemplates,
+              links: { first: 'same', last: 'same' },
+            },
+            isLoading: false,
+            error: null,
+          },
+        },
+      });
+      fixture.detectChanges();
+
+      expect(component.hasMultiplePages()).toBe(false);
+    });
+
+    it('should return false when templates are null', () => {
+      store.reset({
+        registryMetadata: {
+          cedarTemplates: { data: null, isLoading: false, error: null },
+        },
+      });
+      fixture.detectChanges();
+
+      expect(component.hasMultiplePages()).toBe(false);
+    });
+  });
+
+  describe('hasNextPage', () => {
+    it('should return true when next link exists', () => {
+      expect(component.hasNextPage()).toBe(true);
+    });
+
+    it('should return false when next link does not exist', () => {
+      store.reset({
+        registryMetadata: {
+          cedarTemplates: {
+            data: {
+              ...mockCedarTemplates,
+              links: { ...mockCedarTemplates.links, next: null },
+            },
+            isLoading: false,
+            error: null,
+          },
+        },
+      });
+      fixture.detectChanges();
+
+      expect(component.hasNextPage()).toBe(false);
+    });
+  });
+
+  describe('hasExistingRecord', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+    });
+
+    it('should return true when record with template id exists', () => {
+      const result = component.hasExistingRecord('template-1');
+      expect(result).toBe(true);
+    });
+
+    it('should return false when no record with template id exists', () => {
+      const result = component.hasExistingRecord('non-existent-template');
+      expect(result).toBe(false);
+    });
+
+    it('should return false when records are null', () => {
+      store.reset({
+        registryMetadata: {
+          cedarRecords: { data: null, isLoading: false, error: null },
+        },
+      });
+      fixture.detectChanges();
+
+      const result = component.hasExistingRecord('template-1');
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('onTemplateSelected', () => {
+    it('should set selected template', () => {
+      component.onTemplateSelected(mockCedarTemplate);
+      expect(component.selectedTemplate()).toEqual(mockCedarTemplate);
+    });
+  });
+
+  describe('onSubmit', () => {
+    const mockSubmissionData: CedarRecordDataBinding = {
+      data: {
+        '@context': {},
+        Constructs: [],
+        Assessments: [],
+        Organization: [],
+        'Project Name': { '@value': 'Test Project' },
+        LDbaseWebsite: {},
+        'Project Methods': [],
+        'Participant Types': [],
+        'Special Populations': [],
+        'Developmental Design': {},
+        LDbaseProjectEndDate: { '@type': 'xsd:date', '@value': '2024-12-31' },
+        'Educational Curricula': [],
+        LDbaseInvestigatorORCID: [],
+        LDbaseProjectStartDates: { '@type': 'xsd:date', '@value': '2024-01-01' },
+        'Educational Environments': {},
+        LDbaseProjectDescription: { '@value': 'Test Description' },
+        LDbaseProjectContributors: [],
+      },
+      id: 'template-1',
+    };
+
+    const mockMappedRecord: CedarMetadataRecord = {
+      data: {
+        type: 'cedar_metadata_records',
+        attributes: {
+          metadata: mockSubmissionData.data,
+          is_published: false,
+        },
+        relationships: {
+          template: {
+            data: {
+              type: 'cedar-metadata-templates',
+              id: mockSubmissionData.id,
+            },
+          },
+          target: {
+            data: {
+              type: 'registrations',
+              id: mockRegistryId,
+            },
+          },
+        },
+      },
+    };
+
+    beforeEach(() => {
+      component.ngOnInit();
+      fixture.detectChanges();
+      (CedarFormMapper as jest.Mock).mockReturnValue(mockMappedRecord);
+    });
+
+    it('should not submit when registryId is not available', () => {
+      component['registryId'] = '';
+      const dispatchSpy = jest.spyOn(store, 'dispatch');
+
+      component.onSubmit(mockSubmissionData);
+
+      expect(dispatchSpy).not.toHaveBeenCalled();
+      expect(component.isSubmitting()).toBe(false);
+    });
+
+    it('should successfully create cedar record', () => {
+      const dispatchSpy = jest.spyOn(store, 'dispatch').mockReturnValue(of({}));
+      const routerSpy = jest.spyOn(router, 'navigate');
+
+      store.reset({
+        registryMetadata: {
+          cedarRecord: {
+            data: { data: { id: 'new-record-id' } },
+            isLoading: false,
+            error: null,
+          },
+        },
+      });
+
+      component.onSubmit(mockSubmissionData);
+
+      expect(component.isSubmitting()).toBe(true);
+      expect(CedarFormMapper).toHaveBeenCalledWith(mockSubmissionData, mockRegistryId);
+      expect(dispatchSpy).toHaveBeenCalled();
+    });
+
+    it('should handle submission success', (done) => {
+      const routerSpy = jest.spyOn(router, 'navigate');
+      const dispatchSpy = jest.spyOn(store, 'dispatch').mockReturnValue(of({}));
+
+      store.reset({
+        registryMetadata: {
+          cedarRecord: {
+            data: { data: { id: 'new-record-id' } },
+            isLoading: false,
+            error: null,
+          },
+        },
+      });
+
+      component.onSubmit(mockSubmissionData);
+
+      // Use setTimeout to allow the subscription to complete
+      setTimeout(() => {
+        expect(component.isSubmitting()).toBe(false);
+        expect(toastService.showSuccess).toHaveBeenCalledWith(
+          'project.overview.metadata.cedarRecordCreatedSuccessfully'
+        );
+        expect(routerSpy).toHaveBeenCalledWith(['../metadata', 'new-record-id'], {
+          relativeTo: activatedRoute.parent,
+        });
+        done();
+      }, 0);
+    });
+
+    it('should handle submission error', (done) => {
+      const dispatchSpy = jest.spyOn(store, 'dispatch').mockReturnValue(throwError(() => new Error('Test error')));
+
+      component.onSubmit(mockSubmissionData);
+
+      // Use setTimeout to allow the subscription to complete
+      setTimeout(() => {
+        expect(component.isSubmitting()).toBe(false);
+        expect(toastService.showError).toHaveBeenCalledWith('project.overview.metadata.failedToCreateCedarRecord');
+        done();
+      }, 0);
+    });
+  });
+
+  describe('onChangeTemplate', () => {
+    it('should reset selected template', () => {
+      component.selectedTemplate.set(mockCedarTemplate);
+      component.onChangeTemplate();
+      expect(component.selectedTemplate()).toBeNull();
+    });
+  });
+
+  describe('toggleEditMode', () => {
+    it('should toggle edit mode', () => {
+      const initialMode = component.isEditMode;
+      component.toggleEditMode();
+      expect(component.isEditMode).toBe(!initialMode);
+    });
+  });
+
+  describe('onNext', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+    });
+
+    it('should dispatch action with next link when available', () => {
+      const dispatchSpy = jest.spyOn(store, 'dispatch');
+
+      component.onNext();
+
+      expect(dispatchSpy).toHaveBeenCalled();
+    });
+
+    it('should not dispatch action when next link is not available', () => {
+      store.reset({
+        registryMetadata: {
+          cedarTemplates: {
+            data: {
+              ...mockCedarTemplates,
+              links: { ...mockCedarTemplates.links, next: null },
+            },
+            isLoading: false,
+            error: null,
+          },
+        },
+      });
+      fixture.detectChanges();
+
+      const dispatchSpy = jest.spyOn(store, 'dispatch');
+
+      component.onNext();
+
+      expect(dispatchSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('onCancel', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+    });
+
+    it('should dispatch getCedarTemplates when multiple pages exist', () => {
+      const dispatchSpy = jest.spyOn(store, 'dispatch');
+
+      component.onCancel();
+
+      expect(dispatchSpy).toHaveBeenCalled();
+    });
+
+    it('should navigate back when single page', () => {
+      store.reset({
+        registryMetadata: {
+          cedarTemplates: {
+            data: {
+              ...mockCedarTemplates,
+              links: { first: 'same', last: 'same' },
+            },
+            isLoading: false,
+            error: null,
+          },
+        },
+      });
+      fixture.detectChanges();
+
+      const routerSpy = jest.spyOn(router, 'navigate');
+
+      component.onCancel();
+
+      expect(routerSpy).toHaveBeenCalledWith(['..'], { relativeTo: activatedRoute });
+    });
+
+    it('should navigate back when templates are null', () => {
+      store.reset({
+        registryMetadata: {
+          cedarTemplates: { data: null, isLoading: false, error: null },
+        },
+      });
+      fixture.detectChanges();
+
+      const routerSpy = jest.spyOn(router, 'navigate');
+
+      component.onCancel();
+
+      expect(routerSpy).toHaveBeenCalledWith(['..'], { relativeTo: activatedRoute });
+    });
+  });
+});
diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
index 700e325e7..d186849f0 100644
--- a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.ts
@@ -11,10 +11,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 import {
   CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecord,
   CedarMetadataRecordData,
   CedarRecordDataBinding,
 } from '@osf/features/project/metadata/models';
+import { CedarFormMapper } from '@osf/features/registry/mappers';
 import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
 import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
 import { ToastService } from '@shared/services';
@@ -127,29 +127,7 @@ export class RegistryMetadataAddComponent implements OnInit {
 
     this.isSubmitting.set(true);
 
-    const model = {
-      data: {
-        type: 'cedar_metadata_records' as const,
-        attributes: {
-          metadata: data.data,
-          is_published: false,
-        },
-        relationships: {
-          template: {
-            data: {
-              type: 'cedar-metadata-templates' as const,
-              id: data.id,
-            },
-          },
-          target: {
-            data: {
-              type: 'registrations' as const,
-              id: registryId,
-            },
-          },
-        },
-      },
-    } as unknown as CedarMetadataRecord;
+    const model = CedarFormMapper(data, registryId);
 
     this.actions
       .createCedarRecord(model)
@@ -157,12 +135,12 @@ export class RegistryMetadataAddComponent implements OnInit {
       .subscribe({
         next: () => {
           this.isSubmitting.set(false);
-          this.toastService.showSuccess('CEDAR record created successfully');
+          this.toastService.showSuccess('project.overview.metadata.cedarRecordCreatedSuccessfully');
           this.router.navigate(['../metadata', this.cedarRecord()?.data.id], { relativeTo: this.route.parent });
         },
         error: () => {
           this.isSubmitting.set(false);
-          this.toastService.showError('Failed to create CEDAR record');
+          this.toastService.showError('project.overview.metadata.failedToCreateCedarRecord');
         },
       });
   }
diff --git a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
index f3c7e8542..e0056983f 100644
--- a/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
+++ b/src/app/features/registry/pages/registry-metadata/registry-metadata.component.ts
@@ -23,12 +23,12 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { UserSelectors } from '@osf/core/store/user';
 import {
   CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecord,
   CedarMetadataRecordData,
   CedarRecordDataBinding,
   CustomItemMetadataRecord,
 } from '@osf/features/project/metadata/models';
 import { ProjectOverview } from '@osf/features/project/overview/models';
+import { CedarFormMapper } from '@osf/features/registry/mappers';
 import {
   ContributorsSelectors,
   FetchChildrenSubjects,
@@ -47,8 +47,9 @@ import {
   ResourceInformationDialogComponent,
 } from '@shared/components/shared-metadata/dialogs';
 import { SharedMetadataComponent } from '@shared/components/shared-metadata/shared-metadata.component';
-import { ResourceType } from '@shared/enums';
+import { MetadataProjectsEnum, ResourceType } from '@shared/enums';
 import { SubjectModel } from '@shared/models';
+import { MetadataTabsModel } from '@shared/models/metadata-tabs.model';
 import { ToastService } from '@shared/services';
 
 import {
@@ -100,7 +101,7 @@ export class RegistryMetadataComponent implements OnInit {
 
   private registryId = '';
 
-  tabs = signal<{ id: string; label: string; type: 'registry' | 'cedar' }[]>([]);
+  tabs = signal<MetadataTabsModel[]>([]);
   protected readonly selectedTab = signal('registry');
 
   selectedCedarRecord = signal<CedarMetadataRecordData | null>(null);
@@ -157,13 +158,13 @@ export class RegistryMetadataComponent implements OnInit {
       const registry = this.currentRegistry();
       if (!registry) return;
 
-      const baseTabs = [{ id: 'registry', label: registry.title, type: 'registry' as const }];
+      const baseTabs = [{ id: 'registry', label: registry.title, type: MetadataProjectsEnum.REGISTRY }];
 
       const cedarTabs =
         records?.map((record) => ({
           id: record.id || '',
           label: record.embeds?.template?.data?.attributes?.schema_name || `Record ${record.id}`,
-          type: 'cedar' as const,
+          type: MetadataProjectsEnum.CEDAR,
         })) || [];
 
       this.tabs.set([...baseTabs, ...cedarTabs]);
@@ -484,29 +485,7 @@ export class RegistryMetadataComponent implements OnInit {
 
     if (!registryId || !selectedRecord) return;
 
-    const model = {
-      data: {
-        type: 'cedar_metadata_records' as const,
-        attributes: {
-          metadata: data.data,
-          is_published: false,
-        },
-        relationships: {
-          template: {
-            data: {
-              type: 'cedar-metadata-templates' as const,
-              id: data.id,
-            },
-          },
-          target: {
-            data: {
-              type: 'registrations' as const,
-              id: registryId,
-            },
-          },
-        },
-      },
-    } as unknown as CedarMetadataRecord;
+    const model = CedarFormMapper(data, registryId);
 
     if (selectedRecord.id) {
       this.actions
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
index ffb10a74c..9b05ecc0a 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.selectors.ts
@@ -103,9 +103,4 @@ export class RegistryMetadataSelectors {
   static getCedarRecordsLoading(state: RegistryMetadataStateModel) {
     return state.cedarRecords.isLoading;
   }
-
-  @Selector([RegistryMetadataState])
-  static getError(state: RegistryMetadataStateModel) {
-    return state.registry.error;
-  }
 }
diff --git a/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
index c07f81eaa..d21eeb8e3 100644
--- a/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
+++ b/src/app/features/registry/store/registry-metadata/registry-metadata.state.ts
@@ -352,10 +352,8 @@ export class RegistryMetadataState {
   @Action(UpdateRegistryInstitutions)
   updateRegistryInstitutions(ctx: StateContext<RegistryMetadataStateModel>, action: UpdateRegistryInstitutions) {
     return this.registryMetadataService.updateRegistryInstitutions(action.registryId, action.institutions).pipe(
-      tap({
-        next: () => {
-          ctx.dispatch(new GetRegistryInstitutions(action.registryId));
-        },
+      tap(() => {
+        ctx.dispatch(new GetRegistryInstitutions(action.registryId));
       })
     );
   }
@@ -369,12 +367,10 @@ export class RegistryMetadataState {
     return this.registryMetadataService
       .updateRegistryContributor(action.registryId, action.contributorId, updateRequest)
       .pipe(
-        tap({
-          next: () => {
-            ctx.dispatch(new GetBibliographicContributors(action.registryId));
-            ctx.dispatch(new GetAllContributors(action.registryId, ResourceType.Registration));
-            ctx.dispatch(new GetRegistryForMetadata(action.registryId));
-          },
+        tap(() => {
+          ctx.dispatch(new GetBibliographicContributors(action.registryId));
+          ctx.dispatch(new GetAllContributors(action.registryId, ResourceType.Registration));
+          ctx.dispatch(new GetRegistryForMetadata(action.registryId));
         })
       );
   }
@@ -386,12 +382,10 @@ export class RegistryMetadataState {
     };
 
     return this.registryMetadataService.addRegistryContributor(action.registryId, addRequest).pipe(
-      tap({
-        next: () => {
-          ctx.dispatch(new GetBibliographicContributors(action.registryId));
-          ctx.dispatch(new GetAllContributors(action.registryId, ResourceType.Registration));
-          ctx.dispatch(new GetRegistryForMetadata(action.registryId));
-        },
+      tap(() => {
+        ctx.dispatch(new GetBibliographicContributors(action.registryId));
+        ctx.dispatch(new GetAllContributors(action.registryId, ResourceType.Registration));
+        ctx.dispatch(new GetRegistryForMetadata(action.registryId));
       })
     );
   }
diff --git a/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.html b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.html
index 2e99915c7..0b563bc46 100644
--- a/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.html
+++ b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.html
@@ -63,6 +63,7 @@
       severity="secondary"
       [label]="'common.buttons.addMore' | translate"
       [text]="true"
+      [disabled]="fundingForm.invalid"
       (click)="addFundingEntry()"
     />
   </div>
diff --git a/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
index 7c7bf6d70..e0c72cb6b 100644
--- a/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
+++ b/src/app/shared/components/shared-metadata/dialogs/funding-dialog/funding-dialog.component.ts
@@ -117,6 +117,7 @@ export class FundingDialogComponent implements OnInit {
       }),
       awardTitle: new FormControl(supplement ? supplement.title || supplement.awardTitle || '' : '', {
         nonNullable: true,
+        validators: [Validators.required],
       }),
       awardUri: new FormControl(supplement ? supplement.url || supplement.awardUri || '' : '', {
         nonNullable: true,
diff --git a/src/app/shared/enums/index.ts b/src/app/shared/enums/index.ts
index 29464b607..f4d0ac2f6 100644
--- a/src/app/shared/enums/index.ts
+++ b/src/app/shared/enums/index.ts
@@ -9,6 +9,7 @@ export * from './create-project-form-controls.enum';
 export * from './file-menu-type.enum';
 export * from './filter-type.enum';
 export * from './get-resources-request-type.enum';
+export * from './metadata-projects.enum';
 export * from './profile-addons-stepper.enum';
 export * from './profile-settings-key.enum';
 export * from './registration-review-states.enum';
diff --git a/src/app/shared/enums/metadata-projects.enum.ts b/src/app/shared/enums/metadata-projects.enum.ts
new file mode 100644
index 000000000..ee93c95fd
--- /dev/null
+++ b/src/app/shared/enums/metadata-projects.enum.ts
@@ -0,0 +1,5 @@
+export enum MetadataProjectsEnum {
+  PROJECT = 'project',
+  CEDAR = 'cedar',
+  REGISTRY = 'registry',
+}
diff --git a/src/app/shared/models/metadata-tabs.model.ts b/src/app/shared/models/metadata-tabs.model.ts
new file mode 100644
index 000000000..300ae518a
--- /dev/null
+++ b/src/app/shared/models/metadata-tabs.model.ts
@@ -0,0 +1,7 @@
+import { MetadataProjectsEnum } from '@shared/enums';
+
+export interface MetadataTabsModel {
+  id: string;
+  label: string;
+  type: MetadataProjectsEnum;
+}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 3b14b7712..627b839a5 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -589,6 +589,8 @@
         "noResourceInformation": "No resource information available",
         "notSpecified": "Not specified",
         "loading": "Loading metadata...",
+        "cedarRecordCreatedSuccessfully": "CEDAR record created successfully",
+        "failedToCreateCedarRecord": "Failed to create CEDAR record",
         "placeholders": {
           "edit": "Edit description here",
           "add": "Add description here"

From ad37f557b8f97b80d32098d0d3854cc1d0e3bca9 Mon Sep 17 00:00:00 2001
From: volodyayakubovskyy <vyakubovskyy477@gmail.com>
Date: Thu, 24 Jul 2025 17:01:10 +0300
Subject: [PATCH 9/9] feat(registry-metadata): added fixes by suggestions

---
 .../registry-metadata-add.component.html               | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
index ea2723196..1ab039dde 100644
--- a/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
+++ b/src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.html
@@ -15,14 +15,6 @@ <h2>{{ 'project.metadata.addMetadata.selectTemplate' | translate }}</h2>
 
         <div class="flex gap-2 flex-wrap sm:gap-4">
           @for (meta of cedarTemplates()?.data; track meta.id) {
-            <!--            <p-button-->
-            <!--              severity="info"-->
-            <!--              class="metadata border-1 grey-border-color border-round-xl p-4 align-items-center"-->
-            <!--              styleClass="flex justify-content-between flex-column gap-4 hover:border-0"-->
-            <!--              [class.cursor-pointer]="!hasExistingRecord(meta.id)"-->
-            <!--              [class.cursor-not-allowed]="hasExistingRecord(meta.id)"-->
-            <!--              (click)="onTemplateSelected(meta)"-->
-            <!--            >-->
             <div
               class="flex flex-column gap-4 metadata border-1 grey-border-color border-round-xl p-4 align-items-center"
             >
@@ -49,8 +41,6 @@ <h2>{{ meta.attributes.template.title }}</h2>
                 ></p-button>
               }
             </div>
-
-            <!--            </p-button>-->
           }
         </div>