From cdc67f41f45fbd8a6837ff7041c8e167534e2029 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:38:18 +0300
Subject: [PATCH 01/10] ga to matomo (export events)

---
 src/app/analytics-events.service.ts           | 29 +++++++++++
 src/app/google-analytics-events.service.ts    | 20 -------
 .../bootstrap-uploader.component.ts           |  6 ---
 .../export-popup/export-popup.component.ts    | 52 ++++++++++++++-----
 .../import-popup/import-popup.component.ts    |  4 --
 5 files changed, 68 insertions(+), 43 deletions(-)
 create mode 100644 src/app/analytics-events.service.ts
 delete mode 100644 src/app/google-analytics-events.service.ts

diff --git a/src/app/analytics-events.service.ts b/src/app/analytics-events.service.ts
new file mode 100644
index 00000000..3754ad62
--- /dev/null
+++ b/src/app/analytics-events.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import { environment } from '../environments/environment';
+
+@Injectable({
+    providedIn: 'root'
+})
+
+export class analyticsEventsService {
+    trackEvent(
+        /*
+        eventCategory: string,
+        eventAction: string,
+        eventName: string = null,
+        eventValue: string = null,
+        */
+        ...items
+        ): void {
+
+        //if(!environment.production) return;
+
+        const _paq = (window as any)._paq || [];
+
+        if(_paq.push) {
+            const eventArgs = ['trackEvent', ...items];
+            //_paq.push(eventArgs);
+            console.log(eventArgs);
+        }
+    }
+}
diff --git a/src/app/google-analytics-events.service.ts b/src/app/google-analytics-events.service.ts
deleted file mode 100644
index 354cc04d..00000000
--- a/src/app/google-analytics-events.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { environment } from '../environments/environment';
-
-@Injectable({
-    providedIn: 'root'
-})
-export class GoogleAnalyticsEventsService {
-    emitEvent(
-        eventAction: string,
-        eventLabel: string): void {
-        if(!environment.production) return;
-
-        const ga = (window as any).ga;
-
-        if(ga && ga.getAll) {
-            const _tracker = ga.getAll()[0];
-            if(_tracker) _tracker.send('event', 'ThemeBuilder', eventAction, eventLabel);
-        }
-    }
-}
diff --git a/src/app/layouts/bootstrap-uploader/bootstrap-uploader.component.ts b/src/app/layouts/bootstrap-uploader/bootstrap-uploader.component.ts
index 986f6681..9cd88b06 100644
--- a/src/app/layouts/bootstrap-uploader/bootstrap-uploader.component.ts
+++ b/src/app/layouts/bootstrap-uploader/bootstrap-uploader.component.ts
@@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { alert } from 'devextreme/ui/dialog';
 import { NotificationsService } from 'src/app/notification.service';
 import { mutePromise } from 'src/app/promise-helper';
-import { GoogleAnalyticsEventsService } from '../../google-analytics-events.service';
 import { ImportService } from '../../import.service';
 
 @Component({
@@ -21,7 +20,6 @@ export class BootstrapUploaderComponent {
 
     constructor(
         private importService: ImportService,
-        private googleAnalyticsEventsService: GoogleAnalyticsEventsService,
         private notifications: NotificationsService
     ) {}
 
@@ -60,10 +58,6 @@ export class BootstrapUploaderComponent {
                     });
                 }
 
-                this.googleAnalyticsEventsService.emitEvent(
-                    'import',
-                    this.version ? 'bootstrap variables (file)' : 'metadata (file)');
-
                 this.imported.emit();
                 e.component.reset();
             };
diff --git a/src/app/layouts/header/export-popup/export-popup.component.ts b/src/app/layouts/header/export-popup/export-popup.component.ts
index 137093a5..3fb4b2e2 100644
--- a/src/app/layouts/header/export-popup/export-popup.component.ts
+++ b/src/app/layouts/header/export-popup/export-popup.component.ts
@@ -4,7 +4,7 @@ import validationEngine from 'devextreme/ui/validation_engine';
 import { saveAs } from 'file-saver';
 import * as JSZip from 'jszip';
 import * as JSZipUtils from 'jszip-utils';
-import { GoogleAnalyticsEventsService } from '../../../google-analytics-events.service';
+import { analyticsEventsService } from '../../../analytics-events.service';
 import { ImportService } from '../../../import.service';
 import { PopupComponent } from '../popup/popup.component';
 import { DxTreeViewComponent, DxScrollViewComponent } from 'devextreme-angular';
@@ -71,8 +71,8 @@ export class ExportPopupComponent implements OnInit {
 
     constructor(
         private importService: ImportService,
-        private googleAnalyticsEventsService: GoogleAnalyticsEventsService
-    ) {}
+        private analyticsEventsService: analyticsEventsService
+    ) { }
 
     changeStep(index: number): void {
         const START_PAGE_INDEX = 0;
@@ -203,9 +203,13 @@ export class ExportPopupComponent implements OnInit {
     }
 
     exportCss(save: boolean): Promise<void> {
-        this.googleAnalyticsEventsService.emitEvent(
-            'export',
-            'save css (' + this.importService.getThemeName() + ')');
+        if (save) {
+            this.analyticsEventsService.trackEvent(
+                'TB: Export',
+                'Tb download css',
+                this.importService.getThemeName()
+            );
+        }
 
         this.contentReady = false;
         return this.importService.exportCss(this.schemeName, this.makeSwatch, this.getSelectedWidgets(), this.removeExternalResources)
@@ -221,9 +225,13 @@ export class ExportPopupComponent implements OnInit {
     }
 
     exportMeta(save: boolean): void {
-        this.googleAnalyticsEventsService.emitEvent(
-            'export',
-            'save metadata (' + this.importService.getThemeName() + ')');
+        if(save) {
+            this.analyticsEventsService.trackEvent(
+                'TB: Export',
+                'Tb download metadata',
+                this.importService.getThemeName()
+            );
+        }
 
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.importService.exportMetadata(this.schemeName, this.makeSwatch, this.getSelectedWidgets(), this.removeExternalResources).then((metaString) => {
@@ -233,6 +241,12 @@ export class ExportPopupComponent implements OnInit {
     }
 
     exportZip(): void {
+        this.analyticsEventsService.trackEvent(
+            'TB: Export',
+            'Tb download zip',
+            this.importService.getThemeName()
+        );
+
         const zip = new JSZip();
         const fontExtension = ['ttf', 'woff', 'woff2'];
         const theme = {
@@ -264,10 +278,20 @@ export class ExportPopupComponent implements OnInit {
     }
 
     copy(): void {
-        if(this.needMeta) {
+        if (this.needMeta) {
+            this.analyticsEventsService.trackEvent(
+                'TB: Export',
+                'Tb copy metadata',
+                this.importService.getThemeName()
+            );
             this.exportMeta(false);
             this.copyAreaActive = true;
         } else {
+            this.analyticsEventsService.trackEvent(
+                'TB: Export',
+                'Tb copy css',
+                this.importService.getThemeName()
+            );
             this.exportCss(false)
                 .then(() => this.copyAreaActive = true)
                 .catch((e) => {
@@ -277,9 +301,11 @@ export class ExportPopupComponent implements OnInit {
     }
 
     copyFileContent(): void {
-        this.googleAnalyticsEventsService.emitEvent(
-            'export',
-            'copy ' + (this.needMeta ? 'metadata' : 'css') + ' (' + this.importService.getThemeName() + ')');
+        this.analyticsEventsService.trackEvent(
+            'TB: Export',
+            'Tb copy ' + (this.needMeta ? 'metadata' : 'css'),
+            this.importService.getThemeName()
+        );
     }
 
     ngOnInit(): void {
diff --git a/src/app/layouts/header/import-popup/import-popup.component.ts b/src/app/layouts/header/import-popup/import-popup.component.ts
index 32f08e2e..870708d0 100644
--- a/src/app/layouts/header/import-popup/import-popup.component.ts
+++ b/src/app/layouts/header/import-popup/import-popup.component.ts
@@ -1,5 +1,4 @@
 import { Component, ViewChild } from '@angular/core';
-import { GoogleAnalyticsEventsService } from '../../../google-analytics-events.service';
 import { ImportService } from '../../../import.service';
 import { PopupComponent } from '../popup/popup.component';
 
@@ -13,7 +12,6 @@ export class ImportPopupComponent {
 
     constructor(
         private importService: ImportService,
-        private googleAnalyticsEventsService: GoogleAnalyticsEventsService
     ) { }
 
     radioGroupData = [{
@@ -40,8 +38,6 @@ export class ImportPopupComponent {
     importValue = '';
 
     applyClick(t): void {
-        this.googleAnalyticsEventsService.emitEvent('import', 'metadata');
-
         this.importService.importMetadata(t.value, 'advanced').then(() => {
             this.popup.hide();
             t.value = '';

From ab80846c9352f95eee6a76a4610110c537295d73 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:40:17 +0300
Subject: [PATCH 02/10] move init script to end

---
 src/index.html | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/index.html b/src/index.html
index 5b816390..5dd4e8db 100644
--- a/src/index.html
+++ b/src/index.html
@@ -46,15 +46,6 @@
         changeMetaContent();
     </script>
 
-    <!-- Matomo Tag Manager -->
-    <script>
-        var _mtm = window._mtm = window._mtm || [];
-        _mtm.push({ 'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start' });
-        var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
-        g.async = true; g.src = 'https://matomo.devexpress.com/js/container_foTT0fJ8.js'; g.setAttributeNode(d.createAttribute('data-ot-ignore')); s.parentNode.insertBefore(g, s);
-    </script>
-    <!-- End Matomo Tag Manager -->
-
     <style>
         body {
             margin: 0;
@@ -100,5 +91,15 @@
             <img src="images/loading.svg" alt="loading..." />
         </div>
     </app-root>
+
+    <!-- Matomo Tag Manager -->
+    <script>
+        var _mtm = window._mtm = window._mtm || [];
+        _mtm.push({ 'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start' });
+        var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+        g.async = true; g.src = 'https://matomo.devexpress.com/js/container_foTT0fJ8.js'; g.setAttributeNode(d.createAttribute('data-ot-ignore')); s.parentNode.insertBefore(g, s);
+    </script>
+    <!-- End Matomo Tag Manager -->
+    
 </body>
 </html>

From f4955439302c4a87c5d7a54a56253a8821e19e22 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:27:24 +0300
Subject: [PATCH 03/10] track open / close widget / group settings

---
 .../button-detailed/button-detailed.component.ts     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/app/preview/button-detailed/button-detailed.component.ts b/src/app/preview/button-detailed/button-detailed.component.ts
index c2d6a498..14667fb0 100644
--- a/src/app/preview/button-detailed/button-detailed.component.ts
+++ b/src/app/preview/button-detailed/button-detailed.component.ts
@@ -1,16 +1,22 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { analyticsEventsService } from '../../../app/analytics-events.service';
 
 @Component({
     selector: 'app-button-detailed',
     templateUrl: './button-detailed.component.html',
     styleUrls: ['./button-detailed.component.css']
 })
+
 export class ButtonDetailedComponent {
     @Input() widget: string;
     @Input() currentWidget: string;
 
     @Output() clicked = new EventEmitter();
 
+    constructor(
+        private analyticsEventsService: analyticsEventsService,
+    ) { }
+
     onClick(): void {
         const isClosed = this.widget !== this.currentWidget;
         window.parent.postMessage(
@@ -18,6 +24,12 @@ export class ButtonDetailedComponent {
             window.parent.location.href
         );
 
+        this.analyticsEventsService.trackEvent(
+            'TB: Settings',
+            'Tb ' + (isClosed ? 'open' : 'close') + ' settings',
+            this.widget
+        );
+
         this.clicked.emit({ isClosed });
     }
 }

From 6226efe46fc2ec9504cc511ffd8e01ab2e4a29f4 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:43:01 +0300
Subject: [PATCH 04/10] lint-fix

---
 src/app/analytics-events.service.ts                       | 6 +++---
 .../layouts/header/export-popup/export-popup.component.ts | 8 ++++----
 .../layouts/header/import-popup/import-popup.component.ts | 2 +-
 .../preview/button-detailed/button-detailed.component.ts  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/analytics-events.service.ts b/src/app/analytics-events.service.ts
index 3754ad62..94f760b6 100644
--- a/src/app/analytics-events.service.ts
+++ b/src/app/analytics-events.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
-import { environment } from '../environments/environment';
+//import { environment } from '../environments/environment';
 
 @Injectable({
     providedIn: 'root'
 })
 
-export class analyticsEventsService {
+export class AnalyticsEventsService {
     trackEvent(
         /*
         eventCategory: string,
@@ -14,7 +14,7 @@ export class analyticsEventsService {
         eventValue: string = null,
         */
         ...items
-        ): void {
+    ): void {
 
         //if(!environment.production) return;
 
diff --git a/src/app/layouts/header/export-popup/export-popup.component.ts b/src/app/layouts/header/export-popup/export-popup.component.ts
index 3fb4b2e2..056cde22 100644
--- a/src/app/layouts/header/export-popup/export-popup.component.ts
+++ b/src/app/layouts/header/export-popup/export-popup.component.ts
@@ -4,7 +4,7 @@ import validationEngine from 'devextreme/ui/validation_engine';
 import { saveAs } from 'file-saver';
 import * as JSZip from 'jszip';
 import * as JSZipUtils from 'jszip-utils';
-import { analyticsEventsService } from '../../../analytics-events.service';
+import { AnalyticsEventsService } from '../../../analytics-events.service';
 import { ImportService } from '../../../import.service';
 import { PopupComponent } from '../popup/popup.component';
 import { DxTreeViewComponent, DxScrollViewComponent } from 'devextreme-angular';
@@ -71,7 +71,7 @@ export class ExportPopupComponent implements OnInit {
 
     constructor(
         private importService: ImportService,
-        private analyticsEventsService: analyticsEventsService
+        private analyticsEventsService: AnalyticsEventsService
     ) { }
 
     changeStep(index: number): void {
@@ -203,7 +203,7 @@ export class ExportPopupComponent implements OnInit {
     }
 
     exportCss(save: boolean): Promise<void> {
-        if (save) {
+        if(save) {
             this.analyticsEventsService.trackEvent(
                 'TB: Export',
                 'Tb download css',
@@ -278,7 +278,7 @@ export class ExportPopupComponent implements OnInit {
     }
 
     copy(): void {
-        if (this.needMeta) {
+        if(this.needMeta) {
             this.analyticsEventsService.trackEvent(
                 'TB: Export',
                 'Tb copy metadata',
diff --git a/src/app/layouts/header/import-popup/import-popup.component.ts b/src/app/layouts/header/import-popup/import-popup.component.ts
index 870708d0..7f6d33b4 100644
--- a/src/app/layouts/header/import-popup/import-popup.component.ts
+++ b/src/app/layouts/header/import-popup/import-popup.component.ts
@@ -11,7 +11,7 @@ export class ImportPopupComponent {
     @ViewChild('popup') popup: PopupComponent;
 
     constructor(
-        private importService: ImportService,
+        private importService: ImportService
     ) { }
 
     radioGroupData = [{
diff --git a/src/app/preview/button-detailed/button-detailed.component.ts b/src/app/preview/button-detailed/button-detailed.component.ts
index 14667fb0..325fa196 100644
--- a/src/app/preview/button-detailed/button-detailed.component.ts
+++ b/src/app/preview/button-detailed/button-detailed.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { analyticsEventsService } from '../../../app/analytics-events.service';
+import { AnalyticsEventsService } from '../../../app/analytics-events.service';
 
 @Component({
     selector: 'app-button-detailed',
@@ -14,7 +14,7 @@ export class ButtonDetailedComponent {
     @Output() clicked = new EventEmitter();
 
     constructor(
-        private analyticsEventsService: analyticsEventsService,
+        private analyticsEventsService: AnalyticsEventsService
     ) { }
 
     onClick(): void {

From 6c01233df0d3124a5e35fbef7aea99468677b517 Mon Sep 17 00:00:00 2001
From: dxvladslavvolkov <vladislav.volkov@devexpress.com>
Date: Wed, 7 Aug 2024 15:25:26 +0400
Subject: [PATCH 05/10] Add events

---
 src/app/left-menu/editor/editor.component.ts  | 26 +++++++++++++++++--
 .../left-menu/main/left-menu.component.html   |  2 +-
 src/app/left-menu/main/left-menu.component.ts | 20 +++++++++++++-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/app/left-menu/editor/editor.component.ts b/src/app/left-menu/editor/editor.component.ts
index 5961dddd..8b8b7872 100644
--- a/src/app/left-menu/editor/editor.component.ts
+++ b/src/app/left-menu/editor/editor.component.ts
@@ -1,10 +1,12 @@
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 import { Component, Input } from '@angular/core';
 import { SafeHtml } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 
 import { MetadataRepositoryService } from '../../meta-repository.service';
 import { NamesService } from '../../names.service';
 import { MetaItem } from '../../types/meta-item';
+import { AnalyticsEventsService } from '../../analytics-events.service';
 
 @Component({
     selector: 'app-editor',
@@ -17,7 +19,10 @@ export class EditorComponent {
     @Input() searchText = '';
 
     constructor(private names: NamesService,
-        private metaRepository: MetadataRepositoryService) { }
+        private metaRepository: MetadataRepositoryService,
+        private analyticsEventsService: AnalyticsEventsService,
+        private router: Router
+    ) { }
 
     private isValueCanBePixels() {
         return this.item.Key.endsWith('border-radius');
@@ -31,7 +36,18 @@ export class EditorComponent {
         return this.names.getHighlightedForLeftMenuName(text, this.searchText);
     }
 
-    valueTextChanged(e: { value: string }, key: string): void {
+    getSettingsName(): string {
+        const routeParts = this.router.url.split('/').filter(part => part !== '');
+        return routeParts[routeParts.length - 1];
+    }
+
+    valueTextChanged(e: { value: string, component: any }, key: string): void {
+        this.analyticsEventsService.trackEvent(
+            'TB: settings menu',
+            `TB change property of ${this.getSettingsName()}`,
+            key,
+            e.value
+        )
         if(this.isValueCanBePixels() && this.isPositiveNumber(e.value)) {
             e.value = e.value + 'px';
         }
@@ -40,6 +56,12 @@ export class EditorComponent {
     }
 
     valueChanged(e: any, key: string): void {
+        this.analyticsEventsService.trackEvent(
+            'TB: settings menu',
+            `TB change property of ${this.getSettingsName()}`,
+            key,
+            e.value
+        )
         this.metaRepository.updateSingleVariable(e, key);
     }
 }
diff --git a/src/app/left-menu/main/left-menu.component.html b/src/app/left-menu/main/left-menu.component.html
index fe68d1ca..89e4742a 100644
--- a/src/app/left-menu/main/left-menu.component.html
+++ b/src/app/left-menu/main/left-menu.component.html
@@ -56,7 +56,7 @@
                     class="menu-item"
                     [routerLink]="['/advanced', theme, colorScheme, menuItem.route]"
                     routerLinkActive="active-link"
-                    (click)="menuClosed = true;"
+                    (click)="selectComponent(menuItem.route)"
                 >
                     {{ menuItem.name }}
                 </div>
diff --git a/src/app/left-menu/main/left-menu.component.ts b/src/app/left-menu/main/left-menu.component.ts
index aa3a52bf..16246f1a 100644
--- a/src/app/left-menu/main/left-menu.component.ts
+++ b/src/app/left-menu/main/left-menu.component.ts
@@ -9,6 +9,7 @@ import { NamesService } from '../../names.service';
 import { LeftMenuItem } from '../../types/left-menu-item';
 import { MetaItem } from '../../types/meta-item';
 import { LeftMenuAlias } from '../left-menu.aliases';
+import { AnalyticsEventsService } from '../../analytics-events.service';
 import { SafeHtml } from '@angular/platform-browser';
 
 const BASE_THEMING_NAME = 'Basic Settings';
@@ -39,7 +40,11 @@ export class LeftMenuComponent implements OnDestroy, OnInit {
         formControl: new UntypedFormControl('')
     });
 
-    constructor(private route: ActivatedRoute, private metaRepository: MetadataRepositoryService, private names: NamesService) {
+    constructor(private route: ActivatedRoute,
+        private metaRepository: MetadataRepositoryService,
+        private names: NamesService,
+        private analyticsEventsService: AnalyticsEventsService
+    ) {
         this.route.params.subscribe((params) => {
             this.widget = params['group'];
             this.changeWidget(this.widget);
@@ -47,6 +52,10 @@ export class LeftMenuComponent implements OnDestroy, OnInit {
     }
 
     openMenu(): void {
+        this.analyticsEventsService.trackEvent(
+            'TB: settings menu',
+            `TB open settings menu`,
+        );
         this.menuClosed = false;
     }
 
@@ -64,6 +73,15 @@ export class LeftMenuComponent implements OnDestroy, OnInit {
         e.stopPropagation();
     }
 
+    selectComponent(componentName: string): void {
+        this.analyticsEventsService.trackEvent(
+            'TB: settings menu',
+            `TB select subgroup`,
+            componentName
+        );
+        this.menuClosed = true;
+    }
+
     menuSearch(): void {
         const keyword = this.names.getRealName(this.searchKeyword.toLowerCase());
 

From 612c716c5bce7b7ba0222483ce03cfa88e935520 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:28:03 +0300
Subject: [PATCH 06/10] track styles changing breadcrumb

---
 src/app/left-menu/editor/editor.component.ts  | 12 ++++--------
 src/app/left-menu/main/left-menu.component.ts |  8 ++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/app/left-menu/editor/editor.component.ts b/src/app/left-menu/editor/editor.component.ts
index 8b8b7872..e79eda64 100644
--- a/src/app/left-menu/editor/editor.component.ts
+++ b/src/app/left-menu/editor/editor.component.ts
@@ -43,10 +43,8 @@ export class EditorComponent {
 
     valueTextChanged(e: { value: string, component: any }, key: string): void {
         this.analyticsEventsService.trackEvent(
-            'TB: settings menu',
-            `TB change property of ${this.getSettingsName()}`,
-            key,
-            e.value
+            'TB: Settings',
+            `Tb ${this.getSettingsName()} - ${key}`
         )
         if(this.isValueCanBePixels() && this.isPositiveNumber(e.value)) {
             e.value = e.value + 'px';
@@ -57,10 +55,8 @@ export class EditorComponent {
 
     valueChanged(e: any, key: string): void {
         this.analyticsEventsService.trackEvent(
-            'TB: settings menu',
-            `TB change property of ${this.getSettingsName()}`,
-            key,
-            e.value
+            'TB: Settings',
+            `Tb ${this.getSettingsName()} - ${key}`
         )
         this.metaRepository.updateSingleVariable(e, key);
     }
diff --git a/src/app/left-menu/main/left-menu.component.ts b/src/app/left-menu/main/left-menu.component.ts
index 16246f1a..c7c6980f 100644
--- a/src/app/left-menu/main/left-menu.component.ts
+++ b/src/app/left-menu/main/left-menu.component.ts
@@ -52,10 +52,6 @@ export class LeftMenuComponent implements OnDestroy, OnInit {
     }
 
     openMenu(): void {
-        this.analyticsEventsService.trackEvent(
-            'TB: settings menu',
-            `TB open settings menu`,
-        );
         this.menuClosed = false;
     }
 
@@ -75,8 +71,8 @@ export class LeftMenuComponent implements OnDestroy, OnInit {
 
     selectComponent(componentName: string): void {
         this.analyticsEventsService.trackEvent(
-            'TB: settings menu',
-            `TB select subgroup`,
+            'TB: Settings',
+            `Tb select subgroup`,
             componentName
         );
         this.menuClosed = true;

From 2f230d03eea61901dc8dd333591206d2f8c83509 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:28:48 +0300
Subject: [PATCH 07/10] AnalyticsEventsService import last

---
 src/app/layouts/header/export-popup/export-popup.component.ts | 2 +-
 src/app/left-menu/main/left-menu.component.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/layouts/header/export-popup/export-popup.component.ts b/src/app/layouts/header/export-popup/export-popup.component.ts
index 056cde22..d2524235 100644
--- a/src/app/layouts/header/export-popup/export-popup.component.ts
+++ b/src/app/layouts/header/export-popup/export-popup.component.ts
@@ -4,10 +4,10 @@ import validationEngine from 'devextreme/ui/validation_engine';
 import { saveAs } from 'file-saver';
 import * as JSZip from 'jszip';
 import * as JSZipUtils from 'jszip-utils';
-import { AnalyticsEventsService } from '../../../analytics-events.service';
 import { ImportService } from '../../../import.service';
 import { PopupComponent } from '../popup/popup.component';
 import { DxTreeViewComponent, DxScrollViewComponent } from 'devextreme-angular';
+import { AnalyticsEventsService } from '../../../analytics-events.service';
 
 class WidgetData {
     widget: string;
diff --git a/src/app/left-menu/main/left-menu.component.ts b/src/app/left-menu/main/left-menu.component.ts
index c7c6980f..74896cc0 100644
--- a/src/app/left-menu/main/left-menu.component.ts
+++ b/src/app/left-menu/main/left-menu.component.ts
@@ -9,8 +9,8 @@ import { NamesService } from '../../names.service';
 import { LeftMenuItem } from '../../types/left-menu-item';
 import { MetaItem } from '../../types/meta-item';
 import { LeftMenuAlias } from '../left-menu.aliases';
-import { AnalyticsEventsService } from '../../analytics-events.service';
 import { SafeHtml } from '@angular/platform-browser';
+import { AnalyticsEventsService } from '../../analytics-events.service';
 
 const BASE_THEMING_NAME = 'Basic Settings';
 

From cf4d942ac24ba55f8a372a18ecb909509d27eb77 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:34:09 +0300
Subject: [PATCH 08/10] track export popup search value

---
 .../layouts/header/export-popup/export-popup.component.ts   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/layouts/header/export-popup/export-popup.component.ts b/src/app/layouts/header/export-popup/export-popup.component.ts
index d2524235..fd359372 100644
--- a/src/app/layouts/header/export-popup/export-popup.component.ts
+++ b/src/app/layouts/header/export-popup/export-popup.component.ts
@@ -151,6 +151,12 @@ export class ExportPopupComponent implements OnInit {
             treeItem.visible = hasChildItems;
             treeItem.expanded = hasChildItems && this.searchValue.length > 0;
         });
+
+        this.analyticsEventsService.trackEvent(
+            'TB: Export',
+            'Tb export search',
+            this.searchValue
+        );
     }
 
     getFileNameWithoutExt(): string {

From fb4680af9495238159d0675d6f2e51e07bc59f04 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:36:19 +0300
Subject: [PATCH 09/10] lint-fix

---
 src/app/left-menu/editor/editor.component.ts  | 6 +++---
 src/app/left-menu/main/left-menu.component.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/left-menu/editor/editor.component.ts b/src/app/left-menu/editor/editor.component.ts
index e79eda64..d99eba5b 100644
--- a/src/app/left-menu/editor/editor.component.ts
+++ b/src/app/left-menu/editor/editor.component.ts
@@ -37,7 +37,7 @@ export class EditorComponent {
     }
 
     getSettingsName(): string {
-        const routeParts = this.router.url.split('/').filter(part => part !== '');
+        const routeParts = this.router.url.split('/').filter((part) => part !== '');
         return routeParts[routeParts.length - 1];
     }
 
@@ -45,7 +45,7 @@ export class EditorComponent {
         this.analyticsEventsService.trackEvent(
             'TB: Settings',
             `Tb ${this.getSettingsName()} - ${key}`
-        )
+        );
         if(this.isValueCanBePixels() && this.isPositiveNumber(e.value)) {
             e.value = e.value + 'px';
         }
@@ -57,7 +57,7 @@ export class EditorComponent {
         this.analyticsEventsService.trackEvent(
             'TB: Settings',
             `Tb ${this.getSettingsName()} - ${key}`
-        )
+        );
         this.metaRepository.updateSingleVariable(e, key);
     }
 }
diff --git a/src/app/left-menu/main/left-menu.component.ts b/src/app/left-menu/main/left-menu.component.ts
index 74896cc0..632787ab 100644
--- a/src/app/left-menu/main/left-menu.component.ts
+++ b/src/app/left-menu/main/left-menu.component.ts
@@ -72,7 +72,7 @@ export class LeftMenuComponent implements OnDestroy, OnInit {
     selectComponent(componentName: string): void {
         this.analyticsEventsService.trackEvent(
             'TB: Settings',
-            `Tb select subgroup`,
+            'Tb select subgroup',
             componentName
         );
         this.menuClosed = true;

From 81f0c98ae0a38d62e7ab194192b5147bcfefcab6 Mon Sep 17 00:00:00 2001
From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:37:45 +0300
Subject: [PATCH 10/10] prod

---
 src/app/analytics-events.service.ts | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/app/analytics-events.service.ts b/src/app/analytics-events.service.ts
index 94f760b6..5539d4b7 100644
--- a/src/app/analytics-events.service.ts
+++ b/src/app/analytics-events.service.ts
@@ -1,29 +1,19 @@
 import { Injectable } from '@angular/core';
-//import { environment } from '../environments/environment';
+import { environment } from '../environments/environment';
 
 @Injectable({
     providedIn: 'root'
 })
 
 export class AnalyticsEventsService {
-    trackEvent(
-        /*
-        eventCategory: string,
-        eventAction: string,
-        eventName: string = null,
-        eventValue: string = null,
-        */
-        ...items
-    ): void {
-
-        //if(!environment.production) return;
+    trackEvent(...items): void {
+        if(!environment.production) return;
 
         const _paq = (window as any)._paq || [];
 
         if(_paq.push) {
             const eventArgs = ['trackEvent', ...items];
-            //_paq.push(eventArgs);
-            console.log(eventArgs);
+            _paq.push(eventArgs);
         }
     }
 }