mirror of
https://github.com/bitwarden/browser
synced 2025-12-16 16:23:44 +00:00
Update warning when removing an account using key connector (#1307)
This commit is contained in:
2
jslib
2
jslib
Submodule jslib updated: 10fa164ffc...a3e00cdc15
@@ -180,7 +180,7 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
|
|||||||
|
|
||||||
async remove(user: UserType) {
|
async remove(user: UserType) {
|
||||||
const confirmed = await this.platformUtilsService.showDialog(
|
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');
|
this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
|
||||||
|
|
||||||
if (!confirmed) {
|
if (!confirmed) {
|
||||||
@@ -288,6 +288,10 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
|
|||||||
return !searching && this.users && this.users.length > this.pageSize;
|
return !searching && this.users && this.users.length > this.pageSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected deleteWarningMessage(user: UserType): string {
|
||||||
|
return this.i18nService.t('removeUserConfirmation');
|
||||||
|
}
|
||||||
|
|
||||||
protected getCheckedUsers() {
|
protected getCheckedUsers() {
|
||||||
return this.users.filter(u => (u as any).checked);
|
return this.users.filter(u => (u as any).checked);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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[],
|
private async showBulkStatus(users: OrganizationUserUserDetailsResponse[], filteredUsers: OrganizationUserUserDetailsResponse[],
|
||||||
request: Promise<ListResponse<OrganizationUserBulkResponse>>, successfullMessage: string) {
|
request: Promise<ListResponse<OrganizationUserBulkResponse>>, successfullMessage: string) {
|
||||||
|
|
||||||
|
|||||||
@@ -2176,6 +2176,9 @@
|
|||||||
"removeUserConfirmation": {
|
"removeUserConfirmation": {
|
||||||
"message": "Are you sure you want to remove this user?"
|
"message": "Are you sure you want to remove this user?"
|
||||||
},
|
},
|
||||||
|
"removeUserConfirmationKeyConnector": {
|
||||||
|
"message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
|
||||||
|
},
|
||||||
"externalId": {
|
"externalId": {
|
||||||
"message": "External Id"
|
"message": "External Id"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user