Merge branch 'release/23.09.0'

adlius · adlius · commit 6a0a8d3b479f · 2023-08-16T15:57:12.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [23.09.0] - 2023-08-16
+### Changed
+- Added Google Tag Manager
+
 ## [23.08.0] - 2023-07-13
 ### Changed
 - Removed remaining Bootstrap components
@@ -1932,6 +1936,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[23.09.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.09.0
 [23.08.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.08.0
 [23.07.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.07.0
 [23.06.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.1
diff --git a/app/index.html b/app/index.html
@@ -22,6 +22,7 @@
     {{content-for "head-footer"}}
   </head>
   <body>
+    {{content-for "gtm"}}
     {{content-for "assets"}}
     <noscript>
       <p>
diff --git a/config/environment.d.ts b/config/environment.d.ts
@@ -28,6 +28,7 @@ declare const config: {
     rootURL: string;
     assetsPrefix: string;
     sentryDSN: string | null;
+    googleTagManagerId: string | null;
     sentryOptions: {
         release?: string;
         ignoreErrors: string[];
diff --git a/config/environment.js b/config/environment.js
@@ -24,6 +24,7 @@ const {
     FB_APP_ID,
     GIT_COMMIT: release,
     GOOGLE_ANALYTICS_ID,
+    GOOGLE_TAG_MANAGER_ID,
     KEEN_CONFIG: keenConfig,
     LINT_ON_BUILD: lintOnBuild = false,
     MIRAGE_ENABLED = false,
@@ -76,6 +77,7 @@ module.exports = function(environment) {
         assetsPrefix,
         locationType: 'auto',
         sentryDSN: null,
+        googleTagManagerId: null,
         sentryOptions: {
             release,
             ignoreErrors: [
@@ -119,6 +121,13 @@ module.exports = function(environment) {
                     version: 'dimension5',
                 },
             },
+            {
+                name: 'GoogleTagManager',
+                environments: GOOGLE_TAG_MANAGER_ID ? ['all'] : [],
+                config: {
+                    id: GOOGLE_TAG_MANAGER_ID,
+                },
+            },
         ],
         FB_APP_ID,
         OSF: {
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -106,6 +106,22 @@ module.exports = function(defaults) {
                 postProcess,
                 /* eslint-enable max-len */
             },
+            gtm: {
+                enabled: IS_PROD,
+                content: `<script>
+                    var configJson = document.head.querySelector("meta[name$='/config/environment']").content;
+                    var configObject = JSON.parse(unescape(configJson));
+                    if (configObject.googleTagManagerId) {
+                        window.dataLayer = window.dataLayer || [];
+                        function gtag(){dataLayer.push(arguments);}
+                        gtag('js', new Date());
+
+                        gtag('config', configObject.googleTagManagerId);
+                    }
+                </script>
+            `,
+                postProcess,
+            },
         },
         'ember-cli-babel': {
             includePolyfill: IS_PROD,
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "23.08.0",
+  "version": "23.09.0",
   "private": true,
   "description": "Ember front-end for the Open Science Framework",
   "homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ember-osf-web",`
`3`		`- "version": "23.08.0",`
	`3`	`+ "version": "23.09.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Ember front-end for the Open Science Framework",`
`6`	`6`	`"homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",`