UNC-Libraries · bbpennel · Jan 3, 2024 · Oct 12, 2023 · Jan 2, 2024 · Jan 2, 2024
diff --git a/integration/src/test/resources/access-app.properties b/integration/src/test/resources/access-app.properties
@@ -17,7 +17,6 @@ services.api.url=http://localhost:48080/services/api/
 
 fuseki.baseUri=http://localhost:48080
 
-google.trackingId=
 matomo.authToken=
 matomo.api.url=
 matomo.site.id=5

diff --git a/static/js/vue-cdr-access/package-lock.json b/static/js/vue-cdr-access/package-lock.json
diff --git a/static/js/vue-cdr-access/package.json b/static/js/vue-cdr-access/package.json
@@ -27,7 +27,6 @@
     "lodash.sortby": "^4.7.0",
     "nouislider": "^15.6.1",
     "vue": "^3.2.47",
-    "vue-gtag": "^2.0.1",
     "vue-i18n": "^9.2.2",
     "vue-router": "^4.1.6",
     "vuex": "^4.1.0"

diff --git a/static/js/vue-cdr-access/src/main.js b/static/js/vue-cdr-access/src/main.js
@@ -1,7 +1,6 @@
 import { createApp, h } from 'vue'
 import { createI18n } from 'vue-i18n'
 import { createHead, VueHeadMixin } from "@vueuse/head"
-import VueGtag from 'vue-gtag';
 import App from './App.vue'
 import router from './router'
 import store from './store'
@@ -24,8 +23,6 @@ if (document.getElementById('app') !== null && window.dcr_browse_records === und
         }
     });
 
-    const gaCode = import.meta.env.VITE_GA_CODE || '';
-
     // Set this here as it gives a build error otherwise
     window.matomoSiteSrcUrl = import.meta.env.VITE_MATOMO_SITE_SRC_URL || '';
 
@@ -37,10 +34,5 @@ if (document.getElementById('app') !== null && window.dcr_browse_records === und
         .use(head)
         .use(store)
         .use(router)
-        .use(i18n)
-        .use(VueGtag, {
-            config: {
-                id: gaCode
-            }
-        }).mount('#app');
+        .use(i18n).mount('#app');
 }
diff --git a/static/js/vue-cdr-access/src/mixins/analyticsUtils.js b/static/js/vue-cdr-access/src/mixins/analyticsUtils.js
@@ -1,14 +1,6 @@
 export default {
     methods: {
         pageEvent(recordData) {
-            this.$gtag.event('record', {
-                'event_category': recordData.briefObject.parentCollectionId,
-                'event_label': `${recordData.briefObject.title}|${recordData.briefObject.id}`
-            });
-            this.matomoPageEvent(recordData);
-        },
-
-        matomoPageEvent(recordData) {
             let collection = recordData.briefObject.parentCollectionName || '';
             if (collection === '' && recordData.briefObject.type === 'Collection') {
                 collection = recordData.briefObject.title;
@@ -29,15 +21,6 @@ export default {
         },
 
         pageView(title) {
-            this.$gtag.pageview({
-                page_title: `Digital Collections Repository - ${title}`,
-                page_path: this.$route.path,
-                page_location: window.location.href
-            });
-            this.matomoPageView(title)
-        },
-
-        matomoPageView(title) {
             window._mtm = window._mtm || [];
             window._mtm.push({
                 event: 'pageViewEvent',

diff --git a/static/js/vue-cdr-access/tests/fixtures/testHelpers.js b/static/js/vue-cdr-access/tests/fixtures/testHelpers.js
diff --git a/static/js/vue-cdr-access/tests/unit/aboutRepository.spec.js b/static/js/vue-cdr-access/tests/unit/aboutRepository.spec.js
@@ -6,7 +6,6 @@ import {createI18n} from "vue-i18n";
 import translations from "@/translations";
 import store from '@/store';
 import moxios from "moxios";
-import { $gtag } from '../fixtures/testHelpers';
 
 let wrapper, router;
 
@@ -38,7 +37,6 @@ describe('aboutRepository.vue', () => {
         wrapper = shallowMount(aboutRepository, {
             global: {
                 plugins: [i18n, router, store],
-                mocks: { $gtag },
                 stubs: {
                     RouterLink: RouterLinkStub
                 }

diff --git a/static/js/vue-cdr-access/tests/unit/advancedSearch.spec.js b/static/js/vue-cdr-access/tests/unit/advancedSearch.spec.js
@@ -6,7 +6,6 @@ import {createI18n} from "vue-i18n";
 import translations from "@/translations";
 import store from '@/store';
 import moxios from "moxios";
-import { $gtag } from '../fixtures/testHelpers';
 
 let wrapper, router;
 
@@ -38,7 +37,6 @@ describe('advancedSearch.vue', () => {
         wrapper = shallowMount(advancedSearch, {
             global: {
                 plugins: [i18n, router, store],
-                mocks: { $gtag },
                 stubs: {
                     RouterLink: RouterLinkStub
                 }

diff --git a/static/js/vue-cdr-access/tests/unit/analyticsUtils.spec.js b/static/js/vue-cdr-access/tests/unit/analyticsUtils.spec.js
@@ -6,7 +6,6 @@ import analyticsUtils from "../../src/mixins/analyticsUtils";
 import store from '@/store';
 import { createI18n } from "vue-i18n";
 import translations from "@/translations";
-import { $gtag } from '../fixtures/testHelpers';
 import moxios from "moxios";
 
 let wrapper;
@@ -44,7 +43,6 @@ describe('analyticsUtils', () => {
         wrapper = mount(advancedSearch, {
             global: {
                 plugins: [router, store, i18n],
-                mocks: { $gtag },
                 stubs: {
                     RouterLink: RouterLinkStub
                 }
@@ -145,7 +143,7 @@ describe('analyticsUtils', () => {
         wrapper = mount(displayWrapper, {
             global: {
                 plugins: [store, i18n],
-                mocks: { $gtag, $route },
+                mocks: { $route },
                 stubs: {
                     RouterLink: RouterLinkStub
                 }

diff --git a/static/js/vue-cdr-access/tests/unit/displayWrapper.spec.js b/static/js/vue-cdr-access/tests/unit/displayWrapper.spec.js
@@ -6,7 +6,6 @@ import moxios from "moxios";
 import {createI18n} from "vue-i18n";
 import translations from "@/translations";
 import { response, briefObjectData } from "../fixtures/displayWrapperFixtures";
-import { $gtag } from '../fixtures/testHelpers';
 
 let wrapper, router;
 
@@ -45,7 +44,6 @@ describe('displayWrapper.vue', () => {
         wrapper = mount(displayWrapper, {
             global: {
                 plugins: [router, store, i18n],
-                mocks: { $gtag },
                 stubs: {
                     RouterLink: RouterLinkStub
                 }

diff --git a/static/js/vue-cdr-access/tests/unit/frontPage.spec.js b/static/js/vue-cdr-access/tests/unit/frontPage.spec.js
@@ -6,7 +6,6 @@ import {createI18n} from "vue-i18n";
 import translations from "@/translations";
 import store from '@/store';
 import moxios from "moxios";
-import { $gtag } from '../fixtures/testHelpers';
 
 let wrapper, router;
 
@@ -38,7 +37,6 @@ describe('frontPage.vue', () => {
         wrapper = shallowMount(frontPage, {
             global: {
                 plugins: [i18n, router, store],
-                mocks: { $gtag },
                 stubs: {
                     RouterLink: RouterLinkStub
                 }

diff --git a/static/js/vue-cdr-access/tests/unit/matomoUtils.spec.js b/static/js/vue-cdr-access/tests/unit/matomoUtils.spec.js
@@ -6,7 +6,6 @@ import displayWrapper from '@/components/displayWrapper.vue';
 import store from '@/store';
 import { createI18n } from "vue-i18n";
 import translations from "@/translations";
-import { $gtag } from '../fixtures/testHelpers';
 
 
 let wrapper;
@@ -44,7 +43,6 @@ describe('matomoUtils', () => {
             attachTo: '#root',
             global: {
                 plugins: [router, store, i18n],
-                mocks: { $gtag },
                 stubs: {
                     RouterLink: RouterLinkStub
                 }

diff --git a/static/js/vue-cdr-access/tests/unit/searchWrapper.spec.js b/static/js/vue-cdr-access/tests/unit/searchWrapper.spec.js
@@ -5,7 +5,6 @@ import moxios from "moxios";
 import displayWrapper from "@/components/displayWrapper.vue";
 import {createI18n} from "vue-i18n";
 import translations from "@/translations";
-import { $gtag } from '../fixtures/testHelpers';
 
 const response = {
     "container": {
@@ -141,7 +140,6 @@ describe('searchWrapper.vue', () => {
         wrapper = shallowMount(searchWrapper, {
             global: {
                 plugins: [router, i18n],
-                mocks: { $gtag }
             }
         });
 

diff --git a/static/service-unavailable.html b/static/service-unavailable.html
@@ -45,8 +45,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon">
-    <link href="https://www.googletagmanager.com" rel="preconnect">
-    <script async="" src="https://www.googletagmanager.com/gtag/js?id=&amp;l=dataLayer"></script>
     <title>Digital Collections Repository - Page Unavailable</title>
     <base href="https://dcr.lib.unc.edu/">
 </head>

diff --git a/web-access-app/src/main/webapp/WEB-INF/access-fedora-context.xml b/web-access-app/src/main/webapp/WEB-INF/access-fedora-context.xml
@@ -22,10 +22,7 @@
     </bean>
 
     <bean id="analyticsTracker" class="edu.unc.lib.boxc.web.common.utils.AnalyticsTrackerUtil">
-        <property name="gaTrackingID" ref="gaTrackingID" />
         <property name="solrSearchService" ref="unrestrictedSolrSearchService" />
-        <property name="httpClientConnectionManager" ref="httpClientConnectionManager" />
-        <property name="repositoryHost" value="${repository.host}" />
         <property name="matomoAuthToken" value="${matomo.authToken}" />
         <property name="matomoApiURL" value="${matomo.api.url}" />
         <property name="matomoSiteID" value="${matomo.site.id}" />

diff --git a/web-access-app/src/main/webapp/WEB-INF/service-context.xml b/web-access-app/src/main/webapp/WEB-INF/service-context.xml
@@ -41,10 +41,6 @@
 
     <!-- Beans -->
 
-    <bean id="gaTrackingID" class="java.lang.String">
-        <constructor-arg value="${google.trackingId}" />
-    </bean>
-
     <bean id="accessBaseUrl" class="java.lang.String">
         <constructor-arg value="${access.base.url}" />
     </bean>