IO-3330 CARFAX Bodyshop Query Adjustment

Signed-off-by: Allan Carr <allan@imexsystems.ca>

.dockerignore

@@ -11,7 +11,6 @@ node_modules
 # Files to exclude
 .ebignore
 .editorconfig
-.eslintrc.json
 .gitignore
 .prettierrc.js
 Dockerfile
@@ -19,6 +18,6 @@ README.MD
 bodyshop_translations.babel
 docker-compose.yml
 ecosystem.config.js
-
+eslint.config.mjs
 # Optional: Exclude logs and temporary files
 *.log

.eslintrc.json

@@ -1,19 +0,0 @@
-{
-  "env": {
-    "es6": true,
-    "node": true
-  },
-  "extends": "eslint:recommended",
-  "globals": {
-    "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly"
-  },
-  "parserOptions": {
-    "ecmaVersion": 2018,
-    "sourceType": "module"
-  },
-  "rules": {
-    "no-console": "off"
-  },
-  "settings": {}
-}

_reference/ragmate/local-rag-compose.yml

@@ -0,0 +1,10 @@
+services:
+  ragmate:
+    image: ghcr.io/ragmate/ragmate:latest
+    ports:
+      - "11434:11434"
+    env_file:
+      - .ragmate.env
+    volumes:
+      - .:/project
+      - ./docker_data/ragmate:/apps/cache

client/.env.development.imex

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

client/.env.development.rome

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

client/.env.production.imex

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

client/.env.production.rome

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

client/.env.test.imex

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

client/.env.test.rome

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

client/.eslintrc

@@ -1,8 +0,0 @@
-{
-  "extends": [
-    "react-app"
-  ],
-  "rules": {
-    "no-useless-rename": "off"
-  }
-}

client/eslint.config.js

@@ -2,9 +2,9 @@ import globals from "globals";
 import pluginJs from "@eslint/js";
 import pluginReact from "eslint-plugin-react";
 
-/** @type {import('eslint').Linter.Config[]} */
-
+/** @type {import("eslint").Linter.Config[]} */
 export default [
+  { ignores: ["node_modules/**", "dist/**", "build/**", "dev-dist/**"] },
   {
     files: ["**/*.{js,mjs,cjs,jsx}"]
   },
@@ -12,9 +12,13 @@ export default [
   pluginJs.configs.recommended,
   {
     ...pluginReact.configs.flat.recommended,
+    settings: {
+      react: { version: "detect" }
+    },
     rules: {
       ...pluginReact.configs.flat.recommended.rules,
-      "react/prop-types": 0
+      "react/prop-types": 0,
+      "react/no-children-prop": 0 // Disable react/no-children-prop rule
     }
   },
   pluginReact.configs.flat["jsx-runtime"]

client/package.json

@@ -8,58 +8,60 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@ant-design/pro-layout": "^7.22.4",
-    "@apollo/client": "^3.13.6",
+    "@amplitude/analytics-browser": "^2.23.1",
+    "@ant-design/pro-layout": "^7.22.6",
+    "@apollo/client": "^3.13.9",
     "@emotion/is-prop-valid": "^1.3.1",
     "@fingerprintjs/fingerprintjs": "^4.6.1",
-    "@firebase/analytics": "^0.10.16",
-    "@firebase/app": "^0.13.1",
-    "@firebase/auth": "^1.10.6",
-    "@firebase/firestore": "^4.7.17",
-    "@firebase/messaging": "^0.12.21",
+    "@firebase/analytics": "^0.10.17",
+    "@firebase/app": "^0.14.1",
+    "@firebase/auth": "^1.10.8",
+    "@firebase/firestore": "^4.8.0",
+    "@firebase/messaging": "^0.12.22",
     "@jsreport/browser-client": "^3.1.0",
     "@reduxjs/toolkit": "^2.8.2",
-    "@sentry/cli": "^2.47.1",
-    "@sentry/react": "^9.38.0",
-    "@sentry/vite-plugin": "^3.5.0",
+    "@sentry/cli": "^2.52.0",
+    "@sentry/react": "^9.43.0",
+    "@sentry/vite-plugin": "^4.1.1",
     "@splitsoftware/splitio-react": "^2.3.1",
     "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.25.4",
+    "antd": "^5.27.1",
     "apollo-link-logger": "^2.0.1",
-    "apollo-link-sentry": "^4.3.0",
+    "apollo-link-sentry": "^4.4.0",
     "autosize": "^6.0.1",
-    "axios": "^1.8.4",
+    "axios": "^1.11.0",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.13",
     "dayjs-business-days2": "^1.3.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.4.7",
+    "dotenv": "^17.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
     "graphql": "^16.11.0",
-    "i18next": "^24.2.3",
-    "i18next-browser-languagedetector": "^8.1.0",
+    "i18next": "^25.4.0",
+    "i18next-browser-languagedetector": "^8.2.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.10",
+    "libphonenumber-js": "^1.12.13",
     "logrocket": "^9.0.2",
-    "markerjs2": "^2.32.4",
+    "markerjs2": "^2.32.6",
     "memoize-one": "^6.0.0",
     "normalize-url": "^8.0.2",
     "object-hash": "^3.0.0",
-    "phone": "^3.1.59",
+    "phone": "^3.1.67",
+    "posthog-js": "^1.260.2",
     "prop-types": "^15.8.1",
-    "query-string": "^9.2.0",
+    "query-string": "^9.2.2",
     "raf-schd": "^4.0.3",
     "react": "^18.3.1",
-    "react-big-calendar": "^1.19.2",
+    "react-big-calendar": "^1.19.4",
     "react-color": "^2.19.3",
     "react-cookie": "^8.0.1",
     "react-dom": "^18.3.1",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.1",
     "react-grid-layout": "1.3.4",
-    "react-i18next": "^15.5.2",
+    "react-i18next": "^15.7.1",
     "react-icons": "^5.5.0",
     "react-image-lightbox": "^5.1.4",
     "react-markdown": "^10.1.0",
@@ -70,7 +72,7 @@
     "react-resizable": "^3.0.5",
     "react-router-dom": "^6.30.0",
     "react-sticky": "^6.0.3",
-    "react-virtuoso": "^4.12.8",
+    "react-virtuoso": "^4.14.0",
     "recharts": "^2.15.2",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
@@ -78,9 +80,9 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.89.1",
+    "sass": "^1.90.0",
     "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.18",
+    "styled-components": "^6.1.19",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
     "vite-plugin-ejs": "^1.7.0",
@@ -107,7 +109,9 @@
     "test:e2e:rome": "playwright test --config playwright.rome.config.js",
     "test:e2e:imex:headed": "playwright test --config playwright.config.js --headed",
     "test:e2e:rome:headed": "playwright test --config playwright.rome.config.js --headed",
-    "test:e2e:report": "playwright show-report"
+    "test:e2e:report": "playwright show-report",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   },
   "browserslist": {
     "production": [
@@ -131,37 +135,37 @@
     "@ant-design/icons": "^6.0.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.27.1",
-    "@dotenvx/dotenvx": "^1.47.5",
+    "@dotenvx/dotenvx": "^1.49.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.31.0",
-    "@playwright/test": "^1.54.1",
-    "@sentry/webpack-plugin": "^3.5.0",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.3",
+    "@eslint/js": "^9.33.0",
+    "@playwright/test": "^1.55.0",
+    "@sentry/webpack-plugin": "^4.1.1",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.8.0",
     "@testing-library/react": "^16.3.0",
-    "@vitejs/plugin-react": "^4.5.1",
-    "browserslist": "^4.25.0",
+    "@vitejs/plugin-react": "^4.6.0",
+    "browserslist": "^4.25.3",
     "browserslist-to-esbuild": "^2.1.1",
-    "chalk": "^5.4.1",
-    "eslint": "^8.57.1",
-    "eslint-config-react-app": "^7.0.1",
+    "chalk": "^5.6.0",
+    "eslint": "^9.33.0",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "jsdom": "^26.0.0",
-    "memfs": "^4.17.2",
+    "lightningcss": "^1.30.1",
+    "memfs": "^4.36.3",
     "os-browserify": "^0.3.0",
-    "playwright": "^1.54.1",
+    "playwright": "^1.55.0",
     "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^6.3.5",
-    "vite-plugin-babel": "^1.3.1",
+    "vite": "^7.1.3",
+    "vite-plugin-babel": "^1.3.2",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-node-polyfills": "^0.23.0",
-    "vite-plugin-pwa": "^1.0.0",
+    "vite-plugin-node-polyfills": "^0.24.0",
+    "vite-plugin-pwa": "^1.0.3",
     "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^3.2.3",
+    "vitest": "^3.2.4",
     "workbox-window": "^7.3.0"
   }
 }

client/playwright.config.js

@@ -20,6 +20,7 @@ export default defineConfig({
     command: "npm run start:imex",
     ignoreHTTPSErrors: true,
     url: "https://localhost:3000/health", // Health check endpoint will tell us when the server is ready
+    // eslint-disable-next-line no-undef
     reuseExistingServer: !process.env.CI // Reuse server locally, not in CI
   }
 });

client/playwright.rome.config.js

@@ -20,6 +20,7 @@ export default defineConfig({
     command: "npm run start:rome",
     ignoreHTTPSErrors: true,
     url: "https://localhost:3000/health", // Health check endpoint will tell us when the server is ready
+    // eslint-disable-next-line no-undef
     reuseExistingServer: !process.env.CI // Reuse server locally, not in CI
   }
 });

client/public/firebase-messaging-sw.js

@@ -1,5 +1,7 @@
 // Scripts for firebase and firebase messaging
+// eslint-disable-next-line no-undef
 importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-app-compat.js");
+// eslint-disable-next-line no-undef
 importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-messaging-compat.js");
 
 // Initialize the Firebase app in the service worker by passing the generated config
@@ -42,13 +44,16 @@ switch (this.location.hostname) {
     };
 }
 
+// eslint-disable-next-line no-undef
 firebase.initializeApp(firebaseConfig);
 
 // Retrieve firebase messaging
+// eslint-disable-next-line no-undef
 const messaging = firebase.messaging();
 
 messaging.onBackgroundMessage(function (payload) {
   // Customize notification here
   console.log("[firebase-messaging-sw.js] Received background message ", payload);
+  // eslint-disable-next-line no-undef
   self.registration.showNotification(notificationTitle, notificationOptions);
 });

client/src/App/App.container.jsx

@@ -1,16 +1,20 @@
 import { ApolloProvider } from "@apollo/client";
+import * as Sentry from "@sentry/react";
 import { SplitFactoryProvider, useSplitClient } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
+import { CookiesProvider } from "react-cookie";
 import { useTranslation } from "react-i18next";
-import { useSelector } from "react-redux";
+import { connect, useSelector } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
+import { setDarkMode } from "../redux/application/application.actions";
+import { selectDarkMode } from "../redux/application/application.selectors";
+import { selectCurrentUser } from "../redux/user/user.selectors.js";
 import client from "../utils/GraphQLClient";
 import App from "./App";
-import * as Sentry from "@sentry/react";
-import themeProvider from "./themeProvider";
-import { CookiesProvider } from "react-cookie";
+import getTheme from "./themeProvider";
 
 // Base Split configuration
 const config = {
@@ -24,19 +28,53 @@ const config = {
 function SplitClientProvider({ children }) {
   const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
   const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
-
   useEffect(() => {
     if (splitClient && imexshopid) {
-      // Log readiness for debugging; no need for ready() since isReady is available
       console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
     }
   }, [splitClient, imexshopid]);
-
   return children;
 }
 
-function AppContainer() {
+const mapDispatchToProps = (dispatch) => ({
+  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode))
+});
+
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser
+});
+
+function AppContainer({ currentUser, setDarkMode }) {
   const { t } = useTranslation();
+  const isDarkMode = useSelector(selectDarkMode);
+  const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
+
+  // Update data-theme attribute when dark mode changes
+  useEffect(() => {
+    document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
+    return () => document.documentElement.removeAttribute("data-theme");
+  }, [isDarkMode]);
+
+  // Sync Redux darkMode with localStorage on user change
+  useEffect(() => {
+    if (currentUser?.uid) {
+      const savedMode = localStorage.getItem(`dark-mode-${currentUser.uid}`);
+      if (savedMode !== null) {
+        setDarkMode(JSON.parse(savedMode));
+      } else {
+        setDarkMode(false); // default to light mode
+      }
+    } else {
+      setDarkMode(false);
+    }
+  }, [currentUser?.uid]);
+
+  // Persist darkMode to localStorage when it or user changes
+  useEffect(() => {
+    if (currentUser?.uid) {
+      localStorage.setItem(`dark-mode-${currentUser.uid}`, JSON.stringify(isDarkMode));
+    }
+  }, [isDarkMode, currentUser?.uid]);
 
   return (
     <CookiesProvider>
@@ -44,10 +82,9 @@ function AppContainer() {
         <ConfigProvider
           input={{ autoComplete: "new-password" }}
           locale={enLocale}
-          theme={themeProvider}
+          theme={theme}
           form={{
             validateMessages: {
-              // eslint-disable-next-line no-template-curly-in-string
               required: t("general.validation.required", { label: "${label}" })
             }
           }}
@@ -64,4 +101,4 @@ function AppContainer() {
   );
 }
 
-export default Sentry.withProfiler(AppContainer);
+export default Sentry.withProfiler(connect(mapStateToProps, mapDispatchToProps)(AppContainer));

client/src/App/App.jsx

@@ -7,13 +7,14 @@ import { connect } from "react-redux";
 import { Route, Routes, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import DocumentEditorContainer from "../components/document-editor/document-editor.container";
-import ErrorBoundary from "../components/error-boundary/error-boundary.component"; // Component Imports
+import ErrorBoundary from "../components/error-boundary/error-boundary.component";
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
 import DisclaimerPage from "../pages/disclaimer/disclaimer.page";
 import LandingPage from "../pages/landing/landing.page";
 import TechPageContainer from "../pages/tech/tech.page.container";
-import { setOnline } from "../redux/application/application.actions";
-import { selectOnline } from "../redux/application/application.selectors";
+import SimplifiedPartsPageContainer from "../pages/simplified-parts/simplified-parts.page.container.jsx";
+import { setIsPartsEntry, setOnline } from "../redux/application/application.actions";
+import { selectIsPartsEntry, selectOnline } from "../redux/application/application.selectors";
 import { checkUserSession } from "../redux/user/user.actions";
 import { selectBodyshop, selectCurrentEula, selectCurrentUser } from "../redux/user/user.selectors";
 import PrivateRoute from "../components/PrivateRoute";
@@ -28,21 +29,31 @@ const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
 const SignInPage = lazy(() => import("../pages/sign-in/sign-in.page"));
 const CsiPage = lazy(() => import("../pages/csi/csi.container.page"));
-const MobilePaymentContainer = lazy(() => import("../pages/mobile-payment/mobile-payment.container"));
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   online: selectOnline,
   bodyshop: selectBodyshop,
-  currentEula: selectCurrentEula
+  currentEula: selectCurrentEula,
+  isPartsEntry: selectIsPartsEntry
 });
 
 const mapDispatchToProps = (dispatch) => ({
   checkUserSession: () => dispatch(checkUserSession()),
-  setOnline: (isOnline) => dispatch(setOnline(isOnline))
+  setOnline: (isOnline) => dispatch(setOnline(isOnline)),
+  setIsPartsEntry: (isParts) => dispatch(setIsPartsEntry(isParts))
 });
 
-export function App({ bodyshop, checkUserSession, currentUser, online, setOnline, currentEula }) {
+export function App({
+  bodyshop,
+  checkUserSession,
+  currentUser,
+  online,
+  setOnline,
+  setIsPartsEntry,
+  currentEula,
+  isPartsEntry
+}) {
   const client = useSplitClient().client;
   const [listenersAdded, setListenersAdded] = useState(false);
   const { t } = useTranslation();
@@ -52,10 +63,15 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
     if (!navigator.onLine) {
       setOnline(false);
     }
-
     checkUserSession();
   }, [checkUserSession, setOnline]);
 
+  useEffect(() => {
+    const pathname = window.location.pathname;
+    const isParts = pathname === "/parts" || pathname.startsWith("/parts/");
+    setIsPartsEntry(isParts);
+  }, [setIsPartsEntry]);
+
   //const b = Grid.useBreakpoint();
   // console.log("Breakpoints:", b);
 
@@ -144,6 +160,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         currentUser={currentUser}
         bodyshop={bodyshop}
         workspaceCode={bodyshop?.tours_enabled ? "9BkbEseqNqxw8jUH" : ""}
+        isPartsEntry={isPartsEntry}
       />
 
       <NotificationProvider>
@@ -188,14 +205,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
               </ErrorBoundary>
             }
           />
-          <Route
-            path="/mp/:paymentIs"
-            element={
-              <ErrorBoundary>
-                <MobilePaymentContainer />
-              </ErrorBoundary>
-            }
-          />
           <Route
             path="/manage/*"
             element={
@@ -220,6 +229,18 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
           >
             <Route path="*" element={<TechPageContainer />} />
           </Route>
+          <Route
+            path="/parts/*"
+            element={
+              <ErrorBoundary>
+                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                  <PrivateRoute isAuthorized={currentUser.authorized} />
+                </SocketProvider>
+              </ErrorBoundary>
+            }
+          >
+            <Route path="*" element={<SimplifiedPartsPageContainer />} />
+          </Route>
           <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
             <Route path="*" element={<DocumentEditorContainer />} />
           </Route>

client/src/App/App.styles.scss

@@ -1,15 +1,226 @@
-//Global Styles.
+:root {
+  --table-stripe-bg: #f4f4f4; /* Light mode table stripe */
+  --menu-divider-color: #74695c; /* Light mode menu divider */
+  --menu-submenu-text: rgba(255, 255, 255, 0.65); /* Light mode submenu text */
+  --kanban-column-bg: #ddd; /* Light mode kanban column */
+  --alert-color: blue; /* Light mode alert */
+  --completion-soon-color: rgba(255, 140, 0, 0.8); /* Light mode completion soon */
+  --completion-past-color: rgba(255, 0, 0, 0.8); /* Light mode completion past */
+  --job-line-manual-color: tomato; /* Light mode job line manual */
+  --muted-button-color: lightgray; /* Light mode muted button */
+  --muted-button-hover-color: darkgrey; /* Light mode muted button hover */
+  --table-border-color: #ddd; /* Light mode table border */
+  --table-hover-bg: #f5f5f5; /* Light mode table hover */
+  --popover-bg: #fff; /* Light mode popover background */
+  --error-text: red; /* Light mode error message */
+  --no-jobs-text: #888; /* Light mode no jobs message */
+  --message-yours-bg: #eee; /* Light mode yours message background */
+  --message-mine-bg-start: #00d0ea; /* Light mode mine message gradient start */
+  --message-mine-bg-end: #0085d1; /* Light mode mine message gradient end */
+  --message-mine-text: white; /* Light mode mine message text */
+  --message-mine-tail-bg: white; /* Light mode mine/yours message tail */
+  --system-message-bg: #f5f5f5; /* Light mode system message background */
+  --system-message-text: #555; /* Light mode system message text */
+  --system-label-text: #888; /* Light mode system label/date text */
+  --message-icon-color: whitesmoke; /* Light mode message icon */
+  --eula-card-bg: lightgray; /* Light mode eula card background */
+  --notification-bg: #fff; /* Light mode notification background */
+  --notification-text: rgba(0, 0, 0, 0.85); /* Light mode notification text */
+  --notification-border: #d9d9d9; /* Light mode notification border */
+  --notification-header-bg: #fafafa; /* Light mode notification header background */
+  --notification-header-border: #f0f0f0; /* Light mode notification header border */
+  --notification-header-text: rgba(0, 0, 0, 0.85); /* Light mode notification header text */
+  --notification-toggle-icon: #1677ff; /* Light mode notification toggle icon */
+  --notification-switch-bg: #1677ff; /* Light mode notification switch background */
+  --notification-btn-link: #1677ff; /* Light mode notification link button */
+  --notification-btn-link-hover: #69b1ff; /* Light mode notification link button hover */
+  --notification-btn-link-disabled: rgba(0, 0, 0, 0.25); /* Light mode notification link button disabled */
+  --notification-btn-link-active: #0958d9; /* Light mode notification link button active */
+  --notification-read-bg: #fff; /* Light mode notification read background */
+  --notification-read-text: rgba(0, 0, 0, 0.65); /* Light mode notification read text */
+  --notification-unread-bg: #f5f5f5; /* Light mode notification unread background */
+  --notification-unread-text: rgba(0, 0, 0, 0.85); /* Light mode notification unread text */
+  --notification-item-hover-bg: #fafafa; /* Light mode notification item hover background */
+  --notification-ro-number: #1677ff; /* Light mode notification RO number */
+  --notification-relative-time: rgba(0, 0, 0, 0.45); /* Light mode notification relative time */
+  --alert-bg: #fff1f0; /* Light mode alert background */
+  --alert-text: rgba(0, 0, 0, 0.85); /* Light mode alert text */
+  --alert-border: #ffa39e; /* Light mode alert border */
+  --alert-message: #ff4d4f; /* Light mode alert message */
+  --share-badge-bg: #cccccc; /* Light mode share badge background */
+  --column-header-bg: #d0d0d0; /* Light mode column header background */
+  --footer-bg: #d0d0d0; /* Light mode footer background */
+  --tech-icon-color: orangered; /* Light mode tech icon color */
+  --clone-border-color: #1890ff; /* Light mode clone border color */
+  --event-arrived-bg: rgba(4, 141, 4, 0.4); /* Light mode arrived event background */
+  --event-block-bg: tomato; /* Light mode block event background */
+  --event-selected-bg: slategrey; /* Light mode selected event background */
+  --task-bg: #fff; /* Light mode task center background */
+  --task-text: rgba(0, 0, 0, 0.85); /* Light mode task text */
+  --task-border: #d9d9d9; /* Light mode task border */
+  --task-header-bg: #fafafa; /* Light mode task header background */
+  --task-header-border: #f0f0f0; /* Light mode task header border */
+  --task-section-bg: #f5f5f5; /* Light mode task section background */
+  --task-section-border: #e8e8e8; /* Light mode task section border */
+  --task-row-hover-bg: #f5f5f5; /* Light mode task row hover background */
+  --task-row-border: #f0f0f0; /* Light mode task row border */
+  --task-ro-number: #1677ff; /* Light mode task RO number */
+  --task-due-text: rgba(0, 0, 0, 0.45); /* Light mode task due text */
+  --task-button-bg: #1677ff; /* Light mode task button background */
+  --task-button-hover-bg: #4096ff; /* Light mode task button hover background */
+  --task-button-disabled-bg: #d9d9d9; /* Light mode task button disabled background */
+  --task-button-text: white; /* Light mode task button text */
+  --task-message-text: rgba(0, 0, 0, 0.45); /* Light mode task message text */
+  --mask-bg: rgba(0, 0, 0, 0.05); /* Light mode mask background */
+  --board-text-color: #393939; /* Light mode board text color */
+  --section-bg: #e3e3e3; /* Light mode section background */
+  --detail-text-color: #4d4d4d; /* Light mode detail text color */
+  --card-selected-bg: rgba(128, 128, 128, 0.2); /* Light mode selected card background */
+  --card-stripe-even-bg: #f0f2f5; /* Light mode even card background */
+  --card-stripe-odd-bg: #ffffff; /* Light mode odd card background */
+  --bar-border-color: #f0f2f5; /* Light mode bar border and background */
+  --tag-wrapper-bg: #f0f2f5; /* Light mode tag wrapper background */
+  --tag-wrapper-text: #000; /* Light mode tag wrapper text */
+  --preview-bg: lightgray; /* Light mode preview background */
+  --preview-border-color: #2196F3; /* Light mode preview border color */
+  --event-bg-fallback: #c4c4c4; /* Light mode event background fallback */
+  --card-bg-fallback: #ffffff; /* Light mode card background fallback */
+  --card-text-fallback: black; /* Light mode card text fallback */
+  --table-row-even-bg: rgb(236, 236, 236); /* Light mode table row even background */
+  --status-row-bg-fallback: #ffffff; /* Light mode status row fallback background */
+  --reset-link-color: #0000ff; /* Light mode reset link color */
+  --error-header-text: tomato; /* Light mode error header text */
+  --tooltip-bg: white; /* Light mode tooltip background */
+  --tooltip-border: gray; /* Light mode tooltip border */
+  --tooltip-text-fallback: black; /* Light mode tooltip text fallback */
+  --teams-button-bg: #6264A7; /* Light mode Teams button background */
+  --teams-button-border: #6264A7; /* Light mode Teams button border */
+  --teams-button-text: #FFFFFF; /* Light mode Teams button text and icon */
+  --content-bg: #fff; /* Light mode content background */
+  --legend-bg-fallback: #ffffff; /* Light mode legend background fallback */
+  --tech-content-bg: #fff; /* Light mode tech content background */
+  --today-bg: #ffffff; /* Light mode today background */
+  --today-text: #000000; /* Light mode today text */
+  --off-range-bg: #f8f8f8; /* Light mode off-range background */
+}
+
+[data-theme="dark"] {
+  --table-stripe-bg: #2a2a2a; /* Dark mode table stripe */
+  --menu-divider-color: #5c5c5c; /* Dark mode menu divider */
+  --menu-submenu-text: rgba(255, 255, 255, 0.85); /* Dark mode submenu text */
+  --kanban-column-bg: #333333; /* Dark mode kanban column */
+  --alert-color: #4da8ff; /* Dark mode alert */
+  --completion-soon-color: #ff8c1a; /* Dark mode completion soon */
+  --completion-past-color: #ff4d4f; /* Dark mode completion past */
+  --job-line-manual-color: #ff6347; /* Dark mode job line manual */
+  --muted-button-color: #666666; /* Dark mode muted button */
+  --muted-button-hover-color: #999999; /* Dark mode muted button hover */
+  --table-border-color: #5c5c5c; /* Dark mode table border */
+  --table-hover-bg: #2a2a2a; /* Dark mode table hover */
+  --popover-bg: #2a2a2a; /* Dark mode popover background */
+  --error-text: #ff4d4f; /* Dark mode error message */
+  --no-jobs-text: #999999; /* Dark mode no jobs message */
+  --message-yours-bg: #2a2a2a; /* Dark mode yours message background */
+  --message-mine-bg-start: #4da8ff; /* Dark mode mine message gradient start */
+  --message-mine-bg-end: #326ade; /* Dark mode mine message gradient end */
+  --message-mine-text: #ffffff; /* Dark mode mine message text */
+  --message-mine-tail-bg: #1f1f1f; /* Dark mode mine/yours message tail */
+  --system-message-bg: #333333; /* Dark mode system message background */
+  --system-message-text: #cccccc; /* Dark mode system message text */
+  --system-label-text: #999999; /* Dark mode system label/date text */
+  --message-icon-color: #cccccc; /* Dark mode message icon */
+  --eula-card-bg: #2a2a2a; /* Dark mode eula card background */
+  --notification-bg: #2a2a2a; /* Dark mode notification background */
+  --notification-text: rgba(255, 255, 255, 0.85); /* Dark mode notification text */
+  --notification-border: #5c5c5c; /* Dark mode notification border */
+  --notification-header-bg: #333333; /* Dark mode notification header background */
+  --notification-header-border: #444444; /* Dark mode notification header border */
+  --notification-header-text: rgba(255, 255, 255, 0.85); /* Dark mode notification header text */
+  --notification-toggle-icon: #4da8ff; /* Dark mode notification toggle icon */
+  --notification-switch-bg: #4da8ff; /* Dark mode notification switch background */
+  --notification-btn-link: #4da8ff; /* Dark mode notification link button */
+  --notification-btn-link-hover: #80c1ff; /* Dark mode notification link button hover */
+  --notification-btn-link-disabled: rgba(255, 255, 255, 0.25); /* Dark mode notification link button disabled */
+  --notification-btn-link-active: #2681ff; /* Dark mode notification link button active */
+  --notification-read-bg: #2a2a2a; /* Dark mode notification read background */
+  --notification-read-text: rgba(255, 255, 255, 0.65); /* Dark mode notification read text */
+  --notification-unread-bg: #333333; /* Dark mode notification unread background */
+  --notification-unread-text: rgba(255, 255, 255, 0.85); /* Dark mode notification unread text */
+  --notification-item-hover-bg: #3a3a3a; /* Dark mode notification item hover background */
+  --notification-ro-number: #4da8ff; /* Dark mode notification RO number */
+  --notification-relative-time: rgba(255, 255, 255, 0.45); /* Dark mode notification relative time */
+  --alert-bg: #3a1a1a; /* Dark mode alert background */
+  --alert-text: rgba(255, 255, 255, 0.85); /* Dark mode alert text */
+  --alert-border: #ff6666; /* Dark mode alert border */
+  --alert-message: #ff6666; /* Dark mode alert message */
+  --share-badge-bg: #666666; /* Dark mode share badge background */
+  --column-header-bg: #333333; /* Dark mode column header background */
+  --footer-bg: #333333; /* Dark mode footer background */
+  --tech-icon-color: #ff4500; /* Dark mode tech icon color */
+  --clone-border-color: #4da8ff; /* Dark mode clone border color */
+  --event-arrived-bg: rgba(4, 141, 4, 0.6); /* Dark mode arrived event background */
+  --event-block-bg: tomato; /* Dark mode block event background */
+  --event-selected-bg: #4a5e6e; /* Dark mode selected event background */
+  --task-bg: #2a2a2a; /* Dark mode task center background */
+  --task-text: rgba(255, 255, 255, 0.85); /* Dark mode task text */
+  --task-border: #5c5c5c; /* Dark mode task border */
+  --task-header-bg: #333333; /* Dark mode task header background */
+  --task-header-border: #444444; /* Dark mode task header border */
+  --task-section-bg: #333333; /* Dark mode task section background */
+  --task-section-border: #444444; /* Dark mode task section border */
+  --task-row-hover-bg: #3a3a3a; /* Dark mode task row hover background */
+  --task-row-border: #444444; /* Dark mode task row border */
+  --task-ro-number: #4da8ff; /* Dark mode task RO number */
+  --task-due-text: rgba(255, 255, 255, 0.45); /* Dark mode task due text */
+  --task-button-bg: #4da8ff; /* Dark mode task button background */
+  --task-button-hover-bg: #80c1ff; /* Dark mode task button hover background */
+  --task-button-disabled-bg: #666666; /* Dark mode task button disabled background */
+  --task-button-text: #ffffff; /* Dark mode task button text */
+  --task-message-text: rgba(255, 255, 255, 0.45); /* Dark mode task message text */
+  --mask-bg: rgba(255, 255, 255, 0.05); /* Dark mode mask background */
+  --board-text-color: #cccccc; /* Dark mode board text color */
+  --section-bg: #333333; /* Dark mode section background */
+  --detail-text-color: #bbbbbb; /* Dark mode detail text color */
+  --card-selected-bg: rgba(255, 255, 255, 0.1); /* Dark mode selected card background */
+  --card-stripe-even-bg: #2a2a2a; /* Dark mode even card background */
+  --card-stripe-odd-bg: #1f1f1f; /* Dark mode odd card background */
+  --bar-border-color: #2a2a2a; /* Dark mode bar border and background */
+  --tag-wrapper-bg: #2a2a2a; /* Dark mode tag wrapper background */
+  --tag-wrapper-text: #cccccc; /* Dark mode tag wrapper text */
+  --preview-bg: #2a2a2a; /* Dark mode preview background */
+  --preview-border-color: #4da8ff; /* Dark mode preview border color */
+  --event-bg-fallback: #262626; /* Dark mode event background fallback */
+  --card-bg-fallback: #2a2a2a; /* Dark mode card background fallback */
+  --card-text-fallback: #cccccc; /* Dark mode card text fallback */
+  --table-row-even-bg: #2a2a2a; /* Dark mode table row even background */
+  --status-row-bg-fallback: #1f1f1f; /* Dark mode status row fallback background */
+  --reset-link-color: #4da8ff; /* Dark mode reset link color */
+  --error-header-text: #ff6347; /* Dark mode error header text */
+  --tooltip-bg: #2a2a2a; /* Dark mode tooltip background */
+  --tooltip-border: #5c5c5c; /* Dark mode tooltip border */
+  --tooltip-text-fallback: #cccccc; /* Dark mode tooltip text fallback */
+  --teams-button-bg: #7b7dc4; /* Dark mode Teams button background */
+  --teams-button-border: #7b7dc4; /* Dark mode Teams button border */
+  --teams-button-text: #ffffff; /* Dark mode Teams button text and icon */
+  --content-bg: #2a2a2a; /* Dark mode content background */
+  --legend-bg-fallback: #2a2a2a; /* Dark mode legend background fallback */
+  --tech-content-bg: #2a2a2a; /* Dark mode tech content background */
+  --today-bg: #4a5e6e; /* Dark mode today background */
+  --today-text: #ffffff; /* Dark mode today text */
+  --off-range-bg: #333333; /* Dark mode off-range background */
+  --svg-background: #FFF; /* Dark mode SVG background */
+}
+
+// Global Styles
 @import "react-big-calendar/lib/sass/styles";
 
 .ant-menu-item-divider {
-  border-bottom: 1px solid #74695c !important;
+  border-bottom: 1px solid var(--menu-divider-color) !important;
 }
 
-// TODO: This was added because the newest release of ant was making the text color and the background color the same on a selected header
-// Tried all available tokens (https://ant.design/components/menu?locale=en-US) and even reverted all our custom styles, to no avail
-// This should be kept an eye on, especially if implementing DARK MODE
+// Note: Monitor this in dark mode to ensure text visibility
 .ant-menu-submenu-title {
-  color: rgba(255, 255, 255, 0.65) !important;
+  color: var(--menu-submenu-text) !important;
 }
 
 .imex-table-header {
@@ -46,7 +257,7 @@
 }
 
 .ellipses {
-  display: inline-block; /* for em, a, span, etc (inline by default) */
+  display: inline-block;
   text-overflow: ellipsis;
   width: calc(95%);
   overflow: hidden;
@@ -60,23 +271,24 @@
   }
 }
 
-// ::-webkit-scrollbar-track {
-//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-//   border-radius: 0.2rem;
-//   background-color: #f5f5f5;
-// }
+// Scrollbar styles (uncomment if needed, updated for dark mode)
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  border-radius: 0.2rem;
+  background-color: var(--table-stripe-bg);
+}
 
-// ::-webkit-scrollbar {
-//   width: 0.25rem;
-//   max-height: 0.25rem;
-//   background-color: #f5f5f5;
-// }
+::-webkit-scrollbar {
+  width: 0.25rem;
+  max-height: 0.25rem;
+  background-color: var(--table-stripe-bg);
+}
 
-// ::-webkit-scrollbar-thumb {
-//   border-radius: 0.2rem;
-//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-//   background-color: #188fff;
-// }
+::-webkit-scrollbar-thumb {
+  border-radius: 0.2rem;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: var(--alert-color);
+}
 
 .ant-input-number-input,
 .ant-input-number,
@@ -88,28 +300,27 @@
 
 .production-alert {
   animation: alertBlinker 1s linear infinite;
-  color: blue;
+  color: var(--alert-color);
 }
 
 @keyframes alertBlinker {
   50% {
-    color: red;
+    color: var(--completion-past-color);
     opacity: 100;
-    //opacity: 0;
   }
 }
 
 .blue {
-  color: blue;
+  color: var(--alert-color);
 }
 
 .production-completion-soon {
-  color: rgba(255, 140, 0, 0.8);
+  color: var(--completion-soon-color);
   font-weight: bold;
 }
 
 .production-completion-past {
-  color: rgba(255, 0, 0, 0.8);
+  color: var(--completion-past-color);
   font-weight: bold;
 }
 
@@ -139,7 +350,7 @@
 }
 
 .react-kanban-column {
-  background-color: #ddd !important;
+  background-color: var(--kanban-column-bg) !important;
 }
 
 .production-list-table {
@@ -151,18 +362,18 @@
 .ReactGridGallery_tile-icon-bar {
   div {
     svg {
-      fill: #1890ff;
+      fill: var(--alert-color);
     }
   }
 }
 
 .job-line-manual {
-  color: tomato;
+  color: var(--job-line-manual-color);
   font-style: italic;
 }
 
 .ant-table-tbody > tr.ant-table-row:nth-child(2n) > td {
-  background-color: #f4f4f4;
+  background-color: var(--table-stripe-bg);
 }
 
 .rowWithColor > td {
@@ -170,15 +381,15 @@
 }
 
 .muted-button {
-  color: lightgray;
+  color: var(--muted-button-color);
   border: none;
   background: none;
   cursor: pointer;
-  font-size: 16px; /* Adjust as needed */
+  font-size: 16px;
 }
 
 .muted-button:hover {
-  color: darkgrey;
+  color: var(--muted-button-hover-color);
 }
 
 .notification-alert-unordered-list {
@@ -190,3 +401,31 @@
     margin-right: 0;
   }
 }
+
+.content-container {
+  padding: 1rem;
+}
+
+// Override react-big-calendar styles for dark mode only
+[data-theme="dark"] {
+  .car-svg {
+    background-color: var(--svg-background);
+  }
+
+  .rbc-today {
+    background-color: var(--today-bg);
+    color: var(--today-text);
+  }
+
+  .rbc-off-range {
+    background-color: var(--off-range-bg);
+  }
+
+  .rbc-day-bg.rbc-today {
+    background-color: var(--today-bg);
+  }
+}
+
+//.rbc-time-header-gutter {
+//  padding: 0;
+//} 

client/src/App/ProductFruitsWrapper.jsx

@@ -1,9 +1,9 @@
-import React from "react";
+import { memo } from "react";
 import PropTypes from "prop-types";
 import { ProductFruits } from "react-product-fruits";
 import dayjs from "dayjs";
 
-const ProductFruitsWrapper = React.memo(({ currentUser, bodyshop, workspaceCode }) => {
+const ProductFruitsWrapper = memo(({ currentUser, bodyshop, workspaceCode, isPartsEntry }) => {
   const featureProps = bodyshop?.features
     ? Object.entries(bodyshop.features).reduce((acc, [key, value]) => {
         acc[key] = value === true || (typeof value === "string" && dayjs(value).isAfter(dayjs()));
@@ -12,6 +12,7 @@ const ProductFruitsWrapper = React.memo(({ currentUser, bodyshop, workspaceCode
     : {};
 
   return (
+    !isPartsEntry &&
     workspaceCode &&
     currentUser?.authorized === true &&
     currentUser?.email && (
@@ -30,6 +31,8 @@ const ProductFruitsWrapper = React.memo(({ currentUser, bodyshop, workspaceCode
   );
 });
 
+ProductFruitsWrapper.displayName = "ProductFruitsWrapper";
+
 export default ProductFruitsWrapper;
 
 ProductFruitsWrapper.propTypes = {

client/src/App/themeProvider.js

@@ -4,36 +4,42 @@ import InstanceRenderMgr from "../utils/instanceRenderMgr";
 
 const { defaultAlgorithm, darkAlgorithm } = theme;
 
-let isDarkMode = false;
-
 /**
  * Default theme
  * @type {{components: {Menu: {itemDividerBorderColor: string}}}}
  */
-const defaultTheme = {
+const defaultTheme = (isDarkMode) => ({
   components: {
     Table: {
-      rowHoverBg: "#e7f3ff",
-      rowSelectedBg: "#e6f7ff",
+      rowHoverBg: isDarkMode ? "#2a2a2a" : "#e7f3ff",
+      rowSelectedBg: isDarkMode ? "#333333" : "#e6f7ff",
       headerSortHoverBg: "transparent"
     },
     Menu: {
-      darkItemHoverBg: "#1890ff",
-      itemHoverBg: "#1890ff",
-      horizontalItemHoverBg: "#1890ff"
+      darkItemHoverBg: isDarkMode ? "#004a77" : "#1890ff",
+      itemHoverBg: isDarkMode ? "#004a77" : "#1890ff",
+      horizontalItemHoverBg: isDarkMode ? "#004a77" : "#1890ff"
     }
   },
   token: {
-    colorPrimary: InstanceRenderMgr({
-      imex: "#1890ff",
-      rome: "#326ade"
-    }),
-    colorInfo: InstanceRenderMgr({
-      imex: "#1890ff",
-      rome: "#326ade"
-    })
+    colorPrimary: InstanceRenderMgr(
+      {
+        imex: isDarkMode ? "#4da8ff" : "#1890ff",
+        rome: isDarkMode ? "#5b8ce6" : "#326ade"
+      },
+      isDarkMode
+    ),
+    colorInfo: InstanceRenderMgr(
+      {
+        imex: isDarkMode ? "#4da8ff" : "#1890ff",
+        rome: isDarkMode ? "#5b8ce6" : "#326ade"
+      },
+      isDarkMode
+    ),
+    colorError: isDarkMode ? "#ff4d4f" : "#f5222d",
+    colorBgBase: isDarkMode ? "#1f1f1f" : "#ffffff" // Align with Ant Design dark mode
   }
-};
+});
 
 /**
  * Development theme
@@ -60,8 +66,9 @@ const prodTheme = {};
 
 const currentTheme = import.meta.env.DEV ? devTheme : prodTheme;
 
-const finaltheme = {
+const getTheme = (isDarkMode) => ({
   algorithm: isDarkMode ? darkAlgorithm : defaultAlgorithm,
   ...defaultsDeep(currentTheme, defaultTheme)
-};
-export default finaltheme;
+});
+
+export default getTheme;

client/src/components/PrivateRoute.jsx

@@ -1,7 +1,7 @@
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { Outlet, useLocation, useNavigate } from "react-router-dom";
 
-function PrivateRoute({ component: Component, isAuthorized, ...rest }) {
+function PrivateRoute({ isAuthorized }) {
   const location = useLocation();
   const navigate = useNavigate();
 

client/src/components/_test/test.page.jsx

@@ -1,5 +1,4 @@
 import { Button } from "antd";
-import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setModalContext } from "../../redux/modals/modals.actions";

client/src/components/alert/alert.component.jsx

@@ -1,5 +1,4 @@
 import { Alert } from "antd";
-import React from "react";
 
 export default function AlertComponent(props) {
   return <Alert {...props} />;

client/src/components/allocations-assignment/allocations-assignment.component.jsx

@@ -1,5 +1,4 @@
 import { Button, InputNumber, Popover, Select } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";

client/src/components/allocations-assignment/allocations-assignment.container.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import AllocationsAssignmentComponent from "./allocations-assignment.component";
 import { useMutation } from "@apollo/client";
 import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
@@ -18,7 +18,7 @@ export default function AllocationsAssignmentContainer({ jobLineId, hours, refet
 
   const handleAssignment = () => {
     insertAllocation({ variables: { alloc: { ...assignment } } })
-      .then((r) => {
+      .then(() => {
         notification["success"]({
           message: t("allocations.successes.save")
         });

client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.component.jsx

@@ -1,5 +1,4 @@
 import { Button, Popover, Select } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";

client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.container.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import AllocationsBulkAssignment from "./allocations-bulk-assignment.component";
 import { useMutation } from "@apollo/client";
 import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
@@ -24,7 +24,7 @@ export default function AllocationsBulkAssignmentContainer({ jobLines, refetch }
       return acc;
     }, []);
 
-    insertAllocation({ variables: { alloc: allocs } }).then((r) => {
+    insertAllocation({ variables: { alloc: allocs } }).then(() => {
       notification["success"]({
         message: t("employees.successes.save")
       });

client/src/components/allocations-employee-label/allocations-employee-label.component.jsx

@@ -1,5 +1,4 @@
 import Icon from "@ant-design/icons";
-import React from "react";
 import { MdRemoveCircleOutline } from "react-icons/md";
 
 export default function AllocationsLabelComponent({ allocation, handleClick }) {

client/src/components/allocations-employee-label/allocations-employee-label.container.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { useMutation } from "@apollo/client";
 import { DELETE_ALLOCATION } from "../../graphql/allocations.queries";
 import AllocationsLabelComponent from "./allocations-employee-label.component";
@@ -13,13 +12,13 @@ export default function AllocationsLabelContainer({ allocation, refetch }) {
   const handleClick = (e) => {
     e.preventDefault();
     deleteAllocation({ variables: { id: allocation.id } })
-      .then((r) => {
+      .then(() => {
         notification["success"]({
           message: t("allocations.successes.deleted")
         });
         if (refetch) refetch();
       })
-      .catch((error) => {
+      .catch(() => {
         notification["error"]({ message: t("allocations.errors.deleting") });
       });
   };

client/src/components/audit-trail-list/audit-trail-list.component.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { Table } from "antd";
 import { alphaSort } from "../../utils/sorters";
 import { DateTimeFormatter } from "../../utils/DateFormatter";

client/src/components/audit-trail-list/audit-trail-list.container.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import AuditTrailListComponent from "./audit-trail-list.component";
 import { useQuery } from "@apollo/client";
 import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";

client/src/components/audit-trail-list/email-audit-trail-list.component.jsx

@@ -1,5 +1,5 @@
 import { Table } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";

client/src/components/audit-trail-values/audit-trail-values.component.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { List } from "antd";
 import Icon from "@ant-design/icons";
 import { FaArrowRight } from "react-icons/fa";

client/src/components/barcode-popup/barcode-popup.component.jsx

@@ -1,5 +1,4 @@
 import { Popover, Tag } from "antd";
-import React from "react";
 import Barcode from "react-barcode";
 import { useTranslation } from "react-i18next";
 

client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx

@@ -1,5 +1,5 @@
 import { Checkbox, Form, Skeleton, Typography } from "antd";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
 import "./bill-cm-returns-table.styles.scss";
@@ -33,7 +33,7 @@ export default function BillCmdReturnsTableComponent({ form, returnLoading, retu
 
         return (
           <Form.List name="outstanding_returns">
-            {(fields, { add, remove, move }) => {
+            {(fields) => {
               return (
                 <>
                   <Typography.Title level={4}>{t("bills.labels.creditsnotreceived")}</Typography.Title>

client/src/components/bill-cm-returns-table/bill-cm-returns-table.styles.scss

@@ -6,7 +6,7 @@
   td {
     padding: 8px;
     text-align: left;
-    border-bottom: 1px solid #ddd;
+    border-bottom: 1px solid var(--table-border-color);
 
     .ant-form-item {
       margin-bottom: 0px !important;
@@ -14,6 +14,6 @@
   }
 
   tr:hover {
-    background-color: #f5f5f5;
+    background-color: var(--table-hover-bg);
   }
 }

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -1,7 +1,7 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import { Button, Popconfirm } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DELETE_BILL } from "../../graphql/bills.queries";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
@@ -43,7 +43,7 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
       }
     });
 
-    if (!!!result.errors) {
+    if (!result.errors) {
       notification["success"]({ message: t("bills.successes.deleted") });
       insertAuditTrail({
         jobid: jobid,

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -2,7 +2,7 @@ import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation, useQuery } from "@apollo/client";
 import { Button, Divider, Form, Popconfirm, Space } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
@@ -10,7 +10,6 @@ import { createStructuredSelector } from "reselect";
 import { DELETE_BILL_LINE, INSERT_NEW_BILL_LINES, UPDATE_BILL_LINE } from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
-import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";
@@ -28,13 +27,12 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPartsOrderContext: (context) => dispatch(setModalContext({ context: context, modal: "partsOrder" })),
   insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(BillDetailEditcontainer);
 
-export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail, bodyshop }) {
+export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
   const search = queryString.parse(useLocation().search);
 
   const { t } = useTranslation();
@@ -48,7 +46,7 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail
 
   const { loading, error, data, refetch } = useQuery(QUERY_BILL_BY_PK, {
     variables: { billid: search.billid },
-    skip: !!!search.billid,
+    skip: !search.billid,
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
@@ -71,7 +69,7 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail
     setUpdateLoading(true);
     //let adjustmentsToInsert = {};
 
-    const { billlines, upload, ...bill } = values;
+    const { billlines, ...bill } = values;
     const updates = [];
     updates.push(
       update_bill({
@@ -98,6 +96,7 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail
     });
 
     billlines.forEach((billline) => {
+      // eslint-disable-next-line no-unused-vars
       const { deductedfromlbr, inventories, jobline, original_actual_price, create_ppc, ...il } = billline;
       delete il.__typename;
 
@@ -152,8 +151,8 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail
   if (error) return <AlertComponent message={error.message} type="error" />;
   if (!search.billid) return <></>; //<div>{t("bills.labels.noneselected")}</div>;
 
-  const exported = data && data.bills_by_pk && data.bills_by_pk.exported;
-  const isinhouse = data && data.bills_by_pk && data.bills_by_pk.isinhouse;
+  const exported = data?.bills_by_pk && data.bills_by_pk.exported;
+  const isinhouse = data?.bills_by_pk && data.bills_by_pk.isinhouse;
 
   return (
     <>
@@ -183,8 +182,8 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail
                     {t("general.actions.save")}
                   </Button>
                 </Popconfirm>
-                <BillReeportButtonComponent bill={data && data.bills_by_pk} />
-                <BillMarkExportedButton bill={data && data.bills_by_pk} />
+                <BillReeportButtonComponent bill={data?.bills_by_pk} />
+                <BillMarkExportedButton bill={data?.bills_by_pk} />
               </Space>
             }
           />
@@ -220,11 +219,11 @@ const transformData = (data) => {
         billlines: data.bills_by_pk.billlines.map((i) => {
           return {
             ...i,
-            joblineid: !!i.joblineid ? i.joblineid : "noline",
+            joblineid: i.joblineid ? i.joblineid : "noline",
             applicable_taxes: {
-              federal: (i.applicable_taxes && i.applicable_taxes.federal) || false,
-              state: (i.applicable_taxes && i.applicable_taxes.state) || false,
-              local: (i.applicable_taxes && i.applicable_taxes.local) || false
+              federal: i.applicable_taxes?.federal || false,
+              state: i.applicable_taxes?.state || false,
+              local: i.applicable_taxes?.local || false
             }
           };
         }),

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -1,18 +1,15 @@
 import { Button, Checkbox, Form, Modal } from "antd";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});
+
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(
@@ -20,20 +17,12 @@ const mapDispatchToProps = (dispatch) => ({
         context: context,
         modal: "partsOrder"
       })
-    ),
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(
-      insertAuditTrail({
-        jobid,
-        operation,
-        type
-      })
     )
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(BillDetailEditReturn);
 
-export function BillDetailEditReturn({ setPartsOrderContext, insertAuditTrail, bodyshop, data, disabled }) {
+export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
   const search = queryString.parse(useLocation().search);
   const history = useNavigate();
   const { t } = useTranslation();
@@ -86,9 +75,9 @@ export function BillDetailEditReturn({ setPartsOrderContext, insertAuditTrail, b
         title={t("bills.actions.return")}
         onOk={() => form.submit()}
       >
-        <Form initialValues={data && data.bills_by_pk} onFinish={handleFinish} form={form}>
+        <Form initialValues={data?.bills_by_pk} onFinish={handleFinish} form={form}>
           <Form.List name={["billlines"]}>
-            {(fields, { add, remove, move }) => {
+            {(fields) => {
               return (
                 <table style={{ tableLayout: "auto", width: "100%" }}>
                   <thead>

client/src/components/bill-detail-edit/bill-detail-edit.container.jsx

@@ -1,6 +1,5 @@
 import { Drawer, Grid } from "antd";
 import queryString from "query-string";
-import React from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import BillDetailEditComponent from "./bill-detail-edit-component";
 

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -85,6 +85,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
     }
 
     setLoading(true);
+
+    // eslint-disable-next-line no-unused-vars
     const { upload, location, outstanding_returns, inventory, federal_tax_exempt, ...remainingValues } = values;
 
     let adjustmentsToInsert = {};
@@ -102,9 +104,13 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
                   const {
                     deductedfromlbr,
                     lbr_adjustment,
+                    // eslint-disable-next-line no-unused-vars
                     location: lineLocation,
+                    // eslint-disable-next-line no-unused-vars
                     part_type,
+                    // eslint-disable-next-line no-unused-vars
                     create_ppc,
+                    // eslint-disable-next-line no-unused-vars
                     original_actual_price,
                     ...restI
                   } = i;

client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx

@@ -1,11 +1,11 @@
 import { Form, Input, Table } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
 import BillFormItemsExtendedFormItem from "./bill-form-lines.extended.formitem.component";
 
-export default function BillFormLinesExtended({ lineData, discount, form, responsibilityCenters, disabled }) {
+export default function BillFormLinesExtended({ lineData, discount, form, responsibilityCenters }) {
   const [search, setSearch] = useState("");
   const { t } = useTranslation();
   const columns = [

client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { MinusCircleFilled, PlusCircleFilled, WarningOutlined } from "@ant-design/icons";
 import { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import { useTranslation } from "react-i18next";
@@ -12,7 +11,7 @@ import CiecaSelect from "../../utils/Ciecaselect";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(BillFormItemsExtendedFormItem);
@@ -22,7 +21,6 @@ export function BillFormItemsExtendedFormItem({
   bodyshop,
   form,
   record,
-  index,
   disabled,
   responsibilityCenters,
   discount
@@ -78,7 +76,7 @@ export function BillFormItemsExtendedFormItem({
                 ...billlineskeys,
                 [record.id]: {
                   ...billlineskeys[billlineskeys],
-                  actual_cost: !!billlineskeys[billlineskeys].actual_cost
+                  actual_cost: billlineskeys[billlineskeys].actual_cost
                     ? billlineskeys[billlineskeys].actual_cost
                     : Math.round((parseFloat(e.target.value) * (1 - discount) + Number.EPSILON) * 100) / 100
                 }
@@ -93,7 +91,7 @@ export function BillFormItemsExtendedFormItem({
       <Form.Item shouldUpdate>
         {() => {
           const line = value;
-          if (!!!line) return null;
+          if (!line) return null;
           const lineDiscount = (1 - Math.round((line.actual_cost / line.actual_price) * 100) / 100).toPrecision(2);
 
           if (lineDiscount - discount === 0) return <div />;

client/src/components/bill-form/bill-form.component.jsx

@@ -2,7 +2,7 @@ import Icon, { UploadOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Alert, Divider, Form, Input, Select, Space, Statistic, Switch, Upload } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
@@ -26,7 +26,7 @@ import DateTimePicker from "../form-date-time-picker/form-date-time-picker.compo
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = () => ({});
 
 export function BillFormComponent({
   bodyshop,
@@ -254,7 +254,7 @@ export function BillFormComponent({
               required: true
               //message: t("general.validation.required"),
             },
-            ({ getFieldValue }) => ({
+            () => ({
               validator(rule, value) {
                 if (ClosingPeriod.treatment === "on" && bodyshop.accountingconfig.ClosingPeriod) {
                   if (
@@ -374,8 +374,10 @@ export function BillFormComponent({
             let totals;
             if (!!values.total && !!values.billlines && values.billlines.length > 0)
               totals = CalculateBillTotal(values);
-            if (!!totals)
+            if (totals)
               return (
+                // TODO: Align is not correct
+                // eslint-disable-next-line react/no-unknown-property
                 <div align="right">
                   <Space size="large" wrap>
                     <Statistic title={t("bills.labels.subtotal")} value={totals.subtotal.toFormat()} precision={2} />
@@ -458,7 +460,7 @@ export function BillFormComponent({
           if (Array.isArray(e)) {
             return e;
           }
-          return e && e.fileList;
+          return e?.fileList;
         }}
       >
         <Upload.Dragger multiple={true} name="logo" beforeUpload={() => false} listType="picture">

client/src/components/bill-form/bill-form.container.jsx

@@ -1,6 +1,5 @@
 import { useLazyQuery, useQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -1,7 +1,6 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Form, Input, InputNumber, Select, Space, Switch, Table, Tooltip } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -16,7 +15,7 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -27,8 +26,7 @@ export function BillEnterModalLinesComponent({
   discount,
   form,
   responsibilityCenters,
-  billEdit,
-  billid
+  billEdit
 }) {
   const { t } = useTranslation();
   const { setFieldsValue, getFieldsValue, getFieldValue } = form;
@@ -126,7 +124,7 @@ export function BillEnterModalLinesComponent({
             ]
           };
         },
-        formInput: (record, index) => <Input.TextArea disabled={disabled} autoSize />
+        formInput: () => <Input.TextArea disabled={disabled} autoSize />
       },
       {
         title: t("billlines.fields.quantity"),
@@ -158,7 +156,7 @@ export function BillEnterModalLinesComponent({
             ]
           };
         },
-        formInput: (record, index) => <InputNumber precision={0} min={1} disabled={disabled} />
+        formInput: () => <InputNumber precision={0} min={1} disabled={disabled} />
       },
       {
         title: t("billlines.fields.actual_price"),
@@ -188,7 +186,7 @@ export function BillEnterModalLinesComponent({
                   if (idx === index) {
                     return {
                       ...item,
-                      actual_cost: !!item.actual_cost
+                      actual_cost: item.actual_cost
                         ? item.actual_cost
                         : Math.round((parseFloat(e.target.value) * (1 - discount) + Number.EPSILON) * 100) / 100
                     };
@@ -258,7 +256,7 @@ export function BillEnterModalLinesComponent({
               <Form.Item shouldUpdate noStyle>
                 {() => {
                   const line = getFieldsValue(["billlines"]).billlines[index];
-                  if (!!!line) return null;
+                  if (!line) return null;
                   let lineDiscount = 1 - line.actual_cost / line.actual_price;
                   if (isNaN(lineDiscount)) lineDiscount = 0;
                   return (
@@ -322,7 +320,7 @@ export function BillEnterModalLinesComponent({
             ]
           };
         },
-        formInput: (record, index) => (
+        formInput: () => (
           <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
             {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
               ? CiecaSelect(true, false)
@@ -344,7 +342,7 @@ export function BillEnterModalLinesComponent({
                   name: [field.name, "location"]
                 };
               },
-              formInput: (record, index) => (
+              formInput: () => (
                 <Select disabled={disabled}>
                   {bodyshop.md_parts_locations.map((loc, idx) => (
                     <Select.Option key={idx} value={loc}>
@@ -366,7 +364,7 @@ export function BillEnterModalLinesComponent({
             name: [field.name, "deductedfromlbr"]
           };
         },
-        formInput: (record, index) => <Switch disabled={disabled} />,
+        formInput: () => <Switch disabled={disabled} />,
         additional: (record, index) => (
           <Form.Item shouldUpdate noStyle style={{ display: "inline-block" }}>
             {() => {
@@ -478,7 +476,7 @@ export function BillEnterModalLinesComponent({
                 name: [field.name, "applicable_taxes", "federal"]
               };
             },
-            formInput: (record, index) => <Switch disabled={disabled} />
+            formInput: () => <Switch disabled={disabled} />
           }
         ]
       }),
@@ -495,7 +493,7 @@ export function BillEnterModalLinesComponent({
             name: [field.name, "applicable_taxes", "state"]
           };
         },
-        formInput: (record, index) => <Switch disabled={disabled} />
+        formInput: () => <Switch disabled={disabled} />
       },
 
       ...InstanceRenderManager({
@@ -513,7 +511,7 @@ export function BillEnterModalLinesComponent({
                 name: [field.name, "applicable_taxes", "local"]
               };
             },
-            formInput: (record, index) => <Switch disabled={disabled} />
+            formInput: () => <Switch disabled={disabled} />
           }
         ]
       }),
@@ -575,7 +573,7 @@ export function BillEnterModalLinesComponent({
         }
       ]}
     >
-      {(fields, { add, remove, move }) => {
+      {(fields, { add, remove }) => {
         return (
           <>
             <Table
@@ -612,19 +610,7 @@ export function BillEnterModalLinesComponent({
 
 export default connect(mapStateToProps, mapDispatchToProps)(BillEnterModalLinesComponent);
 
-const EditableCell = ({
-  dataIndex,
-  title,
-  inputType,
-  record,
-  index,
-  children,
-  formInput,
-  formItemProps,
-  additional,
-  wrapper,
-  ...restProps
-}) => {
+const EditableCell = ({ dataIndex, record, children, formInput, formItemProps, additional, wrapper, ...restProps }) => {
   const propsFinal = formItemProps && formItemProps(record);
   if (propsFinal && "key" in propsFinal) {
     delete propsFinal.key;

client/src/components/bill-form/bill-form.totals.utility.js

@@ -9,10 +9,10 @@ export const CalculateBillTotal = (invoice) => {
   let stateTax = Dinero({ amount: 0 });
   let localTax = Dinero({ amount: 0 });
 
-  if (!!!billlines) return null;
+  if (!billlines) return null;
 
   billlines.forEach((i) => {
-    if (!!i) {
+    if (i) {
       const itemTotal = Dinero({
         amount: Math.round((i.actual_cost || 0) * 100)
       }).multiply(i.quantity || 1);

client/src/components/bill-inventory-table/bill-inventory-table.component.jsx

@@ -1,5 +1,5 @@
 import { Checkbox, Form, Skeleton, Typography } from "antd";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
 import "./bill-inventory-table.styles.scss";
@@ -13,7 +13,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   billEnterModal: selectBillEnterModal
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(BillInventoryTable);
@@ -22,7 +22,7 @@ export function BillInventoryTable({ billEnterModal, bodyshop, form, billEdit, i
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (inventoryData && inventoryData.inventory) {
+    if (inventoryData?.inventory) {
       form.setFieldsValue({
         inventory: billEnterModal.context.consumeinventoryid
           ? inventoryData.inventory.map((i) => {
@@ -47,7 +47,7 @@ export function BillInventoryTable({ billEnterModal, bodyshop, form, billEdit, i
 
         return (
           <Form.List name="inventory">
-            {(fields, { add, remove, move }) => {
+            {(fields) => {
               return (
                 <>
                   <Typography.Title level={4}>{t("inventory.labels.inventory")}</Typography.Title>

client/src/components/bill-inventory-table/bill-inventory-table.styles.scss

@@ -6,7 +6,7 @@
   td {
     padding: 8px;
     text-align: left;
-    border-bottom: 1px solid #ddd;
+    border-bottom: 1px solid var(--table-border-color);
 
     .ant-form-item {
       margin-bottom: 0px !important;
@@ -14,6 +14,6 @@
   }
 
   tr:hover {
-    background-color: #f5f5f5;
+    background-color: var(--table-hover-bg);
   }
 }

client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx

@@ -1,6 +1,6 @@
 import { gql, useMutation } from "@apollo/client";
 import { Button } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { connect } from "react-redux";
@@ -15,7 +15,7 @@ const mapStateToProps = createStructuredSelector({
   authLevel: selectAuthLevel,
   currentUser: selectCurrentUser
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 

client/src/components/bill-print-button/bill-print-button.component.jsx

@@ -1,5 +1,5 @@
 import { Button, Space } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -26,7 +26,7 @@ export default function BillPrintButton({ billid }) {
         null,
         notification
       );
-    } catch (e) {
+    } catch {
       console.warn("Warning: Error generating a document.");
     }
     setLoading(false);

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -1,6 +1,6 @@
 import { gql, useMutation } from "@apollo/client";
 import { Button } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { connect } from "react-redux";
@@ -13,7 +13,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 

client/src/components/billline-add-inventory/billline-add-inventory.component.jsx

@@ -3,7 +3,7 @@ import { useMutation } from "@apollo/client";
 import { Button, Tooltip } from "antd";
 import { t } from "i18next";
 import dayjs from "./../../utils/day";
-import React, { useState } from "react";
+import { useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_INVENTORY_AND_CREDIT } from "../../graphql/inventory.queries";
@@ -17,7 +17,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(BilllineAddInventory);

client/src/components/bills-vendors-list/bills-vendors-list.component.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { useQuery } from "@apollo/client";
 import queryString from "query-string";
@@ -100,9 +100,9 @@ export default function BillsVendorsList() {
         selectedRowKeys: [search.vendorid],
         type: "radio"
       }}
-      onRow={(record, rowIndex) => {
+      onRow={(record) => {
         return {
-          onClick: (event) => {
+          onClick: () => {
             handleOnRowClick(record);
           } // click row
         };

client/src/components/breadcrumbs/breadcrumbs.component.jsx

@@ -1,10 +1,9 @@
 import { HomeFilled } from "@ant-design/icons";
 import { Breadcrumb, Col, Row } from "antd";
-import React from "react";
+import { selectBreadcrumbs, selectIsPartsEntry } from "../../redux/application/application.selectors";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { selectBreadcrumbs } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import GlobalSearch from "../global-search/global-search.component";
 import GlobalSearchOs from "../global-search/global-search-os.component";
@@ -13,18 +12,19 @@ import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   breadcrumbs: selectBreadcrumbs,
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  isPartsEntry: selectIsPartsEntry
 });
 
-export function BreadCrumbs({ breadcrumbs, bodyshop }) {
+export function BreadCrumbs({ breadcrumbs, bodyshop, isPartsEntry }) {
   const {
     treatments: { OpenSearch }
   } = useSplitTreatments({
     attributes: {},
     names: ["OpenSearch"],
-    splitKey: bodyshop && bodyshop.imexshopid
+    splitKey: bodyshop?.imexshopid
   });
-  // TODO - Client Update - Technically key is not doing anything here
+
   return (
     <Row className="breadcrumb-container">
       <Col xs={24} sm={24} md={16}>
@@ -34,8 +34,8 @@ export function BreadCrumbs({ breadcrumbs, bodyshop }) {
             {
               key: "home",
               title: (
-                <Link to={`/manage/`}>
-                  <HomeFilled /> {(bodyshop && bodyshop.shopname && `(${bodyshop.shopname})`) || ""}
+                <Link to={isPartsEntry ? `/parts/` : `/manage/`}>
+                  <HomeFilled /> {(bodyshop?.shopname && `(${bodyshop.shopname})`) || ""}
                 </Link>
               )
             },

client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx

@@ -1,5 +1,5 @@
 import { Button, Form, Modal } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -32,12 +32,13 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
     logImEXEvent("ca_bc_etf_table_parse");
     setLoading(true);
     const claimNumbers = [];
-    values.table.split("\n").forEach((row, idx, arr) => {
+    values.table.split("\n").forEach((row) => {
       const { 1: claim, 2: shortclaim, 4: amount } = row.split("\t");
       if (!claim || !shortclaim) return;
       const trimmedShortClaim = shortclaim.trim();
       // const trimmedClaim = claim.trim();
       if (amount.slice(-1) === "-") {
+        // NO OP
       }
 
       claimNumbers.push({

client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx

@@ -1,17 +1,13 @@
 import { Form, Input, Radio } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});
 
 export default connect(mapStateToProps, null)(PartsReceiveModalComponent);
 
-export function PartsReceiveModalComponent({ bodyshop, form }) {
+export function PartsReceiveModalComponent() {
   const { t } = useTranslation();
 
   return (

client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx

@@ -1,6 +1,6 @@
 import { CalculatorFilled } from "@ant-design/icons";
 import { Button, Form, InputNumber, Popover, Space } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 

client/src/components/card-payment-modal/card-payment-modal.component.jsx

@@ -2,7 +2,7 @@ import { CopyFilled, DeleteFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { Button, Card, Col, Form, Input, message, Row, Space, Spin, Statistic } from "antd";
 import axios from "axios";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -133,7 +133,6 @@ const CardPaymentModalComponent = ({
       });
 
       if (window.intellipay) {
-        // eslint-disable-next-line no-eval
         eval(response.data);
         pollForIntelliPay(() => {
           SetIntellipayCallbackFunctions();
@@ -149,7 +148,7 @@ const CardPaymentModalComponent = ({
           window.intellipay.initialize();
         });
       }
-    } catch (error) {
+    } catch {
       notification.open({
         type: "error",
         message: t("job_payments.notifications.error.openingip")
@@ -187,7 +186,7 @@ const CardPaymentModalComponent = ({
         message.success(t("general.actions.copied"));
       }
       setLoading(false);
-    } catch (error) {
+    } catch {
       notification.open({
         type: "error",
         message: t("job_payments.notifications.error.openingip")
@@ -359,7 +358,7 @@ function pollForIntelliPay(callbackFunction) {
   const startTime = Date.now();
 
   function checkFixAmount() {
-    if (window.intellipay && window.intellipay.fixAmount !== undefined) {
+    if (window.intellipay?.fixAmount) {
       callbackFunction();
       return;
     }

client/src/components/card-payment-modal/card-payment-modal.container.jsx

@@ -1,23 +1,20 @@
 import { Button, Modal } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectCardPayment } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import CardPaymentModalComponent from "./card-payment-modal.component";
 
 const mapStateToProps = createStructuredSelector({
-  cardPaymentModal: selectCardPayment,
-  bodyshop: selectBodyshop
+  cardPaymentModal: selectCardPayment
 });
 
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment"))
 });
 
-function CardPaymentModalContainer({ cardPaymentModal, toggleModalVisible, bodyshop }) {
+function CardPaymentModalContainer({ cardPaymentModal, toggleModalVisible }) {
   const { open } = cardPaymentModal;
   const { t } = useTranslation();
 

client/src/components/chat-affix/registerMessagingSocketHandlers.js

@@ -57,7 +57,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
             existingConversation: true
           });
         }
-      } catch (error) {
+      } catch {
         logLocal("handleNewMessageSummary - Cache miss", { conversationId });
       }
     }
@@ -328,8 +328,7 @@ 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,
@@ -375,6 +374,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
           });
 
           break;
+        }
 
         case "tag-removed":
           try {
@@ -462,7 +462,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
       logLocal("handlePhoneNumberOptedOut - Error", { error: error.message });
     }
   };
-  
+
   // New handler for phone number opt-in
   const handlePhoneNumberOptedIn = async (data) => {
     const { bodyshopid, phone_number } = data;

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -29,9 +29,7 @@ const mapDispatchToProps = (dispatch) => ({
 function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
   const { t } = useTranslation();
   const [, forceUpdate] = useState(false);
-
   const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
-
   const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
     variables: {
       bodyshopid: bodyshop.id,
@@ -64,15 +62,12 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
     const item = sortedConversationList[index];
     const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
     const hasOptOutEntry = optOutMap.has(normalizedPhone);
-
     const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
     const cardContentLeft =
       item.job_conversations.length > 0
         ? item.job_conversations.map((j, idx) => <Tag key={idx}>{j.job.ro_number}</Tag>)
         : null;
-
-    const names = <>{_.uniq(item.job_conversations.map((j, idx) => OwnerNameDisplayFunction(j.job)))}</>;
-
+    const names = <>{_.uniq(item.job_conversations.map((j) => OwnerNameDisplayFunction(j.job)))}</>;
     const cardTitle = (
       <>
         {item.label && <Tag color="blue">{item.label}</Tag>}
@@ -85,7 +80,6 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         )}
       </>
     );
-
     const cardExtra = (
       <>
         <Badge count={item.messages_aggregate.aggregate.count} />
@@ -98,11 +92,10 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         )}
       </>
     );
-
     const getCardStyle = () =>
       item.id === selectedConversation
-        ? { backgroundColor: "rgba(128, 128, 128, 0.2)" }
-        : { backgroundColor: index % 2 === 0 ? "#f0f2f5" : "#ffffff" };
+        ? { backgroundColor: "var(--card-selected-bg)" }
+        : { backgroundColor: index % 2 === 0 ? "var(--card-stripe-even-bg)" : "var(--card-stripe-odd-bg)" };
 
     return (
       <List.Item

client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx

@@ -21,7 +21,7 @@ export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
 
   const handleRemoveTag = async (jobId) => {
     const convId = jobConversations[0].conversationid;
-    if (!!convId) {
+    if (convId) {
       await removeJobConversation({
         variables: {
           conversationId: convId,

client/src/components/chat-conversation-title/chat-conversation-title.component.jsx

@@ -1,5 +1,4 @@
 import { Space } from "antd";
-import React from "react";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component";
 import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component";
@@ -16,10 +15,10 @@ const mapDispatchToProps = () => ({});
 export function ChatConversationTitle({ conversation }) {
   return (
     <Space className="chat-title" wrap>
-      <PhoneNumberFormatter>{conversation && conversation.phone_num}</PhoneNumberFormatter>
+      <PhoneNumberFormatter>{conversation?.phone_num}</PhoneNumberFormatter>
       <ChatLabelComponent conversation={conversation} />
       <ChatPrintButton conversation={conversation} />
-      <ChatConversationTitleTags jobConversations={(conversation && conversation.job_conversations) || []} />
+      <ChatConversationTitleTags jobConversations={conversation?.job_conversations || []} />
       <ChatTagRoContainer conversation={conversation || []} />
       <ChatArchiveButton conversation={conversation} />
     </Space>

client/src/components/chat-conversation/chat-conversation.component.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import AlertComponent from "../alert/alert.component";
 import ChatConversationTitle from "../chat-conversation-title/chat-conversation-title.component";
 import ChatMessageListComponent from "../chat-messages-list/chat-message-list.component";

client/src/components/chat-label/chat-label.component.jsx

@@ -14,7 +14,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = () => ({});
 
 export function ChatLabel({ conversation, bodyshop }) {
   const [loading, setLoading] = useState(false);

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -19,7 +19,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = () => ({});
 
 export default connect(mapStateToProps, mapDispatchToProps)(ChatMediaSelector);
 

client/src/components/chat-media-selector/chat-media-selector.styles.scss

@@ -5,7 +5,7 @@
     max-height: 480px;
     overflow-y: auto;
     padding: 8px;
-    background-color: #fff;
+    background-color: var(--popover-bg);
     border-radius: 8px;
   }
 }
@@ -17,7 +17,7 @@
 }
 
 .error-message {
-  color: red;
+  color: var(--error-text);
   font-size: 12px;
   text-align: center;
   margin-bottom: 8px;
@@ -25,14 +25,13 @@
 
 .no-jobs-message {
   font-size: 14px;
-  color: #888;
+  color: var(--no-jobs-text);
   text-align: center;
   padding: 8px;
 }
 
 /* Style images within gallery components */
 .media-selector-content img {
-
   object-fit: cover;
   border-radius: 4px;
   margin: 4px;
@@ -40,8 +39,8 @@
 }
 
 /* Grid layout for gallery components */
-.media-selector-content .ant-image, /* Assuming gallery components use Ant Design's Image */
-.media-selector-content .gallery-container { /* Fallback for custom gallery classes */
+.media-selector-content .ant-image,
+.media-selector-content .gallery-container {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
   gap: 4px;

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { Virtuoso } from "react-virtuoso";
 import { renderMessage } from "./renderMessage";
 import "./chat-message-list.styles.scss";
@@ -76,7 +76,7 @@ export default function ChatMessageListComponent({ messages }) {
       <Virtuoso
         ref={virtuosoRef}
         data={messages}
-        overscan={!!messages.reduce((acc, message) => acc + (message.image_path?.length || 0), 0) ? messages.length : 0}
+        overscan={messages.reduce((acc, message) => acc + (message.image_path?.length || 0), 0) ? messages.length : 0}
         itemContent={(index) => renderMessage(messages, index)}
         followOutput={(isAtBottom) => handleScrollStateChange(isAtBottom)}
         initialTopMostItemIndex={messages.length - 1}

client/src/components/chat-messages-list/chat-message-list.styles.scss

@@ -44,7 +44,6 @@
 .chat-send-message-button {
   margin: 0.3rem;
   padding-left: 0.5rem;
-
 }
 
 .message-icon {
@@ -52,7 +51,7 @@
   bottom: 0.1rem;
   right: 0.3rem;
   margin: 0 0.1rem;
-  color: whitesmoke;
+  color: var(--message-icon-color);
   z-index: 5;
 }
 
@@ -80,7 +79,7 @@
 
     &:last-child:after {
       width: 10px;
-      background: white;
+      background: var(--message-mine-tail-bg);
       z-index: 1;
     }
   }
@@ -92,11 +91,11 @@
 
   .message {
     margin-right: 20%;
-    background-color: #eee;
+    background-color: var(--message-yours-bg);
 
     &:last-child:before {
       left: -7px;
-      background: #eee;
+      background: var(--message-yours-bg);
       border-bottom-right-radius: 15px;
     }
 
@@ -112,14 +111,14 @@
   align-items: flex-end;
 
   .message {
-    color: white;
+    color: var(--message-mine-text);
     margin-left: 25%;
-    background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
+    background: linear-gradient(to bottom, var(--message-mine-bg-start) 0%, var(--message-mine-bg-end) 100%);
     padding-bottom: 0.6rem;
 
     &:last-child:before {
       right: -8px;
-      background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
+      background: linear-gradient(to bottom, var(--message-mine-bg-start) 0%, var(--message-mine-bg-end) 100%);
       border-bottom-left-radius: 15px;
     }
 
@@ -135,32 +134,31 @@
   margin: 0.5rem 10%;
 
   .message {
-    background-color: #f5f5f5;
+    background-color: var(--system-message-bg);
     border-radius: 10px;
     padding: 0.5rem 1rem;
     text-align: center;
     font-style: italic;
-    color: #555;
+    color: var(--system-message-text);
     width: fit-content;
     max-width: 80%;
   }
 
   .system-label {
     font-size: 0.75rem;
-    color: #888;
+    color: var(--system-label-text);
     margin-bottom: 0.2rem;
     display: block;
   }
 
   .system-date {
     font-size: 0.75rem;
-    color: #888;
+    color: var(--system-label-text);
     margin-top: 0.2rem;
     text-align: center;
   }
 }
 
-
 .virtuoso-container {
   flex: 1;
   overflow: auto;

client/src/components/chat-presets/chat-presets.component.jsx

@@ -1,6 +1,5 @@
 import { PlusCircleOutlined } from "@ant-design/icons";
 import { Dropdown } from "antd";
-import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setMessage } from "../../redux/messaging/messaging.actions";

client/src/components/chat-print-button/chat-print-button.component.jsx

@@ -1,6 +1,6 @@
 import { MailOutlined, PrinterOutlined } from "@ant-design/icons";
 import { Space, Spin } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setEmailOptions } from "../../redux/email/email.actions";
@@ -31,7 +31,7 @@ export function ChatPrintButton({ conversation }) {
       type,
       conversation.id,
       notification
-    ).catch((e) => {
+    ).catch(() => {
       console.warn("Something went wrong generating a document.");
     });
     setLoading(false);

client/src/components/chat-tag-ro/chat-tag-ro.component.jsx

@@ -1,6 +1,5 @@
 import { CloseCircleOutlined, LoadingOutlined } from "@ant-design/icons";
 import { Empty, Select, Space } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 

client/src/components/config-form-components/checkbox/checkbox.component.jsx

@@ -1,5 +1,4 @@
 import { Checkbox, Form } from "antd";
-import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required } = formItem;

client/src/components/config-form-components/config-form-components.component.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import FormTypes from "./config-form-types";
 
 export default function ConfirmFormComponents({ componentList, readOnly }) {
@@ -7,7 +6,7 @@ export default function ConfirmFormComponents({ componentList, readOnly }) {
       {componentList.map((f, idx) => {
         const Comp = FormTypes[f.type];
 
-        if (!!Comp) {
+        if (Comp) {
           return <Comp key={idx} formItem={f} readOnly={readOnly} />;
         } else {
           return <div key={idx}>Error</div>;

client/src/components/config-form-components/rate/rate.component.jsx

@@ -1,5 +1,4 @@
 import { Form, Rate } from "antd";
-import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required } = formItem;

client/src/components/config-form-components/slider/slider.component.jsx

@@ -1,5 +1,4 @@
 import { Form, Slider } from "antd";
-import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required, min, max } = formItem;

client/src/components/config-form-components/text/text.component.jsx

@@ -1,5 +1,4 @@
 import { Form, Input } from "antd";
-import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required } = formItem;

client/src/components/config-form-components/textarea/textarea.component.jsx

@@ -1,5 +1,4 @@
 import { Form, Input } from "antd";
-import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required, rows } = formItem;

client/src/components/conflict/conflict.component.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { Button, Result } from "antd";
 import { useTranslation } from "react-i18next";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";

client/src/components/contract-cars/contract-cars.component.jsx

@@ -1,5 +1,5 @@
 import { Card, Input, Table } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 
@@ -114,9 +114,9 @@ export default function ContractsCarsComponent({ loading, data, selectedCarId, h
           type: "radio",
           selectedRowKeys: [selectedCarId]
         }}
-        onRow={(record, rowIndex) => {
+        onRow={(record) => {
           return {
-            onClick: (event) => {
+            onClick: () => {
               handleSelect(record);
             }
           };

client/src/components/contract-cars/contract-cars.container.jsx

@@ -1,6 +1,5 @@
 import { useQuery } from "@apollo/client";
 import dayjs from "../../utils/day";
-import React from "react";
 import { QUERY_AVAILABLE_CC } from "../../graphql/courtesy-car.queries";
 import AlertComponent from "../alert/alert.component";
 import ContractCarsComponent from "./contract-cars.component";

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -2,7 +2,7 @@ import { useMutation } from "@apollo/client";
 import { Button, Form, InputNumber, Popover, Radio, Select, Space } from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useNavigate } from "react-router-dom";
@@ -16,7 +16,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -270,7 +270,7 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
       // awaitRefetchQueries: true,
     });
 
-    if (!!result.errors) {
+    if (result.errors) {
       notification["error"]({
         message: t("jobs.errors.inserting", {
           message: JSON.stringify(result.errors)

client/src/components/contract-courtesy-car-block/contract-courtesy-car-block.component.jsx

@@ -1,5 +1,4 @@
 import { Card } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import DataLabel from "../data-label/data-label.component";

client/src/components/contract-form/contract-form-job-prefill.component.jsx

@@ -1,6 +1,6 @@
 import { useLazyQuery } from "@apollo/client";
 import { Button } from "antd";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { GET_JOB_FOR_CC_CONTRACT } from "../../graphql/jobs.queries";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

client/src/components/contract-form/contract-form.component.jsx

@@ -1,6 +1,5 @@
 import { WarningFilled } from "@ant-design/icons";
 import { Form, Input, InputNumber, Space } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";

client/src/components/contract-job-block/contract-job-block.component.jsx

@@ -1,5 +1,4 @@
 import { Card } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import DataLabel from "../data-label/data-label.component";

client/src/components/contract-jobs/contract-jobs.component.jsx

@@ -1,5 +1,5 @@
 import { Card, Input, Table } from "antd";
-import React, { useMemo, useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
@@ -142,9 +142,9 @@ export default function ContractsJobsComponent({ loading, data, selectedJob, han
           type: "radio",
           selectedRowKeys: [selectedJob]
         }}
-        onRow={(record, rowIndex) => {
+        onRow={(record) => {
           return {
-            onClick: (event) => {
+            onClick: () => {
               handleSelect(record);
             }
           };

client/src/components/contract-jobs/contract-jobs.container.jsx

@@ -1,5 +1,4 @@
 import { useQuery } from "@apollo/client";
-import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";

client/src/components/contract-license-decode-button/contract-license-decode-button.component.jsx

@@ -1,6 +1,6 @@
 import { Button, Input, Modal, Typography } from "antd";
 import dayjs from "../../utils/day";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import aamva from "../../utils/aamva";
 import DataLabel from "../data-label/data-label.component";
@@ -54,7 +54,7 @@ export default function ContractLicenseDecodeButton({ form }) {
         open={modalVisible}
         okText={t("contracts.actions.senddltoform")}
         onOk={handleInsertForm}
-        okButtonProps={{ disabled: !!!decodedBarcode }}
+        okButtonProps={{ disabled: !decodedBarcode }}
         onCancel={handleCancel}
       >
         <div>
@@ -62,7 +62,7 @@ export default function ContractLicenseDecodeButton({ form }) {
             <Input
               autoFocus
               allowClear
-              onChange={(e) => {
+              onChange={() => {
                 if (!loading) setLoading(true);
               }}
               onPressEnter={handleDecode}

client/src/components/contracts-find-modal/contracts-find-modal.component.jsx

@@ -1,18 +1,14 @@
 import { Form, Input } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});
 
 export default connect(mapStateToProps, null)(PartsReceiveModalComponent);
 
-export function PartsReceiveModalComponent({ bodyshop, form }) {
+export function PartsReceiveModalComponent() {
   const { t } = useTranslation();
 
   return (

client/src/components/contracts-find-modal/contracts-find-modal.container.jsx

@@ -1,6 +1,6 @@
 import { useLazyQuery } from "@apollo/client";
 import { Button, Form, Modal, Table } from "antd";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
@@ -9,13 +9,11 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { FIND_CONTRACT } from "../../graphql/cccontracts.queries";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectContractFinder } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import ContractsFindModalComponent from "./contracts-find-modal.component";
 import AlertComponent from "../alert/alert.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
   contractFinderModal: selectContractFinder
 });
 
@@ -23,12 +21,7 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("contractFinder"))
 });
 
-export function ContractsFindModalContainer({
-  contractFinderModal,
-  toggleModalVisible,
-
-  bodyshop
-}) {
+export function ContractsFindModalContainer({ contractFinderModal, toggleModalVisible }) {
   const { t } = useTranslation();
 
   const { open } = contractFinderModal;
@@ -133,7 +126,7 @@ export function ContractsFindModalContainer({
             }
           ]}
           rowKey="id"
-          dataSource={data && data.cccontracts}
+          dataSource={data?.cccontracts}
         />
       </Form>
     </Modal>

client/src/components/contracts-list/contracts-list.component.jsx

@@ -1,7 +1,7 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Input, Space, Table, Typography } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -175,7 +175,7 @@ export function ContractsList({ bodyshop, loading, contracts, refetch, total, se
         pagination={{
           position: "top",
           pageSize: pageLimit,
-          current: parseInt(page || 1),
+          current: parseInt(page || 1, 10),
           total: total
         }}
         columns={columns}

client/src/components/contracts-rates-change-button/contracts-rates-change-button.component.jsx

@@ -1,6 +1,5 @@
 import { DownOutlined } from "@ant-design/icons";
 import { Dropdown } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -13,8 +12,8 @@ const mapStateToProps = createStructuredSelector({
 export function ContractsRatesChangeButton({ disabled, form, bodyshop }) {
   const { t } = useTranslation();
 
-  const handleClick = ({ item, key, keyPath }) => {
-    const { label, ...rate } = item.props.value;
+  const handleClick = ({ item }) => {
+    const { ...rate } = item.props.value;
     form.setFieldsValue(rate);
   };
 

client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx

@@ -1,6 +1,5 @@
 import { Card, Table } from "antd";
 import queryString from "query-string";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -3,7 +3,6 @@ import { useApolloClient } from "@apollo/client";
 import { Button, Form, Input, InputNumber, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import dayjs from "../../utils/day";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { CHECK_CC_FLEET_NUMBER } from "../../graphql/courtesy-car.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
@@ -128,7 +127,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading, newC
               required: true
               //message: t("general.validation.required"),
             },
-            ({ getFieldValue }) => ({
+            () => ({
               async validator(rule, value) {
                 if (value) {
                   const response = await client.query({

client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx

@@ -1,5 +1,5 @@
 import { Select } from "antd";
-import React, { forwardRef, useEffect, useState } from "react";
+import { forwardRef, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 const { Option } = Select;

client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx

@@ -1,5 +1,4 @@
 import { Form, InputNumber } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";