bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2026-01-01 08:03:13 +00:00
Code Issues Releases Wiki Activity

Update warning when removing an account using key connector (#1307)

Browse Source
This commit is contained in:
Oscar Hinton
2021-11-19 15:13:55 +01:00
committed by GitHub
parent cd90949d27
commit 0ce00a15e7
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/common/base.people.component.ts
View File

@@ -180,7 +180,7 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
async remove(user: UserType) {
const confirmed = await this.platformUtilsService.showDialog(
this.i18nService.t('removeUserConfirmation'), this.userNamePipe.transform(user),
this.deleteWarningMessage(user), this.userNamePipe.transform(user),
this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
if (!confirmed) {
@@ -288,6 +288,10 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
return !searching && this.users && this.users.length > this.pageSize;
}
protected deleteWarningMessage(user: UserType): string {
return this.i18nService.t('removeUserConfirmation');
}
protected getCheckedUsers() {
return this.users.filter(u => (u as any).checked);
}

8
src/app/organizations/manage/people.component.ts
View File

@@ -291,6 +291,14 @@ export class PeopleComponent extends BasePeopleComponent<OrganizationUserUserDet
});
}
protected deleteWarningMessage(user: OrganizationUserUserDetailsResponse): string {
if (user.usesKeyConnector) {
return this.i18nService.t('removeUserConfirmationKeyConnector');
}
return super.deleteWarningMessage(user);
}
private async showBulkStatus(users: OrganizationUserUserDetailsResponse[], filteredUsers: OrganizationUserUserDetailsResponse[],
request: Promise<ListResponse<OrganizationUserBulkResponse>>, successfullMessage: string) {