Merge pull request #349 from scientist-softserv/update-charts-for-gtm

Update charts for google tag manager

Author: alishaevn

.env

@@ -6,6 +6,3 @@ NEXT_PUBLIC_PROVIDER_ID=5159
 NEXT_PUBLIC_SCIENTIST_API_VERSION=v2
 NEXT_PUBLIC_WEBHOOK_URL=http://ss-mailer/webstore
 NEXT_PUBLIC_APP_BASE_URL=https://webstore-staging.vercel.app
-
-# optional/conditional variables
-GOOGLE_TAG_MANAGER_ID=GTM-PQGCP24G

charts/webstore/templates/deployment.yaml

@@ -44,6 +44,8 @@ spec:
               value: "{{ .Values.nextAuthUrl }}"
             - name: NEXT_PUBLIC_APP_BASE_URL
               value: "{{ .Values.appBaseUrl }}"
+            - name: NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID
+              value: "{{ .Values.googleTagManagerId }}"
             - name: NEXT_PUBLIC_PROVIDER_ID
               value: "{{ .Values.providerId }}"
             - name: NEXT_PUBLIC_PROVIDER_NAME

charts/webstore/values.yaml

@@ -14,6 +14,7 @@ appBaseUrl: ''
 clientId: ''
 clientSecret: ''
 fullnameOverride: ''
+googleTagManagerId: ''
 imagePullSecrets: []
 nameOverride: ''
 nextAuthSecret: ''

ops/production-deploy.tmpl.yaml

@@ -1,6 +1,7 @@
 appBaseUrl: 'https://webstore.softserv.cloud'
 clientId: $CLIENT_ID
 clientSecret: $CLIENT_SECRET
+googleTagManagerId: ''
 nextAuthSecret: $NEXTAUTH_SECRET
 nextAuthUrl: 'https://webstore.softserv.cloud/api/auth'
 nextPublicToken: $NEXT_PUBLIC_TOKEN

ops/staging-deploy.tmpl.yaml

@@ -1,6 +1,7 @@
 appBaseUrl: 'https://webstore-staging.softserv.cloud'
 clientId: $CLIENT_ID
 clientSecret: $CLIENT_SECRET
+googleTagManagerId: ''
 nextAuthSecret: $NEXTAUTH_SECRET
 nextAuthUrl: 'https://webstore-staging.softserv.cloud/api/auth'
 nextPublicToken: $NEXT_PUBLIC_TOKEN

pages/_app.js

@@ -21,7 +21,6 @@ import {
   headerAndFooterLinkColors,
 } from '../utils'
 import '../utils/theme/globals.scss'
-const gtmId = process.env.NODE_ENV === 'production' ? process.env.GOOGLE_TAG_MANAGER_ID : ''
 
 const WebStore = ({ Component }) => {
   /**
@@ -42,7 +41,7 @@ const WebStore = ({ Component }) => {
         enableCookies={enableCookies}
         getCookieConsent={getCookieConsent()}
       /> */}
-      <GoogleTagManager gtmId={gtmId} />
+      <GoogleTagManager gtmId={process.env.NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID} />
       <Header
         auth={{
           signIn: () => signIn(process.env.NEXT_PUBLIC_PROVIDER_NAME),