IO-3325 resolve partial commit error.

ES-3348 Ass ES Vehicle type Route.

client/.env.development.imex

@@ -14,3 +14,5 @@ VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX
 TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
+VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com

client/.env.development.rome

@@ -16,3 +16,5 @@ VITE_APP_COUNTRY=USA
 VITE_APP_INSTANCE=ROME
 TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
+VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com

client/.env.production.imex

@@ -13,3 +13,5 @@ VITE_APP_AXIOS_BASE_API_URL=https://api.imex.online/
 VITE_APP_REPORTS_SERVER_URL=https://reports.imex.online
 VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=IMEX
+VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com

client/.env.production.rome

@@ -13,3 +13,5 @@ VITE_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
 VITE_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
 VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=ROME
+VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com

client/.env.test.imex

@@ -13,3 +13,5 @@ VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
 VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX
+VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com

client/.env.test.rome

@@ -13,3 +13,5 @@ VITE_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
 VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=ROME
+VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com

client/package.json

@@ -8,6 +8,7 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
+    "@amplitude/analytics-browser": "^2.23.1",
     "@ant-design/pro-layout": "^7.22.6",
     "@apollo/client": "^3.13.9",
     "@emotion/is-prop-valid": "^1.3.1",
@@ -48,6 +49,7 @@
     "normalize-url": "^8.0.2",
     "object-hash": "^3.0.0",
     "phone": "^3.1.67",
+    "posthog-js": "^1.260.2",
     "prop-types": "^15.8.1",
     "query-string": "^9.2.2",
     "raf-schd": "^4.0.3",

client/src/firebase/firebase.utils.js

@@ -4,6 +4,8 @@ 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 * as amplitude from '@amplitude/analytics-browser';
+import posthog from 'posthog-js'
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -71,25 +73,33 @@ onMessage(messaging, (payload) => {
 });
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
-  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,
-    ...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);
+  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,
+      ...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.
+  }
 };

client/src/index.jsx

@@ -14,6 +14,8 @@ import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
 import "./translations/i18n";
 import "./utils/CleanAxios";
+import * as amplitude from "@amplitude/analytics-browser";
+import { PostHogProvider } from "posthog-js/react";
 
 window.global ||= window;
 
@@ -23,10 +25,10 @@ registerSW({ immediate: true });
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 
+amplitude.init("6228a598e57cd66875cfd41604f1f891", {});
 const sentryCreateBrowserRouter = Sentry.wrapCreateBrowserRouterV6(createBrowserRouter);
 
 const router = sentryCreateBrowserRouter(createRoutesFromElements(<Route path="*" element={<AppContainer />} />));
-
 if (import.meta.env.DEV) {
   let styles =
     "font-weight: bold; font-size: 50px;color: red;  6px 6px 0 rgb(226,91,14) , 9px 9px 0 rgb(245,221,8) , 12px 12px 0 rgb(5,148,68) ";
@@ -37,7 +39,12 @@ function App() {
   return (
     <PersistGate loading={<LoadingSpinner message="Restoring your settings..." />} persistor={persistor}>
       <Provider store={store}>
-        <RouterProvider router={router} />
+        <PostHogProvider
+          apiKey={import.meta.env.VITE_PUBLIC_POSTHOG_KEY}
+          options={{ autocapture: false, capture_exceptions: true }}
+        >
+          <RouterProvider router={router} />
+        </PostHogProvider>
       </Provider>
     </PersistGate>
   );

client/src/pages/parts-settings/parts-settings.page.component.jsx

@@ -34,7 +34,7 @@ export function PartsSettingsPage({ setSelectedHeader, setBreadcrumbs }) {
     setBreadcrumbs([
       {
         link: "/parts",
-        label: "Parts"
+        label: t("titles.bc.parts")
       },
       {
         link: "/parts/settings",

client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.container.jsx

@@ -63,7 +63,7 @@ function SimplifiedPartsJobsDetailContainer({ setBreadcrumbs, addRecentItem, set
             ro_number: data.jobs_by_pk?.ro_number || t("general.labels.na")
           });
     setBreadcrumbs([
-      { link: "/parts", label: "Parts" },
+      { link: "/parts", label: t("titles.bc.parts") },
       {
         link: `/parts/jobs/${jobId}`,
         label: t("titles.bc.jobs-detail", {

client/src/pages/simplified-parts-jobs/simplified-parts-jobs.page.jsx

@@ -22,7 +22,7 @@ export function SimplifiedPartsJobsPage({ setBreadcrumbs, setSelectedHeader }) {
       })
     });
     setSelectedHeader("parts-queue");
-    setBreadcrumbs([{ link: "/parts", label: "Parts" }]);
+    setBreadcrumbs([{ link: "/parts", label: t("titles.bc.parts") }]);
   }, [setBreadcrumbs, t, setSelectedHeader]);
 
   return (

client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx

@@ -51,7 +51,7 @@ export function VehicleDetailContainer({ setBreadcrumbs, addRecentItem, setSelec
     setSelectedHeader("vehicles");
 
     const crumbs = [];
-    if (isPartsEntry) crumbs.push({ link: "/parts", label: "Parts" });
+    if (isPartsEntry) crumbs.push({ link: "/parts", label: t("titles.bc.parts") });
     crumbs.push({ link: `${basePath}/vehicles`, label: t("titles.bc.vehicles") });
     crumbs.push({
       link: `${basePath}/vehicles/${vehId}`,

client/src/pages/vehicles/vehicles.page.container.jsx

@@ -33,7 +33,7 @@ export function VehiclesPageContainer({ setBreadcrumbs, setSelectedHeader, isPar
 
     if (isPartsEntry) {
       setBreadcrumbs([
-        { link: "/parts", label: "Parts" },
+        { link: "/parts", label: t("titles.bc.parts") },
         { link: `${basePath}/vehicles`, label: t("titles.bc.vehicles") }
       ]);
     } else {

client/src/redux/user/user.sagas.js

@@ -49,6 +49,8 @@ import {
   validatePasswordResetSuccess
 } from "./user.actions";
 import UserActionTypes from "./user.types";
+import * as amplitude from '@amplitude/analytics-browser';
+import posthog from 'posthog-js';
 
 const fpPromise = FingerprintJS.load();
 
@@ -83,8 +85,6 @@ export function* onCheckUserSession() {
 
 export function* isUserAuthenticated() {
   try {
-    logImEXEvent("redux_auth_check");
-
     const user = yield getCurrentUser();
     if (!user) {
       yield put(unauthorizedUser());
@@ -92,6 +92,8 @@ export function* isUserAuthenticated() {
     }
 
     LogRocket.identify(user.email);
+    amplitude.setUserId(user.email);
+    posthog.identify(user.email);
 
     const eulaQuery = yield client.query({
       query: QUERY_EULA,
@@ -137,6 +139,7 @@ export function* signOutStart() {
         imexshopid: state.user.bodyshop.imexshopid,
         type: "messaging"
       });
+      amplitude.reset();
     } catch {
       console.log("No FCM token. Skipping unsubscribe.");
     }
@@ -266,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
         instanceSeg,
         ...(isParts
           ? [
-              InstanceRenderManager({
-                imex: "ImexPartsManagement",
-                rome: "RomePartsManagement"
-              })
-            ]
+            InstanceRenderManager({
+              imex: "ImexPartsManagement",
+              rome: "RomePartsManagement"
+            })
+          ]
           : [])
       ];
       window.$crisp.push(["set", "session:segments", [segs]]);
@@ -295,7 +298,6 @@ export function* signInSuccessSaga({ payload }) {
 
   setUserId(analytics, payload.email);
   setUserProperties(analytics, payload);
-  yield logImEXEvent("redux_sign_in_success");
 }
 
 export function* onSendPasswordResetStart() {
@@ -362,6 +364,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     }
 
     try {
+      amplitude.setGroup('Shop', payload.shopname);
       window.$crisp.push(["set", "user:company", [payload.shopname]]);
       if (authRecord[0] && authRecord[0].user.validemail) {
         window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);

client/src/translations/en_us/common.json

@@ -3523,6 +3523,8 @@
       }
     },
     "titles": {
+      "parts_settings": "Parts Management Settings | {{app}}",
+      "simplified-parts-jobs": "Parts Management | {{app}}",
       "accounting-payables": "Payables | {{app}}",
       "accounting-payments": "Payments | {{app}}",
       "accounting-receivables": "Receivables | {{app}}",
@@ -3530,7 +3532,7 @@
       "app": "",
       "bc": {
         "simplified-parts-jobs": "Jobs",
-        "parts": "Jobs",
+        "parts": "Parts",
         "parts_settings": "Settings",
         "accounting-payables": "Payables",
         "accounting-payments": "Payments",

client/src/translations/es/common.json

@@ -3523,6 +3523,9 @@
       }
     },
     "titles": {
+      "simplified-parts-jobs": "",
+      "parts": "",
+      "parts_settings": "",
       "accounting-payables": "",
       "accounting-payments": "",
       "accounting-receivables": "",

client/src/translations/fr/common.json

@@ -3523,6 +3523,9 @@
       }
     },
     "titles": {
+      "simplified-parts-jobs": "",
+      "parts": "",
+      "parts_settings": "",
       "accounting-payables": "",
       "accounting-payments": "",
       "accounting-receivables": "",