Merge branch 'feature/IO-2776-cdk-fortellis' into feature/Reynolds-and-Reynolds-DMS-API-Integration

2025-09-25 12:08:05 -04:00
parent c6cd6d0f4e f7799ffd03
commit 3d910aa246
82 changed files with 1749 additions and 1077 deletions
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -142,7 +142,16 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
            refetch={refetch}
          />
          <Link to={`/manage/jobs/${record.id}/close`}>
-            <Button>{t("jobs.labels.viewallocations")}</Button>
+            <Button
+              style={{
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+                whiteSpace: "nowrap",
+                verticalAlign: "middle"
+              }}
+            >
+              {t("jobs.labels.viewallocations")}
+            </Button>
          </Link>
        </Space>
      )
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -75,6 +76,7 @@ export function BillsListTableComponent({
      <Button
        title={t("tasks.buttons.create")}
        onClick={() => {
+          logImEXEvent("bills_create_task", {});
          setTaskUpsertContext({
            context: {
              jobid: job.id,
@@ -167,6 +169,7 @@ export function BillsListTableComponent({

  const handleTableChange = (pagination, filters, sorter) => {
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
  };

  const filteredBills = bills
@@ -208,6 +211,7 @@ export function BillsListTableComponent({
              <Button
                disabled={!hasBillsAccess}
                onClick={() => {
+                  logImEXEvent("bills_reconcile", {});
                  setReconciliationContext({
                    actions: { refetch: billsQuery.refetch },
                    context: {
--- a/client/src/components/card-payment-modal/card-payment-modal.component.jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component.jsx
@@ -14,7 +14,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-import { getCurrentUser } from "../../firebase/firebase.utils";
+import { getCurrentUser, logImEXEvent } from "../../firebase/firebase.utils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
@@ -124,6 +124,7 @@ const CardPaymentModalComponent = ({
    const { payments } = form.getFieldsValue();

    try {
+      logImEXEvent("payment_cc_lightbox");
      const response = await axios.post("/intellipay/lightbox_credentials", {
        bodyshop,
        refresh: !!window.intellipay,
@@ -171,6 +172,7 @@ const CardPaymentModalComponent = ({

    try {
      const { payments } = form.getFieldsValue();
+      logImEXEvent("payment_cc_shortlink");
      const response = await axios.post("/intellipay/generate_payment_url", {
        bodyshop,
        amount: payments.reduce((acc, val) => acc + (val?.amount || 0), 0),
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/client/src/components/chat-affix/chat-affix.container.jsx
@@ -9,13 +9,13 @@ import "./chat-affix.styles.scss";
 import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";

-export function ChatAffixContainer({ bodyshop, chatVisible }) {
+export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
  const { t } = useTranslation();
  const client = useApolloClient();
  const { socket } = useSocket();

  useEffect(() => {
-    if (!bodyshop || !bodyshop.messagingservicesid) return;
+    if (!bodyshop?.messagingservicesid) return;

    async function SubscribeToTopicForFCMNotification() {
      try {
@@ -35,8 +35,8 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
    SubscribeToTopicForFCMNotification();

    // Register WebSocket handlers
-    if (socket && socket.connected) {
-      registerMessagingHandlers({ socket, client });
+    if (socket?.connected) {
+      registerMessagingHandlers({ socket, client, currentUser, bodyshop, t });

      return () => {
        unregisterMessagingHandlers({ socket });
@@ -44,11 +44,11 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
    }
  }, [bodyshop, socket, t, client]);

-  if (!bodyshop || !bodyshop.messagingservicesid) return <></>;
+  if (!bodyshop?.messagingservicesid) return <></>;

  return (
    <div className={`chat-affix ${chatVisible ? "chat-affix-open" : ""}`}>
-      {bodyshop && bodyshop.messagingservicesid ? <ChatPopupComponent /> : null}
+      {bodyshop?.messagingservicesid ? <ChatPopupComponent /> : null}
    </div>
  );
 }
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -1,6 +1,11 @@
-import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
 import { gql } from "@apollo/client";

+import { playNewMessageSound } from "../../utils/soundManager.js";
+import { isLeaderTab } from "../../utils/singleTabAudioLeader";
+
+import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
+import { QUERY_ACTIVE_ASSOCIATION_SOUND } from "../../graphql/user.queries";
+
 const logLocal = (message, ...args) => {
  if (import.meta.env.VITE_APP_IS_TEST || !import.meta.env.PROD) {
    console.log(`==================== ${message} ====================`);
@@ -26,16 +31,48 @@ const enrichConversation = (conversation, isOutbound) => ({
  __typename: "conversations"
 });

-export const registerMessagingHandlers = ({ socket, client }) => {
+// Can be uncommonted to test the playback of the notification sound
+// window.testTone = () => {
+//   const notificationSound = new Audio(newMessageSound);
+//   notificationSound.play().catch((error) => {
+//     console.error("Error playing notification sound:", error);
+//   });
+// };
+
+export const registerMessagingHandlers = ({ socket, client, currentUser, bodyshop }) => {
  if (!(socket && client)) return;

  const handleNewMessageSummary = async (message) => {
    const { conversationId, newConversation, existingConversation, isoutbound } = message;

+    // True only when DB value is strictly true; falls back to true on cache miss
+    const isNewMessageSoundEnabled = (client) => {
+      try {
+        const email = currentUser?.email;
+        if (!email) return true; // default allow if we can't resolve user
+        const res = client.readQuery({
+          query: QUERY_ACTIVE_ASSOCIATION_SOUND,
+          variables: { email }
+        });
+        const flag = res?.associations?.[0]?.new_message_sound;
+        return flag === true; // strictly true => enabled
+      } catch {
+        // If the query hasn't been seeded in cache yet, default ON
+        return true;
+      }
+    };
+
    logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });

    const queryVariables = { offset: 0 };

+    if (!isoutbound) {
+      // Play notification sound for new inbound message (scoped to bodyshop)
+      if (isLeaderTab(bodyshop.id) && isNewMessageSoundEnabled(client)) {
+        playNewMessageSound(bodyshop.id);
+      }
+    }
+
    if (!existingConversation && conversationId) {
      // Attempt to read from the cache to determine if this is actually a new conversation
      try {
@@ -291,8 +328,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {

        case "conversation-unarchived":
        case "conversation-archived":
-          // Would like to someday figure out how to get this working without refetch queries,
-          // But I have but a solid 4 hours into it, and there are just too many weird occurrences
          try {
            const listQueryVariables = { offset: 0 };
            const detailsQueryVariables = { conversationId };
@@ -328,7 +363,8 @@ export const registerMessagingHandlers = ({ socket, client }) => {
          }
          break;

-        case "tag-added": { // Ensure `job_conversations` is properly formatted
+        case "tag-added": {
+          // Ensure `job_conversations` is properly formatted
          const formattedJobConversations = job_conversations.map((jc) => ({
            __typename: "job_conversations",
            jobid: jc.jobid || jc.job?.id,
--- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
@@ -34,7 +34,6 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi
    logImEXEvent("contract_finder_search");

    //Execute contract find
-
    callSearch({
      variables: {
        plate: (values.plate && values.plate !== "" && values.plate) || undefined,
--- a/client/src/components/dashboard-grid/createDashboardQuery.js
+++ b/client/src/components/dashboard-grid/createDashboardQuery.js
@@ -2,11 +2,13 @@ import { gql } from "@apollo/client";
 import dayjs from "../../utils/day.js";
 import componentList from "./componentList.js";

-const createDashboardQuery = (state) => {
+const createDashboardQuery = (items) => {
  const componentBasedAdditions =
-    state &&
-    Array.isArray(state.layout) &&
-    state.layout.map((item) => componentList[item.i].gqlFragment || "").join("");
+    Array.isArray(items) &&
+    items
+      .map((item) => (componentList[item.i] && componentList[item.i].gqlFragment) || "")
+      .filter(Boolean)
+      .join("");
  return gql`
    query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
      monthly_sales: jobs(where: {_and: [
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -1,5 +1,5 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
-import { cloneDeep, isEmpty } from "lodash";
+import { cloneDeep } from "lodash";
 import { useMutation, useQuery } from "@apollo/client";
 import { Button, Dropdown, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
@@ -34,14 +34,25 @@ const mapDispatchToProps = () => ({

 export function DashboardGridComponent({ currentUser, bodyshop }) {
  const { t } = useTranslation();
-  const [state, setState] = useState({
-    ...(bodyshop.associations[0].user.dashboardlayout
-      ? bodyshop.associations[0].user.dashboardlayout
-      : { items: [], layout: {}, layouts: [] })
+  const [state, setState] = useState(() => {
+    const persisted = bodyshop.associations[0].user.dashboardlayout;
+    // Normalize persisted structure to avoid malformed shapes that can cause recursive layout recalculations
+    if (persisted) {
+      return {
+        items: Array.isArray(persisted.items) ? persisted.items : [],
+        layout: Array.isArray(persisted.layout) ? persisted.layout : [],
+        layouts: typeof persisted.layouts === "object" && !Array.isArray(persisted.layouts) ? persisted.layouts : {},
+        cols: persisted.cols
+      };
+    }
+    return { items: [], layout: [], layouts: {}, cols: 12 };
  });
  const notification = useNotification();

-  const { loading, error, data, refetch } = useQuery(createDashboardQuery(state), {
+  // Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
+  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
+
+  const { loading, error, data, refetch } = useQuery(dashboardQueryDoc, {
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
@@ -49,21 +60,32 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
  const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);

  const handleLayoutChange = async (layout, layouts) => {
-    logImEXEvent("dashboard_change_layout");
+    try {
+      logImEXEvent("dashboard_change_layout");

-    setState({ ...state, layout, layouts });
+      setState((prev) => ({ ...prev, layout, layouts }));

-    const result = await updateLayout({
-      variables: {
-        email: currentUser.email,
-        layout: { ...state, layout, layouts }
+      const result = await updateLayout({
+        variables: {
+          email: currentUser.email,
+          layout: { ...state, layout, layouts }
+        }
+      });
+
+      if (result?.errors && result.errors.length) {
+        const errorMessages = result.errors.map((e) => e?.message || String(e));
+        notification.error({
+          message: t("dashboard.errors.updatinglayout", {
+            message: errorMessages.join("; ")
+          })
+        });
      }
-    });
-
-    if (!isEmpty(result?.errors)) {
+    } catch (err) {
+      // Catch any unexpected errors (including potential cyclic JSON issues) so the promise never rejects unhandled
+      console.error("Dashboard layout update failed", err);
      notification.error({
        message: t("dashboard.errors.updatinglayout", {
-          message: JSON.stringify(result.errors)
+          message: err?.message || String(err)
        })
      });
    }
@@ -80,19 +102,26 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
  };

  const handleAddComponent = (e) => {
-    logImEXEvent("dashboard_add_component", { name: e.key });
-    setState({
-      ...state,
-      items: [
-        ...state.items,
+    // Avoid passing the full AntD menu click event (contains circular refs) to analytics
+    logImEXEvent("dashboard_add_component", { key: e.key });
+    const compSpec = componentList[e.key] || {};
+    const minW = compSpec.minW || 1;
+    const minH = compSpec.minH || 1;
+    const baseW = compSpec.w || 2;
+    const baseH = compSpec.h || 2;
+    setState((prev) => {
+      const nextItems = [
+        ...prev.items,
        {
          i: e.key,
-          x: (state.items.length * 2) % (state.cols || 12),
-          y: 99, // puts it at the bottom
-          w: componentList[e.key].w || 2,
-          h: componentList[e.key].h || 2
+          // Position near bottom: use a large y so RGL places it last without triggering cascading relayout loops
+          x: (prev.items.length * 2) % (prev.cols || 12),
+          y: 1000,
+          w: Math.max(baseW, minW),
+          h: Math.max(baseH, minH)
        }
-      ]
+      ];
+      return { ...prev, items: nextItems };
    });
  };

@@ -130,25 +159,33 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
        className="layout"
        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
-        width="100%"
        layouts={state.layouts}
        onLayoutChange={handleLayoutChange}
      >
        {state.items.map((item) => {
-          const TheComponent = componentList[item.i].component;
+          const spec = componentList[item.i] || {};
+          const TheComponent = spec.component;
+          const minW = spec.minW || 1;
+          const minH = spec.minH || 1;
+          // Ensure current width/height respect minimums to avoid react-grid-layout prop warnings
+          const safeItem = {
+            ...item,
+            w: Math.max(item.w || spec.w || minW, minW),
+            h: Math.max(item.h || spec.h || minH, minH)
+          };
          return (
            <div
-              key={item.i}
+              key={safeItem.i}
              data-grid={{
-                ...item,
-                minH: componentList[item.i].minH || 1,
-                minW: componentList[item.i].minW || 1
+                ...safeItem,
+                minH,
+                minW
              }}
            >
              <LoadingSkeleton loading={loading}>
                <Icon
                  component={MdClose}
-                  key={item.i}
+                  key={safeItem.i}
                  style={{
                    position: "absolute",
                    zIndex: "2",
@@ -156,9 +193,9 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
                    top: ".25rem",
                    cursor: "pointer"
                  }}
-                  onClick={() => handleRemoveComponent(item.i)}
+                  onClick={() => handleRemoveComponent(safeItem.i)}
                />
-                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />
+                {TheComponent && <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />}
              </LoadingSkeleton>
            </div>
          );
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -75,7 +75,7 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
        jobid: job.id,
        txEnvelope: {
          ...values,
-          SubscriptionID: "5b527d7d-baf3-40bc-adae-e7a541e37363" //bodyshop.cdk_dealerid
+          SubscriptionID: bodyshop.cdk_dealerid
        }
      });
    } else {
@@ -96,16 +96,6 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {

  return (
    <Card title={t("jobs.labels.dms.postingform")}>
-      <Button
-        onClick={() =>
-          wsssocket.emit("fortellis-export-job", {
-            txEnvelope: { test: 1, test2: 2, SubscriptionID: "5b527d7d-baf3-40bc-adae-e7a541e37363" },
-            jobid: job.id
-          })
-        }
-      >
-        Test
-      </Button>
      <Form
        form={form}
        layout="vertical"
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -7,6 +7,7 @@ import { Link, useNavigate } from "react-router-dom";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function GlobalSearchOs() {
  const { t } = useTranslation();
@@ -19,6 +20,8 @@ export default function GlobalSearchOs() {
    if (v && v && v !== "" && v.length >= 3) {
      try {
        setLoading(true);
+        logImEXEvent("global_search", { search: v });
+
        const searchData = await axios.post("/search", {
          search: v
        });
--- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx
+++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
@@ -4,6 +4,7 @@ import { Button, Card, Col, Row, Table, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
@@ -125,6 +126,7 @@ export function JobAuditTrail({ bodyshop, jobId }) {
      render: (text, record) => (
        <Button
          onClick={() => {
+            logImEXEvent("jobs_audit_view_email", {});
            var win = window.open(
              "",
              "Title",
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -46,6 +46,7 @@ import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.con
 import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -397,6 +398,7 @@ export function JobLinesComponent({
      filteredInfo: filters,
      sortedInfo: sorter
    }));
+    logImEXEvent("joblines_table_change", { pagination, filters, sorter });
  };

  const handleMark = (e) => {
@@ -413,6 +415,7 @@ export function JobLinesComponent({
        ])
      );
    }
+    logImEXEvent("joblines_mark_lines", {});
  };

  const markMenu = {
@@ -616,12 +619,18 @@ export function JobLinesComponent({
            expanded ? (
              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
            ) : (
-              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+              <PlusCircleTwoTone
+                onClick={(e) => {
+                  onExpand(record, e);
+                  logImEXEvent("joblines_expander", {});
+                }}
+              />
            )
        }}
        onRow={(record) => {
          return {
            onDoubleClick: () => {
+              logImEXEvent("joblines_double_click_select", {});
              const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
              notMatchingLines.length !== selectedLines.length
                ? setSelectedLines(notMatchingLines)
--- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx
+++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
@@ -1,18 +1,19 @@
-import { useCallback, useEffect, useState } from "react";
-import dayjs from "../../utils/day";
-import axios from "axios";
-import { Badge, Card, Space, Table, Tag } from "antd";
 import { gql, useQuery } from "@apollo/client";
-import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
+import { Badge, Card, Space, Table, Tag } from "antd";
+import axios from "axios";
 import { isEmpty } from "lodash";
+import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import "./job-lifecycle.styles.scss";
-import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
-import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
+import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import "./job-lifecycle.styles.scss";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -57,6 +58,7 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
          jobids: job.id,
          statuses: statuses.statuses
        });
+        logImEXEvent("jobs_lifecycle_data", {});
        const data = response.data.transition[job.id];
        setLifecycleData(data);
      } catch (err) {
--- a/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
+++ b/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
@@ -10,6 +10,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -32,6 +33,7 @@ export function JoblineBulkAssign({ setSelectedLines, selectedLines, insertAudit
  const handleConvert = async (values) => {
    try {
      setLoading(true);
+      logImEXEvent("joblines_bulk_assign", {});
      const result = await assignLines({
        variables: {
          jobline: {
--- a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
+++ b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
@@ -12,6 +12,7 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -46,6 +47,7 @@ export function JobLineDispatchButton({
    try {
      setLoading(true);
      //THIS HAS NOT YET BEEN TESTED. START BY FINISHING THIS FUNCTION.
+      logImEXEvent("joblines_dispatch", {});
      const result = await dispatchLines({
        variables: {
          partsDispatch: {
--- a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
+++ b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
@@ -4,6 +4,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 export default function JobRemoveFromPartsQueue({ checked, jobId }) {
  const [updateJob] = useMutation(UPDATE_JOB);
@@ -13,6 +14,8 @@ export default function JobRemoveFromPartsQueue({ checked, jobId }) {

  const handleChange = async (e) => {
    setLoading(true);
+    logImEXEvent("parts_queue_toggle", { estimators: e });
+
    const result = await updateJob({
      variables: { jobId: jobId, job: { queued_for_parts: e.target.checked } }
    });
--- a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
+++ b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
@@ -8,6 +8,7 @@ import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { selectPartnerVersion } from "../../redux/application/application.selectors";
 import { alphaSort } from "../../utils/sorters";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -30,11 +31,15 @@ export function JobsAvailableScan({ partnerVersion, refetch }) {
  const notification = useNotification();

  const handleTableChange = (pagination, filters, sorter) => {
+    logImEXEvent("available_jobs_scan_sort_filter", { pagination, filters, sorter });
+
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
  };

  const handleImport = async (filepath) => {
    setLoading(true);
+    logImEXEvent("available_jobs_scan", {});
+
    const response = await axios.post("http://localhost:1337/import/", {
      filepath
    });
--- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
@@ -12,6 +12,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -34,6 +35,7 @@ export function JobsAvailableComponent({ bodyshop, loading, data, refetch, addJo

  const handleTableChange = (pagination, filters, sorter) => {
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    logImEXEvent("available_jobs_sort_filter", { pagination, filters, sorter });
  };

  const columns = [
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
@@ -14,6 +14,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser,
@@ -108,6 +109,9 @@ export function JobsDetailHeaderActionsToggleProduction({
                DateTimeFormatterFunction(values.actual_completion)
              )
      });
+
+      logImEXEvent(scenario === "pre" ? "job_intake_quick" : "job-deliver-quick", {});
+
      setPopOverVisible(false);
      closeParentMenu();
      refetch();
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -15,6 +15,7 @@ import { alphaSort, statusSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -177,6 +178,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
    }
    setFilter(filters);
    history({ search: queryString.stringify(search) });
+    logImEXEvent("jobs_all_list_sort_filter", { pagination, filters, sorter });
  };

  useEffect(() => {
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -17,6 +17,7 @@ import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -67,6 +68,7 @@ export function JobsList({ bodyshop }) {
    : [];

  const handleTableChange = (pagination, filters, sorter) => {
+    logImEXEvent("jobs_list_sort_filter", { pagination, filters, sorter });
    setState({ ...state, sortedInfo: sorter });
    setFilter(filters);
  };
--- a/client/src/components/notification-center/notification-center.container.jsx
+++ b/client/src/components/notification-center/notification-center.container.jsx
@@ -39,11 +39,15 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount,
    return showUnreadOnly ? { ...baseWhereClause, read: { _is_null: true } } : baseWhereClause;
  }, [baseWhereClause, showUnreadOnly]);

+  // before you call useQuery, compute skip once so you can reuse it
+  const skipQuery = !userAssociationId || !isEmployee;
+
  const {
    data,
    fetchMore,
    loading: queryLoading,
-    refetch
+    refetch,
+    error
  } = useQuery(GET_NOTIFICATIONS, {
    variables: {
      limit: INITIAL_NOTIFICATIONS,
@@ -52,14 +56,26 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount,
    },
    fetchPolicy: "cache-and-network",
    notifyOnNetworkStatusChange: true,
+    errorPolicy: "all",
    pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
-    skip: !userAssociationId || !isEmployee,
-    onError: (err) => {
-      console.error(`Error polling Notifications: ${err?.message || ""}`);
-      setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
-    }
+    skip: skipQuery
  });

+  // Replace onError with a side-effect that reacts to the hook’s `error`
+  useEffect(() => {
+    if (!error || skipQuery) return;
+
+    console.error(`Error polling Notifications: ${error?.message || ""}`);
+
+    const t = setTimeout(() => {
+      // Guard: if component unmounted or query now skipped, do nothing
+      if (!skipQuery) {
+        refetch().catch((e) => console.error("Refetch failed:", e?.message || e));
+      }
+    }, day.duration(2, "seconds").asMilliseconds());
+
+    return () => clearTimeout(t);
+  }, [error, refetch, skipQuery]);
  useEffect(() => {
    const handleClickOutside = (event) => {
      // Prevent open + close behavior from the header
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -1,17 +1,18 @@
-import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import { useApolloClient, useMutation } from "@apollo/client";
+import { Button, Form, Popconfirm } from "antd";
+import { phone } from "phone"; // Import phone utility for formatting
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors"; // Adjust path
 import { phoneNumberOptOutService } from "../../utils/phoneOptOutService.js"; // Adjust path
 import OwnerDetailFormComponent from "./owner-detail-form.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { phone } from "phone"; // Import phone utility for formatting

 // Connect to Redux to access bodyshop
 const mapStateToProps = createStructuredSelector({
@@ -55,6 +56,7 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {

  const handleDelete = async () => {
    setLoading(true);
+    logImEXEvent("owner_delete", {});
    try {
      const result = await deleteOwner({
        variables: { id: owner.id }
@@ -84,6 +86,7 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {

  const handleFinish = async (values) => {
    setLoading(true);
+    logImEXEvent("owner_update", {});
    try {
      const result = await updateOwner({
        variables: { ownerId: owner.id, owner: values }
--- a/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
@@ -1,7 +1,7 @@
 import { DownOutlined } from "@ant-design/icons";
 import { Dropdown, InputNumber, Space } from "antd";
 import { useTranslation } from "react-i18next";
-
+import { logImEXEvent } from "../../firebase/firebase.utils";
 export default function PartsOrderModalPriceChange({ form, field }) {
  const { t } = useTranslation();
  const menu = {
@@ -63,6 +63,7 @@ export default function PartsOrderModalPriceChange({ form, field }) {
      }
    ],
    onClick: ({ key }) => {
+      logImEXEvent("parts_order_manual_discount", {});
      if (key === "custom") return;
      const values = form.getFieldsValue();
      const { parts_order_lines } = values;
--- a/client/src/components/parts-queue-card/parts-queue-card.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-card.component.jsx
@@ -8,6 +8,7 @@ import AlertComponent from "../alert/alert.component";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsQueueJobLinesComponent from "./parts-queue-job-lines.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function PartsQueueDetailCard() {
  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
@@ -37,6 +38,8 @@ export default function PartsQueueDetailCard() {
  const { t } = useTranslation();
  const handleDrawerClose = () => {
    delete searchParams.selected;
+    logImEXEvent("parts_queue_drawer", {});
+
    history({
      search: queryString.stringify({
        ...searchParams
--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -20,6 +20,7 @@ import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.c
 import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -73,6 +74,7 @@ export function PartsQueueListComponent({ bodyshop }) {
    }
    setFilter(filters);
    history({ search: queryString.stringify(searchParams) });
+    logImEXEvent("parts_queue_sort_filter", { pagination, filters, sorter });
  };

  const handleOnRowClick = (record) => {
--- a/client/src/components/production-board-filters/production-board-filters.component.jsx
+++ b/client/src/components/production-board-filters/production-board-filters.component.jsx
@@ -10,6 +10,7 @@ import {
 } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -26,10 +27,12 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })

  const toggleAlertFilter = () => {
    setFilter({ ...filter, alert: !filter.alert });
+    logImEXEvent("visual_board_filter_alert", {});
  };

  const toggleUnassignedFilter = () => {
    setFilter({ ...filter, unassigned: !filter.unassigned });
+    logImEXEvent("visual_board_filter_unassigned", {});
  };

  return (
@@ -40,6 +43,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
        placeholder={t("general.labels.search")}
        onChange={(e) => {
          setFilter({ ...filter, search: e.target.value });
+          logImEXEvent("visual_board_filter_search", { search: e.target.value });
        }}
      />
      <EmployeeSearchSelectComponent
@@ -47,7 +51,10 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
        options={bodyshop.employees.filter((e) => e.active)}
        value={filter.employeeId}
        placeholder={t("production.labels.employeesearch")}
-        onChange={(emp) => setFilter({ ...filter, employeeId: emp })}
+        onChange={(emp) => {
+          setFilter({ ...filter, employeeId: emp });
+          logImEXEvent("visual_board_filter_alert", { employeeId: emp });
+        }}
        allowClear
      />
      <Button
--- a/client/src/components/production-list-columns/production-list-columns.comment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.comment.component.jsx
@@ -5,6 +5,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function ProductionListColumnComment({ record }) {
  const { t } = useTranslation();
@@ -28,6 +29,7 @@ export default function ProductionListColumnComment({ record }) {
    }).then(() => {
      if (record.refetch) record.refetch();
    });
+    logImEXEvent("job_add_comment", { estimators: e });
  };

  const handleChange = (e) => {
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -18,6 +18,7 @@ import ProductionListDetail from "../production-list-detail/production-list-deta
 import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 import ProductionListPrint from "./production-list-print.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -114,6 +115,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
      setState(newState);
      setHasUnsavedChanges(true);
    }
+    logImEXEvent("production_list_sort_filter", { pagination, filters, sorter });
  };

  const onDragEnd = (fromIndex, toIndex) => {
@@ -134,6 +136,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
      setColumns(newColumns);
      setHasUnsavedChanges(true);
    }
+    logImEXEvent("production_list_remove_column", { key });
  };

  const handleResize =
@@ -156,6 +159,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
      setColumns(updatedColumns);
      setHasUnsavedChanges(true);
    }
+    logImEXEvent("production_list_add_column", { key: newColumn.key });
  };

  const headerItem = (col) => {
--- a/client/src/components/profile-my/profile-my.component.jsx
+++ b/client/src/components/profile-my/profile-my.component.jsx
@@ -1,5 +1,5 @@
-import { Button, Card, Col, Form, Input } from "antd";
-import { LockOutlined } from "@ant-design/icons";
+import { Button, Card, Col, Form, Input, Space, Switch, Tooltip, Typography } from "antd";
+import { AudioMutedOutlined, LockOutlined, SoundOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -10,6 +10,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import NotificationSettingsForm from "../notification-settings/notification-settings-form.component.jsx";
+import { useMutation, useQuery } from "@apollo/client";
+import { QUERY_ACTIVE_ASSOCIATION_SOUND, UPDATE_NEW_MESSAGE_SOUND } from "../../graphql/user.queries.js";

 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser
@@ -48,6 +50,28 @@ export default connect(
    }
  };

+  // ---- Notification sound (associations.new_message_sound) ----
+  const email = currentUser?.email;
+  const { data: assocData, loading: assocLoading } = useQuery(QUERY_ACTIVE_ASSOCIATION_SOUND, {
+    variables: { email },
+    skip: !email,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "cache-first"
+  });
+  const association = assocData?.associations?.[0];
+  // Treat null/undefined as ON for backward-compat
+  const soundEnabled = association?.new_message_sound === true;
+
+  const [updateNewMessageSound, { loading: updatingSound }] = useMutation(UPDATE_NEW_MESSAGE_SOUND, {
+    update(cache, { data }) {
+      const updated = data?.update_associations_by_pk;
+      if (!updated) return;
+      cache.modify({
+        id: cache.identify({ __typename: "associations", id: updated.id }),
+        fields: { new_message_sound: () => updated.new_message_sound }
+      });
+    }
+  });
  return (
    <>
      <Col span={24}>
@@ -80,6 +104,7 @@ export default connect(
          </Card>
        </Form>
      </Col>
+
      <Col span={24}>
        <Form onFinish={handleChangePassword} autoComplete={"no"} initialValues={currentUser} layout="vertical">
          <Card
@@ -119,6 +144,52 @@ export default connect(
          </Card>
        </Form>
      </Col>
+
+      {association && (
+        <Col span={24}>
+          <Card title={t("user.labels.user_settings")}>
+            <Space align="center" size="large">
+              <Typography.Text>{t("user.labels.play_sound_for_new_messages")}</Typography.Text>
+              <Tooltip
+                title={soundEnabled ? t("user.labels.notification_sound_on") : t("user.labels.notification_sound_off")}
+              >
+                <Switch
+                  checkedChildren={<SoundOutlined />}
+                  unCheckedChildren={<AudioMutedOutlined />}
+                  checked={!!soundEnabled}
+                  loading={assocLoading || updatingSound}
+                  onChange={(checked) => {
+                    updateNewMessageSound({
+                      variables: { id: association.id, value: checked },
+                      optimisticResponse: {
+                        update_associations_by_pk: {
+                          __typename: "associations",
+                          id: association.id,
+                          new_message_sound: checked
+                        }
+                      }
+                    })
+                      .then(() => {
+                        notification.success({
+                          message: checked
+                            ? t("user.labels.notification_sound_enabled")
+                            : t("user.labels.notification_sound_disabled")
+                        });
+                      })
+                      .catch((e) => {
+                        notification.error({ message: e.message || "Failed to update setting" });
+                      });
+                  }}
+                />
+              </Tooltip>
+            </Space>
+            <Typography.Paragraph type="secondary" style={{ marginTop: 8 }}>
+              {t("user.labels.notification_sound_help")}
+            </Typography.Paragraph>
+          </Card>
+        </Col>
+      )}
+
      {scenarioNotificationsOn && (
        <Col span={24}>
          <NotificationSettingsForm />
--- a/client/src/components/qbo-authorize/qbo-authorize.component.jsx
+++ b/client/src/components/qbo-authorize/qbo-authorize.component.jsx
@@ -5,6 +5,7 @@ import { useEffect } from "react";
 import { useCookies } from "react-cookie";
 import { useLocation, useNavigate } from "react-router-dom";
 import QboSignIn from "../../assets/qbo/C2QB_green_btn_med_default.svg";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function QboAuthorizeComponent() {
  const location = useLocation();
@@ -12,6 +13,7 @@ export default function QboAuthorizeComponent() {
  const [setCookie] = useCookies(["access_token", "refresh_token"]);

  const handleQbSignIn = async () => {
+    logImEXEvent("qbo_sign_in_clicked");
    const result = await Axios.post("/qbo/authorize");
    window.location.href = result.data;
  };
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx
@@ -9,6 +9,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { upsellEnum, UpsellMaskWrapper } from "../upsell/upsell.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -79,7 +80,12 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
  );

  return (
-    <Popover trigger="hover" placement="bottom" content={popContent}>
+    <Popover
+      trigger="hover"
+      placement="bottom"
+      onOpenChange={(open) => open && logImEXEvent("schedule_spider_graph", {})}
+      content={popContent}
+    >
      <RadarChartOutlined />
    </Popover>
  );
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
@@ -19,6 +19,7 @@ import OwnerNameDisplay from "../owner-name-display/owner-name-display.component
 import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import ScheduleCalendarHeaderGraph from "./schedule-calendar-header-graph.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -142,6 +143,7 @@ export function ScheduleCalendarHeaderComponent({ bodyshop, label, refetch, date
          content={jobsInPopup}
          trigger="hover"
          title={t("appointments.labels.arrivingjobs")}
+          onOpenChange={(open) => open && logImEXEvent("schedule_popover_arriving_jobs", {})}
        >
          <Space size="small">
            <Icon component={MdFileDownload} style={{ color: "green" }} />
@@ -159,6 +161,7 @@ export function ScheduleCalendarHeaderComponent({ bodyshop, label, refetch, date
          content={jobsOutPopup}
          trigger="hover"
          title={t("appointments.labels.completingjobs")}
+          onOpenChange={(open) => open && logImEXEvent("schedule_popover_departing_jobs", {})}
        >
          <Space size="small">
            <Icon component={MdFileUpload} style={{ color: "red" }} />
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
@@ -13,6 +13,7 @@ import Event from "../job-at-change/schedule-event.container";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import local from "./localizer";
 import HeaderComponent from "./schedule-calendar-header.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import "./schedule-calendar.styles.scss";

 const mapStateToProps = createStructuredSelector({
@@ -139,6 +140,8 @@ export function ScheduleCalendarWrapperComponent({
        }}
        onView={(view) => {
          search.view = view;
+          logImEXEvent("schedule_change_view", { view });
+
          history({ search: queryString.stringify(search) });
        }}
        step={15}
--- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx
+++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
@@ -14,6 +14,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import _ from "lodash";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -80,6 +81,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                value={[...estimatorsFilter]}
                onChange={(e) => {
                  setEstimatiorsFilter(e);
+                  logImEXEvent("schedule_filter_by_estimator", { estimators: e });
                }}
                options={estimators.map((e) => ({
                  label: e,
@@ -95,6 +97,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                value={filter?.ins_co_nm ? filter.ins_co_nm : []}
                onChange={(e) => {
                  setFilter({ ...filter, ins_co_nm: e });
+                  logImEXEvent("schedule_filter_by_ins_co_nm", { ins_co_nm: e });
                }}
                options={bodyshop.md_ins_cos.map((i) => ({
                  label: i.name,
--- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
+++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 export default function ScoreboardEntryEdit({ entry }) {
  const [open, setOpen] = useState(false);
@@ -16,6 +17,7 @@ export default function ScoreboardEntryEdit({ entry }) {

  const handleFinish = async (values) => {
    setLoading(true);
+    logImEXEvent("scoreboard_edit_job", {});
    values.date = dayjs(values.date).format("YYYY-MM-DD");
    const result = await updateScoreboardentry({
      variables: { sbId: entry.id, sbInput: values }
--- a/client/src/components/share-to-teams/share-to-teams.component.jsx
+++ b/client/src/components/share-to-teams/share-to-teams.component.jsx
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -52,6 +53,7 @@ const ShareToTeamsComponent = ({
  const teamsShareUrl = `https://teams.microsoft.com/share?href=${currentUrl}&preText=${messageText}&title=${pageTitle}`;
  // Function to open the centered share link in a new window/tab
  const handleShare = () => {
+    logImEXEvent("share_to_teams", {});
    const screenWidth = window.screen.width;
    const screenHeight = window.screen.height;
    const windowWidth = 600;
--- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
+++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
@@ -96,14 +96,14 @@ export function SimplifiedPartsJobsListComponent({

      ellipsis: true,
      sorter: search?.search
-        ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.parts_active_statuses)
+        ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses?.parts_active_statuses)
        : true,
      sortOrder: sortcolumn === "status" && sortorder,
      render: (text, record) => {
        return record.status || t("general.labels.na");
      },
      filteredValue: filter?.status || null,
-      filters: bodyshop.md_ro_statuses.parts_statuses.map((s) => {
+      filters: bodyshop.md_ro_statuses?.parts_statuses.map((s) => {
        return { text: s, value: [s] };
      }),
      onFilter: (value, record) => value.includes(record.status)
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -19,6 +19,7 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter.jsx"
 import dayjs from "../../utils/day";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import PriorityLabel from "../../utils/tasksPriorityLabel.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 /**
 * Task List Component
@@ -289,6 +290,7 @@ function TaskListComponent({
      } else {
        delete search[param];
      }
+      logImEXEvent("tasks_filter", { key: param });
      history({ search: queryString.stringify(search) });
    },
    [history, search]
--- a/client/src/components/task-list/task-list.container.jsx
+++ b/client/src/components/task-list/task-list.container.jsx
@@ -13,6 +13,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import dayjs from "../../utils/day";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -107,6 +108,7 @@ export function TaskListContainer({
          })
        );
      }
+      logImEXEvent("task_completed", {});

      notification["success"]({
        message: t("tasks.successes.completed")
@@ -160,6 +162,7 @@ export function TaskListContainer({
        );
      }

+      logImEXEvent("task_deleted", {});
      notification["success"]({
        message: t("tasks.successes.deleted")
      });
--- a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
@@ -17,6 +17,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import { isEqual } from "lodash";
 import refetchRouteMappings from "./task-upsert-modal.route.mappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser,
@@ -180,7 +181,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
    notification["success"]({
      message: t("tasks.successes.updated")
    });
-
+    logImEXEvent("task_update", {});
    toggleModalVisible();
  };

@@ -217,7 +218,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to

    form.resetFields();
    toggleModalVisible();
-
+    logImEXEvent("task_insert", {});
    notification["success"]({
      message: t("tasks.successes.created")
    });
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
@@ -1,13 +1,14 @@
-import { useState } from "react";
-import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation } from "@apollo/client";
-import VehicleDetailFormComponent from "./vehicle-detail-form.component";
+import { Button, Form, Popconfirm } from "antd";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import dayjs from "../../utils/day";
-import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
 import { useNavigate } from "react-router-dom";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
+import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
+import dayjs from "../../utils/day";
+import VehicleDetailFormComponent from "./vehicle-detail-form.component";

 function VehicleDetailFormContainer({ vehicle, refetch }) {
  const { t } = useTranslation();
@@ -20,6 +21,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {

  const handleDelete = async () => {
    setLoading(true);
+    logImEXEvent("vehicle_delete", {});
    const result = await deleteVehicle({
      variables: { id: vehicle.id }
    });
@@ -42,6 +44,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {

  const handleFinish = async (values) => {
    setLoading(true);
+    logImEXEvent("vehicle_update", {});
    const result = await updateVehicle({
      variables: { vehId: vehicle.id, vehicle: values }
    });