tidy up code and remove of UA GA

DEFRA · Jun 22, 2023 · dc69d8e · dc69d8e
1 parent 7a7af1b
commit dc69d8e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 17 deletions.
diff --git a/readme.md b/readme.md
@@ -53,7 +53,6 @@ DEFRA employees can find examples of environment variables stored in our private
 | FLOOD_APP_BING_URL   | MS Bing Location Search  |    yes    |         |                             | For location search |
 | FLOOD_APP_GEOSERVER_URL   | Geoserver  |    yes    |         |                             | For maps ows |
 | FLOOD_APP_SERVICE_URL   | flood-service  |    yes    |         |                             | For flood api |
-| FLOOD_APP_GA_ID   | Google analytics Id |    no    |         |                             |  |
 | FLOOD_APP_GA4_ID   | Google analytics 4 Id |    no    |         |                             |  |
 | FLOOD_APP_GTM_ID   | Google Tag Manager Id |    no    |         |                             |  |
 | FLOOD_APP_NRW_STATION_URL | NRW station search  | yes | https://rivers-and-seas.naturalresources.wales/Station/ | |

diff --git a/server/config.js b/server/config.js
@@ -17,10 +17,8 @@ const schema = joi.object({
   ordnanceSurveyKey: joi.string().optional(),
   browserRefreshUrl: joi.string().optional(),
   httpTimeoutMs: joi.number().default(10000),
-  gaAccId: joi.string().default(''),
   gaFourAccId: joi.string().default(''),
   gtmAccId: joi.string().default(''),
-  gaOptId: joi.string().default(''),
   siteUrl: joi.string().default(`http://localhost:${defaultPort}`),
   floodRiskUrl: joi.string().default(`http://localhost:${defaultPort}`),
   sessionPassword: joi.string(),
@@ -49,10 +47,8 @@ const config = {
   bingUrl: process.env.FLOOD_APP_BING_URL,
   nrwStationUrl: process.env.FLOOD_APP_NRW_STATION_URL,
   httpTimeoutMs: process.env.FLOOD_APP_HTTP_TIMEOUT,
-  gaAccId: process.env.FLOOD_APP_GA_ID,
   gaFourAccId: process.env.FLOOD_APP_GA4_ID,
   gtmAccId: process.env.FLOOD_APP_GTM_ID,
-  gaOptId: process.env.FLOOD_APP_GA_OPT_ID,
   siteUrl: process.env.FLOOD_APP_SITE_URL,
   floodRiskUrl: process.env.FLOOD_RISK_URL,
   sessionPassword: process.env.FLOOD_APP_SESSION_PASSWORD,

diff --git a/server/plugins/views.js b/server/plugins/views.js
@@ -2,7 +2,7 @@ const nunjucks = require('nunjucks')
 const util = require('../util')
 const config = require('../config')
 const pkg = require('../../package.json')
-const { gaAccId, gaOptId, floodFisUrl, gaFourAccId, gtmAccId } = config
+const { floodFisUrl, gaFourAccId, gtmAccId } = config
 
 module.exports = {
   plugin: require('@hapi/vision'),
@@ -38,8 +38,6 @@ module.exports = {
       appVersion: pkg.version,
       assetPath: '/assets',
       serviceName: 'Check for flooding',
-      gaAccId,
-      gaOptId,
       floodFisUrl,
       gaFourAccId,
       gtmAccId

diff --git a/server/src/js/core.js b/server/src/js/core.js
@@ -103,8 +103,6 @@ window.flood = {
         }
       `
       document.head.appendChild(script)
-
-      // Rest of the function...
     }
   }
 }
@@ -240,6 +238,7 @@ if (saveButton) {
         setCookie('set_cookie_usage', 'true', 30)
         calledGTag = true
         window.flood.utils.setGTagAnalyticsCookies()
+        window.flood.utils.disableGoogleAnalytics()
       } else {
         setCookie('set_cookie_usage', '', -1)
         deleteGA4Cookies()

diff --git a/test/wepack-config.js b/test/wepack-config.js
@@ -8,10 +8,8 @@ const webpackConfig = require('../webpack.config')
 lab.experiment('webpack config test', () => {
   let sandbox
   // let server
-  process.env.FLOOD_APP_GA_ID = 'TEST_GA_ID'
   process.env.FLOOD_APP_GA4_ID = 'TEST_GA4_ID'
   process.env.FLOOD_APP_GTM_ID = 'TEST_GTM_ID'
-  process.env.FLOOD_APP_GA_OPT_ID = 'TEST_GA_OPT_ID'
   process.env.NODE_ENV = 'dev'
   const webPack = webpackConfig()
   lab.beforeEach(async () => {
@@ -26,7 +24,6 @@ lab.experiment('webpack config test', () => {
 
   lab.test('webpack config', async () => {
     Code.expect(webPack.plugins[0].definitions).to.be.a.object()
-    Code.expect(webPack.plugins[0].definitions['process.env.GA_ID']).to.equal('"TEST_GA_ID"')
     Code.expect(webPack.plugins[0].definitions['process.env.GA4_ID']).to.equal('"TEST_GA4_ID"')
     Code.expect(webPack.plugins[0].definitions['process.env.GTM_ID']).to.equal('"TEST_GTM_ID"')
   })

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,6 @@
 const path = require('path')
 const env = process.env.NODE_ENV
-const inDev = env === 'dev' || env === 'development' || env === 'test'
+const inDev = env === 'dev' || env === 'development'
 const webpack = require('webpack')
 module.exports = (env, argv) => ({
   mode: !inDev ? 'production' : 'development',
@@ -45,10 +45,8 @@ module.exports = (env, argv) => ({
   target: ['web', 'es5'],
   plugins: [
     new webpack.DefinePlugin({
-      'process.env.GA_ID': JSON.stringify(process.env.FLOOD_APP_GA_ID),
       'process.env.GA4_ID': JSON.stringify(process.env.FLOOD_APP_GA4_ID),
-      'process.env.GTM_ID': JSON.stringify(process.env.FLOOD_APP_GTM_ID),
-      'process.env.GA_OPT_ID': JSON.stringify(process.env.FLOOD_APP_GA_OPT_ID)
+      'process.env.GTM_ID': JSON.stringify(process.env.FLOOD_APP_GTM_ID)
     })
   ]
 })