[DDW-809] Ensure AnalyticsTracker is configured when user consents

Author: Marcin Mazurek

source/renderer/app/analytics/AnalyticsTracker.ts

@@ -6,33 +6,33 @@ import { MatomoClient } from './MatomoClient';
 import { NoopAnalyticsClient } from './noopAnalyticsClient';
 
 export class AnalyticsTracker {
-  analyticsClient: AnalyticsClient;
+  #analyticsClient: AnalyticsClient;
 
   constructor(
     private environment: Environment,
     private localStorage: LocalStorageApi
   ) {
-    this.analyticsClient = NoopAnalyticsClient;
+    this.#analyticsClient = NoopAnalyticsClient;
     this.#enableTrackingIfAccepted();
   }
 
   async enableTracking() {
-    this.analyticsClient = new MatomoClient(
+    this.#analyticsClient = new MatomoClient(
       this.environment,
-      await localStorage.getUserID()
+      await this.localStorage.getUserID()
     );
   }
 
   disableTracking() {
-    this.analyticsClient = NoopAnalyticsClient;
+    this.#analyticsClient = NoopAnalyticsClient;
   }
 
   sendPageNavigationEvent(pageTitle: string) {
-    return this.analyticsClient.sendPageNavigationEvent(pageTitle);
+    return this.#analyticsClient.sendPageNavigationEvent(pageTitle);
   }
 
   sendEvent(category: string, name: string) {
-    return this.analyticsClient.sendEvent(category, name);
+    return this.#analyticsClient.sendEvent(category, name);
   }
 
   async #enableTrackingIfAccepted() {

source/renderer/app/analytics/MatomoClient.ts

@@ -7,6 +7,7 @@ import {
   DEV_MODE_SITE_MAP_ID,
   NETWORK_TO_ANALYTICS_SITE_ID_MAP,
 } from '../config/analyticsConfig';
+import { formattedBytesToSize } from '../utils/formatters';
 
 const CPU_DIMENSION_KEY = 'dimension2';
 const RAM_DIMENSION_KEY = 'dimension3';
@@ -33,9 +34,7 @@ export class MatomoClient implements AnalyticsClient {
       action_name: pageTitle,
       url: this.getAnalyticsURL(),
       [CPU_DIMENSION_KEY]: formatCpuInfo(this.environment.cpu),
-      [RAM_DIMENSION_KEY]: Math.round(
-        this.environment.ram / 1024 / 1024 / 1024
-      ).toString(),
+      [RAM_DIMENSION_KEY]: formattedBytesToSize(this.environment.ram),
       [OS_DIMENSION_KEY]: this.environment.os,
       [VERSION_DIMENSION_KEY]: this.environment.version,
     });

source/renderer/app/stores/ProfileStore.ts

@@ -1,8 +1,6 @@
-import { action, observable, computed, runInAction } from 'mobx';
+import { action, computed, observable, runInAction } from 'mobx';
 import BigNumber from 'bignumber.js';
-import { includes, camelCase } from 'lodash';
-import axios from 'axios';
-import { v4 as uuidv4 } from 'uuid';
+import { camelCase, includes } from 'lodash';
 import { toJS } from '../../../common/utils/helper';
 import Store from './lib/Store';
 import Request from './lib/LocalizedRequest';
@@ -15,32 +13,32 @@ import { logger } from '../utils/logging';
 import { setStateSnapshotLogChannel } from '../ipc/setStateSnapshotLogChannel';
 import { getDesktopDirectoryPathChannel } from '../ipc/getDesktopDirectoryPathChannel';
 import { getSystemLocaleChannel } from '../ipc/getSystemLocaleChannel';
+import type { Locale } from '../../../common/types/locales.types';
 import { LOCALES } from '../../../common/types/locales.types';
 import {
   compressLogsChannel,
   downloadLogsChannel,
   getLogsChannel,
 } from '../ipc/logs.ipc';
-import type { LogFiles, CompressedLogStatus } from '../types/LogTypes';
+import type { CompressedLogStatus, LogFiles } from '../types/LogTypes';
 import type { StateSnapshotLogParams } from '../../../common/types/logging.types';
-import type { Locale } from '../../../common/types/locales.types';
 import {
   DEFAULT_NUMBER_FORMAT,
   NUMBER_FORMATS,
 } from '../../../common/types/number.types';
 import {
+  getRequestKeys,
   hasLoadedRequest,
   isRequestSet,
   requestGetter,
   requestGetterLocale,
-  getRequestKeys,
 } from '../utils/storesUtils';
 import {
-  NUMBER_OPTIONS,
   DATE_ENGLISH_OPTIONS,
   DATE_JAPANESE_OPTIONS,
-  TIME_OPTIONS,
+  NUMBER_OPTIONS,
   PROFILE_SETTINGS,
+  TIME_OPTIONS,
 } from '../config/profileConfig';
 import { buildSystemInfo } from '../utils/buildSystemInfo';
 import { AnalyticsAcceptanceStatus } from '../analytics/types';
@@ -398,6 +396,12 @@ export default class ProfileStore extends Store {
   _setAnalyticsAcceptanceStatus = (status: AnalyticsAcceptanceStatus) => {
     this.setAnalyticsAcceptanceRequest.execute(status);
     this.getAnalyticsAcceptanceRequest.execute();
+
+    if (status === AnalyticsAcceptanceStatus.ACCEPTED) {
+      this.analytics.enableTracking();
+    } else if (status === AnalyticsAcceptanceStatus.REJECTED) {
+      this.analytics.disableTracking();
+    }
   };
   _getAnalyticsAcceptance = () => {
     this.getAnalyticsAcceptanceRequest.execute();