Backed out changeset 2f1ea34e44b4 (bug 1932202) for causing newtab failures @AdBanner.jsx.

browser/components/newtab/content-src/components/DiscoveryStreamComponents/AdBanner/AdBanner.jsx

@@ -7,13 +7,7 @@ import { SafeAnchor } from "../SafeAnchor/SafeAnchor";
 import { ImpressionStats } from "../../DiscoveryStreamImpressionStats/ImpressionStats";
 import { actionCreators as ac, actionTypes as at } from "common/Actions.mjs";
 
-export const AdBanner = ({
-  spoc,
-  dispatch,
-  firstVisibleTimestamp,
-  row,
-  type,
-}) => {
+export const AdBanner = ({ spoc, dispatch, firstVisibleTimestamp, row }) => {
   const getDimensions = format => {
     switch (format) {
       case "leaderboard":
@@ -47,9 +41,8 @@ export const AdBanner = ({
             flight_id: spoc.flight_id,
             format: spoc.format,
             id: spoc.id,
-            card_type: "spoc",
-            is_pocket_card: true,
-            position: row,
+            is_pocket_card: spoc.is_pocket_card,
+            position: spoc.pos,
             sponsor: spoc.sponsor,
             title: spoc.title,
             url: spoc.url || spoc.shim.url,
@@ -63,25 +56,6 @@ export const AdBanner = ({
     );
   };
 
-  const onLinkCLick = () => {
-    dispatch(
-      ac.DiscoveryStreamUserEvent({
-        event: "CLICK",
-        source: type.toUpperCase(),
-        // Banner ads dont have a position, but a row number
-        action_position: row,
-        value: {
-          card_type: "spoc",
-          tile_id: spoc.id,
-          ...(spoc.shim?.click ? { shim: spoc.shim.click } : {}),
-          fetchTimestamp: spoc.fetchTimestamp,
-          firstVisibleTimestamp,
-          format: spoc.format,
-        },
-      })
-    );
-  };
-
   // in the default card grid 1 would come before the 1st row of cards and 9 comes after the last row
   // using clamp to make sure its between valid values (1-9)
   const clampedRow = Math.max(1, Math.min(9, row));
@@ -100,19 +74,17 @@ export const AdBanner = ({
           className="ad-banner-link"
           url={spoc.url}
           title={spoc.title}
-          onLinkClick={onLinkCLick}
-          dispatch={dispatch}
         >
           <ImpressionStats
             flightId={spoc.flight_id}
             rows={[
               {
                 id: spoc.id,
-                card_type: "spoc",
-                pos: row,
+                pos: spoc.pos,
+                corpus_item_id: spoc.corpus_item_id,
+                scheduled_corpus_item_id: spoc.scheduled_corpus_item_id,
                 recommended_at: spoc.recommended_at,
                 received_rank: spoc.received_rank,
-                format: spoc.format,
               },
             ]}
             dispatch={dispatch}

browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx

@@ -29,7 +29,7 @@ const PREF_FAKESPOT_ENABLED =
   "discoverystream.contextualContent.fakespot.enabled";
 const PREF_BILLBOARD_ENABLED = "newtabAdSize.billboard";
 const PREF_LEADERBOARD_ENABLED = "newtabAdSize.leaderboard";
-const PREF_LEADERBOARD_POSITION = "newtabAdSize.leaderboard.position";
+const PREF_LEADERBOARD_POSITION = "newtabAdSize.billboard.position";
 const PREF_BILLBOARD_POSITION = "newtabAdSize.billboard.position";
 const INTERSECTION_RATIO = 0.5;
 const VISIBLE = "visible";