From 1bfdfd937571d82c90e6885e56c9464a80318cae Mon Sep 17 00:00:00 2001 From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:48:34 +0100 Subject: [PATCH] Move access intelligence feature under bitwarden_license (#12116) Co-authored-by: Daniel James Smith --- .../organizations/organization-routing.module.ts | 7 ------- .../organizations/organizations-routing.module.ts | 7 +++++++ .../access-intelligence-routing.module.ts | 0 .../access-intelligence/access-intelligence.module.ts | 0 .../all-applications.component.html | 0 .../access-intelligence/all-applications.component.ts | 7 +++---- .../access-intelligence/application-table.mock.ts | 0 .../critical-applications.component.html | 0 .../critical-applications.component.ts | 7 +++---- .../notified-members-table.component.html | 0 .../notified-members-table.component.ts | 0 .../password-health-members-uri.component.html | 0 .../password-health-members-uri.component.spec.ts | 6 ++---- .../password-health-members-uri.component.ts | 8 ++------ .../password-health-members.component.html | 0 .../password-health-members.component.ts | 10 +++------- .../password-health.component.html | 0 .../password-health.component.spec.ts | 6 ++---- .../access-intelligence/password-health.component.ts | 11 +++-------- .../access-intelligence/risk-insights.component.html | 0 .../access-intelligence/risk-insights.component.ts | 3 +-- 21 files changed, 26 insertions(+), 46 deletions(-) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/access-intelligence-routing.module.ts (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/access-intelligence.module.ts (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/all-applications.component.html (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/all-applications.component.ts (94%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/application-table.mock.ts (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/critical-applications.component.html (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/critical-applications.component.ts (90%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/notified-members-table.component.html (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/notified-members-table.component.ts (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health-members-uri.component.html (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts (93%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health-members-uri.component.ts (92%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health-members.component.html (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health-members.component.ts (92%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health.component.html (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health.component.spec.ts (93%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/password-health.component.ts (86%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/risk-insights.component.html (100%) rename {apps/web => bitwarden_license/bit-web}/src/app/tools/access-intelligence/risk-insights.component.ts (96%) diff --git a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts index a36b267e2f..538cc45ac6 100644 --- a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts @@ -62,13 +62,6 @@ const routes: Routes = [ (m) => m.OrganizationReportingModule, ), }, - { - path: "access-intelligence", - loadChildren: () => - import("../../tools/access-intelligence/access-intelligence.module").then( - (m) => m.AccessIntelligenceModule, - ), - }, { path: "billing", loadChildren: () => diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts index 8e5860833c..3a76b92ced 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts @@ -76,6 +76,13 @@ const routes: Routes = [ }, ], }, + { + path: "access-intelligence", + loadChildren: () => + import("../../tools/access-intelligence/access-intelligence.module").then( + (m) => m.AccessIntelligenceModule, + ), + }, ], }, ]; diff --git a/apps/web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts similarity index 100% rename from apps/web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts diff --git a/apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts similarity index 100% rename from apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts diff --git a/apps/web/src/app/tools/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html similarity index 100% rename from apps/web/src/app/tools/access-intelligence/all-applications.component.html rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html diff --git a/apps/web/src/app/tools/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts similarity index 94% rename from apps/web/src/app/tools/access-intelligence/all-applications.component.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts index 5d76403f46..c755aa7259 100644 --- a/apps/web/src/app/tools/access-intelligence/all-applications.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts @@ -21,10 +21,9 @@ import { ToastService, } from "@bitwarden/components"; import { CardComponent } from "@bitwarden/tools-card"; - -import { HeaderModule } from "../../layouts/header/header.module"; -import { SharedModule } from "../../shared"; -import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; +import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; +import { SharedModule } from "@bitwarden/web-vault/app/shared"; +import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module"; import { applicationTableMockData } from "./application-table.mock"; diff --git a/apps/web/src/app/tools/access-intelligence/application-table.mock.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/application-table.mock.ts similarity index 100% rename from apps/web/src/app/tools/access-intelligence/application-table.mock.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/application-table.mock.ts diff --git a/apps/web/src/app/tools/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.html similarity index 100% rename from apps/web/src/app/tools/access-intelligence/critical-applications.component.html rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.html diff --git a/apps/web/src/app/tools/access-intelligence/critical-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.ts similarity index 90% rename from apps/web/src/app/tools/access-intelligence/critical-applications.component.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.ts index 0779b2977e..43ff3d458b 100644 --- a/apps/web/src/app/tools/access-intelligence/critical-applications.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/critical-applications.component.ts @@ -7,10 +7,9 @@ import { debounceTime, map } from "rxjs"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { SearchModule, TableDataSource, NoItemsModule, Icons } from "@bitwarden/components"; import { CardComponent } from "@bitwarden/tools-card"; - -import { HeaderModule } from "../../layouts/header/header.module"; -import { SharedModule } from "../../shared"; -import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; +import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; +import { SharedModule } from "@bitwarden/web-vault/app/shared"; +import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module"; import { applicationTableMockData } from "./application-table.mock"; import { RiskInsightsTabType } from "./risk-insights.component"; diff --git a/apps/web/src/app/tools/access-intelligence/notified-members-table.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/notified-members-table.component.html similarity index 100% rename from apps/web/src/app/tools/access-intelligence/notified-members-table.component.html rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/notified-members-table.component.html diff --git a/apps/web/src/app/tools/access-intelligence/notified-members-table.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/notified-members-table.component.ts similarity index 100% rename from apps/web/src/app/tools/access-intelligence/notified-members-table.component.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/notified-members-table.component.ts diff --git a/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.html similarity index 100% rename from apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.html rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.html diff --git a/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts similarity index 93% rename from apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts index e3011604a4..1e9e4171bc 100644 --- a/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts @@ -3,7 +3,6 @@ import { ActivatedRoute, convertToParamMap } from "@angular/router"; import { mock, MockProxy } from "jest-mock-extended"; import { of } from "rxjs"; -// eslint-disable-next-line no-restricted-imports import { MemberCipherDetailsApiService, PasswordHealthService, @@ -15,9 +14,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { TableModule } from "@bitwarden/components"; - -import { LooseComponentsModule } from "../../shared"; -import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; +import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared"; +import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module"; import { PasswordHealthMembersURIComponent } from "./password-health-members-uri.component"; diff --git a/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.ts similarity index 92% rename from apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.ts index c8aea97ef7..ffc9a7911e 100644 --- a/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.ts @@ -5,7 +5,6 @@ import { ActivatedRoute } from "@angular/router"; import { map } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -// eslint-disable-next-line no-restricted-imports import { MemberCipherDetailsApiService, PasswordHealthService, @@ -24,11 +23,8 @@ import { TableDataSource, TableModule, } from "@bitwarden/components"; - -// eslint-disable-next-line no-restricted-imports -import { HeaderModule } from "../../layouts/header/header.module"; -// eslint-disable-next-line no-restricted-imports -import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; +import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; +import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module"; @Component({ standalone: true, diff --git a/apps/web/src/app/tools/access-intelligence/password-health-members.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members.component.html similarity index 100% rename from apps/web/src/app/tools/access-intelligence/password-health-members.component.html rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members.component.html diff --git a/apps/web/src/app/tools/access-intelligence/password-health-members.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members.component.ts similarity index 92% rename from apps/web/src/app/tools/access-intelligence/password-health-members.component.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members.component.ts index 66ff348e9f..19eded0de6 100644 --- a/apps/web/src/app/tools/access-intelligence/password-health-members.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members.component.ts @@ -4,7 +4,6 @@ import { FormControl, FormsModule } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; import { debounceTime, map } from "rxjs"; -// eslint-disable-next-line no-restricted-imports import { MemberCipherDetailsApiService, PasswordHealthService, @@ -21,12 +20,9 @@ import { TableModule, ToastService, } from "@bitwarden/components"; - -import { HeaderModule } from "../../layouts/header/header.module"; -// eslint-disable-next-line no-restricted-imports -import { SharedModule } from "../../shared"; -// eslint-disable-next-line no-restricted-imports -import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; +import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; +import { SharedModule } from "@bitwarden/web-vault/app/shared"; +import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module"; @Component({ standalone: true, diff --git a/apps/web/src/app/tools/access-intelligence/password-health.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.html similarity index 100% rename from apps/web/src/app/tools/access-intelligence/password-health.component.html rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.html diff --git a/apps/web/src/app/tools/access-intelligence/password-health.component.spec.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.spec.ts similarity index 93% rename from apps/web/src/app/tools/access-intelligence/password-health.component.spec.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.spec.ts index 5e934e3edf..98637d0dec 100644 --- a/apps/web/src/app/tools/access-intelligence/password-health.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.spec.ts @@ -3,7 +3,6 @@ import { ActivatedRoute, convertToParamMap } from "@angular/router"; import { mock } from "jest-mock-extended"; import { of } from "rxjs"; -// eslint-disable-next-line no-restricted-imports import { MemberCipherDetailsApiService, PasswordHealthService, @@ -15,9 +14,8 @@ import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/pass import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { TableModule } from "@bitwarden/components"; import { TableBodyDirective } from "@bitwarden/components/src/table/table.component"; - -import { LooseComponentsModule } from "../../shared"; -import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; +import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared"; +import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module"; import { PasswordHealthComponent } from "./password-health.component"; diff --git a/apps/web/src/app/tools/access-intelligence/password-health.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.ts similarity index 86% rename from apps/web/src/app/tools/access-intelligence/password-health.component.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.ts index 058cfb86da..8ae14562f3 100644 --- a/apps/web/src/app/tools/access-intelligence/password-health.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health.component.ts @@ -5,7 +5,6 @@ import { ActivatedRoute } from "@angular/router"; import { map } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -// eslint-disable-next-line no-restricted-imports import { MemberCipherDetailsApiService, PasswordHealthService, @@ -22,13 +21,9 @@ import { TableDataSource, TableModule, } from "@bitwarden/components"; - -// eslint-disable-next-line no-restricted-imports -import { HeaderModule } from "../../layouts/header/header.module"; -// eslint-disable-next-line no-restricted-imports -import { OrganizationBadgeModule } from "../../vault/individual-vault/organization-badge/organization-badge.module"; -// eslint-disable-next-line no-restricted-imports -import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; +import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; +import { OrganizationBadgeModule } from "@bitwarden/web-vault/app/vault/individual-vault/organization-badge/organization-badge.module"; +import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module"; @Component({ standalone: true, diff --git a/apps/web/src/app/tools/access-intelligence/risk-insights.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html similarity index 100% rename from apps/web/src/app/tools/access-intelligence/risk-insights.component.html rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html diff --git a/apps/web/src/app/tools/access-intelligence/risk-insights.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.ts similarity index 96% rename from apps/web/src/app/tools/access-intelligence/risk-insights.component.ts rename to bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.ts index 1c6a36b445..2308de2873 100644 --- a/apps/web/src/app/tools/access-intelligence/risk-insights.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.ts @@ -7,8 +7,7 @@ import { JslibModule } from "@bitwarden/angular/jslib.module"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { AsyncActionsModule, ButtonModule, TabsModule } from "@bitwarden/components"; - -import { HeaderModule } from "../../layouts/header/header.module"; +import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; import { AllApplicationsComponent } from "./all-applications.component"; import { CriticalApplicationsComponent } from "./critical-applications.component";