Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the GA4 redirect logic without breaking the Bitly oauth2 flow #1997

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Fix the GA4 redirect logic without breaking the Bitly oauth2 flow #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9ad994c
Add screen_view, ad_impression, campaign_details events to EventBuilder
ikuleshov Apr 25, 2024
934b569
remove UA toggle
ikuleshov Jul 23, 2024
89bace1
Delete UA-GA4 toggle
ikuleshov Jul 29, 2024
a03a11f
Redirect the root page to ga4 without breaking the Bitly auth.
ikuleshov Aug 29, 2024
81c0991
Remove LineItem since it is not implemented (fix presubmit failures).
ikuleshov Aug 29, 2024
9fd7e83
Fix presubmit failures.
ikuleshov Aug 29, 2024
be7fedd
Merge remote-tracking branch 'origin/ga4redirectfix' into ga4redirectfix
ikuleshov Aug 29, 2024
1490c34
update Circles import to fix presubmits
ikuleshov Aug 29, 2024
389ee32
Merge remote-tracking branch 'origin/ga4redirectfix' into ga4redirectfix
ikuleshov Aug 29, 2024
5f55100
bump react-loader-spinner version
ikuleshov Aug 29, 2024
f76ddcc
Merge remote-tracking branch 'origin/ga4redirectfix' into ga4redirectfix
ikuleshov Aug 29, 2024
505e255
Merge branch 'main' into ga4redirectfix
ikuleshov Oct 3, 2024
1a1f6a9
Merge branch 'googleanalytics:main' into ga4redirectfix
ikuleshov Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions src/components/Layout/GA4Toggle.tsx
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/components/Layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -130,7 +129,12 @@ const Template: React.FC<PropsWithChildren<LayoutProps & TemplateProps>> = ({
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;
}, []);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Spinner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Loading