fix(request-access): updated request access

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

@@ -96,7 +96,7 @@ <h1 class="my-4">{{ 'project.requestAccess.requestForAccess' | translate }}</h1>
 
     <osf-request-access-table
       class="w-full"
-      [contributors]="requestAccessList()"
+      [requestAccessList]="requestAccessList()"
       [isLoading]="areRequestAccessListLoading()"
       [resourceType]="resourceType()"
       (accept)="acceptRequest($event)"

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

@@ -36,6 +36,7 @@ import { findChangedItems } from '@osf/shared/helpers';
 import {
   ContributorDialogAddModel,
   ContributorModel,
+  RequestAccessModel,
   SelectOption,
   TableParameters,
   ViewOnlyLinkJsonApi,
@@ -274,32 +275,32 @@ export class ContributorsComponent implements OnInit {
       });
   }
 
-  acceptRequest(contributor: ContributorModel) {
+  acceptRequest(requestAccessItem: RequestAccessModel) {
     this.customConfirmationService.confirmAccept({
       headerKey: 'project.requestAccess.acceptDialog.header',
       messageKey: 'project.requestAccess.acceptDialog.message',
-      messageParams: { name: contributor.fullName },
+      messageParams: { name: requestAccessItem.creator.fullName },
       acceptLabelKey: 'common.buttons.accept',
       onConfirm: () => {
-        const payload = { permissions: contributor.permission };
+        const payload = { permissions: requestAccessItem.requestedPermissions };
 
         this.actions
-          .acceptRequestAccess(contributor.id, this.resourceId(), this.resourceType(), payload)
+          .acceptRequestAccess(requestAccessItem.id, this.resourceId(), this.resourceType(), payload)
           .pipe(takeUntilDestroyed(this.destroyRef))
           .subscribe(() => this.toastService.showSuccess('project.requestAccess.acceptDialog.successMessage'));
       },
     });
   }
 
-  rejectRequest(contributor: ContributorModel) {
+  rejectRequest(requestAccessItem: RequestAccessModel) {
     this.customConfirmationService.confirmDelete({
       headerKey: 'project.requestAccess.rejectDialog.header',
       messageKey: 'project.requestAccess.rejectDialog.message',
-      messageParams: { name: contributor.fullName },
+      messageParams: { name: requestAccessItem.creator.fullName },
       acceptLabelKey: 'common.buttons.reject',
       onConfirm: () => {
         this.actions
-          .rejectRequestAccess(contributor.id, this.resourceId(), this.resourceType())
+          .rejectRequestAccess(requestAccessItem.id, this.resourceId(), this.resourceType())
           .pipe(takeUntilDestroyed(this.destroyRef))
           .subscribe(() => this.toastService.showSuccess('project.requestAccess.rejectDialog.successMessage'));
       },

src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.html

@@ -11,7 +11,7 @@
         <p class="mt-3">{{ 'project.overview.dialog.uncheckedComponents' | translate }}</p>
 
         <osf-components-selection-list
-          [components]="componentsList()"
+          [(components)]="componentsList"
           [disabledTooltip]="'project.overview.dialog.privacySettingsPermissionTooltip'"
         ></osf-components-selection-list>
       </div>

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

@@ -112,7 +112,7 @@
               binary="true"
               [(ngModel)]="contributor.isBibliographic"
               [ariaLabel]="'project.contributors.table.headers.contributor' | translate"
-              [disabled]="!hasAdminAccess() || contributor.deactivated"
+              [disabled]="!hasAdminAccess() || contributor.deactivated || contributor.isCurator"
             ></p-checkbox>
           </div>
         </td>

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

@@ -1,4 +1,4 @@
-<p-table [value]="isLoading() ? skeletonData : contributors()" [scrollable]="true" class="view-only-table">
+<p-table [value]="isLoading() ? skeletonData : requestAccessList()" [scrollable]="true" class="view-only-table">
   <ng-template #header>
     <tr>
       <th>{{ 'project.contributors.table.headers.name' | translate }}</th>
@@ -46,7 +46,7 @@
       <tr class="select-none">
         <td>
           <p class="flex align-items-center gap-2">
-            <span>{{ contributor.fullName }}</span>
+            <span>{{ contributor.creator.fullName }}</span>
           </p>
         </td>
         <td>
@@ -57,7 +57,7 @@
               [appendTo]="'body'"
               [noBorder]="true"
               [fullWidth]="true"
-              [(selectedValue)]="contributor.permission"
+              [(selectedValue)]="contributor.requestedPermissions"
             />
           </div>
         </td>
@@ -68,7 +68,7 @@
               binary="true"
               [(ngModel)]="contributor.isBibliographic"
               [ariaLabel]="'project.contributors.table.headers.contributor' | translate"
-              [disabled]="contributor.deactivated"
+              [disabled]="contributor.isCurator"
             ></p-checkbox>
           </div>
         </td>
@@ -85,7 +85,7 @@
         </td>
         @if (showEmployment()) {
           <td>
-            @if (contributor.employment?.length) {
+            @if (contributor.creator.employment?.length) {
               <p-button
                 link
                 class="link-btn-no-padding"
@@ -101,7 +101,7 @@
         @if (showEducation()) {
           <td>
             <div class="flex column-gap-2">
-              @if (contributor.education?.length) {
+              @if (contributor.creator.education?.length) {
                 <p-button
                   link
                   class="link-btn-no-padding"

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

@@ -11,7 +11,7 @@ import { FormsModule } from '@angular/forms';
 
 import { PERMISSION_OPTIONS } from '@osf/shared/constants';
 import { ResourceType } from '@osf/shared/enums';
-import { ContributorModel, SelectOption } from '@osf/shared/models';
+import { RequestAccessModel, SelectOption } from '@osf/shared/models';
 import { CustomDialogService } from '@osf/shared/services';
 
 import { EducationHistoryDialogComponent } from '../../education-history-dialog/education-history-dialog.component';
@@ -26,45 +26,45 @@ import { SelectComponent } from '../../select/select.component';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RequestAccessTableComponent {
-  contributors = input.required<ContributorModel[]>();
+  requestAccessList = input.required<RequestAccessModel[]>();
   isLoading = input(false);
   resourceType = input(ResourceType.Project);
   showEmployment = input(true);
   showEducation = input(true);
   showInfo = input(true);
 
-  accept = output<ContributorModel>();
-  reject = output<ContributorModel>();
+  accept = output<RequestAccessModel>();
+  reject = output<RequestAccessModel>();
 
   customDialogService = inject(CustomDialogService);
 
   readonly permissionsOptions: SelectOption[] = PERMISSION_OPTIONS;
 
-  skeletonData: ContributorModel[] = Array.from({ length: 3 }, () => ({}) as ContributorModel);
+  skeletonData = Array.from({ length: 3 }, () => ({}) as RequestAccessModel);
 
   isProject = computed(() => this.resourceType() === ResourceType.Project);
 
-  acceptContributor(contributor: ContributorModel) {
-    this.accept.emit(contributor);
+  acceptContributor(requestAccessItem: RequestAccessModel) {
+    this.accept.emit(requestAccessItem);
   }
 
-  rejectContributor(contributor: ContributorModel) {
-    this.reject.emit(contributor);
+  rejectContributor(requestAccessItem: RequestAccessModel) {
+    this.reject.emit(requestAccessItem);
   }
 
-  openEducationHistory(contributor: ContributorModel) {
+  openEducationHistory(requestAccessItem: RequestAccessModel) {
     this.customDialogService.open(EducationHistoryDialogComponent, {
       header: 'project.contributors.table.headers.education',
       width: '552px',
-      data: contributor.education,
+      data: requestAccessItem.creator.education,
     });
   }
 
-  openEmploymentHistory(contributor: ContributorModel) {
+  openEmploymentHistory(requestAccessItem: RequestAccessModel) {
     this.customDialogService.open(EmploymentHistoryDialogComponent, {
       header: 'project.contributors.table.headers.employment',
       width: '552px',
-      data: contributor.employment,
+      data: requestAccessItem.creator.employment,
     });
   }
 }

src/app/shared/enums/index.ts

@@ -27,6 +27,7 @@ export * from './registration-review-states.enum';
 export * from './registry-resource.enum';
 export * from './registry-status.enum';
 export * from './request-access-trigger.enum';
+export * from './request-access-type.enum';
 export * from './resource-search-mode.enum';
 export * from './resource-type.enum';
 export * from './reusable-filter-type.enum';

src/app/shared/enums/request-access-type.enum.ts

@@ -0,0 +1,4 @@
+export enum RequestAccessType {
+  InstitutionalRequest = 'institutional_request',
+  Access = 'access',
+}

src/app/shared/mappers/request-access/request-access.mapper.ts

@@ -1,10 +1,5 @@
-import { ContributorPermission, RequestAccessTrigger } from '@osf/shared/enums';
-import {
-  ContributorModel,
-  RequestAccessDataJsonApi,
-  RequestAccessModel,
-  RequestAccessPayload,
-} from '@osf/shared/models';
+import { ContributorPermission, RequestAccessTrigger, RequestAccessType } from '@osf/shared/enums';
+import { RequestAccessDataJsonApi, RequestAccessModel, RequestAccessPayload } from '@osf/shared/models';
 
 import { UserMapper } from '../user';
 
@@ -28,34 +23,10 @@ export class RequestAccessMapper {
       created: attributes.created,
       modified: attributes.modified,
       dateLastTransitioned: attributes.date_last_transitioned,
-      requestedPermissions: attributes.requested_permissions,
+      requestedPermissions: attributes.requested_permissions || ContributorPermission.Read,
       creator: UserMapper.fromUserGetResponse(data.embeds.creator.data),
-    };
-  }
-
-  static convertToContributorModels(data: RequestAccessDataJsonApi[]): ContributorModel[] {
-    return data.map((item, index) => this.convertToContributorModel(item, index));
-  }
-
-  static convertToContributorModel(data: RequestAccessDataJsonApi, index: number): ContributorModel {
-    const userData = data.embeds.creator.data;
-    const attributes = data.attributes;
-
-    return {
-      id: data.id,
-      type: data.type,
-      isBibliographic: true,
-      isUnregisteredContributor: false,
-      isCurator: false,
-      permission: attributes.requested_permissions || ContributorPermission.Read,
-      index: index,
-      userId: userData.id || '',
-      fullName: userData?.attributes?.full_name || '',
-      givenName: userData?.attributes?.given_name || '',
-      familyName: userData?.attributes?.family_name || '',
-      education: userData?.attributes?.education || [],
-      employment: userData?.attributes?.employment || [],
-      deactivated: false,
+      isBibliographic: attributes.request_type == RequestAccessType.Access,
+      isCurator: attributes.request_type === RequestAccessType.InstitutionalRequest,
     };
   }
 

src/app/shared/models/request-access/request-access.model.ts

@@ -1,3 +1,5 @@
+import { ContributorPermission } from '@osf/shared/enums';
+
 import { UserModel } from '../user';
 
 export interface RequestAccessModel {
@@ -8,6 +10,8 @@ export interface RequestAccessModel {
   created: string;
   modified: string;
   dateLastTransitioned: string;
-  requestedPermissions: string | null;
+  requestedPermissions: ContributorPermission;
   creator: UserModel;
+  isBibliographic: boolean;
+  isCurator: boolean;
 }

src/app/shared/services/request-access.service.ts

@@ -6,7 +6,7 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 import { RequestAccessTrigger, ResourceType } from '../enums';
 import { RequestAccessMapper } from '../mappers/request-access';
-import { ContributorModel, RequestAccessPayload, RequestAccessResponseJsonApi } from '../models';
+import { RequestAccessModel, RequestAccessPayload, RequestAccessResponseJsonApi } from '../models';
 
 import { JsonApiService } from './json-api.service';
 
@@ -34,13 +34,13 @@ export class RequestAccessService {
     return `${this.apiUrl}/${resourcePath}/${resourceId}/requests`;
   }
 
-  getRequestAccessList(resourceType: ResourceType, resourceId: string): Observable<ContributorModel[]> {
+  getRequestAccessList(resourceType: ResourceType, resourceId: string): Observable<RequestAccessModel[]> {
     const baseUrl = this.getBaseUrl(resourceType, resourceId);
     const params = { 'embed[]': ['creator'], 'filter[machine_state]': 'pending' };
 
     return this.jsonApiService
       .get<RequestAccessResponseJsonApi>(`${baseUrl}/`, params)
-      .pipe(map((response) => RequestAccessMapper.convertToContributorModels(response.data)));
+      .pipe(map((response) => RequestAccessMapper.getRequestAccessList(response.data)));
   }
 
   acceptRequestAccess(

src/app/shared/stores/contributors/contributors.model.ts

@@ -1,4 +1,4 @@
-import { ContributorAddModel, ContributorModel } from '@osf/shared/models';
+import { ContributorAddModel, ContributorModel, RequestAccessModel } from '@osf/shared/models';
 import { AsyncStateModel, AsyncStateWithTotalCount } from '@osf/shared/models/store';
 
 export interface ContributorsStateModel {
@@ -7,7 +7,7 @@ export interface ContributorsStateModel {
     permissionFilter: string | null;
     bibliographyFilter: boolean | null;
   };
-  requestAccessList: AsyncStateModel<ContributorModel[]>;
+  requestAccessList: AsyncStateModel<RequestAccessModel[]>;
   users: AsyncStateWithTotalCount<ContributorAddModel[]>;
 }