fix for DSpace#2869 Difficult to find users to delete from group in l…

…arge groups
iam-vir-harshit · Aug 29, 2024 · ede4109 · ede4109
1 parent a6e3bc3
commit ede4109
Show file tree

Hide file tree

Showing 33 changed files with 442 additions and 0 deletions.
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -64,6 +64,7 @@ <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
                 <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
                 <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
                 <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.remove' | translate}}</th>
               </tr>
               </thead>
               <tbody>
@@ -76,6 +77,12 @@ <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
                   </a>
                 </td>
                 <td class="align-middle">{{ dsoNameService.getName(undefined) }}</td>
+                <td class="align-middle">
+                  <button (click)="deleteGroupFromMember(group)"
+                      [ngClass]="['btn btn-sm', 'btn-outline-danger']">
+                      <i class="fas fa-trash-alt fa-fw"></i>
+                  </button>
+                </td>
               </tr>
               </tbody>
             </table>

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -600,6 +600,38 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Deletes a given group from the Group list of the eperson currently being edited present in
+   * @param group  group we want to delete as of which the current eperson being edited is member of
+   */
+  deleteGroupFromMember(group: Group) {
+    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => {
+      if (activeEPerson != null) {
+        const response = this.groupsDataService.deleteMemberFromGroup(group, activeEPerson);
+        this.showNotifications('deleteMembership', response, this.dsoNameService.getName(group), activeEPerson);
+      } else {
+        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveEPerson'));
+      }
+    });
+  }
+
+  /**
+   * Shows a notification based on the success/failure of the request
+   * @param messageSuffix   Suffix for message
+   * @param response        RestResponse observable containing success/failure request
+   * @param nameObject      Object request was about
+   * @param activeEPerson   EPerson currently being edited
+   */
+  showNotifications(messageSuffix: string, response: Observable<RemoteData<any>>, nameObject: string, activeEPerson: EPerson) {
+    response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<any>) => {
+      if (rd.hasSucceeded) {
+        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.success.' + messageSuffix, { name: nameObject }));
+      } else {
+        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.' + messageSuffix, { name: nameObject }));
+      }
+    });
+  }
+
   /**
    * Cancel the current edit when component is destroyed & unsub all subscriptions
    */

diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -3,6 +3,23 @@ <h2 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h2>
 
   <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
+  <form [formGroup]="searchCurrentMembersForm" (ngSubmit)="searchMembers(searchCurrentMembersForm.value)" class="d-flex justify-content-between">
+    <div class="flex-grow-1 mr-3">
+      <div class="form-group input-group mr-3">
+        <input type="text" name="queryCurrentMembers" id="queryCurrentMembers" formControlName="queryCurrentMembers"
+               class="form-control" aria-label="Search input">
+        <span class="input-group-append">
+            <button type="submit" class="search-button btn btn-primary">
+              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
+        </span>
+      </div>
+    </div>
+    <div>
+      <button (click)="clearCurrentMembersFormAndResetResult()"
+              class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
+    </div>
+  </form>
+
   <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
                  [paginationOptions]="config"
                  [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"

diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -172,12 +172,21 @@ export class MembersListComponent implements OnInit, OnDestroy {
   // The search form
   searchForm;
 
+  // The current member search form
+  searchCurrentMembersForm;
+
   // Current search in edit group - epeople search form
   currentSearchQuery: string;
 
+  // Current search in edit group - epeople current members search form
+  currentMembersSearchQuery: string;
+
   // Whether or not user has done a EPeople search yet
   searchDone: boolean;
 
+  // Whether or not user has done a EPeople Member search yet
+  searchCurrentMembersDone: boolean;
+
   // current active group being edited
   groupBeingEdited: Group;
 
@@ -194,12 +203,18 @@ export class MembersListComponent implements OnInit, OnDestroy {
     public dsoNameService: DSONameService,
   ) {
     this.currentSearchQuery = '';
+    this.currentMembersSearchQuery = '';
   }
 
   ngOnInit(): void {
     this.searchForm = this.formBuilder.group(({
       query: '',
     }));
+
+    this.searchCurrentMembersForm = this.formBuilder.group(({
+      queryCurrentMembers: '',
+    }));
+
     this.subs.set(SubKey.ActiveGroup, this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
         this.groupBeingEdited = activeGroup;
@@ -354,6 +369,55 @@ export class MembersListComponent implements OnInit, OnDestroy {
         }));
   }
 
+  /**
+ * Search all EPeople who are a member of the current group by name, email or metadata
+ * @param data  Contains query param
+ */
+  searchMembers(data: any) {
+    this.unsubFrom(SubKey.Members);
+    this.subs.set(SubKey.Members,
+      this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
+        switchMap((paginationOptions) => {
+          const query: string = data.queryCurrentMembers;
+          if (query != null && this.currentMembersSearchQuery !== query && this.groupBeingEdited) {
+            this.currentMembersSearchQuery = query;
+            this.paginationService.resetPage(this.config.id);
+          }
+          this.searchCurrentMembersDone = true;
+
+          return this.ePersonDataService.searchMembers(this.currentMembersSearchQuery, this.groupBeingEdited.id, {
+            currentPage: paginationOptions.currentPage,
+            elementsPerPage: paginationOptions.pageSize,
+          }, false, true);
+        }),
+        getAllCompletedRemoteData(),
+        map((rd: RemoteData<any>) => {
+          if (rd.hasFailed) {
+            this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage }));
+          } else {
+            return rd;
+          }
+        }),
+        switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
+          const dtos$ = observableCombineLatest([...epersonListRD.payload.page.map((member: EPerson) => {
+            const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
+              this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
+                const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
+                epersonDtoModel.eperson = member;
+                epersonDtoModel.ableToDelete = isMember;
+                return epersonDtoModel;
+              });
+            return dto$;
+          })]);
+          return dtos$.pipe(defaultIfEmpty([]), map((dtos: EpersonDtoModel[]) => {
+            return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
+          }));
+        }),
+      ).subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
+        this.ePeopleMembersOfGroup.next(paginatedListOfDTOs);
+      }));
+  }
+
   /**
    * unsub all subscriptions
    */
@@ -391,4 +455,14 @@ export class MembersListComponent implements OnInit, OnDestroy {
     });
     this.search({ query: '' });
   }
+
+  /**
+   * Reset all input-fields to be empty and search all search
+   */
+  clearCurrentMembersFormAndResetResult() {
+    this.searchCurrentMembersForm.patchValue({
+      queryCurrentMembers:'',
+    });
+    this.searchMembers({queryCurrentMembers: ''});
+  }
 }
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
@@ -241,6 +241,34 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     return this.searchBy('isNotMemberOf', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+    /**
+   * Searches for all EPerons which are a member of a given group, via a passed in query
+   * (searches all EPerson metadata and by exact UUID).
+   * Endpoint used: /eperson/epesons/search/isMemberOf?query=<:string>&group=<:uuid>
+   * @param query                       search query param
+   * @param group                       UUID of group to include results from. Members of this group will only be returned.
+   * @param options
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   */
+    public searchMembers(query: string, group: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<PaginatedList<EPerson>>> {
+      const searchParams = [new RequestParam('query', query), new RequestParam('group', group)];
+      let findListOptions = new FindListOptions();
+      if (options) {
+        findListOptions = Object.assign(new FindListOptions(), options);
+      }
+      if (findListOptions.searchParams) {
+        findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
+      } else {
+        findListOptions.searchParams = searchParams;
+      }
+      return this.searchBy('isMemberOf', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    }
+
   /**
    * Add a new patch to the object cache
    * The patch is derived from the differences between the given object and its version in the object cache

diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
@@ -169,10 +169,14 @@
   "admin.access-control.epeople.form.notification.edited.failure": "فشل في تحرير الشخص الإلكتروني \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "تم حذف الشخص الإلكتروني \"{{name}}\"بنجاح",
   "admin.access-control.epeople.form.notification.deleted.failure": "فشل في حذف الهاتف الإلكتروني \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "لا يوجد شخص إلكتروني نشط حاليًا",
+  "admin.access-control.epeople.form.notification.success.deleteMembership": "العضوية المحذوفة من المجموعة: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.failure.deleteMembership": "لا يمكن حذف العضوية من المجموعة: \"{{name}}\"",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "عضو في هذه المجموعات:",
   "admin.access-control.epeople.form.table.id": "المعرّف",
   "admin.access-control.epeople.form.table.name": "الاسم",
   "admin.access-control.epeople.form.table.collectionOrCommunity": "الحاوية/المجتمع",
+  "admin.access-control.epeople.form.table.remove": "يزيل",
   "admin.access-control.epeople.form.memberOfNoGroups": "هذا الشخص الإلكتروني ليس عضواً في أي مجموعة",
   "admin.access-control.epeople.form.goToGroups": "إضافة إلى مجموعات",
   "admin.access-control.epeople.notification.deleted.failure": "حدث خطأ عند محاولة حذف الشخص الإلكتروني بالمعرف \"{{id}}\" بالرمز: \"{{statusCode}}\" والرسالة: \"{{restResponse.errorMessage}}\"",

diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
@@ -425,6 +425,15 @@
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "ই-পারসন মুছে ফেলতে ব্যর্থ হয়েছে \"{{ name }}\"।",
 
+  // "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "No current active eperson",
+  "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "বর্তমান সক্রিয় ব্যক্তি নেই",
+
+  // "admin.access-control.epeople.form.notification.success.deleteMembership": "Deleted Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.success.deleteMembership": "গ্রুপ থেকে সদস্যপদ মুছে ফেলা হয়েছে: \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.failure.deleteMembership": "Can't Delete Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.failure.deleteMembership": "গ্রুপ থেকে সদস্যপদ মুছে ফেলা যাবে না: \"{{name}}\"",
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "এই দলের সদস্য:",
 
@@ -437,6 +446,9 @@
   // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
   "admin.access-control.epeople.form.table.collectionOrCommunity": "সংগ্রহ / সম্প্রদায়",
 
+  // "admin.access-control.epeople.form.table.remove": "Remove",
+  "admin.access-control.epeople.form.table.remove": "সরান",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "এই ই-পারসন কোন দলের সদস্য নয়",
 

diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
@@ -454,6 +454,15 @@
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "No s'ha pogut esborrar l'usuari \"{{ name }}\"",
 
+  // "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "No current active eperson",
+  "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "No hi ha cap persona electrònica activa",
+
+  // "admin.access-control.epeople.form.notification.success.deleteMembership": "Deleted Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.success.deleteMembership": "Membre suprimit del grup: \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.failure.deleteMembership": "Can't Delete Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.failure.deleteMembership": "No es pot suprimir la pertinença del grup: \"{{name}}\"",
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membre d'aquests grups:",
 
@@ -466,6 +475,9 @@
   // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
   "admin.access-control.epeople.form.table.collectionOrCommunity": "Col·lecció/Comunitat",
 
+  // "admin.access-control.epeople.form.table.remove": "Remove",
+  "admin.access-control.epeople.form.table.remove": "Eliminar",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "Aquest usuari no és membre de cap grup",
 

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
@@ -530,6 +530,15 @@
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "Nepodařilo se smazat uživatele \"{{name}}\"",
 
+  // "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "No current active eperson",
+  "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "Žádný aktuální aktivní eperson",
+
+  // "admin.access-control.epeople.form.notification.success.deleteMembership": "Deleted Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.success.deleteMembership": "Smazané členství ze skupiny: \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.failure.deleteMembership": "Can't Delete Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.failure.deleteMembership": "Nelze smazat členství ze skupiny: \"{{name}}\"",
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Člen těchto skupin:",
 
@@ -542,6 +551,9 @@
   // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
   "admin.access-control.epeople.form.table.collectionOrCommunity": "Kolekce/Komunita",
 
+  // "admin.access-control.epeople.form.table.remove": "Remove",
+  "admin.access-control.epeople.form.table.remove": "Odstranit",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "Tento uživatel není členem žádné skupiny",
 

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
@@ -425,6 +425,15 @@
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "Die Person \"{{name}}\" konnte nicht gelöscht werden.",
 
+  // "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "No current active eperson",
+  "admin.access-control.epeople.form.notification.failure.noActiveEPerson": "Keine derzeit aktive E-Person",
+
+  // "admin.access-control.epeople.form.notification.success.deleteMembership": "Deleted Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.success.deleteMembership": "Gelöschte Mitgliedschaft aus Gruppe: \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.failure.deleteMembership": "Can't Delete Membership From Group: \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.failure.deleteMembership": "Die Mitgliedschaft aus der Gruppe \"{{name}}\" kann nicht gelöscht werden.",
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Mitglied dieser Gruppen:",
 
@@ -434,6 +443,9 @@
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Name",
 
+  // "admin.access-control.epeople.form.table.remove": "Remove",
+  "admin.access-control.epeople.form.table.remove": "Entfernen",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "Diese Person ist kein Mitglied einer Gruppe.",