From 321aee1625eb667df0c7daf27c7aebae49971f0c Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Tue, 25 Oct 2022 12:53:35 +1000 Subject: [PATCH] [EC-620] Fix provider billing obfuscation image (#3830) * Use IconComponent for billing obfuscation image * Wrap CSS variable refs in rgb function --- .../image-subscription-hidden.component.ts | 8 ----- .../organization-subscription.component.html | 2 +- .../organization-subscription.component.ts | 3 ++ ...ponent.svg => subscription-hidden.icon.ts} | 34 +++++++++++-------- .../src/app/shared/loose-components.module.ts | 2 -- 5 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 apps/web/src/app/organizations/settings/image-subscription-hidden.component.ts rename apps/web/src/app/organizations/settings/{image-subscription-hidden.component.svg => subscription-hidden.icon.ts} (90%) diff --git a/apps/web/src/app/organizations/settings/image-subscription-hidden.component.ts b/apps/web/src/app/organizations/settings/image-subscription-hidden.component.ts deleted file mode 100644 index ff2a639e39..0000000000 --- a/apps/web/src/app/organizations/settings/image-subscription-hidden.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from "@angular/core"; - -// Component is used so that the SVG can embed CSS color variables -@Component({ - selector: "app-image-org-subscription-hidden", - templateUrl: "image-subscription-hidden.component.svg", -}) -export class ImageSubscriptionHiddenComponent {} diff --git a/apps/web/src/app/organizations/settings/organization-subscription.component.html b/apps/web/src/app/organizations/settings/organization-subscription.component.html index e54aa47018..2b5f50a8b6 100644 --- a/apps/web/src/app/organizations/settings/organization-subscription.component.html +++ b/apps/web/src/app/organizations/settings/organization-subscription.component.html @@ -18,7 +18,7 @@
- +

{{ "billingManagedByProvider" | i18n: this.userOrg.providerName }}

{{ "billingContactProviderForAssistance" | i18n }}

diff --git a/apps/web/src/app/organizations/settings/organization-subscription.component.ts b/apps/web/src/app/organizations/settings/organization-subscription.component.ts index fe29a38a96..dbcdfd907a 100644 --- a/apps/web/src/app/organizations/settings/organization-subscription.component.ts +++ b/apps/web/src/app/organizations/settings/organization-subscription.component.ts @@ -21,6 +21,7 @@ import { OrganizationSubscriptionResponse } from "@bitwarden/common/models/respo import { BillingSyncKeyComponent } from "../../settings/billing-sync-key.component"; import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component"; +import { SubscriptionHiddenIcon } from "./subscription-hidden.icon"; @Component({ selector: "app-org-subscription", @@ -58,6 +59,8 @@ export class OrganizationSubscriptionComponent implements OnInit { billingSyncKeyViewContainerRef: ViewContainerRef; billingSyncKeyRef: [ModalRef, BillingSyncKeyComponent]; + subscriptionHiddenIcon = SubscriptionHiddenIcon; + constructor( private apiService: ApiService, private platformUtilsService: PlatformUtilsService, diff --git a/apps/web/src/app/organizations/settings/image-subscription-hidden.component.svg b/apps/web/src/app/organizations/settings/subscription-hidden.icon.ts similarity index 90% rename from apps/web/src/app/organizations/settings/image-subscription-hidden.component.svg rename to apps/web/src/app/organizations/settings/subscription-hidden.icon.ts index a45a3decce..3745747ece 100644 --- a/apps/web/src/app/organizations/settings/image-subscription-hidden.component.svg +++ b/apps/web/src/app/organizations/settings/subscription-hidden.icon.ts @@ -1,20 +1,24 @@ +import { svgIcon } from "@bitwarden/components"; + +export const SubscriptionHiddenIcon = svgIcon` - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + +`; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index c68741b5a2..a8a01714ac 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -63,7 +63,6 @@ import { BillingSyncApiKeyComponent } from "../organizations/settings/billing-sy import { ChangePlanComponent } from "../organizations/settings/change-plan.component"; import { DeleteOrganizationComponent } from "../organizations/settings/delete-organization.component"; import { DownloadLicenseComponent } from "../organizations/settings/download-license.component"; -import { ImageSubscriptionHiddenComponent as OrgSubscriptionHiddenComponent } from "../organizations/settings/image-subscription-hidden.component"; import { OrganizationBillingComponent } from "../organizations/settings/organization-billing.component"; import { OrganizationSubscriptionComponent } from "../organizations/settings/organization-subscription.component"; import { SettingsComponent as OrgSettingComponent } from "../organizations/settings/settings.component"; @@ -242,7 +241,6 @@ import { SharedModule } from "."; OrgSettingComponent, OrgToolsComponent, OrgTwoFactorSetupComponent, - OrgSubscriptionHiddenComponent, OrgUnsecuredWebsitesReportComponent, OrgUserAddEditComponent, OrgUserConfirmComponent,