admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-3712-disable-analytics (pull request #3252)

Browse Source 
IO-3712 Disable analytics in client side.

Approved-by: Dave Richer
This commit is contained in:
Patrick Fic
2026-05-20 18:10:39 +00:00
committed by Dave Richer
parent cb9ccb7e77 771573409f
commit da317704c4
4 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/App/App.jsx
View File

@@ -1,6 +1,6 @@
import { useSplitClient } from "@splitsoftware/splitio-react";
import { Button, Result } from "antd";
import LogRocket from "logrocket";
//import LogRocket from "logrocket";
import { lazy, Suspense, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -101,13 +101,13 @@ export function App({
client.setAttribute("imexshopid", bodyshop.imexshopid);
if (client.getTreatment("LogRocket_Tracking") === "on") {
console.log("LR Start");
LogRocket.init(
InstanceRenderMgr({
imex: "gvfvfw/bodyshopapp",
rome: "rome-online/rome-online"
})
);
// console.log("LR Start");
// LogRocket.init(
// InstanceRenderMgr({
// imex: "gvfvfw/bodyshopapp",
// rome: "rome-online/rome-online"
// })
// );
}
}
}, [bodyshop, client, currentUser.authorized]);

66
client/src/firebase/firebase.utils.js
View File

@@ -1,9 +1,9 @@
import { getAnalytics, logEvent } from "@firebase/analytics";
//import { getAnalytics, logEvent } from "@firebase/analytics";
import { initializeApp } from "@firebase/app";
import { getAuth, updatePassword, updateProfile } from "@firebase/auth";
import { getFirestore } from "@firebase/firestore";
import { getMessaging, getToken, onMessage } from "@firebase/messaging";
import { store } from "../redux/store";
//import { store } from "../redux/store";
//import * as amplitude from '@amplitude/analytics-browser';
// import posthog from 'posthog-js'
@@ -12,7 +12,7 @@ initializeApp(config);
export const auth = getAuth();
export const firestore = getFirestore();
export const analytics = getAnalytics();
//export const analytics = getAnalytics();
//export default firebase;
export const getCurrentUser = () => {
@@ -72,34 +72,36 @@ onMessage(messaging, (payload) => {
// ...
});
export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
try {
const state = stateProp || store.getState();
// eslint-disable-next-line no-unused-vars
export const logImEXEvent = (eventName, additionalParams, _stateProp = null) => {
// Disabled as a part of IO-3712.
// try {
// const state = stateProp || store.getState();
const eventParams = {
shop: (state.user && state.user.bodyshop && state.user.bodyshop.shopname) || null,
user: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
partsManagementOnly: state?.user?.partsManagementOnly,
...additionalParams
};
// axios.post("/ioevent", {
// useremail: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
// bodyshopid: (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
// operationName: eventName,
// variables: additionalParams,
// dbevent: false,
// env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
// });
// console.log(
// "%c[Analytics]",
// "background-color: green ;font-weight:bold;",
// eventName,
// eventParams
// );
logEvent(analytics, eventName, eventParams);
//amplitude.track(eventName, eventParams);
//posthog.capture(eventName, eventParams);
} finally {
//If it fails, just keep going.
}
// const eventParams = {
// shop: (state.user && state.user.bodyshop && state.user.bodyshop.shopname) || null,
// user: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
// partsManagementOnly: state?.user?.partsManagementOnly,
// ...additionalParams
// };
// // axios.post("/ioevent", {
// // useremail: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
// // bodyshopid: (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
// // operationName: eventName,
// // variables: additionalParams,
// // dbevent: false,
// // env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
// // });
// // console.log(
// // "%c[Analytics]",
// // "background-color: green ;font-weight:bold;",
// // eventName,
// // eventParams
// // );
// logEvent(analytics, eventName, eventParams);
// //amplitude.track(eventName, eventParams);
// //posthog.capture(eventName, eventParams);
// } finally {
// //If it fails, just keep going.
// }
};

16
client/src/index.jsx
View File

@@ -14,8 +14,8 @@ import reportWebVitals from "./reportWebVitals";
import "./translations/i18n";
import "./utils/CleanAxios";
// import * as amplitude from "@amplitude/analytics-browser";
import { PostHogProvider } from "posthog-js/react";
import posthog from "posthog-js";
//import { PostHogProvider } from "posthog-js/react";
//import posthog from "posthog-js";
import { StrictMode } from "react";
window.global ||= window;
@@ -44,11 +44,11 @@ Dinero.globalRoundingMode = "HALF_EVEN";
// // }
// });
posthog.init(import.meta.env.VITE_PUBLIC_POSTHOG_KEY, {
autocapture: false,
capture_exceptions: true,
api_host: import.meta.env.VITE_PUBLIC_POSTHOG_HOST
});
// posthog.init(import.meta.env.VITE_PUBLIC_POSTHOG_KEY, {
// autocapture: false,
// capture_exceptions: true,
// api_host: import.meta.env.VITE_PUBLIC_POSTHOG_HOST
// });
const sentryCreateBrowserRouter = Sentry.wrapCreateBrowserRouterV6(createBrowserRouter);
@@ -70,9 +70,7 @@ function App() {
return (
<Provider store={store}>
<PersistGate loading={<LoadingSpinner message="Restoring your settings..." />} persistor={persistor}>
<PostHogProvider client={posthog}>
<RouterProvider router={router} />
</PostHogProvider>
</PersistGate>
</Provider>
);

34
client/src/redux/user/user.sagas.js
View File

@@ -1,5 +1,5 @@
import FingerprintJS from "@fingerprintjs/fingerprintjs";
import { setUserId, setUserProperties } from "@firebase/analytics";
//import { setUserId, setUserProperties } from "@firebase/analytics";
import {
checkActionCode,
confirmPasswordReset,
@@ -13,10 +13,10 @@ import * as Sentry from "@sentry/react";
import { notification } from "antd";
import axios from "axios";
import i18next from "i18next";
import LogRocket from "logrocket";
//import LogRocket from "logrocket";
import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
import {
analytics,
//analytics,
auth,
firestore,
getCurrentUser,
@@ -49,7 +49,7 @@ import {
validatePasswordResetSuccess
} from "./user.actions";
import UserActionTypes from "./user.types";
import posthog from "posthog-js";
//import posthog from "posthog-js";
import { bodyshopHasDmsKey, determineDMSTypeByBodyshop, DMS_MAP } from "../../utils/dmsUtils";
const fpPromise = FingerprintJS.load();
@@ -91,9 +91,9 @@ export function* isUserAuthenticated() {
return;
}
LogRocket.identify(user.email);
//LogRocket.identify(user.email);
//amplitude.setUserId(user.email);
posthog.identify(user.email);
//posthog.identify(user.email);
const eulaQuery = yield client.query({
query: QUERY_EULA,
@@ -234,7 +234,7 @@ export function* onSignInSuccess() {
}
export function* signInSuccessSaga({ payload }) {
LogRocket.identify(payload.email);
//LogRocket.identify(payload.email);
try {
window.$crisp?.push(["set", "user:nickname", [payload.displayName || payload.email]]);
@@ -279,17 +279,17 @@ export function* signInSuccessSaga({ payload }) {
console.log("Error updating Crisp settings.", error);
}
try {
Sentry.setUser({
email: payload.email,
username: payload.displayName || payload.email
});
} catch (error) {
console.log("Error setting Sentry user.", error);
}
// try {
// Sentry.setUser({
// email: payload.email,
// username: payload.displayName || payload.email
// });
// } catch (error) {
// console.log("Error setting Sentry user.", error);
// }
setUserId(analytics, payload.email);
setUserProperties(analytics, payload);
// setUserId(analytics, payload.email);
// setUserProperties(analytics, payload);
yield;
}