chore(flags): remove EnableRemovalUnderMaintenanceStep flag

Author: kschelonka

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/fix/data-broker-profiles/removal-under-maintenance/page.tsx

@@ -4,89 +4,13 @@
 
 import { redirect } from "next/navigation";
 import { getServerSession } from "../../../../../../../../../functions/server/getServerSession";
-import {
-  getNextGuidedStep,
-  StepDeterminationData,
-} from "../../../../../../../../../functions/server/getRelevantGuidedSteps";
-import { getCountryCode } from "../../../../../../../../../functions/server/getCountryCode";
-import { headers } from "next/headers";
-import {
-  getMockedScanResults,
-  getMockedScanResultsWithBrokerUnderMaintenance,
-  getScanResultsWithBroker,
-  getScanResultsWithBrokerUnderMaintenance,
-} from "../../../../../../../../../../db/tables/onerep_scans";
-import { getOnerepProfileId } from "../../../../../../../../../../db/tables/subscribers";
-import { getSubscriberBreaches } from "../../../../../../../../../functions/server/getSubscriberBreaches";
-import { getSubscriberEmails } from "../../../../../../../../../functions/server/getSubscriberEmails";
-import { RemovalUnderMaintenanceView } from "./RemovalUnderMaintenanceView";
-import { hasPremium } from "../../../../../../../../../functions/universal/user";
-import { getEnabledFeatureFlags } from "../../../../../../../../../../db/tables/featureFlags";
 
 export default async function RemovalUnderMaintenance() {
   const session = await getServerSession();
-  const countryCode = getCountryCode(await headers());
 
   if (!session?.user?.subscriber?.id) {
     return redirect("/");
   }
 
-  const enabledFeatureFlags = await getEnabledFeatureFlags({
-    email: session.user.email,
-  });
-
-  if (
-    !hasPremium(session.user) ||
-    !enabledFeatureFlags.includes("EnableRemovalUnderMaintenanceStep")
-  ) {
-    redirect("/user/dashboard");
-  }
-
-  const profileId = await getOnerepProfileId(session.user.subscriber.id);
-  const useMockedScans =
-    enabledFeatureFlags.includes("CustomDataBrokers") &&
-    process.env.APP_ENV !== "production";
-
-  const scanResultsWithRemovalUnderMaintenance = useMockedScans
-    ? await getMockedScanResultsWithBrokerUnderMaintenance(profileId)
-    : await getScanResultsWithBrokerUnderMaintenance(profileId);
-
-  const scanResults = useMockedScans
-    ? await getMockedScanResults(profileId)
-    : // MNTOR-4893: Implement removal under maintenance?
-      await getScanResultsWithBroker(profileId, hasPremium(session.user));
-
-  const data: StepDeterminationData = {
-    countryCode,
-    user: session.user,
-    latestScanData: scanResults ?? null,
-    subscriberBreaches: await getSubscriberBreaches({
-      fxaUid: session.user.subscriber.fxa_uid,
-      countryCode,
-    }),
-  };
-
-  const getNextStep = getNextGuidedStep(
-    data,
-    enabledFeatureFlags,
-    "DataBrokerManualRemoval",
-  );
-
-  if (
-    scanResultsWithRemovalUnderMaintenance?.results.length === 0 ||
-    !scanResultsWithRemovalUnderMaintenance
-  ) {
-    redirect(getNextStep.href);
-  }
-
-  const subscriberEmails = await getSubscriberEmails(session.user);
-
-  return (
-    <RemovalUnderMaintenanceView
-      stepDeterminationData={data}
-      data={scanResultsWithRemovalUnderMaintenance}
-      subscriberEmails={subscriberEmails}
-      enabledFeatureFlags={enabledFeatureFlags}
-    />
-  );
+  redirect("/user/dashboard");
 }

src/app/components/client/FixNavigation.tsx

@@ -83,12 +83,7 @@ export const Steps = (props: {
       {label} {count > 0 && `(${count})`}
     </div>
   );
-  const dataBrokerStepCompleted =
-    hasCompletedStepSection(props.data, "Scan") &&
-    // TODO: MNTOR-3886 - Remove EnableRemovalUnderMaintenanceStep feature flag
-    /* c8 ignore next */
-    (!props.enabledFeatureFlags.includes("EnableRemovalUnderMaintenanceStep") ||
-      hasCompletedStepSection(props.data, "DataBrokerManualRemoval"));
+  const dataBrokerStepCompleted = hasCompletedStepSection(props.data, "Scan");
 
   return (
     <ul className={styles.steps}>

src/app/components/client/exposure_card/ExposureCard.stories.tsx

@@ -52,11 +52,6 @@ const ScanMockItemInProgress = createRandomScanResult({
   manually_resolved: false,
 });
 
-const ScanMockItemRemovalUnderMaintenance = createRandomScanResult({
-  status: "optout_in_progress",
-  manually_resolved: false,
-  broker_status: "removal_under_maintenance",
-});
 const ScanMockItemNoExposureData: OnerepScanResultDataBrokerRow = {
   id: 0,
   onerep_scan_result_id: 123,
@@ -82,21 +77,6 @@ const ScanMockItemNoExposureData: OnerepScanResultDataBrokerRow = {
   addresses: [],
 };
 
-const ScanMockItemRemovalUnderMaintenanceManuallyFixed = createRandomScanResult(
-  {
-    status: "optout_in_progress",
-    manually_resolved: true,
-    broker_status: "removal_under_maintenance",
-  },
-);
-
-const ScanMockItemRemovalUnderMaintenanceAutomaticallyRemoved =
-  createRandomScanResult({
-    status: "removed",
-    manually_resolved: false,
-    broker_status: "removal_under_maintenance",
-  });
-
 const BreachMockItemRemoved = createRandomBreach({
   isResolved: true,
   dataClassesEffected: [
@@ -161,33 +141,6 @@ export const DataBreachActionNeeded: Story = {
   },
 };
 
-export const DataBrokerRemovalUnderMaintenance: Story = {
-  args: {
-    exposureImg: FamilyTreeImage,
-    exposureData: ScanMockItemRemovalUnderMaintenance,
-    isPremiumUser: true,
-    enabledFeatureFlags: ["EnableRemovalUnderMaintenanceStep"],
-  },
-};
-
-export const DataBrokerRemovalUnderMaintenanceFixed: Story = {
-  args: {
-    exposureImg: FamilyTreeImage,
-    exposureData: ScanMockItemRemovalUnderMaintenanceManuallyFixed,
-    isPremiumUser: true,
-    enabledFeatureFlags: ["EnableRemovalUnderMaintenanceStep"],
-  },
-};
-
-export const DataBrokerRemovalUnderMaintenanceAutomaticallyRemoved: Story = {
-  args: {
-    exposureImg: FamilyTreeImage,
-    exposureData: ScanMockItemRemovalUnderMaintenanceAutomaticallyRemoved,
-    isPremiumUser: true,
-    enabledFeatureFlags: ["EnableRemovalUnderMaintenanceStep"],
-  },
-};
-
 export const DataBreachFixed: Story = {
   args: {
     exposureImg: TwitterImage,

src/app/components/client/exposure_card/ExposureCard.test.tsx

@@ -15,9 +15,6 @@ import Meta, {
   DataBrokerManualRemoved,
   DataBrokerRemoved,
   DataBrokerRequestedRemoval,
-  DataBrokerRemovalUnderMaintenance,
-  DataBrokerRemovalUnderMaintenanceFixed,
-  DataBrokerRemovalUnderMaintenanceAutomaticallyRemoved,
   DataBrokerActionNeededNoExposureResults,
 } from "./ExposureCard.stories";
 import { isDataBrokerUnderMaintenance } from "../../../(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View";
@@ -115,52 +112,6 @@ describe("ScanResultCard", () => {
     expect(innerDescription).toBeInTheDocument();
   });
 
-  // Data broker removal under maintenance unresolved
-  it("shows the right description for a scan result card with removal under maintenance status", () => {
-    const ComposedProgressCard = composeStory(
-      DataBrokerRemovalUnderMaintenance,
-      Meta,
-    );
-    render(<ComposedProgressCard />);
-    const innerDescription = screen.getByText(
-      "We’ve asked this data broker to remove your profile but they haven’t done it.",
-      { exact: false },
-    );
-
-    expect(innerDescription).toBeInTheDocument();
-  });
-
-  // Data broker removal under maintenance manually removed
-  it("shows the right description for a scan result card with removal under maintenance status that's been manually resolved", () => {
-    const ComposedProgressCard = composeStory(
-      DataBrokerRemovalUnderMaintenanceFixed,
-      Meta,
-    );
-    render(<ComposedProgressCard />);
-    const innerDescription = screen.getByText(
-      "You could be added back in the future, so ⁨Monitor⁩ will continue to scan data broker sites for new exposures.",
-      { exact: false },
-    );
-
-    expect(innerDescription).toBeInTheDocument();
-  });
-
-  // Data broker removal under maintenance automatically removed
-  it("shows the right description for a scan result card with removal under maintenance status that's been automatically resolved", () => {
-    const ComposedProgressCard = composeStory(
-      DataBrokerRemovalUnderMaintenanceAutomaticallyRemoved,
-      Meta,
-    );
-
-    render(<ComposedProgressCard />);
-    const innerDescription = screen.getByText(
-      "will continually monitor to make sure they don’t add you back",
-      { exact: false },
-    );
-
-    expect(innerDescription).toBeInTheDocument();
-  });
-
   // Data broker removal in progress
   it("shows the right description for a scan result card where removal is in progress", () => {
     const ComposedProgressCard = composeStory(DataBrokerInProgress, Meta);
@@ -173,20 +124,6 @@ describe("ScanResultCard", () => {
     expect(innerDescription).toBeInTheDocument();
   });
 
-  it("shows the right description for a scan result card where removal is under maintenance", () => {
-    const ComposedProgressCard = composeStory(
-      DataBrokerRemovalUnderMaintenance,
-      Meta,
-    );
-    render(<ComposedProgressCard />);
-    const innerDescription = screen.getByText(
-      "We’ve asked this data broker to remove your profile but they haven’t done it.",
-      { exact: false },
-    );
-
-    expect(innerDescription).toBeInTheDocument();
-  });
-
   it("shows an additional note for “requested removal” status label if the feature flag `DataBrokerRemovalAttempts` is enabled", () => {
     const ComposedProgressCard = composeStory(DataBrokerRequestedRemoval, Meta);
     render(<ComposedProgressCard />);

src/app/components/client/exposure_card/ScanResultCard.tsx

@@ -112,27 +112,6 @@ export const ScanResultCard = (props: ScanResultCardProps) => {
     // Data broker cards manually resolved do not change their status to "removed";
     // instead, we track them using the "manually_resolved" property.
 
-    if (
-      // TODO: MNTOR-3886 - Remove EnableRemovalUnderMaintenanceStep feature flag
-      props.enabledFeatureFlags.includes("EnableRemovalUnderMaintenanceStep") &&
-      isDataBrokerUnderMaintenance(props.scanResult)
-    ) {
-      if (scanResult.manually_resolved) {
-        return l10n.getFragment(
-          "exposure-card-description-info-for-sale-fixed-removal-under-maintenance-manually-fixed",
-          { elems: { data_broker_profile: dataBrokerProfileLink } },
-        );
-      }
-      return l10n.getFragment(
-        "exposure-card-description-info-for-sale-manual-removal-needed",
-        {
-          elems: {
-            b: <b />,
-          },
-        },
-      );
-    }
-
     if (scanResult.manually_resolved) {
       return l10n.getFragment(
         "exposure-card-description-info-for-sale-fixed-manually-fixed",
@@ -260,14 +239,6 @@ export const ScanResultCard = (props: ScanResultCardProps) => {
       );
     }
 
-    if (
-      // TODO: MNTOR-3886 - Remove EnableRemovalUnderMaintenanceStep feature flag
-      props.enabledFeatureFlags.includes("EnableRemovalUnderMaintenanceStep") &&
-      isDataBrokerUnderMaintenance(props.scanResult)
-    ) {
-      return <span>{props.resolutionCta}</span>;
-    }
-
     switch (props.scanResult.status) {
       case "new":
         return <span>{props.resolutionCta}</span>;

src/app/components/server/StatusPill.tsx

@@ -53,12 +53,7 @@ export const StatusPill = (props: Props) => {
               exposure: props.exposure,
               pillType,
               l10n,
-              // TODO: MNTOR-3886 - Remove EnableRemovalUnderMaintenanceStep feature flag
-              isDataBrokerUnderMaintenance: props.enabledFeatureFlags?.includes(
-                "EnableRemovalUnderMaintenanceStep",
-              )
-                ? props.isRemovalUnderMaintenance
-                : undefined,
+              isDataBrokerUnderMaintenance: undefined,
             })
           : getStatusLabel({
               pillType,
@@ -78,7 +73,6 @@ type StatusLabelProps = {
   exposure?: Exposure;
   pillType: string;
   l10n: ExtendedReactLocalization;
-  isDataBrokerUnderMaintenance?: boolean;
 };
 
 const getStatusLabel = (props: StatusLabelProps): string => {
@@ -91,10 +85,6 @@ const getStatusLabel = (props: StatusLabelProps): string => {
     return props.l10n.getString("status-pill-removed");
   }
 
-  if (props.isDataBrokerUnderMaintenance) {
-    return props.l10n.getString("status-pill-action-needed");
-  }
-
   switch (props.pillType) {
     case StatusPillTypeMap.RequestedRemoval:
       return props.l10n.getString("status-pill-requested-removal");
@@ -119,19 +109,11 @@ export const getExposureStatus = (
     const additionalRemovalStatusesEnabled = enabledFeatureFlags.includes(
       "AdditionalRemovalStatuses",
     );
-    // TODO: MNTOR-3886 - Remove EnableRemovalUnderMaintenanceStep feature flag
-    const manualRemovalEnabled = enabledFeatureFlags.includes(
-      "EnableRemovalUnderMaintenanceStep",
-    );
 
     if (exposure.manually_resolved) {
       return "fixed";
     }
 
-    if (manualRemovalEnabled && isRemovalUnderMaintenance) {
-      return "actionNeeded";
-    }
-
     switch (exposure.status) {
       case "removed":
         return "removed";