- {(fields, { add, remove, move }) => {
+ {(fields, { remove, move }) => {
return (
{fields.map((field, index) => (
diff --git a/client/src/graphql/apollo-error-handling.js b/client/src/graphql/apollo-error-handling.js
index 5e6e88691..3fdaa929c 100644
--- a/client/src/graphql/apollo-error-handling.js
+++ b/client/src/graphql/apollo-error-handling.js
@@ -1,12 +1,10 @@
import { onError } from "@apollo/client/link/error";
//https://stackoverflow.com/questions/57163454/refreshing-a-token-with-apollo-client-firebase-auth
-import * as Sentry from "@sentry/react";
const errorLink = onError(({ graphQLErrors, networkError, operation, forward }) => {
if (graphQLErrors) {
graphQLErrors.forEach(({ message, locations, path }) => {
console.log(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`);
- Sentry.captureException({ message, locations, path });
});
}
if (networkError) console.log(`[Network error]: ${JSON.stringify(networkError)}`);
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 1310c32da..6b417ba36 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1890,6 +1890,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
kmout
qb_multiple_payers
lbr_adjustments
+ ownr_ea
payments {
amount
created_at
diff --git a/client/src/index.jsx b/client/src/index.jsx
index 2e47b02d1..327d57e84 100644
--- a/client/src/index.jsx
+++ b/client/src/index.jsx
@@ -1,10 +1,12 @@
+import "./utils/sentry"; //Must be first.
import * as Sentry from "@sentry/react";
+import { ConfigProvider } from "antd";
import Dinero from "dinero.js";
-import React from "react";
import ReactDOM from "react-dom/client";
import { Provider } from "react-redux";
import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from "react-router-dom";
import { PersistGate } from "redux-persist/integration/react";
+import { registerSW } from "virtual:pwa-register";
import AppContainer from "./App/App.container";
import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
import "./index.css";
@@ -12,56 +14,18 @@ import { persistor, store } from "./redux/store";
import reportWebVitals from "./reportWebVitals";
import "./translations/i18n";
import "./utils/CleanAxios";
-import { ConfigProvider } from "antd";
-import InstanceRenderManager from "./utils/instanceRenderMgr";
-import { registerSW } from "virtual:pwa-register";
window.global ||= window;
registerSW({ immediate: true });
-//import { BrowserTracing } from "@sentry/tracing";
-//import "antd/dist/antd.css";
-// import "antd/dist/antd.less";
// Dinero.defaultCurrency = "CAD";
// Dinero.globalLocale = "en-CA";
Dinero.globalRoundingMode = "HALF_EVEN";
-if (import.meta.env.PROD) {
- Sentry.init({
- dsn: InstanceRenderManager({
- imex: "https://fd7e89369b6b4bdc9c6c4c9f22fa4ee4@o492140.ingest.sentry.io/5651027",
- rome: "https://a6acc91c073e414196014b8484627a61@o492140.ingest.sentry.io/4504561071161344"
- }),
+const sentryCreateBrowserRouter = Sentry.wrapCreateBrowserRouterV6(createBrowserRouter);
- ignoreErrors: [
- "ResizeObserver loop",
- "ResizeObserver loop limit exceeded",
- "Module specifier, 'fs' does not start",
- "Module specifier, 'zlib' does not start with"
- ],
- integrations: [
- Sentry.replayIntegration({
- maskAllText: false,
- blockAllMedia: true
- }),
- Sentry.browserTracingIntegration()
- ],
- tracePropagationTargets: [
- "api.imex.online",
- "api.test.imex.online",
- "db.imex.online",
- "api.romeonline.io",
- "api.test.romeonline.io",
- "db.romeonline.io"
- ],
- tracesSampleRate: 1.0,
- replaysOnErrorSampleRate: 1.0,
- environment: import.meta.env.MODE
- });
-}
-
-const router = createBrowserRouter(createRoutesFromElements(} />));
+const router = sentryCreateBrowserRouter(createRoutesFromElements(} />));
if (import.meta.env.DEV) {
let styles =
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 5dbf95dc5..bcf0ca09b 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -142,7 +142,7 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
const fetchedAlerts = await response.json();
setAlerts(fetchedAlerts);
} catch (error) {
- console.error("Error fetching alerts:", error);
+ console.warn("Error fetching alerts:", error.message);
}
};
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index 5e5259874..a8c0ffd0b 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -351,7 +351,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
: window.$crisp.push(["set", "session:segments", [["basic"]]]);
} catch (error) {
- console.error("Couldnt find $crisp.");
+ console.warn("Couldnt find $crisp.", error.message);
}
} catch (error) {
yield put(signInFailure(error.message));
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index d0e83bfc7..622b5ab42 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -689,7 +689,7 @@
"notespresets": "Notes Presets",
"orderstatuses": "Order Statuses",
"partslocations": "Parts Locations",
- "partsscan": "Critical Parts Scanning",
+ "partsscan": "Parts Scanning",
"printlater": "Print Later",
"qbo": "Use QuickBooks Online?",
"qbo_departmentid": "QBO Department ID",
diff --git a/client/src/utils/GraphQLClient.js b/client/src/utils/GraphQLClient.js
index 689083139..1e316f894 100644
--- a/client/src/utils/GraphQLClient.js
+++ b/client/src/utils/GraphQLClient.js
@@ -7,9 +7,9 @@ import { getMainDefinition } from "@apollo/client/utilities";
//import { split } from "apollo-link";
import apolloLogger from "apollo-link-logger";
//import axios from "axios";
+import { SentryLink } from "apollo-link-sentry";
import { auth } from "../firebase/firebase.utils";
import errorLink from "../graphql/apollo-error-handling";
-import { SentryLink } from "apollo-link-sentry";
//import { store } from "../redux/store";
const httpLink = new HttpLink({
diff --git a/client/src/utils/sentry.js b/client/src/utils/sentry.js
new file mode 100644
index 000000000..d1152d773
--- /dev/null
+++ b/client/src/utils/sentry.js
@@ -0,0 +1,63 @@
+import * as Sentry from "@sentry/react";
+import { excludeGraphQLFetch } from "apollo-link-sentry";
+import { useEffect } from "react";
+import { createRoutesFromChildren, matchRoutes, useLocation, useNavigationType } from "react-router-dom";
+import InstanceRenderManager from "./instanceRenderMgr";
+
+const currentDatePST = new Date()
+ .toLocaleDateString("en-US", {
+ timeZone: "America/Los_Angeles",
+ year: "numeric",
+ month: "2-digit",
+ day: "2-digit"
+ })
+ .split("/")
+ .reverse()
+ .join("-");
+const sentryRelease =
+ `${import.meta.env.VITE_APP_IS_TEST ? "test" : "production"}-${currentDatePST}-${process.env.VITE_GIT_COMMIT_HASH}`.trim();
+
+if (!import.meta.env.DEV) {
+ Sentry.init({
+ dsn: InstanceRenderManager({
+ imex: "https://fd7e89369b6b4bdc9c6c4c9f22fa4ee4@o492140.ingest.sentry.io/5651027",
+ rome: "https://a6acc91c073e414196014b8484627a61@o492140.ingest.sentry.io/4504561071161344"
+ }),
+ release: sentryRelease,
+
+ ignoreErrors: [
+ "ResizeObserver loop",
+ "ResizeObserver loop limit exceeded",
+ "Module specifier, 'fs' does not start",
+ "Module specifier, 'zlib' does not start with",
+ "Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
+ "Failed to update a ServiceWorker for scope"
+ ],
+ integrations: [
+ // See docs for support of different versions of variation of react router
+ // https://docs.sentry.io/platforms/javascript/guides/react/configuration/integrations/react-router/
+ Sentry.reactRouterV6BrowserTracingIntegration({
+ useEffect,
+ useLocation,
+ useNavigationType,
+ createRoutesFromChildren,
+ matchRoutes
+ }),
+ Sentry.replayIntegration(),
+ Sentry.browserProfilingIntegration()
+ ],
+
+ tracePropagationTargets: [
+ "api.imex.online",
+ "api.test.imex.online",
+ "db.imex.online",
+ "api.romeonline.io",
+ "api.test.romeonline.io",
+ "db.romeonline.io"
+ ],
+ tracesSampleRate: 1.0,
+ replaysOnErrorSampleRate: 1.0,
+ environment: import.meta.env.MODE,
+ beforeBreadcrumb: excludeGraphQLFetch
+ });
+}
diff --git a/client/vite.config.js b/client/vite.config.js
index 0882c1e3a..6b13da6bf 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -1,16 +1,31 @@
+import { sentryVitePlugin } from "@sentry/vite-plugin";
import react from "@vitejs/plugin-react";
+import chalk from "chalk";
+import * as child from "child_process";
import { promises as fsPromises } from "fs";
import { createLogger, defineConfig } from "vite";
import { ViteEjsPlugin } from "vite-plugin-ejs";
import eslint from "vite-plugin-eslint";
import { VitePWA } from "vite-plugin-pwa";
import InstanceRenderManager from "./src/utils/instanceRenderMgr";
-import chalk from "chalk";
// Ensure your environment variables are set correctly for Vite 6
process.env.VITE_APP_GIT_SHA_DATE = new Date().toLocaleString("en-US", {
timeZone: "America/Los_Angeles"
});
+const commitHash = child.execSync("git rev-parse HEAD").toString().trimEnd();
+process.env.VITE_GIT_COMMIT_HASH = commitHash;
+
+const currentDatePST = new Date()
+ .toLocaleDateString("en-US", {
+ timeZone: "America/Los_Angeles",
+ year: "numeric",
+ month: "2-digit",
+ day: "2-digit"
+ })
+ .split("/")
+ .reverse()
+ .join("-");
const getFormattedTimestamp = () =>
new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");
@@ -78,10 +93,25 @@ export default defineConfig({
}
}),
react(),
- eslint()
+ eslint(),
+ sentryVitePlugin({
+ org: "imex",
+ reactComponentAnnotation: {
+ enabled: true
+ },
+ release: {
+ name: `${process.env.VITE_APP_IS_TEST ? "test" : "production"}-${currentDatePST}-${commitHash}`.trim()
+ },
+ project: InstanceRenderManager({
+ instance: process.env.VITE_APP_INSTANCE,
+ imex: "imexonline",
+ rome: "rome-online"
+ })
+ })
],
define: {
- APP_VERSION: JSON.stringify(process.env.npm_package_version)
+ APP_VERSION: JSON.stringify(process.env.npm_package_version),
+ __COMMIT_HASH__: JSON.stringify(commitHash)
},
server: {
host: true,
@@ -184,7 +214,9 @@ export default defineConfig({
"libphonenumber-js": ["libphonenumber-js"]
}
}
- }
+ },
+
+ sourcemap: true
},
optimizeDeps: {
include: [
diff --git a/server/data/usageReport.js b/server/data/usageReport.js
index 42a8b5451..66fec2fca 100644
--- a/server/data/usageReport.js
+++ b/server/data/usageReport.js
@@ -55,7 +55,7 @@ exports.default = async (req, res) => {
const csv = converter.json2csv(shopList, { emptyFieldValue: "" });
emailer
.sendTaskEmail({
- to: ["patrick.fic@convenient-brands.com", "bradley.rhoades@convenient-brands.com"],
+ to: ["patrick.fic@convenient-brands.com", "bradley.rhoades@convenient-brands.com", "jrome@rometech.com"],
subject: `RO Usage Report - ${moment().format("MM/DD/YYYY")}`,
text: `
Usage Report for ${moment().format("MM/DD/YYYY")} for Rome Online Customers.
diff --git a/server/email/sendemail.js b/server/email/sendemail.js
index 7bc258dce..81787fe49 100644
--- a/server/email/sendemail.js
+++ b/server/email/sendemail.js
@@ -92,7 +92,7 @@ const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachmen
},
(err, info) => {
// (message, type, user, record, meta
- logger.log("server-email", err ? "error" : "debug", null, null, { message: err || info });
+ logger.log("server-email", err ? "error" : "debug", null, null, { message: err ? err?.message : info });
}
);
} catch (error) {
@@ -239,24 +239,24 @@ const emailBounce = async (req, res) => {
return;
}
//If it's bounced, log it as bounced in audit log. Send an email to the user.
- const result = await client.request(queries.UPDATE_EMAIL_AUDIT, {
+ await client.request(queries.UPDATE_EMAIL_AUDIT, {
sesid: messageId,
status: "Bounced",
context: message.bounce?.bouncedRecipients
});
mailer.sendMail(
{
- from: InstanceMgr({
+ from: InstanceManager({
imex: `ImEX Online `,
rome: `Rome Online `
}),
to: replyTo,
//bcc: "patrick@snapt.ca",
- subject: `${InstanceMgr({
+ subject: `${InstanceManager({
imex: "ImEX Online",
rome: "Rome Online"
})} Bounced Email - RE: ${subject}`,
- text: `${InstanceMgr({
+ text: `${InstanceManager({
imex: "ImEX Online",
rome: "Rome Online"
})} has tried to deliver an email with the subject: ${subject} to the intended recipients but encountered an error.
@@ -270,7 +270,7 @@ ${body.bounce?.bouncedRecipients.map(
},
(err, info) => {
logger.log("sns-error", err ? "error" : "debug", "api", null, {
- message: err ? JSON.stringify(error) : info
+ message: err ? err?.message : info
});
}
);
diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js
index 930933373..66e76cc50 100644
--- a/server/opensearch/os-handler.js
+++ b/server/opensearch/os-handler.js
@@ -99,6 +99,7 @@ async function OpenSearchUpdateHandler(req, res) {
break;
case "payments":
//Query to get the job and RO number
+
const payment = await client.request(
`query ADMIN_GET_PAYMENT_BY_ID($paymentId: uuid!) {
payments_by_pk(id: $paymentId) {
@@ -147,11 +148,25 @@ async function OpenSearchUpdateHandler(req, res) {
body: document
};
+ logger.log("os-handler", "DEBUG", null, null, {
+ id: req.body.event.data.new.id,
+ index: req.body.table.name,
+ bodyshopid: payload.body.bodyshopid
+ // body: document
+ });
+
const response = await osClient.index(payload);
//console.log(response.body);
res.status(200).json(response.body);
}
} catch (error) {
+ logger.log("os-handler-error", "ERROR", null, null, {
+ id: req.body.event.data.new.id,
+ index: req.body.table.name,
+ message: error.message,
+ stack: error.stack
+ // body: document
+ });
res.status(400).json(JSON.stringify(error));
}
}
@@ -166,7 +181,9 @@ async function OpenSearchSearchHandler(req, res) {
}
logger.log("os-search", "DEBUG", req.user.email, null, {
- search
+ search,
+ index,
+ bodyshopid
});
const BearerToken = req.BearerToken;
@@ -187,7 +204,7 @@ async function OpenSearchSearchHandler(req, res) {
: process.env.BODY_SHOP_ID_MATCH_OVERRIDE;
const { body } = await osClient.search({
- ...(index ? { index } : {}),
+ ...(index ? { index } : { index: ["jobs", "vehicles", "owners", "bills", "payments"] }),
body: {
size: 100,
query: {
@@ -231,8 +248,8 @@ async function OpenSearchSearchHandler(req, res) {
"*ownr_fn^8",
"*ownr_co_nm^8",
"*ownr_ph1^8",
- "*ownr_ph2^8",
- "*"
+ "*ownr_ph2^8"
+ // "*"
]
}
}