From 5779df241721634ffbf78a4229272bab4eb15e01 Mon Sep 17 00:00:00 2001 From: Leslie Tilton <23057410+Banrion@users.noreply.github.com> Date: Mon, 24 Nov 2025 10:46:28 -0600 Subject: [PATCH] Correct phishing blocker file structure (#17477) --- .../{pages => popup}/phishing-warning.component.html | 0 .../{pages => popup}/phishing-warning.component.ts | 3 --- .../{pages => popup}/phishing-warning.stories.ts | 2 -- .../{pages => popup}/protected-by-component.html | 0 .../{pages => popup}/protected-by-component.ts | 2 -- apps/browser/src/popup/app-routing.module.ts | 4 ++-- 6 files changed, 2 insertions(+), 9 deletions(-) rename apps/browser/src/dirt/phishing-detection/{pages => popup}/phishing-warning.component.html (100%) rename apps/browser/src/dirt/phishing-detection/{pages => popup}/phishing-warning.component.ts (93%) rename apps/browser/src/dirt/phishing-detection/{pages => popup}/phishing-warning.stories.ts (97%) rename apps/browser/src/dirt/phishing-detection/{pages => popup}/protected-by-component.html (100%) rename apps/browser/src/dirt/phishing-detection/{pages => popup}/protected-by-component.ts (86%) diff --git a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.html b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.html similarity index 100% rename from apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.html rename to apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.html diff --git a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.ts b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.ts similarity index 93% rename from apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.ts rename to apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.ts index 589b880b206..d8e9895237c 100644 --- a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.ts +++ b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.ts @@ -1,8 +1,5 @@ -// eslint-disable-next-line no-restricted-imports import { CommonModule } from "@angular/common"; -// eslint-disable-next-line no-restricted-imports import { Component, inject } from "@angular/core"; -// eslint-disable-next-line no-restricted-imports import { ActivatedRoute, RouterModule } from "@angular/router"; import { firstValueFrom, map } from "rxjs"; diff --git a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.stories.ts b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.stories.ts similarity index 97% rename from apps/browser/src/dirt/phishing-detection/pages/phishing-warning.stories.ts rename to apps/browser/src/dirt/phishing-detection/popup/phishing-warning.stories.ts index e79543605c2..32b3c102c36 100644 --- a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.stories.ts +++ b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.stories.ts @@ -1,5 +1,3 @@ -// TODO: This needs to be dealt with by moving this folder or updating the lint rule. -/* eslint-disable no-restricted-imports */ import { ActivatedRoute, RouterModule } from "@angular/router"; import { Meta, StoryObj, moduleMetadata } from "@storybook/angular"; import { BehaviorSubject, of } from "rxjs"; diff --git a/apps/browser/src/dirt/phishing-detection/pages/protected-by-component.html b/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.html similarity index 100% rename from apps/browser/src/dirt/phishing-detection/pages/protected-by-component.html rename to apps/browser/src/dirt/phishing-detection/popup/protected-by-component.html diff --git a/apps/browser/src/dirt/phishing-detection/pages/protected-by-component.ts b/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.ts similarity index 86% rename from apps/browser/src/dirt/phishing-detection/pages/protected-by-component.ts rename to apps/browser/src/dirt/phishing-detection/popup/protected-by-component.ts index 71cdac89aa2..8da916af5e6 100644 --- a/apps/browser/src/dirt/phishing-detection/pages/protected-by-component.ts +++ b/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.ts @@ -1,6 +1,4 @@ -// eslint-disable-next-line no-restricted-imports import { CommonModule } from "@angular/common"; -// eslint-disable-next-line no-restricted-imports import { Component } from "@angular/core"; import { JslibModule } from "@bitwarden/angular/jslib.module"; diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 1834beb391e..a36396afa1a 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -56,8 +56,8 @@ import { BlockedDomainsComponent } from "../autofill/popup/settings/blocked-doma import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-domains.component"; import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component"; import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component"; -import { PhishingWarning } from "../dirt/phishing-detection/pages/phishing-warning.component"; -import { ProtectedByComponent } from "../dirt/phishing-detection/pages/protected-by-component"; +import { PhishingWarning } from "../dirt/phishing-detection/popup/phishing-warning.component"; +import { ProtectedByComponent } from "../dirt/phishing-detection/popup/protected-by-component"; import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component"; import BrowserPopupUtils from "../platform/browser/browser-popup-utils"; import { popupRouterCacheGuard } from "../platform/popup/view-cache/popup-router-cache.service";