bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 06:13:38 +00:00
Code Issues Releases Wiki Activity

[PM-9951] Assign to Collection copy (#10205)

Browse Source 
* refactor "Assign collections" to "Assign to collections"

* show singular or plural version of collection assignment success message

* update singular and plural warning text

* refactor switch to be an `if`
This commit is contained in:
Nick Krantz
2024-07-23 21:21:39 -05:00
committed by GitHub
parent 26a3f6b8ec
commit 3093566f01
5 changed files with 89 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/vault/src/components/assign-collections.component.ts
View File

@@ -13,7 +13,6 @@ import {
} from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { PluralizePipe } from "@bitwarden/angular/pipes/pluralize.pipe";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -134,10 +133,18 @@ export class AssignCollectionsComponent implements OnInit {
);
protected transferWarningText = (orgName: string, itemsCount: number) => {
const pluralizedItems = this.pluralizePipe.transform(itemsCount, "item", "items");
return orgName
? this.i18nService.t("personalItemsWithOrgTransferWarning", pluralizedItems, orgName)
: this.i18nService.t("personalItemsTransferWarning", pluralizedItems);
const haveOrgName = !!orgName;
if (itemsCount > 1 && haveOrgName) {
return this.i18nService.t("personalItemsWithOrgTransferWarningPlural", itemsCount, orgName);
}
if (itemsCount > 1 && !haveOrgName) {
return this.i18nService.t("personalItemsTransferWarningPlural", itemsCount);
}
if (itemsCount === 1 && haveOrgName) {
return this.i18nService.t("personalItemWithOrgTransferWarningSingular", orgName);
}
return this.i18nService.t("personalItemTransferWarningSingular");
};
private editableItems: CipherView[] = [];
@@ -155,7 +162,6 @@ export class AssignCollectionsComponent implements OnInit {
private organizationService: OrganizationService,
private collectionService: CollectionService,
private formBuilder: FormBuilder,
private pluralizePipe: PluralizePipe,
private toastService: ToastService,
) {}
@@ -416,7 +422,7 @@ export class AssignCollectionsComponent implements OnInit {
variant: "success",
title: null,
message: this.i18nService.t(
"movedItemsToOrg",
shareableCiphers.length === 1 ? "itemMovedToOrg" : "itemsMovedToOrg",
this.orgName ?? this.i18nService.t("organization"),
),
});