From b0c5b5e9e6678c2ec7ffe837fa1cace5d0e1f7a0 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:38:10 -0800
Subject: [PATCH] [PM-14567] - fix routes. update copy and headers (#11908)

* fix routes. update copy and headers

* Patch build process

* Revert "Patch build process"

This reverts commit 4d3716d37534d5df78d42f2d7327ecc36d0c43f0.

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
Co-authored-by: Tom <144813356+ttalty@users.noreply.github.com>
---
 .../layouts/organization-layout.component.html   | 16 ++++++++++------
 .../layouts/organization-layout.component.ts     |  4 ++--
 .../organizations/organization-routing.module.ts |  6 +++---
 .../access-intelligence-routing.module.ts}       |  6 +++---
 .../access-intelligence.module.ts                |  9 +++++++++
 .../all-applications.component.html              |  0
 .../all-applications.component.ts                |  0
 .../application-table.mock.ts                    |  0
 .../critical-applications.component.html         |  0
 .../critical-applications.component.ts           |  0
 .../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 |  0
 .../password-health-members-uri.component.ts     |  0
 .../password-health-members.component.html       |  0
 .../password-health-members.component.ts         |  0
 .../password-health.component.html               |  0
 .../password-health.component.spec.ts            |  0
 .../password-health.component.ts                 |  0
 .../risk-insights.component.html                 | 11 +++++++----
 .../risk-insights.component.ts                   |  0
 .../tools/risk-insights/risk-insights.module.ts  |  9 ---------
 apps/web/src/locales/en/messages.json            |  7 +++++--
 24 files changed, 39 insertions(+), 29 deletions(-)
 rename apps/web/src/app/tools/{risk-insights/risk-insights-routing.module.ts => access-intelligence/access-intelligence-routing.module.ts} (89%)
 create mode 100644 apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/all-applications.component.html (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/all-applications.component.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/application-table.mock.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/critical-applications.component.html (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/critical-applications.component.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/notified-members-table.component.html (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/notified-members-table.component.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health-members-uri.component.html (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health-members-uri.component.spec.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health-members-uri.component.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health-members.component.html (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health-members.component.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health.component.html (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health.component.spec.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/password-health.component.ts (100%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/risk-insights.component.html (78%)
 rename apps/web/src/app/tools/{risk-insights => access-intelligence}/risk-insights.component.ts (100%)
 delete mode 100644 apps/web/src/app/tools/risk-insights/risk-insights.module.ts

diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
index 9cd94c5208..aaba492dff 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -2,7 +2,16 @@
   <app-side-nav variant="secondary" *ngIf="organization$ | async as organization">
     <bit-nav-logo [openIcon]="logo" route="." [label]="'adminConsole' | i18n"></bit-nav-logo>
     <org-switcher [filter]="orgFilter" [hideNewButton]="hideNewOrgButton$ | async"></org-switcher>
-
+    <bit-nav-group
+      icon="bwi-filter"
+      *ngIf="isAccessIntelligenceFeatureEnabled"
+      [text]="'accessIntelligence' | i18n"
+    >
+      <bit-nav-item
+        [text]="'riskInsights' | i18n"
+        route="access-intelligence/risk-insights"
+      ></bit-nav-item>
+    </bit-nav-group>
     <bit-nav-item
       icon="bwi-collection"
       [text]="'collections' | i18n"
@@ -39,11 +48,6 @@
         *ngIf="organization.canAccessReports"
       ></bit-nav-item>
     </bit-nav-group>
-    <bit-nav-item
-      *ngIf="isRiskInsightsFeatureEnabled"
-      [text]="'riskInsights' | i18n"
-      route="risk-insights"
-    ></bit-nav-item>
     <bit-nav-group
       icon="bwi-billing"
       [text]="'billing' | i18n"
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index c4ed44ab0c..522862cecb 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -51,7 +51,7 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
   showPaymentAndHistory$: Observable<boolean>;
   hideNewOrgButton$: Observable<boolean>;
   organizationIsUnmanaged$: Observable<boolean>;
-  isRiskInsightsFeatureEnabled = false;
+  isAccessIntelligenceFeatureEnabled = false;
 
   private _destroy = new Subject<void>();
 
@@ -67,7 +67,7 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
   async ngOnInit() {
     document.body.classList.remove("layout_frontend");
 
-    this.isRiskInsightsFeatureEnabled = await this.configService.getFeatureFlag(
+    this.isAccessIntelligenceFeatureEnabled = await this.configService.getFeatureFlag(
       FeatureFlag.AccessIntelligence,
     );
 
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 1725148d47..a36b267e2f 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
@@ -63,10 +63,10 @@ const routes: Routes = [
           ),
       },
       {
-        path: "risk-insights",
+        path: "access-intelligence",
         loadChildren: () =>
-          import("../../tools/risk-insights/risk-insights.module").then(
-            (m) => m.RiskInsightsModule,
+          import("../../tools/access-intelligence/access-intelligence.module").then(
+            (m) => m.AccessIntelligenceModule,
           ),
       },
       {
diff --git a/apps/web/src/app/tools/risk-insights/risk-insights-routing.module.ts b/apps/web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts
similarity index 89%
rename from apps/web/src/app/tools/risk-insights/risk-insights-routing.module.ts
rename to apps/web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts
index 19cc6f6832..c13cc0efae 100644
--- a/apps/web/src/app/tools/risk-insights/risk-insights-routing.module.ts
+++ b/apps/web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts
@@ -8,9 +8,9 @@ import { RiskInsightsComponent } from "./risk-insights.component";
 
 const routes: Routes = [
   {
-    path: "",
-    component: RiskInsightsComponent,
+    path: "risk-insights",
     canActivate: [canAccessFeature(FeatureFlag.AccessIntelligence)],
+    component: RiskInsightsComponent,
     data: {
       titleId: "RiskInsights",
     },
@@ -21,4 +21,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class RiskInsightsRoutingModule {}
+export class AccessIntelligenceRoutingModule {}
diff --git a/apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts b/apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts
new file mode 100644
index 0000000000..3f177119aa
--- /dev/null
+++ b/apps/web/src/app/tools/access-intelligence/access-intelligence.module.ts
@@ -0,0 +1,9 @@
+import { NgModule } from "@angular/core";
+
+import { AccessIntelligenceRoutingModule } from "./access-intelligence-routing.module";
+import { RiskInsightsComponent } from "./risk-insights.component";
+
+@NgModule({
+  imports: [RiskInsightsComponent, AccessIntelligenceRoutingModule],
+})
+export class AccessIntelligenceModule {}
diff --git a/apps/web/src/app/tools/risk-insights/all-applications.component.html b/apps/web/src/app/tools/access-intelligence/all-applications.component.html
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/all-applications.component.html
rename to apps/web/src/app/tools/access-intelligence/all-applications.component.html
diff --git a/apps/web/src/app/tools/risk-insights/all-applications.component.ts b/apps/web/src/app/tools/access-intelligence/all-applications.component.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/all-applications.component.ts
rename to apps/web/src/app/tools/access-intelligence/all-applications.component.ts
diff --git a/apps/web/src/app/tools/risk-insights/application-table.mock.ts b/apps/web/src/app/tools/access-intelligence/application-table.mock.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/application-table.mock.ts
rename to apps/web/src/app/tools/access-intelligence/application-table.mock.ts
diff --git a/apps/web/src/app/tools/risk-insights/critical-applications.component.html b/apps/web/src/app/tools/access-intelligence/critical-applications.component.html
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/critical-applications.component.html
rename to apps/web/src/app/tools/access-intelligence/critical-applications.component.html
diff --git a/apps/web/src/app/tools/risk-insights/critical-applications.component.ts b/apps/web/src/app/tools/access-intelligence/critical-applications.component.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/critical-applications.component.ts
rename to apps/web/src/app/tools/access-intelligence/critical-applications.component.ts
diff --git a/apps/web/src/app/tools/risk-insights/notified-members-table.component.html b/apps/web/src/app/tools/access-intelligence/notified-members-table.component.html
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/notified-members-table.component.html
rename to apps/web/src/app/tools/access-intelligence/notified-members-table.component.html
diff --git a/apps/web/src/app/tools/risk-insights/notified-members-table.component.ts b/apps/web/src/app/tools/access-intelligence/notified-members-table.component.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/notified-members-table.component.ts
rename to apps/web/src/app/tools/access-intelligence/notified-members-table.component.ts
diff --git a/apps/web/src/app/tools/risk-insights/password-health-members-uri.component.html b/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.html
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health-members-uri.component.html
rename to apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.html
diff --git a/apps/web/src/app/tools/risk-insights/password-health-members-uri.component.spec.ts b/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health-members-uri.component.spec.ts
rename to apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts
diff --git a/apps/web/src/app/tools/risk-insights/password-health-members-uri.component.ts b/apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health-members-uri.component.ts
rename to apps/web/src/app/tools/access-intelligence/password-health-members-uri.component.ts
diff --git a/apps/web/src/app/tools/risk-insights/password-health-members.component.html b/apps/web/src/app/tools/access-intelligence/password-health-members.component.html
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health-members.component.html
rename to apps/web/src/app/tools/access-intelligence/password-health-members.component.html
diff --git a/apps/web/src/app/tools/risk-insights/password-health-members.component.ts b/apps/web/src/app/tools/access-intelligence/password-health-members.component.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health-members.component.ts
rename to apps/web/src/app/tools/access-intelligence/password-health-members.component.ts
diff --git a/apps/web/src/app/tools/risk-insights/password-health.component.html b/apps/web/src/app/tools/access-intelligence/password-health.component.html
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health.component.html
rename to apps/web/src/app/tools/access-intelligence/password-health.component.html
diff --git a/apps/web/src/app/tools/risk-insights/password-health.component.spec.ts b/apps/web/src/app/tools/access-intelligence/password-health.component.spec.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health.component.spec.ts
rename to apps/web/src/app/tools/access-intelligence/password-health.component.spec.ts
diff --git a/apps/web/src/app/tools/risk-insights/password-health.component.ts b/apps/web/src/app/tools/access-intelligence/password-health.component.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/password-health.component.ts
rename to apps/web/src/app/tools/access-intelligence/password-health.component.ts
diff --git a/apps/web/src/app/tools/risk-insights/risk-insights.component.html b/apps/web/src/app/tools/access-intelligence/risk-insights.component.html
similarity index 78%
rename from apps/web/src/app/tools/risk-insights/risk-insights.component.html
rename to apps/web/src/app/tools/access-intelligence/risk-insights.component.html
index c2cd0cac70..067207160d 100644
--- a/apps/web/src/app/tools/risk-insights/risk-insights.component.html
+++ b/apps/web/src/app/tools/access-intelligence/risk-insights.component.html
@@ -1,7 +1,10 @@
-<div class="tw-mb-1 text-primary" bitTypography="body1">{{ "riskInsights" | i18n }}</div>
-<h1 bitTypography="h1">{{ "passwordRisk" | i18n }}</h1>
-<div class="tw-text-muted">{{ "discoverAtRiskPasswords" | i18n }}</div>
-<div class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-2 tw-my-4">
+<div class="tw-mb-1 text-primary" bitTypography="body1">{{ "accessIntelligence" | i18n }}</div>
+<h1 bitTypography="h1">{{ "riskInsights" | i18n }}</h1>
+<div class="tw-text-muted tw-max-w-4xl tw-mb-2">
+  {{ "reviewAtRiskPasswords" | i18n }}
+  &nbsp;<a class="text-primary" routerLink="/login">{{ "learnMore" | i18n }}</a>
+</div>
+<div *ngIf="apps.length" class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-2 tw-my-4">
   <i class="bwi bwi-exclamation-triangle bwi-lg tw-text-[1.2rem] text-muted" aria-hidden="true"></i>
   <span class="tw-mx-4">{{
     "dataLastUpdated" | i18n: (dataLastUpdated | date: "MMMM d, y 'at' h:mm a")
diff --git a/apps/web/src/app/tools/risk-insights/risk-insights.component.ts b/apps/web/src/app/tools/access-intelligence/risk-insights.component.ts
similarity index 100%
rename from apps/web/src/app/tools/risk-insights/risk-insights.component.ts
rename to apps/web/src/app/tools/access-intelligence/risk-insights.component.ts
diff --git a/apps/web/src/app/tools/risk-insights/risk-insights.module.ts b/apps/web/src/app/tools/risk-insights/risk-insights.module.ts
deleted file mode 100644
index 23d3cd8089..0000000000
--- a/apps/web/src/app/tools/risk-insights/risk-insights.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { RiskInsightsRoutingModule } from "./risk-insights-routing.module";
-import { RiskInsightsComponent } from "./risk-insights.component";
-
-@NgModule({
-  imports: [RiskInsightsComponent, RiskInsightsRoutingModule],
-})
-export class RiskInsightsModule {}
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 76cd45e149..cb0456bc03 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5,14 +5,17 @@
   "criticalApplications": {
     "message": "Critical applications"
   },
+  "accessIntelligence": {
+    "message": "Access Intelligence"
+  },
   "riskInsights": {
     "message": "Risk Insights"
   },
   "passwordRisk": {
     "message": "Password Risk"
   },
-  "discoverAtRiskPasswords": {
-    "message": "Discover at-risk passwords and notify users to change those passwords."
+  "reviewAtRiskPasswords": {
+    "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",