Global usage of the same singleton and test fixes

Author: bjester

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

@@ -4,11 +4,9 @@ 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);
+export default function AnalyticsPlugin(Vue) {
+  const analytics = Analytics.getInstance();
 
   // Merge in old dataLayer
   if (Vue.$analytics) {

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

@@ -19,7 +19,6 @@ window.WritableStream = global.WritableStream = WritableStream;
 window.TransformStream = global.TransformStream = TransformStream;
 window.CountQueuingStrategy = global.CountQueuingStrategy = CountQueuingStrategy;
 
-import AnalyticsPlugin from 'shared/analytics/plugin';
 import { setupSchema } from 'shared/data';
 import * as resources from 'shared/data/resources';
 import icons from 'shared/vuetify/icons';
@@ -53,9 +52,6 @@ Vue.use(Vuetify, {
 // Register kolibri-design-system plugin
 Vue.use(KThemePlugin);
 
-// Register analytics plugin with plain array
-Vue.use(AnalyticsPlugin, { dataLayer: [] });
-
 // Register global components
 Vue.component('ActionLink', ActionLink);