vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

show family icon for free orgs in filter chips (#9532)

This commit is contained in:
Nick Krantz 2024-06-06 15:30:02 -05:00 committed by GitHub
parent a5591dc4bc
commit 3457941634
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
View File

@ -4,6 +4,7 @@ import { BehaviorSubject, skipWhile } from "rxjs";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ProductType } from "@bitwarden/common/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
@ -18,7 +19,7 @@ import { MY_VAULT_ID, VaultPopupListFiltersService } from "./vault-popup-list-fi
describe("VaultPopupListFiltersService", () => {
let service: VaultPopupListFiltersService;
const memberOrganizations$ = new BehaviorSubject<{ name: string; id: string }[]>([]);
const memberOrganizations$ = new BehaviorSubject<Organization[]>([]);
const folderViews$ = new BehaviorSubject([]);
const cipherViews$ = new BehaviorSubject({});
const decryptedCollections$ = new BehaviorSubject<CollectionView[]>([]);
@ -100,7 +101,8 @@ describe("VaultPopupListFiltersService", () => {
});
it('adds "myVault" to the list of organizations when there are other organizations', (done) => {
memberOrganizations$.next([{ name: "bobby's org", id: "1234-3323-23223" }]);
const orgs = [{ name: "bobby's org", id: "1234-3323-23223" }] as Organization[];
memberOrganizations$.next(orgs);
service.organizations$.subscribe((organizations) => {
expect(organizations.map((o) => o.label)).toEqual(["myVault", "bobby's org"]);
@ -109,10 +111,11 @@ describe("VaultPopupListFiltersService", () => {
});
it("sorts organizations by name", (done) => {
memberOrganizations$.next([
const orgs = [
{ name: "bobby's org", id: "1234-3323-23223" },
{ name: "alice's org", id: "2223-4343-99888" },
]);
] as Organization[];
memberOrganizations$.next(orgs);
service.organizations$.subscribe((organizations) => {
expect(organizations.map((o) => o.label)).toEqual([
@ -123,6 +126,65 @@ describe("VaultPopupListFiltersService", () => {
done();
});
});
describe("icons", () => {
it("sets family icon for family organizations", (done) => {
const orgs = [
{
name: "family org",
id: "1234-3323-23223",
enabled: true,
planProductType: ProductType.Families,
},
] as Organization[];
memberOrganizations$.next(orgs);
service.organizations$.subscribe((organizations) => {
expect(organizations.map((o) => o.icon)).toEqual(["bwi-user", "bwi-family"]);
done();
});
});
it("sets family icon for free organizations", (done) => {
const orgs = [
{
name: "free org",
id: "1234-3323-23223",
enabled: true,
planProductType: ProductType.Free,
},
] as Organization[];
memberOrganizations$.next(orgs);
service.organizations$.subscribe((organizations) => {
expect(organizations.map((o) => o.icon)).toEqual(["bwi-user", "bwi-family"]);
done();
});
});
it("sets warning icon for disabled organizations", (done) => {
const orgs = [
{
name: "free org",
id: "1234-3323-23223",
enabled: false,
planProductType: ProductType.Free,
},
] as Organization[];
memberOrganizations$.next(orgs);
service.organizations$.subscribe((organizations) => {
expect(organizations.map((o) => o.icon)).toEqual([
"bwi-user",
"bwi-exclamation-triangle tw-text-danger",
]);
done();
});
});
});
});
describe("collections$", () => {

7
apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
View File

@ -188,8 +188,11 @@ export class VaultPopupListFiltersService {
if (!org.enabled) {
// Show a warning icon if the organization is deactivated
icon = "bwi-exclamation-triangle tw-text-danger";
} else if (org.planProductType === ProductType.Families) {
// Show a family icon if the organization is a family org
} else if (
org.planProductType === ProductType.Families ||
org.planProductType === ProductType.Free
) {
// Show a family icon if the organization is a family or free org
icon = "bwi-family";
}