From 45c31aa089b643a7ed8cfd65315e05223f680d3d Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Tue, 18 May 2021 10:27:52 +0200
Subject: [PATCH] Bulk remove organization users (#970)

* Add support for bulk removal of org users

* Rename to UserBulkDeleteRequest

* Use OrganizationUserBulkRequest

* Bump jslib

* Fix linting
---
 jslib                                         |  2 +-
 src/app/app.module.ts                         |  4 +--
 .../manage/people.component.html              |  4 +++
 .../organizations/manage/people.component.ts  | 35 +++++++++++++++++--
 src/locales/en/messages.json                  |  6 ++++
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/jslib b/jslib
index 92dbf24a..6b9246c2 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 92dbf24ab895443d8f5bd404e749d4fd83f32207
+Subproject commit 6b9246c272fc74cd644bc4b94cb99f936c6f44f8
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9c03e58f..84bf6c95 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -191,17 +191,17 @@ import {
     DatePipe,
     registerLocaleData,
 } from '@angular/common';
+import localeBg from '@angular/common/locales/bg';
 import localeCa from '@angular/common/locales/ca';
 import localeCs from '@angular/common/locales/cs';
-import localeBg from '@angular/common/locales/bg';
 import localeDa from '@angular/common/locales/da';
 import localeDe from '@angular/common/locales/de';
 import localeEl from '@angular/common/locales/el';
 import localeEnGb from '@angular/common/locales/en-GB';
 import localeEnIn from '@angular/common/locales/en-IN';
+import localeEo from '@angular/common/locales/eo';
 import localeEs from '@angular/common/locales/es';
 import localeEt from '@angular/common/locales/et';
-import localeEo from '@angular/common/locales/eo';
 import localeFi from '@angular/common/locales/fi';
 import localeFr from '@angular/common/locales/fr';
 import localeHe from '@angular/common/locales/he';
diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html
index 72fbf90e..7abbe137 100644
--- a/src/app/organizations/manage/people.component.html
+++ b/src/app/organizations/manage/people.component.html
@@ -35,6 +35,10 @@
                     <i class="fa fa-fw fa-envelope-o" aria-hidden="true"></i>
                     {{'reinviteSelected' | i18n}}
                 </button>
+                <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
+                    <i class="fa fa-fw fa-remove" aria-hidden="true"></i>
+                    {{'remove' | i18n}}
+                </button>
                 <div class="dropdown-divider"></div>
                 <button class="dropdown-item" appStopClick (click)="selectAll(true)">
                     <i class="fa fa-fw fa-check-square-o" aria-hidden="true"></i>
diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts
index 5dabe40c..ae591bf3 100644
--- a/src/app/organizations/manage/people.component.ts
+++ b/src/app/organizations/manage/people.component.ts
@@ -25,7 +25,7 @@ import { UserService } from 'jslib/abstractions/user.service';
 
 import { OrganizationUserConfirmRequest } from 'jslib/models/request/organizationUserConfirmRequest';
 
-import { UserBulkReinviteRequest } from 'jslib/models/request/userBulkReinviteRequest';
+import { OrganizationUserBulkRequest } from 'jslib/models/request/organizationUserBulkRequest';
 import { OrganizationUserUserDetailsResponse } from 'jslib/models/response/organizationUserResponse';
 
 import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType';
@@ -260,6 +260,37 @@ export class PeopleComponent implements OnInit {
         this.actionPromise = null;
     }
 
+    async bulkRemove() {
+        if (this.actionPromise != null) {
+            return;
+        }
+
+        const users = this.getCheckedUsers();
+        if (users.length <= 0) {
+            this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'),
+                this.i18nService.t('noSelectedUsersApplicable'));
+            return;
+        }
+
+        const confirmed = await this.platformUtilsService.showDialog(
+            this.i18nService.t('removeSelectedUsersConfirmation'), this.i18nService.t('remove'),
+            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
+        if (!confirmed) {
+            return false;
+        }
+
+        const request = new OrganizationUserBulkRequest(users.map(user => user.id));
+        this.actionPromise = this.apiService.deleteManyOrganizationUsers(this.organizationId, request);
+        try {
+            await this.actionPromise;
+            this.toasterService.popAsync('success', null, this.i18nService.t('usersHasBeenRemoved'));
+            await this.load();
+        } catch (e) {
+            this.validationService.showError(e);
+        }
+        this.actionPromise = null;
+    }
+
     async bulkReinvite() {
         if (this.actionPromise != null) {
             return;
@@ -273,7 +304,7 @@ export class PeopleComponent implements OnInit {
             return;
         }
 
-        const request = new UserBulkReinviteRequest(users.map(user => user.id));
+        const request = new OrganizationUserBulkRequest(users.map(user => user.id));
         this.actionPromise = this.apiService.postManyOrganizationUserReinvite(this.organizationId, request);
         try {
             await this.actionPromise;
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 531dd283..5a33d087 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3905,5 +3905,11 @@
   },
   "usersHasBeenReinvited": {
     "message": "The selected users have been reinvited."
+  },
+  "removeSelectedUsersConfirmation": {
+    "message": "Are you sure you want to remove the selected users?"
+  },
+  "usersHasBeenRemoved": {
+    "message": "The selected users have been removed."
   }
 }