From 1f7c2e32b522db1d5d624f82e92c99cfa062f8c0 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Thu, 2 Jun 2022 14:06:54 +1000 Subject: [PATCH] Create PoliciesModule --- .../organizations-routing.module.ts | 2 +- src/app/organizations/organizations.module.ts | 25 ++------------- .../policies.component.html | 0 .../policies.component.ts | 5 +-- .../organizations/policies/policies.module.ts | 32 +++++++++++++++++++ 5 files changed, 39 insertions(+), 25 deletions(-) rename src/app/organizations/{manage => policies}/policies.component.html (100%) rename src/app/organizations/{manage => policies}/policies.component.ts (96%) create mode 100644 src/app/organizations/policies/policies.module.ts diff --git a/src/app/organizations/organizations-routing.module.ts b/src/app/organizations/organizations-routing.module.ts index 1f6f64ea..6a845efd 100644 --- a/src/app/organizations/organizations-routing.module.ts +++ b/src/app/organizations/organizations-routing.module.ts @@ -11,7 +11,7 @@ import { EventsComponent } from "./manage/events.component"; import { GroupsComponent } from "./manage/groups.component"; import { ManageComponent } from "./manage/manage.component"; import { PeopleComponent } from "./manage/people.component"; -import { PoliciesComponent } from "./manage/policies.component"; +import { PoliciesComponent } from "./policies/policies.component"; import { NavigationPermissionsService } from "./services/navigation-permissions.service"; import { AccountComponent } from "./settings/account.component"; import { BillingComponent } from "./settings/billing.component"; diff --git a/src/app/organizations/organizations.module.ts b/src/app/organizations/organizations.module.ts index cd210c7d..2d57f7cf 100644 --- a/src/app/organizations/organizations.module.ts +++ b/src/app/organizations/organizations.module.ts @@ -2,7 +2,6 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; import { LayoutsModule } from "../layouts/layouts.module"; -import { PipesModule } from "../modules/pipes/pipes.module"; import { SharedModule } from "../modules/shared.module"; import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; @@ -18,22 +17,13 @@ import { GroupAddEditComponent } from "./manage/group-add-edit.component"; import { GroupsComponent } from "./manage/groups.component"; import { ManageComponent } from "./manage/manage.component"; import { PeopleComponent } from "./manage/people.component"; -import { PoliciesComponent } from "./manage/policies.component"; import { PolicyEditComponent } from "./manage/policy-edit.component"; import { ResetPasswordComponent } from "./manage/reset-password.component"; import { UserAddEditComponent } from "./manage/user-add-edit.component"; import { UserConfirmComponent } from "./manage/user-confirm.component"; import { UserGroupsComponent } from "./manage/user-groups.component"; import { OrganizationsRoutingModule } from "./organizations-routing.module"; -import { DisableSendPolicyComponent } from "./policies/disable-send.component"; -import { MasterPasswordPolicyComponent } from "./policies/master-password.component"; -import { PasswordGeneratorPolicyComponent } from "./policies/password-generator.component"; -import { PersonalOwnershipPolicyComponent } from "./policies/personal-ownership.component"; -import { RequireSsoPolicyComponent } from "./policies/require-sso.component"; -import { ResetPasswordPolicyComponent } from "./policies/reset-password.component"; -import { SendOptionsPolicyComponent } from "./policies/send-options.component"; -import { SingleOrgPolicyComponent } from "./policies/single-org.component"; -import { TwoFactorAuthenticationPolicyComponent } from "./policies/two-factor-authentication.component"; +import { PoliciesModule } from "./policies/policies.module"; import { AccountComponent } from "./settings/account.component"; import { AdjustSubscription } from "./settings/adjust-subscription.component"; import { BillingSyncApiKeyComponent } from "./settings/billing-sync-api-key.component"; @@ -56,8 +46,9 @@ import { ToolsComponent } from "./tools/tools.component"; import { UnsecuredWebsitesReportComponent } from "./tools/unsecured-websites-report.component"; import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.component"; + @NgModule({ - imports: [CommonModule, OrganizationsRoutingModule, SharedModule, PipesModule, LayoutsModule], + imports: [CommonModule, OrganizationsRoutingModule, SharedModule, LayoutsModule, PoliciesModule], declarations: [ AcceptFamilySponsorshipComponent, AccountComponent, @@ -70,7 +61,6 @@ import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.comp ChangePlanComponent, CollectionAddEditComponent, DeleteOrganizationComponent, - DisableSendPolicyComponent, DownloadLicenseComponent, EntityEventsComponent, EventsComponent, @@ -84,24 +74,15 @@ import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.comp InactiveTwoFactorReportComponent, ManageCollectionsComponent, ManageComponent, - MasterPasswordPolicyComponent, OrganizationLayoutComponent, OrganizationSwitcherComponent, - PasswordGeneratorPolicyComponent, PeopleComponent, - PersonalOwnershipPolicyComponent, - PoliciesComponent, PolicyEditComponent, - RequireSsoPolicyComponent, ResetPasswordComponent, - ResetPasswordPolicyComponent, ReusedPasswordsReportComponent, - SendOptionsPolicyComponent, SettingsComponent, - SingleOrgPolicyComponent, SubscriptionComponent, ToolsComponent, - TwoFactorAuthenticationPolicyComponent, TwoFactorSetupComponent, UnsecuredWebsitesReportComponent, UserAddEditComponent, diff --git a/src/app/organizations/manage/policies.component.html b/src/app/organizations/policies/policies.component.html similarity index 100% rename from src/app/organizations/manage/policies.component.html rename to src/app/organizations/policies/policies.component.html diff --git a/src/app/organizations/manage/policies.component.ts b/src/app/organizations/policies/policies.component.ts similarity index 96% rename from src/app/organizations/manage/policies.component.ts rename to src/app/organizations/policies/policies.component.ts index f62c8bf2..ee0af146 100644 --- a/src/app/organizations/manage/policies.component.ts +++ b/src/app/organizations/policies/policies.component.ts @@ -10,9 +10,10 @@ import { Organization } from "jslib-common/models/domain/organization"; import { PolicyResponse } from "jslib-common/models/response/policyResponse"; import { PolicyListService } from "../../services/policy-list.service"; -import { BasePolicy } from "../policies/base-policy.component"; +import { PolicyEditComponent } from "../manage/policy-edit.component"; + +import { BasePolicy } from "./base-policy.component"; -import { PolicyEditComponent } from "./policy-edit.component"; @Component({ selector: "app-org-policies", diff --git a/src/app/organizations/policies/policies.module.ts b/src/app/organizations/policies/policies.module.ts new file mode 100644 index 00000000..ba56e38d --- /dev/null +++ b/src/app/organizations/policies/policies.module.ts @@ -0,0 +1,32 @@ +import { CommonModule } from "@angular/common"; +import { NgModule } from "@angular/core"; + +import { SharedModule } from "../../modules/shared.module"; + +import { DisableSendPolicyComponent } from "./disable-send.component"; +import { MasterPasswordPolicyComponent } from "./master-password.component"; +import { PasswordGeneratorPolicyComponent } from "./password-generator.component"; +import { PersonalOwnershipPolicyComponent } from "./personal-ownership.component"; +import { PoliciesComponent } from "./policies.component"; +import { RequireSsoPolicyComponent } from "./require-sso.component"; +import { ResetPasswordPolicyComponent } from "./reset-password.component"; +import { SendOptionsPolicyComponent } from "./send-options.component"; +import { SingleOrgPolicyComponent } from "./single-org.component"; +import { TwoFactorAuthenticationPolicyComponent } from "./two-factor-authentication.component"; + +@NgModule({ + imports: [CommonModule, SharedModule], + declarations: [ + DisableSendPolicyComponent, + MasterPasswordPolicyComponent, + PasswordGeneratorPolicyComponent, + PersonalOwnershipPolicyComponent, + RequireSsoPolicyComponent, + ResetPasswordPolicyComponent, + SendOptionsPolicyComponent, + SingleOrgPolicyComponent, + TwoFactorAuthenticationPolicyComponent, + PoliciesComponent, + ], +}) +export class PoliciesModule {}