bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-23 11:43:46 +00:00
Code Issues Releases Wiki Activity

[EC-331] User status terminology updates (revoked/restore) (#3135)

Browse Source
This commit is contained in:
Thomas Rittson
2022-07-20 11:41:27 +10:00
committed by GitHub
parent f07e071f09
commit 00ac22ba01
11 changed files with 81 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/web/src/app/common/base.people.component.ts
View File

@@ -204,15 +204,18 @@ export abstract class BasePeopleComponent<
this.edit(null);
}
async remove(user: UserType) {
const confirmed = await this.platformUtilsService.showDialog(
this.deleteWarningMessage(user),
protected async removeUserConfirmationDialog(user: UserType) {
return this.platformUtilsService.showDialog(
this.i18nService.t("removeUserConfirmation"),
this.userNamePipe.transform(user),
this.i18nService.t("yes"),
this.i18nService.t("no"),
"warning"
);
}
async remove(user: UserType) {
const confirmed = await this.removeUserConfirmationDialog(user);
if (!confirmed) {
return false;
}
@@ -235,8 +238,8 @@ export abstract class BasePeopleComponent<
async deactivate(user: UserType) {
const confirmed = await this.platformUtilsService.showDialog(
this.deactivateWarningMessage(),
this.i18nService.t("deactivateUserId", this.userNamePipe.transform(user)),
this.i18nService.t("deactivate"),
this.i18nService.t("revokeUserId", this.userNamePipe.transform(user)),
this.i18nService.t("revokeAccess"),
this.i18nService.t("cancel"),
"warning"
);
@@ -251,7 +254,7 @@ export abstract class BasePeopleComponent<
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("deactivatedUserId", this.userNamePipe.transform(user))
this.i18nService.t("revokedUserId", this.userNamePipe.transform(user))
);
await this.load();
} catch (e) {
@@ -261,25 +264,13 @@ export abstract class BasePeopleComponent<
}
async activate(user: UserType) {
const confirmed = await this.platformUtilsService.showDialog(
this.activateWarningMessage(),
this.i18nService.t("activateUserId", this.userNamePipe.transform(user)),
this.i18nService.t("activate"),
this.i18nService.t("cancel"),
"warning"
);
if (!confirmed) {
return false;
}
this.actionPromise = this.activateUser(user.id);
try {
await this.actionPromise;
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("activatedUserId", this.userNamePipe.transform(user))
this.i18nService.t("restoredUserId", this.userNamePipe.transform(user))
);
await this.load();
} catch (e) {
@@ -395,7 +386,7 @@ export abstract class BasePeopleComponent<
}
protected deactivateWarningMessage(): string {
return this.i18nService.t("deactivateUserConfirmation");
return this.i18nService.t("revokeUserConfirmation");
}
protected activateWarningMessage(): string {