bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-28 02:23:25 +00:00
Code Issues Releases Wiki Activity

[PM-8830] Billing Enums Rename (#9612)

Browse Source 
* Renamed ProductType to ProductTierType

* Renamed Product properties to ProductTier

* Moved product-tier-type.enum.ts to billing folder

* Added ProductType enum
This commit is contained in:
Conner Turnbull
2024-06-14 15:43:40 -04:00
committed by GitHub
parent e521d702ba
commit f484dd491b
31 changed files with 164 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/vault/popup/components/vault/vault-select.component.html
View File

@@ -57,12 +57,12 @@
>
<div class="vault-select-org-text-container">
<i
*ngIf="organization.planProductType !== 1"
*ngIf="organization.productTierType !== 1"
class="bwi bwi-fw bwi-business vault-select-prefix-icon"
aria-hidden="true"
></i>
<i
*ngIf="organization.planProductType === 1"
*ngIf="organization.productTierType === 1"
class="bwi bwi-fw bwi-family vault-select-prefix-icon"
aria-hidden="true"
></i>

4
apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
View File

@@ -5,7 +5,7 @@ import { BehaviorSubject } from "rxjs";
import { SearchService } from "@bitwarden/common/abstractions/search.service";
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 { ProductTierType } from "@bitwarden/common/billing/enums";
import { ObservableTracker } from "@bitwarden/common/spec";
import { CipherId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -78,7 +78,7 @@ describe("VaultPopupItemsService", () => {
mockOrg = {
id: "org1",
name: "Organization 1",
planProductType: ProductType.Enterprise,
productTierType: ProductTierType.Enterprise,
} as Organization;
mockCollections = [

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

@@ -6,7 +6,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ProductType } from "@bitwarden/common/enums";
import { ProductTierType } from "@bitwarden/common/billing/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";
@@ -206,7 +206,7 @@ describe("VaultPopupListFiltersService", () => {
name: "family org",
id: "1234-3323-23223",
enabled: true,
planProductType: ProductType.Families,
productTierType: ProductTierType.Families,
},
] as Organization[];
@@ -224,7 +224,7 @@ describe("VaultPopupListFiltersService", () => {
name: "free org",
id: "1234-3323-23223",
enabled: true,
planProductType: ProductType.Free,
productTierType: ProductTierType.Free,
},
] as Organization[];
@@ -242,7 +242,7 @@ describe("VaultPopupListFiltersService", () => {
name: "free org",
id: "1234-3323-23223",
enabled: false,
planProductType: ProductType.Free,
productTierType: ProductTierType.Free,
},
] as Organization[];

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

@@ -16,7 +16,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ProductType } from "@bitwarden/common/enums";
import { ProductTierType } from "@bitwarden/common/billing/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -216,8 +216,8 @@ export class VaultPopupListFiltersService {
// Show a warning icon if the organization is deactivated
icon = "bwi-exclamation-triangle tw-text-danger";
} else if (
org.planProductType === ProductType.Families ||
org.planProductType === ProductType.Free
org.productTierType === ProductTierType.Families ||
org.productTierType === ProductTierType.Free
) {
// Show a family icon if the organization is a family or free org
icon = "bwi-family";

14
apps/browser/src/vault/popup/views/popup-cipher.view.ts
View File

@@ -1,5 +1,5 @@
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ProductType } from "@bitwarden/common/enums";
import { ProductTierType } from "@bitwarden/common/billing/enums";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
@@ -26,13 +26,13 @@ export class PopupCipherView extends CipherView {
* Get the bwi icon for the cipher according to the organization type.
*/
get orgIcon(): "bwi-family" | "bwi-business" | null {
switch (this.organization?.planProductType) {
case ProductType.Free:
case ProductType.Families:
switch (this.organization?.productTierType) {
case ProductTierType.Free:
case ProductTierType.Families:
return "bwi-family";
case ProductType.Teams:
case ProductType.Enterprise:
case ProductType.TeamsStarter:
case ProductTierType.Teams:
case ProductTierType.Enterprise:
case ProductTierType.TeamsStarter:
return "bwi-business";
default:
return null;