Fix - Contributors permissions

src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.html

@@ -2,12 +2,14 @@
   <div class="flex justify-content-between align-items-center">
     <h3>{{ 'project.contributors.addContributor' | translate }}</h3>
 
-    <p-button
-      [label]="'project.contributors.addContributor' | translate"
-      [disabled]="isLoading()"
-      (onClick)="openAddContributorDialog()"
-      data-test-add-button
-    ></p-button>
+    @if (isCurrentUserAdminContributor()) {
+      <p-button
+        [label]="'project.contributors.addContributor' | translate"
+        [disabled]="isLoading()"
+        (onClick)="openAddContributorDialog()"
+        data-test-add-button
+      />
+    }
   </div>
 
   <div class="filters-container flex flex-column gap-3">
@@ -20,6 +22,8 @@ <h3>{{ 'project.contributors.addContributor' | translate }}</h3>
     [showEducation]="false"
     [showEmployment]="false"
     [isLoading]="isLoading()"
+    [isCurrentUserAdminContributor]="isCurrentUserAdminContributor()"
+    [currentUserId]="currentUser()?.id"
     (remove)="removeContributor($event)"
   ></osf-contributors-list>
 

src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts

@@ -7,17 +7,27 @@ import { DialogService, DynamicDialogConfig, DynamicDialogRef } from 'primeng/dy
 
 import { filter, forkJoin } from 'rxjs';
 
-import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit, signal } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  DestroyRef,
+  effect,
+  inject,
+  OnInit,
+  signal,
+} from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormsModule } from '@angular/forms';
 
+import { UserSelectors } from '@core/store/user';
 import { SearchInputComponent } from '@osf/shared/components';
 import {
   AddContributorDialogComponent,
   AddUnregisteredContributorDialogComponent,
   ContributorsListComponent,
 } from '@osf/shared/components/contributors';
-import { AddContributorType, ResourceType } from '@osf/shared/enums';
+import { AddContributorType, ContributorPermission, ResourceType } from '@osf/shared/enums';
 import { findChangedItems } from '@osf/shared/helpers';
 import { ContributorDialogAddModel, ContributorModel } from '@osf/shared/models';
 import { CustomConfirmationService, ToastService } from '@osf/shared/services';
@@ -52,6 +62,19 @@ export class ContributorsDialogComponent implements OnInit {
   isLoading = select(ContributorsSelectors.isContributorsLoading);
   initialContributors = select(ContributorsSelectors.getContributors);
   contributors = signal([]);
+
+  currentUser = select(UserSelectors.getCurrentUser);
+
+  isCurrentUserAdminContributor = computed(() => {
+    const currentUserId = this.currentUser()?.id;
+    const initialContributors = this.initialContributors();
+    if (!currentUserId) return false;
+
+    return initialContributors.some((contributor: ContributorModel) => {
+      return contributor.userId === currentUserId && contributor.permission === ContributorPermission.Admin;
+    });
+  });
+
   actions = createDispatchMap({
     updateSearchValue: UpdateSearchValue,
     updatePermissionFilter: UpdatePermissionFilter,

src/app/features/project/contributors/contributors.component.html

@@ -1,11 +1,13 @@
 <h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.contributors' | translate }}</h1>
 
 <section class="contributors flex flex-column align-items-baseline w-full p-3 pt-4 md:px-5 xl:px-4">
-  <p-button
-    [label]="'project.contributors.addContributor' | translate"
-    [disabled]="isContributorsLoading()"
-    (onClick)="openAddContributorDialog()"
-  ></p-button>
+  @if (isCurrentUserAdminContributor()) {
+    <p-button
+      [label]="'project.contributors.addContributor' | translate"
+      [disabled]="isContributorsLoading()"
+      (onClick)="openAddContributorDialog()"
+    ></p-button>
+  }
 
   <div class="filters-container flex flex-column xl:flex-row">
     <div class="xl:w-7">
@@ -64,6 +66,8 @@ <h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.contributors' | translate }
     class="w-full"
     [contributors]="contributors()"
     [isLoading]="isContributorsLoading()"
+    [isCurrentUserAdminContributor]="isCurrentUserAdminContributor()"
+    [currentUserId]="currentUser()?.id"
     [showCurator]="true"
     (remove)="removeContributor($event)"
   ></osf-contributors-list>

src/app/features/project/contributors/contributors.component.ts

@@ -23,6 +23,7 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl, FormsModule } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 
+import { UserSelectors } from '@core/store/user';
 import { SearchInputComponent, ViewOnlyTableComponent } from '@osf/shared/components';
 import {
   AddContributorDialogComponent,
@@ -105,9 +106,20 @@ export class ContributorsComponent implements OnInit {
 
   readonly isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
   readonly isViewOnlyLinksLoading = select(ViewOnlyLinkSelectors.isViewOnlyLinksLoading);
+  readonly currentUser = select(UserSelectors.getCurrentUser);
 
   canCreateViewLink = computed(() => !!this.resourceDetails() && !!this.resourceId());
 
+  isCurrentUserAdminContributor = computed(() => {
+    const currentUserId = this.currentUser()?.id;
+    const initialContributors = this.initialContributors();
+    if (!currentUserId) return false;
+
+    return initialContributors.some((contributor: ContributorModel) => {
+      return contributor.userId === currentUserId && contributor.permission === ContributorPermission.Admin;
+    });
+  });
+
   actions = createDispatchMap({
     getViewOnlyLinks: FetchViewOnlyLinks,
     getResourceDetails: GetResourceDetails,

src/app/features/registry/models/index.ts

@@ -6,7 +6,6 @@ export * from './linked-registrations-json-api.model';
 export * from './linked-response.models';
 export * from './registry-components.models';
 export * from './registry-components-json-api.model';
-export * from './registry-contributor-json-api.model';
 export * from './registry-metadata.models';
 export * from './registry-overview.models';
 export * from './resources';

src/app/shared/components/contributors/contributors-list/contributors-list.component.html

@@ -187,7 +187,7 @@ <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
           </td>
         }
         <td>
-          @if (isCurrentUserAdminContributor() || currentUserId() === contributor.userId) {
+          @if (canRemoveContributor().get(contributor.userId)) {
             <p-button
               class="danger-icon-btn"
               icon="fas fa-trash"

src/app/shared/components/contributors/contributors-list/contributors-list.component.ts

@@ -7,7 +7,7 @@ import { Skeleton } from 'primeng/skeleton';
 import { TableModule } from 'primeng/table';
 import { Tooltip } from 'primeng/tooltip';
 
-import { ChangeDetectionStrategy, Component, inject, input, output, signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, inject, input, output, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
 import { ModeratorPermission } from '@osf/features/moderation/enums';
@@ -37,6 +37,24 @@ export class ContributorsListComponent {
   currentUserId = input<string | undefined>(undefined);
   isCurrentUserAdminContributor = input<boolean>(true);
 
+  canRemoveContributor = computed(() => {
+    const contributors = this.contributors();
+    const currentUserId = this.currentUserId();
+    const isAdmin = this.isCurrentUserAdminContributor();
+    const adminCount = contributors.filter((c) => c.permission === ContributorPermission.Admin).length;
+
+    const result = new Map<string, boolean>();
+
+    for (const c of contributors) {
+      const canRemove =
+        (isAdmin || currentUserId === c.userId) && !(c.permission === ContributorPermission.Admin && adminCount <= 1);
+
+      result.set(c.userId, canRemove);
+    }
+
+    return result;
+  });
+
   remove = output<ContributorModel>();
   dialogService = inject(DialogService);
   translateService = inject(TranslateService);

src/app/shared/components/registration-card/registration-card.component.html

@@ -39,7 +39,7 @@ <h2 class="align-self-center">
               <strong>{{ 'project.overview.metadata.contributors' | translate }}:</strong>
               <span class="contributors">
                 @for (contributor of registrationData().contributors; track contributor) {
-                  <a class="font-bold" [routerLink]="['/user', contributor.userId]">{{ contributor.fullName }}</a>
+                  <a class="font-bold" [routerLink]="['/user', contributor.id]">{{ contributor.fullName }}</a>
                   @if (!$last) {
                     <span>, </span>
                   }

src/app/shared/mappers/registration/registration.mapper.ts

@@ -89,8 +89,8 @@ export class RegistrationMapper {
       revisionState: registration.attributes.revision_state,
       contributors:
         registration.embeds?.bibliographic_contributors?.data.map((contributor) => ({
-          id: contributor.id,
-          fullName: contributor.embeds?.users?.data.attributes.full_name,
+          id: contributor.embeds.users.data.id,
+          fullName: contributor.embeds.users.data.attributes.full_name,
         })) || [],
     };
   }