From 9ad994c185823958c3fb8375d1f0974d98e8693a Mon Sep 17 00:00:00 2001
From: ikuleshov <ikuleshov@google.com>
Date: Thu, 25 Apr 2024 08:06:44 +0000
Subject: [PATCH 1/2] Add screen_view, ad_impression, campaign_details events
 to EventBuilder

---
 .../schemas/eventTypes/eventDefinitions.ts    |  3 ++
 src/components/ga4/EventBuilder/event.ts      | 41 +++++++++++++++++++
 src/components/ga4/EventBuilder/types.ts      |  4 +-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts b/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts
index 7a594bf3e..65a1024e7 100644
--- a/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts
+++ b/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts
@@ -1,11 +1,13 @@
 // Event and required property mapping
 
 export const eventDefinitions = {
+    "ad_impression": [],
     "add_payment_info": ["value", "items"],
     "add_shipping_info": ["value", "items"],
     "add_to_cart": ["value", "items"],
     "add_to_wishlist": ["value", "items"],
     "begin_checkout": ["value", "items"],
+    "campaign_details": [],
     "earn_virtual_currency": [],
     "generate_lead": ["value"],
     "join_group": [],
@@ -15,6 +17,7 @@ export const eventDefinitions = {
     "purchase": ["transaction_id", "items", "value"],
     "refund": ["transaction_id", "value"],
     "remove_from_cart": ["items", "value"],
+    "screen_view": [],
     "search": ["search_term"],
     "select_content": [],
     "select_item": ["items"],
diff --git a/src/components/ga4/EventBuilder/event.ts b/src/components/ga4/EventBuilder/event.ts
index 75bf9fe4c..5704422b4 100644
--- a/src/components/ga4/EventBuilder/event.ts
+++ b/src/components/ga4/EventBuilder/event.ts
@@ -50,6 +50,19 @@ const eventFor = (
 
 const custom_event = eventFor(EventType.CustomEvent, [Category.Custom], [], [])
 
+const ad_impression = eventFor(
+    EventType.AdImpression,
+    [Category.AllApps],
+    [
+      stringParam("ad_platform", "MoPub"),
+      stringParam("ad_source", "AdColony"),
+      stringParam("ad_format", "Banner"),
+      stringParam("ad_unit_name", "Banner_03"),
+      stringParam("currency", "USD"),
+      numberParam("value", 	3.99),
+    ]
+)
+
 const add_payment_info = eventFor(
   EventType.AddPaymentInfo,
   [Category.RetailEcommerce],
@@ -159,6 +172,19 @@ const begin_checkout = eventFor(
   ]
 )
 
+const campaign_details = eventFor(
+    EventType.CampaignDetails,
+    [Category.AllApps],
+    [
+      stringParam("campaign_id", "SUMMER_FUN"),
+      stringParam("campaign", "Summer_fun"),
+      stringParam("source", "google"),
+      stringParam("medium", "cpc"),
+      stringParam("term", "summer+travel"),
+      stringParam("content", "logolink"),
+    ]
+)
+
 const earn_virtual_currency = eventFor(
   EventType.EarnVirtualCurrency,
   [Category.AllApps],
@@ -274,6 +300,15 @@ const remove_from_cart = eventFor(
   ]
 )
 
+const screen_view = eventFor(
+    EventType.ScreenView,
+    [Category.AllApps],
+    [
+      stringParam("screen_class", "MainActivity"),
+      stringParam("screen_name", "About"),
+    ]
+)
+
 const search = eventFor(
   EventType.Search,
   [Category.AllApps],
@@ -489,6 +524,8 @@ export const suggestedEventFor = (eventType: EventType): Event2 => {
     case EventType.CustomEvent:
       return custom_event
 
+    case EventType.AdImpression:
+      return ad_impression
     case EventType.AddPaymentInfo:
       return add_payment_info
     case EventType.AddShippingInfo:
@@ -499,6 +536,8 @@ export const suggestedEventFor = (eventType: EventType): Event2 => {
       return add_to_wishlist
     case EventType.BeginCheckout:
       return begin_checkout
+    case EventType.CampaignDetails:
+      return campaign_details
     case EventType.EarnVirtualCurrency:
       return earn_virtual_currency
     case EventType.GenerateLead:
@@ -517,6 +556,8 @@ export const suggestedEventFor = (eventType: EventType): Event2 => {
       return refund
     case EventType.RemoveFromCart:
       return remove_from_cart
+    case EventType.ScreenView:
+      return screen_view
     case EventType.Search:
       return search
     case EventType.SelectContent:
diff --git a/src/components/ga4/EventBuilder/types.ts b/src/components/ga4/EventBuilder/types.ts
index 7e1f53cfa..f8d108ea8 100644
--- a/src/components/ga4/EventBuilder/types.ts
+++ b/src/components/ga4/EventBuilder/types.ts
@@ -28,12 +28,13 @@ export enum Category {
 
 export enum EventType {
   CustomEvent = "custom_event",
-
+  AdImpression = "ad_impression",
   AddPaymentInfo = "add_payment_info",
   AddShippingInfo = "add_shipping_info",
   AddToCart = "add_to_cart",
   AddToWishlist = "add_to_wishlist",
   BeginCheckout = "begin_checkout",
+  CampaignDetails = "campaign_details",
   EarnVirtualCurrency = "earn_virtual_currency",
   GenerateLead = "generate_lead",
   JoinGroup = "join_group",
@@ -43,6 +44,7 @@ export enum EventType {
   Purchase = "purchase",
   Refund = "refund",
   RemoveFromCart = "remove_from_cart",
+  ScreenView = "screen_view",
   Search = "search",
   SelectContent = "select_content",
   SelectItem = "select_item",

From 934b569aaa9924c57890ddade02983e9655d11c3 Mon Sep 17 00:00:00 2001
From: ikuleshov <ikuleshov@google.com>
Date: Tue, 23 Jul 2024 01:33:19 +0000
Subject: [PATCH 2/2] remove UA toggle

---
 src/components/Layout/index.tsx | 20 --------------------
 src/components/Layout/links.ts  | 10 +---------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx
index 0510e054c..3944a7d6e 100644
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -204,16 +204,6 @@ const Template: React.FC<PropsWithChildren<LayoutProps & TemplateProps>> = ({
                       </Typography>
                   )
                 }
-                if (linkData.type === "ga4toggle") {
-                  return (
-                      <li key={linkData.type} className={classes.innerNav}>
-                        <GA4Toggle
-                            setGAVersion={setGAVersion}
-                            gaVersion={gaVersion}
-                        />
-                      </li>
-                  )
-                }
                 return (
                     <ListItem
                         button
@@ -255,16 +245,6 @@ const Template: React.FC<PropsWithChildren<LayoutProps & TemplateProps>> = ({
                     </li>
                 )
               }
-              if (linkData.type === "ga4toggle") {
-                return (
-                    <li key={linkData.type} className={classes.innerNav}>
-                      <GA4Toggle
-                          setGAVersion={setGAVersion}
-                          gaVersion={gaVersion}
-                      />
-                    </li>
-                )
-              }
               return (
                   <li key={linkData.text}>
                     <Link
diff --git a/src/components/Layout/links.ts b/src/components/Layout/links.ts
index 5724b4abd..c3b137bc2 100644
--- a/src/components/Layout/links.ts
+++ b/src/components/Layout/links.ts
@@ -13,11 +13,7 @@ interface LinkT {
   href: string
 }
 
-interface ToggleT {
-  type: "ga4toggle"
-  versions: GAVersion[]
-}
-export type LinkData = LinkT | Heading | ToggleT
+export type LinkData = LinkT | Heading
 
 // TODO - Add an enum for the slugs so they aren't magic strings.
 export const linkData: LinkData[] = [
@@ -26,10 +22,6 @@ export const linkData: LinkData[] = [
     type: "heading",
     versions: [GAVersion.GoogleAnalytics4, GAVersion.UniversalAnalytics],
   },
-  {
-    type: "ga4toggle",
-    versions: [GAVersion.GoogleAnalytics4, GAVersion.UniversalAnalytics],
-  },
   {
     text: "Account Explorer",
     href: "/account-explorer/",