From 968a255269cedc966044cf969ab4204d8d5afb58 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Mon, 17 May 2021 15:13:26 +0200 Subject: [PATCH] Correctly handle errors on remove and reinvite of organization users (#979) --- .../organizations/manage/people.component.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts index 7753af89..5dabe40c 100644 --- a/src/app/organizations/manage/people.component.ts +++ b/src/app/organizations/manage/people.component.ts @@ -234,20 +234,29 @@ export class PeopleComponent implements OnInit { return false; } + this.actionPromise = this.apiService.deleteOrganizationUser(this.organizationId, user.id); try { - await this.apiService.deleteOrganizationUser(this.organizationId, user.id); + await this.actionPromise; this.toasterService.popAsync('success', null, this.i18nService.t('removedUserId', user.name || user.email)); this.removeUser(user); - } catch { } + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; } async reinvite(user: OrganizationUserUserDetailsResponse) { if (this.actionPromise != null) { return; } + this.actionPromise = this.apiService.postOrganizationUserReinvite(this.organizationId, user.id); - await this.actionPromise; - this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenReinvited', user.name || user.email)); + try { + await this.actionPromise; + this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenReinvited', user.name || user.email)); + } catch (e) { + this.validationService.showError(e); + } this.actionPromise = null; }