fix(contributors): updated selected contributors in add dialog

Author: nsemets

src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts

@@ -163,13 +163,10 @@ export class ProjectContributorsStepComponent {
   }
 
   private openAddContributorDialog() {
-    const addedContributorIds = this.projectContributors().map((x) => x.userId);
-
     this.customDialogService
       .open(AddContributorDialogComponent, {
         header: 'project.contributors.addDialog.addRegisteredContributor',
         width: '448px',
-        data: addedContributorIds,
       })
       .onClose.pipe(
         filter((res: ContributorDialogAddModel) => !!res),

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

@@ -255,7 +255,6 @@ export class ContributorsComponent implements OnInit, OnDestroy {
   }
 
   openAddContributorDialog() {
-    const addedContributorIds = this.initialContributors().map((x) => x.userId);
     const rootParentId = this.resourceDetails().rootParentId ?? this.resourceId();
 
     this.loaderService.show();
@@ -273,7 +272,6 @@ export class ContributorsComponent implements OnInit, OnDestroy {
             header: 'project.contributors.addDialog.addRegisteredContributor',
             width: '448px',
             data: {
-              addedContributorIds,
               components,
               resourceName: this.resourceDetails().title,
             },

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

@@ -131,13 +131,10 @@ export class ContributorsDialogComponent implements OnInit {
   }
 
   openAddContributorDialog(): void {
-    const addedContributorIds = this.initialContributors().map((x) => x.userId);
-
     this.customDialogService
       .open(AddContributorDialogComponent, {
         header: 'project.contributors.addDialog.addRegisteredContributor',
         width: '448px',
-        data: addedContributorIds,
       })
       .onClose.pipe(
         filter((res: ContributorDialogAddModel) => !!res),

src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.html

@@ -39,7 +39,7 @@
       </p-accordion-header>
 
       <p-accordion-content>
-        <div class="flex align-items-center gap-1 p-3 pt-0 ml-3">
+        <div class="flex align-items-baseline gap-1 p-3 pt-0 ml-3">
           <p>{{ 'common.labels.contributors' | translate }}:</p>
 
           @if (submission().contributorsLoading) {

src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.ts

@@ -115,13 +115,10 @@ export class PreprintsContributorsComponent implements OnInit {
   }
 
   openAddContributorDialog() {
-    const addedContributorIds = this.initialContributors().map((x) => x.userId);
-
     this.customDialogService
       .open(AddContributorDialogComponent, {
         header: 'project.contributors.addDialog.addRegisteredContributor',
         width: '448px',
-        data: addedContributorIds,
       })
       .onClose.pipe(
         filter((res: ContributorDialogAddModel) => !!res),

src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.ts

@@ -132,13 +132,10 @@ export class RegistriesContributorsComponent implements OnInit, OnDestroy {
   }
 
   openAddContributorDialog() {
-    const addedContributorIds = this.initialContributors().map((x) => x.userId);
-
     this.customDialogService
       .open(AddContributorDialogComponent, {
         header: 'project.contributors.addDialog.addRegisteredContributor',
         width: '448px',
-        data: addedContributorIds,
       })
       .onClose.pipe(
         filter((res: ContributorDialogAddModel) => !!res),

src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html

@@ -11,7 +11,12 @@
       } @else {
         @for (item of users(); track $index) {
           <div class="border-divider flex pb-3">
-            <p-checkbox variant="filled" [value]="item" [(ngModel)]="selectedUsers"></p-checkbox>
+            <p-checkbox
+              variant="filled"
+              [value]="item"
+              [(ngModel)]="selectedUsers"
+              [disabled]="!!item.disabled"
+            ></p-checkbox>
             <a class="ml-2 font-bold" [href]="item.id" target="_blank">{{ item.fullName }}</a>
           </div>
         }

src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.ts

@@ -14,6 +14,7 @@ import {
   Component,
   computed,
   DestroyRef,
+  effect,
   inject,
   OnDestroy,
   OnInit,
@@ -82,6 +83,10 @@ export class AddContributorDialogComponent implements OnInit, OnDestroy {
   readonly hasComponents = computed(() => this.components().length > 0);
   readonly buttonLabel = computed(() => (this.isComponentsState() ? 'common.buttons.done' : 'common.buttons.next'));
 
+  constructor() {
+    this.setupEffects();
+  }
+
   ngOnInit(): void {
     this.initializeDialogData();
     this.setSearchSubscription();
@@ -145,8 +150,10 @@ export class AddContributorDialogComponent implements OnInit, OnDestroy {
       .filter((c) => c.checked && !c.isCurrent)
       .map((c) => c.id);
 
+    const filteredUsers = this.selectedUsers().filter((user) => !user.disabled);
+
     this.dialogRef.close({
-      data: this.selectedUsers(),
+      data: filteredUsers,
       type: AddContributorType.Registered,
       childNodeIds: childNodeIds.length > 0 ? childNodeIds : undefined,
     } as ContributorDialogAddModel);
@@ -174,4 +181,18 @@ export class AddContributorDialogComponent implements OnInit, OnDestroy {
     this.currentPage.set(1);
     this.first.set(0);
   }
+
+  private setupEffects(): void {
+    effect(() => {
+      const usersList = this.users();
+
+      if (usersList.length > 0) {
+        const checkedUsers = usersList.filter((user) => user.checked);
+
+        if (checkedUsers.length > 0) {
+          this.selectedUsers.set(checkedUsers);
+        }
+      }
+    });
+  }
 }

src/app/shared/models/contributors/contributor-add.model.ts

@@ -5,4 +5,6 @@ export interface ContributorAddModel {
   fullName?: string;
   email?: string;
   index?: number;
+  checked?: boolean;
+  disabled?: boolean;
 }

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

@@ -266,17 +266,21 @@ export class ContributorsState {
       users: { ...state.users, isLoading: true, error: null },
     });
 
-    const addedContributorsIds = state.contributorsList.data.map((contributor) => contributor.userId);
-
     if (!action.searchValue) {
       return of([]);
     }
 
     return this.contributorsService.searchUsers(action.searchValue, action.page).pipe(
       tap((users) => {
+        const addedContributorsIds = state.contributorsList.data.map((contributor) => contributor.userId);
+
         ctx.patchState({
           users: {
-            data: users.data.filter((user) => !addedContributorsIds.includes(user.id!)),
+            data: users.data.map((user) => ({
+              ...user,
+              checked: addedContributorsIds.includes(user.id!),
+              disabled: addedContributorsIds.includes(user.id!),
+            })),
             isLoading: false,
             error: '',
             totalCount: users.totalCount,
@@ -321,7 +325,7 @@ export class ContributorsState {
               isLoading: false,
               error: null,
               page: action.page,
-              pageSize: 10,
+              pageSize: res.pageSize,
               totalCount: res.totalCount,
             },
           });
@@ -337,18 +341,20 @@ export class ContributorsState {
   ) {
     const state = ctx.getState();
     const nextPage = state.bibliographicContributorsList.page + 1;
+    const nextPageSize = state.bibliographicContributorsList.pageSize;
 
-    return ctx.dispatch(new GetBibliographicContributors(action.resourceId, action.resourceType, nextPage, 10));
+    return ctx.dispatch(
+      new GetBibliographicContributors(action.resourceId, action.resourceType, nextPage, nextPageSize)
+    );
   }
 
   @Action(LoadMoreContributors)
   loadMoreContributors(ctx: StateContext<ContributorsStateModel>, action: LoadMoreContributors) {
     const state = ctx.getState();
     const nextPage = state.contributorsList.page + 1;
+    const nextPageSize = state.contributorsList.pageSize;
 
-    return ctx.dispatch(
-      new GetAllContributors(action.resourceId, action.resourceType, nextPage, state.contributorsList.pageSize)
-    );
+    return ctx.dispatch(new GetAllContributors(action.resourceId, action.resourceType, nextPage, nextPageSize));
   }
 
   @Action(ResetContributorsState)