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

Merge remote-tracking branch 'origin/release/2025-09-26' into feature/IO-3377-Add-Notification-Tone-For-Messaging

Browse Source
This commit is contained in:
Dave
2025-09-24 11:51:27 -04:00
parent 0b9b3c027f 5b8c7d922c
commit 33579c3e6a
51 changed files with 267 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/.env.development.imex
View File

@@ -16,4 +16,5 @@ TEST_USERNAME="test@imex.dev"
TEST_PASSWORD="test123"
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891

3
client/.env.development.rome
View File

@@ -18,4 +18,5 @@ TEST_USERNAME="test@imex.dev"
TEST_PASSWORD="test123"
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78

3
client/.env.production.imex
View File

@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
VITE_APP_INSTANCE=IMEX
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891

3
client/.env.production.rome
View File

@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
VITE_APP_INSTANCE=ROME
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78

3
client/.env.test.imex
View File

@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
VITE_APP_INSTANCE=IMEX
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891

3
client/.env.test.rome
View File

@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
VITE_APP_INSTANCE=ROME
VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78

11
client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
View File

@@ -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>
)

4
client/src/components/bills-list-table/bills-list-table.component.jsx
View File

@@ -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: {

4
client/src/components/card-payment-modal/card-payment-modal.component.jsx
View File

@@ -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),

1
client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
View File

@@ -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,

10
client/src/components/dashboard-grid/createDashboardQuery.js
View File

@@ -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: [

107
client/src/components/dashboard-grid/dashboard-grid.component.jsx
View File

@@ -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>
);

3
client/src/components/global-search/global-search-os.component.jsx
View File

@@ -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
});

2
client/src/components/job-audit-trail/job-audit-trail.component.jsx
View File

@@ -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",

11
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -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)

20
client/src/components/job-lifecycle/job-lifecycle.component.jsx
View File

@@ -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) {

2
client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
View File

@@ -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: {

2
client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
View File

@@ -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: {

3
client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
View File

@@ -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 } }
});

5
client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
View File

@@ -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
});

2
client/src/components/jobs-available-table/jobs-available-table.component.jsx
View File

@@ -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 = [

4
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
View File

@@ -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();

2
client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
View File

@@ -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(() => {

2
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -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);
};

13
client/src/components/owner-detail-form/owner-detail-form.container.jsx
View File

@@ -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 }

3
client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
View File

@@ -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;

3
client/src/components/parts-queue-card/parts-queue-card.component.jsx
View File

@@ -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

2
client/src/components/parts-queue-list/parts-queue.list.component.jsx
View File

@@ -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) => {

9
client/src/components/production-board-filters/production-board-filters.component.jsx
View File

@@ -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

2
client/src/components/production-list-columns/production-list-columns.comment.component.jsx
View File

@@ -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) => {

4
client/src/components/production-list-table/production-list-table.component.jsx
View File

@@ -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) => {

2
client/src/components/qbo-authorize/qbo-authorize.component.jsx
View File

@@ -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;
};

8
client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx
View File

@@ -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>
);

3
client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
View File

@@ -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" }} />

3
client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
View File

@@ -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}

3
client/src/components/schedule-calendar/schedule-calendar.component.jsx
View File

@@ -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,

2
client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
View File

@@ -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 }

2
client/src/components/share-to-teams/share-to-teams.component.jsx
View File

@@ -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;

4
client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
View File

@@ -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)

2
client/src/components/task-list/task-list.component.jsx
View File

@@ -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]

3
client/src/components/task-list/task-list.container.jsx
View File

@@ -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")
});

5
client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
View File

@@ -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")
});

13
client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
View File

@@ -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 }
});

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

@@ -76,9 +76,11 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
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", {
@@ -89,12 +91,12 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
// 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
// );
console.log(
"%c[Analytics]",
"background-color: green ;font-weight:bold;",
eventName,
eventParams
);
logEvent(analytics, eventName, eventParams);
amplitude.track(eventName, eventParams);
posthog.capture(eventName, eventParams);

4
client/src/graphql/bills.queries.js
View File

@@ -20,8 +20,8 @@ export const DELETE_BILL = gql`
`;
export const QUERY_ALL_BILLS_PAGINATED = gql`
query QUERY_ALL_BILLS_PAGINATED($offset: Int, $limit: Int, $order: [bills_order_by!]!) {
bills(offset: $offset, limit: $limit, order_by: $order) {
query QUERY_ALL_BILLS_PAGINATED($offset: Int, $limit: Int, $order: [bills_order_by!]!, $where: bills_bool_exp) {
bills(offset: $offset, limit: $limit, order_by: $order, where: $where) {
id
vendorid
vendor {

2
client/src/index.jsx
View File

@@ -26,7 +26,7 @@ registerSW({ immediate: true });
// Dinero.globalLocale = "en-CA";
Dinero.globalRoundingMode = "HALF_EVEN";
amplitude.init("6228a598e57cd66875cfd41604f1f891", {
amplitude.init(import.meta.env.VITE_APP_AMP_KEY, {
defaultTracking: true,
serverUrl: import.meta.env.VITE_APP_AMP_URL
// {

30
client/src/pages/bills/bills.page.component.jsx
View File

@@ -18,6 +18,7 @@ import { pageLimit } from "../../utils/config";
import { alphaSort, dateSort } from "../../utils/sorters";
import useLocalStorage from "../../utils/useLocalStorage";
import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
import { logImEXEvent } from "../../firebase/firebase.utils";
const mapDispatchToProps = (dispatch) => ({
setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
@@ -31,7 +32,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
const history = useNavigate();
const [state, setState] = useLocalStorage("bills_list_sort", {
sortedInfo: {},
filteredInfo: { text: "" }
filteredInfo: { vendorname: [] }
});
const Templates = TemplateList("bill");
const { t } = useTranslation();
@@ -48,8 +49,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
vendor: { name: order === "descend" ? "desc" : "asc" }
}),
filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
filteredValue: state.filteredInfo.vendorname || null,
onFilter: (value, record) => record.vendorid === value,
filteredValue: search.vendorIds ? search.vendorIds.split(",") : null,
sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
render: (text, record) => <span>{record.vendor.name}</span>
},
@@ -165,20 +165,37 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
];
const handleTableChange = (pagination, filters, sorter) => {
// Persist filters (including vendorname) and sorting
setState({ ...state, filteredInfo: { ...state.filteredInfo, ...filters }, sortedInfo: sorter });
setState({
sortedInfo: sorter,
filteredInfo: { ...state.filteredInfo, vendorname: filters.vendorname || [] }
});
search.page = pagination.current;
if (filters.vendorname && filters.vendorname.length) {
search.vendorIds = filters.vendorname.join(",");
} else {
delete search.vendorIds;
}
if (sorter && sorter.column && sorter.column.sortObject) {
search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
delete search.sortcolumn;
delete search.sortorder;
} else {
delete search.searchObj;
search.sortcolumn = sorter.order ? sorter.columnKey : null;
search.sortorder = sorter.order;
}
search.sort = JSON.stringify({ [sorter.columnKey]: sorter.order });
history({ search: queryString.stringify(search) });
logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
};
useEffect(() => {
if (!search.vendorIds && state.filteredInfo.vendorname && state.filteredInfo.vendorname.length) {
search.vendorIds = state.filteredInfo.vendorname.join(",");
history({ search: queryString.stringify(search) });
}
}, []);
useEffect(() => {
if (search.search && search.search.trim() !== "") {
searchBills();
@@ -192,6 +209,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
search: value || search.search,
index: "bills"
});
logImEXEvent("bills_search", { search: value || search.search, results: searchData?.data?.hits?.hits?.length });
setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
} catch (error) {
console.log("Error while fetching search results", error);

3
client/src/pages/bills/bills.page.container.jsx
View File

@@ -49,7 +49,8 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
: {
[sortcolumn || "date"]: sortorder ? (sortorder === "descend" ? "desc" : "asc") : "desc"
}
]
],
where: searchParams.vendorIds ? { vendorid: { _in: searchParams.vendorIds.split(",") } } : undefined
}
});

2
client/src/pages/contract-create/contract-create.page.container.jsx
View File

@@ -15,6 +15,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
import ContractCreatePageComponent from "./contract-create.page.component";
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
import { logImEXEvent } from "../../firebase/firebase.utils.js";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
@@ -57,6 +58,7 @@ export function ContractCreatePageContainer({ bodyshop, setBreadcrumbs, setSelec
if (!result.errors) {
//Update the courtesy car to have the damage.
logImEXEvent("courtesy_car_contract_created", {});
notification["success"]({
message: t("contracts.successes.saved")
});

4
client/src/pages/jobs-create/jobs-create.container.jsx
View File

@@ -14,7 +14,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
import JobsCreateComponent from "./jobs-create.component";
import JobCreateContext from "./jobs-create.context";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
import { logImEXEvent } from "../../firebase/firebase.utils";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
@@ -70,6 +70,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
label: t("titles.bc.jobs-new")
}
]);
logImEXEvent("manual_job_create_start", {});
}, [t, setBreadcrumbs, setSelectedHeader]);
const runInsertJob = (job) => {
@@ -81,6 +82,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
error: null,
newJobId: resp.data.insert_jobs.returning[0].id
});
logImEXEvent("manual_job_create_completed", {});
})
.catch((error) => {
notification["error"]({

2
client/vite.config.js
View File

@@ -220,7 +220,7 @@ export default defineConfig({
// Strip console/debugger in prod to shrink bundles
esbuild: {
drop: ["console", "debugger"]
//drop: ["console", "debugger"]
},
optimizeDeps: {