Fixes tl-its-umich-edu#1580 use new GoogleAnalytics react package, up…

…grade react, react-dom
jaydonkrooss · Jul 31, 2024 · a2036ca · a2036ca
1 parent 244815c
commit a2036ca
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 60 deletions.
diff --git a/assets/src/components/GoogleAnalyticsTracking.js b/assets/src/components/GoogleAnalyticsTracking.js
diff --git a/assets/src/containers/App.js b/assets/src/containers/App.js
@@ -1,14 +1,15 @@
 import React from 'react'
 import { Route, Routes, useMatch } from 'react-router-dom'
-import GoogleAnalyticsTracking from '../components/GoogleAnalyticsTracking'
 import CourseList from './CourseList'
 import Course from './Course'
 import WarningBanner from '../components/WarningBanner'
 import AlertBanner from '../components/AlertBanner'
 import { Helmet } from 'react-helmet'
+import useGoogleAnalytics from 'react-ga-onetrust-consent'
 
 function App (props) {
   const { user, gaId, cspNonce } = props
+  useGoogleAnalytics({ googleAnalyticsId: gaId, nonce: cspNonce })
 
   if (!user.isLoggedIn) {
     if (user.loginURL === '') {
@@ -21,7 +22,6 @@ function App (props) {
   return (
     <>
       <Helmet titleTemplate='%s | My Learning Analytics' title='Courses' />
-      <GoogleAnalyticsTracking {...{ gaId, cspNonce }} />
       <Routes>
         <Route path='/' element={<CourseList user={user} />} />
         <Route path='/courses' element={<CourseList user={user} />} />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,11 +18,12 @@
     "lodash.debounce": "4.0.8",
     "lodash.isequal": "4.5.0",
     "rc-slider": "10.5.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-ga-onetrust-consent": "github:tl-its-umich-edu/react-ga-onetrust-consent",
     "react-ga4": "2.1.0",
     "react-helmet": "6.1.0",
-    "react-router-dom": "6.21.1"
+    "react-router-dom": "6.25.1"
   },
   "babel": {
     "presets": [