fix filterexposures component

Author: codemist

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/filterExposures.test.ts

@@ -3,10 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { it, expect } from "@jest/globals";
-import {
-  createRandomBreach,
-  createRandomScanResult,
-} from "../../../../../../../apiMocks/mockData";
+import { createRandomBreach } from "../../../../../../../apiMocks/mockData";
 import { filterExposures } from "./filterExposures";
 import { CONST_DAY_MILLISECONDS } from "../../../../../../../constants";
 jest.mock("../../../../../../hooks/useTelemetry");
@@ -30,33 +27,12 @@ const breachOld = createRandomBreach({
   addedDate: getDateDaysAgo(1000),
 });
 
-const scanResultThisWeek = createRandomScanResult({
-  fakerSeed: 1234,
-  createdDate: getDateDaysAgo(2),
-});
-const scanResultThisMonth = createRandomScanResult({
-  fakerSeed: 1234,
-  createdDate: getDateDaysAgo(10),
-});
-const scanResultThisYear = createRandomScanResult({
-  fakerSeed: 1234,
-  createdDate: getDateDaysAgo(100),
-});
-const scanResultOld = createRandomScanResult({
-  fakerSeed: 1234,
-  createdDate: getDateDaysAgo(1000),
-});
-
 it("doesn't filter out anything by default", () => {
   const exposures = [
     breachThisWeek,
-    scanResultThisWeek,
     breachThisMonth,
-    scanResultThisMonth,
     breachThisYear,
-    scanResultThisYear,
     breachOld,
-    scanResultOld,
   ];
 
   expect(
@@ -70,38 +46,25 @@ it("doesn't filter out anything by default", () => {
 it("can filter out breaches", () => {
   const exposures = [
     breachThisWeek,
-    scanResultThisWeek,
     breachThisMonth,
-    scanResultThisMonth,
     breachThisYear,
-    scanResultThisYear,
     breachOld,
-    scanResultOld,
   ];
 
   expect(
     filterExposures(exposures, {
       dateFound: "show-all-date-found",
       exposureType: "data-broker",
     }),
-  ).toStrictEqual([
-    scanResultThisWeek,
-    scanResultThisMonth,
-    scanResultThisYear,
-    scanResultOld,
-  ]);
+  ).toStrictEqual([]);
 });
 
 it("can filter out data brokers", () => {
   const exposures = [
     breachThisWeek,
-    scanResultThisWeek,
     breachThisMonth,
-    scanResultThisMonth,
     breachThisYear,
-    scanResultThisYear,
     breachOld,
-    scanResultOld,
   ];
 
   expect(
@@ -115,85 +78,57 @@ it("can filter out data brokers", () => {
 it("can filter out exposures older than a year", () => {
   const exposures = [
     breachThisWeek,
-    scanResultThisWeek,
     breachThisMonth,
-    scanResultThisMonth,
     breachThisYear,
-    scanResultThisYear,
     breachOld,
-    scanResultOld,
   ];
 
   expect(
     filterExposures(exposures, {
       dateFound: "last-year",
       exposureType: "show-all-exposure-type",
     }),
-  ).toStrictEqual([
-    breachThisWeek,
-    scanResultThisWeek,
-    breachThisMonth,
-    scanResultThisMonth,
-    breachThisYear,
-    scanResultThisYear,
-  ]);
+  ).toStrictEqual([breachThisWeek, breachThisMonth, breachThisYear]);
 });
 
 it("can filter out exposures older than a month", () => {
   const exposures = [
     breachThisWeek,
-    scanResultThisWeek,
     breachThisMonth,
-    scanResultThisMonth,
     breachThisYear,
-    scanResultThisYear,
     breachOld,
-    scanResultOld,
   ];
 
   expect(
     filterExposures(exposures, {
       dateFound: "thirty-days",
       exposureType: "show-all-exposure-type",
     }),
-  ).toStrictEqual([
-    breachThisWeek,
-    scanResultThisWeek,
-    breachThisMonth,
-    scanResultThisMonth,
-  ]);
+  ).toStrictEqual([breachThisWeek, breachThisMonth]);
 });
 
 it("can filter out exposures older than a week", () => {
   const exposures = [
     breachThisWeek,
-    scanResultThisWeek,
     breachThisMonth,
-    scanResultThisMonth,
     breachThisYear,
-    scanResultThisYear,
     breachOld,
-    scanResultOld,
   ];
 
   expect(
     filterExposures(exposures, {
       dateFound: "seven-days",
       exposureType: "show-all-exposure-type",
     }),
-  ).toStrictEqual([breachThisWeek, scanResultThisWeek]);
+  ).toStrictEqual([breachThisWeek]);
 });
 
 it("filters out anything that doesn't match *all* filters", () => {
   const exposures = [
     breachThisWeek,
-    scanResultThisWeek,
     breachThisMonth,
-    scanResultThisMonth,
     breachThisYear,
-    scanResultThisYear,
     breachOld,
-    scanResultOld,
   ];
 
   expect(

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/filterExposures.ts

@@ -2,28 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import {
-  Exposure,
-  isScanResult,
-} from "../../../../../../components/client/exposure_card/ExposureCard";
 import { FilterState } from "../../../../../../components/client/ExposuresFilter";
 import { CONST_DAY_MILLISECONDS } from "../../../../../../../constants";
+import { SubscriberBreach } from "../../../../../../../utils/subscriberBreaches";
 
 export function filterExposures(
-  exposures: Exposure[],
+  exposures: SubscriberBreach[],
   filters: FilterState,
-): Exposure[] {
+): SubscriberBreach[] {
   return exposures.filter((exposure) => {
-    if (filters.exposureType === "data-breach" && isScanResult(exposure)) {
-      return false;
-    }
-    if (filters.exposureType === "data-broker" && !isScanResult(exposure)) {
-      return false;
-    }
-
-    const exposureDate = isScanResult(exposure)
-      ? new Date(exposure.created_at)
-      : new Date(exposure.addedDate);
+    const exposureDate = new Date(exposure.addedDate);
 
     if (
       filters.dateFound === "seven-days" &&