diff --git a/src/components/Layout/GA4Toggle.tsx b/src/components/Layout/GA4Toggle.tsx deleted file mode 100644 index 55fac1a18..000000000 --- a/src/components/Layout/GA4Toggle.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import * as React from "react" - -import Grid from "@mui/material/Grid/Grid" -import Switch from '@mui/material/Switch'; -import Tooltip from '@mui/material/Tooltip'; - -import { GAVersion } from "@/constants" - -interface GA4ToggleProps { - gaVersion: GAVersion - setGAVersion: (version: GAVersion) => void -} - -const GA4Toggle: React.FC = ({ setGAVersion, gaVersion }) => { - return ( - - - UA - - { - if (e.target.checked === true) { - setGAVersion(GAVersion.GoogleAnalytics4) - } else { - setGAVersion(GAVersion.UniversalAnalytics) - } - }} - name="use GA4" - color="primary" - /> - - GA4 - - - ) -} - -export default GA4Toggle diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx index 3944a7d6e..de6890868 100644 --- a/src/components/Layout/index.tsx +++ b/src/components/Layout/index.tsx @@ -41,7 +41,6 @@ import { useGAVersion } from "../../hooks" import { GAVersion, Url } from "../../constants" import Spinner from "../Spinner" import { linkData } from "./links" -import GA4Toggle from "./GA4Toggle" import BugReport from "./BugReport" import Loadable from "../Loadable" import useLogin2, { UserStatus } from "./useLogin" @@ -130,7 +129,12 @@ const Template: React.FC> = ({ const newLocation = window.location.href.replace( window.location.hostname, newHostname ); window.location.replace(newLocation); } - //}, 1000); + + if( !window.location.search && window.location.pathname === '/' ) { + const newLocation = window.location.pathname = '/ga4/'; + window.location.replace(newLocation); + } + //}, 1000); return; }, []); diff --git a/src/components/Spinner.tsx b/src/components/Spinner.tsx index cdce1e407..87df73317 100644 --- a/src/components/Spinner.tsx +++ b/src/components/Spinner.tsx @@ -1,7 +1,7 @@ import * as React from "react" import { styled } from '@mui/material/styles'; import { useTheme } from "@mui/material" -import {Circles} from "react-loader-spinner" +import { Circles } from 'react-loader-spinner' import {PropsWithChildren} from 'react'; const PREFIX = 'Spinner'; diff --git a/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts b/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts index 65a1024e7..920c1212d 100644 --- a/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts +++ b/src/components/ga4/EventBuilder/ValidateEvent/schemas/eventTypes/eventDefinitions.ts @@ -1,13 +1,11 @@ // 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": [], diff --git a/src/components/ga4/EventBuilder/event.ts b/src/components/ga4/EventBuilder/event.ts index 5704422b4..eb2ac1816 100644 --- a/src/components/ga4/EventBuilder/event.ts +++ b/src/components/ga4/EventBuilder/event.ts @@ -50,19 +50,6 @@ 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], @@ -172,19 +159,6 @@ 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], @@ -524,8 +498,6 @@ 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: @@ -536,8 +508,6 @@ 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: diff --git a/src/components/ga4/EventBuilder/types.ts b/src/components/ga4/EventBuilder/types.ts index f8d108ea8..b853bd720 100644 --- a/src/components/ga4/EventBuilder/types.ts +++ b/src/components/ga4/EventBuilder/types.ts @@ -28,13 +28,11 @@ 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",