Merge branch 'main' into mntor-3825

mozilla · Dec 20, 2024 · a0503a8 · a0503a8
2 parents 6c396f7 + 2bd45be
commit a0503a8
Show file tree

Hide file tree

Showing 41 changed files with 851 additions and 785 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,8 +70,8 @@
     "npm": "10.1.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.705.0",
-    "@aws-sdk/lib-storage": "^3.705.0",
+    "@aws-sdk/client-s3": "^3.716.0",
+    "@aws-sdk/lib-storage": "^3.716.0",
     "@fluent/bundle": "^0.18.0",
     "@fluent/langneg": "^0.7.0",
     "@fluent/react": "^0.15.2",
@@ -86,7 +86,7 @@
     "@sentry/utils": "^8.42.0",
     "@stripe/stripe-js": "^5.2.0",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.10.2",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "canvas-confetti": "^1.9.3",
@@ -99,7 +99,7 @@
     "knex": "^3.1.0",
     "mjml": "^4.15.3",
     "next": "^14.2.15",
-    "next-auth": "^4.24.10",
+    "next-auth": "^4.24.11",
     "nodemailer": "^6.9.16",
     "pg": "^8.13.1",
     "react": "^18.3.1",

diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/page.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/page.tsx
@@ -68,7 +68,7 @@ export default async function FeatureFlagPage() {
             lastScanDate={null}
             // We're not going to run experiments on the feature flag page (it's
             // not user-visible), so no need to fetch experiment data:
-            experimentData={defaultExperimentData}
+            experimentData={defaultExperimentData["Features"]}
           />
         </div>
       </nav>

diff --git a/...proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/Dashboard.stories.tsx b/...proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/Dashboard.stories.tsx
@@ -56,7 +56,7 @@ export type DashboardWrapperProps = (
   totalNumberOfPerformedScans?: number;
   activeTab?: TabType;
   enabledFeatureFlags?: FeatureFlagName[];
-  experimentData?: ExperimentData;
+  experimentData?: ExperimentData["Features"];
   hasFirstMonitoringScan?: boolean;
   signInCount?: number;
   autoOpenUpsellDialog?: boolean;
@@ -227,7 +227,7 @@ const DashboardWrapper = (props: DashboardWrapperProps) => {
             enabledFeatureFlags={props.enabledFeatureFlags ?? []}
             experimentData={
               props.experimentData ?? {
-                ...defaultExperimentData,
+                ...defaultExperimentData["Features"],
                 "last-scan-date": {
                   enabled: true,
                 },

diff --git a/...p/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/Dashboard.test.tsx b/...p/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/Dashboard.test.tsx
@@ -3487,7 +3487,7 @@ describe("CSAT survey banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: false,
           },
@@ -3515,7 +3515,7 @@ describe("CSAT survey banner", () => {
         activeTab="action-needed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: false,
           },
@@ -3539,7 +3539,7 @@ describe("CSAT survey banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3564,7 +3564,7 @@ describe("CSAT survey banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3595,7 +3595,7 @@ describe("CSAT survey banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3630,7 +3630,7 @@ describe("CSAT survey banner", () => {
           "AutomaticRemovalCsatSurvey",
         ]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3659,7 +3659,7 @@ describe("CSAT survey banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["DataBrokerRemovalTimeEstimateCsat"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-broker-removal-time-estimates": {
             enabled: true,
           },
@@ -3683,7 +3683,7 @@ describe("CSAT survey banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["DataBrokerRemovalTimeEstimateCsat"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-broker-removal-time-estimates": {
             enabled: false,
           },
@@ -3707,7 +3707,7 @@ describe("CSAT survey banner", () => {
         activeTab="action-needed"
         enabledFeatureFlags={["DataBrokerRemovalTimeEstimateCsat"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-broker-removal-time-estimates": {
             enabled: true,
           },
@@ -3731,7 +3731,7 @@ describe("CSAT survey banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["DataBrokerRemovalTimeEstimateCsat"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-broker-removal-time-estimates": {
             enabled: true,
           },
@@ -3756,7 +3756,7 @@ describe("Data privacy petition banner", () => {
       <ComposedDashboard
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3780,7 +3780,7 @@ describe("Data privacy petition banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3804,7 +3804,7 @@ describe("Data privacy petition banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3827,7 +3827,7 @@ describe("Data privacy petition banner", () => {
       <ComposedDashboard
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3847,7 +3847,7 @@ describe("Data privacy petition banner", () => {
       <ComposedDashboard
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3882,7 +3882,7 @@ describe("Data privacy petition banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },
@@ -3914,7 +3914,7 @@ describe("Data privacy petition banner", () => {
         activeTab="fixed"
         enabledFeatureFlags={["PetitionBannerCsatSurvey"]}
         experimentData={{
-          ...defaultExperimentData,
+          ...defaultExperimentData["Features"],
           "data-privacy-petition-banner": {
             enabled: true,
           },

diff --git a/...ct)/(redesign)/(authenticated)/user/(dashboard)/dashboard/DashboardNonUSUsers.stories.tsx b/...ct)/(redesign)/(authenticated)/user/(dashboard)/dashboard/DashboardNonUSUsers.stories.tsx
@@ -194,7 +194,7 @@ const DashboardWrapper = (props: DashboardWrapperProps) => {
             enabledFeatureFlags={props.enabledFeatureFlags ?? []}
             experimentData={
               props.experimentData ?? {
-                ...defaultExperimentData,
+                ...defaultExperimentData["Features"],
                 "last-scan-date": {
                   enabled: true,
                 },

diff --git a/...act)/(redesign)/(authenticated)/user/(dashboard)/dashboard/DashboardPlusUsers.stories.tsx b/...act)/(redesign)/(authenticated)/user/(dashboard)/dashboard/DashboardPlusUsers.stories.tsx
@@ -193,7 +193,7 @@ const DashboardWrapper = (props: DashboardWrapperProps) => {
             enabledFeatureFlags={props.enabledFeatureFlags ?? []}
             experimentData={
               props.experimentData ?? {
-                ...defaultExperimentData,
+                ...defaultExperimentData["Features"],
                 "last-scan-date": {
                   enabled: true,
                 },

diff --git a/...react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/DashboardUSUsers.stories.tsx b/...react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/DashboardUSUsers.stories.tsx
@@ -194,7 +194,7 @@ const DashboardWrapper = (props: DashboardWrapperProps) => {
             enabledFeatureFlags={props.enabledFeatureFlags ?? []}
             experimentData={
               props.experimentData ?? {
-                ...defaultExperimentData,
+                ...defaultExperimentData["Features"],
                 "last-scan-date": {
                   enabled: true,
                 },

diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
@@ -62,7 +62,7 @@ export type TabType = "action-needed" | "fixed";
 
 export type Props = {
   enabledFeatureFlags: FeatureFlagName[];
-  experimentData: ExperimentData;
+  experimentData: ExperimentData["Features"];
   user: Session["user"];
   userBreaches: SubscriberBreach[];
   userScanData: LatestOnerepScanData;

diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/CancelFlow.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/CancelFlow.tsx
@@ -25,7 +25,7 @@ import { OpenInNew } from "../../../../../../components/server/Icons";
 export type Props = {
   fxaSubscriptionsUrl: string;
   enableDiscountCoupon: boolean;
-  experimentData?: ExperimentData;
+  experimentData?: ExperimentData["Features"];
   isMonthlySubscriber: boolean;
 };