jingram/cpm-stats-on-ntp: Update Protections Report on NTP to include CPM stats

special-pages/pages/new-tab/app/activity/NormalizeDataProvider.js

@@ -36,6 +36,7 @@ import { ACTION_BURN } from '../burning/BurnProvider.js';
  * @property {Record<string, boolean>} favorites
  * @property {string[]} urls
  * @property {number} totalTrackers
+ * @property {Record<string, boolean|null|undefined>} cookiePopUpBlocked
  */
 
 /**
@@ -52,6 +53,7 @@ export function normalizeData(prev, incoming) {
         trackingStatus: {},
         urls: [],
         totalTrackers: incoming.totalTrackers,
+        cookiePopUpBlocked: {},
     };
 
     if (shallowDiffers(prev.urls, incoming.urls)) {
@@ -64,6 +66,7 @@ export function normalizeData(prev, incoming) {
         const id = item.url;
 
         output.favorites[id] = item.favorite;
+        output.cookiePopUpBlocked[id] = item.cookiePopUpBlocked;
 
         /** @type {Item} */
         const next = {
@@ -187,6 +190,7 @@ export function SignalStateProvider({ children }) {
                 favorites: {},
                 urls: [],
                 totalTrackers: 0,
+                cookiePopUpBlocked: {},
             },
             { activity: state.data.activity, urls: state.data.urls, totalTrackers: state.data.totalTrackers },
         ),

special-pages/pages/new-tab/app/activity/activity.md

@@ -48,7 +48,8 @@ title: Activity
           "url": "https://youtube.com/watch?v=abc",
           "relativeTime": "Just now"
         }
-      ]
+      ],
+      "cookiePopUpBlocked": true,
     }
   ]
 }
@@ -178,4 +179,4 @@ example payload without id (for example, on history items)
 ```
 
 ### `activity_burnAnimationComplete`
-- Sent when the burn animation completes
+- Sent when the burn animation completes

special-pages/pages/new-tab/app/activity/components/Activity.examples.js

@@ -9,32 +9,32 @@ import { normalizeData, NormalizedDataContext } from '../NormalizeDataProvider.j
 export const activityExamples = {
     'activity.empty': {
         factory: () => {
-            return <Activity itemCount={0} batched={false} />;
+            return <Activity itemCount={0} batched={false} shouldDisplayLegacyActivity={true} />;
         },
     },
     'activity.few': {
         factory: () => (
-            <Activity itemCount={10} batched={false}>
+            <Activity itemCount={10} batched={false} shouldDisplayLegacyActivity={true}>
                 <Mock size={3}>
-                    <ActivityBody canBurn={false} visibility={'visible'} />
+                    <ActivityBody canBurn={false} visibility={'visible'} shouldDisplayLegacyActivity={true} />
                 </Mock>
             </Activity>
         ),
     },
     'activity.noTrackers': {
         factory: () => (
-            <Activity itemCount={20} batched={false}>
+            <Activity itemCount={20} batched={false} shouldDisplayLegacyActivity={true}>
                 <Mock size={1}>
-                    <ActivityBody canBurn={false} visibility={'visible'} />
+                    <ActivityBody canBurn={false} visibility={'visible'} shouldDisplayLegacyActivity={true} />
                 </Mock>
             </Activity>
         ),
     },
     'activity.noActivity.someTrackers': {
         factory: () => (
-            <Activity itemCount={0} batched={false}>
+            <Activity itemCount={0} batched={false} shouldDisplayLegacyActivity={true}>
                 <Mock size={0}>
-                    <ActivityBody canBurn={false} visibility={'visible'} />
+                    <ActivityBody canBurn={false} visibility={'visible'} shouldDisplayLegacyActivity={true} />
                 </Mock>
             </Activity>
         ),
@@ -58,6 +58,7 @@ function Mock({ children, size }) {
             favorites: {},
             urls: [],
             totalTrackers: 0,
+            cookiePopUpBlocked: {},
         },
         { activity: mocks, urls: mocks.map((x) => x.url), totalTrackers: 0 },
     );