From 96bde49aa7a6c2d7adad597dd3f2766d11ee76ef Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Wed, 11 May 2022 13:27:25 +1000 Subject: [PATCH] Remove Organization prefix, remove unneeded imports --- .../organizations-routing.module.ts | 8 +++---- src/app/organizations/organizations.module.ts | 23 ++++++------------- ....component.html => billing.component.html} | 0 ...ling.component.ts => billing.component.ts} | 4 ++-- ...onent.html => subscription.component.html} | 0 ...component.ts => subscription.component.ts} | 4 ++-- 6 files changed, 15 insertions(+), 24 deletions(-) rename src/app/organizations/settings/{organization-billing.component.html => billing.component.html} (100%) rename src/app/organizations/settings/{organization-billing.component.ts => billing.component.ts} (97%) rename src/app/organizations/settings/{organization-subscription.component.html => subscription.component.html} (100%) rename src/app/organizations/settings/{organization-subscription.component.ts => subscription.component.ts} (98%) diff --git a/src/app/organizations/organizations-routing.module.ts b/src/app/organizations/organizations-routing.module.ts index cae00bec..1f6f64ea 100644 --- a/src/app/organizations/organizations-routing.module.ts +++ b/src/app/organizations/organizations-routing.module.ts @@ -14,9 +14,9 @@ import { PeopleComponent } from "./manage/people.component"; import { PoliciesComponent } from "./manage/policies.component"; import { NavigationPermissionsService } from "./services/navigation-permissions.service"; import { AccountComponent } from "./settings/account.component"; -import { OrganizationBillingComponent } from "./settings/organization-billing.component"; -import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component"; +import { BillingComponent } from "./settings/billing.component"; import { SettingsComponent } from "./settings/settings.component"; +import { SubscriptionComponent } from "./settings/subscription.component"; import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component"; import { ExportComponent } from "./tools/export.component"; import { ExposedPasswordsReportComponent } from "./tools/exposed-passwords-report.component"; @@ -200,13 +200,13 @@ const routes: Routes = [ }, { path: "billing", - component: OrganizationBillingComponent, + component: BillingComponent, canActivate: [PermissionsGuard], data: { titleId: "billing", permissions: [Permissions.ManageBilling] }, }, { path: "subscription", - component: OrganizationSubscriptionComponent, + component: SubscriptionComponent, data: { titleId: "subscription" }, }, ], diff --git a/src/app/organizations/organizations.module.ts b/src/app/organizations/organizations.module.ts index 91ce3c75..359de47c 100644 --- a/src/app/organizations/organizations.module.ts +++ b/src/app/organizations/organizations.module.ts @@ -2,9 +2,6 @@ import { NgModule } from "@angular/core"; import { PipesModule } from "../modules/pipes/pipes.module"; import { SharedModule } from "../modules/shared.module"; -import { VaultFilterModule } from "../modules/vault-filter/vault-filter.module"; -import { OrganizationBadgeModule } from "../modules/vault/modules/organization-badge/organization-badge.module"; - import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; import { OrganizationSwitcherComponent } from "./layouts/organization-switcher.component"; @@ -36,16 +33,16 @@ import { ResetPasswordPolicyComponent } from "./policies/reset-password.componen import { SendOptionsPolicyComponent } from "./policies/send-options.component"; import { SingleOrgPolicyComponent } from "./policies/single-org.component"; import { TwoFactorAuthenticationPolicyComponent } from "./policies/two-factor-authentication.component"; -import { AccountComponent as OrgAccountComponent } from "./settings/account.component"; +import { AccountComponent } from "./settings/account.component"; import { AdjustSubscription } from "./settings/adjust-subscription.component"; import { BillingSyncApiKeyComponent } from "./settings/billing-sync-api-key.component"; +import { BillingComponent } from "./settings/billing.component"; import { ChangePlanComponent } from "./settings/change-plan.component"; import { DeleteOrganizationComponent } from "./settings/delete-organization.component"; import { DownloadLicenseComponent } from "./settings/download-license.component"; import { ImageSubscriptionHiddenComponent } from "./settings/image-subscription-hidden.component"; -import { OrganizationBillingComponent } from "./settings/organization-billing.component"; -import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component"; import { SettingsComponent } from "./settings/settings.component"; +import { SubscriptionComponent } from "./settings/subscription.component"; import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component"; import { AcceptFamilySponsorshipComponent } from "./sponsorships/accept-family-sponsorship.component"; import { FamiliesForEnterpriseSetupComponent } from "./sponsorships/families-for-enterprise-setup.component"; @@ -59,16 +56,12 @@ import { UnsecuredWebsitesReportComponent } from "./tools/unsecured-websites-rep import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.component"; @NgModule({ - imports: [ - OrganizationsRoutingModule, - SharedModule, - VaultFilterModule, - OrganizationBadgeModule, - PipesModule, - ], + imports: [OrganizationsRoutingModule, SharedModule, PipesModule], declarations: [ AcceptFamilySponsorshipComponent, + AccountComponent, AdjustSubscription, + BillingComponent, BillingSyncApiKeyComponent, BulkConfirmComponent, BulkRemoveComponent, @@ -92,10 +85,7 @@ import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.comp ManageCollectionsComponent, ManageComponent, MasterPasswordPolicyComponent, - OrgAccountComponent, - OrganizationBillingComponent, OrganizationLayoutComponent, - OrganizationSubscriptionComponent, OrganizationSwitcherComponent, PasswordGeneratorPolicyComponent, PeopleComponent, @@ -109,6 +99,7 @@ import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.comp SendOptionsPolicyComponent, SettingsComponent, SingleOrgPolicyComponent, + SubscriptionComponent, ToolsComponent, TwoFactorAuthenticationPolicyComponent, TwoFactorSetupComponent, diff --git a/src/app/organizations/settings/organization-billing.component.html b/src/app/organizations/settings/billing.component.html similarity index 100% rename from src/app/organizations/settings/organization-billing.component.html rename to src/app/organizations/settings/billing.component.html diff --git a/src/app/organizations/settings/organization-billing.component.ts b/src/app/organizations/settings/billing.component.ts similarity index 97% rename from src/app/organizations/settings/organization-billing.component.ts rename to src/app/organizations/settings/billing.component.ts index 49ed6a0e..119b453d 100644 --- a/src/app/organizations/settings/organization-billing.component.ts +++ b/src/app/organizations/settings/billing.component.ts @@ -12,9 +12,9 @@ import { BillingResponse } from "jslib-common/models/response/billingResponse"; @Component({ selector: "app-org-billing", - templateUrl: "./organization-billing.component.html", + templateUrl: "./billing.component.html", }) -export class OrganizationBillingComponent implements OnInit { +export class BillingComponent implements OnInit { loading = false; firstLoaded = false; showAdjustPayment = false; diff --git a/src/app/organizations/settings/organization-subscription.component.html b/src/app/organizations/settings/subscription.component.html similarity index 100% rename from src/app/organizations/settings/organization-subscription.component.html rename to src/app/organizations/settings/subscription.component.html diff --git a/src/app/organizations/settings/organization-subscription.component.ts b/src/app/organizations/settings/subscription.component.ts similarity index 98% rename from src/app/organizations/settings/organization-subscription.component.ts rename to src/app/organizations/settings/subscription.component.ts index e829e820..2fd5ab84 100644 --- a/src/app/organizations/settings/organization-subscription.component.ts +++ b/src/app/organizations/settings/subscription.component.ts @@ -23,9 +23,9 @@ import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component"; @Component({ selector: "app-org-subscription", - templateUrl: "organization-subscription.component.html", + templateUrl: "subscription.component.html", }) -export class OrganizationSubscriptionComponent implements OnInit { +export class SubscriptionComponent implements OnInit { @ViewChild("setupBillingSyncTemplate", { read: ViewContainerRef, static: true }) setupBillingSyncModalRef: ViewContainerRef;