Global usage of the same singleton and test fixes

Author: bjester

contentcuration/contentcuration/frontend/shared/analytics/plugin.js

@@ -1,20 +1,11 @@
-import Vue from 'vue';
 // the new home for analytics
 import { Analytics } from 'shared/composables/useAnalytics';
 
 /**
  * @param Vue
- * @param {Object} options
- * @param {Array} options.dataLayer
  */
-export default function AnalyticsPlugin(Vue, options = {}) {
-  const analytics = new Analytics(options.dataLayer);
-
-  // Merge in old dataLayer
-  if (Vue.$analytics) {
-    analytics.dataLayer.push(...Vue.$analytics.dataLayer);
-    Vue.$analytics.destroy();
-  }
+export default function AnalyticsPlugin(Vue) {
+  const analytics = Analytics.getInstance();
 
   Vue.$analytics = analytics;
   Vue.mixin({
@@ -24,6 +15,3 @@ export default function AnalyticsPlugin(Vue, options = {}) {
     },
   });
 }
-
-// Initialize with empty dataLayer
-AnalyticsPlugin(Vue, { dataLayer: [] });

contentcuration/contentcuration/frontend/shared/app.js

@@ -252,7 +252,7 @@ Vue.use(Vuetify, {
 Vue.use(KThemePlugin);
 
 // Register analytics plugin with dataLayer that should already be defined
-Vue.use(AnalyticsPlugin, { dataLayer: window.dataLayer });
+Vue.use(AnalyticsPlugin);
 
 // Register global components
 Vue.component('ActionLink', ActionLink);

contentcuration/contentcuration/frontend/shared/composables/__tests__/useAnalytics.spec.js

@@ -7,6 +7,7 @@ describe('useAnalytics', () => {
   beforeEach(() => {
     // Reset modules to get fresh composable instance
     jest.resetModules();
+    Analytics.destroyInstance();
 
     // Create mock dataLayer
     mockDataLayer = [];
@@ -28,7 +29,6 @@ describe('useAnalytics', () => {
 
   afterEach(() => {
     jest.restoreAllMocks();
-    Analytics.destroyInstance();
     resetIntervals = 0;
   });
 

jest_config/setup.js

@@ -52,9 +52,7 @@ Vue.use(Vuetify, {
 });
 // Register kolibri-design-system plugin
 Vue.use(KThemePlugin);
-
-// Register analytics plugin with plain array
-Vue.use(AnalyticsPlugin, { dataLayer: [] });
+Vue.use(AnalyticsPlugin);
 
 // Register global components
 Vue.component('ActionLink', ActionLink);