fix(bugs): fixed ui bugs

src/app/features/metadata/components/metadata-publication-doi/metadata-publication-doi.component.html

@@ -1,6 +1,10 @@
 <p-card>
   <div class="flex justify-content-between align-items-center">
-    <h2>{{ 'project.overview.metadata.publication' | translate }}</h2>
+    <h2>
+      {{
+        (isProject() ? 'project.overview.metadata.projectDOI' : 'project.overview.metadata.publicationDOI') | translate
+      }}
+    </h2>
 
     @if (!hideEditDoi()) {
       <p-button
@@ -12,7 +16,7 @@ <h2>{{ 'project.overview.metadata.publication' | translate }}</h2>
     }
   </div>
 
-  @if (resourceType() === ResourceType.Project) {
+  @if (isProject()) {
     @if (identifiers() && identifiers().length) {
       <div class="mt-4">
         @for (identifier of identifiers()!; track identifier.id) {
@@ -25,7 +29,7 @@ <h2>{{ 'project.overview.metadata.publication' | translate }}</h2>
       </div>
     } @else {
       <div class="mt-4">
-        <p>{{ 'project.overview.metadata.noPublicationDoi' | translate }}</p>
+        <p>{{ 'project.overview.metadata.noProjectDoi' | translate }}</p>
       </div>
     }
   } @else {

src/app/features/metadata/components/metadata-publication-doi/metadata-publication-doi.component.ts

@@ -3,7 +3,7 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { Button } from 'primeng/button';
 import { Card } from 'primeng/card';
 
-import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
 
 import { ResourceType } from '@osf/shared/enums';
 import { Identifier } from '@osf/shared/models';
@@ -22,5 +22,6 @@ export class MetadataPublicationDoiComponent {
   publicationDoi = input<string | null>(null);
   resourceType = input<ResourceType>(ResourceType.Project);
   doiHost = 'https://doi.org/';
-  ResourceType = ResourceType;
+
+  isProject = computed(() => this.resourceType() === ResourceType.Project);
 }

src/app/features/metadata/metadata.component.html

@@ -92,7 +92,7 @@
           (updateSelectedSubjects)="updateSelectedSubjects($event)"
           [isSubjectsUpdating]="isSubjectsUpdating()!"
           [selectedSubjects]="selectedSubjects()"
-          [readonly]="!hasAdminAccess()"
+          [readonly]="!hasWriteAccess()"
         />
       </div>
     </div>

src/app/features/moderation/components/moderators-table/moderators-table.component.html

@@ -32,9 +32,9 @@
     @if (item.id) {
       <tr>
         <td>
-          <p class="flex align-items-center gap-2">
-            <span>{{ item.fullName }}</span>
-          </p>
+          <a class="font-bold" [routerLink]="['/', item.userId]">
+            {{ item.fullName }}
+          </a>
         </td>
         <td>
           <div>

src/app/features/moderation/components/moderators-table/moderators-table.component.ts

@@ -6,6 +6,7 @@ import { TableModule } from 'primeng/table';
 
 import { ChangeDetectionStrategy, Component, inject, input, output, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
+import { RouterLink } from '@angular/router';
 
 import { MODERATION_PERMISSIONS } from '@osf/features/moderation/constants';
 import { ModeratorPermission } from '@osf/features/moderation/enums';
@@ -21,7 +22,7 @@ import { CustomDialogService } from '@osf/shared/services';
 
 @Component({
   selector: 'osf-moderators-table',
-  imports: [TranslatePipe, FormsModule, TableModule, Skeleton, Button, SelectComponent],
+  imports: [TranslatePipe, FormsModule, TableModule, Skeleton, Button, SelectComponent, RouterLink],
   templateUrl: './moderators-table.component.html',
   styleUrl: './moderators-table.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,

src/app/features/moderation/pages/registries-moderation/registries-moderation.component.ts

@@ -48,7 +48,7 @@ export class RegistriesModerationComponent implements OnInit, OnDestroy {
     clearCurrentProvider: ClearCurrentProvider,
   });
 
-  selectedTab = RegistryModerationTab.Submitted;
+  selectedTab = RegistryModerationTab.Pending;
 
   ngOnInit(): void {
     this.selectedTab = this.route.snapshot.firstChild?.data['tab'];

src/app/features/moderation/registry-moderation.routes.ts

@@ -20,7 +20,7 @@ export const registryModerationRoutes: Routes = [
       {
         path: '',
         pathMatch: 'full',
-        redirectTo: 'submitted',
+        redirectTo: 'pending',
       },
       {
         path: 'submitted',

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

@@ -66,6 +66,8 @@ <h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.contributors' | translate }
     [isCurrentUserAdminContributor]="isCurrentUserAdminContributor()"
     [currentUserId]="currentUser()?.id"
     [showCurator]="true"
+    [showInfo]="true"
+    [resourceType]="resourceType()"
     (remove)="removeContributor($event)"
   ></osf-contributors-table>
 

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

@@ -17,69 +17,31 @@
       <th>
         <div class="flex align-items-center">
           <span>{{ 'project.contributors.table.headers.permissions' | translate }}</span>
-          <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="permissionsTooltip" tooltipPosition="top"></i>
-          <ng-template #permissionsTooltip>
-            <div class="flex flex-column row-gap-3">
-              <h2>{{ 'project.contributors.permissionInfo.title' | translate }}</h2>
 
-              <div class="inside-list">
-                <p class="font-bold">{{ 'project.contributors.permissions.read' | translate }}</p>
-                <ul class="font-normal ml-4">
-                  <li>{{ 'project.contributors.permissionInfo.viewProjectContent' | translate }}</li>
-                </ul>
-              </div>
-
-              <div class="inside-list">
-                <p class="font-bold">{{ 'project.contributors.permissions.readAndWrite' | translate }}</p>
-                <ul class="font-normal ml-4">
-                  <li>{{ 'project.contributors.permissionInfo.read' | translate }}</li>
-                  <li>{{ 'project.contributors.permissionInfo.addComponents' | translate }}</li>
-                  <li>{{ 'project.contributors.permissionInfo.editContent' | translate }}</li>
-                </ul>
-              </div>
-
-              <div class="inside-list">
-                <p class="font-bold">{{ 'project.contributors.permissions.administrator' | translate }}</p>
-                <ul class="font-normal ml-4">
-                  <li>{{ 'project.contributors.permissionInfo.readWrite' | translate }}</li>
-                  <li>{{ 'project.contributors.permissionInfo.manageContributors' | translate }}</li>
-                  <li>{{ 'project.contributors.permissionInfo.deleteRegister' | translate }}</li>
-                  <li>{{ 'project.contributors.permissionInfo.publicPrivate' | translate }}</li>
-                </ul>
-              </div>
-            </div>
-          </ng-template>
+          @if (showInfo()) {
+            <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="permissionsTooltip" tooltipPosition="top"></i>
+          }
         </div>
       </th>
 
       <th>
         <div class="flex align-items-center justify-content-center">
           <span>{{ 'project.contributors.table.headers.contributor' | translate }}</span>
-          <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="contributorTooltip" tooltipPosition="top"></i>
-          <ng-template #contributorTooltip>
-            <div class="flex flex-column row-gap-3">
-              <h2>{{ 'project.contributors.bibliographicContributorInfo.heading' | translate }}</h2>
 
-              <span>
-                {{ 'project.contributors.bibliographicContributorInfo.description' | translate }}
-              </span>
-            </div>
-          </ng-template>
+          @if (showInfo()) {
+            <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="contributorTooltip" tooltipPosition="top"></i>
+          }
         </div>
       </th>
 
       @if (showCurator()) {
         <th>
           <div class="flex align-items-center justify-content-center">
             <span>{{ 'project.contributors.table.headers.curator' | translate }}</span>
-            <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="curatorTooltip" tooltipPosition="top"></i>
-            <ng-template #curatorTooltip>
-              <div class="flex flex-column row-gap-3">
-                <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
 
-                <span>{{ 'project.contributors.curatorInfo.description' | translate }}</span>
-              </div>
-            </ng-template>
+            @if (showInfo()) {
+              <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="curatorTooltip" tooltipPosition="top"></i>
+            }
           </div>
         </th>
       }
@@ -212,3 +174,96 @@ <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
     </tr>
   </ng-template>
 </p-table>
+
+<ng-template #permissionsTooltip>
+  <div class="flex flex-column row-gap-3">
+    <h2>{{ 'project.contributors.permissionInfo.title' | translate }}</h2>
+
+    <div class="inside-list">
+      <p class="font-bold">{{ 'project.contributors.permissions.read' | translate }}</p>
+      <ul class="font-normal ml-4">
+        <li>
+          {{
+            (isProject() ? 'project.contributors.permissionInfo.viewProjectContent' : 'viewRegistrationContent')
+              | translate
+          }}
+        </li>
+      </ul>
+    </div>
+
+    <div class="inside-list">
+      <p class="font-bold">{{ 'project.contributors.permissions.readAndWrite' | translate }}</p>
+      <ul class="font-normal ml-4">
+        <li>{{ 'project.contributors.permissionInfo.read' | translate }}</li>
+        <li>
+          {{
+            (isProject()
+              ? 'project.contributors.permissionInfo.addComponents'
+              : 'project.contributors.permissionInfo.editMetadata'
+            ) | translate
+          }}
+        </li>
+        <li>
+          {{
+            (isProject()
+              ? 'project.contributors.permissionInfo.editContent'
+              : 'project.contributors.permissionInfo.addResourcesLinks'
+            ) | translate
+          }}
+        </li>
+      </ul>
+    </div>
+
+    <div class="inside-list">
+      <p class="font-bold">{{ 'project.contributors.permissions.administrator' | translate }}</p>
+      <ul class="font-normal ml-4">
+        <li>{{ 'project.contributors.permissionInfo.readWrite' | translate }}</li>
+        <li>{{ 'project.contributors.permissionInfo.manageContributors' | translate }}</li>
+        <li>
+          {{
+            (isProject()
+              ? 'project.contributors.permissionInfo.deleteRegister'
+              : 'project.contributors.permissionInfo.withdrawRegistration'
+            ) | translate
+          }}
+        </li>
+        <li>
+          {{
+            (isProject()
+              ? 'project.contributors.permissionInfo.publicPrivate'
+              : 'project.contributors.permissionInfo.endEmbargoEarly'
+            ) | translate
+          }}
+        </li>
+      </ul>
+    </div>
+  </div>
+</ng-template>
+
+<ng-template #contributorTooltip>
+  <div class="flex flex-column row-gap-3">
+    <h2>{{ 'project.contributors.bibliographicContributorInfo.heading' | translate }}</h2>
+
+    <span>
+      {{
+        (isProject()
+          ? 'project.contributors.bibliographicContributorInfo.projectDescription'
+          : 'project.contributors.bibliographicContributorInfo.registrationDescription'
+        ) | translate
+      }}
+    </span>
+  </div>
+</ng-template>
+
+<ng-template #curatorTooltip>
+  <div class="flex flex-column row-gap-3">
+    <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
+
+    <span>{{
+      (isProject()
+        ? 'project.contributors.curatorInfo.projectDescription'
+        : 'project.contributors.curatorInfo.registrationDescription'
+      ) | translate
+    }}</span>
+  </div>
+</ng-template>

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

@@ -9,12 +9,11 @@ import { Tooltip } from 'primeng/tooltip';
 import { ChangeDetectionStrategy, Component, computed, inject, input, output, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
-import { ModeratorPermission } from '@osf/features/moderation/enums';
 import { EducationHistoryDialogComponent } from '@osf/shared/components/education-history-dialog/education-history-dialog.component';
 import { EmploymentHistoryDialogComponent } from '@osf/shared/components/employment-history-dialog/employment-history-dialog.component';
 import { SelectComponent } from '@osf/shared/components/select/select.component';
 import { DEFAULT_TABLE_PARAMS, PERMISSION_OPTIONS } from '@osf/shared/constants';
-import { ContributorPermission } from '@osf/shared/enums';
+import { ContributorPermission, ResourceType } from '@osf/shared/enums';
 import { ContributorModel, SelectOption, TableParameters } from '@osf/shared/models';
 import { CustomDialogService } from '@osf/shared/services';
 
@@ -31,10 +30,24 @@ export class ContributorsTableComponent {
   showCurator = input(false);
   showEducation = input(true);
   showEmployment = input(true);
+  showInfo = input(false);
+  resourceType = input(ResourceType.Project);
 
   currentUserId = input<string | undefined>(undefined);
   isCurrentUserAdminContributor = input<boolean>(true);
 
+  remove = output<ContributorModel>();
+
+  customDialogService = inject(CustomDialogService);
+
+  readonly tableParams = signal<TableParameters>({ ...DEFAULT_TABLE_PARAMS });
+  readonly permissionsOptions: SelectOption[] = PERMISSION_OPTIONS;
+  readonly ContributorPermission = ContributorPermission;
+
+  skeletonData: ContributorModel[] = Array.from({ length: 3 }, () => ({}) as ContributorModel);
+
+  isProject = computed(() => this.resourceType() === ResourceType.Project);
+
   canRemoveContributor = computed(() => {
     const contributors = this.contributors();
     const currentUserId = this.currentUserId();
@@ -53,17 +66,6 @@ export class ContributorsTableComponent {
     return result;
   });
 
-  remove = output<ContributorModel>();
-
-  customDialogService = inject(CustomDialogService);
-
-  readonly tableParams = signal<TableParameters>({ ...DEFAULT_TABLE_PARAMS });
-  readonly permissionsOptions: SelectOption[] = PERMISSION_OPTIONS;
-  readonly ModeratorPermission = ModeratorPermission;
-  readonly ContributorPermission = ContributorPermission;
-
-  skeletonData: ContributorModel[] = Array.from({ length: 3 }, () => ({}) as ContributorModel);
-
   removeContributor(contributor: ContributorModel) {
     this.remove.emit(contributor);
   }

src/app/shared/components/resource-metadata/resource-metadata.component.html

@@ -106,7 +106,7 @@ <h3>{{ 'project.overview.metadata.internetArchiveLink' | translate }}</h3>
     @if (!resource.isAnonymous) {
       <div class="flex flex-column gap-2">
         <h3>
-          {{ (isProject() ? 'project.overview.metadata.publication' : 'registry.overview.metadata.doi') | translate }}
+          {{ (isProject() ? 'project.overview.metadata.projectDOI' : 'registry.overview.metadata.doi') | translate }}
         </h3>
 
         @if (resource.identifiers?.length) {
@@ -118,7 +118,7 @@ <h3>
             }
           }
         } @else {
-          <p>{{ 'project.overview.metadata.noPublicationDoi' | translate }}</p>
+          <p>{{ 'project.overview.metadata.noProjectDoi' | translate }}</p>
         }
       </div>
     }